@@ -30,8 +30,9 @@ |
||
| 30 | 30 | switch ($method) |
| 31 | 31 | { |
| 32 | 32 | case '_COOKIE': |
| 33 | - if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key])) |
|
| 34 | - setcookie($key, $_COOKIE[$key], time() - 1, '/'); |
|
| 33 | + if (array_key_exists($key, $_COOKIE) || !empty($_COOKIE[$key])) { |
|
| 34 | + setcookie($key, $_COOKIE[$key], time() - 1, '/'); |
|
| 35 | + } |
|
| 35 | 36 | break; |
| 36 | 37 | |
| 37 | 38 | case '_SESSION': |
@@ -21,9 +21,10 @@ |
||
| 21 | 21 | $db->setDbuser($user); |
| 22 | 22 | $db->setDbpass($pass); |
| 23 | 23 | |
| 24 | - if ($db->isConnected()) |
|
| 25 | - return $db->reconnect() |
|
| 24 | + if ($db->isConnected()) { |
|
| 25 | + return $db->reconnect() |
|
| 26 | 26 | else |
| 27 | 27 | return $db->connect(); |
| 28 | + } |
|
| 28 | 29 | } |
| 29 | 30 | } |
| 30 | 31 | \ No newline at end of file |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | return [ |
| 4 | 4 | 'router' => [ |
| 5 | 5 | 'routes' => [ |
| 6 | - 'Auth' => [ |
|
| 7 | - 'module' => 'Auth', |
|
| 8 | - 'controller' => 'LogIn', |
|
| 9 | - 'view' => 'index' |
|
| 10 | - ] |
|
| 6 | + 'Auth' => [ |
|
| 7 | + 'module' => 'Auth', |
|
| 8 | + 'controller' => 'LogIn', |
|
| 9 | + 'view' => 'index' |
|
| 10 | + ] |
|
| 11 | 11 | ], |
| 12 | 12 | ], |
| 13 | 13 | 'view_manager' => [ |
@@ -26,8 +26,9 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | foreach ($files as $file) |
| 28 | 28 | { |
| 29 | - if (!in_array($file, ['.', '..'])) |
|
| 30 | - $_files[] = $file; |
|
| 29 | + if (!in_array($file, ['.', '..'])) { |
|
| 30 | + $_files[] = $file; |
|
| 31 | + } |
|
| 31 | 32 | } |
| 32 | 33 | |
| 33 | 34 | $_folders[$folder] = $_files; |
@@ -74,8 +75,9 @@ discard block |
||
| 74 | 75 | |
| 75 | 76 | private function object_to_array($obj) |
| 76 | 77 | { |
| 77 | - if (is_object($obj)) |
|
| 78 | - $obj = (array) $obj; |
|
| 78 | + if (is_object($obj)) { |
|
| 79 | + $obj = (array) $obj; |
|
| 80 | + } |
|
| 79 | 81 | |
| 80 | 82 | if (is_array($obj)) |
| 81 | 83 | { |
@@ -85,9 +87,9 @@ discard block |
||
| 85 | 87 | { |
| 86 | 88 | $new[$key] = $this->object_to_array($val); |
| 87 | 89 | } |
| 90 | + } else { |
|
| 91 | + $new = $obj; |
|
| 88 | 92 | } |
| 89 | - else |
|
| 90 | - $new = $obj; |
|
| 91 | 93 | |
| 92 | 94 | return $new; |
| 93 | 95 | } |
@@ -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 |
@@ -6,32 +6,32 @@ |
||
| 6 | 6 | |
| 7 | 7 | class Resource extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var integer |
|
| 11 | - */ |
|
| 9 | + /** |
|
| 10 | + * @var integer |
|
| 11 | + */ |
|
| 12 | 12 | public $RESOURCE_ID; |
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 14 | + /** |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | 17 | public $RESOURCE_NAME; |
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * @var string |
|
| 21 | - */ |
|
| 19 | + /** |
|
| 20 | + * @var string |
|
| 21 | + */ |
|
| 22 | 22 | public $STATE; |
| 23 | 23 | |
| 24 | - /** |
|
| 25 | - * @var date |
|
| 26 | - */ |
|
| 24 | + /** |
|
| 25 | + * @var date |
|
| 26 | + */ |
|
| 27 | 27 | public $RECORD_DATE; |
| 28 | 28 | |
| 29 | 29 | public function __construct($data = []) |
| 30 | 30 | { |
| 31 | - parent::__construct($data); |
|
| 31 | + parent::__construct($data); |
|
| 32 | 32 | |
| 33 | - $config = include 'module/Auth/config/user.config.php'; |
|
| 34 | - $prefix = $config["database"]["prefix"]; |
|
| 33 | + $config = include 'module/Auth/config/user.config.php'; |
|
| 34 | + $prefix = $config["database"]["prefix"]; |
|
| 35 | 35 | |
| 36 | 36 | $this->setTableName($prefix . "_" . "RESOURCE"); |
| 37 | 37 | } |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | foreach ($row as $key => $value) |
| 51 | 51 | { |
| 52 | - if (is_string($key)) |
|
| 53 | - $filtered_array[$key] = $value; |
|
| 52 | + if (is_string($key)) { |
|
| 53 | + $filtered_array[$key] = $value; |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | $user = new User(); |
@@ -81,8 +82,9 @@ discard block |
||
| 81 | 82 | |
| 82 | 83 | foreach ($row as $key => $value) |
| 83 | 84 | { |
| 84 | - if (is_string($key)) |
|
| 85 | - $filtered_array[$key] = $value; |
|
| 85 | + if (is_string($key)) { |
|
| 86 | + $filtered_array[$key] = $value; |
|
| 87 | + } |
|
| 86 | 88 | } |
| 87 | 89 | |
| 88 | 90 | $user = new User(); |
@@ -6,14 +6,14 @@ |
||
| 6 | 6 | |
| 7 | 7 | class UserRole extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var string |
|
| 11 | - */ |
|
| 9 | + /** |
|
| 10 | + * @var string |
|
| 11 | + */ |
|
| 12 | 12 | public $USER_ID; |
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var integer |
|
| 16 | - */ |
|
| 14 | + /** |
|
| 15 | + * @var integer |
|
| 16 | + */ |
|
| 17 | 17 | public $ROLE_ID; |
| 18 | 18 | |
| 19 | 19 | public function __construct($data = []) |
@@ -6,19 +6,19 @@ discard block |
||
| 6 | 6 | |
| 7 | 7 | class User extends Entity |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * @var string |
|
| 11 | - */ |
|
| 9 | + /** |
|
| 10 | + * @var string |
|
| 11 | + */ |
|
| 12 | 12 | public $TOKEN; |
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @var date |
|
| 16 | - */ |
|
| 14 | + /** |
|
| 15 | + * @var date |
|
| 16 | + */ |
|
| 17 | 17 | public $RECORD_DATE; |
| 18 | 18 | |
| 19 | 19 | public function __construct($data = []) |
| 20 | 20 | { |
| 21 | - $config = include 'module/Auth/config/user.config.php'; |
|
| 21 | + $config = include 'module/Auth/config/user.config.php'; |
|
| 22 | 22 | |
| 23 | 23 | $username_str = $config["authentication"]["gateway"]["credentials"]["username"]; |
| 24 | 24 | $password_str = $config["authentication"]["gateway"]["credentials"]["password"]; |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | $this->{$field} = null; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - parent::__construct($data); |
|
| 34 | + parent::__construct($data); |
|
| 35 | 35 | |
| 36 | - $table = $config["authentication"]["gateway"]["entity"]; |
|
| 37 | - $prefix = $config["database"]["prefix"]; |
|
| 36 | + $table = $config["authentication"]["gateway"]["entity"]; |
|
| 37 | + $prefix = $config["database"]["prefix"]; |
|
| 38 | 38 | |
| 39 | 39 | $this->setTableName($prefix . "_" . $table); |
| 40 | 40 | } |