AgelxNash / DocLister

assets/lib/MODxAPI/modResource.php

Spacing +27 added lines, -27 removed lines

@@ -189,7 +189,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]);
             }
         }
@@ -227,7 +227,7 @@ 
     {
         $out = null;
         $id = (int)$this->getID();
-        if (!empty($id)) {
+        if ( ! empty($id)) {
             $out = $this->modx->makeUrl($id);
         }
 
@@ -321,7 +321,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;
@@ -394,12 +394,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;
             }
         }
@@ -440,11 +440,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');
             }
         }
@@ -524,8 +524,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';
 
@@ -544,7 +544,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':
@@ -576,7 +576,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:
@@ -585,7 +585,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 {
@@ -605,7 +605,7 @@ 
 
         $_deleteTVs = $_updateTVs = $_insertTVs = array();
         foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key]) || !$this->isChanged($key)) {
+            if (empty($this->tv[$key]) || ! $this->isChanged($key)) {
                 continue;
             } elseif ($value === '') {
                 $_deleteTVs[] = $this->tv[$key];
@@ -614,7 +614,7 @@ 
             }
         }
 
-        if (!$this->newDoc && !empty($_insertTVs)) {
+        if ( ! $this->newDoc && ! empty($_insertTVs)) {
             $ids = implode(',', array_keys($_insertTVs));
             $result = $this->query("SELECT `tmplvarid` FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid`={$this->id} AND `tmplvarid` IN ({$ids})");
             $existedTVs = $this->modx->db->getColumn('tmplvarid', $result);
@@ -624,13 +624,13 @@ 
             }
         }
 
-        if (!empty($_updateTVs)) {
+        if ( ! empty($_updateTVs)) {
             foreach ($_updateTVs as $id => $value) {
                 $this->query("UPDATE {$this->makeTable('site_tmplvar_contentvalues')} SET `value` = '{$value}' WHERE `contentid` = {$this->id} AND `tmplvarid` = {$id}");
             }
         }
 
-        if (!empty($_insertTVs)) {
+        if ( ! empty($_insertTVs)) {
             $values = array();
             foreach ($_insertTVs as $id => $value) {
                 $values[] = "({$this->id}, {$id}, '{$value}')";
@@ -639,12 +639,12 @@ 
             $this->query("INSERT into {$this->makeTable('site_tmplvar_contentvalues')} (`contentid`,`tmplvarid`,`value`) VALUES {$values}");
         }
 
-        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;
         }
@@ -720,7 +720,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) {
@@ -785,12 +785,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;
@@ -865,7 +865,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);
@@ -887,11 +887,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);
@@ -952,7 +952,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);

Braces +183 added lines, -181 removed lines

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

+{

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

+    {

         $out = array_intersect_key(parent::toArray(), $this->default_field);
 
         return $out;
@@ -183,18 +183,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);
             }
         }
@@ -209,8 +209,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),
@@ -223,11 +223,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);
         }
 
@@ -239,10 +239,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);
         }
 
@@ -252,8 +252,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()));
@@ -264,8 +264,8 @@ 
     /**
      * @return $this
      */
-    public function touch()
-    {
+    public function touch()

+    {

         $this->set('editedon', time());
 
         return $this;
@@ -275,14 +275,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());
@@ -299,14 +299,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);
             }
         }
@@ -319,10 +319,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;
@@ -332,38 +332,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;
@@ -390,20 +390,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;
         }
 
@@ -414,9 +414,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;
@@ -437,14 +437,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');
             }
         }
@@ -456,11 +456,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);
@@ -478,10 +478,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;
@@ -489,12 +489,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();
@@ -511,10 +511,10 @@ 
      * @param bool $clearCache
      * @return bool|null|void
      */
-    public function save($fire_events = false, $clearCache = false)
-    {
+    public function save($fire_events = false, $clearCache = false)

+    {

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

             $this->log['emptyPagetitle'] = 'Pagetitle is empty in <pre>' . print_r($this->field, true) . '</pre>';
 
             return false;
@@ -526,7 +526,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;
@@ -542,11 +542,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;
@@ -566,11 +566,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;
@@ -585,66 +585,66 @@ 
             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 = $_updateTVs = $_insertTVs = array();
-        foreach ($fld as $key => $value) {
-            if (empty($this->tv[$key]) || !$this->isChanged($key)) {
+        foreach ($fld as $key => $value) {

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

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

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

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

             $ids = implode(',', array_keys($_insertTVs));
             $result = $this->query("SELECT `tmplvarid` FROM {$this->makeTable('site_tmplvar_contentvalues')} WHERE `contentid`={$this->id} AND `tmplvarid` IN ({$ids})");
             $existedTVs = $this->modx->db->getColumn('tmplvarid', $result);
-            foreach ($existedTVs as $id) {
+            foreach ($existedTVs as $id) {

                 $_updateTVs[$id] = $_insertTVs[$id];
                 unset($_insertTVs[$id]);
             }
         }
 
-        if (!empty($_updateTVs)) {
-            foreach ($_updateTVs as $id => $value) {
+        if (!empty($_updateTVs)) {

+            foreach ($_updateTVs as $id => $value) {

                 $this->query("UPDATE {$this->makeTable('site_tmplvar_contentvalues')} SET `value` = '{$value}' WHERE `contentid` = {$this->id} AND `tmplvarid` = {$id}");
             }
         }
 
-        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);
             $this->query("INSERT into {$this->makeTable('site_tmplvar_contentvalues')} (`contentid`,`tmplvarid`,`value`) VALUES {$values}");
         }
 
-        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;
         }
@@ -655,7 +655,7 @@ 
             'docObj' => $this
         ), $fire_events);
 
-        if ($clearCache) {
+        if ($clearCache) {

             $this->clearCache($fire_events);
         }
         $this->decodeFields();
@@ -668,16 +668,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>');
         }
@@ -689,11 +689,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);
@@ -715,15 +715,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);
@@ -739,8 +739,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(
@@ -757,8 +757,8 @@ 
     /**
      * @return array
      */
-    private function systemID()
-    {
+    private function systemID()

+    {

         $ignore = array(
             0, //empty document
             (int)$this->modxConfig('site_start'),
@@ -768,7 +768,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'];
         }
 
@@ -780,22 +780,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);
@@ -809,8 +809,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));
     }
 
@@ -818,11 +818,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']
@@ -831,14 +831,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;
@@ -847,12 +849,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'];
         }
 
@@ -863,16 +865,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;
             }
         }
@@ -885,17 +887,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));
             }
         }
@@ -906,14 +908,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 = '';
             }
         }
@@ -930,10 +932,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}");
         }
@@ -946,37 +948,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'];
                     }
                 }
@@ -993,18 +995,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);
         }
@@ -1018,18 +1020,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);
         }
@@ -1042,8 +1044,8 @@ 
      * @param  string $field имя поля
      * @return boolean
      */
-    public function isTVarrayField($field)
-    {
+    public function isTVarrayField($field)

+    {

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

+    {

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

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

+    {

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

             $this->markAsDecode($field);
         }
 

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

@@ -589,7 +589,7 @@ 
             if ($this->newDoc) {
                 $SQL = "INSERT into {$this->makeTable('site_content')} SET " . implode(', ', $this->set);
             } else {
-                $SQL = "UPDATE {$this->makeTable('site_content')} SET " . implode(', ',
+                $SQL = "update {$this->makeTable('site_content')} SET " . implode(', ',
                         $this->set) . " WHERE `id` = " . $this->id;
             }
             $this->query($SQL);
@@ -599,7 +599,7 @@ 
             }
 
             if ($parent > 0) {
-                $this->query("UPDATE {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");
+                $this->query("update {$this->makeTable('site_content')} SET `isfolder`='1' WHERE `id`='{$parent}'");
             }
         }
 
@@ -626,7 +626,7 @@ 
 
         if (!empty($_updateTVs)) {
             foreach ($_updateTVs as $id => $value) {
-                $this->query("UPDATE {$this->makeTable('site_tmplvar_contentvalues')} SET `value` = '{$value}' WHERE `contentid` = {$this->id} AND `tmplvarid` = {$id}");
+                $this->query("update {$this->makeTable('site_tmplvar_contentvalues')} SET `value` = '{$value}' WHERE `contentid` = {$this->id} AND `tmplvarid` = {$id}");
             }
         }
 
@@ -676,7 +676,7 @@ 
             $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})");
+            $this->query("update {$this->makeTable('site_content')} SET `deleted`=1, `deletedby`={$uid}, `deletedon`={$deletedon} 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>');
@@ -869,7 +869,7 @@ 
             $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})");
+            $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) {
@@ -892,7 +892,7 @@ 
                 $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");
+                    throw new Exception("template {$tpl} is not exists");
                 }
                 $tpl = $this->modx->db->getValue($rs);
             } else {
@@ -935,7 +935,7 @@ 
         $dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
         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}");
+            $this->query("update {$this->makeTable('site_content')} SET `menuindex` = (@index := @index + 1) WHERE `parent`={$parent} ORDER BY {$criteria} {$dir}");
         }
 
         return $this;