AgelxNash / DocLister

assets/lib/APIHelpers.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -80,7 +80,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)
@@ -155,7 +155,7 @@ 
     }
 
     /**
-     * @param $data
+     * @param string $data
      * @return bool|false|string
      */
     public static function getEnv($data)

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, $validate = null)
-    {
+    public static function getkey($data, $key, $default = null, $validate = 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/SimpleTab/table.abstract.php

Doc Comments +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
     /**
      * @param $ids
      * @param $rid
-     * @param null $fire_events
+     * @param false|null $fire_events
      * @return $this
      */
     public function deleteAll($ids, $rid, $fire_events = false)

Braces +48 added lines, -46 removed lines

@@ -8,8 +8,8 @@ 
  * Class dataTable
  * @package SimpleTab
  */
-class dataTable extends \autoTable
-{
+class dataTable extends \autoTable

+{

     /**
      * @var array
      */
@@ -40,8 +40,8 @@ 
      * @param \DocumentParser $modx
      * @param bool $debug
      */
-    public function __construct($modx, $debug = false)
-    {
+    public function __construct($modx, $debug = false)

+    {

         parent::__construct($modx, $debug);
         $this->modx = $modx;
         $this->fs = \Helpers\FS::getInstance();
@@ -51,8 +51,8 @@ 
      * @param $ids
      * @param $rid
      */
-    protected function clearIndexes($ids, $rid)
-    {
+    protected function clearIndexes($ids, $rid)

+    {

         $ids = $this->cleanIDs($ids, ',', array(0));
         $ids = $this->sanitarIn($ids);
         $table = $this->makeTable($this->table);
@@ -70,8 +70,8 @@ 
      * @param $field
      * @return $this
      */
-    public function touch($field)
-    {
+    public function touch($field)

+    {

         $this->set($field, date('Y-m-d H:i:s', time() + $this->modx->config['server_offset_time']));
 
         return $this;
@@ -82,22 +82,22 @@ 
      * @param $dir
      * @param $rid
      */
-    public function place($ids, $dir, $rid)
-    {
+    public function place($ids, $dir, $rid)

+    {

         $table = $this->makeTable($this->table);
         $ids = $this->cleanIDs($ids, ',', array(0));
-        if (empty($ids) || is_scalar($ids)) {
+        if (empty($ids) || is_scalar($ids)) {

             return false;
         }
         $rows = $this->query("SELECT count(`{$this->pkName}`) FROM {$table} WHERE `{$this->rfName}`={$rid}");
         $index = $this->modx->db->getValue($rows);
         $cnt = count($ids);
         $ids = implode(',', $ids);
-        if ($dir == 'top') {
+        if ($dir == 'top') {

             $this->query("SET @index := " . ($index - $cnt - 1));
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := -1");
-        } else {
+        } else {

             $this->query("SET @index := -1");
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := " . ($cnt - 1));
@@ -112,26 +112,26 @@ 
      * @param $url
      * @param bool $cache
      */
-    public function deleteThumb($url, $cache = false)
-    {
+    public function deleteThumb($url, $cache = false)

+    {

         $url = $this->fs->relativePath($url);
-        if (empty($url)) {
+        if (empty($url)) {

             return;
         }
-        if ($this->fs->checkFile($url)) {
+        if ($this->fs->checkFile($url)) {

             unlink(MODX_BASE_PATH . $url);
         }
         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
-        if (!$iterator->valid()) {
+        if (!$iterator->valid()) {

             rmdir($dir);
         }
-        if ($cache) {
+        if ($cache) {

             return;
         }
         $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);
         $thumb = $thumbsCache . $url;
-        if ($this->fs->checkFile($thumb)) {
+        if ($this->fs->checkFile($thumb)) {

             $this->deleteThumb($thumb, true);
         }
     }
@@ -141,8 +141,8 @@ 
      * @param bool $fire_events
      * @return $this
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

         $out = parent::delete($ids, $fire_events);
         $this->query("ALTER TABLE {$this->makeTable($this->table)} AUTO_INCREMENT = 1");
 
@@ -155,8 +155,8 @@ 
      * @param null $fire_events
      * @return $this
      */
-    public function deleteAll($ids, $rid, $fire_events = false)
-    {
+    public function deleteAll($ids, $rid, $fire_events = false)

+    {

         $this->clearIndexes($ids, $rid);
 
         return $this->delete($ids, $fire_events);
@@ -165,8 +165,8 @@ 
     /**
      * @return array
      */
-    public function fieldNames()
-    {
+    public function fieldNames()

+    {

         $fields = array_keys($this->getDefaultFields());
         $fields[] = $this->fieldPKName();
 
@@ -177,8 +177,8 @@ 
      * @param  string $name
      * @return string
      */
-    public function stripName($name)
-    {
+    public function stripName($name)

+    {

 
         $filename = $this->fs->takeFileName($name);
         $ext = $this->fs->takeFileExt($name);
@@ -194,8 +194,8 @@ 
      * @param $orderDir
      * @return int|void
      */
-    public function reorder($source, $target, $point, $rid, $orderDir)
-    {
+    public function reorder($source, $target, $point, $rid, $orderDir)

+    {

         $rid = (int)$rid;
         $point = strtolower($point);
         $orderDir = strtolower($orderDir);
@@ -205,25 +205,25 @@ 
         $table = $this->makeTable($this->table);
         $rows = 0;
         /* more refactoring  needed */
-        if ($targetIndex < $sourceIndex) {
-            if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
+        if ($targetIndex < $sourceIndex) {

+            if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
                     "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
-            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
+            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
                     "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
             }
-        } else {
-            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
+        } else {

+            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
                     "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
-            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
+            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
                     "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}", $table,
@@ -240,9 +240,9 @@ 
      * @param $options
      * @return bool
      */
-    public function makeThumb($folder, $url, $options)
-    {
-        if (empty($url)) {
+    public function makeThumb($folder, $url, $options)

+    {

+        if (empty($url)) {

             return false;
         }
         $thumb = new \Helpers\PHPThumb();
@@ -250,9 +250,9 @@ 
         $outputFile = MODX_BASE_PATH . $this->fs->relativePath($folder) . '/' . $this->fs->relativePath($url);
         $dir = $this->fs->takeFileDir($outputFile);
         $this->fs->makeDir($dir, $this->modx->config['new_folder_permissions']);
-        if ($thumb->create($inputFile, $outputFile, $options)) {
+        if ($thumb->create($inputFile, $outputFile, $options)) {

             return true;
-        } else {
+        } else {

             $this->modx->logEvent(0, 3, $thumb->debugMessages, __NAMESPACE__);
 
             return false;
@@ -262,16 +262,18 @@ 
     /**
      * @return array
      */
-    public function getParams()
-    {
+    public function getParams()

+    {

         return $this->params;
     }
 
     /**
      * @param array $params
      */
-    public function setParams($params = array())
-    {
-        if (is_array($params)) $this->params = $params;
+    public function setParams($params = array())

+    {

+        if (is_array($params)) {

+            $this->params = $params;

+        }

     }
 }

assets/snippets/DocLister/lib/DLphx.class.php

Doc Comments +20 added lines, -20 removed lines

@@ -40,7 +40,7 @@ 
 
     /**
      * DLphx constructor.
-     * @param int|bool|string $debug
+     * @param integer $debug
      * @param int $maxpass
      */
     public function __construct($debug = false, $maxpass = 50)
@@ -76,7 +76,7 @@ 
     // Parser: Preparation, cleaning and checkup
     /**
      * @param string $template
-     * @return mixed|string
+     * @return string
      */
     public function Parse($template = '')
     {
@@ -234,7 +234,7 @@ 
     // Parser: modifier detection and eXtended processing if needed
     /**
      * @param $input
-     * @param $modifiers
+     * @param string $modifiers
      * @return mixed|null|string
      */
     public function Filter($input, $modifiers)
@@ -589,8 +589,8 @@ 
     // positive userid = manager, negative integer = webuser
     /**
      * @param $userid
-     * @param $field
-     * @return mixed
+     * @param string $field
+     * @return string
      */
     public function ModUser($userid, $field)
     {
@@ -651,7 +651,7 @@ 
 
     // Returns the value of a PHx/MODx placeholder.
     /**
-     * @param $name
+     * @param string $name
      * @return mixed|string
      */
     public function getPHxVariable($name)
@@ -669,8 +669,8 @@ 
 
     // Sets a placeholder variable which can only be access by PHx
     /**
-     * @param $name
-     * @param $value
+     * @param string $name
+     * @param string $value
      */
     public function setPHxVariable($name, $value)
     {
@@ -681,9 +681,9 @@ 
 
     //mbstring
     /**
-     * @param $str
-     * @param $s
-     * @param null $l
+     * @param string $str
+     * @param integer $s
+     * @param integer $l
      * @return string
      */
     public function substr($str, $s, $l = null)
@@ -696,7 +696,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return int
      */
     public function strlen($str)
@@ -709,7 +709,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function strtolower($str)
@@ -722,7 +722,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function strtoupper($str)
@@ -735,7 +735,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function ucfirst($str)
@@ -748,7 +748,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function lcfirst($str)
@@ -761,7 +761,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function ucwords($str)
@@ -774,7 +774,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function strrev($str)
@@ -785,7 +785,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return string
      */
     public function str_shuffle($str)
@@ -797,7 +797,7 @@ 
     }
 
     /**
-     * @param $str
+     * @param string $str
      * @return int
      */
     public function str_word_count($str)

Braces +119 added lines, -117 removed lines

@@ -15,8 +15,8 @@ 
 /**
  * Class DLphx
  */
-class DLphx
-{
+class DLphx

+{

     public $placeholders = array();
     public $name = 'PHx';
     public $version = '2.2.0';
@@ -43,8 +43,8 @@ 
      * @param int|bool|string $debug
      * @param int $maxpass
      */
-    public function __construct($debug = false, $maxpass = 50)
-    {
+    public function __construct($debug = false, $maxpass = 50)

+    {

         global $modx;
 
         $this->user["mgrid"] = isset($_SESSION['mgrInternalKey']) ? intval($_SESSION['mgrInternalKey']) : 0;
@@ -56,14 +56,14 @@ 
         $this->maxPasses = ($maxpass != '') ? $maxpass : 50;
 
         $modx->setPlaceholder("phx", "&_PHX_INTERNAL_&");
-        if (function_exists('mb_internal_encoding')) {
+        if (function_exists('mb_internal_encoding')) {

             mb_internal_encoding($modx->config['modx_charset']);
         }
     }
 
     // Plugin event hook for MODx
-    public function OnParseDocument()
-    {
+    public function OnParseDocument()

+    {

         global $modx;
         // Get document output from MODx
         $template = $modx->documentOutput;
@@ -78,11 +78,11 @@ 
      * @param string $template
      * @return mixed|string
      */
-    public function Parse($template = '')
-    {
+    public function Parse($template = '')

+    {

         global $modx;
         // If we already reached max passes don't get at it again.
-        if ($this->curPass == $this->maxPasses) {
+        if ($this->curPass == $this->maxPasses) {

             return $template;
         }
         // Set template pre-process hash
@@ -93,7 +93,7 @@ 
         $template = $this->ParseValues($template);
         // clean up unused placeholders that have modifiers attached (MODx can't clean them)
         preg_match_all('~(?:=`[^`@]*?)(\[\+([^:\+\[\]]+)([^\[\]]*?)\+\])~s', $template, $matches);
-        if ($matches[0]) {
+        if ($matches[0]) {

             $template = str_replace($matches[1], '', $template);
             $this->Log("Cleaning unsolved tags: \n" . implode("\n", $matches[2]));
         }
@@ -102,11 +102,11 @@ 
         // Set template post-process hash
         $et = md5($template);
         // If template has changed, parse it once more...
-        if ($st != $et) {
+        if ($st != $et) {

             $template = $this->Parse($template);
         }
         // Write an event log if debugging is enabled and there is something to log
-        if ($this->debug && $this->debugLog) {
+        if ($this->debug && $this->debugLog) {

             $modx->logEvent($this->curPass, 1, $this->createEventLog(), $this->name . ' ' . $this->version);
             $this->debugLog = false;
         }
@@ -120,8 +120,8 @@ 
      * @param string $template
      * @return mixed|string
      */
-    public function ParseValues($template = '')
-    {
+    public function ParseValues($template = '')

+    {

         global $modx;
 
         $this->curPass = $this->curPass + 1;
@@ -130,12 +130,12 @@ 
         $this->LogPass();
 
         // MODX Chunks
-        if (preg_match_all('~(?<!(?:then|else)=`){{([^:\+{}]+)([^{}]*?)}}~s', $template, $matches)) {
+        if (preg_match_all('~(?<!(?:then|else)=`){{([^:\+{}]+)([^{}]*?)}}~s', $template, $matches)) {

             $this->Log('MODX Chunks -> Merging all chunk tags');
             $count = count($matches[0]);
             $var_search = array();
             $var_replace = array();
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $var_search[] = $matches[0][$i];
                 $input = $matches[1][$i];
                 $this->Log('MODX Chunk: ' . $input);
@@ -147,13 +147,13 @@ 
 
         // MODx Snippets
         //if ( preg_match_all('~\[(\[|!)([^\[]*?)(!|\])\]~s',$template, $matches)) {
-        if (preg_match_all('~(?<!(?:then|else)=`)\[(\[)([^\[]*?)(\])\]~s', $template, $matches)) {
+        if (preg_match_all('~(?<!(?:then|else)=`)\[(\[)([^\[]*?)(\])\]~s', $template, $matches)) {

             $count = count($matches[0]);
             $var_search = array();
             $var_replace = array();
 
             // for each detected snippet
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $snippet = $matches[2][$i]; // snippet call
                 $this->Log("MODx Snippet -> " . $snippet);
 
@@ -169,7 +169,7 @@ 
         }
 
         // PHx / MODx Tags
-        if (preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $template, $matches)) {
+        if (preg_match_all('~\[(\+|\*|\()([^:\+\[\]]+)([^\[\]]*?)(\1|\))\]~s', $template, $matches)) {

 
             //$matches[0] // Complete string that's need to be replaced
             //$matches[1] // Type
@@ -180,11 +180,11 @@ 
             $count = count($matches[0]);
             $var_search = array();
             $var_replace = array();
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $input = $matches[2][$i];
                 $modifiers = $matches[3][$i];
                 $var_search[] = $matches[0][$i];
-                switch ($matches[1][$i]) {
+                switch ($matches[1][$i]) {

                     // Document / Template Variable eXtended
                     case "*":
                         $this->Log("MODx TV/DV: " . $input);
@@ -203,10 +203,10 @@ 
                         // Check if placeholder is set
                         if (!array_key_exists($input, $this->placeholders) && !array_key_exists($input,
                                 $modx->placeholders)
-                        ) {
+                        ) {

                             // not set so try again later.
                             $input = '';
-                        } else {
+                        } else {

                             // is set, get value and run filter
                             $input = $this->getPHxVariable($input);
                         }
@@ -220,11 +220,11 @@ 
         $et = md5($template); // Post-process template hash
 
         // Log an event if this was the maximum pass
-        if ($this->curPass == $this->maxPasses) {
+        if ($this->curPass == $this->maxPasses) {

             $this->Log("Max passes reached. infinite loop protection so exiting.\n If you need the extra passes set the max passes to the highest count of nested tags in your template.");
         }
         // If this pass is not at maximum passes and the template hash is not the same, get at it again.
-        if (($this->curPass < $this->maxPasses) && ($st != $et)) {
+        if (($this->curPass < $this->maxPasses) && ($st != $et)) {

             $template = $this->ParseValues($template);
         }
 
@@ -237,23 +237,23 @@ 
      * @param $modifiers
      * @return mixed|null|string
      */
-    public function Filter($input, $modifiers)
-    {
+    public function Filter($input, $modifiers)

+    {

         global $modx;
         $output = $input;
         $this->Log("  |--- Input = '" . $output . "'");
-        if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {
+        if (preg_match_all('~:([^:=]+)(?:=`(.*?)`(?=:[^:=]+|$))?~s', $modifiers, $matches)) {

             $modifier_cmd = $matches[1]; // modifier command
             $modifier_value = $matches[2]; // modifier value
             $count = count($modifier_cmd);
             $condition = array();
-            for ($i = 0; $i < $count; $i++) {
+            for ($i = 0; $i < $count; $i++) {

                 $output = trim($output);
                 $this->Log("  |--- Modifier = '" . $modifier_cmd[$i] . "'");
-                if ($modifier_value[$i] != '') {
+                if ($modifier_value[$i] != '') {

                     $this->Log("  |--- Options = '" . $modifier_value[$i] . "'");
                 }
-                switch ($modifier_cmd[$i]) {
+                switch ($modifier_cmd[$i]) {

                     #####  Conditional Modifiers
                     case "input":
                     case "if":
@@ -295,7 +295,7 @@ 
                     case "ir":
                     case "memberof":
                     case "mo": // Is Member Of  (same as inrole but this one can be stringed as a conditional)
-                        if ($output == "&_PHX_INTERNAL_&") {
+                        if ($output == "&_PHX_INTERNAL_&") {

                             $output = $this->user["id"];
                         }
                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
@@ -310,23 +310,23 @@ 
                     case "show":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval(eval("return (" . $conditional . ");"));
-                        if (!$isvalid) {
+                        if (!$isvalid) {

                             $output = null;
                         }
                         break;
                     case "then":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval(eval("return (" . $conditional . ");"));
-                        if ($isvalid) {
+                        if ($isvalid) {

                             $output = $modifier_value[$i];
-                        } else {
+                        } else {

                             $output = null;
                         }
                         break;
                     case "else":
                         $conditional = implode(' ', $condition);
                         $isvalid = intval(eval("return (" . $conditional . ");"));
-                        if (!$isvalid) {
+                        if (!$isvalid) {

                             $output = $modifier_value[$i];
                         }
                         break;
@@ -334,7 +334,7 @@ 
                         $raw = explode("&", $modifier_value[$i]);
                         $map = array();
                         $count = count($raw);
-                        for ($m = 0; $m < $count; $m++) {
+                        for ($m = 0; $m < $count; $m++) {

                             $mi = explode("=", $raw[$m]);
                             $map[$mi[0]] = $mi[1];
                         }
@@ -415,13 +415,13 @@ 
                         $output = eval("return " . $filter . ";");
                         break;
                     case "isnotempty":
-                        if (!empty($output)) {
+                        if (!empty($output)) {

                             $output = $modifier_value[$i];
                         }
                         break;
                     case "isempty":
                     case "ifempty":
-                        if (empty($output)) {
+                        if (empty($output)) {

                             $output = $modifier_value[$i];
                         }
                         break;
@@ -433,12 +433,12 @@ 
                         break;
                     case "set":
                         $c = $i + 1;
-                        if ($count > $c && $modifier_cmd[$c] == "value") {
+                        if ($count > $c && $modifier_cmd[$c] == "value") {

                             $output = preg_replace("~([^a-zA-Z0-9])~", "", $modifier_value[$i]);
                         }
                         break;
                     case "value":
-                        if ($i > 0 && $modifier_cmd[$i - 1] == "set") {
+                        if ($i > 0 && $modifier_cmd[$i - 1] == "set") {

                             $modx->SetPlaceholder("phx." . $output, $modifier_value[$i]);
                         }
                         $output = null;
@@ -447,13 +447,13 @@ 
                         $output = md5($output);
                         break;
                     case "userinfo":
-                        if ($output == "&_PHX_INTERNAL_&") {
+                        if ($output == "&_PHX_INTERNAL_&") {

                             $output = $this->user["id"];
                         }
                         $output = $this->ModUser($output, $modifier_value[$i]);
                         break;
                     case "inrole": // deprecated
-                        if ($output == "&_PHX_INTERNAL_&") {
+                        if ($output == "&_PHX_INTERNAL_&") {

                             $output = $this->user["id"];
                         }
                         $grps = ($this->strlen($modifier_value[$i]) > 0) ? explode(",", $modifier_value[$i]) : array();
@@ -465,19 +465,21 @@ 
                         $snippet = '';
                         // modified by Anton Kuzmin (23.06.2010) //
                         $snippetName = 'phx:' . $modifier_cmd[$i];
-                        if (isset($modx->snippetCache[$snippetName])) {
+                        if (isset($modx->snippetCache[$snippetName])) {

                             $snippet = $modx->snippetCache[$snippetName];
-                        } else { // not in cache so let's check the db
+                        } else {

+// not in cache so let's check the db
                             $sql = "SELECT snippet FROM " . $modx->getFullTableName("site_snippets") . " WHERE " . $modx->getFullTableName("site_snippets") . ".name='" . $modx->db->escape($snippetName) . "';";
                             $result = $modx->dbQuery($sql);
-                            if ($modx->recordCount($result) == 1) {
+                            if ($modx->recordCount($result) == 1) {

                                 $row = $modx->fetchRow($result);
                                 $snippet = $modx->snippetCache[$row['name']] = $row['snippet'];
                                 $this->Log("  |--- DB -> Custom Modifier");
-                            } else {
-                                if ($modx->recordCount($result) == 0) { // If snippet not found, look in the modifiers folder
+                            } else {

+                                if ($modx->recordCount($result) == 0) {

+// If snippet not found, look in the modifiers folder
                                     $filename = $modx->config['rb_base_dir'] . 'plugins/phx/modifiers/' . $modifier_cmd[$i] . '.phx.php';
-                                    if (@file_exists($filename)) {
+                                    if (@file_exists($filename)) {

                                         $file_contents = @file_get_contents($filename);
                                         $file_contents = str_replace('<' . '?php', '', $file_contents);
                                         $file_contents = str_replace('?' . '>', '', $file_contents);
@@ -485,7 +487,7 @@ 
                                         $snippet = $modx->snippetCache[$snippetName] = $file_contents;
                                         $modx->snippetCache[$snippetName . 'Props'] = '';
                                         $this->Log("  |--- File ($filename) -> Custom Modifier");
-                                    } else {
+                                    } else {

                                         $this->Log("  |--- PHX Error:  {$modifier_cmd[$i]} could not be found");
                                     }
                                 }
@@ -494,19 +496,19 @@ 
                         $cm = $snippet;
                         // end //
 
-                        if (!empty($cm)) {
+                        if (!empty($cm)) {

                             ob_start();
                             $options = $modifier_value[$i];
                             $custom = eval($cm);
                             $msg = ob_get_contents();
                             $output = $msg . $custom;
                             ob_end_clean();
-                        } else {
+                        } else {

                             $output = '';
                         }
                         break;
                 }
-                if (count($condition)) {
+                if (count($condition)) {

                     $this->Log("  |--- Condition = '" . $condition[count($condition) - 1] . "'");
                 }
                 $this->Log("  |--- Output = '" . $output . "'");
@@ -520,9 +522,9 @@ 
     /**
      * @return string
      */
-    public function createEventLog()
-    {
-        if (!empty($this->console)) {
+    public function createEventLog()

+    {

+        if (!empty($this->console)) {

             $console = implode("\n", $this->console);
             $this->console = array();
 
@@ -535,8 +537,8 @@ 
      * @param $string
      * @return array|mixed|string
      */
-    public function LogClean($string)
-    {
+    public function LogClean($string)

+    {

         $string = preg_replace("/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", $string);
         $string = APIHelpers::sanitarTag($string);
 
@@ -547,9 +549,9 @@ 
     /**
      * @param $string
      */
-    public function Log($string)
-    {
-        if ($this->debug) {
+    public function Log($string)

+    {

+        if ($this->debug) {

             $this->debugLog = true;
             $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",
                     time()) . "] " . $this->LogClean($string);
@@ -560,9 +562,9 @@ 
     /**
      * @param $string
      */
-    public function LogSnippet($string)
-    {
-        if ($this->debug) {
+    public function LogSnippet($string)

+    {

+        if ($this->debug) {

             $this->debugLog = true;
             $this->console[] = (count($this->console) + 1 - $this->curPass) . " [" . strftime("%H:%M:%S",
                     time()) . "] " . "  |--- Returns: <div style='margin: 10px;'>" . $this->LogClean($string) . "</div>";
@@ -570,8 +572,8 @@ 
     }
 
     // Log pass
-    public function LogPass()
-    {
+    public function LogPass()

+    {

         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Pass " . $this->curPass . "</div>";
     }
 
@@ -579,8 +581,8 @@ 
     /**
      * @param $string
      */
-    public function LogSource($string)
-    {
+    public function LogSource($string)

+    {

         $this->console[] = "<div style='margin: 2px;margin-top: 5px;border-bottom: 1px solid black;'>Source:</div>" . $this->LogClean($string);
     }
 
@@ -592,17 +594,17 @@ 
      * @param $field
      * @return mixed
      */
-    public function ModUser($userid, $field)
-    {
+    public function ModUser($userid, $field)

+    {

         global $modx;
-        if (!array_key_exists($userid, $this->cache["ui"])) {
-            if (intval($userid) < 0) {
+        if (!array_key_exists($userid, $this->cache["ui"])) {

+            if (intval($userid) < 0) {

                 $user = $modx->getWebUserInfo(-($userid));
-            } else {
+            } else {

                 $user = $modx->getUserInfo($userid);
             }
             $this->cache["ui"][$userid] = $user;
-        } else {
+        } else {

             $user = $this->cache["ui"][$userid];
         }
 
@@ -615,32 +617,32 @@ 
      * @param array $groupNames
      * @return bool
      */
-    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())
-    {
+    public function isMemberOfWebGroupByUserId($userid = 0, $groupNames = array())

+    {

         global $modx;
 
         // if $groupNames is not an array return false
-        if (!is_array($groupNames)) {
+        if (!is_array($groupNames)) {

             return false;
         }
 
         // if the user id is a negative number make it positive
-        if (intval($userid) < 0) {
+        if (intval($userid) < 0) {

             $userid = -($userid);
         }
 
         // Creates an array with all webgroups the user id is in
-        if (!array_key_exists($userid, $this->cache["mo"])) {
+        if (!array_key_exists($userid, $this->cache["mo"])) {

             $tbl = $modx->getFullTableName("webgroup_names");
             $tbl2 = $modx->getFullTableName("web_groups");
             $sql = "SELECT wgn.name FROM $tbl wgn INNER JOIN $tbl2 wg ON wg.webgroup=wgn.id AND wg.webuser='" . $userid . "'";
             $this->cache["mo"][$userid] = $grpNames = $modx->db->getColumn("name", $sql);
-        } else {
+        } else {

             $grpNames = $this->cache["mo"][$userid];
         }
         // Check if a supplied group matches a webgroup from the array we just created
-        foreach ($groupNames as $k => $v) {
-            if (in_array(trim($v), $grpNames)) {
+        foreach ($groupNames as $k => $v) {

+            if (in_array(trim($v), $grpNames)) {

                 return true;
             }
         }
@@ -654,14 +656,14 @@ 
      * @param $name
      * @return mixed|string
      */
-    public function getPHxVariable($name)
-    {
+    public function getPHxVariable($name)

+    {

         global $modx;
         // Check if this variable is created by PHx
-        if (array_key_exists($name, $this->placeholders)) {
+        if (array_key_exists($name, $this->placeholders)) {

             // Return the value from PHx
             return $this->placeholders[$name];
-        } else {
+        } else {

             // Return the value from MODx
             return $modx->getPlaceholder($name);
         }
@@ -672,9 +674,9 @@ 
      * @param $name
      * @param $value
      */
-    public function setPHxVariable($name, $value)
-    {
-        if ($name != "phx") {
+    public function setPHxVariable($name, $value)

+    {

+        if ($name != "phx") {

             $this->placeholders[$name] = $value;
         }
     }
@@ -686,9 +688,9 @@ 
      * @param null $l
      * @return string
      */
-    public function substr($str, $s, $l = null)
-    {
-        if (function_exists('mb_substr')) {
+    public function substr($str, $s, $l = null)

+    {

+        if (function_exists('mb_substr')) {

             return mb_substr($str, $s, $l);
         }
 
@@ -699,9 +701,9 @@ 
      * @param $str
      * @return int
      */
-    public function strlen($str)
-    {
-        if (function_exists('mb_strlen')) {
+    public function strlen($str)

+    {

+        if (function_exists('mb_strlen')) {

             return mb_strlen($str);
         }
 
@@ -712,9 +714,9 @@ 
      * @param $str
      * @return string
      */
-    public function strtolower($str)
-    {
-        if (function_exists('mb_strtolower')) {
+    public function strtolower($str)

+    {

+        if (function_exists('mb_strtolower')) {

             return mb_strtolower($str);
         }
 
@@ -725,9 +727,9 @@ 
      * @param $str
      * @return string
      */
-    public function strtoupper($str)
-    {
-        if (function_exists('mb_strtoupper')) {
+    public function strtoupper($str)

+    {

+        if (function_exists('mb_strtoupper')) {

             return mb_strtoupper($str);
         }
 
@@ -738,9 +740,9 @@ 
      * @param $str
      * @return string
      */
-    public function ucfirst($str)
-    {
-        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {
+    public function ucfirst($str)

+    {

+        if (function_exists('mb_strtoupper') && function_exists('mb_substr') && function_exists('mb_strlen')) {

             return mb_strtoupper(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
         }
 
@@ -751,9 +753,9 @@ 
      * @param $str
      * @return string
      */
-    public function lcfirst($str)
-    {
-        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {
+    public function lcfirst($str)

+    {

+        if (function_exists('mb_strtolower') && function_exists('mb_substr') && function_exists('mb_strlen')) {

             return mb_strtolower(mb_substr($str, 0, 1)) . mb_substr($str, 1, mb_strlen($str));
         }
 
@@ -764,9 +766,9 @@ 
      * @param $str
      * @return string
      */
-    public function ucwords($str)
-    {
-        if (function_exists('mb_convert_case')) {
+    public function ucwords($str)

+    {

+        if (function_exists('mb_convert_case')) {

             return mb_convert_case($str, MB_CASE_TITLE);
         }
 
@@ -777,8 +779,8 @@ 
      * @param $str
      * @return string
      */
-    public function strrev($str)
-    {
+    public function strrev($str)

+    {

         preg_match_all('/./us', $str, $ar);
 
         return implode(array_reverse($ar[0]));
@@ -788,8 +790,8 @@ 
      * @param $str
      * @return string
      */
-    public function str_shuffle($str)
-    {
+    public function str_shuffle($str)

+    {

         preg_match_all('/./us', $str, $ar);
         shuffle($ar[0]);
 
@@ -800,8 +802,8 @@ 
      * @param $str
      * @return int
      */
-    public function str_word_count($str)
-    {
+    public function str_word_count($str)

+    {

         return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
 }

assets/lib/class.summary.php

Spacing +5 added lines, -5 removed lines

@@ -86,7 +86,7 @@ 
         if (($scheme == 1 && ($this->_useCut === true || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && $this->_useCut !== true)) {
             $this->_cfg['content'] .= '…'; //...
         } else {
-            if ($scheme && ($this->_useCut !== true|| $scheme != 2)) {
+            if ($scheme && ($this->_useCut !== true || $scheme != 2)) {
                 $this->_cfg['content'] .= '.';
             }
         }
@@ -115,13 +115,13 @@ 
                         $this->_cfg['content'] = APIhelpers::sanitarTag($this->_cfg['content']);
                         break;
                     case 'chars':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if ( ! (isset($process[1]) && $process[1] > 0)) {
                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = APIhelpers::mb_trim_word($this->_cfg['content'], $process[1]);
                         break;
                     case 'len':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if ( ! (isset($process[1]) && $process[1] > 0)) {
                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = $this->summary($this->_cfg['content'], $process[1], 50, true,
@@ -208,7 +208,7 @@ 
                 } else {
                     $next_char = "";
                 }
-                if (!$quotes_on) {
+                if ( ! $quotes_on) {
                     // Check if it's a tag
                     // On a "<" add 3 if it's an opening tag (like <a href...)
                     // or add only 1 if it's an ending tag (like </a>)
@@ -348,7 +348,7 @@ 
                 if (mb_strstr($tag, ' ', 'UTF-8')) {
                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
-                if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {
+                if ( ! mb_stristr($tag, 'br', 'UTF-8') && ! mb_stristr($tag, 'img', 'UTF-8') && ! empty ($tag)) {
                     $endTags .= '</' . $tag . '>';
                 }
             }

Braces +69 added lines, -69 removed lines

@@ -17,8 +17,8 @@ 
 /**
  * Class SummaryText
  */
-class SummaryText
-{
+class SummaryText

+{

     /**
      * @var array
      */
@@ -45,8 +45,8 @@ 
      * @param $action
      * @param null $break
      */
-    public function __construct($text, $action, $break = null)
-    {
+    public function __construct($text, $action, $break = null)

+    {

         $this->_cfg['content'] = is_scalar($text) ? $text : '';
         $this->_cfg['original'] = $this->_cfg['content'];
         $this->_cfg['summary'] = is_scalar($action) ? $action : '';
@@ -57,12 +57,12 @@ 
      * @param $cut
      * @return bool
      */
-    public function setCut($cut)
-    {
-        if (is_scalar($cut) && $cut != '') {
+    public function setCut($cut)

+    {

+        if (is_scalar($cut) && $cut != '') {

             $this->_cfg['cut'] = $cut;
             $flag = true;
-        } else {
+        } else {

             $flag = false;
         }
 
@@ -72,8 +72,8 @@ 
     /**
      * @return mixed
      */
-    public function getCut()
-    {
+    public function getCut()

+    {

         return \APIHelpers::getkey($this->_cfg, 'cut', '<cut/>');
     }
 
@@ -81,12 +81,12 @@ 
      * @param int $scheme
      * @return mixed
      */
-    protected function dotted($scheme = 0)
-    {
-        if (($scheme == 1 && ($this->_useCut === true || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && $this->_useCut !== true)) {
+    protected function dotted($scheme = 0)

+    {

+        if (($scheme == 1 && ($this->_useCut === true || $this->_useSubstr)) || ($scheme == 2 && $this->_useSubstr && $this->_useCut !== true)) {

             $this->_cfg['content'] .= '&hellip;'; //...
-        } else {
-            if ($scheme && ($this->_useCut !== true|| $scheme != 2)) {
+        } else {

+            if ($scheme && ($this->_useCut !== true|| $scheme != 2)) {

                 $this->_cfg['content'] .= '.';
             }
         }
@@ -98,16 +98,16 @@ 
      * @param int $dotted
      * @return mixed
      */
-    public function run($dotted = 0)
-    {
+    public function run($dotted = 0)

+    {

         $this->_dotted = $dotted;
-        if (isset($this->_cfg['content'], $this->_cfg['summary']) && $this->_cfg['summary'] != '' && $this->_cfg['content'] != '') {
+        if (isset($this->_cfg['content'], $this->_cfg['summary']) && $this->_cfg['summary'] != '' && $this->_cfg['content'] != '') {

             $param = explode(",", $this->_cfg['summary']);
             $this->_cfg['content'] = $this->beforeCut($this->_cfg['content'], $this->getCut());
-            foreach ($param as $doing) {
+            foreach ($param as $doing) {

 
                 $process = explode(":", $doing);
-                switch ($process[0]) {
+                switch ($process[0]) {

                     case 'notags':
                         $this->_cfg['content'] = strip_tags($this->_cfg['content']);
                         break;
@@ -115,13 +115,13 @@ 
                         $this->_cfg['content'] = APIhelpers::sanitarTag($this->_cfg['content']);
                         break;
                     case 'chars':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if (!(isset($process[1]) && $process[1] > 0)) {

                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = APIhelpers::mb_trim_word($this->_cfg['content'], $process[1]);
                         break;
                     case 'len':
-                        if (!(isset($process[1]) && $process[1] > 0)) {
+                        if (!(isset($process[1]) && $process[1] > 0)) {

                             $process[1] = 200;
                         }
                         $this->_cfg['content'] = $this->summary($this->_cfg['content'], $process[1], 50, true,
@@ -139,15 +139,15 @@ 
      * @param string $splitter
      * @return array|mixed
      */
-    protected function beforeCut($resource, $splitter = '')
-    {
-        if ($splitter !== '') {
+    protected function beforeCut($resource, $splitter = '')

+    {

+        if ($splitter !== '') {

             $summary = str_replace('<p>' . $splitter . '</p>', $splitter,
                 $resource); // For TinyMCE or if it isn't wrapped inside paragraph tags
             $summary = explode($splitter, $summary, 2);
             $this->_useCut = isset($summary[1]);
             $summary = $summary['0'];
-        } else {
+        } else {

             $summary = $resource;
         }
 
@@ -162,18 +162,18 @@ 
      * @param string $splitter
      * @return array|mixed|string
      */
-    protected function summary($resource, $truncLen, $truncOffset, $truncChars, $splitter = '')
-    {
-        if (isset($this->_useCut) && $splitter != '' && mb_strstr($resource, $splitter, 'UTF-8')) {
+    protected function summary($resource, $truncLen, $truncOffset, $truncChars, $splitter = '')

+    {

+        if (isset($this->_useCut) && $splitter != '' && mb_strstr($resource, $splitter, 'UTF-8')) {

             $summary = $this->beforeCut($resource, $splitter);
-        } else {
-            if ($this->_useCut !== true && (mb_strlen($resource, 'UTF-8') > $truncLen)) {
+        } else {

+            if ($this->_useCut !== true && (mb_strlen($resource, 'UTF-8') > $truncLen)) {

 
                 $summary = $this->html_substr($resource, $truncLen, $truncOffset, $truncChars);
-                if ($resource != $summary) {
+                if ($resource != $summary) {

                     $this->_useSubstr = true;
                 }
-            } else {
+            } else {

                 $summary = $resource;
             }
         }
@@ -194,60 +194,60 @@ 
      * @param bool $truncChars
      * @return string
      */
-    protected function html_substr($posttext, $minimum_length = 200, $length_offset = 100, $truncChars = false)
-    {
+    protected function html_substr($posttext, $minimum_length = 200, $length_offset = 100, $truncChars = false)

+    {

         $tag_counter = 0;
         $quotes_on = false;
-        if (mb_strlen($posttext) > $minimum_length && $truncChars !== true) {
+        if (mb_strlen($posttext) > $minimum_length && $truncChars !== true) {

             $c = 0;
             $len = mb_strlen($posttext, 'UTF-8');
-            for ($i = 0; $i < $len; $i++) {
+            for ($i = 0; $i < $len; $i++) {

                 $current_char = mb_substr($posttext, $i, 1, 'UTF-8');
-                if ($i < mb_strlen($posttext, 'UTF-8') - 1) {
+                if ($i < mb_strlen($posttext, 'UTF-8') - 1) {

                     $next_char = mb_substr($posttext, $i + 1, 1, 'UTF-8');
-                } else {
+                } else {

                     $next_char = "";
                 }
-                if (!$quotes_on) {
+                if (!$quotes_on) {

                     // Check if it's a tag
                     // On a "<" add 3 if it's an opening tag (like <a href...)
                     // or add only 1 if it's an ending tag (like </a>)
-                    if ($current_char == '<') {
-                        if ($next_char == '/') {
+                    if ($current_char == '<') {

+                        if ($next_char == '/') {

                             $tag_counter += 1;
-                        } else {
+                        } else {

                             $tag_counter += 3;
                         }
                     }
                     // Slash signifies an ending (like </a> or ... />)
                     // substract 2
-                    if ($current_char == '/' && $tag_counter <> 0) {
+                    if ($current_char == '/' && $tag_counter <> 0) {

                         $tag_counter -= 2;
                     }
                     // On a ">" substract 1
-                    if ($current_char == '>') {
+                    if ($current_char == '>') {

                         $tag_counter -= 1;
                     }
                     // If quotes are encountered, start ignoring the tags
                     // (for directory slashes)
-                    if ($current_char == '"') {
+                    if ($current_char == '"') {

                         $quotes_on = true;
                     }
-                } else {
+                } else {

                     // IF quotes are encountered again, turn it back off
-                    if ($current_char == '"') {
+                    if ($current_char == '"') {

                         $quotes_on = false;
                     }
                 }
 
                 // Count only the chars outside html tags
-                if ($tag_counter == 2 || $tag_counter == 0) {
+                if ($tag_counter == 2 || $tag_counter == 0) {

                     $c++;
                 }
 
                 // Check if the counter has reached the minimum length yet,
                 // then wait for the tag_counter to become 0, and chop the string there
-                if ($c > $minimum_length - $length_offset && $tag_counter == 0) {
+                if ($c > $minimum_length - $length_offset && $tag_counter == 0) {

                     $posttext = mb_substr($posttext, 0, $i + 1, 'UTF-8');
 
                     return $posttext;
@@ -267,20 +267,20 @@ 
      * @param string $break
      * @return string
      */
-    protected function textTrunc($string, $limit, $break = ". ")
-    {
+    protected function textTrunc($string, $limit, $break = ". ")

+    {

         // Original PHP code from The Art of Web: www.the-art-of-web.com
 
         // return with no change if string is shorter than $limit
-        if (mb_strlen($string, 'UTF-8') < $limit) {
+        if (mb_strlen($string, 'UTF-8') < $limit) {

             return $string;
         }
 
         $string = mb_substr($string, 0, $limit, 'UTF-8');
-        if (false !== ($breakpoint = mb_strrpos($string, $break, 'UTF-8'))) {
+        if (false !== ($breakpoint = mb_strrpos($string, $break, 'UTF-8'))) {

             $string = mb_substr($string, 0, $breakpoint + 1, 'UTF-8');
-        } else {
-            if ($break != ' ') {
+        } else {

+            if ($break != ' ') {

                 $string = $this->textTrunc($string, $limit, " ");
             }
         }
@@ -292,10 +292,10 @@ 
      * @param $str
      * @return mixed
      */
-    protected function rTriming($str)
-    {
+    protected function rTriming($str)

+    {

         $str = preg_replace('/[\r\n]++/', ' ', $str);
-        if ($this->_useCut !== true || $this->_dotted != 2) {
+        if ($this->_useCut !== true || $this->_dotted != 2) {

             $str = preg_replace("/(([\.,\-:!?;\s])|(&\w+;))+$/ui", "", $str);
         }
 
@@ -308,8 +308,8 @@ 
      * @param $text
      * @return string
      */
-    private function closeTags($text)
-    {
+    private function closeTags($text)

+    {

         $openPattern = "/<([^\/].*?)>/";
         $closePattern = "/<\/(.*?)>/";
         $endTags = '';
@@ -319,15 +319,15 @@ 
 
         $c = 0;
         $loopCounter = count($closeTags[1]); //used to prevent an infinite loop if the html is malformed
-        while ($c < count($closeTags[1]) && $loopCounter) {
+        while ($c < count($closeTags[1]) && $loopCounter) {

             $i = 0;
-            while ($i < count($openTags[1])) {
+            while ($i < count($openTags[1])) {

                 $tag = trim($openTags[1][$i]);
 
-                if (mb_strstr($tag, ' ', 'UTF-8')) {
+                if (mb_strstr($tag, ' ', 'UTF-8')) {

                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
-                if ($tag == $closeTags[1][$c]) {
+                if ($tag == $closeTags[1][$c]) {

                     $openTags[1][$i] = '';
                     $c++;
                     break;
@@ -339,16 +339,16 @@ 
 
         $results = $openTags[1];
 
-        if (is_array($results)) {
+        if (is_array($results)) {

             $results = array_reverse($results);
 
-            foreach ($results as $tag) {
+            foreach ($results as $tag) {

                 $tag = trim($tag);
 
-                if (mb_strstr($tag, ' ', 'UTF-8')) {
+                if (mb_strstr($tag, ' ', 'UTF-8')) {

                     $tag = mb_substr($tag, 0, strpos($tag, ' '), 'UTF-8');
                 }
-                if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {
+                if (!mb_stristr($tag, 'br', 'UTF-8') && !mb_stristr($tag, 'img', 'UTF-8') && !empty ($tag)) {

                     $endTags .= '</' . $tag . '>';
                 }
             }

assets/lib/MODxAPI/MODx.php

Braces +217 added lines, -211 removed lines

@@ -7,15 +7,15 @@ 
 /**
  * Class MODxAPIhelpers
  */
-class MODxAPIhelpers
-{
+class MODxAPIhelpers

+{

     /**
      * @param $email
      * @param bool $dns
      * @return false|string
      */
-    public function emailValidate($email, $dns = true)
-    {
+    public function emailValidate($email, $dns = true)

+    {

         return \APIhelpers::emailValidate($email, $dns);
     }
 
@@ -24,8 +24,8 @@ 
      * @param string $data
      * @return string
      */
-    public function genPass($len, $data = '')
-    {
+    public function genPass($len, $data = '')

+    {

         return \APIhelpers::genPass($len, $data);
     }
 
@@ -33,8 +33,8 @@ 
      * @param string $out
      * @return string
      */
-    public function getUserIP($out = '127.0.0.1')
-    {
+    public function getUserIP($out = '127.0.0.1')

+    {

         return \APIhelpers::getUserIP($out);
     }
 
@@ -42,8 +42,8 @@ 
      * @param $data
      * @return array|mixed|string
      */
-    public function sanitarTag($data)
-    {
+    public function sanitarTag($data)

+    {

         return \APIhelpers::sanitarTag($data);
     }
 
@@ -54,8 +54,8 @@ 
      * @param array $mixArray
      * @return bool
      */
-    public function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())
-    {
+    public function checkString($value, $minLen = 1, $alph = array(), $mixArray = array())

+    {

         return \APIhelpers::checkString($value, $minLen, $alph, $mixArray);
     }
 }
@@ -63,8 +63,8 @@ 
 /**
  * Class MODxAPI
  */
-abstract class MODxAPI extends MODxAPIhelpers
-{
+abstract class MODxAPI extends MODxAPIhelpers

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -148,10 +148,10 @@ 
      * @param bool $debug
      * @throws Exception
      */
-    public function __construct(DocumentParser $modx, $debug = false)
-    {
+    public function __construct(DocumentParser $modx, $debug = false)

+    {

         $this->modx = $modx;
-        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
+        if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {

             throw new Exception('Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.');
         }
 
@@ -163,8 +163,8 @@ 
      * @param boolean $flag
      * @return $this
      */
-    public function setDebug($flag)
-    {
+    public function setDebug($flag)

+    {

         $this->_debug = (bool)$flag;
 
         return $this;
@@ -173,16 +173,16 @@ 
     /**
      * @return bool
      */
-    public function getDebug()
-    {
+    public function getDebug()

+    {

         return $this->_debug;
     }
 
     /**
      * @return array
      */
-    public function getDefaultFields()
-    {
+    public function getDefaultFields()

+    {

         return $this->default_field;
     }
 
@@ -190,14 +190,14 @@ 
      * @param $value
      * @return int|mixed|string
      */
-    protected function getTime($value)
-    {
+    protected function getTime($value)

+    {

         $value = trim($value);
-        if (!empty($value)) {
-            if (!is_numeric($value)) {
+        if (!empty($value)) {

+            if (!is_numeric($value)) {

                 $value = (int)strtotime($value);
             }
-            if (!empty($value)) {
+            if (!empty($value)) {

                 $value += $this->modxConfig('server_offset_time');
             }
         }
@@ -210,8 +210,8 @@ 
      * @param null $default
      * @return mixed
      */
-    final public function modxConfig($name, $default = null)
-    {
+    final public function modxConfig($name, $default = null)

+    {

         return APIHelpers::getkey($this->modx->config, $name, $default);
     }
 
@@ -219,9 +219,9 @@ 
      * @param $q
      * @return $this
      */
-    public function addQuery($q)
-    {
-        if (is_scalar($q) && !empty($q)) {
+    public function addQuery($q)

+    {

+        if (is_scalar($q) && !empty($q)) {

             $this->_query[] = $q;
         }
 
@@ -231,8 +231,8 @@ 
     /**
      * @return array
      */
-    public function getQueryList()
-    {
+    public function getQueryList()

+    {

         return $this->_query;
     }
 
@@ -240,9 +240,9 @@ 
      * @param $SQL
      * @return mixed
      */
-    final public function query($SQL)
-    {
-        if ($this->getDebug()) {
+    final public function query($SQL)

+    {

+        if ($this->getDebug()) {

             $this->addQuery($SQL);
         }
 
@@ -253,11 +253,11 @@ 
      * @param $value
      * @return string|void
      */
-    final public function escape($value)
-    {
-        if (!is_scalar($value)) {
+    final public function escape($value)

+    {

+        if (!is_scalar($value)) {

             $value = '';
-        } else {
+        } else {

             $value = $this->modx->db->escape($value);
         }
 
@@ -270,9 +270,9 @@ 
      * @param bool $flag
      * @return $this
      */
-    final public function invokeEvent($name, $data = array(), $flag = false)
-    {
-        if ((bool)$flag === true) {
+    final public function invokeEvent($name, $data = array(), $flag = false)

+    {

+        if ((bool)$flag === true) {

             $this->modx->invokeEvent($name, $data);
         }
 
@@ -285,8 +285,8 @@ 
      * @param boolean $flag
      * @return array|bool
      */
-    final public function getInvokeEventResult($name, $data = array(), $flag = null)
-    {
+    final public function getInvokeEventResult($name, $data = array(), $flag = null)

+    {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
 
         return $flag ? $this->modx->invokeEvent($name, $data) : false;
@@ -295,8 +295,8 @@ 
     /**
      * @return $this
      */
-    final public function clearLog()
-    {
+    final public function clearLog()

+    {

         $this->log = array();
 
         return $this;
@@ -305,8 +305,8 @@ 
     /**
      * @return array
      */
-    final public function getLog()
-    {
+    final public function getLog()

+    {

         return $this->log;
     }
 
@@ -314,10 +314,10 @@ 
      * @param bool $flush
      * @return $this
      */
-    final public function list_log($flush = false)
-    {
+    final public function list_log($flush = false)

+    {

         echo '<pre>' . print_r(APIHelpers::sanitarTag($this->log), true) . '</pre>';
-        if ($flush) {
+        if ($flush) {

             $this->clearLog();
         }
 
@@ -328,10 +328,10 @@ 
      * @param bool $full
      * @return string
      */
-    final public function getCachePath($full = true)
-    {
+    final public function getCachePath($full = true)

+    {

         $path = $this->modx->getCachePath();
-        if ($full) {
+        if ($full) {

             $path = MODX_BASE_PATH . substr($path, strlen(MODX_BASE_URL));
         }
 
@@ -342,10 +342,10 @@ 
      * @param boolean $fire_events
      * @param bool $custom
      */
-    final public function clearCache($fire_events = false, $custom = false)
-    {
+    final public function clearCache($fire_events = false, $custom = false)

+    {

         $IDs = array();
-        if ($custom === false) {
+        if ($custom === false) {

             $this->modx->clearCache();
             include_once(MODX_MANAGER_PATH . 'processors/cache_sync.class.processor.php');
             $sync = new synccache();
@@ -353,22 +353,22 @@ 
             $sync->setCachepath($path);
             $sync->setReport(false);
             $sync->emptyCache();
-        } else {
-            if (is_scalar($custom)) {
+        } else {

+            if (is_scalar($custom)) {

                 $custom = array($custom);
             }
-            switch ($this->modx->config['cache_type']) {
+            switch ($this->modx->config['cache_type']) {

                 case 2:
                     $cacheFile = "_*.pageCache.php";
                     break;
                 default:
                     $cacheFile = ".pageCache.php";
             }
-            if (is_array($custom)) {
-                foreach ($custom as $id) {
+            if (is_array($custom)) {

+                foreach ($custom as $id) {

                     $tmp = glob(MODX_BASE_PATH . "assets/cache/docid_" . $id . $cacheFile);
-                    foreach ($tmp as $file) {
-                        if (is_readable($file)) {
+                    foreach ($tmp as $file) {

+                        if (is_readable($file)) {

                             unlink($file);
                         }
                         $IDs[] = $id;
@@ -384,9 +384,9 @@ 
      * @param integer $id
      * @return MODxAPI
      */
-    public function switchObject($id)
-    {
-        switch (true) {
+    public function switchObject($id)

+    {

+        switch (true) {

             //Если загружен другой объект - не тот, с которым мы хотим временно поработать
             case ($this->getID() != $id && $id):
                 $obj = clone $this;
@@ -408,8 +408,8 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function useIgnore($flag = true)
-    {
+    public function useIgnore($flag = true)

+    {

         $this->ignoreError = $flag ? 'IGNORE' : '';
 
         return $this;
@@ -418,8 +418,8 @@ 
     /**
      * @return bool
      */
-    public function hasIgnore()
-    {
+    public function hasIgnore()

+    {

         return (bool)$this->ignoreError;
     }
 
@@ -428,9 +428,9 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+    public function set($key, $value)

+    {

+        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {

             $this->field[$key] = $value;
         }
 
@@ -440,8 +440,8 @@ 
     /**
      * @return null|int
      */
-    final public function getID()
-    {
+    final public function getID()

+    {

         return $this->id;
     }
 
@@ -449,8 +449,8 @@ 
      * @param $key
      * @return mixed
      */
-    public function get($key)
-    {
+    public function get($key)

+    {

         return APIHelpers::getkey($this->field, $key, null);
     }
 
@@ -458,10 +458,10 @@ 
      * @param $data
      * @return $this
      */
-    public function fromArray($data)
-    {
-        if (is_array($data)) {
-            foreach ($data as $key => $value) {
+    public function fromArray($data)

+    {

+        if (is_array($data)) {

+            foreach ($data as $key => $value) {

                 $this->set($key, $value);
             }
         }
@@ -477,22 +477,22 @@ 
      * @return $this
      * @throws Exception
      */
-    final protected function Uset($key, $id = '')
-    {
-        if (!isset($this->field[$key])) {
+    final protected function Uset($key, $id = '')

+    {

+        if (!isset($this->field[$key])) {

             $tmp = "`{$key}`=''";
             $this->log[] = "{$key} is empty";
-        } else {
-            if ($this->issetField($key) && is_scalar($this->field[$key])) {
+        } else {

+            if ($this->issetField($key) && is_scalar($this->field[$key])) {

                 $tmp = "`{$key}`='{$this->escape($this->field[$key])}'";
-            } else {
+            } else {

                 throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
             }
         }
-        if (!empty($tmp) && $this->isChanged($key)) {
-            if ($id == '') {
+        if (!empty($tmp) && $this->isChanged($key)) {

+            if ($id == '') {

                 $this->set[] = $tmp;
-            } else {
+            } else {

                 $this->set[$id][] = $tmp;
             }
         }
@@ -506,8 +506,11 @@ 
      * @param array $data
      * @return $this
      */
-    public function store($data = array()) {
-        if (is_array($data)) $this->store = $data;
+    public function store($data = array())

+    {

+        if (is_array($data)) {

+            $this->store = $data;

+        }

 
         return $this;
     }
@@ -518,10 +521,11 @@ 
      * @param string $key
      * @return MODxAPI
      */
-    public function rollback($key = '') {
-        if (!empty($key) && isset($this->store[$key])) {
+    public function rollback($key = '')

+    {

+        if (!empty($key) && isset($this->store[$key])) {

             $this->set($key,$this->store[$key]);
-        } else {
+        } else {

             $this->fromArray($this->store);
         }
 
@@ -534,7 +538,8 @@ 
      * @param $key
      * @return bool
      */
-    public function isChanged($key) {
+    public function isChanged($key)

+    {

         $flag = !isset($this->store[$key]) || (isset($this->store[$key]) && $this->store[$key] != $this->field[$key]);
 
         return $flag;
@@ -547,23 +552,24 @@ 
      * @return array
      * @throws Exception
      */
-    final public function cleanIDs($IDs, $sep = ',', $ignore = array())
-    {
+    final public function cleanIDs($IDs, $sep = ',', $ignore = array())

+    {

         $out = array();
-        if (!is_array($IDs)) {
-            if (is_scalar($IDs)) {
+        if (!is_array($IDs)) {

+            if (is_scalar($IDs)) {

                 $IDs = explode($sep, $IDs);
-            } else {
+            } else {

                 $IDs = array();
                 throw new Exception('Invalid IDs list <pre>' . print_r($IDs, 1) . '</pre>');
             }
         }
-        foreach ($IDs as $item) {
+        foreach ($IDs as $item) {

             $item = trim($item);
-            if (is_scalar($item) && (int)$item >= 0) { //Fix 0xfffffffff
-                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {
+            if (is_scalar($item) && (int)$item >= 0) {

+//Fix 0xfffffffff
+                if (!empty($ignore) && in_array((int)$item, $ignore, true)) {

                     $this->log[] = 'Ignore id ' . (int)$item;
-                } else {
+                } else {

                     $out[] = (int)$item;
                 }
             }
@@ -579,26 +585,26 @@ 
      * @return $this
      * @throws Exception
      */
-    final public function fromJson($data, $callback = null)
-    {
-        if (is_scalar($data) && !empty($data)) {
+    final public function fromJson($data, $callback = null)

+    {

+        if (is_scalar($data) && !empty($data)) {

             $json = json_decode($data);
-        } else {
+        } else {

             throw new Exception("json is not string with json data");
         }
 
-        if ($this->jsonError($json)) {
-            if (isset($callback) && is_callable($callback)) {
+        if ($this->jsonError($json)) {

+            if (isset($callback) && is_callable($callback)) {

                 call_user_func_array($callback, array($json));
-            } else {
-                if (isset($callback)) {
+            } else {

+                if (isset($callback)) {

                     throw new Exception("Can't call callback JSON unpack <pre>" . print_r($callback, 1) . "</pre>");
                 }
-                foreach ($json as $key => $val) {
+                foreach ($json as $key => $val) {

                     $this->set($key, $val);
                 }
             }
-        } else {
+        } else {

             throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
         }
 
@@ -610,19 +616,19 @@ 
      * @return string
      * @throws Exception
      */
-    final public function toJson($callback = null)
-    {
+    final public function toJson($callback = null)

+    {

         $data = $this->toArray();
-        if (isset($callback) && is_callable($callback)) {
+        if (isset($callback) && is_callable($callback)) {

             $data = call_user_func_array($callback, array($data));
-        } else {
-            if (isset($callback)) {
+        } else {

+            if (isset($callback)) {

                 throw new Exception("Can't call callback JSON pre pack <pre>" . print_r($callback, 1) . "</pre>");
             }
         }
         $json = json_encode($data);
 
-        if ($this->jsonError($data)) {
+        if ($this->jsonError($data)) {

             throw new Exception('Error from JSON decode: <pre>' . print_r($data, 1) . '</pre>');
         }
 
@@ -633,10 +639,10 @@ 
      * @param $data
      * @return bool
      */
-    final protected function jsonError($data)
-    {
+    final protected function jsonError($data)

+    {

         $flag = false;
-        if (json_last_error() === JSON_ERROR_NONE && is_object($data) && $data instanceof stdClass) {
+        if (json_last_error() === JSON_ERROR_NONE && is_object($data) && $data instanceof stdClass) {

             $flag = true;
         }
 
@@ -649,25 +655,25 @@ 
      * @param string $sep
      * @return array
      */
-    public function toArray($prefix = '', $suffix = '', $sep = '_')
-    {
+    public function toArray($prefix = '', $suffix = '', $sep = '_')

+    {

         $tpl = '';
         $plh = '[+key+]';
-        if ($prefix !== '') {
+        if ($prefix !== '') {

             $tpl = $prefix . $sep;
         }
         $tpl .= $plh;
-        if ($suffix !== '') {
+        if ($suffix !== '') {

             $tpl .= $sep . $suffix;
         }
         $out = array();
         $fields = $this->field;
         $fields[$this->fieldPKName()] = $this->getID();
-        if ($tpl != $plh) {
-            foreach ($fields as $key => $value) {
+        if ($tpl != $plh) {

+            foreach ($fields as $key => $value) {

                 $out[str_replace($plh, $key, $tpl)] = $value;
             }
-        } else {
+        } else {

             $out = $fields;
         }
 
@@ -677,8 +683,8 @@ 
     /**
      * @return string
      */
-    final public function fieldPKName()
-    {
+    final public function fieldPKName()

+    {

         return $this->pkName;
     }
 
@@ -686,8 +692,8 @@ 
      * @param $table
      * @return mixed|string
      */
-    final public function makeTable($table)
-    {
+    final public function makeTable($table)

+    {

         //Без использования APIHelpers::getkey(). Иначе getFullTableName будет всегда выполняться
         return (isset($this->_table[$table])) ? $this->_table[$table] : $this->modx->getFullTableName($table);
     }
@@ -697,14 +703,14 @@ 
      * @param string $sep
      * @return array|string
      */
-    final public function sanitarIn($data, $sep = ',')
-    {
-        if (!is_array($data)) {
+    final public function sanitarIn($data, $sep = ',')

+    {

+        if (!is_array($data)) {

             $data = explode($sep, $data);
         }
         $out = array();
-        foreach ($data as $item) {
-            if ($item !== '') {
+        foreach ($data as $item) {

+            if ($item !== '') {

                 $out[] = $this->escape($item);
             }
         }
@@ -719,34 +725,34 @@ 
      * @param string $PK
      * @return bool
      */
-    public function checkUnique($table, $field, $PK = 'id')
-    {
-        if (is_array($field)) {
+    public function checkUnique($table, $field, $PK = 'id')

+    {

+        if (is_array($field)) {

             $where = array();
-            foreach ($field as $_field) {
+            foreach ($field as $_field) {

                 $val = $this->get($_field);
-                if ($val != '') {
+                if ($val != '') {

                     $where[] = "`" . $this->escape($_field) . "` = '" . $this->escape($val) . "'";
                 }
             }
             $where = implode(' AND ', $where);
-        } else {
+        } else {

             $where = '';
             $val = $this->get($field);
-            if ($val != '') {
+            if ($val != '') {

                 $where = "`" . $this->escape($field) . "` = '" . $this->escape($val) . "'";
             }
         }
 
-        if ($where != '') {
+        if ($where != '') {

             $sql = $this->query("SELECT `" . $this->escape($PK) . "` FROM " . $this->makeTable($table) . " WHERE " . $where);
             $id = $this->modx->db->getValue($sql);
-            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {
+            if (is_null($id) || (!$this->newDoc && $id == $this->getID())) {

                 $flag = true;
-            } else {
+            } else {

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

             $flag = false;
         }
 
@@ -757,8 +763,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         $this->close();
         $this->fromArray($data);
 
@@ -769,8 +775,8 @@ 
      * @param $id
      * @return $this
      */
-    public function copy($id)
-    {
+    public function copy($id)

+    {

         $this->edit($id)->id = 0;
         $this->newDoc = true;
         $this->store = array();
@@ -781,8 +787,8 @@ 
     /**
      *
      */
-    public function close()
-    {
+    public function close()

+    {

         $this->newDoc = true;
         $this->id = null;
         $this->field = array();
@@ -795,8 +801,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (is_scalar($key) && array_key_exists($key, $this->default_field));
     }
 
@@ -824,8 +830,8 @@ 
      * @param $data
      * @return array|mixed|string
      */
-    final public function sanitarTag($data)
-    {
+    final public function sanitarTag($data)

+    {

         return parent::sanitarTag($this->modx->stripTags($data));
     }
 
@@ -834,17 +840,17 @@ 
      * @param bool $dmi3yy
      * @return bool
      */
-    final protected function checkVersion($version, $dmi3yy = true)
-    {
+    final protected function checkVersion($version, $dmi3yy = true)

+    {

         $flag = false;
         $currentVer = $this->modx->getVersionData('version');
-        if (is_array($currentVer)) {
+        if (is_array($currentVer)) {

             $currentVer = APIHelpers::getkey($currentVer, 'version', '');
         }
         $tmp = substr($currentVer, 0, strlen($version));
-        if (version_compare($tmp, $version, '>=')) {
+        if (version_compare($tmp, $version, '>=')) {

             $flag = true;
-            if ($dmi3yy) {
+            if ($dmi3yy) {

                 $flag = (boolean)preg_match('/^' . $tmp . '(.*)\-d/', $currentVer);
             }
         }
@@ -856,10 +862,10 @@ 
      * @param string $name
      * @return bool|mixed
      */
-    protected function eraseField($name)
-    {
+    protected function eraseField($name)

+    {

         $flag = false;
-        if (array_key_exists($name, $this->field)) {
+        if (array_key_exists($name, $this->field)) {

             $flag = $this->field[$name];
             unset($this->field[$name]);
         }
@@ -872,8 +878,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isJsonField($field)
-    {
+    public function isJsonField($field)

+    {

         return (is_scalar($field) && in_array($field, $this->jsonFields));
     }
 
@@ -882,9 +888,9 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsDecode($field)
-    {
-        if (is_scalar($field)) {
+    public function markAsDecode($field)

+    {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, false);
         }
 
@@ -896,9 +902,9 @@ 
      * @param  string $field имя поля
      * @return $this
      */
-    public function markAsEncode($field)
-    {
-        if (is_scalar($field)) {
+    public function markAsEncode($field)

+    {

+        if (is_scalar($field)) {

             $this->_decodedFields->set($field, true);
         }
 
@@ -909,10 +915,10 @@ 
      * Пометить все поля как запакованные
      * @return $this
      */
-    public function markAllEncode()
-    {
+    public function markAllEncode()

+    {

         $this->_decodedFields->clear();
-        foreach ($this->jsonFields as $field) {
+        foreach ($this->jsonFields as $field) {

             $this->markAsEncode($field);
         }
 
@@ -923,10 +929,10 @@ 
      * Пометить все поля как распакованные
      * @return $this
      */
-    public function markAllDecode()
-    {
+    public function markAllDecode()

+    {

         $this->_decodedFields->clear();
-        foreach ($this->jsonFields as $field) {
+        foreach ($this->jsonFields as $field) {

             $this->markAsDecode($field);
         }
 
@@ -937,9 +943,9 @@ 
      * Получить список не запакованных полей
      * @return DLCollection
      */
-    public function getNoEncodeFields()
-    {
-        return $this->_decodedFields->filter(function ($value) {
+    public function getNoEncodeFields()

+    {

+        return $this->_decodedFields->filter(function ($value) {

             return ($value === false);
         });
     }
@@ -948,9 +954,9 @@ 
      * Получить список не распакованных полей
      * @return DLCollection
      */
-    public function getNoDecodeFields()
-    {
-        return $this->_decodedFields->filter(function ($value) {
+    public function getNoDecodeFields()

+    {

+        return $this->_decodedFields->filter(function ($value) {

             return ($value === true);
         });
     }
@@ -960,8 +966,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isDecodableField($field)
-    {
+    public function isDecodableField($field)

+    {

         $data = $this->get($field);
 
         /**
@@ -976,8 +982,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isEncodableField($field)
-    {
+    public function isEncodableField($field)

+    {

         /**
          * Если поле было распаковано ранее и еще не упаковано
          */
@@ -990,14 +996,14 @@ 
      * @param  bool $store обновить распакованное поле
      * @return array ассоциативный массив с данными из json строки
      */
-    public function decodeField($field, $store = false)
-    {
+    public function decodeField($field, $store = false)

+    {

         $out = array();
-        if ($this->isDecodableField($field)) {
+        if ($this->isDecodableField($field)) {

             $data = $this->get($field);
             $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsDecode($field);
         }
@@ -1009,9 +1015,9 @@ 
      * Декодирование всех json полей
      * @return $this
      */
-    protected function decodeFields()
-    {
-        foreach ($this->getNoDecodeFields() as $field => $flag) {
+    protected function decodeFields()

+    {

+        foreach ($this->getNoDecodeFields() as $field => $flag) {

             $this->decodeField($field, true);
         }
 
@@ -1024,14 +1030,14 @@ 
      * @param  bool $store обновить запакованное поле
      * @return string|null json строка
      */
-    public function encodeField($field, $store = false)
-    {
+    public function encodeField($field, $store = false)

+    {

         $out = null;
-        if ($this->isEncodableField($field)) {
+        if ($this->isEncodableField($field)) {

             $data = $this->get($field);
             $out = json_encode($data);
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsEncode($field);
         }
@@ -1043,9 +1049,9 @@ 
      * Запаковка всех json полей
      * @return $this
      */
-    protected function encodeFields()
-    {
-        foreach ($this->getNoEncodeFields() as $field => $flag) {
+    protected function encodeFields()

+    {

+        foreach ($this->getNoEncodeFields() as $field => $flag) {

             $this->encodeField($field, true);
         }
 

assets/lib/MODxAPI/modResource.php

Spacing +25 added lines, -25 removed lines

@@ -188,7 +188,7 @@ 
         $tpl = $this->get('template');
         $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
         foreach ($tvTPL as $item) {
-            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
+            if (isset($this->tvid[$item]) && ! array_key_exists($this->tvid[$item], $out)) {
                 $out[$this->tvid[$item]] = $this->get($this->tvid[$item]);
             }
         }
@@ -226,7 +226,7 @@ 
     {
         $out = null;
         $id = (int)$this->getID();
-        if (!empty($id)) {
+        if ( ! empty($id)) {
             $out = $this->modx->makeUrl($id);
         }
 
@@ -320,7 +320,7 @@ 
      */
     public function set($key, $value)
     {
-        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && ! empty($key)) {
             switch ($key) {
                 case 'parent':
                     $value = (int)$value;
@@ -393,12 +393,12 @@ 
     {
         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);
         $value = (int)$value;
-        if (!empty($value)) {
+        if ( ! empty($value)) {
             $by = $this->findUserBy($value);
-            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {
+            $exists = $this->managerUsers->exists(function($key, Helpers\Collection $val) use ($by, $value) {
                 return ($val->containsKey($by) && $val->get($by) === (string)$value);
             });
-            if (!$exists) {
+            if ( ! $exists) {
                 $value = 0;
             }
         }
@@ -504,8 +504,8 @@ 
 
         if (
             $this->field['parent'] == 0 &&
-            !$this->modxConfig('udperms_allowroot') &&
-            !($uid && isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1)
+            ! $this->modxConfig('udperms_allowroot') &&
+            ! ($uid && isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1)
         ) {
             $this->log['rootForbidden'] = 'Only Administrators can create documents in the root folder because udperms_allowroot setting is off';
 
@@ -524,7 +524,7 @@ 
         $fld = $this->encodeFields()->toArray(null, null, null, false);
         foreach ($this->default_field as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 if ($tmp == $value) {
                     switch ($key) {
                         case 'cacheable':
@@ -556,7 +556,7 @@ 
                     $this->field[$key] = $parent;
                     $this->Uset($key);
                     break;
-                case ($key == 'alias_visible' && !$this->checkVersion('1.0.10', true)):
+                case ($key == 'alias_visible' && ! $this->checkVersion('1.0.10', true)):
                     $this->eraseField('alias_visible');
                     break;
                 default:
@@ -565,7 +565,7 @@ 
             unset($fld[$key]);
         }
 
-        if (!empty($this->set)) {
+        if ( ! empty($this->set)) {
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
             } else {
@@ -585,7 +585,7 @@ 
 
         $_deleteTVs = $_insertTVs = array();
         foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {
+            if (empty($this->tv[$key]) || ! $this->isChanged($key) || ! $this->belongsToTemplate($this->tv[$key])) {
                 continue;
             } elseif ($value === '') {
                 $_deleteTVs[] = $this->tv[$key];
@@ -594,7 +594,7 @@ 
             }
         }
 
-        if (!empty($_insertTVs)) {
+        if ( ! empty($_insertTVs)) {
             $values = array();
             foreach ($_insertTVs as $id => $value) {
                 $values[] = "({$this->id}, {$id}, '{$value}')";
@@ -604,17 +604,17 @@ 
     `value` = VALUES(`value`)");
         }
 
-        if (!empty($_deleteTVs)) {
+        if ( ! empty($_deleteTVs)) {
             $ids = implode(',', $_deleteTVs);
             $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` IN ({$ids})");
         }
 
-        if (!isset($this->mode)) {
+        if ( ! isset($this->mode)) {
             $this->mode = $this->newDoc ? "new" : "upd";
             $this->newDoc = false;
         }
 
-        if (!empty($this->groupIds)) $this->setDocumentGroups($this->id, $this->groupIds);
+        if ( ! empty($this->groupIds)) $this->setDocumentGroups($this->id, $this->groupIds);
         $this->invokeEvent('OnDocFormSave', array(
             'mode'   => $this->mode,
             'id'     => isset($this->id) ? $this->id : '',
@@ -697,7 +697,7 @@ 
         $_ids = $this->cleanIDs($ids, ',');
         if (is_array($_ids) && $_ids != array()) {
             $id = $this->sanitarIn($_ids);
-            if (!empty($id)) {
+            if ( ! empty($id)) {
                 $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} where `parent` IN ({$id})");
                 $id = $this->modx->db->getColumn('id', $q);
                 if ($depth > 0 || $depth === true) {
@@ -762,12 +762,12 @@ 
         $alias = strtolower($alias);
         if ($this->modxConfig('friendly_urls')) {
             $_alias = $this->escape($alias);
-            if ((!$this->modxConfig('allow_duplicate_alias') && !$this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {
+            if (( ! $this->modxConfig('allow_duplicate_alias') && ! $this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {
                 $flag = $this->modx->db->getValue($this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `alias`='{$_alias}' AND `parent`={$this->get('parent')} LIMIT 1"));
             } else {
                 $flag = $this->modx->db->getValue($this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `alias`='{$_alias}' LIMIT 1"));
             }
-            if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {
+            if (($flag && $this->newDoc) || ( ! $this->newDoc && $flag && $this->id != $flag)) {
                 $suffix = substr($alias, -2);
                 if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
                     $suffix = (int)$tmp[1] + 1;
@@ -843,7 +843,7 @@ 
      */
     protected function loadTVDefault(array $tvId = array())
     {
-        if (is_array($tvId) && !empty($tvId)) {
+        if (is_array($tvId) && ! empty($tvId)) {
             $tbl_site_tmplvars = $this->makeTable('site_tmplvars');
             $fields = 'id,name,default_text as value,display,display_params,type';
             $implodeTvId = implode(',', $tvId);
@@ -865,11 +865,11 @@ 
      */
     public function setTemplate($tpl)
     {
-        if (!is_numeric($tpl) || $tpl != (int)$tpl) {
+        if ( ! is_numeric($tpl) || $tpl != (int)$tpl) {
             if (is_scalar($tpl)) {
                 $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '" . $this->escape($tpl) . "'";
                 $rs = $this->query($sql);
-                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {
+                if ( ! $rs || $this->modx->db->getRecordCount($rs) <= 0) {
                     throw new Exception("Template {$tpl} is not exists");
                 }
                 $tpl = $this->modx->db->getValue($rs);
@@ -930,7 +930,7 @@ 
         $template = $this->modxConfig('default_template');
         switch ($this->modxConfig('auto_template_logic')) {
             case 'sibling':
-                if (!$parent) {
+                if ( ! $parent) {
                     $site_start = $this->modxConfig('site_start');
                     $where = "sc.isfolder=0 AND sc.id!={$site_start}";
                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
@@ -1082,7 +1082,7 @@ 
      */
     public function setDocumentGroups($docId = 0, $groupIds = array())
     {
-        if (!is_array($groupIds)) return $this;
+        if ( ! is_array($groupIds)) return $this;
         if ($this->newDoc && $docId == 0) {
             $this->groupIds = $groupIds;
         } else {
@@ -1091,7 +1091,7 @@ 
                 foreach ($groupIds as $gid) {
                     $this->query("REPLACE INTO {$this->makeTable('document_groups')} (`document_group`, `document`) VALUES ('{$gid}', '{$id}')");
                 }
-                if (!$this->newDoc) {
+                if ( ! $this->newDoc) {
                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('document_groups')} WHERE `document`={$id} AND `document_group` NOT IN ({$groupIds})");
                 }

Braces +193 added lines, -185 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * Class modResource
  */
-class modResource extends MODxAPI
-{
+class modResource extends MODxAPI

+{

     /**
      * @var string
      */
@@ -157,8 +157,8 @@ 
      * @param DocumentParser $modx
      * @param bool $debug
      */
-    public function __construct($modx, $debug = false)
-    {
+    public function __construct($modx, $debug = false)

+    {

         parent::__construct($modx, $debug);
         $this->get_TV();
         $uTable = $this->makeTable("manager_users");
@@ -171,8 +171,8 @@ 
     /**
      * @return array
      */
-    public function toArrayMain()
-    {
+    public function toArrayMain()

+    {

         $out = array_intersect_key(parent::toArray(), $this->default_field);
 
         return $out;
@@ -182,18 +182,18 @@ 
      * @param bool $render
      * @return array
      */
-    public function toArrayTV($render = false)
-    {
+    public function toArrayTV($render = false)

+    {

         $out = array_diff_key(parent::toArray(), $this->default_field);
         $tpl = $this->get('template');
         $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
-        foreach ($tvTPL as $item) {
-            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {
+        foreach ($tvTPL as $item) {

+            if (isset($this->tvid[$item]) && !array_key_exists($this->tvid[$item], $out)) {

                 $out[$this->tvid[$item]] = $this->get($this->tvid[$item]);
             }
         }
-        if ($render) {
-            foreach ($out as $key => $val) {
+        if ($render) {

+            foreach ($out as $key => $val) {

                 $out[$key] = $this->renderTV($key);
             }
         }
@@ -208,8 +208,8 @@ 
      * @param bool $render
      * @return array
      */
-    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true)
-    {
+    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true)

+    {

         $out = array_merge(
             $this->toArrayMain(),
             $this->toArrayTV($render),
@@ -222,11 +222,11 @@ 
     /**
      * @return null|string
      */
-    public function getUrl()
-    {
+    public function getUrl()

+    {

         $out = null;
         $id = (int)$this->getID();
-        if (!empty($id)) {
+        if (!empty($id)) {

             $out = $this->modx->makeUrl($id);
         }
 
@@ -238,10 +238,10 @@ 
      * @param string $second
      * @return mixed
      */
-    public function getTitle($main = 'menutitle', $second = 'pagetitle')
-    {
+    public function getTitle($main = 'menutitle', $second = 'pagetitle')

+    {

         $title = $this->get($main);
-        if (empty($title) && $title !== '0') {
+        if (empty($title) && $title !== '0') {

             $title = $this->get($second);
         }
 
@@ -251,8 +251,8 @@ 
     /**
      * @return bool
      */
-    public function isWebShow()
-    {
+    public function isWebShow()

+    {

         $pub = ($this->get('publishedon') < time() && $this->get('published'));
         $unpub = ($this->get('unpub_date') == 0 || $this->get('unpub_date') > time());
         $del = ($this->get('deleted') == 0 && ($this->get('deletedon') == 0 || $this->get('deletedon') > time()));
@@ -263,8 +263,8 @@ 
     /**
      * @return $this
      */
-    public function touch()
-    {
+    public function touch()

+    {

         $this->set('editedon', time());
 
         return $this;
@@ -274,14 +274,14 @@ 
      * @param $tvname
      * @return null|string
      */
-    public function renderTV($tvname)
-    {
+    public function renderTV($tvname)

+    {

         $out = null;
-        if ($this->getID() > 0) {
+        if ($this->getID() > 0) {

             include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";
             include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";
             $tvval = $this->get($tvname);
-            if ($this->isTVarrayField($tvname) && is_array($tvval)) {
+            if ($this->isTVarrayField($tvname) && is_array($tvval)) {

                 $tvval = implode('||', $tvval);
             }
             $param = APIHelpers::getkey($this->tvd, $tvname, array());
@@ -298,14 +298,14 @@ 
      * @param $key
      * @return mixed
      */
-    public function get($key)
-    {
+    public function get($key)

+    {

         $out = parent::get($key);
-        if (isset($this->tv[$key])) {
+        if (isset($this->tv[$key])) {

             $tpl = $this->get('template');
             $tvTPL = APIHelpers::getkey($this->tvTpl, $tpl, array());
             $tvID = APIHelpers::getkey($this->tv, $key, 0);
-            if (in_array($tvID, $tvTPL) && is_null($out)) {
+            if (in_array($tvID, $tvTPL) && is_null($out)) {

                 $out = APIHelpers::getkey($this->tvd[$key], 'value', null);
             }
         }
@@ -318,10 +318,10 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
-            switch ($key) {
+    public function set($key, $value)

+    {

+        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {

+            switch ($key) {

                 case 'parent':
                     $value = (int)$value;
                     break;
@@ -331,38 +331,38 @@ 
                     break;
                 case 'published':
                     $value = (int)((bool)$value);
-                    if ($value) {
+                    if ($value) {

                         $this->field['publishedon'] = time() + $this->modxConfig('server_offset_time');
                     }
                     break;
                 case 'pub_date':
                     $value = $this->getTime($value);
-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {

                         $this->field['published'] = 1;
                         $this->field['publishedon'] = $value;
                     }
                     break;
                 case 'unpub_date':
                     $value = $this->getTime($value);
-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') > $value) {

                         $this->field['published'] = 0;
                         $this->field['publishedon'] = 0;
                     }
                     break;
                 case 'deleted':
                     $value = (int)((bool)$value);
-                    if ($value) {
+                    if ($value) {

                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    } else {
+                    } else {

                         $this->field['deletedon'] = 0;
                     }
                     break;
                 case 'deletedon':
                     $value = $this->getTime($value);
-                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {
+                    if ($value > 0 && time() + $this->modxConfig('server_offset_time') < $value) {

                         $value = 0;
                     }
-                    if ($value) {
+                    if ($value) {

                         $this->field['deleted'] = 1;
                     }
                     break;
@@ -389,20 +389,20 @@ 
      * @param int $default
      * @return int|mixed
      */
-    protected function getUser($value, $default = 0)
-    {
+    protected function getUser($value, $default = 0)

+    {

         $currentAdmin = APIHelpers::getkey($_SESSION, 'mgrInternalKey', 0);
         $value = (int)$value;
-        if (!empty($value)) {
+        if (!empty($value)) {

             $by = $this->findUserBy($value);
-            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {
+            $exists = $this->managerUsers->exists(function ($key, Helpers\Collection $val) use ($by, $value) {

                 return ($val->containsKey($by) && $val->get($by) === (string)$value);
             });
-            if (!$exists) {
+            if (!$exists) {

                 $value = 0;
             }
         }
-        if (empty($value)) {
+        if (empty($value)) {

             $value = empty($currentAdmin) ? $default : $currentAdmin;
         }
 
@@ -413,9 +413,9 @@ 
      * @param $data
      * @return bool|string
      */
-    protected function findUserBy($data)
-    {
-        switch (true) {
+    protected function findUserBy($data)

+    {

+        switch (true) {

             case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):
                 $find = 'id';
                 break;
@@ -436,11 +436,11 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         $this->close();
         $fld = array();
-        foreach ($this->tvd as $name => $tv) {
+        foreach ($this->tvd as $name => $tv) {

             $fld[$name] = $tv['value'];
         };
         $this->store($fld);
@@ -458,10 +458,10 @@ 
      * @param $id
      * @return $this
      */
-    public function edit($id)
-    {
+    public function edit($id)

+    {

         $id = is_scalar($id) ? trim($id) : '';
-        if ($this->getID() != $id) {
+        if ($this->getID() != $id) {

             $this->close();
             $this->markAllEncode();
             $this->newDoc = false;
@@ -469,12 +469,12 @@ 
             $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);
             $this->fromArray($this->modx->db->getRow($result));
             $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=" . (int)$id);
-            while ($row = $this->modx->db->getRow($result)) {
+            while ($row = $this->modx->db->getRow($result)) {

                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];
             }
-            if (empty($this->field['id'])) {
+            if (empty($this->field['id'])) {

                 $this->id = null;
-            } else {
+            } else {

                 $this->id = $this->field['id'];
                 $this->set('editedby', null)->touch();
                 $this->decodeFields();
@@ -491,10 +491,10 @@ 
      * @param bool $clearCache
      * @return bool|null
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
+    public function save($fire_events = false, $clearCache = false)

+    {

         $parent = null;
-        if ($this->field['pagetitle'] == '') {
+        if ($this->field['pagetitle'] == '') {

             $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
 
             return false;
@@ -506,7 +506,7 @@ 
             $this->field['parent'] == 0 &&
             !$this->modxConfig('udperms_allowroot') &&
             !($uid && isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1)
-        ) {
+        ) {

             $this->log['rootForbidden'] = 'Only Administrators can create documents in the root folder because udperms_allowroot setting is off';
 
             return false;
@@ -522,11 +522,11 @@ 
         ), $fire_events);
 
         $fld = $this->encodeFields()->toArray(null, null, null, false);
-        foreach ($this->default_field as $key => $value) {
+        foreach ($this->default_field as $key => $value) {

             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
-                if ($tmp == $value) {
-                    switch ($key) {
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

+                if ($tmp == $value) {

+                    switch ($key) {

                         case 'cacheable':
                             $value = $this->modxConfig('cache_default');
                             break;
@@ -546,11 +546,11 @@ 
                 }
                 $this->field[$key] = $value;
             }
-            switch (true) {
+            switch (true) {

                 case $key == 'parent':
                     $parent = (int)$this->get($key);
                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");
-                    if ($this->modx->db->getValue($q) != 1) {
+                    if ($this->modx->db->getValue($q) != 1) {

                         $parent = 0;
                     }
                     $this->field[$key] = $parent;
@@ -565,38 +565,38 @@ 
             unset($fld[$key]);
         }
 
-        if (!empty($this->set)) {
-            if ($this->newDoc) {
+        if (!empty($this->set)) {

+            if ($this->newDoc) {

                 $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
-            } else {
+            } else {

                 $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',
                         $this->set) . " WHERE `id` = " . $this->id;
             }
             $this->query($SQL);
 
-            if ($this->newDoc) {
+            if ($this->newDoc) {

                 $this->id = $this->modx->db->getInsertId();
             }
 
-            if ($parent > 0) {
+            if ($parent > 0) {

                 $this->query("UPDATE {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");
             }
         }
 
         $_deleteTVs = $_insertTVs = array();
-        foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {
+        foreach ($fld as $key => $value) {

+            if (empty($this->tv[$key]) || !$this->isChanged($key) || !$this->belongsToTemplate($this->tv[$key])) {

                 continue;
-            } elseif ($value === '') {
+            } elseif ($value === '') {

                 $_deleteTVs[] = $this->tv[$key];
-            } else {
+            } else {

                 $_insertTVs[$this->tv[$key]] = $this->escape($value);
             }
         }
 
-        if (!empty($_insertTVs)) {
+        if (!empty($_insertTVs)) {

             $values = array();
-            foreach ($_insertTVs as $id => $value) {
+            foreach ($_insertTVs as $id => $value) {

                 $values[] = "({$this->id}, {$id}, '{$value}')";
             }
             $values = implode(',', $values);
@@ -604,17 +604,19 @@ 
     `value` = VALUES(`value`)");
         }
 
-        if (!empty($_deleteTVs)) {
+        if (!empty($_deleteTVs)) {

             $ids = implode(',', $_deleteTVs);
             $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` IN ({$ids})");
         }
 
-        if (!isset($this->mode)) {
+        if (!isset($this->mode)) {

             $this->mode = $this->newDoc ? "new" : "upd";
             $this->newDoc = false;
         }
 
-        if (!empty($this->groupIds)) $this->setDocumentGroups($this->id, $this->groupIds);
+        if (!empty($this->groupIds)) {

+            $this->setDocumentGroups($this->id, $this->groupIds);

+        }

         $this->invokeEvent('OnDocFormSave', array(
             'mode'   => $this->mode,
             'id'     => isset($this->id) ? $this->id : '',
@@ -622,7 +624,7 @@ 
             'docObj' => $this
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
         $this->decodeFields();
@@ -634,7 +636,8 @@ 
      * @param $tvId
      * @return bool
      */
-    protected function belongsToTemplate($tvId) {
+    protected function belongsToTemplate($tvId)

+    {

         $template = $this->get('template');
 
         return isset($this->tvTpl[$template]) && in_array($tvId, $this->tvTpl[$template]);
@@ -645,16 +648,16 @@ 
      * @return $this
      * @throws Exception
      */
-    public function toTrash($ids)
-    {
+    public function toTrash($ids)

+    {

         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $id = $this->sanitarIn($_ids);
             $uid = (int)$this->modx->getLoginUserId();
             $deletedon = time() + $this->modxConfig('server_offset_time');
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} WHERE `id` IN ({$id})");
-        } else {
+        } else {

             throw new Exception('Invalid IDs list for mark trash: <pre>' . print_r($ids,
                     1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
         }
@@ -666,11 +669,11 @@ 
      * @param bool $fire_events
      * @return $this
      */
-    public function clearTrash($fire_events = false)
-    {
+    public function clearTrash($fire_events = false)

+    {

         $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `deleted`='1'");
         $_ids = $this->modx->db->getColumn('id', $q);
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $this->invokeEvent('OnBeforeEmptyTrash', array(
                 "ids" => $_ids
             ), $fire_events);
@@ -692,15 +695,15 @@ 
      * @param int|bool $depth
      * @return array
      */
-    public function children($ids, $depth)
-    {
+    public function children($ids, $depth)

+    {

         $_ids = $this->cleanIDs($ids, ',');
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $id = $this->sanitarIn($_ids);
-            if (!empty($id)) {
+            if (!empty($id)) {

                 $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} where `parent` IN ({$id})");
                 $id = $this->modx->db->getColumn('id', $q);
-                if ($depth > 0 || $depth === true) {
+                if ($depth > 0 || $depth === true) {

                     $id = $this->children($id, is_bool($depth) ? $depth : ($depth - 1));
                 }
                 $_ids = array_merge($_ids, $id);
@@ -716,8 +719,8 @@ 
      * @return $this
      * @throws Exception
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

         $ids = $this->children($ids, true);
         $_ids = $this->cleanIDs($ids, ',', $this->systemID());
         $this->invokeEvent('OnBeforeDocFormDelete', array(
@@ -734,8 +737,8 @@ 
     /**
      * @return array
      */
-    private function systemID()
-    {
+    private function systemID()

+    {

         $ignore = array(
             0, //empty document
             (int)$this->modxConfig('site_start'),
@@ -745,7 +748,7 @@ 
         );
         $data = $this->query("SELECT DISTINCT setting_value FROM {$this->makeTable('web_user_settings')} WHERE `setting_name`='login_home' AND `setting_value`!=''");
         $data = $this->modx->db->makeArray($data);
-        foreach ($data as $item) {
+        foreach ($data as $item) {

             $ignore[] = (int)$item['setting_value'];
         }
 
@@ -757,22 +760,22 @@ 
      * @param $alias
      * @return string
      */
-    protected function checkAlias($alias)
-    {
+    protected function checkAlias($alias)

+    {

         $alias = strtolower($alias);
-        if ($this->modxConfig('friendly_urls')) {
+        if ($this->modxConfig('friendly_urls')) {

             $_alias = $this->escape($alias);
-            if ((!$this->modxConfig('allow_duplicate_alias') && !$this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {
+            if ((!$this->modxConfig('allow_duplicate_alias') && !$this->modxConfig('use_alias_path')) || ($this->modxConfig('allow_duplicate_alias') && $this->modxConfig('use_alias_path'))) {

                 $flag = $this->modx->db->getValue($this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `alias`='{$_alias}' AND `parent`={$this->get('parent')} LIMIT 1"));
-            } else {
+            } else {

                 $flag = $this->modx->db->getValue($this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `alias`='{$_alias}' LIMIT 1"));
             }
-            if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {
+            if (($flag && $this->newDoc) || (!$this->newDoc && $flag && $this->id != $flag)) {

                 $suffix = substr($alias, -2);
-                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
+                if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {

                     $suffix = (int)$tmp[1] + 1;
                     $alias = substr($alias, 0, -2) . '-' . $suffix;
-                } else {
+                } else {

                     $alias .= '-2';
                 }
                 $alias = $this->checkAlias($alias);
@@ -786,8 +789,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (array_key_exists($key, $this->default_field) || array_key_exists($key, $this->tv));
     }
 
@@ -795,12 +798,12 @@ 
      * @param bool $reload
      * @return $this
      */
-    protected function get_TV($reload = false)
-    {
+    protected function get_TV($reload = false)

+    {

         $this->modx->_TVnames = array();
-        if (empty($this->modx->_TVnames) || $reload) {
+        if (empty($this->modx->_TVnames) || $reload) {

             $result = $this->query('SELECT `id`,`name`,`type` FROM ' . $this->makeTable('site_tmplvars'));
-            while ($row = $this->modx->db->GetRow($result)) {
+            while ($row = $this->modx->db->GetRow($result)) {

                 $this->modx->_TVnames[$row['name']] = array(
                     "id"   => $row['id'],
                     "type" => $row['type']
@@ -809,14 +812,16 @@ 
         }
         $arrayTypes = array('checkbox', 'listbox-multiple');
         $arrayTVs = array();
-        foreach ($this->modx->_TVnames as $name => $data) {
+        foreach ($this->modx->_TVnames as $name => $data) {

             $this->tvid[$data['id']] = $name;
             $this->tv[$name] = $data['id'];
-            if (in_array($data['type'], $arrayTypes)) {
+            if (in_array($data['type'], $arrayTypes)) {

                 $arrayTVs[] = $name;
             }
         }
-        if (empty($this->tvaFields)) $this->tvaFields = $arrayTVs;
+        if (empty($this->tvaFields)) {

+            $this->tvaFields = $arrayTVs;

+        }

         $this->loadTVTemplate()->loadTVDefault(array_values($this->tv));
 
         return $this;
@@ -825,12 +830,12 @@ 
     /**
      * @return $this
      */
-    protected function loadTVTemplate()
-    {
+    protected function loadTVTemplate()

+    {

         $q = $this->query("SELECT `tmplvarid`, `templateid` FROM " . $this->makeTable('site_tmplvar_templates'));
         $q = $this->modx->db->makeArray($q);
         $this->tvTpl = array();
-        foreach ($q as $item) {
+        foreach ($q as $item) {

             $this->tvTpl[$item['templateid']][] = $item['tmplvarid'];
         }
 
@@ -841,16 +846,16 @@ 
      * @param array $tvId
      * @return $this
      */
-    protected function loadTVDefault(array $tvId = array())
-    {
-        if (is_array($tvId) && !empty($tvId)) {
+    protected function loadTVDefault(array $tvId = array())

+    {

+        if (is_array($tvId) && !empty($tvId)) {

             $tbl_site_tmplvars = $this->makeTable('site_tmplvars');
             $fields = 'id,name,default_text as value,display,display_params,type';
             $implodeTvId = implode(',', $tvId);
             $rs = $this->query("SELECT {$fields} FROM {$tbl_site_tmplvars} WHERE id IN({$implodeTvId})");
             $rows = $this->modx->db->makeArray($rs);
             $this->tvd = array();
-            foreach ($rows as $item) {
+            foreach ($rows as $item) {

                 $this->tvd[$item['name']] = $item;
             }
         }
@@ -863,17 +868,17 @@ 
      * @return int
      * @throws Exception
      */
-    public function setTemplate($tpl)
-    {
-        if (!is_numeric($tpl) || $tpl != (int)$tpl) {
-            if (is_scalar($tpl)) {
+    public function setTemplate($tpl)

+    {

+        if (!is_numeric($tpl) || $tpl != (int)$tpl) {

+            if (is_scalar($tpl)) {

                 $sql = "SELECT `id` FROM {$this->makeTable('site_templates')} WHERE `templatename` = '" . $this->escape($tpl) . "'";
                 $rs = $this->query($sql);
-                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {
+                if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {

                     throw new Exception("Template {$tpl} is not exists");
                 }
                 $tpl = $this->modx->db->getValue($rs);
-            } else {
+            } else {

                 throw new Exception("Invalid template name: " . print_r($tpl, 1));
             }
         }
@@ -884,14 +889,14 @@ 
     /**
      * @return string
      */
-    protected function getAlias()
-    {
-        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {
+    protected function getAlias()

+    {

+        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {

             $alias = strtr($this->get('pagetitle'), $this->table);
-        } else {
-            if ($this->get('alias') != '') {
+        } else {

+            if ($this->get('alias') != '') {

                 $alias = $this->get('alias');
-            } else {
+            } else {

                 $alias = '';
             }
         }
@@ -908,10 +913,10 @@ 
      *
      * Пересчет menuindex по полю таблицы site_content
      */
-    public function updateMenuindex($parent, $criteria = 'id', $dir = 'asc')
-    {
+    public function updateMenuindex($parent, $criteria = 'id', $dir = 'asc')

+    {

         $dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
-        if (is_integer($parent) && $criteria !== '') {
+        if (is_integer($parent) && $criteria !== '') {

             $this->query("SET @index := 0");
             $this->query("UPDATE {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");
         }
@@ -924,37 +929,37 @@ 
      *
      * @return $this
      */
-    public function setDefaultTemplate()
-    {
+    public function setDefaultTemplate()

+    {

         $parent = $this->get('parent');
         $template = $this->modxConfig('default_template');
-        switch ($this->modxConfig('auto_template_logic')) {
+        switch ($this->modxConfig('auto_template_logic')) {

             case 'sibling':
-                if (!$parent) {
+                if (!$parent) {

                     $site_start = $this->modxConfig('site_start');
                     $where = "sc.isfolder=0 AND sc.id!={$site_start}";
                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

                         $template = $sibl[0]['template'];
                     }
-                } else {
+                } else {

                     $sibl = $this->modx->getDocumentChildren($parent, 1, 0, 'template', 'isfolder=0', 'menuindex',
                         'ASC', 1);
-                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

                         $template = $sibl[0]['template'];
-                    } else {
+                    } else {

                         $sibl = $this->modx->getDocumentChildren($parent, 0, 0, 'template', 'isfolder=0', 'menuindex',
                             'ASC', 1);
-                        if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                        if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {

                             $template = $sibl[0]['template'];
                         }
                     }
                 }
                 break;
             case 'parent':
-                if ($parent) {
+                if ($parent) {

                     $_parent = $this->modx->getPageInfo($parent, 0, 'template');
-                    if (isset($_parent['template'])) {
+                    if (isset($_parent['template'])) {

                         $template = $_parent['template'];
                     }
                 }
@@ -971,18 +976,18 @@ 
      * @param  bool $store обновить распакованное поле
      * @return array ассоциативный массив с данными из json строки
      */
-    public function decodeField($field, $store = false)
-    {
+    public function decodeField($field, $store = false)

+    {

         $out = array();
-        if ($this->isDecodableField($field)) {
+        if ($this->isDecodableField($field)) {

             $data = $this->get($field);
-            if ($this->isTVarrayField($field)) {
+            if ($this->isTVarrayField($field)) {

                 $out = explode('||', $data);
-            } else {
+            } else {

                 $out = jsonHelper::jsonDecode($data, array('assoc' => true), true);
             }
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsDecode($field);
         }
@@ -996,18 +1001,18 @@ 
      * @param  bool $store обновить запакованное поле
      * @return string|null json строка
      */
-    public function encodeField($field, $store = false)
-    {
+    public function encodeField($field, $store = false)

+    {

         $out = null;
-        if ($this->isEncodableField($field)) {
+        if ($this->isEncodableField($field)) {

             $data = $this->get($field);
-            if ($this->isTVarrayField($field)) {
+            if ($this->isTVarrayField($field)) {

                 $out = is_array($data) ? implode('||', $data) : $data;
-            } else {
+            } else {

                 $out = json_encode($data);
             }
         }
-        if ($store) {
+        if ($store) {

             $this->field[$field] = $out;
             $this->markAsEncode($field);
         }
@@ -1020,8 +1025,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isTVarrayField($field)
-    {
+    public function isTVarrayField($field)

+    {

         return (is_scalar($field) && in_array($field, $this->tvaFields));
     }
 
@@ -1029,10 +1034,10 @@ 
      * Пометить все поля как запакованные
      * @return $this
      */
-    public function markAllEncode()
-    {
+    public function markAllEncode()

+    {

         parent::markAllEncode();
-        foreach ($this->tvaFields as $field) {
+        foreach ($this->tvaFields as $field) {

             $this->markAsEncode($field);
         }
 
@@ -1043,10 +1048,10 @@ 
      * Пометить все поля как распакованные
      * @return $this
      */
-    public function markAllDecode()
-    {
+    public function markAllDecode()

+    {

         parent::markAllDecode();
-        foreach ($this->tvaFields as $field) {
+        foreach ($this->tvaFields as $field) {

             $this->markAsDecode($field);
         }
 
@@ -1056,16 +1061,17 @@ 
     /**
      * @param int $docId
      */
-    public function getDocumentGroups($docId = 0) {
+    public function getDocumentGroups($docId = 0)

+    {

         $out = array();
         $doc = $this->switchObject($docId);
-        if (null !== $doc->getID()) {
+        if (null !== $doc->getID()) {

             $doc_groups = $this->makeTable('document_groups');
             $docgroup_names = $this->makeTable('documentgroup_names');
 
             $rs = $this->query("SELECT `dg`.`document_group`, `dgn`.`name` FROM {$doc_groups} as `dg` INNER JOIN {$docgroup_names} as `dgn` ON `dgn`.`id`=`dg`.`document_group`
                 WHERE `dg`.`document` = " . $doc->getID());
-            while ($row = $this->modx->db->getRow($rs)) {
+            while ($row = $this->modx->db->getRow($rs)) {

                 $out[$row['document_group']] = $row['name'];
             }
 
@@ -1080,18 +1086,20 @@ 
      * @param array $groupIds
      * @return $this
      */
-    public function setDocumentGroups($docId = 0, $groupIds = array())
-    {
-        if (!is_array($groupIds)) return $this;
-        if ($this->newDoc && $docId == 0) {
+    public function setDocumentGroups($docId = 0, $groupIds = array())

+    {

+        if (!is_array($groupIds)) {

+            return $this;

+        }

+        if ($this->newDoc && $docId == 0) {

             $this->groupIds = $groupIds;
-        } else {
+        } else {

             $doc = $this->switchObject($docId);
-            if ($id = $doc->getID()) {
-                foreach ($groupIds as $gid) {
+            if ($id = $doc->getID()) {

+                foreach ($groupIds as $gid) {

                     $this->query("REPLACE INTO {$this->makeTable('document_groups')} (`document_group`, `document`) VALUES ('{$gid}', '{$id}')");
                 }
-                if (!$this->newDoc) {
+                if (!$this->newDoc) {

                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('document_groups')} WHERE `document`={$id} AND `document_group` NOT IN ({$groupIds})");
                 }

assets/lib/MODxAPI/modManagers.php

Spacing +22 added lines, -22 removed lines

@@ -75,7 +75,7 @@ 
      * @param $val
      * @return $this
      */
-    protected function setRememberTime($val){
+    protected function setRememberTime($val) {
         $this->rememberTime = (int)$val;
         return $this;
     }
@@ -83,7 +83,7 @@ 
     /**
      * @return integer
      */
-    public function getRememberTime(){
+    public function getRememberTime() {
         return $this->rememberTime;
     }
 
@@ -143,7 +143,7 @@ 
             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if ( ! $find = $this->findUser($id)) {
                 $this->id = null;
             } else {
                 $this->set('editedon', time());
@@ -175,7 +175,7 @@ 
      */
     public function set($key, $value)
     {
-        if (is_scalar($value) && is_scalar($key) && !empty($key)) {
+        if (is_scalar($value) && is_scalar($key) && ! empty($key)) {
             switch ($key) {
                 case 'password':
                     $this->givenPassword = $value;
@@ -233,20 +233,20 @@ 
             return false;
         }
 
-        if (!$this->checkUnique('manager_users', 'username')) {
+        if ( ! $this->checkUnique('manager_users', 'username')) {
             $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('user_attributes', 'email', 'internalKey')) {
+        if ( ! $this->checkUnique('user_attributes', 'email', 'internalKey')) {
             $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
 
             return false;
         }
 
-        if(!$this->get('role')) {
+        if ( ! $this->get('role')) {
             $this->log['UniqueEmail'] = 'Wrong manager role <pre>' . print_r($this->get('role'), true) . '</pre>';
         }
 
@@ -254,13 +254,13 @@ 
         $fld = $this->toArray();
         foreach ($this->default_field['user'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'user');
             unset($fld[$key]);
         }
-        if (!empty($this->set['user'])) {
+        if ( ! empty($this->set['user'])) {
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('manager_users')} SET " . implode(', ', $this->set['user']);
             } else {
@@ -276,13 +276,13 @@ 
 
         foreach ($this->default_field['attribute'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'attribute');
             unset($fld[$key]);
         }
-        if (!empty($this->set['attribute'])) {
+        if ( ! empty($this->set['attribute'])) {
             if ($this->newDoc) {
                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
                 $SQL = "INSERT into {$this->makeTable('user_attributes')} SET " . implode(', ',
@@ -295,7 +295,7 @@ 
         }
         unset($fld['id']);
         foreach ($fld as $key => $value) {
-            if ($value == '' || !$this->isChanged($key)) {
+            if ($value == '' || ! $this->isChanged($key)) {
                 continue;
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
@@ -306,7 +306,7 @@ 
             }
         }
         // TODO
-        if (!$this->newDoc && $this->givenPassword) {
+        if ( ! $this->newDoc && $this->givenPassword) {
             $this->invokeEvent('OnManagerChangePassword', array(
                 'userObj'      => $this,
                 'userid'       => $this->id,
@@ -316,7 +316,7 @@ 
             ), $fire_events);
         }
 
-        if (!empty($this->groupIds)) {
+        if ( ! empty($this->groupIds)) {
             $this->setUserGroups($this->id, $this->groupIds);
         }
         // TODO
@@ -412,7 +412,7 @@ 
         $b = $tmp->get('blocked');
         $bu = $tmp->get('blockeduntil');
         $ba = $tmp->get('blockedafter');
-        $flag = (($b && !$bu && !$ba) || ($bu && $now < $bu) || ($ba && $now > $ba));
+        $flag = (($b && ! $bu && ! $ba) || ($bu && $now < $bu) || ($ba && $now > $ba));
         unset($tmp);
 
         return $flag;
@@ -434,7 +434,7 @@ 
 
         $flag = $pluginFlag = false;
         if (
-            (null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
+            (null !== $tmp->getID()) && ( ! $blocker || ($blocker && ! $tmp->checkBlock($id)))
         ) {
             $_password = $tmp->get('password');
             $eventResult = $this->getInvokeEventResult('OnManagerAuthentication', array(
@@ -451,7 +451,7 @@ 
             } else {
                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if ( ! $pluginFlag) {
                 $hashType = $this->getPasswordHashType($_password);
                 switch ($hashType) {
                     case 'phpass':
@@ -488,7 +488,7 @@ 
      */
     public function logOut($cookieName = 'modx_remember_manager', $fire_events = false)
     {
-        if (!$uid = $this->modx->getLoginUserID('mgr')) {
+        if ( ! $uid = $this->modx->getLoginUserID('mgr')) {
             return;
         }
         $params = array(
@@ -534,7 +534,7 @@ 
                     $_SESSION['mgrPermissions'] = $this->mgrPermissions;
                     $_SESSION['mgrDocgroups'] = $this->getDocumentGroups();
                     $_SESSION['mgrToken'] = md5($this->get('sessionid'));
-                    if (!empty($remember)) {
+                    if ( ! empty($remember)) {
                         $this->setAutoLoginCookie($cookieName, $remember);
                     }
                 }
@@ -584,7 +584,7 @@ 
      */
     public function setAutoLoginCookie($cookieName, $remember = true)
     {
-        if (!empty($cookieName) && $this->getID() !== null) {
+        if ( ! empty($cookieName) && $this->getID() !== null) {
             $secure = $this->isSecure();
             $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
             $cookieValue = $this->get('username');
@@ -648,7 +648,7 @@ 
      */
     public function setUserGroups($userID = 0, $groupIds = array())
     {
-        if (!is_array($groupIds)) {
+        if ( ! is_array($groupIds)) {
             return $this;
         }
         if ($this->newDoc && $userID == 0) {
@@ -659,7 +659,7 @@ 
                 foreach ($groupIds as $gid) {
                     $this->query("REPLACE INTO {$this->makeTable('member_groups')} (`user_group`, `member`) VALUES ('{$gid}', '{$uid}')");
                 }
-                if (!$this->newDoc) {
+                if ( ! $this->newDoc) {
                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('member_groups')} WHERE `member`={$uid} AND `user_group` NOT IN ({$groupIds})");
                 }

Braces +117 added lines, -115 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * Class modUsers
  */
-class modManagers extends MODxAPI
-{
+class modManagers extends MODxAPI

+{

     /**
      * @var array
      */
@@ -64,8 +64,8 @@ 
      * @param bool $debug
      * @throws Exception
      */
-    public function __construct(DocumentParser $modx, $debug = false)
-    {
+    public function __construct(DocumentParser $modx, $debug = false)

+    {

         $this->setRememberTime(60 * 60 * 24 * 365 * 5);
         parent::__construct($modx, $debug);
         $this->modx->loadExtension('phpass');
@@ -75,7 +75,8 @@ 
      * @param $val
      * @return $this
      */
-    protected function setRememberTime($val){
+    protected function setRememberTime($val)

+    {

         $this->rememberTime = (int)$val;
         return $this;
     }
@@ -83,7 +84,8 @@ 
     /**
      * @return integer
      */
-    public function getRememberTime(){
+    public function getRememberTime()

+    {

         return $this->rememberTime;
     }
 
@@ -91,8 +93,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (array_key_exists($key, $this->default_field['user']) || array_key_exists($key,
                 $this->default_field['attribute']) || in_array($key, $this->default_field['hidden']));
     }
@@ -101,9 +103,9 @@ 
      * @param string $data
      * @return string|false
      */
-    protected function findUser($data)
-    {
-        switch (true) {
+    protected function findUser($data)

+    {

+        switch (true) {

             case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):
                 $find = 'attribute.internalKey';
                 break;
@@ -124,8 +126,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         parent::create($data);
         $this->set('createdon', time());
 
@@ -136,16 +138,16 @@ 
      * @param $id
      * @return $this
      */
-    public function edit($id)
-    {
+    public function edit($id)

+    {

         $id = is_scalar($id) ? trim($id) : '';
-        if ($this->getID() != $id) {
+        if ($this->getID() != $id) {

             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if (!$find = $this->findUser($id)) {

                 $this->id = null;
-            } else {
+            } else {

                 $this->set('editedon', time());
                 $result = $this->query("
                     SELECT * from {$this->makeTable('user_attributes')} as attribute
@@ -173,10 +175,10 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if (is_scalar($value) && is_scalar($key) && !empty($key)) {
-            switch ($key) {
+    public function set($key, $value)

+    {

+        if (is_scalar($value) && is_scalar($key) && !empty($key)) {

+            switch ($key) {

                 case 'password':
                     $this->givenPassword = $value;
                     $value = $this->getPassword($value);
@@ -184,7 +186,7 @@ 
                 case 'sessionid':
                     session_regenerate_id(false);
                     $value = session_id();
-                    if ($mid = $this->modx->getLoginUserID('mgr')) {
+                    if ($mid = $this->modx->getLoginUserID('mgr')) {

                         $this->modx->db->query("UPDATE {$this->makeTable('active_user_locks')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
                         $this->modx->db->query("UPDATE {$this->makeTable('active_user_sessions')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
                         $this->modx->db->query("UPDATE {$this->makeTable('active_users')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
@@ -205,8 +207,8 @@ 
      * @param $pass
      * @return string
      */
-    public function getPassword($pass)
-    {
+    public function getPassword($pass)

+    {

         return $this->modx->phpass->HashPassword($pass);
     }
 
@@ -214,8 +216,8 @@ 
      * @param string $name
      * @return bool
      */
-    public function hasPermission($name)
-    {
+    public function hasPermission($name)

+    {

         return (is_string($name) && $name && isset($this->mgrPermissions[$name]));
     }
 
@@ -224,89 +226,89 @@ 
      * @param bool $clearCache
      * @return bool|int|null|void
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
-        if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {
+    public function save($fire_events = false, $clearCache = false)

+    {

+        if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {

             $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>' . print_r($this->toArray(),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('manager_users', 'username')) {
+        if (!$this->checkUnique('manager_users', 'username')) {

             $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('user_attributes', 'email', 'internalKey')) {
+        if (!$this->checkUnique('user_attributes', 'email', 'internalKey')) {

             $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
 
             return false;
         }
 
-        if(!$this->get('role')) {
+        if(!$this->get('role')) {

             $this->log['UniqueEmail'] = 'Wrong manager role <pre>' . print_r($this->get('role'), true) . '</pre>';
         }
 
         $this->set('sessionid', '');
         $fld = $this->toArray();
-        foreach ($this->default_field['user'] as $key => $value) {
+        foreach ($this->default_field['user'] as $key => $value) {

             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'user');
             unset($fld[$key]);
         }
-        if (!empty($this->set['user'])) {
-            if ($this->newDoc) {
+        if (!empty($this->set['user'])) {

+            if ($this->newDoc) {

                 $SQL = "INSERT into {$this->makeTable('manager_users')} SET " . implode(', ', $this->set['user']);
-            } else {
+            } else {

                 $SQL = "UPDATE {$this->makeTable('manager_users')} SET " . implode(', ',
                         $this->set['user']) . " WHERE id = " . $this->id;
             }
             $this->query($SQL);
         }
 
-        if ($this->newDoc) {
+        if ($this->newDoc) {

             $this->id = $this->modx->db->getInsertId();
         }
 
-        foreach ($this->default_field['attribute'] as $key => $value) {
+        foreach ($this->default_field['attribute'] as $key => $value) {

             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'attribute');
             unset($fld[$key]);
         }
-        if (!empty($this->set['attribute'])) {
-            if ($this->newDoc) {
+        if (!empty($this->set['attribute'])) {

+            if ($this->newDoc) {

                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
                 $SQL = "INSERT into {$this->makeTable('user_attributes')} SET " . implode(', ',
                         $this->set['attribute']);
-            } else {
+            } else {

                 $SQL = "UPDATE {$this->makeTable('user_attributes')} SET " . implode(', ',
                         $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();
             }
             $this->query($SQL);
         }
         unset($fld['id']);
-        foreach ($fld as $key => $value) {
-            if ($value == '' || !$this->isChanged($key)) {
+        foreach ($fld as $key => $value) {

+            if ($value == '' || !$this->isChanged($key)) {

                 continue;
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
-            if ($this->modx->db->getRecordCount($result) > 0) {
+            if ($this->modx->db->getRecordCount($result) > 0) {

                 $this->query("UPDATE {$this->makeTable('user_settings')} SET `setting_value` = '{$value}' WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}';");
-            } else {
+            } else {

                 $this->query("INSERT into {$this->makeTable('user_settings')} SET `user` = {$this->id},`setting_name` = '{$key}',`setting_value` = '{$value}';");
             }
         }
         // TODO
-        if (!$this->newDoc && $this->givenPassword) {
+        if (!$this->newDoc && $this->givenPassword) {

             $this->invokeEvent('OnManagerChangePassword', array(
                 'userObj'      => $this,
                 'userid'       => $this->id,
@@ -316,7 +318,7 @@ 
             ), $fire_events);
         }
 
-        if (!empty($this->groupIds)) {
+        if (!empty($this->groupIds)) {

             $this->setUserGroups($this->id, $this->groupIds);
         }
         // TODO
@@ -332,7 +334,7 @@ 
             "userroleid"   => $this->get('role')
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
 
@@ -344,9 +346,9 @@ 
      * @param bool $fire_events
      * @return bool|null|void
      */
-    public function delete($ids, $fire_events = false)
-    {
-        if ($this->edit($ids)) {
+    public function delete($ids, $fire_events = false)

+    {

+        if ($this->edit($ids)) {

             $flag = $this->query("
           DELETE user,attribute FROM {$this->makeTable('user_attributes')} as attribute
             LEFT JOIN {$this->makeTable('manager_users')} as user ON user.id=attribute.internalKey
@@ -360,7 +362,7 @@ 
                 'username'    => $this->get('username'),
                 'timestamp'   => time()
             ), $fire_events);
-        } else {
+        } else {

             $flag = false;
         }
         $this->close();
@@ -375,13 +377,13 @@ 
      * @param bool $fire_events
      * @return bool
      */
-    public function authUser($id = 0, $fulltime = true, $cookieName = 'modx_remember_manager', $fire_events = false)
-    {
+    public function authUser($id = 0, $fulltime = true, $cookieName = 'modx_remember_manager', $fire_events = false)

+    {

         $flag = false;
-        if (null === $this->getID() && $id) {
+        if (null === $this->getID() && $id) {

             $this->edit($id);
         }
-        if (null !== $this->getID()) {
+        if (null !== $this->getID()) {

             $flag = true;
             $this->save(false);
             $this->SessionHandler('start', $cookieName, $fulltime);
@@ -401,10 +403,10 @@ 
      * @param int $id
      * @return bool
      */
-    public function checkBlock($id = 0)
-    {
+    public function checkBlock($id = 0)

+    {

         $tmp = clone $this;
-        if ($id && $tmp->getID() != $id) {
+        if ($id && $tmp->getID() != $id) {

             $tmp->edit($id);
         }
         $now = time();
@@ -425,17 +427,17 @@ 
      * @param bool $fire_events
      * @return bool
      */
-    public function testAuth($id, $password, $blocker, $fire_events = false)
-    {
+    public function testAuth($id, $password, $blocker, $fire_events = false)

+    {

         $tmp = clone $this;
-        if ($id && $tmp->getID() != $id) {
+        if ($id && $tmp->getID() != $id) {

             $tmp->edit($id);
         }
 
         $flag = $pluginFlag = false;
         if (
             (null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
-        ) {
+        ) {

             $_password = $tmp->get('password');
             $eventResult = $this->getInvokeEventResult('OnManagerAuthentication', array(
                 'userObj'       => $this,
@@ -444,16 +446,16 @@ 
                 'userpassword'  => $password,
                 'savedpassword' => $_password
             ), $fire_events);
-            if (is_array($eventResult)) {
-                foreach ($eventResult as $result) {
+            if (is_array($eventResult)) {

+                foreach ($eventResult as $result) {

                     $pluginFlag = (bool)$result;
                 }
-            } else {
+            } else {

                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if (!$pluginFlag) {

                 $hashType = $this->getPasswordHashType($_password);
-                switch ($hashType) {
+                switch ($hashType) {

                     case 'phpass':
                         $flag = $this->modx->phpass->CheckPassword($password, $_password);
                         break;
@@ -463,15 +465,15 @@ 
                     case 'v1':
                         $algorithm = \APIhelpers::getkey($this->modx->config, 'pwd_hash_algo', 'UNCRYPT');
                         $userAlgorithm = $this->getPasswordHashAlgorithm($_password);
-                        if ($algorithm !== $userAlgorithm) {
+                        if ($algorithm !== $userAlgorithm) {

                             $algorithm = $userAlgorithm;
                         }
                         $flag = $_password == $this->makeHash($password, $tmp->getID(), $algorithm);
                         break;
                 }
-                if ($flag && $hashType == 'md5' || $hashType == 'v1') {
+                if ($flag && $hashType == 'md5' || $hashType == 'v1') {

                     $tmp->set('password', $password)->save();
-                    if ($id == $this->getID()) {
+                    if ($id == $this->getID()) {

                         $this->field['password'] = $tmp->get('password');
                     }
                 }
@@ -486,9 +488,9 @@ 
      * @param string $cookieName
      * @param bool $fire_events
      */
-    public function logOut($cookieName = 'modx_remember_manager', $fire_events = false)
-    {
-        if (!$uid = $this->modx->getLoginUserID('mgr')) {
+    public function logOut($cookieName = 'modx_remember_manager', $fire_events = false)

+    {

+        if (!$uid = $this->modx->getLoginUserID('mgr')) {

             return;
         }
         $params = array(
@@ -516,11 +518,11 @@ 
      *
      * remeber может быть числом в секундах
      */
-    protected function SessionHandler($directive, $cookieName, $remember = true)
-    {
-        switch ($directive) {
+    protected function SessionHandler($directive, $cookieName, $remember = true)

+    {

+        switch ($directive) {

             case 'start':
-                if ($this->getID() !== null) {
+                if ($this->getID() !== null) {

                     $_SESSION['usertype'] = 'manager';
                     $_SESSION['mgrShortname'] = $this->get('username');
                     $_SESSION['mgrFullname'] = $this->get('fullname');
@@ -534,13 +536,13 @@ 
                     $_SESSION['mgrPermissions'] = $this->mgrPermissions;
                     $_SESSION['mgrDocgroups'] = $this->getDocumentGroups();
                     $_SESSION['mgrToken'] = md5($this->get('sessionid'));
-                    if (!empty($remember)) {
+                    if (!empty($remember)) {

                         $this->setAutoLoginCookie($cookieName, $remember);
                     }
                 }
                 break;
             case 'destroy':
-                if (isset($_SESSION['mgrValidated'])) {
+                if (isset($_SESSION['mgrValidated'])) {

                     unset($_SESSION['usertype']);
                     unset($_SESSION['mgrShortname']);
                     unset($_SESSION['mgrFullname']);
@@ -554,8 +556,8 @@ 
                     unset($_SESSION['mgrPermissions']);
                     unset($_SESSION['mgrToken']);
                     setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
-                } else {
-                    if (isset($_COOKIE[session_name()])) {
+                } else {

+                    if (isset($_COOKIE[session_name()])) {

                         setcookie(session_name(), '', time() - 60, MODX_BASE_URL);
                     }
                     setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
@@ -570,8 +572,8 @@ 
     /**
      * @return bool
      */
-    public function isSecure()
-    {
+    public function isSecure()

+    {

         $out = $this->modxConfig('server_protocol') == 'http' ? false : true;
 
         return $out;
@@ -582,9 +584,9 @@ 
      * @param bool|integer $remember
      * @return $this
      */
-    public function setAutoLoginCookie($cookieName, $remember = true)
-    {
-        if (!empty($cookieName) && $this->getID() !== null) {
+    public function setAutoLoginCookie($cookieName, $remember = true)

+    {

+        if (!empty($cookieName) && $this->getID() !== null) {

             $secure = $this->isSecure();
             $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
             $cookieValue = $this->get('username');
@@ -599,11 +601,11 @@ 
      * @param int $userID
      * @return array
      */
-    public function getDocumentGroups($userID = 0)
-    {
+    public function getDocumentGroups($userID = 0)

+    {

         $out = array();
         $user = $this->switchObject($userID);
-        if (null !== $user->getID()) {
+        if (null !== $user->getID()) {

             $member_groups = $this->modx->getFullTableName('member_groups');
             $membergroup_access = $this->modx->getFullTableName('membergroup_access');
 
@@ -621,18 +623,18 @@ 
      * @param int $userID
      * @return array
      */
-    public function getUserGroups($userID = 0)
-    {
+    public function getUserGroups($userID = 0)

+    {

         $out = array();
         $user = $this->switchObject($userID);
-        if (null !== $user->getID()) {
+        if (null !== $user->getID()) {

             $member_groups = $this->makeTable('member_groups');
             $membergroup_names = $this->makeTable('membergroup_names');
 
             $rs = $this->query("SELECT `ug`.`user_group`, `ugn`.`name` FROM {$member_groups} as `ug`
                 INNER JOIN {$membergroup_names} as `ugn` ON `ugn`.`id`=`ug`.`user_group`
                 WHERE `ug`.`member` = " . $user->getID());
-            while ($row = $this->modx->db->getRow($rs)) {
+            while ($row = $this->modx->db->getRow($rs)) {

                 $out[$row['user_group']] = $row['name'];
             }
         }
@@ -646,20 +648,20 @@ 
      * @param array $groupIds
      * @return $this
      */
-    public function setUserGroups($userID = 0, $groupIds = array())
-    {
-        if (!is_array($groupIds)) {
+    public function setUserGroups($userID = 0, $groupIds = array())

+    {

+        if (!is_array($groupIds)) {

             return $this;
         }
-        if ($this->newDoc && $userID == 0) {
+        if ($this->newDoc && $userID == 0) {

             $this->groupIds = $groupIds;
-        } else {
+        } else {

             $user = $this->switchObject($userID);
-            if ($uid = $user->getID()) {
-                foreach ($groupIds as $gid) {
+            if ($uid = $user->getID()) {

+                foreach ($groupIds as $gid) {

                     $this->query("REPLACE INTO {$this->makeTable('member_groups')} (`user_group`, `member`) VALUES ('{$gid}', '{$uid}')");
                 }
-                if (!$this->newDoc) {
+                if (!$this->newDoc) {

                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('member_groups')} WHERE `member`={$uid} AND `user_group` NOT IN ({$groupIds})");
                 }
@@ -675,14 +677,14 @@ 
      * @param string $pass
      * @return string
      */
-    public function getPasswordHashType($pass)
-    {
+    public function getPasswordHashType($pass)

+    {

         $out = 'unknown';
-        if (substr($pass, 0, 1) === '$') {
+        if (substr($pass, 0, 1) === '$') {

             $out = 'phpass';
-        } elseif (strpos($pass, '>') !== false) {
+        } elseif (strpos($pass, '>') !== false) {

             $out = 'v1';
-        } elseif (strlen($pass) === 32) {
+        } elseif (strlen($pass) === 32) {

             $out = 'md5';
         }
 
@@ -693,8 +695,8 @@ 
      * @param string $pass
      * @return string
      */
-    public function getPasswordHashAlgorithm($pass)
-    {
+    public function getPasswordHashAlgorithm($pass)

+    {

         $pointer = strpos($pass, '>');
         $out = $pointer === false ? 'NOSALT' : substr($pass, 0, $pointer);
 
@@ -707,11 +709,11 @@ 
      * @param string $algorithm
      * @return string
      */
-    public function makeHash($pass, $seed, $algorithm)
-    {
+    public function makeHash($pass, $seed, $algorithm)

+    {

         $salt = md5($pass . $seed);
 
-        switch ($algorithm) {
+        switch ($algorithm) {

             case 'BLOWFISH_Y':
                 $salt = '$2y$07$' . substr($salt, 0, 22);
                 break;

assets/lib/MODxAPI/modUsers.php

Spacing +23 added lines, -23 removed lines

@@ -74,7 +74,7 @@ 
      * @param $val
      * @return $this
      */
-    protected function setRememberTime($val){
+    protected function setRememberTime($val) {
         $this->rememberTime = (int)$val;
         return $this;
     }
@@ -82,7 +82,7 @@ 
     /**
      * @return integer
      */
-    public function getRememberTime(){
+    public function getRememberTime() {
         return $this->rememberTime;
     }
 
@@ -142,7 +142,7 @@ 
             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if ( ! $find = $this->findUser($id)) {
                 $this->id = null;
             } else {
                 $this->set('editedon', time());
@@ -177,7 +177,7 @@ 
      */
     public function set($key, $value)
     {
-        if (is_scalar($value) && is_scalar($key) && !empty($key)) {
+        if (is_scalar($value) && is_scalar($key) && ! empty($key)) {
             switch ($key) {
                 case 'password':
                     $this->givenPassword = $value;
@@ -226,14 +226,14 @@ 
             return false;
         }
 
-        if (!$this->checkUnique('web_users', 'username')) {
+        if ( ! $this->checkUnique('web_users', 'username')) {
             $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('web_user_attributes', 'email', 'internalKey')) {
+        if ( ! $this->checkUnique('web_user_attributes', 'email', 'internalKey')) {
             $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
 
             return false;
@@ -242,13 +242,13 @@ 
         $fld = $this->toArray();
         foreach ($this->default_field['user'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'user');
             unset($fld[$key]);
         }
-        if (!empty($this->set['user'])) {
+        if ( ! empty($this->set['user'])) {
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('web_users')} SET " . implode(', ', $this->set['user']);
             } else {
@@ -266,7 +266,7 @@ 
         unset($fld['id']);
 
         foreach ($fld as $key => $value) {
-            if ($value == '' || !$this->isChanged($key)) {
+            if ($value == '' || ! $this->isChanged($key)) {
                 continue;
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}'");
@@ -276,7 +276,7 @@ 
                 $this->query("INSERT into {$this->makeTable('web_user_settings')} SET `webuser` = {$this->id},`setting_name` = '{$key}',`setting_value` = '{$value}';");
             }
         }
-        if (!$this->newDoc && $this->givenPassword) {
+        if ( ! $this->newDoc && $this->givenPassword) {
             $this->invokeEvent('OnWebChangePassword', array(
                 'userObj'      => $this,
                 'userid'       => $this->id,
@@ -287,7 +287,7 @@ 
             ), $fire_events);
         }
 
-        if (!empty($this->groupIds)) $this->setUserGroups($this->id, $this->groupIds);
+        if ( ! empty($this->groupIds)) $this->setUserGroups($this->id, $this->groupIds);
 
         $this->invokeEvent('OnWebSaveUser', array(
             'userObj' => $this,
@@ -309,13 +309,13 @@ 
     protected function saveQuery(array &$fld) {
         foreach ($this->default_field['attribute'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'attribute');
             unset($fld[$key]);
         }
-        if (!empty($this->set['attribute'])) {
+        if ( ! empty($this->set['attribute'])) {
             if ($this->newDoc) {
                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
                 $SQL = "INSERT into {$this->makeTable('web_user_attributes')} SET " . implode(', ',
@@ -405,7 +405,7 @@ 
         $b = $tmp->get('blocked');
         $bu = $tmp->get('blockeduntil');
         $ba = $tmp->get('blockedafter');
-        $flag = (($b && !$bu && !$ba) || ($bu && $now < $bu) || ($ba && $now > $ba));
+        $flag = (($b && ! $bu && ! $ba) || ($bu && $now < $bu) || ($ba && $now > $ba));
         unset($tmp);
 
         return $flag;
@@ -427,7 +427,7 @@ 
 
         $flag = $pluginFlag = false;
         if (
-            (null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
+            (null !== $tmp->getID()) && ( ! $blocker || ($blocker && ! $tmp->checkBlock($id)))
         ) {
             $eventResult = $this->getInvokeEventResult('OnWebAuthentication', array(
                 'userObj'       => $this,
@@ -443,7 +443,7 @@ 
             } else {
                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if ( ! $pluginFlag) {
                 $flag = ($tmp->get('password') == $tmp->getPassword($password));
             }
         }
@@ -463,7 +463,7 @@ 
         if (isset($_COOKIE[$cookieName])) {
             $cookie = explode('|', $_COOKIE[$cookieName], 4);
             if (isset($cookie[0], $cookie[1], $cookie[2]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {
-                if (!$fulltime && isset($cookie[4])) {
+                if ( ! $fulltime && isset($cookie[4])) {
                     $fulltime = (int)$cookie[4];
                 }
                 $this->close();
@@ -474,7 +474,7 @@ 
                     && null !== $this->getID()
                     && $this->get('password') == $cookie[1]
                     && $this->get('sessionid') == $cookie[2]
-                    && !$this->checkBlock($this->getID())
+                    && ! $this->checkBlock($this->getID())
                 ) {
                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
 
@@ -491,7 +491,7 @@ 
      */
     public function logOut($cookieName = 'WebLoginPE', $fire_events = false)
     {
-        if (!$uid = $this->modx->getLoginUserID('web')) {
+        if ( ! $uid = $this->modx->getLoginUserID('web')) {
             return;
         }
         $params = array(
@@ -535,7 +535,7 @@ 
                     $_SESSION['webUsrConfigSet'] = array();
                     $_SESSION['webUserGroupNames'] = $this->getUserGroups();
                     $_SESSION['webDocgroups'] = $this->getDocumentGroups();
-                    if (!empty($remember)) {
+                    if ( ! empty($remember)) {
                         $this->setAutoLoginCookie($cookieName, $remember);
                     }
                 }
@@ -587,7 +587,7 @@ 
      */
     public function setAutoLoginCookie($cookieName, $remember = true)
     {
-        if (!empty($cookieName) && $this->getID() !== null) {
+        if ( ! empty($cookieName) && $this->getID() !== null) {
             $secure = $this->isSecure();
             $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
             $cookieValue = array(md5($this->get('username')), $this->get('password'), $this->get('sessionid'), $remember);
@@ -653,7 +653,7 @@ 
      */
     public function setUserGroups($userID = 0, $groupIds = array())
     {
-        if (!is_array($groupIds)) return $this;
+        if ( ! is_array($groupIds)) return $this;
         if ($this->newDoc && $userID == 0) {
             $this->groupIds = $groupIds;
         } else {
@@ -662,7 +662,7 @@ 
                 foreach ($groupIds as $gid) {
                     $this->query("REPLACE INTO {$this->makeTable('web_groups')} (`webgroup`, `webuser`) VALUES ('{$gid}', '{$uid}')");
                 }
-                if (!$this->newDoc) {
+                if ( ! $this->newDoc) {
                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('web_groups')} WHERE `webuser`={$uid} AND `webgroup` NOT IN ({$groupIds})");
                 }

Braces +116 added lines, -107 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * Class modUsers
  */
-class modUsers extends MODxAPI
-{
+class modUsers extends MODxAPI

+{

     /**
      * @var array
      */
@@ -64,8 +64,8 @@ 
      * @param bool $debug
      * @throws Exception
      */
-    public function __construct(DocumentParser $modx, $debug = false)
-    {
+    public function __construct(DocumentParser $modx, $debug = false)

+    {

         $this->setRememberTime(60 * 60 * 24 * 365 * 5);
         parent::__construct($modx, $debug);
     }
@@ -74,7 +74,8 @@ 
      * @param $val
      * @return $this
      */
-    protected function setRememberTime($val){
+    protected function setRememberTime($val)

+    {

         $this->rememberTime = (int)$val;
         return $this;
     }
@@ -82,7 +83,8 @@ 
     /**
      * @return integer
      */
-    public function getRememberTime(){
+    public function getRememberTime()

+    {

         return $this->rememberTime;
     }
 
@@ -90,8 +92,8 @@ 
      * @param $key
      * @return bool
      */
-    public function issetField($key)
-    {
+    public function issetField($key)

+    {

         return (array_key_exists($key, $this->default_field['user']) || array_key_exists($key,
                 $this->default_field['attribute']) || in_array($key, $this->default_field['hidden']));
     }
@@ -100,9 +102,9 @@ 
      * @param string $data
      * @return string|false
      */
-    protected function findUser($data)
-    {
-        switch (true) {
+    protected function findUser($data)

+    {

+        switch (true) {

             case (is_int($data) || ((int)$data > 0 && (string)intval($data) === $data)):
                 $find = 'attribute.internalKey';
                 break;
@@ -123,8 +125,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         parent::create($data);
         $this->set('createdon', time());
 
@@ -135,16 +137,16 @@ 
      * @param $id
      * @return $this
      */
-    public function edit($id)
-    {
+    public function edit($id)

+    {

         $id = is_scalar($id) ? trim($id) : '';
-        if ($this->getID() != $id) {
+        if ($this->getID() != $id) {

             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if (!$find = $this->findUser($id)) {

                 $this->id = null;
-            } else {
+            } else {

                 $this->set('editedon', time());
                 $this->editQuery($find, $id);
                 $this->id = empty($this->field['internalKey']) ? null : $this->get('internalKey');
@@ -161,7 +163,8 @@ 
      * @param string $find
      * @param string $id
      */
-    protected function editQuery($find, $id) {
+    protected function editQuery($find, $id)

+    {

         $result = $this->query("
             SELECT * from {$this->makeTable('web_user_attributes')} as attribute
             LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
@@ -175,10 +178,10 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if (is_scalar($value) && is_scalar($key) && !empty($key)) {
-            switch ($key) {
+    public function set($key, $value)

+    {

+        if (is_scalar($value) && is_scalar($key) && !empty($key)) {

+            switch ($key) {

                 case 'password':
                     $this->givenPassword = $value;
                     $value = $this->getPassword($value);
@@ -186,7 +189,7 @@ 
                 case 'sessionid':
                     session_regenerate_id(false);
                     $value = session_id();
-                    if ($mid = $this->modx->getLoginUserID('mgr')) {
+                    if ($mid = $this->modx->getLoginUserID('mgr')) {

                         $this->modx->db->query("UPDATE {$this->makeTable('active_user_locks')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
                         $this->modx->db->query("UPDATE {$this->makeTable('active_user_sessions')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
                         $this->modx->db->query("UPDATE {$this->makeTable('active_users')} SET `sid`='{$value}' WHERE `internalKey`={$mid}");
@@ -207,8 +210,8 @@ 
      * @param $pass
      * @return string
      */
-    public function getPassword($pass)
-    {
+    public function getPassword($pass)

+    {

         return md5($pass);
     }
 
@@ -217,66 +220,66 @@ 
      * @param bool $clearCache
      * @return bool|int|null|void
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
-        if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {
+    public function save($fire_events = false, $clearCache = false)

+    {

+        if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {

             $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>' . print_r($this->toArray(),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('web_users', 'username')) {
+        if (!$this->checkUnique('web_users', 'username')) {

             $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('web_user_attributes', 'email', 'internalKey')) {
+        if (!$this->checkUnique('web_user_attributes', 'email', 'internalKey')) {

             $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
 
             return false;
         }
         $this->set('sessionid', '');
         $fld = $this->toArray();
-        foreach ($this->default_field['user'] as $key => $value) {
+        foreach ($this->default_field['user'] as $key => $value) {

             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'user');
             unset($fld[$key]);
         }
-        if (!empty($this->set['user'])) {
-            if ($this->newDoc) {
+        if (!empty($this->set['user'])) {

+            if ($this->newDoc) {

                 $SQL = "INSERT into {$this->makeTable('web_users')} SET " . implode(', ', $this->set['user']);
-            } else {
+            } else {

                 $SQL = "UPDATE {$this->makeTable('web_users')} SET " . implode(', ',
                         $this->set['user']) . " WHERE id = " . $this->id;
             }
             $this->query($SQL);
         }
 
-        if ($this->newDoc) {
+        if ($this->newDoc) {

             $this->id = $this->modx->db->getInsertId();
         }
 
         $this->saveQuery($fld);
         unset($fld['id']);
 
-        foreach ($fld as $key => $value) {
-            if ($value == '' || !$this->isChanged($key)) {
+        foreach ($fld as $key => $value) {

+            if ($value == '' || !$this->isChanged($key)) {

                 continue;
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}'");
-            if ($this->modx->db->getRecordCount($result) > 0) {
+            if ($this->modx->db->getRecordCount($result) > 0) {

                 $this->query("UPDATE {$this->makeTable('web_user_settings')} SET `setting_value` = '{$value}' WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}';");
-            } else {
+            } else {

                 $this->query("INSERT into {$this->makeTable('web_user_settings')} SET `webuser` = {$this->id},`setting_name` = '{$key}',`setting_value` = '{$value}';");
             }
         }
-        if (!$this->newDoc && $this->givenPassword) {
+        if (!$this->newDoc && $this->givenPassword) {

             $this->invokeEvent('OnWebChangePassword', array(
                 'userObj'      => $this,
                 'userid'       => $this->id,
@@ -287,7 +290,9 @@ 
             ), $fire_events);
         }
 
-        if (!empty($this->groupIds)) $this->setUserGroups($this->id, $this->groupIds);
+        if (!empty($this->groupIds)) {

+            $this->setUserGroups($this->id, $this->groupIds);

+        }

 
         $this->invokeEvent('OnWebSaveUser', array(
             'userObj' => $this,
@@ -296,7 +301,7 @@ 
             'user'    => $this->toArray()
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
 
@@ -306,21 +311,22 @@ 
     /**
      * @param  array  $fld
      */
-    protected function saveQuery(array &$fld) {
-        foreach ($this->default_field['attribute'] as $key => $value) {
+    protected function saveQuery(array &$fld)

+    {

+        foreach ($this->default_field['attribute'] as $key => $value) {

             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {

                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'attribute');
             unset($fld[$key]);
         }
-        if (!empty($this->set['attribute'])) {
-            if ($this->newDoc) {
+        if (!empty($this->set['attribute'])) {

+            if ($this->newDoc) {

                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
                 $SQL = "INSERT into {$this->makeTable('web_user_attributes')} SET " . implode(', ',
                         $this->set['attribute']);
-            } else {
+            } else {

                 $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET " . implode(', ',
                         $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();
             }
@@ -333,9 +339,9 @@ 
      * @param bool $fire_events
      * @return bool|null|void
      */
-    public function delete($ids, $fire_events = false)
-    {
-        if ($this->edit($ids)) {
+    public function delete($ids, $fire_events = false)

+    {

+        if ($this->edit($ids)) {

             $flag = $this->deleteQuery();
             $this->query("DELETE FROM {$this->makeTable('web_user_settings')} WHERE webuser='{$this->getID()}'");
             $this->query("DELETE FROM {$this->makeTable('web_groups')} WHERE webuser='{$this->getID()}'");
@@ -346,7 +352,7 @@ 
                 'username'    => $this->get('username'),
                 'timestamp'   => time()
             ), $fire_events);
-        } else {
+        } else {

             $flag = false;
         }
         $this->close();
@@ -354,7 +360,8 @@ 
         return $flag;
     }
 
-    protected function deleteQuery() {
+    protected function deleteQuery()

+    {

         return $this->query("
           DELETE user,attribute FROM {$this->makeTable('web_user_attributes')} as attribute
             LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
@@ -368,13 +375,13 @@ 
      * @param bool $fire_events
      * @return bool
      */
-    public function authUser($id = 0, $fulltime = true, $cookieName = 'WebLoginPE', $fire_events = false)
-    {
+    public function authUser($id = 0, $fulltime = true, $cookieName = 'WebLoginPE', $fire_events = false)

+    {

         $flag = false;
-        if (null === $this->getID() && $id) {
+        if (null === $this->getID() && $id) {

             $this->edit($id);
         }
-        if (null !== $this->getID()) {
+        if (null !== $this->getID()) {

             $flag = true;
             $this->save(false);
             $this->SessionHandler('start', $cookieName, $fulltime);
@@ -394,10 +401,10 @@ 
      * @param int $id
      * @return bool
      */
-    public function checkBlock($id = 0)
-    {
+    public function checkBlock($id = 0)

+    {

         $tmp = clone $this;
-        if ($id && $tmp->getID() != $id) {
+        if ($id && $tmp->getID() != $id) {

             $tmp->edit($id);
         }
         $now = time();
@@ -418,17 +425,17 @@ 
      * @param bool $fire_events
      * @return bool
      */
-    public function testAuth($id, $password, $blocker, $fire_events = false)
-    {
+    public function testAuth($id, $password, $blocker, $fire_events = false)

+    {

         $tmp = clone $this;
-        if ($id && $tmp->getID() != $id) {
+        if ($id && $tmp->getID() != $id) {

             $tmp->edit($id);
         }
 
         $flag = $pluginFlag = false;
         if (
             (null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
-        ) {
+        ) {

             $eventResult = $this->getInvokeEventResult('OnWebAuthentication', array(
                 'userObj'       => $this,
                 'userid'        => $tmp->getID(),
@@ -436,14 +443,14 @@ 
                 'userpassword'  => $password,
                 'savedpassword' => $tmp->get('password')
             ), $fire_events);
-            if (is_array($eventResult)) {
-                foreach ($eventResult as $result) {
+            if (is_array($eventResult)) {

+                foreach ($eventResult as $result) {

                     $pluginFlag = (bool)$result;
                 }
-            } else {
+            } else {

                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if (!$pluginFlag) {

                 $flag = ($tmp->get('password') == $tmp->getPassword($password));
             }
         }
@@ -457,13 +464,13 @@ 
      * @param string $cookieName
      * @return bool
      */
-    public function AutoLogin($fulltime = true, $cookieName = 'WebLoginPE', $fire_events = null)
-    {
+    public function AutoLogin($fulltime = true, $cookieName = 'WebLoginPE', $fire_events = null)

+    {

         $flag = false;
-        if (isset($_COOKIE[$cookieName])) {
+        if (isset($_COOKIE[$cookieName])) {

             $cookie = explode('|', $_COOKIE[$cookieName], 4);
-            if (isset($cookie[0], $cookie[1], $cookie[2]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {
-                if (!$fulltime && isset($cookie[4])) {
+            if (isset($cookie[0], $cookie[1], $cookie[2]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {

+                if (!$fulltime && isset($cookie[4])) {

                     $fulltime = (int)$cookie[4];
                 }
                 $this->close();
@@ -475,7 +482,7 @@ 
                     && $this->get('password') == $cookie[1]
                     && $this->get('sessionid') == $cookie[2]
                     && !$this->checkBlock($this->getID())
-                ) {
+                ) {

                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
 
                 }
@@ -489,9 +496,9 @@ 
      * @param string $cookieName
      * @param bool $fire_events
      */
-    public function logOut($cookieName = 'WebLoginPE', $fire_events = false)
-    {
-        if (!$uid = $this->modx->getLoginUserID('web')) {
+    public function logOut($cookieName = 'WebLoginPE', $fire_events = false)

+    {

+        if (!$uid = $this->modx->getLoginUserID('web')) {

             return;
         }
         $params = array(
@@ -517,11 +524,11 @@ 
      *
      * remeber может быть числом в секундах
      */
-    protected function SessionHandler($directive, $cookieName, $remember = true)
-    {
-        switch ($directive) {
+    protected function SessionHandler($directive, $cookieName, $remember = true)

+    {

+        switch ($directive) {

             case 'start':
-                if ($this->getID() !== null) {
+                if ($this->getID() !== null) {

                     $_SESSION['webShortname'] = $this->get('username');
                     $_SESSION['webFullname'] = $this->get('fullname');
                     $_SESSION['webEmail'] = $this->get('email');
@@ -535,13 +542,13 @@ 
                     $_SESSION['webUsrConfigSet'] = array();
                     $_SESSION['webUserGroupNames'] = $this->getUserGroups();
                     $_SESSION['webDocgroups'] = $this->getDocumentGroups();
-                    if (!empty($remember)) {
+                    if (!empty($remember)) {

                         $this->setAutoLoginCookie($cookieName, $remember);
                     }
                 }
                 break;
             case 'destroy':
-                if (isset($_SESSION['mgrValidated'])) {
+                if (isset($_SESSION['mgrValidated'])) {

                     unset($_SESSION['webShortname']);
                     unset($_SESSION['webFullname']);
                     unset($_SESSION['webEmail']);
@@ -557,8 +564,8 @@ 
                     unset($_SESSION['webDocgroups']);
 
                     setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
-                } else {
-                    if (isset($_COOKIE[session_name()])) {
+                } else {

+                    if (isset($_COOKIE[session_name()])) {

                         setcookie(session_name(), '', time() - 60, MODX_BASE_URL);
                     }
                     setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
@@ -573,8 +580,8 @@ 
     /**
      * @return bool
      */
-    public function isSecure()
-    {
+    public function isSecure()

+    {

         $out = $this->modxConfig('server_protocol') == 'http' ? false : true;
 
         return $out;
@@ -585,9 +592,9 @@ 
      * @param bool|integer $remember
      * @return $this
      */
-    public function setAutoLoginCookie($cookieName, $remember = true)
-    {
-        if (!empty($cookieName) && $this->getID() !== null) {
+    public function setAutoLoginCookie($cookieName, $remember = true)

+    {

+        if (!empty($cookieName) && $this->getID() !== null) {

             $secure = $this->isSecure();
             $remember = is_bool($remember) ? $this->getRememberTime() : (int)$remember;
             $cookieValue = array(md5($this->get('username')), $this->get('password'), $this->get('sessionid'), $remember);
@@ -603,11 +610,11 @@ 
      * @param int $userID
      * @return array
      */
-    public function getDocumentGroups($userID = 0)
-    {
+    public function getDocumentGroups($userID = 0)

+    {

         $out = array();
         $user = $this->switchObject($userID);
-        if (null !== $user->getID()) {
+        if (null !== $user->getID()) {

             $web_groups = $this->modx->getFullTableName('web_groups');
             $webgroup_access = $this->modx->getFullTableName('webgroup_access');
 
@@ -626,18 +633,18 @@ 
      * @param int $userID
      * @return array
      */
-    public function getUserGroups($userID = 0)
-    {
+    public function getUserGroups($userID = 0)

+    {

         $out = array();
         $user = $this->switchObject($userID);
-        if (null !== $user->getID()) {
+        if (null !== $user->getID()) {

             $web_groups = $this->makeTable('web_groups');
             $webgroup_names = $this->makeTable('webgroup_names');
 
             $rs = $this->query("SELECT `ug`.`webgroup`, `ugn`.`name` FROM {$web_groups} as `ug`
                 INNER JOIN {$webgroup_names} as `ugn` ON `ugn`.`id`=`ug`.`webgroup`
                 WHERE `ug`.`webuser` = " . $user->getID());
-            while ($row = $this->modx->db->getRow($rs)) {
+            while ($row = $this->modx->db->getRow($rs)) {

                 $out[$row['webgroup']] = $row['name'];
             }
         }
@@ -651,18 +658,20 @@ 
      * @param array $groupIds
      * @return $this
      */
-    public function setUserGroups($userID = 0, $groupIds = array())
-    {
-        if (!is_array($groupIds)) return $this;
-        if ($this->newDoc && $userID == 0) {
+    public function setUserGroups($userID = 0, $groupIds = array())

+    {

+        if (!is_array($groupIds)) {

+            return $this;

+        }

+        if ($this->newDoc && $userID == 0) {

             $this->groupIds = $groupIds;
-        } else {
+        } else {

             $user = $this->switchObject($userID);
-            if ($uid = $user->getID()) {
-                foreach ($groupIds as $gid) {
+            if ($uid = $user->getID()) {

+                foreach ($groupIds as $gid) {

                     $this->query("REPLACE INTO {$this->makeTable('web_groups')} (`webgroup`, `webuser`) VALUES ('{$gid}', '{$uid}')");
                 }
-                if (!$this->newDoc) {
+                if (!$this->newDoc) {

                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('web_groups')} WHERE `webuser`={$uid} AND `webgroup` NOT IN ({$groupIds})");
                 }

assets/lib/MODxAPI/autoTable.abstract.php

Braces +32 added lines, -33 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * Class autoTable
  */
-abstract class autoTable extends MODxAPI
-{
+abstract class autoTable extends MODxAPI

+{

     /**
      * @var null
      */
@@ -18,8 +18,8 @@ 
     /**
      * @return null
      */
-    public function tableName()
-    {
+    public function tableName()

+    {

         return $this->table;
     }
 
@@ -28,16 +28,16 @@ 
      * @param DocumentParser $modx
      * @param bool $debug
      */
-    public function __construct($modx, $debug = false)
-    {
+    public function __construct($modx, $debug = false)

+    {

         parent::__construct($modx, $debug);
-        if (empty($this->default_field)) {
+        if (empty($this->default_field)) {

             $data = $this->modx->db->getTableMetaData($this->makeTable($this->table));
-            foreach ($data as $item) {
-                if (empty($this->pkName) && $item['Key'] == 'PRI') {
+            foreach ($data as $item) {

+                if (empty($this->pkName) && $item['Key'] == 'PRI') {

                     $this->pkName = $item['Field'];
                 }
-                if ($this->pkName != $item['Field']) {
+                if ($this->pkName != $item['Field']) {

                     $this->default_field[$item['Field']] = $item['Default'];
                 }
             }
@@ -49,10 +49,10 @@ 
      * @param $id
      * @return $this
      */
-    public function edit($id)
-    {
+    public function edit($id)

+    {

         $id = is_scalar($id) ? trim($id) : '';
-        if ($this->getID() != $id) {
+        if ($this->getID() != $id) {

             $this->close();
             $this->markAllEncode();
             $this->newDoc = false;
@@ -60,9 +60,9 @@ 
             $this->fromArray($this->modx->db->getRow($result));
             $this->store($this->toArray());
             $this->id = $this->eraseField($this->pkName);
-            if (is_bool($this->id) && $this->id === false) {
+            if (is_bool($this->id) && $this->id === false) {

                 $this->id = null;
-            } else {
+            } else {

                 $this->decodeFields();
             }
         }
@@ -75,40 +75,39 @@ 
      * @param bool $clearCache
      * @return bool|null|void
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
-        foreach ($this->jsonFields as $field) {
+    public function save($fire_events = false, $clearCache = false)

+    {

+        foreach ($this->jsonFields as $field) {

             if ($this->get($field) === null
                 && isset($this->default_field[$field])
-                && is_array($this->default_field[$field]))
-            {
+                && is_array($this->default_field[$field])) {

                 $this->set($field, $this->default_field[$field]);
             }
         }
         $fld = $this->encodeFields()->toArray();
-        foreach ($this->default_field as $key => $value) {
-            if ($this->newDoc && $this->get($key) === null && $this->get($key) !== $value) {
+        foreach ($this->default_field as $key => $value) {

+            if ($this->newDoc && $this->get($key) === null && $this->get($key) !== $value) {

                 $this->set($key, $value);
             }
-            if ((!$this->generateField || isset($fld[$key])) && $this->get($key) !== null) {
+            if ((!$this->generateField || isset($fld[$key])) && $this->get($key) !== null) {

                 $this->Uset($key);
             }
             unset($fld[$key]);
         }
-        if (!empty($this->set)) {
-            if ($this->newDoc) {
+        if (!empty($this->set)) {

+            if ($this->newDoc) {

                 $SQL = "INSERT {$this->ignoreError} INTO {$this->makeTable($this->table)} SET " . implode(', ',
                         $this->set);
-            } else {
+            } else {

                 $SQL = ($this->getID() === null) ? null : "UPDATE {$this->ignoreError} {$this->makeTable($this->table)} SET " . implode(', ',
                         $this->set) . " WHERE `" . $this->pkName . "` = " . $this->getID();
             }
             $this->query($SQL);
-            if ($this->newDoc) {
+            if ($this->newDoc) {

                 $this->id = $this->modx->db->getInsertId();
             }
         }
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
         $this->decodeFields();
@@ -122,16 +121,16 @@ 
      * @return $this
      * @throws Exception
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

         $_ids = $this->cleanIDs($ids, ',');
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $id = $this->sanitarIn($_ids);
-            if (!empty($id)) {
+            if (!empty($id)) {

                 $this->query("DELETE from {$this->makeTable($this->table)} where `" . $this->pkName . "` IN ({$id})");
             }
             $this->clearCache($fire_events);
-        } else {
+        } else {

             throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre>');
         }