psfs / core

src/base/types/traits/Api/ManagerTrait.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
             "domain" => $this->getDomain(),
             "listLabel" => Api::API_LIST_NAME_FIELD,
             'modelId' => Api::API_MODEL_KEY_FIELD,
-            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)),
-            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)),
+            'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)),
+            "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)),
         ), [], '');
     }
 

src/base/types/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@ 
     public function render($template, array $vars = array(), $cookies = array(), $domain = null)
     {
         $vars['__menu__'] = $this->getMenu();
-        if(Config::getParam('profiling.enable')) {
+        if (Config::getParam('profiling.enable')) {
             $vars['__profiling__'] = Inspector::getStats();
         }
         $domain = (null === $domain) ? $this->getDomain() : $domain;
-        return $this->tpl->render($domain . $template, $vars, $cookies);
+        return $this->tpl->render($domain.$template, $vars, $cookies);
     }
 
     /**
@@ -76,7 +76,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**

src/base/Template.php

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -140,7 +140,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -162,8 +162,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -224,7 +224,7 @@ 
             'getFlash' => TemplateFunctions::GET_FLASH_FUNCTION,
             'getQuery' => TemplateFunctions::GET_QUERY_FUNCTION,
         ];
-        foreach($functions as $name => $function) {
+        foreach ($functions as $name => $function) {
             $this->addTemplateFunction($name, $function);
         }
     }
@@ -243,7 +243,7 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
         if (null !== $domains) {
             foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
@@ -258,7 +258,7 @@ 
     {
         $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.autoreload', TRUE),
         ));

src/base/types/traits/Api/ApiTrait.php

Braces +3 added lines, -1 removed lines

@@ -114,7 +114,9 @@
                 try {
                     $query->filterBy($phpName, $pks[$i]);
                     $i++;
-                    if($i >= count($pks)) break;
+                    if($i >= count($pks)) {
+                        break;
+                    }
                 } catch(\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }

Spacing +15 added lines, -15 removed lines

@@ -96,15 +96,15 @@ 
     protected function hydrateBulkRequest() {
         $class = new \ReflectionClass($this->getModelNamespace());
         $this->list = [];
-        foreach($this->data as $item) {
-            if(is_array($item)) {
-                if(count($this->list) < Config::getParam('api.block.limit', 1000)) {
+        foreach ($this->data as $item) {
+            if (is_array($item)) {
+                if (count($this->list) < Config::getParam('api.block.limit', 1000)) {
                     /** @var ActiveRecordInterface $model */
                     $model = $class->newInstance();
                     $this->hydrateModelFromRequest($model, $item);
                     $this->list[] = $model;
-                } else {
-                    Logger::log(_('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . _('items'));
+                }else {
+                    Logger::log(_('Max items per bulk insert raised'), LOG_WARNING, count($this->data)._('items'));
                 }
             }
         }
@@ -115,12 +115,12 @@ 
      */
     protected function saveBulk() {
         $tablemap = $this->getTableMap();
-        foreach($this->list as &$model) {
+        foreach ($this->list as &$model) {
             $con = Propel::getWriteConnection($tablemap::DATABASE_NAME);
             try {
                 $model->save($con);
                 $con->commit();
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, $model->toArray());
                 $con->rollBack();
             }
@@ -133,7 +133,7 @@ 
     protected function exportList() {
         $list = [];
         /** @var ActiveRecordInterface $item */
-        foreach($this->list as $item) {
+        foreach ($this->list as $item) {
             $list[] = $item->toArray();
         }
         return $list;
@@ -157,16 +157,16 @@ 
      */
     protected function findPk(ModelCriteria $query, $pk) {
         $pks = explode(Api::API_PK_SEPARATOR, urldecode($pk));
-        if(count($pks) === 1 && !empty($pks[0])) {
+        if (count($pks) === 1 && !empty($pks[0])) {
             $query->filterByPrimaryKey($pks[0]);
-        } else {
+        }else {
             $i = 0;
-            foreach($this->getPkDbName() as $key => $phpName) {
+            foreach ($this->getPkDbName() as $key => $phpName) {
                 try {
                     $query->filterBy($phpName, $pks[$i]);
                     $i++;
-                    if($i >= count($pks)) break;
-                } catch(\Exception $e) {
+                    if ($i >= count($pks)) break;
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_DEBUG);
                 }
             }
@@ -196,8 +196,8 @@ 
         try {
             $query = $this->prepareQuery();
             $this->model = $this->findPk($query, $pk);
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
     }
 

src/base/config/ConfigForm.php

Spacing +3 added lines, -3 removed lines

@@ -82,9 +82,9 @@
             "class" => "btn-warning md-default",
             "icon" => "fa-plus",
         ];
-        if(Config::getParam('admin.version', 'v1') === 'v1') {
-            $add["onclick"] = "javascript:addNewField(document.getElementById('" . $this->getName() . "'));";
-        } else {
+        if (Config::getParam('admin.version', 'v1') === 'v1') {
+            $add["onclick"] = "javascript:addNewField(document.getElementById('".$this->getName()."'));";
+        }else {
             $add["ng-click"] = "addNewField()";
         }
         $this->addButton('submit', _("Guardar configuración"), "submit", array(

src/base/types/traits/OutputTrait.php

Spacing +13 added lines, -13 removed lines

@@ -120,7 +120,7 @@ 
                 $this->setStatusCode(Template::STATUS_OK);
                 break;
             default:
-                $this->setStatusCode('HTTP/1.0 ' . $status ?: 200);
+                $this->setStatusCode('HTTP/1.0 '.$status ?: 200);
                 break;
         }
         return $this;
@@ -138,7 +138,7 @@ 
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -154,16 +154,16 @@ 
         Logger::log('Start output response');
         ob_start();
         $this->setReponseHeaders($contentType, $cookies);
-        header('Content-length: ' . strlen($output));
-        header('CRC: ' . crc32($output));
+        header('Content-length: '.strlen($output));
+        header('CRC: '.crc32($output));
 
         $needCache = Cache::needCache();
         $cache = Cache::getInstance();
         list($path, $cacheDataName) = $cache->getRequestCacheHash();
         if (false !== $needCache && $this->getStatusCode() === Template::STATUS_OK && null !== $cacheDataName) {
             Logger::log('Saving output response into cache');
-            $cache->storeData("json" . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output);
-            $cache->storeData("json" . DIRECTORY_SEPARATOR . $path . $cacheDataName . ".headers", headers_list(), Cache::JSON);
+            $cache->storeData("json".DIRECTORY_SEPARATOR.$path.$cacheDataName, $output);
+            $cache->storeData("json".DIRECTORY_SEPARATOR.$path.$cacheDataName.".headers", headers_list(), Cache::JSON);
         } elseif (Request::getInstance()->getMethod() !== 'GET') {
             $cache->flushCache();
         }
@@ -183,11 +183,11 @@ 
         Logger::log('Close template render');
         $uri = Request::requestUri();
         Security::getInstance()->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . $uri,
+            "url" => Request::getInstance()->getRootUrl().$uri,
             "ts" => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . $uri, LOG_INFO);
+        Logger::log('End request: '.$uri, LOG_INFO);
         exit;
     }
 
@@ -225,17 +225,17 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         header("Pragma: no-cache");
         header("Expires: 0");
         header('Content-Transfer-Encoding: binary');
-        header("Content-type: " . $content);
-        header("Content-length: " . strlen($data));
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header("Content-type: ".$content);
+        header("Content-length: ".strlen($data));
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
         header("Access-Control-Expose-Headers: Filename");
-        header("Filename: " . $filename);
+        header("Filename: ".$filename);
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/types/helpers/Inspector.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     protected static function calculateStats(array $stats, $ts, $mem = 0, $files = 0) {
         return [
             'ts' => round($stats['ts'] - $ts, 4),
-            'mem' => round(($stats['mem'] - $mem) / 1024 / 1024, 4),
+            'mem' => round(($stats['mem'] - $mem)/1024/1024, 4),
             'files' => $stats['files'] - $files,
             'name' => $stats['name'],
         ];
@@ -42,7 +42,7 @@ 
         $ts = defined('PSFS_START_TS') ? PSFS_START_TS : 0;
         $mem = defined('PSFS_START_MEM') ? PSFS_START_MEM : 0;
         $files = 0;
-        foreach(self::$profiling as $key => &$value) {
+        foreach (self::$profiling as $key => &$value) {
             $value = self::calculateStats($value, $ts, $mem, $files);
         }
         self::$profiling[] = self::calculateStats(self::collect('Profiling collect ends'), $ts, $mem, $files);

src/base/types/helpers/RequestHelper.php

Braces +45 added lines, -22 removed lines

@@ -70,22 +70,28 @@ 
             if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',') !== false) {
                 $iplist = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
                 foreach ($iplist as $ip) {
-                    if (self::validateIpAddress($ip))
-                        return $ip;
+                    if (self::validateIpAddress($ip)) {
+                                            return $ip;
+                    }
                 }
             } else {
-                if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR']))
-                    return $_SERVER['HTTP_X_FORWARDED_FOR'];
+                if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                                    return $_SERVER['HTTP_X_FORWARDED_FOR'];
+                }
             }
         }
-        if (!empty($_SERVER['HTTP_X_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_X_FORWARDED']))
-            return $_SERVER['HTTP_X_FORWARDED'];
-        if (!empty($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']) && self::validateIpAddress($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']))
-            return $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'];
-        if (!empty($_SERVER['HTTP_FORWARDED_FOR']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED_FOR']))
-            return $_SERVER['HTTP_FORWARDED_FOR'];
-        if (!empty($_SERVER['HTTP_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED']))
-            return $_SERVER['HTTP_FORWARDED'];
+        if (!empty($_SERVER['HTTP_X_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_X_FORWARDED'])) {
+                    return $_SERVER['HTTP_X_FORWARDED'];
+        }
+        if (!empty($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']) && self::validateIpAddress($_SERVER['HTTP_X_CLUSTER_CLIENT_IP'])) {
+                    return $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'];
+        }
+        if (!empty($_SERVER['HTTP_FORWARDED_FOR']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED_FOR'])) {
+                    return $_SERVER['HTTP_FORWARDED_FOR'];
+        }
+        if (!empty($_SERVER['HTTP_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED'])) {
+                    return $_SERVER['HTTP_FORWARDED'];
+        }
 
         // return unreliable ip since all else failed
         return $_SERVER['REMOTE_ADDR'];
@@ -96,8 +102,9 @@ 
      * a private network range.
      */
     public static function validateIpAddress($ip) {
-        if (strtolower($ip) === 'unknown')
-            return false;
+        if (strtolower($ip) === 'unknown') {
+                    return false;
+        }
 
         // generate ipv4 network address
         $ip = ip2long($ip);
@@ -109,14 +116,30 @@ 
             // signed numbers (ints default to signed in PHP)
             $ip = sprintf('%u', $ip);
             // do private network range checking
-            if ($ip >= 0 && $ip <= 50331647) return false;
-            if ($ip >= 167772160 && $ip <= 184549375) return false;
-            if ($ip >= 2130706432 && $ip <= 2147483647) return false;
-            if ($ip >= 2851995648 && $ip <= 2852061183) return false;
-            if ($ip >= 2886729728 && $ip <= 2887778303) return false;
-            if ($ip >= 3221225984 && $ip <= 3221226239) return false;
-            if ($ip >= 3232235520 && $ip <= 3232301055) return false;
-            if ($ip >= 4294967040) return false;
+            if ($ip >= 0 && $ip <= 50331647) {
+                return false;
+            }
+            if ($ip >= 167772160 && $ip <= 184549375) {
+                return false;
+            }
+            if ($ip >= 2130706432 && $ip <= 2147483647) {
+                return false;
+            }
+            if ($ip >= 2851995648 && $ip <= 2852061183) {
+                return false;
+            }
+            if ($ip >= 2886729728 && $ip <= 2887778303) {
+                return false;
+            }
+            if ($ip >= 3221225984 && $ip <= 3221226239) {
+                return false;
+            }
+            if ($ip >= 3232235520 && $ip <= 3232301055) {
+                return false;
+            }
+            if ($ip >= 4294967040) {
+                return false;
+            }
         }
         return true;
     }

Spacing +3 added lines, -3 removed lines

@@ -46,10 +46,10 @@ 
 
                     // TODO include this headers in Template class output method
                     header("Access-Control-Allow-Credentials: true");
-                    header("Access-Control-Allow-Origin: " . Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
+                    header("Access-Control-Allow-Origin: ".Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
                     header("Vary: Origin");
                     header("Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS");
-                    header("Access-Control-Allow-Headers: " . implode(', ', self::getCorsHeaders()));
+                    header("Access-Control-Allow-Headers: ".implode(', ', self::getCorsHeaders()));
                 }
                 if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) {
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG);
@@ -78,7 +78,7 @@ 
                     if (self::validateIpAddress($ip))
                         return $ip;
                 }
-            } else {
+            }else {
                 if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR']))
                     return $_SERVER['HTTP_X_FORWARDED_FOR'];
             }

src/base/types/traits/JsonTrait.php

Spacing +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@ 
      */
     public function json($response, $statusCode = 200)
     {
-        if(Config::getParam('profiling.enable')) {
-            if(is_array($response)) {
+        if (Config::getParam('profiling.enable')) {
+            if (is_array($response)) {
                 $response['profiling'] = Inspector::getStats();
-            } elseif($response instanceof JsonResponse) {
+            } elseif ($response instanceof JsonResponse) {
                 $response = ProfilingJsonResponse::createFromPrevious($response, Inspector::getStats());
             }
         }
@@ -34,13 +34,13 @@ 
         $this->decodeJsonReponse($response);
 
         $mask = JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING;
-        if(Config::getParam('output.json.strict_numbers')) {
+        if (Config::getParam('output.json.strict_numbers')) {
             $mask = JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK;
         }
 
         $data = json_encode($response, $mask);
-        if(Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+        if (Config::getParam('angular.protection', false)) {
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         ResponseHelper::setDebugHeaders([]);