AgelxNash / DocLister

assets/lib/MODxAPI/modResource.php

Doc Comments +6 added lines, -6 removed lines

@@ -309,7 +309,7 @@ 
     }
 
     /**
-     * @param $key
+     * @param string $key
      * @param $value
      * @return $this
      */
@@ -405,8 +405,8 @@ 
     }
 
     /**
-     * @param $data
-     * @return bool|string
+     * @param integer $data
+     * @return string|false
      */
     protected function findUserBy($data)
     {
@@ -660,7 +660,7 @@ 
 
     /**
      * @param $ids
-     * @param int|bool $depth
+     * @param boolean $depth
      * @return array
      */
     public function childrens($ids, $depth)
@@ -713,7 +713,7 @@ 
     }
 
     /**
-     * @return array
+     * @return integer[]
      */
     private function systemID()
     {
@@ -830,7 +830,7 @@ 
     }
 
     /**
-     * @param $tpl
+     * @param string $tpl
      * @return int
      * @throws Exception
      */

Braces +141 added lines, -141 removed lines

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

+{

     /**
      * @var string
      */
@@ -155,8 +155,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");
@@ -169,8 +169,8 @@ 
     /**
      * @return array
      */
-    public function toArrayMain()
-    {
+    public function toArrayMain()

+    {

         $out = array_intersect_key(parent::toArray(), $this->default_field);
 
         return $out;
@@ -180,18 +180,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);
             }
         }
@@ -206,8 +206,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),
@@ -220,11 +220,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);
         }
 
@@ -236,10 +236,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);
         }
 
@@ -249,8 +249,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()));
@@ -261,8 +261,8 @@ 
     /**
      * @return $this
      */
-    public function touch()
-    {
+    public function touch()

+    {

         $this->set('editedon', time());
 
         return $this;
@@ -272,10 +272,10 @@ 
      * @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);
@@ -293,14 +293,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);
             }
         }
@@ -313,10 +313,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 'parent':
                     $value = (int)$value;
                     break;
@@ -326,38 +326,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;
@@ -384,20 +384,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;
         }
 
@@ -408,9 +408,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;
@@ -431,14 +431,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');
             }
         }
@@ -450,8 +450,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

         parent::create($data);
         $this->set('createdby', null)
             ->set('editedby', null)
@@ -465,22 +465,22 @@ 
      * @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;
 
             $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();
             }
@@ -495,10 +495,10 @@ 
      * @param bool $clearCache
      * @return bool|null|void
      */
-    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;
@@ -514,11 +514,11 @@ 
         ), $fire_events);
 
         $fld = $this->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;
@@ -538,11 +538,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 = $value;
                     }
                     $this->field[$key] = $parent;
@@ -557,41 +557,41 @@ 
             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}'");
             }
         }
 
-        foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key])) {
+        foreach ($fld as $key => $value) {

+            if (empty($this->tv[$key])) {

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

                 $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}'");
-            } else {
+            } else {

                 $value = $this->escape($value);
                 $result = $this->query("SELECT `value` FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}'");
-                if ($this->modx->db->getRecordCount($result) > 0) {
+                if ($this->modx->db->getRecordCount($result) > 0) {

                     $this->query("UPDATE {$this->makeTable('site_tmplvar_contentvalues')} SET `value` = '{$value}' WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}';");
-                } else {
+                } else {

                     $this->query("INSERT into {$this->makeTable('site_tmplvar_contentvalues')} SET `contentid` = {$this->id},`tmplvarid` = {$this->tv[$key]},`value` = '{$value}';");
                 }
             }
         }
-        if (!isset($this->mode)) {
+        if (!isset($this->mode)) {

             $this->mode = $this->newDoc ? "new" : "upd";
             $this->newDoc = false;
         }
@@ -602,7 +602,7 @@ 
             'docObj' => $this
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
 
@@ -614,14 +614,14 @@ 
      * @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);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' 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>');
         }
@@ -633,15 +633,15 @@ 
      * @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'");
         $q = $this->modx->makeArray($q);
         $_ids = array();
-        foreach ($q as $item) {
+        foreach ($q as $item) {

             $_ids[] = $item['id'];
         }
-        if (is_array($_ids) && $_ids != array()) {
+        if (is_array($_ids) && $_ids != array()) {

             $this->invokeEvent('OnBeforeEmptyTrash', array(
                 "ids" => $_ids
             ), $fire_events);
@@ -663,15 +663,15 @@ 
      * @param int|bool $depth
      * @return array
      */
-    public function childrens($ids, $depth)
-    {
+    public function childrens($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->childrens($id, is_bool($depth) ? $depth : ($depth - 1));
                 }
                 $_ids = array_merge($_ids, $id);
@@ -687,24 +687,24 @@ 
      * @return $this
      * @throws Exception
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

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

             $this->invokeEvent('OnBeforeEmptyTrash', array(
                 "ids" => $_ids
             ), $fire_events);
 
             $id = $this->sanitarIn($_ids);
-            if (!empty($id)) {
+            if (!empty($id)) {

                 $this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
                 $this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
                 $this->invokeEvent('OnEmptyTrash', array(
                     "ids" => $_ids
                 ), $fire_events);
             }
-        } else {
+        } else {

             throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids,
                     1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
         }
@@ -715,8 +715,8 @@ 
     /**
      * @return array
      */
-    private function systemID()
-    {
+    private function systemID()

+    {

         $ignore = array(
             0, //empty document
             (int)$this->modxConfig('site_start'),
@@ -726,7 +726,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'];
         }
 
@@ -738,22 +738,22 @@ 
      * @param $alias
      * @return string
      */
-    private function checkAlias($alias)
-    {
+    private 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);
@@ -767,8 +767,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));
     }
 
@@ -776,15 +776,15 @@ 
      * @param bool $reload
      * @return $this
      */
-    protected function get_TV($reload = false)
-    {
-        if (empty($this->modx->_TVnames) || $reload) {
+    protected function get_TV($reload = false)

+    {

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

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

                 $this->modx->_TVnames[$row['name']] = $row['id'];
             }
         }
-        foreach ($this->modx->_TVnames as $name => $id) {
+        foreach ($this->modx->_TVnames as $name => $id) {

             $this->tvid[$id] = $name;
             $this->tv[$name] = $id;
         }
@@ -796,12 +796,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'];
         }
 
@@ -812,16 +812,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;
             }
         }
@@ -834,17 +834,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));
             }
         }
@@ -855,14 +855,14 @@ 
     /**
      * @return string
      */
-    private function getAlias()
-    {
-        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {
+    private 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 = '';
             }
         }

assets/lib/Helpers/Video.php

Spacing +11 added lines, -11 removed lines

@@ -90,7 +90,7 @@ 
      */
     public function __construct($link = null, $autostart = true, $info = false)
     {
-        if (!empty($link)) {
+        if ( ! empty($link)) {
             $this->setLink($link);
             $this->setInfo($info);
             if ($autostart) {
@@ -181,10 +181,10 @@ 
     /** Обработка ссылки. Возвращает идентификатор видеохостинга или false */
     public function process($link = null, $info = null)
     {
-        if (!empty($link)) {
+        if ( ! empty($link)) {
             $this->setLink($link);
         }
-        if (!empty($info)) {
+        if ( ! empty($info)) {
             $this->setInfo($info);
         }
 
@@ -208,11 +208,11 @@ 
     /** Скачать превью. Если не указать имя файла для записи - функция вернет содержимое файла */
     public function fetchImage($filename = null)
     {
-        if (!$url = $this->getImage()) {
+        if ( ! $url = $this->getImage()) {
             return false;
         }
 
-        if (!$res = $this->fetchPage($url)) {
+        if ( ! $res = $this->fetchPage($url)) {
             return false;
         }
 
@@ -224,11 +224,11 @@ 
     /** Проверка и подготовка ссылки и частей */
     protected function cleanLink()
     {
-        if (!preg_match('/^(http|https)\:\/\//i', $this->link)) {
+        if ( ! preg_match('/^(http|https)\:\/\//i', $this->link)) {
             $this->link = 'http://' . $this->link;
         }
 
-        if (!$this->link_parts = parse_url($this->link)) {
+        if ( ! $this->link_parts = parse_url($this->link)) {
             return false;
         }
 
@@ -244,7 +244,7 @@ 
         if ('youtube.com' == $h) {
             parse_str($this->link_parts['query'], $q);
 
-            if ('/watch' == $p && !empty($q['v'])) {
+            if ('/watch' == $p && ! empty($q['v'])) {
                 return $this->foundYoutube($q['v']);
             }
             if (0 === strpos($p, '/embed/')) {
@@ -317,7 +317,7 @@ 
     /** Обработка VIMEO */
     protected function foundVimeo($id)
     {
-        if (empty($id) || !is_numeric($id)) {
+        if (empty($id) || ! is_numeric($id)) {
             return false;
         }
 
@@ -396,7 +396,7 @@ 
         $class = isset($options['class']) ? $options['class'] : '';
 
         $url = $this->getVideo($autoplay);
-        if (!empty($class)) {
+        if ( ! empty($class)) {
             $class = ' class="' . $class . '"';
         }
 
@@ -406,7 +406,7 @@ 
     /** Прогоняем тест по видам URL */
     public static function RunTest($links = null)
     {
-        if (!is_array($links)) {
+        if ( ! is_array($links)) {
             $links = static::$test;
         }
 

Braces +87 added lines, -87 removed lines

@@ -11,8 +11,8 @@ 
  * VideoThumb::RunTest()
  * @See: https://gist.github.com/cmsx/5539570
  */
-class Video
-{
+class Video

+{

     /** Ссылка на ролик */
     protected $link;
 
@@ -88,12 +88,12 @@ 
      * @param string|null $link ссылка на видео
      * @param bool $autostart сразу определить превью и клип
      */
-    public function __construct($link = null, $autostart = true, $info = false)
-    {
-        if (!empty($link)) {
+    public function __construct($link = null, $autostart = true, $info = false)

+    {

+        if (!empty($link)) {

             $this->setLink($link);
             $this->setInfo($info);
-            if ($autostart) {
+            if ($autostart) {

                 $this->process();
             }
         }
@@ -102,9 +102,9 @@ 
     /**
      * @return string
      */
-    public function getScheme()
-    {
-        switch ($this->scheme) {
+    public function getScheme()

+    {

+        switch ($this->scheme) {

             case 'http':
                 $out = 'http://';
                 break;
@@ -122,42 +122,42 @@ 
     /**
      * @param $info
      */
-    public function setInfo($info)
-    {
+    public function setInfo($info)

+    {

         $this->info = (bool)$info;
     }
 
     /**
      * @return bool
      */
-    public function getInfo()
-    {
+    public function getInfo()

+    {

         return $this->info;
     }
 
     /** Видеохостинг */
-    public function getHosting()
-    {
+    public function getHosting()

+    {

         return $this->hosting;
     }
 
     /** Идентификатор видео */
-    public function getId()
-    {
+    public function getId()

+    {

         return $this->id;
     }
 
     /** Ссылка на превью */
-    public function getImage()
-    {
+    public function getImage()

+    {

         return $this->getScheme() . $this->image;
     }
 
     /** Ссылка на видео */
-    public function getVideo($autoplay = false)
-    {
+    public function getVideo($autoplay = false)

+    {

         $url = $this->video;
-        if ($autoplay) {
+        if ($autoplay) {

             $url .= '&autoplay=1';
         }
 
@@ -165,39 +165,39 @@ 
     }
 
     /** Название видео */
-    public function getTitle()
-    {
+    public function getTitle()

+    {

         return $this->title;
     }
 
     /** Задать ссылку на видео */
-    public function setLink($link)
-    {
+    public function setLink($link)

+    {

         $this->link = $link;
 
         return $this;
     }
 
     /** Обработка ссылки. Возвращает идентификатор видеохостинга или false */
-    public function process($link = null, $info = null)
-    {
-        if (!empty($link)) {
+    public function process($link = null, $info = null)

+    {

+        if (!empty($link)) {

             $this->setLink($link);
         }
-        if (!empty($info)) {
+        if (!empty($info)) {

             $this->setInfo($info);
         }
 
-        if ($this->cleanLink()) {
-            if ($this->maybeYoutube()) {
+        if ($this->cleanLink()) {

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

                 return self::YOUTUBE;
             }
 
-            if ($this->maybeVimeo()) {
+            if ($this->maybeVimeo()) {

                 return self::VIMEO;
             }
 
-            if ($this->maybeRutube()) {
+            if ($this->maybeRutube()) {

                 return self::RUTUBE;
             }
         }
@@ -206,13 +206,13 @@ 
     }
 
     /** Скачать превью. Если не указать имя файла для записи - функция вернет содержимое файла */
-    public function fetchImage($filename = null)
-    {
-        if (!$url = $this->getImage()) {
+    public function fetchImage($filename = null)

+    {

+        if (!$url = $this->getImage()) {

             return false;
         }
 
-        if (!$res = $this->fetchPage($url)) {
+        if (!$res = $this->fetchPage($url)) {

             return false;
         }
 
@@ -222,13 +222,13 @@ 
     }
 
     /** Проверка и подготовка ссылки и частей */
-    protected function cleanLink()
-    {
-        if (!preg_match('/^(http|https)\:\/\//i', $this->link)) {
+    protected function cleanLink()

+    {

+        if (!preg_match('/^(http|https)\:\/\//i', $this->link)) {

             $this->link = 'http://' . $this->link;
         }
 
-        if (!$this->link_parts = parse_url($this->link)) {
+        if (!$this->link_parts = parse_url($this->link)) {

             return false;
         }
 
@@ -236,21 +236,21 @@ 
     }
 
     /** Проверка YOUTUBE */
-    protected function maybeYoutube()
-    {
+    protected function maybeYoutube()

+    {

         $h = str_replace('www.', '', $this->link_parts['host']);
         $p = isset($this->link_parts['path']) ? $this->link_parts['path'] : false;
 
-        if ('youtube.com' == $h) {
+        if ('youtube.com' == $h) {

             parse_str($this->link_parts['query'], $q);
 
-            if ('/watch' == $p && !empty($q['v'])) {
+            if ('/watch' == $p && !empty($q['v'])) {

                 return $this->foundYoutube($q['v']);
             }
-            if (0 === strpos($p, '/embed/')) {
+            if (0 === strpos($p, '/embed/')) {

                 return $this->foundYoutube(str_replace('/embed/', '', $p));
             }
-        } elseif ('youtu.be' == $h) {
+        } elseif ('youtu.be' == $h) {

             return $this->foundYoutube(trim($p, '/'));
         }
 
@@ -258,14 +258,14 @@ 
     }
 
     /** Проверка VIMEO */
-    protected function maybeVimeo()
-    {
+    protected function maybeVimeo()

+    {

         $h = str_replace('www.', '', $this->link_parts['host']);
         $p = isset($this->link_parts['path']) ? $this->link_parts['path'] : false;
 
-        if ('vimeo.com' == $h) {
+        if ('vimeo.com' == $h) {

             return $this->foundVimeo(trim($p, '/'));
-        } elseif ('player.vimeo.com' == $h && 0 === strpos($p, '/video/')) {
+        } elseif ('player.vimeo.com' == $h && 0 === strpos($p, '/video/')) {

             return $this->foundVimeo(str_replace('/video/', '', $p));
         }
 
@@ -273,20 +273,20 @@ 
     }
 
     /** Проверка RUTUBE */
-    protected function maybeRutube($html = null)
-    {
+    protected function maybeRutube($html = null)

+    {

         $link = $html ?: $this->link;
 
-        foreach ($this->regexp[self::RUTUBE] as $regexp) {
-            if (preg_match($regexp, $link, $matches)) {
+        foreach ($this->regexp[self::RUTUBE] as $regexp) {

+            if (preg_match($regexp, $link, $matches)) {

                 return $this->foundRutube($matches[1]);
             }
         }
 
         // Проверка на особенную ссылку RUtube`a
-        if (is_null($html) && preg_match($this->regexp_rutube_extra, $this->link, $matches)) {
+        if (is_null($html) && preg_match($this->regexp_rutube_extra, $this->link, $matches)) {

             $html = $this->fetchPage($matches[0]);
-            if ($r = $this->maybeRutube($html)) {
+            if ($r = $this->maybeRutube($html)) {

                 return $r;
             }
         }
@@ -295,9 +295,9 @@ 
     }
 
     /** Обработка YOUTUBE */
-    protected function foundYoutube($id)
-    {
-        if (empty($id) || strlen($id) != 11) {
+    protected function foundYoutube($id)

+    {

+        if (empty($id) || strlen($id) != 11) {

             return false;
         }
 
@@ -307,7 +307,7 @@ 
         /** @see https://developers.google.com/youtube/player_parameters */
         $this->video = 'www.youtube.com/embed/' . $id . '?showinfo=0&modestbranding=1&rel=0';
 
-        if ($this->info) {
+        if ($this->info) {

             $this->getYoutubeInfo($id);
         }
 
@@ -315,9 +315,9 @@ 
     }
 
     /** Обработка VIMEO */
-    protected function foundVimeo($id)
-    {
-        if (empty($id) || !is_numeric($id)) {
+    protected function foundVimeo($id)

+    {

+        if (empty($id) || !is_numeric($id)) {

             return false;
         }
 
@@ -325,7 +325,7 @@ 
         $this->id = $id;
         $this->video = 'player.vimeo.com/video/' . $id . '?';
 
-        if ($this->info) {
+        if ($this->info) {

             $this->getVimeoInfo($id);
         }
 
@@ -333,13 +333,13 @@ 
     }
 
     /** Обработка RUTUBE */
-    protected function foundRutube($id)
-    {
+    protected function foundRutube($id)

+    {

         $this->hosting = self::RUTUBE;
         $this->id = $id;
         $this->video = 'rutube.ru/video/embed/' . $id . '?';
 
-        if ($this->info) {
+        if ($this->info) {

             $this->getRutubeInfo($id);
         }
 
@@ -347,34 +347,34 @@ 
     }
 
     /** Парсинг XML от RUTUBE и определение превьюхи */
-    protected function getRutubeInfo($id)
-    {
-        if (@$xml = simplexml_load_file("http://rutube.ru/cgi-bin/xmlapi.cgi?rt_mode=movie&rt_movie_id=" . $id . "&utf=1")) {
+    protected function getRutubeInfo($id)

+    {

+        if (@$xml = simplexml_load_file("http://rutube.ru/cgi-bin/xmlapi.cgi?rt_mode=movie&rt_movie_id=" . $id . "&utf=1")) {

             $this->title = (string)$xml->title;
             $this->image = (string)$xml->thumbnail_url;
         }
     }
 
     /** Парсинг XML от VIMEO и определение превьюхи */
-    protected function getVimeoInfo($id)
-    {
-        if (@$xml = simplexml_load_file('http://vimeo.com/api/v2/video/' . $id . '.xml')) {
+    protected function getVimeoInfo($id)

+    {

+        if (@$xml = simplexml_load_file('http://vimeo.com/api/v2/video/' . $id . '.xml')) {

             $this->title = (string)$xml->video->title;
             $this->image = (string)$xml->video->thumbnail_large ?: $xml->video->thumbnail_medium;
         }
     }
 
     /** Получение названия ролика */
-    protected function getYoutubeInfo($id)
-    {
-        if (@$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/' . $id)) {
+    protected function getYoutubeInfo($id)

+    {

+        if (@$xml = simplexml_load_file('http://gdata.youtube.com/feeds/api/videos/' . $id)) {

             $this->title = (string)$xml->title;
         }
     }
 
     /** Скачивание страницы с помощью CURL */
-    protected function fetchPage($url)
-    {
+    protected function fetchPage($url)

+    {

         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_FAILONERROR, true);
@@ -388,15 +388,15 @@ 
      * @param $options
      * @return string
      */
-    public function getEmbed($options)
-    {
+    public function getEmbed($options)

+    {

         $autoplay = isset($options["autoplay"]) ? $options["autoplay"] : $this->autoplay;
         $width = isset($options["width"]) ? (int)$options["width"] : $this->width;
         $height = isset($options["height"]) ? (int)$options["height"] : $this->height;
         $class = isset($options['class']) ? $options['class'] : '';
 
         $url = $this->getVideo($autoplay);
-        if (!empty($class)) {
+        if (!empty($class)) {

             $class = ' class="' . $class . '"';
         }
 
@@ -404,13 +404,13 @@ 
     }
 
     /** Прогоняем тест по видам URL */
-    public static function RunTest($links = null)
-    {
-        if (!is_array($links)) {
+    public static function RunTest($links = null)

+    {

+        if (!is_array($links)) {

             $links = static::$test;
         }
 
-        foreach ($links as $link) {
+        foreach ($links as $link) {

             $v = new static($link);
             echo "<h1>$link</h1>\n"
                 . "<h3>" . $v->getHosting() . "</h3>"

assets/lib/MODxAPI/modUsers.php

Spacing +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if ( ! $find = $this->findUser($id)) {
                 $this->id = null;
             } else {
                 $result = $this->query("
@@ -119,7 +119,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;
@@ -155,14 +155,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;
@@ -171,13 +171,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 {
@@ -193,13 +193,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('web_user_attributes')} SET " . implode(', ',
@@ -222,7 +222,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,
@@ -318,7 +318,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;
@@ -340,7 +340,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,
@@ -356,7 +356,7 @@ 
             } else {
                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if ( ! $pluginFlag) {
                 $flag = ($tmp->get('password') == $tmp->getPassword($password));
             }
         }
@@ -397,7 +397,7 @@ 
      */
     public function logOut($cookieName = 'WebLoginPE', $fire_events = null)
     {
-        if (!$uid = $this->modx->getLoginUserID('web')) {
+        if ( ! $uid = $this->modx->getLoginUserID('web')) {
             return;
         }
         $params = array(

Braces +85 added lines, -85 removed lines

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

+{

     /**
      * @var array
      */
@@ -53,8 +53,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']));
     }
@@ -63,9 +63,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;
@@ -86,16 +86,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 {

                 $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
@@ -117,10 +117,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);
@@ -136,8 +136,8 @@ 
      * @param $pass
      * @return string
      */
-    public function getPassword($pass)
-    {
+    public function getPassword($pass)

+    {

         return md5($pass);
     }
 
@@ -146,83 +146,83 @@ 
      * @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;
         }
 
         $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();
         }
 
-        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('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();
             }
             $this->query($SQL);
         }
 
-        foreach ($fld as $key => $value) {
-            if ($value == '') {
+        foreach ($fld as $key => $value) {

+            if ($value == '') {

                 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,
@@ -239,7 +239,7 @@ 
             'user'    => $this->toArray()
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
 
@@ -251,9 +251,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('web_user_attributes')} as attribute
             LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey
@@ -267,7 +267,7 @@ 
                 'username'    => $this->get('username'),
                 'timestamp'   => time()
             ), $fire_events);
-        } else {
+        } else {

             $flag = false;
         }
         $this->close();
@@ -282,13 +282,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->SessionHandler('start', $cookieName, $fulltime);
             $this->invokeEvent("OnWebLogin", array(
@@ -307,10 +307,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();
@@ -331,17 +331,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(),
@@ -349,14 +349,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));
             }
         }
@@ -370,18 +370,18 @@ 
      * @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], 2);
-            if (isset($cookie[0], $cookie[1]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {
+            if (isset($cookie[0], $cookie[1]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {

                 $this->close();
                 $q = $this->modx->db->query("SELECT id FROM " . $this->makeTable('web_users') . " WHERE md5(username)='{$this->escape($cookie[0])}'");
                 $id = $this->modx->db->getValue($q);
                 if ($this->edit($id) && null !== $this->getID() && $this->get('password') == $cookie[1] && $this->testAuth($this->getID(),
                         $cookie[1], true)
-                ) {
+                ) {

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

+    {

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

             return;
         }
         $params = array(
@@ -422,11 +422,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()) {
+                if ($this->getID()) {

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

                         $cookieValue = md5($this->get('username')) . '|' . $this->get('password');
                         $cookieExpires = time() + (is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember);
                         setcookie($cookieName, $cookieValue, $cookieExpires, '/');
@@ -448,7 +448,7 @@ 
                 }
                 break;
             case 'destroy':
-                if (isset($_SESSION['mgrValidated'])) {
+                if (isset($_SESSION['mgrValidated'])) {

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

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

                         setcookie(session_name(), '', time() - 60, '/');
                     }
                     setcookie($cookieName, '', time() - 60, '/');
@@ -481,11 +481,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');
 
@@ -504,11 +504,11 @@ 
      * @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');
 
@@ -527,11 +527,11 @@ 
      * @param array $groupIds
      * @return $this
      */
-    public function setUserGroups($userID = 0, $groupIds = array())
-    {
+    public function setUserGroups($userID = 0, $groupIds = array())

+    {

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

+            foreach ($groupIds as $gid) {

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

assets/lib/MODxAPI/MODx.php

Spacing +13 added lines, -13 removed lines

@@ -197,7 +197,7 @@ 
      */
     public function addQuery($q)
     {
-        if (is_scalar($q) && !empty($q)) {
+        if (is_scalar($q) && ! empty($q)) {
             $this->_query[] = $q;
         }
 
@@ -231,7 +231,7 @@ 
      */
     final public function escape($value)
     {
-        if (!is_scalar($value)) {
+        if ( ! is_scalar($value)) {
             $value = '';
         } else {
             $value = $this->modx->db->escape($value);
@@ -372,7 +372,7 @@ 
             //Если уже загружен объект, с которым мы хотим временно поработать
             case ($this->getID() == $id && $id):
                 //Если $id не указан, но уже загружен какой-то объект
-            case (!$id && null !== $this->getID()):
+            case ( ! $id && null !== $this->getID()):
             default:
                 $obj = $this;
                 break;
@@ -407,7 +407,7 @@ 
      */
     public function set($key, $value)
     {
-        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
+        if ((is_scalar($value) || $this->isJsonField($key)) && is_scalar($key) && ! empty($key)) {
             $this->field[$key] = $value;
         }
 
@@ -454,7 +454,7 @@ 
      */
     final protected function Uset($key, $id = '')
     {
-        if (!isset($this->field[$key])) {
+        if ( ! isset($this->field[$key])) {
             $tmp = "`{$key}`=''";
             $this->log[] = "{$key} is empty";
         } else {
@@ -464,7 +464,7 @@ 
                 throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
             }
         }
-        if (!empty($tmp)) {
+        if ( ! empty($tmp)) {
             if ($id == '') {
                 $this->set[] = $tmp;
             } else {
@@ -485,7 +485,7 @@ 
     final public function cleanIDs($IDs, $sep = ',', $ignore = array())
     {
         $out = array();
-        if (!is_array($IDs)) {
+        if ( ! is_array($IDs)) {
             if (is_scalar($IDs)) {
                 $IDs = explode($sep, $IDs);
             } else {
@@ -496,7 +496,7 @@ 
         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 ( ! empty($ignore) && in_array((int)$item, $ignore, true)) {
                     $this->log[] = 'Ignore id ' . (int)$item;
                 } else {
                     $out[] = (int)$item;
@@ -516,7 +516,7 @@ 
      */
     final public function fromJson($data, $callback = null)
     {
-        if (is_scalar($data) && !empty($data)) {
+        if (is_scalar($data) && ! empty($data)) {
             $json = json_decode($data);
         } else {
             throw new Exception("json is not string with json data");
@@ -634,7 +634,7 @@ 
      */
     final public function sanitarIn($data, $sep = ',')
     {
-        if (!is_array($data)) {
+        if ( ! is_array($data)) {
             $data = explode($sep, $data);
         }
         $out = array();
@@ -676,7 +676,7 @@ 
         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 {
                 $flag = false;
@@ -872,7 +872,7 @@ 
      */
     public function getNoEncodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === false);
         });
     }
@@ -883,7 +883,7 @@ 
      */
     public function getNoDecodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === true);
         });
     }

assets/lib/Module/Action.php

Braces +39 added lines, -39 removed lines

@@ -4,8 +4,8 @@ 
  * Class Action
  * @package Module
  */
-abstract class Action
-{
+abstract class Action

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -20,8 +20,8 @@ 
     /**
      * @param \DocumentParser $modx
      */
-    public static function setMODX(\DocumentParser $modx)
-    {
+    public static function setMODX(\DocumentParser $modx)

+    {

         self::$modx = $modx;
     }
 
@@ -30,8 +30,8 @@ 
      * @param Template $tpl
      * @param \MODxAPI $classTable
      */
-    public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable)
-    {
+    public static function init(\DocumentParser $modx, Template $tpl, \MODxAPI $classTable)

+    {

         self::setMODX($modx);
         self::$TPL = Template::showLog();
         self::$_tplObj = $tpl;
@@ -41,8 +41,8 @@ 
     /**
      * @return string
      */
-    public static function TABLE()
-    {
+    public static function TABLE()

+    {

         return static::$TABLE;
     }
 
@@ -50,8 +50,8 @@ 
      * @param $id
      * @return bool
      */
-    protected static function _checkObj($id)
-    {
+    protected static function _checkObj($id)

+    {

         $q = self::$modx->db->select('id', self::$modx->getFullTableName(self::TABLE()), "id = " . $id);
 
         return (self::$modx->db->getRecordCount($q) == 1);
@@ -62,8 +62,8 @@ 
      * @param $id
      * @return mixed
      */
-    protected static function _getValue($field, $id)
-    {
+    protected static function _getValue($field, $id)

+    {

         $q = self::$modx->db->select($field, self::$modx->getFullTableName(self::TABLE()), "id = " . $id);
 
         return self::$modx->db->getValue($q);
@@ -72,9 +72,9 @@ 
     /**
      * @return array|mixed
      */
-    public static function listValue()
-    {
-        $out = self::_workValue(function ($data, $modObj) {
+    public static function listValue()

+    {

+        $out = self::_workValue(function ($data, $modObj) {

             $listFunction = $data['key'] . 'Lists';
             $out = method_exists($modObj, $listFunction) ? $modObj->$listFunction() : array();
             $out['selected'] = $modObj->get($data['key']);
@@ -90,15 +90,15 @@ 
      * @param $callback
      * @return array|mixed
      */
-    protected static function _workValue($callback)
-    {
+    protected static function _workValue($callback)

+    {

         self::$TPL = 'ajax/getValue';
         $data = Helper::jeditable('data');
         $out = array();
-        if (!empty($data)) {
+        if (!empty($data)) {

             $modObj = self::$classTable;
             $modObj->edit($data['id']);
-            if ($modObj->getID() !== null && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))) {
+            if ($modObj->getID() !== null && ((is_object($callback) && ($callback instanceof \Closure)) || is_callable($callback))) {

                 $out = call_user_func($callback, $data, $modObj);
             }
         }
@@ -109,16 +109,16 @@ 
     /**
      * @return array|mixed
      */
-    public static function saveValue()
-    {
-        return self::_workValue(function ($data, $modObj) {
+    public static function saveValue()

+    {

+        return self::_workValue(function ($data, $modObj) {

             $out = array();
-            if (isset($_POST['value']) && is_scalar($_POST['value'])) {
-                if ($modObj->set($data['key'], $_POST['value'])->save()) {
+            if (isset($_POST['value']) && is_scalar($_POST['value'])) {

+                if ($modObj->set($data['key'], $_POST['value'])->save()) {

                     $textMethod = $data['key'] . 'Text';
-                    if (method_exists($modObj, $textMethod)) {
+                    if (method_exists($modObj, $textMethod)) {

                         $out['value'] = $modObj->$textMethod();
-                    } else {
+                    } else {

                         $out['value'] = $modObj->get($data['key']);
                     }
                 }
@@ -131,9 +131,9 @@ 
     /**
      * @return array|mixed
      */
-    public static function getValue()
-    {
-        return self::_workValue(function ($data, $modObj) {
+    public static function getValue()

+    {

+        return self::_workValue(function ($data, $modObj) {

             return array(
                 'value' => $modObj->get($data['key'])
             );
@@ -143,21 +143,21 @@ 
     /**
      * @return array
      */
-    public static function deleted()
-    {
+    public static function deleted()

+    {

         $data = array();
         $dataID = (int)Template::getParam('docId', $_GET);
-        if ($dataID > 0 && self::_checkObj($dataID)) {
+        if ($dataID > 0 && self::_checkObj($dataID)) {

             $oldValue = self::_getValue('deleted_at', $dataID);
             $q = self::$modx->db->update(array(
                 'deleted_at' => empty($oldValue) ? date('Y-m-d H:i:s') : null
             ), self::$modx->getFullTableName(self::TABLE()), "id = " . $dataID);
-            if ($q) {
+            if ($q) {

                 $data['log'] = $oldValue ? 'Запись с ID ' . $dataID . ' восстановлена' : 'Запись с ID ' . $dataID . ' удалена';
-            } else {
+            } else {

                 $data['log'] = $oldValue ? 'Не удалось восстановить запись с ID ' . $dataID : 'Не удалось удалить запись с ID ' . $dataID;
             }
-        } else {
+        } else {

             $data['log'] = '<span class="error">Ошибка</span>. Не удалось определить обновляему запись';
         }
 
@@ -167,16 +167,16 @@ 
     /**
      *
      */
-    public static function lists()
-    {
+    public static function lists()

+    {

         self::$TPL = 'ajax/lists';
     }
 
     /**
      * @return null
      */
-    public static function getClassTable()
-    {
+    public static function getClassTable()

+    {

         return self::$classTable;
     }
 }

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

Braces +12 added lines, -12 removed lines

@@ -4,8 +4,8 @@ 
 /**
  * Class DLCollection
  */
-class DLCollection extends \Helpers\Collection
-{
+class DLCollection extends \Helpers\Collection

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -18,10 +18,10 @@ 
      * @param DocumentParser $modx
      * @param mixed $data
      */
-    public function __construct(DocumentParser $modx, $data = array())
-    {
+    public function __construct(DocumentParser $modx, $data = array())

+    {

         $this->modx = $modx;
-        switch (true) {
+        switch (true) {

             case is_resource($data):
             case (is_object($data) && $data instanceof \mysqli_result):
                 $this->fromQuery($data, false);
@@ -30,7 +30,7 @@ 
                 $this->data = $data;
                 break;
             case (is_object($data) && $data instanceof \IteratorAggregate):
-                foreach ($data as $key => $item) {
+                foreach ($data as $key => $item) {

                     $this->add($item, $key);
                 }
                 break;
@@ -44,13 +44,13 @@ 
      * @param bool $exec
      * @return int
      */
-    public function fromQuery($q, $exec = true)
-    {
+    public function fromQuery($q, $exec = true)

+    {

         $i = 0;
-        if ($exec) {
+        if ($exec) {

             $q = $this->modx->db->query($q);
         }
-        while ($row = $this->modx->db->getRow($q)) {
+        while ($row = $this->modx->db->getRow($q)) {

             $data = $this->create($row);
             $this->add($data);
             $i++;
@@ -63,8 +63,8 @@ 
      * @param array $data
      * @return static
      */
-    public function create(array $data = array())
-    {
+    public function create(array $data = array())

+    {

         return new static($this->modx, $data);
     }
 }

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

Spacing +5 added lines, -5 removed lines

@@ -251,7 +251,7 @@ 
     public function getOutput()
     {
         $out = '';
-        if (!$this->calculate && $this->calculate() && !empty($this->pagination)) {
+        if ( ! $this->calculate && $this->calculate() && ! empty($this->pagination)) {
             $out = str_replace(array("[+class+]", "[+wrap+]"), array($this->className, $this->pagination),
                     $this->mainTpl) . "\n";
         }
@@ -288,7 +288,7 @@ 
     {
         $flag = (strpos($this->target, '?') === false);
         $value = $this->getPageQuery($id);
-        if ($flag && !empty($this->urlF)) {
+        if ($flag && ! empty($this->urlF)) {
             $out = str_replace($this->urlF, $value, $this->target);
         } else {
             $out = $this->target;
@@ -309,12 +309,12 @@ 
         $this->calculate = true;
         $error = false;
 
-        if (!empty($this->urlF) && is_scalar($this->urlF) && $this->urlF != '%' && strpos($this->target,
+        if ( ! empty($this->urlF) && is_scalar($this->urlF) && $this->urlF != '%' && strpos($this->target,
                 $this->urlF) === false
         ) {
             //Es necesario especificar el comodin para sustituir
             $error = true;
-        } elseif (!empty($this->urlF) && is_scalar($this->urlF) && $this->urlF == '%' && strpos($this->target,
+        } elseif ( ! empty($this->urlF) && is_scalar($this->urlF) && $this->urlF == '%' && strpos($this->target,
                 $this->urlF) === false
         ) {
             $error = true;
@@ -323,7 +323,7 @@ 
         if ($this->total_pages < 0) {
             $error = true;
         }
-        if (!is_int($this->limit)) {
+        if ( ! is_int($this->limit)) {
             $error = true;
         }
         if ($error) {

Braces +74 added lines, -72 removed lines

@@ -3,8 +3,8 @@ 
 /**
  * Class DLpaginate
  */
-class DLpaginate
-{
+class DLpaginate

+{

     /**
      * Script Name: *Digg Style Paginator Class
      * Script URI: http://www.mis-algoritmos.com/2007/05/27/digg-style-pagination-class/
@@ -57,8 +57,8 @@ 
      * @param array $config
      * @return $this
      */
-    public function setMode($mode, array $config = array())
-    {
+    public function setMode($mode, array $config = array())

+    {

         $this->mode = $mode;
         $this->modeConfig = $config;
 
@@ -71,8 +71,8 @@ 
      * @param $value
      * @return $this
      */
-    public function items($value)
-    {
+    public function items($value)

+    {

         $this->total_pages = (int)$value;
 
         return $this;
@@ -84,8 +84,8 @@ 
      * @param $value
      * @return $this
      */
-    public function limit($value)
-    {
+    public function limit($value)

+    {

         $this->limit = (int)$value;
 
         return $this;
@@ -97,8 +97,8 @@ 
      * @param $value
      * @return $this
      */
-    public function target($value)
-    {
+    public function target($value)

+    {

         $this->target = $value;
 
         return $this;
@@ -110,8 +110,8 @@ 
      * @param $value
      * @return $this
      */
-    public function currentPage($value)
-    {
+    public function currentPage($value)

+    {

         $this->page = (int)$value;
 
         return $this;
@@ -123,8 +123,8 @@ 
      * @param $value
      * @return $this
      */
-    public function adjacents($value)
-    {
+    public function adjacents($value)

+    {

         $this->adjacents = (int)$value;
 
         return $this;
@@ -136,8 +136,8 @@ 
      * @param string $value
      * @return $this
      */
-    public function showCounter($value = "")
-    {
+    public function showCounter($value = "")

+    {

         $this->showCounter = ($value === true) ? true : false;
 
         return $this;
@@ -149,8 +149,8 @@ 
      * @param string $value
      * @return $this
      */
-    public function changeClass($value = "")
-    {
+    public function changeClass($value = "")

+    {

         $this->className = $value;
 
         return $this;
@@ -160,8 +160,8 @@ 
      * @param $value
      * @return $this
      */
-    public function mainTpl($value)
-    {
+    public function mainTpl($value)

+    {

         $this->mainTpl = $value;
 
         return $this;
@@ -171,8 +171,8 @@ 
      * @param $value
      * @return $this
      */
-    public function nextLabel($value)
-    {
+    public function nextLabel($value)

+    {

         $this->nextT = $value;
 
         return $this;
@@ -182,8 +182,8 @@ 
      * @param $value
      * @return $this
      */
-    public function nextIcon($value)
-    {
+    public function nextIcon($value)

+    {

         $this->nextI = $value;
 
         return $this;
@@ -193,8 +193,8 @@ 
      * @param $value
      * @return $this
      */
-    public function prevLabel($value)
-    {
+    public function prevLabel($value)

+    {

         $this->prevT = $value;
 
         return $this;
@@ -204,8 +204,8 @@ 
      * @param $value
      * @return $this
      */
-    public function prevIcon($value)
-    {
+    public function prevIcon($value)

+    {

         $this->prevI = $value;
 
         return $this;
@@ -217,8 +217,8 @@ 
      * @param string $value
      * @return $this
      */
-    public function parameterName($value = "")
-    {
+    public function parameterName($value = "")

+    {

         $this->parameterName = $value;
 
         return $this;
@@ -230,9 +230,9 @@ 
      * @param string $value
      * @return $this
      */
-    public function urlFriendly($value = "%")
-    {
-        if (preg_match('/^\s/', $value)) {
+    public function urlFriendly($value = "%")

+    {

+        if (preg_match('/^\s/', $value)) {

             $this->urlF = false;
         }
         $this->urlF = $value;
@@ -240,18 +240,18 @@ 
         return $this;
     }
 
-    public function show()
-    {
+    public function show()

+    {

         echo $this->getOutput();
     }
 
     /**
      * @return string
      */
-    public function getOutput()
-    {
+    public function getOutput()

+    {

         $out = '';
-        if (!$this->calculate && $this->calculate() && !empty($this->pagination)) {
+        if (!$this->calculate && $this->calculate() && !empty($this->pagination)) {

             $out = str_replace(array("[+class+]", "[+wrap+]"), array($this->className, $this->pagination),
                     $this->mainTpl) . "\n";
         }
@@ -263,9 +263,9 @@ 
      * @param $page
      * @return int|mixed
      */
-    protected function getPageQuery($page)
-    {
-        switch ($this->mode) {
+    protected function getPageQuery($page)

+    {

+        switch ($this->mode) {

             case 'offset':
                 $display = isset($this->modeConfig['display']) ? $this->modeConfig['display'] : 0;
                 $out = $display * ($page - 1);
@@ -284,15 +284,15 @@ 
      * @param $id
      * @return mixed|string
      */
-    public function get_pagenum_link($id)
-    {
+    public function get_pagenum_link($id)

+    {

         $flag = (strpos($this->target, '?') === false);
         $value = $this->getPageQuery($id);
-        if ($flag && !empty($this->urlF)) {
+        if ($flag && !empty($this->urlF)) {

             $out = str_replace($this->urlF, $value, $this->target);
-        } else {
+        } else {

             $out = $this->target;
-            if ($id > 1) {
+            if ($id > 1) {

                 $out .= ($flag ? "?" : "&") . $this->parameterName . "=" . $value;
             }
         }
@@ -303,30 +303,30 @@ 
     /**
      * @return bool
      */
-    public function calculate()
-    {
+    public function calculate()

+    {

         $this->pagination = "";
         $this->calculate = true;
         $error = false;
 
         if (!empty($this->urlF) && is_scalar($this->urlF) && $this->urlF != '%' && strpos($this->target,
                 $this->urlF) === false
-        ) {
+        ) {

             //Es necesario especificar el comodin para sustituir
             $error = true;
         } elseif (!empty($this->urlF) && is_scalar($this->urlF) && $this->urlF == '%' && strpos($this->target,
                 $this->urlF) === false
-        ) {
+        ) {

             $error = true;
         }
 
-        if ($this->total_pages < 0) {
+        if ($this->total_pages < 0) {

             $error = true;
         }
-        if (!is_int($this->limit)) {
+        if (!is_int($this->limit)) {

             $error = true;
         }
-        if ($error) {
+        if ($error) {

             return false;
         }
 
@@ -342,26 +342,28 @@ 
                 Now we apply our rules and draw the pagination object.
                 We're actually saving the code to a variable in case we want to draw it more than once.
         */
-        if ($lastpage > 1) {
-            if ($this->page) {
-                if ($this->page > 1) {
+        if ($lastpage > 1) {

+            if ($this->page) {

+                if ($this->page > 1) {

                     $this->pagination .= $this->firstT ? $this->renderItemTPL($this->firstT, 0) : '';
                     $this->pagination .= $this->prevT ? $this->renderItemTPL($this->prevT, $prev) : '';
-                } else {
+                } else {

                     $this->pagination .= $this->firstI ? $this->renderItemTPL($this->firstI, 0) : '';
                     $this->pagination .= $this->prevI ? $this->renderItemTPL($this->prevI, $prev) : '';
                 }
             }
             //pages
-            if ($lastpage < 7 + ($this->adjacents * 2)) { //not enough pages to bother breaking it up
-                for ($counter = 1; $counter <= $lastpage; $counter++) {
+            if ($lastpage < 7 + ($this->adjacents * 2)) {

+//not enough pages to bother breaking it up
+                for ($counter = 1; $counter <= $lastpage; $counter++) {

                     $tpl = ($counter == $this->page) ? $this->currentT : $this->numberT;
                     $this->pagination .= $this->renderItemTPL($tpl, $counter);
                 }
-            } elseif ($lastpage > 5 + ($this->adjacents * 2)) { //enough pages to hide some
+            } elseif ($lastpage > 5 + ($this->adjacents * 2)) {

+//enough pages to hide some
                 //close to beginning; only hide later pages
-                if ($this->page < 1 + ($this->adjacents * 2)) {
-                    for ($counter = 1; $counter < 4 + ($this->adjacents * 2); $counter++) {
+                if ($this->page < 1 + ($this->adjacents * 2)) {

+                    for ($counter = 1; $counter < 4 + ($this->adjacents * 2); $counter++) {

                         $tpl = ($counter == $this->page) ? $this->currentT : $this->numberT;
                         $this->pagination .= $this->renderItemTPL($tpl, $counter);
                     }
@@ -369,12 +371,12 @@ 
                     $this->pagination .= $this->renderItemTPL($this->numberT, $lpm1);
                     $this->pagination .= $this->renderItemTPL($this->numberT, $lastpage);
                 } //in middle; hide some front and some back
-                elseif ($lastpage - ($this->adjacents * 2) > $this->page && $this->page > ($this->adjacents * 2)) {
+                elseif ($lastpage - ($this->adjacents * 2) > $this->page && $this->page > ($this->adjacents * 2)) {

                     $this->pagination .= $this->renderItemTPL($this->numberT, 1);
                     $this->pagination .= $this->renderItemTPL($this->numberT, 2);
                     $this->pagination .= $this->renderItemTPL($this->dotsT, 3);
 
-                    for ($counter = $this->page - $this->adjacents; $counter <= $this->page + $this->adjacents; $counter++) {
+                    for ($counter = $this->page - $this->adjacents; $counter <= $this->page + $this->adjacents; $counter++) {

                         $tpl = ($counter == $this->page) ? $this->currentT : $this->numberT;
                         $this->pagination .= $this->renderItemTPL($tpl, $counter);
                     }
@@ -382,27 +384,27 @@ 
                     $this->pagination .= $this->renderItemTPL($this->numberT, $lpm1);
                     $this->pagination .= $this->renderItemTPL($this->numberT, $lastpage);
                 } //close to end; only hide early pages
-                else {
+                else {

                     $this->pagination .= $this->renderItemTPL($this->numberT, 1);
                     $this->pagination .= $this->renderItemTPL($this->numberT, 2);
                     $this->pagination .= $this->renderItemTPL($this->dotsT, 3);
 
-                    for ($counter = $lastpage - (2 + ($this->adjacents * 2)); $counter <= $lastpage; $counter++) {
+                    for ($counter = $lastpage - (2 + ($this->adjacents * 2)); $counter <= $lastpage; $counter++) {

                         $tpl = ($counter == $this->page) ? $this->currentT : $this->numberT;
                         $this->pagination .= $this->renderItemTPL($tpl, $counter);
                     }
                 }
             }
-            if ($this->page) {
-                if ($this->page < $counter - 1) {
+            if ($this->page) {

+                if ($this->page < $counter - 1) {

                     $this->pagination .= $this->nextT ? $this->renderItemTPL($this->nextT, $next) : '';
                     $this->pagination .= $this->lastT ? $this->renderItemTPL($this->lastT, $lastpage) : '';
-                } else {
+                } else {

                     $this->pagination .= $this->nextI ? $this->renderItemTPL($this->nextI, $next) : '';
                     $this->pagination .= $this->lastI ? $this->renderItemTPL($this->lastI, $lastpage) : '';
                 }
 
-                if ($this->showCounter) {
+                if ($this->showCounter) {

                     $this->pagination .= "<div class=\"pagination_data\">($this->total_pages Pages)</div>";
                 }
             }
@@ -416,8 +418,8 @@ 
      * @param $num
      * @return mixed
      */
-    protected function renderItemTPL($tpl, $num)
-    {
+    protected function renderItemTPL($tpl, $num)

+    {

         return str_replace(array('[+num+]', '[+link+]'), array($num, $this->get_pagenum_link($num)), $tpl);
     }
 }

assets/snippets/DocLister/snippet.DLReflect.php

Braces +37 added lines, -37 removed lines

@@ -25,7 +25,7 @@ 
  *            year - по годам
  */
 $reflectType = APIHelpers::getkey($params, 'reflectType', 'month');
-if (!in_array($reflectType, array('year', 'month'))) {
+if (!in_array($reflectType, array('year', 'month'))) {

     return '';
 }
 
@@ -50,9 +50,9 @@ 
  */
 $activeReflectTPL = APIHelpers::getkey($params, 'activeReflectTPL', '@CODE: <li><span>[+title+]</span></li>');
 
-list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {
+list($dateFormat, $sqlDateFormat, $reflectValidator) = DLReflect::switchReflect($reflectType, function () {

     return array('m-Y', '%m-%Y', array('DLReflect', 'validateMonth'));
-}, function () {
+}, function () {

     return array('Y', '%Y', array('DLReflect', 'validateYear'));
 });
 $tmp = $originalDate = date($dateFormat);
@@ -65,13 +65,13 @@ 
  *        Если не указан в параметре, то генерируется автоматически текущая дата
  */
 $currentReflect = APIHelpers::getkey($params, 'currentReflect', $tmp);
-if (!call_user_func($reflectValidator, $currentYear)) {
+if (!call_user_func($reflectValidator, $currentYear)) {

     $currentReflect = $tmp;
 }
 $originalCurrentReflect = $currentReflect;
 
 $selectCurrentReflect = APIHelpers::getkey($params, 'selectCurrentReflect', 1);
-if (!$selectCurrentReflect && $currentReflect == $tmp) {
+if (!$selectCurrentReflect && $currentReflect == $tmp) {

     $currentReflect = null;
 }
 
@@ -99,12 +99,12 @@ 
  */
 $tmp = APIHelpers::getkey($params, 'activeReflect', $currentReflect);
 $tmpGet = APIHelpers::getkey($_GET, $reflectType, $tmp);
-if (!call_user_func($reflectValidator, $tmpGet)) {
+if (!call_user_func($reflectValidator, $tmpGet)) {

     $activeReflect = $tmp;
-    if (!call_user_func($reflectValidator, $activeReflect)) {
+    if (!call_user_func($reflectValidator, $activeReflect)) {

         $activeReflect = $currentReflect;
     }
-} else {
+} else {

     $activeReflect = $tmpGet;
 }
 
@@ -159,10 +159,10 @@ 
 $DLParams['api'] = 'id';
 $DLParams['orderBy'] = $reflectField;
 $DLParams['saveDLObject'] = 'DLAPI';
-if ($reflectSource == 'tv') {
+if ($reflectSource == 'tv') {

     $DLParams['tvSortType'] = 'TVDATETIME';
     $DLParams['selectFields'] = "DATE_FORMAT(STR_TO_DATE(`dltv_" . $reflectField . "_1`.`value`,'%d-%m-%Y %H:%i:%s'), '" . $sqlDateFormat . "') as `id`";
-} else {
+} else {

     $DLParams['orderBy'] = $reflectField;
     $DLParams['selectFields'] = "DATE_FORMAT(FROM_UNIXTIME(" . $reflectField . "), '" . $sqlDateFormat . "') as `id`";
 }
@@ -170,32 +170,32 @@ 
 /** Получаем объект DocLister'a */
 $DLAPI = $modx->getPlaceholder('DLAPI');
 
-if ($reflectType == 'month') {
+if ($reflectType == 'month') {

     //Загружаем лексикон с месяцами
     $DLAPI->loadLang('months');
 }
 
 /** Разбираем API ответ от DocLister'a */
 $totalReflects = json_decode($totalReflects, true);
-if (is_null($totalReflects)) {
+if (is_null($totalReflects)) {

     $totalReflects = array();
 }
 $totalReflects = new DLCollection($modx, $totalReflects);
-$totalReflects = $totalReflects->filter(function ($el) {
+$totalReflects = $totalReflects->filter(function ($el) {

     return !empty($el['id']);
 });
 /** Добавляем активную дату в коллекцию */
-if (!is_null($activeReflect)) {
+if (!is_null($activeReflect)) {

     $totalReflects->add(array('id' => $activeReflect), $activeReflect);
 }
 $hasCurrentReflect = ($totalReflects->indexOf(array('id' => $originalCurrentReflect)) !== false);
 
 /** Добавляем текущую дату в коллекцию */
-if ($appendCurrentReflect) {
+if ($appendCurrentReflect) {

     $totalReflects->add(array('id' => $originalCurrentReflect), $originalCurrentReflect);
 }
 /** Сортируем даты по возрастанию */
-$totalReflects->sort(function ($a, $b) use ($dateFormat) {
+$totalReflects->sort(function ($a, $b) use ($dateFormat) {

     $aDate = DateTime::createFromFormat($dateFormat, $a['id']);
     $bDate = DateTime::createFromFormat($dateFormat, $b['id']);
 
@@ -207,9 +207,9 @@ 
     $activeReflect,
     $originalDate,
     $dateFormat
-) {
+) {

     $aDate = DateTime::createFromFormat($dateFormat, $val['id']);
-    if (is_null($activeReflect)) {
+    if (is_null($activeReflect)) {

         $activeReflect = $originalDate;
     }
     $bDate = DateTime::createFromFormat($dateFormat, $activeReflect);
@@ -217,7 +217,7 @@ 
     return $aDate->getTimestamp() < $bDate->getTimestamp();
 });
 /** Удаляем текущую активную дату из списка дат идущих за текущим */
-if ($rReflect->indexOf(array('id' => $originalCurrentReflect)) !== false) {
+if ($rReflect->indexOf(array('id' => $originalCurrentReflect)) !== false) {

     $rReflect->reindex()->remove(0);
 }
 /** Разворачиваем в обратном порядке список дат до текущей даты */
@@ -225,13 +225,13 @@ 
 
 /** Расчитываем сколько дат из какого списка взять */
 $showBefore = ($lReflect->count() < $limitBefore || empty($limitBefore)) ? $lReflect->count() : $limitBefore;
-if (($rReflect->count() < $limitAfter) || empty($limitAfter)) {
+if (($rReflect->count() < $limitAfter) || empty($limitAfter)) {

     $showAfter = $rReflect->count();
     $showBefore += !empty($limitAfter) ? ($limitAfter - $rReflect->count()) : 0;
-} else {
-    if ($limitBefore > 0) {
+} else {

+    if ($limitBefore > 0) {

         $showAfter = $limitAfter + ($limitBefore - $showBefore);
-    } else {
+    } else {

         $showAfter = $limitAfter;
     }
 }
@@ -241,25 +241,25 @@ 
 $outReflects = new DLCollection($modx);
 /** Берем нужное число элементов с левой стороны */
 $i = 0;
-foreach ($lReflect as $item) {
-    if ((++$i) > $showBefore) {
+foreach ($lReflect as $item) {

+    if ((++$i) > $showBefore) {

         break;
     }
     $outReflects->add($item['id']);
 }
 /** Добавляем текущую дату */
-if (is_null($activeReflect)) {
-    if (($hasCurrentReflect && !$selectCurrentReflect) || $appendCurrentReflect) {
+if (is_null($activeReflect)) {

+    if (($hasCurrentReflect && !$selectCurrentReflect) || $appendCurrentReflect) {

         $outReflects->add($originalCurrentReflect);
     }
-} else {
+} else {

     $outReflects->add($activeReflect);
 }
 
 /** Берем оставшее число позиций с правой стороны */
 $i = 0;
-foreach ($rReflect as $item) {
-    if ((++$i) > $showAfter) {
+foreach ($rReflect as $item) {

+    if ((++$i) > $showAfter) {

         break;
     }
     $outReflects->add($item['id']);
@@ -267,11 +267,11 @@ 
 
 $sortDir = APIHelpers::getkey($params, 'sortDir', 'ASC');
 /** Сортируем результатирующий список  */
-$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {
+$outReflects = $outReflects->sort(function ($a, $b) use ($sortDir, $dateFormat) {

     $aDate = DateTime::createFromFormat($dateFormat, $a);
     $bDate = DateTime::createFromFormat($dateFormat, $b);
     $out = false;
-    switch ($sortDir) {
+    switch ($sortDir) {

         case 'ASC':
             $out = $aDate->getTimestamp() - $bDate->getTimestamp();
             break;
@@ -284,10 +284,10 @@ 
 })->reindex()->unique();
 
 /** Применяем шаблон к каждой отображаемой дате */
-foreach ($outReflects as $reflectItem) {
+foreach ($outReflects as $reflectItem) {

     $tpl = (!is_null($activeReflect) && $activeReflect == $reflectItem) ? $activeReflectTPL : $reflectTPL;
 
-    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {
+    $data = DLReflect::switchReflect($reflectType, function () use ($reflectItem, $DLAPI) {

         list($vMonth, $vYear) = explode('-', $reflectItem, 2);
 
         return array(
@@ -295,7 +295,7 @@ 
             'monthName' => $DLAPI->getMsg('months.' . (int)$vMonth),
             'year'      => $vYear,
         );
-    }, function () use ($reflectItem) {
+    }, function () use ($reflectItem) {

         return array(
             'year' => $reflectItem
         );
@@ -321,9 +321,9 @@ 
 /**
  * Ну и выводим стек отладки если это нужно
  */
-if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {
+if (isset($_SESSION['usertype']) && $_SESSION['usertype'] == 'manager') {

     $debug = $DLAPI->debug->showLog();
-} else {
+} else {

     $debug = '';
 }
 

assets/snippets/DLUsers/src/Actions.php

Spacing +18 added lines, -18 removed lines

@@ -97,7 +97,7 @@ 
     public function logout($params)
     {
         $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-        if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
+        if (is_scalar($LogoutName) && ! empty($LogoutName) && isset($_GET[$LogoutName])) {
             $userID = $this->UserID('web');
             if ($userID) {
                 $this->userObj->edit($userID);
@@ -177,7 +177,7 @@ 
             $dataTPL = $this->userObj->toArray();
             $dataTPL['url.logout'] = $this->logoutUrl($params);
             $homeID = APIHelpers::getkey($params, 'homeID');
-            if (!empty($homeID)) {
+            if ( ! empty($homeID)) {
                 $dataTPL['url.profile'] = $this->makeUrl($homeID);
             }
         } else {
@@ -197,7 +197,7 @@ 
                 'errorCode'  => $errorCode
             );
             $authId = APIHelpers::getkey($params, 'authId');
-            if (!empty($authId)) {
+            if ( ! empty($authId)) {
                 $dataTPL['authPage'] = $this->makeUrl($authId);
                 $dataTPL['method'] = strtolower(__CLASS__ . '::' . 'authpage');
             }
@@ -231,7 +231,7 @@ 
         if ($request === false) {
             $request = array();
         }
-        if (!empty($_SERVER['HTTP_REFERER'])) {
+        if ( ! empty($_SERVER['HTTP_REFERER'])) {
             /**
              * Thank you for super protection against hacking in protect.inc.php:-)
              */
@@ -242,7 +242,7 @@ 
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-            if (!is_scalar($backUrl)) {
+            if ( ! is_scalar($backUrl)) {
                 $backUrl = $refer;
             } else {
                 $backUrl = urldecode($backUrl);
@@ -254,12 +254,12 @@ 
         if ($backUrl === false) {
             $backUrl = array();
         }
-        if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
+        if ( ! empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
             $POST['backUrl'] = $backUrl['path'];
         } else {
             $POST['backUrl'] = $this->getBackUrl($backUrl);
         }
-        if (!empty($POST['backUrl'])) {
+        if ( ! empty($POST['backUrl'])) {
             $idURL = $this->moveTo(array(
                 'url'      => '/' . ltrim($POST['backUrl'], '/'),
                 'validate' => true
@@ -295,8 +295,8 @@ 
     {
         $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
         if (empty($request['host']) || $request['host'] == $selfHost) {
-            $query = !empty($request['query']) ? '?' . $request['query'] : '';
-            $out = !empty($request['path']) ? $request['path'] . $query : '';
+            $query = ! empty($request['query']) ? '?' . $request['query'] : '';
+            $out = ! empty($request['path']) ? $request['path'] . $query : '';
         } else {
             $out = '';
         }
@@ -335,7 +335,7 @@ 
                 'email'    => APIHelpers::getkey($_POST, $emailField, ''),
                 'remember' => (bool)((int)APIHelpers::getkey($_POST, $rememberField, 0))
             ));
-            if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'],
+            if ( ! empty($POST['email']) && is_scalar($POST['email']) && ! $userObj->emailValidate($POST['email'],
                     false)
             ) {
                 $userObj->edit($POST['email']);
@@ -346,7 +346,7 @@ 
                     "rememberme"   => $POST['remember'],
                     'userObj'      => $userObj
                 ));
-                if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {
+                if ($userObj->getID() && ! $userObj->checkBlock($userObj->getID())) {
                     $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
                         "userid"        => $userObj->getID(),
                         "username"      => $userObj->get('username'),
@@ -385,7 +385,7 @@ 
                 $POST['email'] = '';
             }
         }
-        if (!empty($error)) {
+        if ( ! empty($error)) {
             $errorCode = $error;
             $error = APIHelpers::getkey($params, $error, '');
             $error = static::getLangMsg($error, $error);
@@ -434,7 +434,7 @@ 
      */
     public function isGuestGoHome($params)
     {
-        if (!$this->UserID('web')) {
+        if ( ! $this->UserID('web')) {
             /**
              * @see : http://modx.im/blog/triks/105.html
              */
@@ -470,7 +470,7 @@ 
     {
         $id = (int)APIHelpers::getkey($params, 'id', 0);
         $uri = APIHelpers::getkey($params, 'url', '');
-        if ((empty($uri) && !empty($id)) || !is_string($uri)) {
+        if ((empty($uri) && ! empty($id)) || ! is_string($uri)) {
             $uri = $this->makeUrl($id);
         }
         $code = (int)APIHelpers::getkey($params, 'code', 0);
@@ -538,10 +538,10 @@ 
     protected static function loadLang($lang)
     {
         $file = dirname(dirname(__FILE__)) . '/lang/' . $lang . '.php';
-        if (!FS::getInstance()->checkFile($file)) {
+        if ( ! FS::getInstance()->checkFile($file)) {
             $file = false;
         }
-        if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {
+        if ( ! empty($lang) && ! isset(static::$langDic[$lang]) && ! empty($file)) {
             static::$langDic[$lang] = include_once($file);
             if (is_array(static::$langDic[$lang])) {
                 static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
@@ -550,7 +550,7 @@ 
             }
         }
 
-        return !(empty($lang) || empty(static::$langDic[$lang]));
+        return ! (empty($lang) || empty(static::$langDic[$lang]));
     }
 
     /**
@@ -568,7 +568,7 @@ 
         }
         if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {
             $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.' . $key));
-            if (!empty($msg)) {
+            if ( ! empty($msg)) {
                 $out = $msg;
             }
         }

Braces +103 added lines, -103 removed lines

@@ -13,8 +13,8 @@ 
  * Class Actions
  * @package DLUsers
  */
-class Actions
-{
+class Actions

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -40,10 +40,10 @@ 
      *
      * @return self
      */
-    public static function getInstance(DocumentParser $modx, $lang, $userClass = 'modUsers', $debug = false)
-    {
+    public static function getInstance(DocumentParser $modx, $lang, $userClass = 'modUsers', $debug = false)

+    {

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

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

+    {

         $this->modx = $modx;
         $this->userObj = new $userClass($this->modx, $debug);
         $this->url = new DLCollection($this->modx);
@@ -76,8 +76,8 @@ 
      *
      * @return void
      */
-    private function __clone()
-    {
+    private function __clone()

+    {

 
     }
 
@@ -86,23 +86,23 @@ 
      *
      * @return void
      */
-    private function __wakeup()
-    {
+    private function __wakeup()

+    {

 
     }
 
     /**
      * Сброс авторизации и обновление страницы
      */
-    public function logout($params)
-    {
+    public function logout($params)

+    {

         $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
-        if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {
+        if (is_scalar($LogoutName) && !empty($LogoutName) && isset($_GET[$LogoutName])) {

             $userID = $this->UserID('web');
-            if ($userID) {
+            if ($userID) {

                 $this->userObj->edit($userID);
                 $params = array();
-                if ($this->userObj->getID()) {
+                if ($this->userObj->getID()) {

                     $params = array(
                         "userid"   => $this->userObj->getID(),
                         "username" => $this->userObj->get('username')
@@ -110,12 +110,12 @@ 
                     $this->modx->invokeEvent("OnBeforeWebLogout", $params);
                 }
                 $this->userObj->logOut();
-                if ($this->userObj->getID()) {
+                if ($this->userObj->getID()) {

                     $this->modx->invokeEvent("OnWebLogout", $params);
                 }
 
                 $go = APIHelpers::getkey($params, 'url', '');
-                if (empty($go)) {
+                if (empty($go)) {

                     $go = str_replace(
                         array("?" . $LogoutName, "&" . $LogoutName),
                         array("", ""),
@@ -124,13 +124,13 @@ 
                 }
 
                 $start = $this->makeUrl($this->config['site_start']);
-                if ($start == $go) {
+                if ($start == $go) {

                     $go = $this->config['site_url'];
-                } else {
+                } else {

                     $go = $this->config['site_url'] . ltrim($go, '/');
                 }
                 $this->moveTo(array('url' => $go));
-            } else {
+            } else {

                 //Если юзер не авторизован, то показываем ему 404 ошибку
                 $this->modx->sendErrorPage();
             }
@@ -143,8 +143,8 @@ 
      * Генерация ссылки под кнопку выход
      * @return string
      */
-    public function logoutUrl($params)
-    {
+    public function logoutUrl($params)

+    {

         $LogoutName = APIHelpers::getkey($params, 'LogoutName', 'logout');
         $request = parse_url($_SERVER['REQUEST_URI']);
 
@@ -159,8 +159,8 @@ 
      *        если указан параметр authId, то данные из формы перекидываются в метод AuthPage
      *    В противном случае вся работа происходит внутри самого блока
      */
-    public function AuthBlock($params)
-    {
+    public function AuthBlock($params)

+    {

         $POST = array('backUrl' => $_SERVER['REQUEST_URI']);
 
         $error = $errorCode = '';
@@ -169,20 +169,20 @@ 
         $emailField = APIHelpers::getkey($params, 'emailField', 'email');
         $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
-        if ($this->UserID('web')) {
+        if ($this->UserID('web')) {

             $tpl = APIHelpers::getkey($params, 'tplProfile', '');
-            if (empty($tpl)) {
+            if (empty($tpl)) {

                 $tpl = $this->getTemplate('tplProfile');
             }
             $dataTPL = $this->userObj->toArray();
             $dataTPL['url.logout'] = $this->logoutUrl($params);
             $homeID = APIHelpers::getkey($params, 'homeID');
-            if (!empty($homeID)) {
+            if (!empty($homeID)) {

                 $dataTPL['url.profile'] = $this->makeUrl($homeID);
             }
-        } else {
+        } else {

             $tpl = APIHelpers::getkey($params, 'tplForm', '');
-            if (empty($tpl)) {
+            if (empty($tpl)) {

                 $tpl = $this->getTemplate('authForm');
             }
             $POST = $this->Auth($pwdField, $emailField, $rememberField, $POST['backUrl'], __METHOD__, $error,
@@ -197,7 +197,7 @@ 
                 'errorCode'  => $errorCode
             );
             $authId = APIHelpers::getkey($params, 'authId');
-            if (!empty($authId)) {
+            if (!empty($authId)) {

                 $dataTPL['authPage'] = $this->makeUrl($authId);
                 $dataTPL['method'] = strtolower(__CLASS__ . '::' . 'authpage');
             }
@@ -210,8 +210,8 @@ 
      * Авторизация на сайте со страницы авторизации
      * [!Auth? &login=`password` &pwdField=`password` &homeID=`72`!]
      */
-    public function AuthPage($params)
-    {
+    public function AuthPage($params)

+    {

         $homeID = APIHelpers::getkey($params, 'homeID');
         $this->isAuthGoHome(array('id' => $homeID));
 
@@ -223,52 +223,52 @@ 
         $rememberField = APIHelpers::getkey($params, 'rememberField', 'remember');
 
         $tpl = APIHelpers::getkey($params, 'tpl', '');
-        if (empty($tpl)) {
+        if (empty($tpl)) {

             $tpl = $this->getTemplate('authForm');
         }
 
         $request = parse_url($_SERVER['REQUEST_URI']);
-        if ($request === false) {
+        if ($request === false) {

             $request = array();
         }
-        if (!empty($_SERVER['HTTP_REFERER'])) {
+        if (!empty($_SERVER['HTTP_REFERER'])) {

             /**
              * Thank you for super protection against hacking in protect.inc.php:-)
              */
             $refer = htmlspecialchars_decode($_SERVER['HTTP_REFERER'], ENT_QUOTES);
-        } else {
+        } else {

             $refer = $this->getBackUrl($request);
         }
 
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {

             $backUrl = APIHelpers::getkey($_POST, 'backUrl', $POST['backUrl']);
-            if (!is_scalar($backUrl)) {
+            if (!is_scalar($backUrl)) {

                 $backUrl = $refer;
-            } else {
+            } else {

                 $backUrl = urldecode($backUrl);
             }
-        } else {
+        } else {

             $backUrl = $refer;
         }
         $backUrl = parse_url($backUrl);
-        if ($backUrl === false) {
+        if ($backUrl === false) {

             $backUrl = array();
         }
-        if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {
+        if (!empty($backUrl['path']) && $request['path'] != $backUrl['path']) {

             $POST['backUrl'] = $backUrl['path'];
-        } else {
+        } else {

             $POST['backUrl'] = $this->getBackUrl($backUrl);
         }
-        if (!empty($POST['backUrl'])) {
+        if (!empty($POST['backUrl'])) {

             $idURL = $this->moveTo(array(
                 'url'      => '/' . ltrim($POST['backUrl'], '/'),
                 'validate' => true
             ));
-        } else {
+        } else {

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

+            if (empty($homeID)) {

                 $homeID = $this->config['site_start'];
             }
             $POST['backUrl'] = $this->makeUrl($homeID);
@@ -291,13 +291,13 @@ 
      * @param array $request
      * @return string
      */
-    protected function getBackUrl(array $request = array())
-    {
+    protected function getBackUrl(array $request = array())

+    {

         $selfHost = rtrim(str_replace("http://", "", $this->config['site_url']), '/');
-        if (empty($request['host']) || $request['host'] == $selfHost) {
+        if (empty($request['host']) || $request['host'] == $selfHost) {

             $query = !empty($request['query']) ? '?' . $request['query'] : '';
             $out = !empty($request['path']) ? $request['path'] . $query : '';
-        } else {
+        } else {

             $out = '';
         }
 
@@ -324,12 +324,12 @@ 
         &$error,
         &$errorCode,
         $params = array()
-    ) {
+    ) {

         $POST = array(
             'backUrl' => urlencode($backUrl)
         );
         $userObj = &$this->userObj;
-        if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && APIHelpers::getkey($_POST, 'method', '') == strtolower($method)) {

             $POST = array_merge($POST, array(
                 'password' => APIHelpers::getkey($_POST, $pwdField, ''),
                 'email'    => APIHelpers::getkey($_POST, $emailField, ''),
@@ -337,7 +337,7 @@ 
             ));
             if (!empty($POST['email']) && is_scalar($POST['email']) && !$userObj->emailValidate($POST['email'],
                     false)
-            ) {
+            ) {

                 $userObj->edit($POST['email']);
 
                 $this->modx->invokeEvent("OnBeforeWebLogin", array(
@@ -346,7 +346,7 @@ 
                     "rememberme"   => $POST['remember'],
                     'userObj'      => $userObj
                 ));
-                if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {
+                if ($userObj->getID() && !$userObj->checkBlock($userObj->getID())) {

                     $pluginFlag = $this->modx->invokeEvent("OnWebAuthentication", array(
                         "userid"        => $userObj->getID(),
                         "username"      => $userObj->get('username'),
@@ -358,7 +358,7 @@ 
                         ($pluginFlag === true || $userObj->testAuth($userObj->getID(), $POST['password'], 0))
                         &&
                         $userObj->authUser($userObj->getID(), $POST['remember'])
-                    ) {
+                    ) {

                         $userObj->set('logincount', (int)$userObj->get('logincount') + 1);
                         $userObj->set('lastlogin', time());
                         $userObj->set('failedlogincount', 0);
@@ -371,21 +371,21 @@ 
                             "rememberme"   => $POST['remember'],
                         ));
                         $this->moveTo(array('url' => urldecode($POST['backUrl'])));
-                    } else {
+                    } else {

                         $userObj->set('failedlogincount', (int)$userObj->get('failedlogincount') + 1);
                         $userObj->save(false, false);
 
                         $error = 'error.incorrect_password';
                     }
-                } else {
+                } else {

                     $error = 'error.no_user';
                 }
-            } else {
+            } else {

                 $error = 'error.incorrect_mail';
                 $POST['email'] = '';
             }
         }
-        if (!empty($error)) {
+        if (!empty($error)) {

             $errorCode = $error;
             $error = APIHelpers::getkey($params, $error, '');
             $error = static::getLangMsg($error, $error);
@@ -398,17 +398,17 @@ 
      * Информация о пользователе
      * [!DLUsers? &action=`UserInfo` &field=`fullname` &id=`2`!]
      */
-    public function UserInfo($params)
-    {
+    public function UserInfo($params)

+    {

         $out = '';
         $userID = APIHelpers::getkey($params, 'id', 0);
-        if (empty($userID)) {
+        if (empty($userID)) {

             $userID = $this->UserID('web');
         }
         $field = APIHelpers::getkey($params, 'field', 'username');
-        if ($userID > 0) {
+        if ($userID > 0) {

             $this->userObj->edit($userID);
-            switch (true) {
+            switch (true) {

                 case ($field == $this->userObj->fieldPKName()):
                     $out = $this->userObj->getID();
                     break;
@@ -424,17 +424,17 @@ 
     /**
      * ID пользователя
      */
-    public function UserID($type = 'web')
-    {
+    public function UserID($type = 'web')

+    {

         return $this->modx->getLoginUserID($type);
     }
 
     /**
      * Если не авторизован - то отправить на страницу
      */
-    public function isGuestGoHome($params)
-    {
-        if (!$this->UserID('web')) {
+    public function isGuestGoHome($params)

+    {

+        if (!$this->UserID('web')) {

             /**
              * @see : http://modx.im/blog/triks/105.html
              */
@@ -449,12 +449,12 @@ 
     /**
      * Если авторизован - то открыть личный кабинет
      */
-    public function isAuthGoHome($params)
-    {
+    public function isAuthGoHome($params)

+    {

         $userID = $this->UserID('web');
-        if ($userID > 0) {
+        if ($userID > 0) {

             $id = APIHelpers::getkey($params, 'homeID');
-            if (empty($id)) {
+            if (empty($id)) {

                 $id = $this->modx->getConfig('login_home', $this->config['site_start']);
             }
             $this->moveTo(compact('id'));
@@ -466,28 +466,28 @@ 
     /**
      * Редирект
      */
-    public function moveTo($params)
-    {
+    public function moveTo($params)

+    {

         $id = (int)APIHelpers::getkey($params, 'id', 0);
         $uri = APIHelpers::getkey($params, 'url', '');
-        if ((empty($uri) && !empty($id)) || !is_string($uri)) {
+        if ((empty($uri) && !empty($id)) || !is_string($uri)) {

             $uri = $this->makeUrl($id);
         }
         $code = (int)APIHelpers::getkey($params, 'code', 0);
         $addUrl = APIHelpers::getkey($params, 'addUrl', '');
-        if (is_scalar($addUrl) && $addUrl != '') {
+        if (is_scalar($addUrl) && $addUrl != '') {

             $uri .= "?" . $addUrl;
         }
-        if (APIHelpers::getkey($params, 'validate', false)) {
-            if (isset($this->modx->snippetCache['getPageID'])) {
+        if (APIHelpers::getkey($params, 'validate', false)) {

+            if (isset($this->modx->snippetCache['getPageID'])) {

                 $out = $this->modx->runSnippet('getPageID', compact('uri'));
-                if (empty($out)) {
+                if (empty($out)) {

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

                 $uri = APIhelpers::sanitarTag($uri);
             }
-        } else {
+        } else {

             header("Location: " . $uri, true, ($code > 0 ? $code : 307));
         }
 
@@ -500,15 +500,15 @@ 
      * @param  int $id ID документа
      * @return string
      */
-    protected function makeUrl($id = null)
-    {
+    protected function makeUrl($id = null)

+    {

         $id = (int)$id;
-        if ($id <= 0) {
+        if ($id <= 0) {

             $id = $this->modx->documentObject['id'];
         }
-        if ($this->url->containsKey($id)) {
+        if ($this->url->containsKey($id)) {

             $url = $this->url->get($id);
-        } else {
+        } else {

             $url = $this->modx->makeUrl($id);
             $this->url->set($id, $url);
         }
@@ -520,11 +520,11 @@ 
      * @param $name
      * @return string
      */
-    protected function getTemplate($name)
-    {
+    protected function getTemplate($name)

+    {

         $out = '';
         $file = dirname(dirname(__FILE__)) . '/tpl/' . $name . '.html';
-        if (FS::getInstance()->checkFile($file)) {
+        if (FS::getInstance()->checkFile($file)) {

             $out = '@CODE: ' . file_get_contents($file);
         }
 
@@ -535,17 +535,17 @@ 
      * @param $lang
      * @return bool
      */
-    protected static function loadLang($lang)
-    {
+    protected static function loadLang($lang)

+    {

         $file = dirname(dirname(__FILE__)) . '/lang/' . $lang . '.php';
-        if (!FS::getInstance()->checkFile($file)) {
+        if (!FS::getInstance()->checkFile($file)) {

             $file = false;
         }
-        if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {
+        if (!empty($lang) && !isset(static::$langDic[$lang]) && !empty($file)) {

             static::$langDic[$lang] = include_once($file);
-            if (is_array(static::$langDic[$lang])) {
+            if (is_array(static::$langDic[$lang])) {

                 static::$langDic[$lang] = APIHelpers::renameKeyArr(static::$langDic[$lang], $lang);
-            } else {
+            } else {

                 static::$langDic[$lang] = array();
             }
         }
@@ -558,17 +558,17 @@ 
      * @param $default
      * @return string
      */
-    protected static function getLangMsg($key, $default)
-    {
+    protected static function getLangMsg($key, $default)

+    {

         $out = $default;
         $lng = static::$lang;
         $dic = static::$langDic;
-        if (isset($dic[$lng], $dic[$lng][$lng . '.' . $key])) {
+        if (isset($dic[$lng], $dic[$lng][$lng . '.' . $key])) {

             $out = $dic[$lng][$lng . '.' . $key];
         }
-        if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {
+        if (class_exists('evoBabel', false) && isset(self::$instance->modx->snippetCache['lang'])) {

             $msg = self::$instance->modx->runSnippet('lang', array('a' => 'DLUsers.' . $key));
-            if (!empty($msg)) {
+            if (!empty($msg)) {

                 $out = $msg;
             }
         }