AgelxNash / DocLister

assets/lib/MODxAPI/modUsers.php

Doc Comments +7 added lines, -6 removed lines

@@ -46,8 +46,8 @@ 
     }

 

     /**

-     * @param $data

-     * @return bool|string

+     * @param string $data

+     * @return string|false

      */

     protected function findUser($data)

     {

@@ -97,7 +97,7 @@ 
     }

 

     /**

-     * @param $key

+     * @param string $key

      * @param $value

      * @return $this

      */

@@ -290,7 +290,7 @@ 
     /**

      * @param $id

      * @param $password

-     * @param $blocker

+     * @param boolean $blocker

      * @param null $fire_events

      * @return bool

      */

@@ -364,8 +364,9 @@ 
      * SessionHandler

      * Starts the user session on login success. Destroys session on error or logout.

      *

-     * @param string $directive ('start' or 'destroy')

-     * @return void

+     * @param string $directive ('start' or 'destroy')
+     * @param string $cookieName

+     * @return modUsers

      * @author Raymond Irving

      * @author Scotty Delicious

      *

Braces +10 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 

             if (!$find = $this->findUser($id)) {

                 $this->id = null;

-            }else {

+            } else {

                 $result = $this->query("

                     SELECT * from {$this->makeTable('web_user_attributes')} as attribute

                     LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey

@@ -200,7 +200,9 @@ 
         }

 

         foreach ($fld as $key => $value) {

-            if ($value == '') continue;

+            if ($value == '') {

+                continue;

+            }

             $result = $this->query("SELECT `setting_value` FROM {$this->makeTable('web_user_settings')} WHERE `webuser` = '{$this->id}' AND `setting_name` = '{$key}'");

             if ($this->modx->db->getRecordCount($result) > 0) {

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

@@ -252,7 +254,9 @@ 
     public function authUser($id = 0, $fulltime = true, $cookieName = 'WebLoginPE', $fire_events = null)

     {

         $flag = false;

-        if (!$this->getID() && $id) $this->edit($id);

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

+            $this->edit($id);

+        }

         if ($this->getID()) {

             //$this->logOut($cookieName);

             $flag = true;

@@ -349,7 +353,9 @@ 
      */

     public function logOut($cookieName = 'WebLoginPE', $fire_events = null)

     {

-        if (!$uid = $this->modx->getLoginUserID('web')) return;

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

+            return;

+        }

         $params = array(

             'username'      => $_SESSION['webShortname'],

             'internalKey'   => $uid,

Indentation +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
             'gender' => null,

             'country' => null,

             'state' => null,

-	    'city' => null,

+        'city' => null,

             'zip' => null,

             'fax' => null,

             'photo' => null,

@@ -211,8 +211,8 @@ 
             $this->invokeEvent('OnWebChangePassword',array(

                 'userObj'       => $this,

                 'userid'        => $this->id,

-			    'user'	        => $this->toArray(),

-			    'userpassword'	=> $this->givenPassword,

+                'user'	        => $this->toArray(),

+                'userpassword'	=> $this->givenPassword,

                 'internalKey'   => $this->id,

                 'username'      => $this->get('username')

             ),$fire_events);

Spacing +28 added lines, -28 removed lines

@@ -81,7 +81,7 @@ 
 

             if (!$find = $this->findUser($id)) {

                 $this->id = null;

-            }else {

+            } else {

                 $result = $this->query("

                     SELECT * from {$this->makeTable('web_user_attributes')} as attribute

                     LEFT JOIN {$this->makeTable('web_users')} as user ON user.id=attribute.internalKey

@@ -133,17 +133,17 @@ 
     public function save($fire_events = null, $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>';

+            $this->log['EmptyPKField'] = 'Email, username or password is empty <pre>'.print_r($this->toArray(), true).'</pre>';

             return false;

         }

 

         if (!$this->checkUnique('web_users', 'username')) {

-            $this->log['UniqueUsername'] = 'username not unique <pre>' . print_r($this->get('username'), true) . '</pre>';

+            $this->log['UniqueUsername'] = 'username not unique <pre>'.print_r($this->get('username'), true).'</pre>';

             return false;

         }

 

         if (!$this->checkUnique('web_user_attributes', 'email', 'internalKey')) {

-            $this->log['UniqueEmail'] = 'Email not unique <pre>' . print_r($this->get('email'), true) . '</pre>';

+            $this->log['UniqueEmail'] = 'Email not unique <pre>'.print_r($this->get('email'), true).'</pre>';

             return false;

         }

 

@@ -155,8 +155,8 @@ 
         $fld = $this->toArray();

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

             $tmp = $this->get($key);

-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {

-                if($tmp == $value){

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

+                if ($tmp == $value) {

                     //take default value from global config

                 }

                 $this->field[$key] = $value;

@@ -166,9 +166,9 @@ 
         }

         if (!empty($this->set['user'])) {

             if ($this->newDoc) {

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

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

             } else {

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

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

             }

             $this->query($SQL);

         }

@@ -179,8 +179,8 @@ 
 

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

             $tmp = $this->get($key);

-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {

-                if($tmp == $value){

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

+                if ($tmp == $value) {

                     //take default value from global config

                 }

                 $this->field[$key] = $value;

@@ -191,9 +191,9 @@ 
         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']);

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

             } else {

-                $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET " . implode(', ', $this->set['attribute']) . " WHERE  internalKey = " . $this->getID();

+                $SQL = "UPDATE {$this->makeTable('web_user_attributes')} SET ".implode(', ', $this->set['attribute'])." WHERE  internalKey = ".$this->getID();

             }

             $this->query($SQL);

         }

@@ -208,21 +208,21 @@ 
             }

         }

         if (!$this->newDoc && $this->givenPassword) {

-            $this->invokeEvent('OnWebChangePassword',array(

+            $this->invokeEvent('OnWebChangePassword', array(

                 'userObj'       => $this,

                 'userid'        => $this->id,

 			    'user'	        => $this->toArray(),

 			    'userpassword'	=> $this->givenPassword,

                 'internalKey'   => $this->id,

                 'username'      => $this->get('username')

-            ),$fire_events);

+            ), $fire_events);

         }

-        $this->invokeEvent('OnWebSaveUser',array (

+        $this->invokeEvent('OnWebSaveUser', array(

             'userObj'   => $this,

             'mode'      => $this->newDoc ? "new" : "upd",

             'id'        => $this->id,

             'user'      => $this->toArray()

-        ),$fire_events);

+        ), $fire_events);

 

         if ($clearCache) {

             $this->clearCache($fire_events);

@@ -274,7 +274,7 @@ 
                 'username'      => $this->get('username'),

                 'userpassword'  => $this->givenPassword,

                 'rememberme'    => $fulltime

-            ),$fire_events);

+            ), $fire_events);

         }

         return $flag;

     }

@@ -317,13 +317,13 @@ 
         if (

             ($tmp->getID()) && (!$blocker || ($blocker && !$tmp->checkBlock($id)))

         ) {

-            $eventResult = $this->getInvokeEventResult('OnWebAuthentication',array(

+            $eventResult = $this->getInvokeEventResult('OnWebAuthentication', array(

                 'userObj'       => $this,

                 'userid'        => $tmp->getID(),

                 'username'      => $tmp->get('username'),

                 'userpassword'  => $password,

                 'savedpassword' => $tmp->get('password')

-            ),$fire_events);

+            ), $fire_events);

             if (is_array($eventResult)) {

                 foreach ($eventResult as $result) {

                     $pluginFlag = (bool)$result;

@@ -351,7 +351,7 @@ 
             $cookie = explode('|', $_COOKIE[$cookieName], 2);

             if (isset($cookie[0], $cookie[1]) && strlen($cookie[0]) == 32 && strlen($cookie[1]) == 32) {

                 $this->close();

-                $q = $this->modx->db->query("SELECT id FROM " . $this->makeTable('web_users') . " WHERE md5(username)='{$this->escape($cookie[0])}'");

+                $q = $this->modx->db->query("SELECT id FROM ".$this->makeTable('web_users')." WHERE md5(username)='{$this->escape($cookie[0])}'");

                 $id = $this->modx->db->getValue($q);

                 if ($this->edit($id) && $this->getID() && $this->get('password') == $cookie[1] && $this->testAuth($this->getID(), $cookie[1], true)) {

                     $flag = $this->authUser($this->getID(), $fulltime, $cookieName, $fire_events);

@@ -410,7 +410,7 @@ 
                     $_SESSION['webUserGroupNames'] = $this->getUserGroups();

                     $_SESSION['webDocgroups'] = $this->getDocumentGroups();

                     if ($remember) {

-                        $cookieValue = md5($this->get('username')) . '|' . $this->get('password');

+                        $cookieValue = md5($this->get('username')).'|'.$this->get('password');

                         $cookieExpires = time() + (is_bool($remember) ? (60 * 60 * 24 * 365 * 5) : (int)$remember);

                         setcookie($cookieName, $cookieValue, $cookieExpires, '/');

                     }

@@ -452,17 +452,17 @@ 
      * @param int $userID

      * @return array

      */

-    public function getDocumentGroups($userID = 0){

+    public function getDocumentGroups($userID = 0) {

         $out = array();

         $user = $this->switchObject($userID);

-        if($user->getID()){

+        if ($user->getID()) {

             $web_groups = $this->modx->getFullTableName('web_groups');

             $webgroup_access = $this->modx->getFullTableName('webgroup_access');

 

             $sql = "SELECT `uga`.`documentgroup` FROM {$web_groups} as `ug`

                 INNER JOIN {$webgroup_access} as `uga` ON `uga`.`webgroup`=`ug`.`webgroup`

                 WHERE `ug`.`webuser` = ".$user->getID();

-            $out = $this->modx->db->getColumn('documentgroup',$this->query($sql));

+            $out = $this->modx->db->getColumn('documentgroup', $this->query($sql));

 

         }

         unset($user);

@@ -473,17 +473,17 @@ 
      * @param int $userID

      * @return array

      */

-    public function getUserGroups($userID = 0){

+    public function getUserGroups($userID = 0) {

         $out = array();

         $user = $this->switchObject($userID);

-        if($user->getID()){

+        if ($user->getID()) {

             $web_groups = $this->makeTable('web_groups');

             $webgroup_names = $this->makeTable('webgroup_names');

 

             $sql = "SELECT `ugn`.`name` FROM {$web_groups} as `ug`

                 INNER JOIN {$webgroup_names} as `ugn` ON `ugn`.`id`=`ug`.`webgroup`

                 WHERE `ug`.`webuser` = ".$user->getID();

-            $out = $this->modx->db->getColumn('name',$this->query($sql));

+            $out = $this->modx->db->getColumn('name', $this->query($sql));

         }

         unset($user);

         return $out;

@@ -491,7 +491,7 @@ 
 

     public function setUserGroups($userID = 0, $groupIds = array()) {

         $user = $this->switchObject($userID);

-        if(($uid = $user->getID()) && is_array($groupIds)) {

+        if (($uid = $user->getID()) && is_array($groupIds)) {

             foreach ($groupIds as $gid) {

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

             }

assets/lib/MODxAPI/modResource.php

Braces +13 added lines, -5 removed lines

@@ -212,7 +212,7 @@ 
                     $value = (int)((bool)$value);
                     if($value){
                         $this->field['deletedon'] = time() + $this->modxConfig('server_offset_time');
-                    }else{
+                    } else{
                         $this->field['deletedon'] = 0;
                     }
                     break;
@@ -402,7 +402,9 @@ 
         }
 
         foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key])) continue;
+            if (empty($this->tv[$key])) {

+                continue;

+            }

             if ($value === '') {
                 $this->query("DELETE FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid` = '{$this->id}' AND `tmplvarid` = '{$this->tv[$key]}'");
             } else {
@@ -434,7 +436,9 @@ 
         if (is_array($_ids) && $_ids != array()) {
         	$id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else 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>');
+		} 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>');

+		}

         return $this;
     }
     public function clearTrash($fire_events = null){
@@ -477,7 +481,9 @@ 
 					"ids" => $_ids
 				), $fire_events);
 			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else {

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

+		}

 
         return $this;
     }
@@ -574,7 +580,9 @@ 
             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) throw new Exception("Template {$tpl} is not exists");
+				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) {

+				    throw new Exception("Template {$tpl} is not exists");

+				}

 				$tpl = $this->modx->db->getValue($rs);
 			} else {
 				throw new Exception("Invalid template name: " . print_r($tpl, 1));

Spacing +54 added lines, -54 removed lines

@@ -94,20 +94,20 @@ 
         $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);
             }
         }
         return $out;
     }
 
-    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true){
+    public function toArray($prefix = '', $suffix = '', $sep = '_', $render = true) {
         $out = array_merge(
             $this->toArrayMain(),
             $this->toArrayTV($render),
@@ -115,17 +115,17 @@ 
         );
         return \APIhelpers::renameKeyArr($out, $prefix, $suffix, $sep);
     }
-	public function getUrl(){
+	public function getUrl() {
 		$out = null;
 		$id = (int)$this->getID();
-		if(!empty($id)){
+		if (!empty($id)) {
 			$out = $this->modx->makeUrl($id);
 		}
 		return $out;
 	}
-	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);
 		}
 		return $title;
@@ -138,16 +138,16 @@ 
         $del = ($this->get('deleted') == 0 && ($this->get('deletedon') == 0 || $this->get('deletedon') > time()));
         return ($pub && $unpub && $del);
     }
-    public function touch(){
+    public function touch() {
         $this->set('editedon', time());
         return $this;
     }
 
-    public function renderTV($tvname){
+    public function renderTV($tvname) {
         $out = null;
-        if($this->getID() > 0){
-            include_once MODX_MANAGER_PATH . "includes/tmplvars.format.inc.php";
-            include_once MODX_MANAGER_PATH . "includes/tmplvars.commands.inc.php";
+        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);
             $param = APIHelpers::getkey($this->tvd, $tvname, array());
             $display = APIHelpers::getkey($param, 'display', '');
@@ -158,13 +158,13 @@ 
         return $out;
     }
 
-    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);
             }
         }
@@ -184,38 +184,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;
@@ -236,19 +236,19 @@ 
         return $this;
     }
 
-    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, $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;
         }
         return $value;
@@ -272,13 +272,13 @@ 
         return $find;
     }
 
-    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');
             }
         }
@@ -301,9 +301,9 @@ 
             $this->close();
             $this->newDoc = false;
 
-            $result = $this->query("SELECT * from {$this->makeTable('site_content')} where `id`=" . (int)$id);
+            $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);
+            $result = $this->query("SELECT * from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid`=".(int)$id);
             while ($row = $this->modx->db->getRow($result)) {
                 $this->field[$this->tvid[$row['tmplvarid']]] = $row['value'];
             }
@@ -322,7 +322,7 @@ 
     {
         $parent = null;
         if ($this->field['pagetitle'] == '') {
-            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
+            $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>'.print_r($this->field, true).'</pre>';
             return false;
         }
 
@@ -338,8 +338,8 @@ 
 	
         foreach ($this->default_field as $key => $value) {
             $tmp = $this->get($key);
-            if ($this->newDoc && ( !is_int($tmp) && $tmp=='')) {
-                if($tmp == $value){
+            if ($this->newDoc && (!is_int($tmp) && $tmp == '')) {
+                if ($tmp == $value) {
                     switch ($key) {
                         case 'cacheable':
                             $value = $this->modxConfig('cache_default');
@@ -360,11 +360,11 @@ 
                 }
                 $this->field[$key] = $value;
             }
-            switch(true){
+            switch (true) {
                 case $key == 'parent':
                     $parent = (int)$this->get($key);
                     $q = $this->query("SELECT count(`id`) FROM {$this->makeTable('site_content')} WHERE `id`='{$parent}'");
-                    if($this->modx->db->getValue($q)!=1){
+                    if ($this->modx->db->getValue($q) != 1) {
                         $parent = $value;
                     }
                     $this->field[$key] = $parent;
@@ -381,9 +381,9 @@ 
 
         if (!empty($this->set)) {
             if ($this->newDoc) {
-                $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
+                $SQL = "INSERT into {$this->makeTable('site_content')} SET ".implode(', ', $this->set);
             } else {
-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ', $this->set) . " WHERE `id` = " . $this->id;
+                $SQL = "UPDATE {$this->makeTable('site_content')} SET ".implode(', ', $this->set)." WHERE `id` = ".$this->id;
             }
             $this->query($SQL);
 
@@ -423,20 +423,20 @@ 
         return $this->id;
     }
 
-    public function toTrash($ids){
+    public function toTrash($ids) {
         $ignore = $this->systemID();
         $_ids = $this->cleanIDs($ids, ',', $ignore);
         if (is_array($_ids) && $_ids != array()) {
         	$id = $this->sanitarIn($_ids);
             $this->query("UPDATE {$this->makeTable('site_content')} SET `deleted`='1' WHERE `id` IN ({$id})");
-		} else 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>');
+		} 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>');
         return $this;
     }
-    public function clearTrash($fire_events = null){
+    public function clearTrash($fire_events = null) {
         $q = $this->query("SELECT `id` FROM {$this->makeTable('site_content')} WHERE `deleted`='1'");
         $q = $this->modx->makeArray($q);
         $_ids = array();
-        foreach($q as $item){
+        foreach ($q as $item) {
               $_ids[] = $item['id'];
         }
         if (is_array($_ids) && $_ids != array()) {
@@ -465,14 +465,14 @@ 
 			), $fire_events);
 
 			$id = $this->sanitarIn($_ids);
-			if(!empty($id)){
+			if (!empty($id)) {
 				$this->query("DELETE from {$this->makeTable('site_content')} where `id` IN ({$id})");
 				$this->query("DELETE from {$this->makeTable('site_tmplvar_contentvalues')} where `contentid` IN ({$id})");
 				$this->invokeEvent('OnEmptyTrash', array(
 					"ids" => $_ids
 				), $fire_events);
 			}
-		} else throw new Exception('Invalid IDs list for delete: <pre>' . print_r($ids, 1) . '</pre> please, check ignore list: <pre>' . print_r($ignore, 1) . '</pre>');
+		} else throw new Exception('Invalid IDs list for delete: <pre>'.print_r($ids, 1).'</pre> please, check ignore list: <pre>'.print_r($ignore, 1).'</pre>');
 
         return $this;
     }
@@ -509,7 +509,7 @@ 
                 $suffix = substr($alias, -2);
                 if (preg_match('/-(\d+)/', $suffix, $tmp) && isset($tmp[1]) && (int)$tmp[1] > 1) {
                     $suffix = (int)$tmp[1] + 1;
-                    $alias = substr($alias, 0, -2) . '-' . $suffix;
+                    $alias = substr($alias, 0, -2).'-'.$suffix;
                 } else {
                     $alias .= '-2';
                 }
@@ -527,30 +527,30 @@ 
     protected function get_TV($reload = false)
     {
         if (empty($this->modx->_TVnames) || $reload) {
-            $result = $this->query('SELECT `id`,`name` FROM ' . $this->makeTable('site_tmplvars'));
+            $result = $this->query('SELECT `id`,`name` FROM '.$this->makeTable('site_tmplvars'));
             while ($row = $this->modx->db->GetRow($result)) {
                 $this->modx->_TVnames[$row['name']] = $row['id'];
             }
         }
-        foreach($this->modx->_TVnames as $name => $id){
+        foreach ($this->modx->_TVnames as $name => $id) {
             $this->tvid[$id] = $name;
             $this->tv[$name] = $id;
         }
         $this->loadTVTemplate()->loadTVDefault(array_values($this->tv));
         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'];
         }
         return $this;
     }
     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);
@@ -572,7 +572,7 @@ 
 				if (!$rs || $this->modx->db->getRecordCount($rs) <= 0) throw new Exception("Template {$tpl} is not exists");
 				$tpl = $this->modx->db->getValue($rs);
 			} else {
-				throw new Exception("Invalid template name: " . print_r($tpl, 1));
+				throw new Exception("Invalid template name: ".print_r($tpl, 1));
 			}
         }
         return (int)$tpl;

assets/snippets/DocLister/core/controller/site_content_tags.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
  * @TODO add parameter showFolder - include document container in result data whithout children document if you set depth parameter.

  */

 

-include_once(dirname(__FILE__) . "/site_content.php");

+include_once(dirname(__FILE__)."/site_content.php");

 

 class site_content_tagsDocLister extends site_contentDocLister

 {

@@ -37,9 +37,9 @@ 
         $link = $this->checkExtender('request') ? $this->extender['request']->getLink() : "";

         $tag = $this->checkTag();

         if ($tag != false && is_array($tag) && $tag['mode'] == 'get') {

-            $link .= "&tag=" . urlencode($tag['tag']);

+            $link .= "&tag=".urlencode($tag['tag']);

         }

-        $url = ($id == $this->modx->config['site_start']) ? $this->modx->config['site_url'] . ($link != '' ? "?{$link}" : "") : $this->modx->makeUrl($id, '', $link, 'full');

+        $url = ($id == $this->modx->config['site_start']) ? $this->modx->config['site_url'].($link != '' ? "?{$link}" : "") : $this->modx->makeUrl($id, '', $link, 'full');

         return $url;

     }

 

@@ -57,9 +57,9 @@ 
                     case 'static':

                     default:

                         $tag = $tmp[1];

-                        $separator = $this->getCFGDef('tagsSeparator','||');

+                        $separator = $this->getCFGDef('tagsSeparator', '||');

                         if (!empty($tag) && !empty($separator)) {

-                            $_tag = explode($separator,$tag);

+                            $_tag = explode($separator, $tag);

                             if (count($_tag) > 1) $tag = $_tag;

                         }

                         break;

@@ -84,23 +84,23 @@ 
     {

         $tag = $this->checkTag(true);

         if ($tag !== false) {

-            $join = "RIGHT JOIN " . $this->getTable('site_content_tags', 'ct') . " on ct.doc_id=c.id

-					RIGHT JOIN " . $this->getTable('tags', 't') . " on t.id=ct.tag_id";

+            $join = "RIGHT JOIN ".$this->getTable('site_content_tags', 'ct')." on ct.doc_id=c.id

+					RIGHT JOIN " . $this->getTable('tags', 't')." on t.id=ct.tag_id";

             if (is_array($tag['tag'])) {

-                $where = "t.`name` IN (" . $this->sanitarIn($tag['tag']) . ")";

+                $where = "t.`name` IN (".$this->sanitarIn($tag['tag']).")";

             } else {

-                $where = "t.`name`='" . $this->modx->db->escape($tag['tag']) . "'";

+                $where = "t.`name`='".$this->modx->db->escape($tag['tag'])."'";

             }

-            $where .= ($this->getCFGDef('tagsData', '') > 0) ? "AND ct.tv_id=" . (int)$this->getCFGDef('tagsData', '') : "";

+            $where .= ($this->getCFGDef('tagsData', '') > 0) ? "AND ct.tv_id=".(int)$this->getCFGDef('tagsData', '') : "";

 

             if (!empty($this->_filters['where'])) {

-                $this->_filters['where'] .= " AND " . $where;

+                $this->_filters['where'] .= " AND ".$where;

             } else {

                 $this->_filters['where'] = $where;

             }

 

             if (!empty($this->_filters['join'])) {

-                $this->_filters['join'] .= ' ' . $join;

+                $this->_filters['join'] .= ' '.$join;

             } else {

                 $this->_filters['join'] = $join;

             }

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
                         $separator = $this->getCFGDef('tagsSeparator','||');

                         if (!empty($tag) && !empty($separator)) {

                             $_tag = explode($separator,$tag);

-                            if (count($_tag) > 1) $tag = $_tag;

+                            if (count($_tag) > 1) {

+                                $tag = $_tag;

+                            }

                         }

                         break;

                 }