AgelxNash / DocLister

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('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('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['mgrValidated'])) {
+                if (isset($_SESSION['mgrValidated'])) {

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

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

                         setcookie(session_name(), '', time() - 60, MODX_BASE_URL);
                     }
                     setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
@@ -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;

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -238,7 +238,7 @@ 
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('manager_users')} SET " . implode(', ', $this->set['user']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('manager_users')} SET " . implode(', ',
+                $SQL = "update {$this->makeTable('manager_users')} SET " . implode(', ',
                         $this->set['user']) . " WHERE id = " . $this->id;
             }
             $this->query($SQL);
@@ -262,7 +262,7 @@ 
                 $SQL = "INSERT into {$this->makeTable('user_attributes')} SET " . implode(', ',
                         $this->set['attribute']);
             } else {
-                $SQL = "UPDATE {$this->makeTable('user_attributes')} SET " . implode(', ',
+                $SQL = "update {$this->makeTable('user_attributes')} SET " . implode(', ',
                         $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();
             }
             $this->query($SQL);
@@ -274,7 +274,7 @@ 
             }
             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('user_settings')} WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}'");
             if ($this->modx->db->getRecordCount($result) > 0) {
-                $this->query("UPDATE {$this->makeTable('user_settings')} SET `setting_value` = '{$value}' WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}';");
+                $this->query("update {$this->makeTable('user_settings')} SET `setting_value` = '{$value}' WHERE `user` = '{$this->id}' AND `setting_name` = '{$key}';");
             } else {
                 $this->query("INSERT into {$this->makeTable('user_settings')} SET `user` = {$this->id},`setting_name` = '{$key}',`setting_value` = '{$value}';");
             }

assets/lib/MODxAPI/modUsers.php

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,83 +172,83 @@ 
      * @param bool $clearCache
      * @return bool|int|null|void
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
-        if ($this->get('email') == '' || $this->get('username') == '' || $this->get('password') == '') {
+    public function save($fire_events = false, $clearCache = false)

+    {

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

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

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

             $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';
 
             return false;
         }
         $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,
@@ -259,7 +259,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,
@@ -268,7 +270,7 @@ 
             'user'    => $this->toArray()
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
 
@@ -280,9 +282,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
@@ -296,7 +298,7 @@ 
                 'username'    => $this->get('username'),
                 'timestamp'   => time()
             ), $fire_events);
-        } else {
+        } else {

             $flag = false;
         }
         $this->close();
@@ -311,13 +313,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);
@@ -337,10 +339,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();
@@ -361,17 +363,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(),
@@ -379,14 +381,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));
             }
         }
@@ -400,12 +402,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);
@@ -415,7 +417,7 @@ 
                     && $this->get('password') == $cookie[1] 
                     && $this->get('sessionid') == $cookie[2] 
                     && !$this->checkBlock($this->getID())
-                ) {
+                ) {

                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);
 
                 }
@@ -429,9 +431,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(
@@ -456,11 +458,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');
@@ -474,13 +476,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']);
@@ -496,8 +498,8 @@ 
                     unset($_SESSION['webDocgroups']);
 
                     setcookie($cookieName, '', time() - 60, MODX_BASE_URL);
-                } else {
-                    if (isset($_COOKIE[session_name()])) {
+                } else {

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

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

+    {

         $out = $this->modxConfig('server_protocol') == 'http' ? false : true;
 
         return $out;
@@ -524,9 +526,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);
@@ -542,11 +544,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');
 
@@ -565,18 +567,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'];
             }
         }
@@ -590,18 +592,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})");
                 }