AgelxNash / DocLister

assets/lib/APIHelpers.class.php

Doc Comments +2 added lines, -3 removed lines

@@ -62,7 +62,6 @@ 
      * @param mixed $data массив
      * @param string $key ключ массива
      * @param mixed $default null значение по умолчанию
-     * @param Closure $validate null функция дополнительной валидации значения (должна возвращать true или false)
      * @return mixed
      */
     public static function getkey($data, $key, $default = null)
@@ -85,7 +84,7 @@ 
      * @license    GNU General Public License (GPL), http://www.gnu.org/copyleft/gpl.html
      * @param string $email проверяемый email
      * @param boolean $dns проверять ли DNS записи
-     * @return boolean Результат проверки почтового ящика
+     * @return false|string Результат проверки почтового ящика
      * @author Anton Shevchuk
      */
     public static function emailValidate($email, $dns = true)
@@ -160,7 +159,7 @@ 
     }
 
     /**
-     * @param $data
+     * @param string $data
      * @return bool|false|string
      */
     public static function getEnv($data)

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
         if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {
             $out = $data[$key];
         }
-        if (!empty($validate) && is_callable($validate)) {
+        if ( ! empty($validate) && is_callable($validate)) {
             $out = (($validate($out) === true) ? $out : $default);
         }
         return $out;
@@ -92,7 +92,7 @@ 
     {
         if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
             list(, $domain) = explode("@", $email, 2);
-            if (!$dns || ($dns && checkdnsrr($domain, "MX") && checkdnsrr($domain, "A"))) {
+            if ( ! $dns || ($dns && checkdnsrr($domain, "MX") && checkdnsrr($domain, "A"))) {
                 $error = false;
             } else {
                 $error = 'dns';
@@ -223,7 +223,7 @@ 
             case ($tmp = self::getEnv('HTTP_X_FORWARDED_FOR')):
                 $out = $tmp;
                 break;
-            case (!empty($_SERVER['REMOTE_ADDR'])):
+            case ( ! empty($_SERVER['REMOTE_ADDR'])):
                 $out = $_SERVER['REMOTE_ADDR'];
                 break;
             default:
@@ -359,7 +359,7 @@ 
             }
             for ($i = 0; $i < $len; $i++) {
                 $chr = mb_strtoupper(mb_substr($value, $i, 1, 'UTF-8'), 'UTF-8');
-                if (!in_array($chr, $data, true)) {
+                if ( ! in_array($chr, $data, true)) {
                     $flag = false;
                     break;
                 }

Braces +51 added lines, -51 removed lines

@@ -3,16 +3,16 @@ 
 /**
  * Class APIhelpers
  */
-class APIhelpers
-{
+class APIhelpers

+{

     /**
      * Преобразует первый символ в нижний регистр
      * @param $str
      * @param string $encoding - кодировка, по-умолчанию UTF-8
      * @return string
      */
-    public static function mb_lcfirst($str, $encoding = 'UTF-8')
-    {
+    public static function mb_lcfirst($str, $encoding = 'UTF-8')

+    {

         return mb_strtolower(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str),
             $encoding);
     }
@@ -23,8 +23,8 @@ 
      * @param string $encoding - кодировка, по-умолчанию UTF-8
      * @return string
      */
-    public static function mb_ucfirst($str, $encoding = 'UTF-8')
-    {
+    public static function mb_ucfirst($str, $encoding = 'UTF-8')

+    {

         $str = mb_ereg_replace('^[\ ]+', '', $str);
         $str = mb_strtoupper(mb_substr($str, 0, 1, $encoding), $encoding) . mb_substr($str, 1, mb_strlen($str),
                 $encoding);
@@ -43,13 +43,13 @@ 
      * @param string $encoding кодировка
      * @return string
      */
-    public static function mb_trim_word($html, $len, $encoding = 'UTF-8')
-    {
+    public static function mb_trim_word($html, $len, $encoding = 'UTF-8')

+    {

         $text = trim(preg_replace('|\s+|', ' ', strip_tags($html)));
         $text = mb_substr($text, 0, $len + 1, $encoding);
-        if (mb_substr($text, -1, null, $encoding) == ' ') {
+        if (mb_substr($text, -1, null, $encoding) == ' ') {

             $out = trim($text);
-        } else {
+        } else {

             $out = mb_substr($text, 0, mb_strripos($text, ' ', null, $encoding), $encoding);
         }
 
@@ -65,13 +65,13 @@ 
      * @param Closure $validate null функция дополнительной валидации значения (должна возвращать true или false)
      * @return mixed
      */
-    public static function getkey($data, $key, $default = null)
-    {
+    public static function getkey($data, $key, $default = null)

+    {

         $out = $default;
-        if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {
+        if (is_array($data) && (is_int($key) || is_string($key)) && $key !== '' && array_key_exists($key, $data)) {

             $out = $data[$key];
         }
-        if (!empty($validate) && is_callable($validate)) {
+        if (!empty($validate) && is_callable($validate)) {

             $out = (($validate($out) === true) ? $out : $default);
         }
         return $out;
@@ -88,16 +88,16 @@ 
      * @return boolean Результат проверки почтового ящика
      * @author Anton Shevchuk
      */
-    public static function emailValidate($email, $dns = true)
-    {
-        if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
+    public static function emailValidate($email, $dns = true)

+    {

+        if (filter_var($email, FILTER_VALIDATE_EMAIL)) {

             list(, $domain) = explode("@", $email, 2);
-            if (!$dns || ($dns && checkdnsrr($domain, "MX") && checkdnsrr($domain, "A"))) {
+            if (!$dns || ($dns && checkdnsrr($domain, "MX") && checkdnsrr($domain, "A"))) {

                 $error = false;
-            } else {
+            } else {

                 $error = 'dns';
             }
-        } else {
+        } else {

             $error = 'format';
         }
 
@@ -130,16 +130,16 @@ 
      * $this->genPass(20,"."); //AMV,>&?J)v55,(^g}Z06
      * $this->genPass(20,"aaa0aaa.A"); //rtvKja5xb0\KpdiRR1if
      */
-    public static function genPass($len, $data = '')
-    {
-        if ($data == '') {
+    public static function genPass($len, $data = '')

+    {

+        if ($data == '') {

             $data = 'Aa0.';
         }
         $opt = strlen($data);
         $pass = array();
 
-        for ($i = $len; $i > 0; $i--) {
-            switch ($data[rand(0, ($opt - 1))]) {
+        for ($i = $len; $i > 0; $i--) {

+            switch ($data[rand(0, ($opt - 1))]) {

                 case 'A':
                     $tmp = rand(65, 90);
                     break;
@@ -163,9 +163,9 @@ 
      * @param $data
      * @return bool|false|string
      */
-    public static function getEnv($data)
-    {
-        switch (true) {
+    public static function getEnv($data)

+    {

+        switch (true) {

             case (isset($_SERVER[$data])):
                 $out = $_SERVER[$data];
                 break;
@@ -198,10 +198,10 @@ 
      *
      * @see http://stackoverflow.com/questions/5036443/php-how-to-block-proxies-from-my-site
      */
-    public static function getUserIP($default = '127.0.0.1')
-    {
+    public static function getUserIP($default = '127.0.0.1')

+    {

         //Порядок условий зависит от приоритетов
-        switch (true) {
+        switch (true) {

             case ($tmp = self::getEnv('HTTP_COMING_FROM')):
                 $out = $tmp;
                 break;
@@ -255,8 +255,8 @@ 
             '`'   => '`',
             '%60' => '`'
         )
-    ) {
-        switch (true) {
+    ) {

+        switch (true) {

             case is_scalar($data):
                 $out = str_replace(
                     array_keys($chars),
@@ -266,7 +266,7 @@ 
                 break;
             case is_array($data):
                 $out = $data;
-                foreach ($out as $key => &$val) {
+                foreach ($out as $key => &$val) {

                     $val = self::sanitarTag($val, $charset, $chars);
                 }
                 break;
@@ -282,8 +282,8 @@ 
      * @param string $charset
      * @return string
      */
-    public static function e($text, $charset = 'UTF-8')
-    {
+    public static function e($text, $charset = 'UTF-8')

+    {

         return is_scalar($text) ? htmlspecialchars($text, ENT_QUOTES, $charset, false) : '';
     }
 
@@ -298,17 +298,17 @@ 
      * @param array $mixArray Примесь символов, которые так же могут использоваться в строке
      * @return bool
      */
-    public static function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())
-    {
+    public static function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())

+    {

         $flag = true;
         $len = mb_strlen($value, 'UTF-8');
         $value = trim($value);
-        if (mb_strlen($value, 'UTF-8') == $len) {
+        if (mb_strlen($value, 'UTF-8') == $len) {

             $data = is_array($mixArray) ? $mixArray : array();
             $alph = is_array($alph) ? array_unique($alph) : array();
-            foreach ($alph as $item) {
+            foreach ($alph as $item) {

                 $item = strtolower($item);
-                switch ($item) {
+                switch ($item) {

                     case 'rus':
                         $data = array_merge($data, array(
                             'А',
@@ -348,7 +348,7 @@ 
                         break;
                     case 'num':
                         $tmp = range('0', '9');
-                        foreach ($tmp as $t) {
+                        foreach ($tmp as $t) {

                             $data[] = (string)$t;
                         }
                         break;
@@ -357,15 +357,15 @@ 
                         break;
                 }
             }
-            for ($i = 0; $i < $len; $i++) {
+            for ($i = 0; $i < $len; $i++) {

                 $chr = mb_strtoupper(mb_substr($value, $i, 1, 'UTF-8'), 'UTF-8');
-                if (!in_array($chr, $data, true)) {
+                if (!in_array($chr, $data, true)) {

                     $flag = false;
                     break;
                 }
             }
             $flag = ($flag && $len >= $minLen);
-        } else {
+        } else {

             $flag = false;
         }
 
@@ -382,18 +382,18 @@ 
      * @param string $sep разделитель ключей при склейке многомерных массивов
      * @return array массив с переименованными ключами
      */
-    public static function renameKeyArr($data, $prefix = '', $suffix = '', $addPS = '.', $sep = '.')
-    {
+    public static function renameKeyArr($data, $prefix = '', $suffix = '', $addPS = '.', $sep = '.')

+    {

         $out = array();
-        if ($prefix == '' && $suffix == '') {
+        if ($prefix == '' && $suffix == '') {

             $out = $data;
-        } else {
+        } else {

             $InsertPrefix = ($prefix != '') ? ($prefix . $addPS) : '';
             $InsertSuffix = ($suffix != '') ? ($addPS . $suffix) : '';
-            foreach ($data as $key => $item) {
+            foreach ($data as $key => $item) {

                 $key = $InsertPrefix . $key;
                 $val = null;
-                switch (true) {
+                switch (true) {

                     case is_scalar($item):
                         $val = $item;
                         break;

assets/lib/Helpers/FS.php

Spacing +10 added lines, -10 removed lines

@@ -65,12 +65,12 @@ 
      */
     private function _pathinfo($file, $mode)
     {
-        if (!is_scalar($file) && !is_scalar($mode)) {
+        if ( ! is_scalar($file) && ! is_scalar($mode)) {
             $file = $mode = '';
         }
-        $flag = !(empty($file) || empty($mode));
+        $flag = ! (empty($file) || empty($mode));
         $f = MODX_BASE_PATH . $this->relativePath($file);
-        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
+        if ($flag && ! isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
             $this->_fileInfo[$f] = pathinfo($f);
         }
         $out = $flag && isset($this->_fileInfo[$f][$mode]) ? $this->_fileInfo[$f][$mode] : '';
@@ -113,7 +113,7 @@ 
     public function takeFileExt($file, $lower = true)
     {
         $str = $this->_pathinfo($file, 'extension');
-        if($lower){
+        if ($lower) {
             $str = strtolower($str);
         }
         return $str;
@@ -127,7 +127,7 @@ 
     {
         $f = is_scalar($file) ? MODX_BASE_PATH . $this->relativePath($file) : '';
 
-        return (!empty($f) && is_file($f) && is_readable($f));
+        return ( ! empty($f) && is_file($f) && is_readable($f));
     }
 
     /**
@@ -138,7 +138,7 @@ 
     {
         $f = is_scalar($path) ? $this->relativePath($path) : '';
 
-        return (!empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
+        return ( ! empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
     }
 
     /**
@@ -153,10 +153,10 @@ 
             $out = filesize(MODX_BASE_PATH . $this->relativePath($file));
         }
         
-        if($format === true) $format = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+        if ($format === true) $format = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
         if (is_array($format)) {
             $size = $out > 0 ? floor(log($out, 1024)) : 0;
-            $type = isset($format[$size]) ? ' '.$format[$size] : '';
+            $type = isset($format[$size]) ? ' ' . $format[$size] : '';
             $out = number_format($out / pow(1024, $size), 2, '.', ',') . $type;
         }
         
@@ -228,7 +228,7 @@ 
      */
     public function makeDir($path, $perm = 0755)
     {
-        if (!$this->checkDir($path)) {
+        if ( ! $this->checkDir($path)) {
             $path = MODX_BASE_PATH . $this->relativePath($path);
             $flag = mkdir($path, $this->toOct($perm), true);
         } else {
@@ -293,7 +293,7 @@ 
             $owner = MODX_BASE_PATH;
         }
         $path = str_replace('\\', '/', $path);
-        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
+        if ( ! (empty($path) || ! is_scalar($path)) && ! preg_match("/^http(s)?:\/\/\w+/", $path)) {
             $path = trim(preg_replace("#^" . preg_quote($owner) . "#", '', $path), DIRECTORY_SEPARATOR);
         } else {
             $path = '';

Braces +73 added lines, -70 removed lines

@@ -4,8 +4,8 @@ 
  * Class FS
  * @package Helpers
  */
-class FS
-{
+class FS

+{

     /**
      * @var FS cached reference to singleton instance
      */
@@ -21,9 +21,9 @@ 
      *
      * @return self
      */
-    public static function getInstance()
-    {
-        if (null === self::$instance) {
+    public static function getInstance()

+    {

+        if (null === self::$instance) {

             self::$instance = new self();
         }
 
@@ -34,8 +34,8 @@ 
      * is not allowed to call from outside: private!
      *
      */
-    private function __construct()
-    {
+    private function __construct()

+    {

     }
 
     /**
@@ -43,8 +43,8 @@ 
      *
      * @return void
      */
-    private function __clone()
-    {
+    private function __clone()

+    {

     }
 
     /**
@@ -52,8 +52,8 @@ 
      *
      * @return void
      */
-    private function __wakeup()
-    {
+    private function __wakeup()

+    {

     }
 
     /**
@@ -63,14 +63,14 @@ 
      * @param string $file ключ
      * @return string информация из pathinfo о обрабатываемом файле input
      */
-    private function _pathinfo($file, $mode)
-    {
-        if (!is_scalar($file) && !is_scalar($mode)) {
+    private function _pathinfo($file, $mode)

+    {

+        if (!is_scalar($file) && !is_scalar($mode)) {

             $file = $mode = '';
         }
         $flag = !(empty($file) || empty($mode));
         $f = MODX_BASE_PATH . $this->relativePath($file);
-        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {
+        if ($flag && !isset($this->_fileInfo[$f], $this->_fileInfo[$f][$mode])) {

             $this->_fileInfo[$f] = pathinfo($f);
         }
         $out = $flag && isset($this->_fileInfo[$f][$mode]) ? $this->_fileInfo[$f][$mode] : '';
@@ -82,8 +82,8 @@ 
      * @param $file
      * @return string
      */
-    public function takeFileDir($file)
-    {
+    public function takeFileDir($file)

+    {

         return $this->_pathinfo($file, 'dirname');
     }
 
@@ -91,8 +91,9 @@ 
      * @param $file
      * @return string
      */
-    public function takeFileBasename($file)
-    { //file name with extension
+    public function takeFileBasename($file)

+    {

+//file name with extension
         return $this->_pathinfo($file, 'basename');
     }
 
@@ -100,8 +101,8 @@ 
      * @param $file
      * @return string
      */
-    public function takeFileName($file)
-    {
+    public function takeFileName($file)

+    {

         return $this->_pathinfo($file, 'filename');
     }
 
@@ -110,10 +111,10 @@ 
      * @param bool $lower 
      * @return string
      */
-    public function takeFileExt($file, $lower = true)
-    {
+    public function takeFileExt($file, $lower = true)

+    {

         $str = $this->_pathinfo($file, 'extension');
-        if($lower){
+        if($lower) {

             $str = strtolower($str);
         }
         return $str;
@@ -123,8 +124,8 @@ 
      * @param $file
      * @return bool
      */
-    public function checkFile($file)
-    {
+    public function checkFile($file)

+    {

         $f = is_scalar($file) ? MODX_BASE_PATH . $this->relativePath($file) : '';
 
         return (!empty($f) && is_file($f) && is_readable($f));
@@ -134,8 +135,8 @@ 
      * @param $path
      * @return bool
      */
-    public function checkDir($path)
-    {
+    public function checkDir($path)

+    {

         $f = is_scalar($path) ? $this->relativePath($path) : '';
 
         return (!empty($f) && is_dir(MODX_BASE_PATH . $f) && is_readable(MODX_BASE_PATH . $f));
@@ -146,15 +147,17 @@ 
      * @param bool|array $format
      * @return int|string
      */
-    public function fileSize($file, $format = false)
-    {
+    public function fileSize($file, $format = false)

+    {

         $out = 0;
-        if ($this->checkFile($file)) {
+        if ($this->checkFile($file)) {

             $out = filesize(MODX_BASE_PATH . $this->relativePath($file));
         }
         
-        if($format === true) $format = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-        if (is_array($format)) {
+        if($format === true) {

+            $format = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');

+        }

+        if (is_array($format)) {

             $size = $out > 0 ? floor(log($out, 1024)) : 0;
             $type = isset($format[$size]) ? ' '.$format[$size] : '';
             $out = number_format($out / pow(1024, $size), 2, '.', ',') . $type;
@@ -173,17 +176,17 @@ 
      * @param string $file Имя файла
      * @return null|string MIME тип файла
      */
-    public function takeFileMIME($file)
-    {
+    public function takeFileMIME($file)

+    {

         $out = null;
         $path = $this->relativePath($file);
-        if ($this->checkFile($path)) {
+        if ($this->checkFile($path)) {

             $fname = MODX_BASE_PATH . $path;
-            switch (true) {
+            switch (true) {

                 /** need fileinfo extension */
                 case (extension_loaded('fileinfo') && class_exists('\finfo')):
                     $fi = new \finfo(FILEINFO_MIME_TYPE);
-                    if ($fi) {
+                    if ($fi) {

                         $out = $fi->file($fname);
                     }
                     break;
@@ -195,10 +198,10 @@ 
                      * @see: http://www.php.net/manual/ru/function.finfo-open.php#112617
                      */
                     $fh = fopen($fname, 'rb');
-                    if ($fh) {
+                    if ($fh) {

                         $bytes6 = fread($fh, 6);
                         fclose($fh);
-                        switch (true) {
+                        switch (true) {

                             case ($bytes6 === false):
                                 break;
                             case (substr($bytes6, 0, 3) == "\xff\xd8\xff"):
@@ -226,12 +229,12 @@ 
      * @param int $perm
      * @return bool
      */
-    public function makeDir($path, $perm = 0755)
-    {
-        if (!$this->checkDir($path)) {
+    public function makeDir($path, $perm = 0755)

+    {

+        if (!$this->checkDir($path)) {

             $path = MODX_BASE_PATH . $this->relativePath($path);
             $flag = mkdir($path, $this->toOct($perm), true);
-        } else {
+        } else {

             $flag = true;
         }
 
@@ -245,13 +248,13 @@ 
      * @param string $to получатель
      * @return bool статус копирования
      */
-    public function copyFile($from, $to, $chmod = 0644)
-    {
+    public function copyFile($from, $to, $chmod = 0644)

+    {

         $flag = false;
         $from = MODX_BASE_PATH . $this->relativePath($from);
         $to = MODX_BASE_PATH . $this->relativePath($to);
         $dir = $this->takeFileDir($to);
-        if ($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)) {
+        if ($this->checkFile($from) && $this->makeDir($dir) && copy($from, $to)) {

             chmod($to, $this->toOct($chmod));
             $flag = true;
         }
@@ -266,13 +269,13 @@ 
      * @param string $to получатель
      * @return bool статус перемещения
      */
-    public function moveFile($from, $to, $chmod = 0644)
-    {
+    public function moveFile($from, $to, $chmod = 0644)

+    {

         $flag = false;
         $from = MODX_BASE_PATH . $this->relativePath($from);
         $to = MODX_BASE_PATH . $this->relativePath($to);
         $dir = $this->takeFileDir($to);
-        if ($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)) {
+        if ($this->checkFile($from) && $this->makeDir($dir) && rename($from, $to)) {

             chmod($to, $this->toOct($chmod));
             $flag = true;
         }
@@ -287,15 +290,15 @@ 
      * @param string $owner начальный путь который стоит вырезать
      * @return string относительный путь
      */
-    public function relativePath($path, $owner = null)
-    {
-        if (is_null($owner)) {
+    public function relativePath($path, $owner = null)

+    {

+        if (is_null($owner)) {

             $owner = MODX_BASE_PATH;
         }
         $path = str_replace('\\', '/', $path);
-        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {
+        if (!(empty($path) || !is_scalar($path)) && !preg_match("/^http(s)?:\/\/\w+/", $path)) {

             $path = trim(preg_replace("#^" . preg_quote($owner) . "#", '', $path), DIRECTORY_SEPARATOR);
-        } else {
+        } else {

             $path = '';
         }
 
@@ -314,8 +317,8 @@ 
      * @param  mixed $chmod строка или число в восьмеричной/десятичной системе счисления
      * @return int        число в восьмеричной системе счисления
      */
-    public function toOct($chmod)
-    {
+    public function toOct($chmod)

+    {

         return is_string($chmod) ? octdec($chmod) : $chmod;
     }
 
@@ -323,15 +326,15 @@ 
      * @param $dirPath
      * @return bool
      */
-    public function rmDir($dirPath)
-    {
+    public function rmDir($dirPath)

+    {

         $flag = false;
         $path = $_path = MODX_BASE_PATH . $this->relativePath($dirPath);
-        if ($this->checkDir($path)) {
+        if ($this->checkDir($path)) {

             $dirIterator = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);
             $dirRecursiveIterator = new \RecursiveIteratorIterator($dirIterator,
                 \RecursiveIteratorIterator::CHILD_FIRST);
-            foreach ($dirRecursiveIterator as $path) {
+            foreach ($dirRecursiveIterator as $path) {

                 $path->isDir() ? rmdir($path->getPathname()) : unlink($path->getPathname());
             }
             $flag = rmdir($_path);
@@ -344,10 +347,10 @@ 
      * @param $file
      * @return bool
      */
-    public function unlink($file)
-    {
+    public function unlink($file)

+    {

         $flag = false;
-        if ($this->checkFile($file)) {
+        if ($this->checkFile($file)) {

             $flag = unlink(MODX_BASE_PATH . $this->relativePath($file));
         }
 
@@ -358,10 +361,10 @@ 
      * @param $path
      * @return bool
      */
-    public function delete($path)
-    {
+    public function delete($path)

+    {

         $path = MODX_BASE_PATH . $this->relativePath($path);
-        switch (true) {
+        switch (true) {

             case $this->checkDir($path):
                 $flag = $this->rmDir($path);
                 break;
@@ -380,11 +383,11 @@ 
      * @param bool $full
      * @return string
      */
-    public function getInexistantFilename($file, $full = false)
-    {
+    public function getInexistantFilename($file, $full = false)

+    {

         $i = 1;
         $file = $mainFile = MODX_BASE_PATH . $this->relativePath($file);
-        while ($this->checkFile($file)) {
+        while ($this->checkFile($file)) {

             $i++;
             $out = $this->takeFileDir($file) . '/';
             $out .= $this->takeFileName($mainFile) . "({$i})." . $this->takeFileExt($file);

assets/lib/Helpers/Config.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     public function loadConfig($name)
     {
         //$this->debug->debug('Load json config: ' . $this->debug->dumpData($name), 'loadconfig', 2);
-        if (!is_scalar($name)) {
+        if ( ! is_scalar($name)) {
             $name = '';
         }
         $config = array();
@@ -117,10 +117,10 @@ 
      */
     public function loadArray($arr, $sep = ',')
     {
-        switch(gettype($arr)){
+        switch (gettype($arr)) {
             case 'string':
                 $out = jsonHelper::jsonDecode($arr, array('assoc' => true));
-                if (!is_array($out)) {
+                if ( ! is_array($out)) {
                     $out = $sep ? array_filter(explode($sep, $arr)) : array();
                 }
                 break;

Braces +26 added lines, -25 removed lines

@@ -7,15 +7,15 @@ 
 use jsonHelper;
 use APIhelpers;
 
-class Config
-{
+class Config

+{

     private $_cfg = array();
     protected $fs = null;
     protected $path = '';
 
-    public function __construct($cfg = array())
-    {
-        if ($cfg) {
+    public function __construct($cfg = array())

+    {

+        if ($cfg) {

             $this->setConfig($cfg);
         }
         $this->fs = FS::getInstance();
@@ -25,7 +25,8 @@ 
      * @param $path
      * @return $this
      */
-    public function setPath($path) {
+    public function setPath($path)

+    {

         $this->path = $path;
 
         return $this;
@@ -37,21 +38,21 @@ 
      * @param $name string имя конфига
      * @return array массив с настройками
      */
-    public function loadConfig($name)
-    {
+    public function loadConfig($name)

+    {

         //$this->debug->debug('Load json config: ' . $this->debug->dumpData($name), 'loadconfig', 2);
-        if (!is_scalar($name)) {
+        if (!is_scalar($name)) {

             $name = '';
         }
         $config = array();
         $name = explode(";", $name);
-        foreach ($name as $cfgName) {
+        foreach ($name as $cfgName) {

             $cfgName = explode(":", $cfgName, 2);
-            if (empty($cfgName[1])) {
+            if (empty($cfgName[1])) {

                 $cfgName[1] = 'custom';
             }
             $cfgName[1] = rtrim($cfgName[1], '/');
-            switch ($cfgName[1]) {
+            switch ($cfgName[1]) {

                 case 'custom':
                 case 'core':
                     $configFile = $this->fs->relativePath($this->path) . "/config/{$cfgName[1]}/{$cfgName[0]}.json";
@@ -61,7 +62,7 @@ 
                     break;
             }
 
-            if ($this->fs->checkFile($configFile)) {
+            if ($this->fs->checkFile($configFile)) {

                 $json = file_get_contents(MODX_BASE_PATH . $configFile);
                 $config = array_merge($config, jsonHelper::jsonDecode($json, array('assoc' => true), true));
             }
@@ -76,8 +77,8 @@ 
      * Получение всего списка настроек
      * @return array
      */
-    public function getConfig()
-    {
+    public function getConfig()

+    {

         return $this->_cfg;
     }
 
@@ -86,12 +87,12 @@ 
      * @param array $cfg массив настроек
      * @return int результат сохранения настроек
      */
-    public function setConfig($cfg, $overwrite = false)
-    {
-        if (is_array($cfg)) {
+    public function setConfig($cfg, $overwrite = false)

+    {

+        if (is_array($cfg)) {

             $this->_cfg = $overwrite ? $cfg : array_merge($this->_cfg, $cfg);
             $ret = count($this->_cfg);
-        } else {
+        } else {

             $ret = false;
         }
 
@@ -103,8 +104,8 @@ 
      * @param null $def
      * @return mixed
      */
-    public function getCFGDef($name, $def = null)
-    {
+    public function getCFGDef($name, $def = null)

+    {

         return APIhelpers::getkey($this->_cfg, $name, $def);
     }
 
@@ -115,12 +116,12 @@ 
      * @param string $sep
      * @return array|mixed|\xNop
      */
-    public function loadArray($arr, $sep = ',')
-    {
-        switch(gettype($arr)){
+    public function loadArray($arr, $sep = ',')

+    {

+        switch(gettype($arr)) {

             case 'string':
                 $out = jsonHelper::jsonDecode($arr, array('assoc' => true));
-                if (!is_array($out)) {
+                if (!is_array($out)) {

                     $out = $sep ? array_filter(explode($sep, $arr)) : array();
                 }
                 break;