AgelxNash / DocLister

assets/lib/MODxAPI/modUsers.php

Spacing +18 added lines, -18 removed lines

@@ -109,7 +109,7 @@ 
             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if ( ! $find = $this->findUser($id)) {
                 $this->id = null;
             } else {
                 $this->set('editedon', time());
@@ -137,7 +137,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;
@@ -181,14 +181,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;
@@ -198,13 +198,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 {
@@ -220,13 +220,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(', ',
@@ -239,7 +239,7 @@ 
         }
         unset($fld['id']);
         foreach ($fld as $key => $value) {
-            if ($value == '' || !$this->isChanged($key)) {
+            if ($value == '' || ! $this->isChanged($key)) {
                 continue;
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}'");
@@ -249,7 +249,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,
@@ -349,7 +349,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;
@@ -371,7 +371,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,
@@ -387,7 +387,7 @@ 
             } else {
                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if ( ! $pluginFlag) {
                 $flag = ($tmp->get('password') == $tmp->getPassword($password));
             }
         }
@@ -415,7 +415,7 @@ 
                     && null !== $this->getID() 
                     && $this->get('password') == $cookie[1] 
                     && $this->get('sessionid') == $cookie[2] 
-                    && !$this->checkBlock($this->getID())
+                    && ! $this->checkBlock($this->getID())
                 ) {
                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
 
@@ -432,7 +432,7 @@ 
      */
     public function logOut($cookieName = 'WebLoginPE', $fire_events = null)
     {
-        if (!$uid = $this->modx->getLoginUserID('web')) {
+        if ( ! $uid = $this->modx->getLoginUserID('web')) {
             return;
         }
         $params = array(
@@ -527,7 +527,7 @@ 
      */
     public function setAutoLoginCookie($cookieName, $remember = true)
     {
-        if (!empty($cookieName) && $this->getID()) {
+        if ( ! empty($cookieName) && $this->getID()) {
             $secure = $this->isSecure();
             $remember = is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember;
             $cookieValue = array(md5($this->get('username')), $this->get('password'), $this->get('sessionid'), $remember);
@@ -593,7 +593,7 @@ 
      */
     public function setUserGroups($userID = 0, $groupIds = array())
     {
-        if (!is_array($groupIds)) return $this;
+        if ( ! is_array($groupIds)) return $this;
         if ($this->newDoc && $userID == 0) {
             $this->groupIds = $groupIds;
         } else {
@@ -602,7 +602,7 @@ 
                 foreach ($groupIds as $gid) {
                     $this->query("REPLACE INTO {$this->makeTable('web_groups')} (`webgroup`, `webuser`) VALUES ('{$gid}', '{$uid}')");
                 }
-                if (!$this->newDoc) {
+                if ( ! $this->newDoc) {
                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('web_groups')} WHERE `webuser`={$uid} AND `webgroup` NOT IN ({$groupIds})");
                 }

Braces +102 added lines, -98 removed lines

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

+{

     /**
      * @var array
      */
@@ -57,8 +57,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']));
     }
@@ -67,9 +67,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;
@@ -90,8 +90,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

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

+    {

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

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

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

                 $this->set('editedon', time());
                 $result = $this->query("
                     SELECT * from {$this->makeTable('web_user_attributes')} as attribute
@@ -135,10 +135,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);
@@ -162,8 +162,8 @@ 
      * @param $pass
      * @return string
      */
-    public function getPassword($pass)
-    {
+    public function getPassword($pass)

+    {

         return md5($pass);
     }
 
@@ -172,23 +172,23 @@ 
      * @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;
@@ -196,60 +196,60 @@ 
         $time = 
         $this->set('sessionid', '');
         $fld = $this->toArray();
-        foreach ($this->default_field['user'] as $key => $value) {
+        foreach ($this->default_field['user'] as $key => $value) {

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

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

+            if ($this->newDoc) {

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

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

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

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

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

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

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

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

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

+        }

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

             $this->clearCache($fire_events);
         }
 
@@ -281,9 +283,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
@@ -297,7 +299,7 @@ 
                 'username'    => $this->get('username'),
                 'timestamp'   => time()
             ), $fire_events);
-        } else {
+        } else {

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

+    {

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

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

             $flag = true;
             $this->save(false);
             $this->SessionHandler('start', $cookieName, $fulltime);
@@ -338,10 +340,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();
@@ -362,17 +364,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(),
@@ -380,14 +382,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));
             }
         }
@@ -401,12 +403,12 @@ 
      * @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], 3);
-            if (isset($cookie[0], $cookie[1], $cookie[2]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {
+            if (isset($cookie[0], $cookie[1], $cookie[2]) && 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);
@@ -416,7 +418,7 @@ 
                     && $this->get('password') == $cookie[1] 
                     && $this->get('sessionid') == $cookie[2] 
                     && !$this->checkBlock($this->getID())
-                ) {
+                ) {

                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
 
                 }
@@ -430,9 +432,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(
@@ -457,11 +459,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');
@@ -475,13 +477,13 @@ 
                     $_SESSION['webUsrConfigSet'] = array();
                     $_SESSION['webUserGroupNames'] = $this->getUserGroups();
                     $_SESSION['webDocgroups'] = $this->getDocumentGroups();
-                    if ($remember) {
+                    if ($remember) {

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

                     unset($_SESSION['webShortname']);
                     unset($_SESSION['webFullname']);
                     unset($_SESSION['webEmail']);
@@ -497,8 +499,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, '/');
@@ -513,8 +515,8 @@ 
     /**
      * @return bool
      */
-    public function isSecure()
-    {
+    public function isSecure()

+    {

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

+    {

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

             $secure = $this->isSecure();
             $remember = is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember;
             $cookieValue = array(md5($this->get('username')), $this->get('password'), $this->get('sessionid'), $remember);
@@ -543,11 +545,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');
 
@@ -566,18 +568,18 @@ 
      * @param int $userID
      * @return array
      */
-    public function getUserGroups($userID = 0)
-    {
+    public function getUserGroups($userID = 0)

+    {

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

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

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

+    {

+        if (!is_array($groupIds)) {

+            return $this;

+        }

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

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

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

+                foreach ($groupIds as $gid) {

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

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

assets/lib/MODxAPI/MODx.php

Spacing +19 added lines, -19 removed lines

@@ -193,11 +193,11 @@ 
     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');
             }
         }
@@ -221,7 +221,7 @@ 
      */
     public function addQuery($q)
     {
-        if (is_scalar($q) && !empty($q)) {
+        if (is_scalar($q) && ! empty($q)) {
             $this->_query[] = $q;
         }
 
@@ -255,7 +255,7 @@ 
      */
     final public function escape($value)
     {
-        if (!is_scalar($value)) {
+        if ( ! is_scalar($value)) {
             $value = '';
         } else {
             $value = $this->modx->db->escape($value);
@@ -396,7 +396,7 @@ 
             //Если уже загружен объект, с которым мы хотим временно поработать
             case ($this->getID() == $id && $id):
                 //Если $id не указан, но уже загружен какой-то объект
-            case (!$id && null !== $this->getID()):
+            case ( ! $id && null !== $this->getID()):
             default:
                 $obj = $this;
                 break;
@@ -431,7 +431,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;
         }
 
@@ -480,7 +480,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 {
@@ -490,7 +490,7 @@ 
                 throw new Exception("{$key} is invalid <pre>" . print_r($this->field[$key], true) . "</pre>");
             }
         }
-        if (!empty($tmp) && $this->isChanged($key)) {
+        if ( ! empty($tmp) && $this->isChanged($key)) {
             if ($id == '') {
                 $this->set[] = $tmp;
             } else {
@@ -520,8 +520,8 @@ 
      * @return MODxAPI
      */
     public function rollback($key = '') {
-        if (!empty($key) && isset($this->store[$key])) {
-            $this->set($key,$this->store[$key]);
+        if ( ! empty($key) && isset($this->store[$key])) {
+            $this->set($key, $this->store[$key]);
         } else {
             $this->fromArray($this->store);
         }
@@ -536,7 +536,7 @@ 
      * @return bool
      */
     public function isChanged($key) {
-        $flag = !isset($this->store[$key]) || (isset($this->store[$key]) && $this->store[$key] != $this->field[$key]);
+        $flag = ! isset($this->store[$key]) || (isset($this->store[$key]) && $this->store[$key] != $this->field[$key]);
 
         return $flag;
     }
@@ -551,7 +551,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 {
@@ -562,7 +562,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;
@@ -582,7 +582,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");
@@ -700,7 +700,7 @@ 
      */
     final public function sanitarIn($data, $sep = ',')
     {
-        if (!is_array($data)) {
+        if ( ! is_array($data)) {
             $data = explode($sep, $data);
         }
         $out = array();
@@ -742,7 +742,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;
@@ -940,7 +940,7 @@ 
      */
     public function getNoEncodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === false);
         });
     }
@@ -951,7 +951,7 @@ 
      */
     public function getNoDecodeFields()
     {
-        return $this->_decodedFields->filter(function ($value) {
+        return $this->_decodedFields->filter(function($value) {
             return ($value === true);
         });
     }

Braces +217 added lines, -211 removed lines

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

+{

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

+    {

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

+    {

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

+    {

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

+    {

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

+    {

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

+{

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

+    {

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

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

+    {

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

+    {

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

+    {

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

+    {

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

+            if (!is_numeric($value)) {

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

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

+    {

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

+    {

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

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

+    {

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

+    {

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

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

+    {

+        if (!is_scalar($value)) {

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

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

+    {

         $flag = (isset($flag) && $flag != '') ? (bool)$flag : false;
-        if ($flag) {
+        if ($flag) {

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

+    {

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

+    {

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

+    {

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

+    {

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

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

+    {

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

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

+    {

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

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

+            if (is_scalar($custom)) {

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

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

+                foreach ($custom as $id) {

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

+                        if (is_readable($file)) {

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

+    {

+        switch (true) {

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

+    {

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

+    {

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

+    {

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

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

+    {

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

+    {

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

+    {

+        if (is_array($data)) {

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

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

+    {

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

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

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

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

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

+            if ($id == '') {

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

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

+    {

+        if (is_array($data)) {

+            $this->store = $data;

+        }

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

+    {

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

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

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

+    {

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

+    {

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

+            if (is_scalar($IDs)) {

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

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

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

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

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

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

+    {

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

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

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

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

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

+                if (isset($callback)) {

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

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

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

+    {

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

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

+            if (isset($callback)) {

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

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

+    {

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

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

+    {

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

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

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

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

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

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

+    {

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

+    {

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

+    {

+        if (!is_array($data)) {

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

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

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

+    {

+        if (is_array($field)) {

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

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

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

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

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

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

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

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

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

+    {

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

+    {

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

+    {

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

+    {

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

+    {

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

+    {

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

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

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

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

+    {

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

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

+    {

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

+    {

+        if (is_scalar($field)) {

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

+    {

+        if (is_scalar($field)) {

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

+    {

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

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

+    {

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

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

+    {

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

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

+    {

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

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

+    {

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

+    {

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

+    {

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

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

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

+    {

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

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

+    {

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

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

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

+    {

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

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

assets/lib/MODxAPI/modManagers.php

Spacing +18 added lines, -18 removed lines

@@ -122,7 +122,7 @@ 
             $this->close();
             $this->newDoc = false;
 
-            if (!$find = $this->findUser($id)) {
+            if ( ! $find = $this->findUser($id)) {
                 $this->id = null;
             } else {
                 $this->set('editedon', time());
@@ -154,7 +154,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;
@@ -207,20 +207,20 @@ 
             return false;
         }
 
-        if (!$this->checkUnique('manager_users', 'username')) {
+        if ( ! $this->checkUnique('manager_users', 'username')) {
             $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'),
                     true) . '</pre>';
 
             return false;
         }
 
-        if (!$this->checkUnique('user_attributes', 'email', 'internalKey')) {
+        if ( ! $this->checkUnique('user_attributes', 'email', 'internalKey')) {
             $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
 
             return false;
         }
 
-        if(!$this->get('role')) {
+        if ( ! $this->get('role')) {
             $this->log['UniqueEmail'] = 'Wrong manager role <pre>' . print_r($this->get('role'), true) . '</pre>';
         }
         
@@ -228,13 +228,13 @@ 
         $fld = $this->toArray();
         foreach ($this->default_field['user'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'user');
             unset($fld[$key]);
         }
-        if (!empty($this->set['user'])) {
+        if ( ! empty($this->set['user'])) {
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('manager_users')} SET " . implode(', ', $this->set['user']);
             } else {
@@ -250,13 +250,13 @@ 
 
         foreach ($this->default_field['attribute'] as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+            if ($this->newDoc && ( ! is_int($tmp) && $tmp == '')) {
                 $this->field[$key] = $value;
             }
             $this->Uset($key, 'attribute');
             unset($fld[$key]);
         }
-        if (!empty($this->set['attribute'])) {
+        if ( ! empty($this->set['attribute'])) {
             if ($this->newDoc) {
                 $this->set('internalKey', $this->id)->Uset('internalKey', 'attribute');
                 $SQL = "INSERT into {$this->makeTable('user_attributes')} SET " . implode(', ',
@@ -269,7 +269,7 @@ 
         }
         unset($fld['id']);
         foreach ($fld as $key => $value) {
-            if ($value == '' || !$this->isChanged($key)) {
+            if ($value == '' || ! $this->isChanged($key)) {
                 continue;
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
@@ -280,7 +280,7 @@ 
             }
         }
         // TODO
-        if (!$this->newDoc && $this->givenPassword) {
+        if ( ! $this->newDoc && $this->givenPassword) {
             $this->invokeEvent('OnManagerChangePassword', array(
                 'userObj'      => $this,
                 'userid'       => $this->id,
@@ -386,7 +386,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;
@@ -408,7 +408,7 @@ 
 
         $flag = $pluginFlag = false;
         if (
-            (null !== $tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))
+            (null !== $tmp->getID()) && ( ! $blocker || ($blocker && ! $tmp->checkBlock($id)))
         ) {
             $_password = $tmp->get('password');
             $eventResult = $this->getInvokeEventResult('OnManagerAuthentication', array(
@@ -425,7 +425,7 @@ 
             } else {
                 $pluginFlag = (bool)$eventResult;
             }
-            if (!$pluginFlag) {
+            if ( ! $pluginFlag) {
                 $hashType = $this->getPasswordHashType($_password);
                 switch ($hashType) {
                     case 'phpass':
@@ -462,7 +462,7 @@ 
      */
     public function logOut($cookieName = 'modx_remember_manager', $fire_events = null)
     {
-        if (!$uid = $this->modx->getLoginUserID('mgr')) {
+        if ( ! $uid = $this->modx->getLoginUserID('mgr')) {
             return;
         }
         $params = array(
@@ -556,7 +556,7 @@ 
      */
     public function setAutoLoginCookie($cookieName, $remember = true)
     {
-        if (!empty($cookieName) && $this->getID()) {
+        if ( ! empty($cookieName) && $this->getID()) {
             $secure = $this->isSecure();
             $remember = is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember;
             $cookieValue = $this->get('username');
@@ -620,7 +620,7 @@ 
      */
     public function setUserGroups($userID = 0, $groupIds = array())
     {
-        if (!is_array($groupIds)) {
+        if ( ! is_array($groupIds)) {
             return $this;
         }
         if ($this->newDoc && $userID == 0) {
@@ -631,7 +631,7 @@ 
                 foreach ($groupIds as $gid) {
                     $this->query("REPLACE INTO {$this->makeTable('member_groups')} (`user_group`, `member`) VALUES ('{$gid}', '{$uid}')");
                 }
-                if (!$this->newDoc) {
+                if ( ! $this->newDoc) {
                     $groupIds = empty($groupIds) ? '0' : implode(',', $groupIds);
                     $this->query("DELETE FROM {$this->makeTable('member_groups')} WHERE `member`={$uid} AND `user_group` NOT IN ({$groupIds})");
                 }

Braces +112 added lines, -112 removed lines

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

+{

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

+    {

         parent::__construct($modx, $debug);
         $this->modx->loadExtension('phpass');
     }
@@ -70,8 +70,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']));
     }
@@ -80,9 +80,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;
@@ -103,8 +103,8 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

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

+    {

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

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

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

                 $this->set('editedon', time());
                 $result = $this->query("
                     SELECT * from {$this->makeTable('user_attributes')} as attribute
@@ -152,10 +152,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);
@@ -179,8 +179,8 @@ 
      * @param $pass
      * @return string
      */
-    public function getPassword($pass)
-    {
+    public function getPassword($pass)

+    {

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

+    {

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

+    {

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

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

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

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

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

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

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

+            if ($this->newDoc) {

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

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

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

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

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

+            if ($this->newDoc) {

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

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

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

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

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

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

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

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

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

+    {

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

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

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

+    {

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

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

             $flag = true;
             $this->save(false);
             $this->SessionHandler('start', $cookieName, $fulltime);
@@ -375,10 +375,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();
@@ -399,17 +399,17 @@ 
      * @param bool $fire_events
      * @return bool
      */
-    public function testAuth($id, $password, $blocker, $fire_events = false)
-    {
+    public function testAuth($id, $password, $blocker, $fire_events = false)

+    {

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

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

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

+                foreach ($eventResult as $result) {

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

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

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

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

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

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

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

+    {

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

             return;
         }
         $params = array(
@@ -489,11 +489,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['usertype'] = 'manager';
                     $_SESSION['mgrShortname'] = $this->get('username');
                     $_SESSION['mgrFullname'] = $this->get('fullname');
@@ -506,13 +506,13 @@ 
                     $_SESSION['mgrRole'] = $this->get('role');
                     $_SESSION['mgrPermissions'] = $this->mgrPermissions;
                     $_SESSION['mgrDocgroups'] = $this->getDocumentGroups();
-                    if ($remember) {
+                    if ($remember) {

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

                     unset($_SESSION['usertype']);
                     unset($_SESSION['webShortname']);
                     unset($_SESSION['mgrFullname']);
@@ -526,8 +526,8 @@ 
                     unset($_SESSION['mgrPermissions']);
 
                     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, '/');
@@ -542,8 +542,8 @@ 
     /**
      * @return bool
      */
-    public function isSecure()
-    {
+    public function isSecure()

+    {

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

+    {

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

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

+    {

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

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

+    {

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

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

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

+    {

+        if (!is_array($groupIds)) {

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

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

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

+                foreach ($groupIds as $gid) {

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

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

+    {

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

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

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

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

+    {

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

+    {

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

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

assets/lib/MODxAPI/modResource.php

Spacing +24 added lines, -24 removed lines

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

Braces +193 added lines, -185 removed lines

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

+{

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

+    {

         $out = array_intersect_key(parent::toArray(), $this->default_field);
 
         return $out;
@@ -184,18 +184,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);
             }
         }
@@ -210,8 +210,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),
@@ -224,11 +224,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);
         }
 
@@ -240,10 +240,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);
         }
 
@@ -253,8 +253,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()));
@@ -265,8 +265,8 @@ 
     /**
      * @return $this
      */
-    public function touch()
-    {
+    public function touch()

+    {

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

+    {

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

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

                 $tvval = implode('||', $tvval);
             }
             $param = APIHelpers::getkey($this->tvd, $tvname, array());
@@ -300,14 +300,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);
             }
         }
@@ -320,10 +320,10 @@ 
      * @param $value
      * @return $this
      */
-    public function set($key, $value)
-    {
-        if ((is_scalar($value) || $this->isTVarrayField($key) || $this->isJsonField($key)) && is_scalar($key) && !empty($key)) {
-            switch ($key) {
+    public function set($key, $value)

+    {

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

+            switch ($key) {

                 case 'parent':
                     $value = (int)$value;
                     break;
@@ -333,38 +333,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;
@@ -391,20 +391,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;
         }
 
@@ -415,9 +415,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;
@@ -438,11 +438,11 @@ 
      * @param array $data
      * @return $this
      */
-    public function create($data = array())
-    {
+    public function create($data = array())

+    {

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

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

+    {

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

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

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

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

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

+    {

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

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

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

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

+                if ($tmp == $value) {

+                    switch ($key) {

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

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

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

+            if ($this->newDoc) {

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

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

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

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

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

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

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

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

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

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

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

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

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

+        }

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

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

+    {

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

+    {

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

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

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

+    {

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

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

+    {

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

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

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

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

+    {

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

+    {

         $ignore = array(
             0, //empty document
             (int)$this->modxConfig('site_start'),
@@ -747,7 +750,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'];
         }
 
@@ -759,22 +762,22 @@ 
      * @param $alias
      * @return string
      */
-    protected function checkAlias($alias)
-    {
+    protected function checkAlias($alias)

+    {

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

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

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

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

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

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

                     $alias .= '-2';
                 }
                 $alias = $this->checkAlias($alias);
@@ -788,8 +791,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));
     }
 
@@ -797,11 +800,11 @@ 
      * @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`,`type` FROM ' . $this->makeTable('site_tmplvars'));
-            while ($row = $this->modx->db->GetRow($result)) {
+            while ($row = $this->modx->db->GetRow($result)) {

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

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

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

+            $this->tvaFields = $arrayTVs;

+        }

         $this->loadTVTemplate()->loadTVDefault(array_values($this->tv));
 
         return $this;
@@ -826,12 +831,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'];
         }
 
@@ -842,16 +847,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;
             }
         }
@@ -864,17 +869,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));
             }
         }
@@ -885,14 +890,14 @@ 
     /**
      * @return string
      */
-    protected function getAlias()
-    {
-        if ($this->modxConfig('friendly_urls') && $this->modxConfig('automatic_alias') && $this->get('alias') == '') {
+    protected function getAlias()

+    {

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

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

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

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

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

+    {

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

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

+    {

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

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

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

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

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

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

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

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

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

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

+    {

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

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

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

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

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

+    {

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

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

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

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

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

+    {

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

+    {

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

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

+    {

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

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

+    {

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

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

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

+    {

+        if (!is_array($groupIds)) {

+            return $this;

+        }

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

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

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

+                foreach ($groupIds as $gid) {

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

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