o2system / framework

src/Http/Presenter/Assets/Positions/Body.php

Spacing +7 added lines, -7 removed lines

@@ -111,15 +111,15 @@ 
             foreach ($this->javascripts as $javascript) {
                 if (in_array(pathinfo($javascript, PATHINFO_FILENAME), $unbundledFilenames)) {
                     $fileVersion = $this->getVersion(filemtime($javascript));
-                    $output[] = '<script type="text/javascript" id="js-'.pathinfo($javascript, PATHINFO_FILENAME).'" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>';
+                    $output[] = '<script type="text/javascript" id="js-' . pathinfo($javascript, PATHINFO_FILENAME) . '" src="' . $this->getUrl($javascript) . '?v=' . $fileVersion . '"></script>';
                 } elseif (in_array(pathinfo($javascript, PATHINFO_FILENAME), ['module', 'module.min'])) {
                     $modulePublicFile = $this->publishFile($javascript);
 
-                    if (is_file($modulePublicFile[ 'filePath' ])) {
+                    if (is_file($modulePublicFile['filePath'])) {
                         if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'minify' ][ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>';
+                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['minify']['url'] . '?v=' . $modulePublicFile['version'] . '"></script>';
                         } else {
-                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile[ 'url' ] . '?v=' . $modulePublicFile[ 'version' ] . '"></script>';
+                            $output[] = '<script type="text/javascript" id="js-module" src="' . $modulePublicFile['url'] . '?v=' . $modulePublicFile['version'] . '"></script>';
                         }
                     }
                 } else {
@@ -130,11 +130,11 @@ 
             if (count($bundleJavascriptSources)) {
                 $bundleJavascriptPublicFile = $this->bundleFile($bundleFilename . '.js', $bundleJavascriptSources);
 
-                if (is_file($bundleJavascriptPublicFile[ 'filePath' ])) {
+                if (is_file($bundleJavascriptPublicFile['filePath'])) {
                     if (input()->env('DEBUG_STAGE') === 'PRODUCTION') {
-                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'minify' ][ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>';
+                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['minify']['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>';
                     } else {
-                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile[ 'url' ] . '?v=' . $bundleJavascriptPublicFile[ 'version' ] . '"></script>';
+                        $output[] = '<script type="text/javascript" id="js-bundle" src="' . $bundleJavascriptPublicFile['url'] . '?v=' . $bundleJavascriptPublicFile['version'] . '"></script>';
                     }
                 }
             }

src/Helpers/Framework.php

Spacing +9 added lines, -9 removed lines

@@ -67,8 +67,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($GLOBALS[ $args[ 0 ] ])) {
-                return $GLOBALS[ $args[ 0 ] ];
+            if (isset($GLOBALS[$args[0]])) {
+                return $GLOBALS[$args[0]];
             }
 
             return null;
@@ -93,8 +93,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($_ENV[ $args[ 0 ] ])) {
-                return $_ENV[ $args[ 0 ] ];
+            if (isset($_ENV[$args[0]])) {
+                return $_ENV[$args[0]];
             }
 
             return null;
@@ -195,9 +195,9 @@ 
         $args = func_get_args();
 
         if (count($args) == 1) {
-            return o2system()->models->autoload($args[ 0 ]);
+            return o2system()->models->autoload($args[0]);
         } else if (count($args) == 2) {
-            return o2system()->models->autoload($args[ 0 ], $args[ 1 ]);
+            return o2system()->models->autoload($args[0], $args[1]);
         }
 
         return o2system()->models;
@@ -219,7 +219,7 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            return o2system()->modules->getModule($args[ 0 ]);
+            return o2system()->modules->getModule($args[0]);
         }
 
         return o2system()->modules;
@@ -261,8 +261,8 @@ 
         $args = func_get_args();
 
         if (count($args)) {
-            if (isset($_SESSION[ $args[ 0 ] ])) {
-                return $_SESSION[ $args[ 0 ] ];
+            if (isset($_SESSION[$args[0]])) {
+                return $_SESSION[$args[0]];
             }
 
             return null;

src/Models/Sql/Traits/ModifierTrait.php

Spacing +16 added lines, -16 removed lines

@@ -41,8 +41,8 @@ 
             }
 
             if (method_exists($this, 'getRecordOrdering')) {
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $sets[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $sets['record_ordering'] = $this->getRecordOrdering($this->table);
                 }
             }
 
@@ -93,8 +93,8 @@ 
             if (method_exists($this, 'insertRecordSets')) {
                 foreach ($sets as $set) {
                     $this->insertRecordSets($set);
-                    if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                        $set[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+                    if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                        $set['record_ordering'] = $this->getRecordOrdering($this->table);
                     }
                 }
             }
@@ -154,8 +154,8 @@ 
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
             if (empty($conditions)) {
-                if (isset($sets[ $primaryKey ])) {
-                    $conditions = [$primaryKey => $sets[ $primaryKey ]];
+                if (isset($sets[$primaryKey])) {
+                    $conditions = [$primaryKey => $sets[$primaryKey]];
                 }
             }
 
@@ -168,8 +168,8 @@ 
             }
 
             if (method_exists($this, 'getRecordOrdering')) {
-                if ($this->recordOrdering === true && empty($sets[ 'record_ordering' ])) {
-                    $sets[ 'record_ordering' ] = $this->getRecordOrdering($this->table);
+                if ($this->recordOrdering === true && empty($sets['record_ordering'])) {
+                    $sets['record_ordering'] = $this->getRecordOrdering($this->table);
                 }
             }
 
@@ -202,8 +202,8 @@ 
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
             if (empty($conditions)) {
-                if (isset($sets[ $primaryKey ])) {
-                    $conditions = [$primaryKey => $sets[ $primaryKey ]];
+                if (isset($sets[$primaryKey])) {
+                    $conditions = [$primaryKey => $sets[$primaryKey]];
                 } else {
                     $conditions = $sets;
                 }
@@ -235,7 +235,7 @@ 
 
         if (method_exists($this, 'updateRecordSets')) {
             foreach ($sets as $key => $set) {
-                $this->updateRecordSets($sets[ $key ]);
+                $this->updateRecordSets($sets[$key]);
             }
         }
 
@@ -383,7 +383,7 @@ 
      */
     private function updateRecordStatus($id, $recordStatus, $method)
     {
-        $sets[ 'record_status' ] = $recordStatus;
+        $sets['record_status'] = $recordStatus;
         $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
         if (method_exists($this, 'updateRecordSets')) {
@@ -417,13 +417,13 @@ 
     private function updateRecordStatusMany(array $ids, $recordStatus, $method)
     {
         if (count($ids)) {
-            $sets[ 'record_status' ] = $recordStatus;
+            $sets['record_status'] = $recordStatus;
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
             $this->qb->whereIn($primaryKey, $ids);
 
             if (method_exists($this, 'updateRecordSets')) {
-                $this->updateRecordSets($sets[ $key ]);
+                $this->updateRecordSets($sets[$key]);
             }
 
             if (method_exists($this, $beforeMethod = 'before' . ucfirst($method))) {
@@ -455,7 +455,7 @@ 
     private function updateRecordStatusBy(array $conditions = [], $recordStatus, $method)
     {
         if (count($conditions)) {
-            $sets[ 'record_status' ] = $recordStatus;
+            $sets['record_status'] = $recordStatus;
 
             if (method_exists($this, 'updateRecordSets')) {
                 $this->updateRecordSets($sets);
@@ -490,7 +490,7 @@ 
     private function updateRecordStatusManyBy($conditions = [], $recordStatus, $method)
     {
         if (count($conditions)) {
-            $sets[ 'record_status' ] = $recordStatus;
+            $sets['record_status'] = $recordStatus;
 
             if (method_exists($this, 'updateRecordSets')) {
                 $this->updateRecordSets($sets);

src/Models/Sql/Traits/RecordTrait.php

Spacing +35 added lines, -35 removed lines

@@ -99,64 +99,64 @@ 
     {
         $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s');
 
-        if(is_null($this->recordUser)) {
-            if(globals()->offsetExists('account')) {
+        if (is_null($this->recordUser)) {
+            if (globals()->offsetExists('account')) {
                 $this->setRecordUser(globals()->account->id);
             }
         }
 
-        if ( ! isset($sets[ 'record_status' ])) {
-            $sets[ 'record_status' ] = $this->recordStatus;
+        if ( ! isset($sets['record_status'])) {
+            $sets['record_status'] = $this->recordStatus;
         }
 
         if (empty($this->primaryKeys)) {
             $primaryKey = isset($this->primaryKey) ? $this->primaryKey : 'id';
 
-            if (isset($sets[ $primaryKey ])) {
-                if (empty($sets[ $primaryKey ])) {
-                    unset($sets[ $primaryKey ]);
+            if (isset($sets[$primaryKey])) {
+                if (empty($sets[$primaryKey])) {
+                    unset($sets[$primaryKey]);
                 }
             }
 
-            if (empty($sets[ $primaryKey ])) {
-                if ( ! isset($sets[ 'record_create_user' ])) {
-                    $sets[ 'record_create_user' ] = $this->recordUser;
+            if (empty($sets[$primaryKey])) {
+                if ( ! isset($sets['record_create_user'])) {
+                    $sets['record_create_user'] = $this->recordUser;
                 }
 
-                if ( ! isset($sets[ 'record_create_timestamp' ])) {
-                    $sets[ 'record_create_timestamp' ] = $timestamp;
+                if ( ! isset($sets['record_create_timestamp'])) {
+                    $sets['record_create_timestamp'] = $timestamp;
                 } elseif ($this->unixTimestamp) {
-                    $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]);
+                    $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']);
                 }
             }
         } else {
             foreach ($this->primaryKeys as $primaryKey) {
-                if (empty($sets[ $primaryKey ])) {
-                    if ( ! isset($sets[ 'record_create_user' ])) {
-                        $sets[ 'record_create_user' ] = $this->recordUser;
+                if (empty($sets[$primaryKey])) {
+                    if ( ! isset($sets['record_create_user'])) {
+                        $sets['record_create_user'] = $this->recordUser;
                     }
 
-                    if ( ! isset($sets[ 'record_create_timestamp' ])) {
-                        $sets[ 'record_create_timestamp' ] = $timestamp;
+                    if ( ! isset($sets['record_create_timestamp'])) {
+                        $sets['record_create_timestamp'] = $timestamp;
                     } elseif ($this->unixTimestamp) {
-                        $sets[ 'record_create_timestamp' ] = strtotime($sets[ 'record_create_timestamp' ]);
+                        $sets['record_create_timestamp'] = strtotime($sets['record_create_timestamp']);
                     }
                 }
             }
         }
 
-        if ( ! isset($sets[ 'record_update_user' ])) {
-            $sets[ 'record_update_user' ] = $this->recordUser;
+        if ( ! isset($sets['record_update_user'])) {
+            $sets['record_update_user'] = $this->recordUser;
         }
 
-        if ( ! isset($sets[ 'record_update_timestamp' ])) {
-            $sets[ 'record_update_timestamp' ] = $timestamp;
+        if ( ! isset($sets['record_update_timestamp'])) {
+            $sets['record_update_timestamp'] = $timestamp;
         } elseif ($this->unixTimestamp) {
-            $sets[ 'record_update_timestamp' ] = strtotime($sets[ 'record_update_timestamp' ]);
+            $sets['record_update_timestamp'] = strtotime($sets['record_update_timestamp']);
         }
 
-        if ( ! isset($sets[ 'record_ordering' ]) && $this->recordOrdering === true) {
-            $sets[ 'record_ordering' ] = $this->getRecordOrdering();
+        if ( ! isset($sets['record_ordering']) && $this->recordOrdering === true) {
+            $sets['record_ordering'] = $this->getRecordOrdering();
         }
     }
 
@@ -169,24 +169,24 @@ 
      */
     protected function updateRecordSets(array &$sets)
     {
-        if(is_null($this->recordUser)) {
-            if(globals()->offsetExists('account')) {
+        if (is_null($this->recordUser)) {
+            if (globals()->offsetExists('account')) {
                 $this->setRecordUser(globals()->account->id);
             }
         }
 
-        if ( ! isset($sets[ 'record_status' ])) {
-            $sets[ 'record_status' ] = $this->recordStatus;
+        if ( ! isset($sets['record_status'])) {
+            $sets['record_status'] = $this->recordStatus;
         }
 
-        if ( ! isset($sets[ 'record_update_user' ])) {
-            $sets[ 'record_update_user' ] = $this->recordUser;
+        if ( ! isset($sets['record_update_user'])) {
+            $sets['record_update_user'] = $this->recordUser;
         }
 
         $timestamp = $this->unixTimestamp === true ? strtotime(date('Y-m-d H:i:s')) : date('Y-m-d H:i:s');
 
-        if ( ! isset($sets[ 'record_update_timestamp' ])) {
-            $sets[ 'record_update_timestamp' ] = $timestamp;
+        if ( ! isset($sets['record_update_timestamp'])) {
+            $sets['record_update_timestamp'] = $timestamp;
         }
     }
 
@@ -199,7 +199,7 @@ 
      */
     public function getRecordOrdering()
     {
-        if($this->recordOrdering === true) {
+        if ($this->recordOrdering === true) {
             return $this->qb->countAllResults($this->table) + 1;
         }
 

src/Libraries/AccessControl/User.php

Spacing +11 added lines, -11 removed lines

@@ -77,10 +77,10 @@ 
             if (isset($account)) {
                 foreach ($account as $key => $value) {
                     if (strpos($key, 'record') !== false) {
-                        unset($account[ $key ]);
+                        unset($account[$key]);
                     } elseif (in_array($key,
                         ['password', 'pin', 'token', 'sso', 'id_sys_user', 'id_sys_module', 'id_sys_module_role'])) {
-                        unset($account[ $key ]);
+                        unset($account[$key]);
                     }
                 }
 
@@ -109,7 +109,7 @@ 
             $column = 'id';
         } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) {
             $column = 'email';
-        } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) {
+        } elseif (preg_match($this->config['msisdnRegex'], $username)) {
             $column = 'msisdn';
         }
 
@@ -131,7 +131,7 @@ 
     public function loggedIn()
     {
         if (parent::loggedIn()) {
-            $account = new Account($_SESSION[ 'account' ]);
+            $account = new Account($_SESSION['account']);
 
             if ($user = models('users')->findWhere(['username' => $account->username], 1)) {
                 // Store Account Profile
@@ -180,7 +180,7 @@ 
             $column = 'id';
         } elseif (filter_var($username, FILTER_VALIDATE_EMAIL)) {
             $column = 'email';
-        } elseif (preg_match($this->config[ 'msisdnRegex' ], $username)) {
+        } elseif (preg_match($this->config['msisdnRegex'], $username)) {
             $column = 'msisdn';
         } elseif (strpos($username, 'token-') !== false) {
             $username = str_replace('token-', '', $username);
@@ -195,15 +195,15 @@ 
 
             foreach ($account as $key => $value) {
                 if (strpos($key, 'record') !== false) {
-                    unset($account[ $key ]);
+                    unset($account[$key]);
                 } elseif (in_array($key, ['password', 'pin', 'token', 'sso'])) {
-                    unset($account[ $key ]);
+                    unset($account[$key]);
                 }
             }
 
             if ($column === 'token') {
                 models('users')->update([
-                    'id'    => $account[ 'id' ],
+                    'id'    => $account['id'],
                     'token' => null,
                 ]);
             }
@@ -227,9 +227,9 @@ 
      */
     public function authorize(ServerRequest $request)
     {
-        if (isset($GLOBALS[ 'account' ][ 'role' ])) {
+        if (isset($GLOBALS['account']['role'])) {
             $uriSegments = $request->getUri()->getSegments()->getString();
-            $role = $GLOBALS[ 'account' ][ 'role' ];
+            $role = $GLOBALS['account']['role'];
             if (in_array($role->code, ['DEVELOPER', 'ADMINISTRATOR'])) {
                 globals()->store('authority', new Authority([
                     'permission' => 'GRANTED',
@@ -269,7 +269,7 @@ 
     public function getIframeCode()
     {
         if ($this->signedOn() && $this->loggedIn() === false) {
-            return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config[ 'sso' ][ 'server' ],
+            return '<iframe id="sign-on-iframe" width="1" height="1" src="' . rtrim($this->config['sso']['server'],
                     '/') . '" style="display: none; visibility: hidden;"></iframe>';
         }
 

src/Http/Controllers/ServiceWorker.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      */
     public function index()
     {
-        if($javascript = file_get_contents(PATH_PUBLIC . 'assets/sw.js')) {
+        if ($javascript = file_get_contents(PATH_PUBLIC . 'assets/sw.js')) {
             $javascript = str_replace(['{{$theme}}', '{{ $theme }}'], 'default', $javascript);
 
             header("Content-type: application/x-javascript");

src/Models/Sql/Traits/HierarchicalTrait.php

Spacing +4 added lines, -4 removed lines

@@ -85,7 +85,7 @@ 
                         ]);
                 }
 
-                $update[ 'id' ] = $child->id;
+                $update['id'] = $child->id;
 
                 if ($this->qb
                     ->table($this->table)
@@ -100,7 +100,7 @@ 
                         ->update($update = [
                             'record_right' => $right,
                         ]);
-                    $update[ 'id' ] = $child->id;
+                    $update['id'] = $child->id;
                 }
 
                 $i++;
@@ -215,7 +215,7 @@ 
      */
     public function getNumOfParents($id)
     {
-        if($parents = $this->getParents($id)) {
+        if ($parents = $this->getParents($id)) {
             return $parents->count();
         }
 
@@ -281,7 +281,7 @@ 
      */
     public function getNumOfChilds($idParent, $direct = true)
     {
-        if($childs = $this->getChilds($idParent)) {
+        if ($childs = $this->getChilds($idParent)) {
             return $childs->count();
         }