@@ -6,19 +6,19 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Identifiers extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var integer |
|
| 11 | - */ |
|
| 12 | - public $CONN_IDENTI_ID; |
|
| 9 | + /** |
|
| 10 | + * @var integer |
|
| 11 | + */ |
|
| 12 | + public $CONN_IDENTI_ID; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - public $CONN_IDENTI_NAME; |
|
| 14 | + /** |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + public $CONN_IDENTI_NAME; |
|
| 18 | 18 | |
| 19 | 19 | public function __construct($data = []) |
| 20 | 20 | { |
| 21 | - parent::__construct($data); |
|
| 21 | + parent::__construct($data); |
|
| 22 | 22 | $this->setTableName("SWM_CONN_IDENTIFIERS"); |
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | \ No newline at end of file |
@@ -6,19 +6,19 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ConnectionType extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var integer |
|
| 11 | - */ |
|
| 12 | - public $CONN_TYPE_ID; |
|
| 9 | + /** |
|
| 10 | + * @var integer |
|
| 11 | + */ |
|
| 12 | + public $CONN_TYPE_ID; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - public $CONN_TYPE_NAME; |
|
| 14 | + /** |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + public $CONN_TYPE_NAME; |
|
| 18 | 18 | |
| 19 | 19 | public function __construct($data = []) |
| 20 | 20 | { |
| 21 | - parent::__construct($data); |
|
| 21 | + parent::__construct($data); |
|
| 22 | 22 | $this->setTableName("SWM_CONNECTION_TYPES"); |
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | \ No newline at end of file |
@@ -6,29 +6,29 @@ |
||
| 6 | 6 | |
| 7 | 7 | class ConnectionTypeField extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var integer |
|
| 11 | - */ |
|
| 12 | - public $CONN_TYPE_ID; |
|
| 9 | + /** |
|
| 10 | + * @var integer |
|
| 11 | + */ |
|
| 12 | + public $CONN_TYPE_ID; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var integer |
|
| 16 | - */ |
|
| 17 | - public $CONN_IDENTI_ID; |
|
| 14 | + /** |
|
| 15 | + * @var integer |
|
| 16 | + */ |
|
| 17 | + public $CONN_IDENTI_ID; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * @var string |
|
| 21 | - */ |
|
| 22 | - public $FIELD_NAME; |
|
| 19 | + /** |
|
| 20 | + * @var string |
|
| 21 | + */ |
|
| 22 | + public $FIELD_NAME; |
|
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * @var string |
|
| 26 | - */ |
|
| 27 | - public $PLACEHOLDER; |
|
| 24 | + /** |
|
| 25 | + * @var string |
|
| 26 | + */ |
|
| 27 | + public $PLACEHOLDER; |
|
| 28 | 28 | |
| 29 | 29 | public function __construct($data = []) |
| 30 | 30 | { |
| 31 | - parent::__construct($data); |
|
| 31 | + parent::__construct($data); |
|
| 32 | 32 | $this->setTableName("SWM_CONN_TYPE_FIELDS"); |
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | \ No newline at end of file |
@@ -6,24 +6,24 @@ |
||
| 6 | 6 | |
| 7 | 7 | class UserConnectionDetails extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var integer |
|
| 11 | - */ |
|
| 12 | - public $USER_CONN_ID; |
|
| 9 | + /** |
|
| 10 | + * @var integer |
|
| 11 | + */ |
|
| 12 | + public $USER_CONN_ID; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var integer |
|
| 16 | - */ |
|
| 17 | - public $CONN_IDENTI_ID; |
|
| 14 | + /** |
|
| 15 | + * @var integer |
|
| 16 | + */ |
|
| 17 | + public $CONN_IDENTI_ID; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * @var string |
|
| 21 | - */ |
|
| 22 | - public $FIELD_VALUE; |
|
| 19 | + /** |
|
| 20 | + * @var string |
|
| 21 | + */ |
|
| 22 | + public $FIELD_VALUE; |
|
| 23 | 23 | |
| 24 | 24 | public function __construct($data = []) |
| 25 | 25 | { |
| 26 | - parent::__construct($data); |
|
| 26 | + parent::__construct($data); |
|
| 27 | 27 | $this->setTableName("SWM_USER_CONN_DETAILS"); |
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | \ No newline at end of file |
@@ -6,39 +6,39 @@ |
||
| 6 | 6 | |
| 7 | 7 | class UserConnection extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var integer |
|
| 11 | - */ |
|
| 12 | - public $USER_CONN_ID; |
|
| 13 | - |
|
| 14 | - /** |
|
| 15 | - * @var integer |
|
| 16 | - */ |
|
| 17 | - public $USER_ID; |
|
| 18 | - |
|
| 19 | - /** |
|
| 20 | - * @var integer |
|
| 21 | - */ |
|
| 22 | - public $CONN_TYPE_ID; |
|
| 23 | - |
|
| 24 | - /** |
|
| 25 | - * @var string |
|
| 26 | - */ |
|
| 27 | - public $CONNECTION_NAME; |
|
| 28 | - |
|
| 29 | - /** |
|
| 30 | - * @var string |
|
| 31 | - */ |
|
| 32 | - public $STATE; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * @var date |
|
| 36 | - */ |
|
| 37 | - public $RECORD_DATE; |
|
| 9 | + /** |
|
| 10 | + * @var integer |
|
| 11 | + */ |
|
| 12 | + public $USER_CONN_ID; |
|
| 13 | + |
|
| 14 | + /** |
|
| 15 | + * @var integer |
|
| 16 | + */ |
|
| 17 | + public $USER_ID; |
|
| 18 | + |
|
| 19 | + /** |
|
| 20 | + * @var integer |
|
| 21 | + */ |
|
| 22 | + public $CONN_TYPE_ID; |
|
| 23 | + |
|
| 24 | + /** |
|
| 25 | + * @var string |
|
| 26 | + */ |
|
| 27 | + public $CONNECTION_NAME; |
|
| 28 | + |
|
| 29 | + /** |
|
| 30 | + * @var string |
|
| 31 | + */ |
|
| 32 | + public $STATE; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * @var date |
|
| 36 | + */ |
|
| 37 | + public $RECORD_DATE; |
|
| 38 | 38 | |
| 39 | 39 | public function __construct($data = []) |
| 40 | 40 | { |
| 41 | - parent::__construct($data); |
|
| 41 | + parent::__construct($data); |
|
| 42 | 42 | $this->setTableName("SWM_USER_CONNECTIONS"); |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | \ No newline at end of file |
@@ -9,12 +9,12 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | class Module extends AbstractionModule |
| 11 | 11 | { |
| 12 | - public function init(AbstractionController $c) |
|
| 13 | - { |
|
| 14 | - $config = $this->getUserConfig("Auth"); |
|
| 15 | - $_config = $this->toFormConfig($config); |
|
| 12 | + public function init(AbstractionController $c) |
|
| 13 | + { |
|
| 14 | + $config = $this->getUserConfig("Auth"); |
|
| 15 | + $_config = $this->toFormConfig($config); |
|
| 16 | 16 | |
| 17 | - # config constraints |
|
| 17 | + # config constraints |
|
| 18 | 18 | |
| 19 | 19 | $components = [ |
| 20 | 20 | "attributes" => [ |
@@ -86,21 +86,21 @@ discard block |
||
| 86 | 86 | { |
| 87 | 87 | case '_COOKIE': |
| 88 | 88 | |
| 89 | - if (!array_key_exists($key, $_COOKIE) || empty($_COOKIE[$key])) |
|
| 90 | - header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 89 | + if (!array_key_exists($key, $_COOKIE) || empty($_COOKIE[$key])) |
|
| 90 | + header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 91 | 91 | |
| 92 | 92 | break; |
| 93 | 93 | |
| 94 | 94 | case '_SESSION': |
| 95 | 95 | |
| 96 | - if (!array_key_exists($key, $_SESSION) || empty($_SESSION[$key])) |
|
| 97 | - header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 96 | + if (!array_key_exists($key, $_SESSION) || empty($_SESSION[$key])) |
|
| 97 | + header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 98 | 98 | |
| 99 | 99 | break; |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | $this->setTranslator($c); |
| 103 | - } |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | 105 | private function setTranslator(AbstractionController $c) |
| 106 | 106 | { |
@@ -122,30 +122,30 @@ discard block |
||
| 122 | 122 | $c->translator = new \Zend\Mvc\I18n\Translator($i18nTranslator); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - public function getUserConfig($module) |
|
| 126 | - { |
|
| 127 | - return include __DIR__ . "/../$module/config/user.config.php"; |
|
| 128 | - } |
|
| 129 | - |
|
| 130 | - private function toFormConfig($config) |
|
| 131 | - { |
|
| 132 | - $new_config = []; |
|
| 133 | - $again = false; |
|
| 134 | - |
|
| 135 | - foreach ($config as $param => $configure) |
|
| 136 | - { |
|
| 137 | - if (is_array($configure)) |
|
| 138 | - { |
|
| 139 | - foreach ($configure as $key => $value) |
|
| 140 | - { |
|
| 141 | - $again = true; |
|
| 142 | - $new_config[$param . "_" . $key] = $value; |
|
| 143 | - } |
|
| 144 | - } |
|
| 145 | - else |
|
| 146 | - $new_config[$param] = $configure; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - return (!$again) ? $new_config : $this->toFormConfig($new_config); |
|
| 150 | - } |
|
| 125 | + public function getUserConfig($module) |
|
| 126 | + { |
|
| 127 | + return include __DIR__ . "/../$module/config/user.config.php"; |
|
| 128 | + } |
|
| 129 | + |
|
| 130 | + private function toFormConfig($config) |
|
| 131 | + { |
|
| 132 | + $new_config = []; |
|
| 133 | + $again = false; |
|
| 134 | + |
|
| 135 | + foreach ($config as $param => $configure) |
|
| 136 | + { |
|
| 137 | + if (is_array($configure)) |
|
| 138 | + { |
|
| 139 | + foreach ($configure as $key => $value) |
|
| 140 | + { |
|
| 141 | + $again = true; |
|
| 142 | + $new_config[$param . "_" . $key] = $value; |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + else |
|
| 146 | + $new_config[$param] = $configure; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + return (!$again) ? $new_config : $this->toFormConfig($new_config); |
|
| 150 | + } |
|
| 151 | 151 | } |
| 152 | 152 | \ No newline at end of file |
@@ -87,14 +87,14 @@ |
||
| 87 | 87 | case '_COOKIE': |
| 88 | 88 | |
| 89 | 89 | if (!array_key_exists($key, $_COOKIE) || empty($_COOKIE[$key])) |
| 90 | - header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 90 | + header("location: " . $c->basePath . "/public/" . "Auth"); |
|
| 91 | 91 | |
| 92 | 92 | break; |
| 93 | 93 | |
| 94 | 94 | case '_SESSION': |
| 95 | 95 | |
| 96 | 96 | if (!array_key_exists($key, $_SESSION) || empty($_SESSION[$key])) |
| 97 | - header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 97 | + header("location: " . $c->basePath . "/public/" . "Auth"); |
|
| 98 | 98 | |
| 99 | 99 | break; |
| 100 | 100 | } |
@@ -86,15 +86,17 @@ discard block |
||
| 86 | 86 | { |
| 87 | 87 | case '_COOKIE': |
| 88 | 88 | |
| 89 | - if (!array_key_exists($key, $_COOKIE) || empty($_COOKIE[$key])) |
|
| 90 | - header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 89 | + if (!array_key_exists($key, $_COOKIE) || empty($_COOKIE[$key])) { |
|
| 90 | + header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 91 | + } |
|
| 91 | 92 | |
| 92 | 93 | break; |
| 93 | 94 | |
| 94 | 95 | case '_SESSION': |
| 95 | 96 | |
| 96 | - if (!array_key_exists($key, $_SESSION) || empty($_SESSION[$key])) |
|
| 97 | - header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 97 | + if (!array_key_exists($key, $_SESSION) || empty($_SESSION[$key])) { |
|
| 98 | + header("location: " . $c->basePath ."/public/". "Auth"); |
|
| 99 | + } |
|
| 98 | 100 | |
| 99 | 101 | break; |
| 100 | 102 | } |
@@ -141,9 +143,9 @@ discard block |
||
| 141 | 143 | $again = true; |
| 142 | 144 | $new_config[$param . "_" . $key] = $value; |
| 143 | 145 | } |
| 146 | + } else { |
|
| 147 | + $new_config[$param] = $configure; |
|
| 144 | 148 | } |
| 145 | - else |
|
| 146 | - $new_config[$param] = $configure; |
|
| 147 | 149 | } |
| 148 | 150 | |
| 149 | 151 | return (!$again) ? $new_config : $this->toFormConfig($new_config); |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | return [ |
| 4 | 4 | 'router' => [ |
| 5 | 5 | 'routes' => [ |
| 6 | - 'Workarea' => [ |
|
| 7 | - 'module' => 'Workarea', |
|
| 8 | - 'controller' => 'Start', |
|
| 9 | - 'view' => 'index' |
|
| 10 | - ] |
|
| 6 | + 'Workarea' => [ |
|
| 7 | + 'module' => 'Workarea', |
|
| 8 | + 'controller' => 'Start', |
|
| 9 | + 'view' => 'index' |
|
| 10 | + ] |
|
| 11 | 11 | ], |
| 12 | 12 | ], |
| 13 | 13 | 'view_manager' => [ |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | ], |
| 25 | 25 | 'environment' => [ |
| 26 | 26 | 'base_path' => (dirname(dirname($_SERVER['PHP_SELF'])) == "/") ? "" : dirname(dirname($_SERVER['PHP_SELF'])), |
| 27 | - 'dev_mode' => true, // set this to FALSE for production environments |
|
| 27 | + 'dev_mode' => true, // set this to FALSE for production environments |
|
| 28 | 28 | 'locale' => 'en' |
| 29 | 29 | ], |
| 30 | 30 | ]; |
| 31 | 31 | \ No newline at end of file |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | - 'default' => [ |
|
| 5 | - 'dbname' => '', |
|
| 6 | - 'dbuser' => '', |
|
| 7 | - 'dbpass' => '', |
|
| 8 | - 'dbhost' => '', |
|
| 9 | - 'driver' => 'Oci8', |
|
| 10 | - 'dbchar' => 'utf8' |
|
| 11 | - ], |
|
| 4 | + 'default' => [ |
|
| 5 | + 'dbname' => '', |
|
| 6 | + 'dbuser' => '', |
|
| 7 | + 'dbpass' => '', |
|
| 8 | + 'dbhost' => '', |
|
| 9 | + 'driver' => 'Oci8', |
|
| 10 | + 'dbchar' => 'utf8' |
|
| 11 | + ], |
|
| 12 | 12 | ]; |
| 13 | 13 | \ No newline at end of file |