AgelxNash / DocLister

assets/lib/SimpleTab/table.abstract.php

Doc Comments +2 added lines, -2 removed lines

@@ -139,7 +139,7 @@ 
 
     /**
      * @param $ids
-     * @param null $fire_events
+     * @param false|null $fire_events
      * @return $this
      */
     public function delete($ids, $fire_events = false)
@@ -153,7 +153,7 @@ 
     /**
      * @param $ids
      * @param $rid
-     * @param null $fire_events
+     * @param false|null $fire_events
      * @return $this
      */
     public function deleteAll($ids, $rid, $fire_events = false)

Braces +41 added lines, -41 removed lines

@@ -8,8 +8,8 @@ 
  * Class dataTable
  * @package SimpleTab
  */
-class dataTable extends \autoTable
-{
+class dataTable extends \autoTable

+{

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

+    {

         parent::__construct($modx, $debug);
         $this->modx = $modx;
         $this->params = (isset($modx->event->params) && is_array($modx->event->params)) ? $modx->event->params : array();
@@ -52,8 +52,8 @@ 
      * @param $ids
      * @param $rid
      */
-    protected function clearIndexes($ids, $rid)
-    {
+    protected function clearIndexes($ids, $rid)

+    {

         $ids = $this->cleanIDs($ids, ',', array(0));
         $ids = $this->sanitarIn($ids);
         $table = $this->makeTable($this->table);
@@ -71,8 +71,8 @@ 
      * @param $field
      * @return $this
      */
-    public function touch($field)
-    {
+    public function touch($field)

+    {

         $this->set($field, date('Y-m-d H:i:s', time() + $this->modx->config['server_offset_time']));
 
         return $this;
@@ -83,22 +83,22 @@ 
      * @param $dir
      * @param $rid
      */
-    public function place($ids, $dir, $rid)
-    {
+    public function place($ids, $dir, $rid)

+    {

         $table = $this->makeTable($this->table);
         $ids = $this->cleanIDs($ids, ',', array(0));
-        if (empty($ids) || is_scalar($ids)) {
+        if (empty($ids) || is_scalar($ids)) {

             return false;
         }
         $rows = $this->query("SELECT count(`{$this->pkName}`) FROM {$table} WHERE `{$this->rfName}`={$rid}");
         $index = $this->modx->db->getValue($rows);
         $cnt = count($ids);
         $ids = implode(',', $ids);
-        if ($dir == 'top') {
+        if ($dir == 'top') {

             $this->query("SET @index := " . ($index - $cnt - 1));
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := -1");
-        } else {
+        } else {

             $this->query("SET @index := -1");
             $this->query("UPDATE {$table} SET `{$this->indexName}` = (@index := @index + 1) WHERE (`{$this->pkName}` IN ({$ids})) ORDER BY `{$this->indexName}` ASC");
             $this->query("SET @index := " . ($cnt - 1));
@@ -113,26 +113,26 @@ 
      * @param $url
      * @param bool $cache
      */
-    public function deleteThumb($url, $cache = false)
-    {
+    public function deleteThumb($url, $cache = false)

+    {

         $url = $this->fs->relativePath($url);
-        if (empty($url)) {
+        if (empty($url)) {

             return;
         }
-        if ($this->fs->checkFile($url)) {
+        if ($this->fs->checkFile($url)) {

             unlink(MODX_BASE_PATH . $url);
         }
         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
-        if (!$iterator->valid()) {
+        if (!$iterator->valid()) {

             rmdir($dir);
         }
-        if ($cache) {
+        if ($cache) {

             return;
         }
         $thumbsCache = isset($this->params['thumbsCache']) ? $this->params['thumbsCache'] : $this->thumbsCache;
         $thumb = $thumbsCache . $url;
-        if ($this->fs->checkFile($thumb)) {
+        if ($this->fs->checkFile($thumb)) {

             $this->deleteThumb($thumb, true);
         }
     }
@@ -142,8 +142,8 @@ 
      * @param null $fire_events
      * @return $this
      */
-    public function delete($ids, $fire_events = false)
-    {
+    public function delete($ids, $fire_events = false)

+    {

         $out = parent::delete($ids, $fire_events);
         $this->query("ALTER TABLE {$this->makeTable($this->table)} AUTO_INCREMENT = 1");
 
@@ -156,8 +156,8 @@ 
      * @param null $fire_events
      * @return $this
      */
-    public function deleteAll($ids, $rid, $fire_events = false)
-    {
+    public function deleteAll($ids, $rid, $fire_events = false)

+    {

         $this->clearIndexes($ids, $rid);
 
         return $this->delete($ids, $fire_events);
@@ -166,8 +166,8 @@ 
     /**
      * @return array
      */
-    public function fieldNames()
-    {
+    public function fieldNames()

+    {

         $fields = array_keys($this->getDefaultFields());
         $fields[] = $this->fieldPKName();
 
@@ -178,8 +178,8 @@ 
      * @param  string $name
      * @return string
      */
-    public function stripName($name)
-    {
+    public function stripName($name)

+    {

 
         $filename = $this->fs->takeFileName($name);
         $ext = $this->fs->takeFileExt($name);
@@ -195,8 +195,8 @@ 
      * @param $orderDir
      * @return int|void
      */
-    public function reorder($source, $target, $point, $rid, $orderDir)
-    {
+    public function reorder($source, $target, $point, $rid, $orderDir)

+    {

         $rid = (int)$rid;
         $point = strtolower($point);
         $orderDir = strtolower($orderDir);
@@ -206,25 +206,25 @@ 
         $table = $this->makeTable($this->table);
         $rows = 0;
         /* more refactoring  needed */
-        if ($targetIndex < $sourceIndex) {
-            if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
+        if ($targetIndex < $sourceIndex) {

+            if (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
                     "`{$this->indexName}`>={$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
-            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
+            } elseif (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`+1", $table,
                     "`{$this->indexName}`>{$targetIndex} AND `{$this->indexName}`<{$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`=1+{$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
             }
-        } else {
-            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {
+        } else {

+            if (($point == 'bottom' && $orderDir == 'asc') || ($point == 'top' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
                     "`{$this->indexName}`<={$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`={$targetIndex}", $table,
                     "`{$this->pkName}`={$sourceId}");
-            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {
+            } elseif (($point == 'top' && $orderDir == 'asc') || ($point == 'bottom' && $orderDir == 'desc')) {

                 $this->modx->db->update("`{$this->indexName}`=`{$this->indexName}`-1", $table,
                     "`{$this->indexName}`<{$targetIndex} AND `{$this->indexName}`>={$sourceIndex} AND `{$this->rfName}`={$rid}");
                 $rows = $this->modx->db->update("`{$this->indexName}`=-1+{$targetIndex}", $table,
@@ -241,9 +241,9 @@ 
      * @param $options
      * @return bool
      */
-    public function makeThumb($folder, $url, $options)
-    {
-        if (empty($url)) {
+    public function makeThumb($folder, $url, $options)

+    {

+        if (empty($url)) {

             return false;
         }
         $thumb = new \Helpers\PHPThumb();
@@ -251,9 +251,9 @@ 
         $outputFile = MODX_BASE_PATH . $this->fs->relativePath($folder) . '/' . $this->fs->relativePath($url);
         $dir = $this->fs->takeFileDir($outputFile);
         $this->fs->makeDir($dir, $this->modx->config['new_folder_permissions']);
-        if ($thumb->create($inputFile, $outputFile, $options)) {
+        if ($thumb->create($inputFile, $outputFile, $options)) {

             return true;
-        } else {
+        } else {

             $this->modx->logEvent(0, 3, $thumb->debugMessages, __NAMESPACE__);
 
             return false;

assets/lib/SimpleTab/plugin.class.php

Braces +44 added lines, -44 removed lines

@@ -10,8 +10,8 @@ 
  * Class Plugin
  * @package SimpleTab
  */
-abstract class Plugin
-{
+abstract class Plugin

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -54,21 +54,21 @@ 
      * @param $modx
      * @param string $lang_attribute
      */
-    public function __construct($modx, $lang_attribute = 'en')
-    {
+    public function __construct($modx, $lang_attribute = 'en')

+    {

         $this->modx = $modx;
         $this->_table = $modx->getFullTableName($this->table);
         $this->lang_attribute = $lang_attribute;
         $this->params = $modx->event->params;
-        if ($this->checkTemplate && !isset($this->params['template']) && $modx->event->name != 'OnEmptyTrash') {
+        if ($this->checkTemplate && !isset($this->params['template']) && $modx->event->name != 'OnEmptyTrash') {

             $doc = $modx->getDocument($this->params['id'], 'template', 'all', 'all');
             $this->params['template'] = is_array($doc) ? end($doc) : null;
         }
         //overload plugin and class properties
         $_params = $modx->parseProperties('&template=;;' . $this->params['template'] . ' &id=;;' . $this->params['id'],
             $modx->event->activePlugin, 'plugin');
-        foreach ($_params as $key => $value) {
-            if (property_exists($this, $key)) {
+        foreach ($_params as $key => $value) {

+            if (property_exists($this, $key)) {

                 $this->$key = $value;
             }
         }
@@ -84,9 +84,9 @@ 
      * @param array $ids
      * @param $folder
      */
-    public function clearFolders($ids = array(), $folder)
-    {
-        foreach ($ids as $id) {
+    public function clearFolders($ids = array(), $folder)

+    {

+        foreach ($ids as $id) {

             $this->fs->rmDir($folder . $id . '/');
         }
     }
@@ -94,8 +94,8 @@ 
     /**
      * @return bool
      */
-    public function checkPermissions()
-    {
+    public function checkPermissions()

+    {

         $templates = isset($this->params['templates']) ? explode(',', $this->params['templates']) : false;
         $roles = isset($this->params['roles']) ? explode(',', $this->params['roles']) : false;
 
@@ -114,11 +114,11 @@ 
     /**
      * @return string
      */
-    public function prerender()
-    {
-        if (!$this->checkTable()) {
+    public function prerender()

+    {

+        if (!$this->checkTable()) {

             $result = $this->createTable();
-            if (!$result) {
+            if (!$result) {

                 $this->modx->logEvent(0, 3, "Cannot create {$this->table} table.", $this->pluginName);
 
                 return;
@@ -127,9 +127,9 @@ 
         }
         $output = $this->assets->registerJQuery();
         $tpl = MODX_BASE_PATH . $this->tpl;
-        if ($this->fs->checkFile($tpl)) {
+        if ($this->fs->checkFile($tpl)) {

             $output .= '[+js+][+styles+]' . file_get_contents($tpl);
-        } else {
+        } else {

             $this->modx->logEvent(0, 3, "Cannot load {$this->tpl} .", $this->pluginName);
 
             return false;
@@ -143,20 +143,20 @@ 
      * @param array $ph
      * @return string
      */
-    public function renderJS($list, $ph = array())
-    {
+    public function renderJS($list, $ph = array())

+    {

         $js = '';
         $scripts = MODX_BASE_PATH . $list;
-        if ($this->fs->checkFile($scripts)) {
+        if ($this->fs->checkFile($scripts)) {

             $scripts = @file_get_contents($scripts);
             $scripts = $this->DLTemplate->parseChunk('@CODE:' . $scripts, $ph);
             $scripts = json_decode($scripts, true);
             $scripts = isset($scripts['scripts']) ? $scripts['scripts'] : $scripts['styles'];
             $js = $this->assets->registerScriptsList($scripts);
-        } else {
-            if ($list == $this->jsListDefault) {
+        } else {

+            if ($list == $this->jsListDefault) {

                 $this->modx->logEvent(0, 3, "Cannot load {$this->jsListDefault} .", $this->pluginName);
-            } elseif ($list == $this->cssListDefault) {
+            } elseif ($list == $this->cssListDefault) {

                 $this->modx->logEvent(0, 3, "Cannot load {$this->cssListDefault} .", $this->pluginName);
             }
         }
@@ -167,8 +167,8 @@ 
     /**
      * @return array
      */
-    public function getTplPlaceholders()
-    {
+    public function getTplPlaceholders()

+    {

         $ph = array();
 
         return $ph;
@@ -177,11 +177,11 @@ 
     /**
      * @return string
      */
-    public function render()
-    {
-        if (!$this->checkPermissions()) {
+    public function render()

+    {

+        if (!$this->checkPermissions()) {

             $output = $this->prerender();
-            if ($output !== false) {
+            if ($output !== false) {

                 $ph = $this->getTplPlaceholders();
                 $ph['js'] = $this->renderJS($this->jsListDefault, $ph) . $this->renderJS($this->jsListCustom, $ph);
                 $ph['styles'] = $this->renderJS($this->cssListDefault, $ph) . $this->renderJS($this->cssListCustom,
@@ -196,18 +196,18 @@ 
     /**
      * @return string
      */
-    public function renderEmpty()
-    {
-        if (!$this->checkPermissions()) {
+    public function renderEmpty()

+    {

+        if (!$this->checkPermissions()) {

             $tpl = MODX_BASE_PATH . $this->emptyTpl;
-            if ($this->fs->checkFile($tpl)) {
+            if ($this->fs->checkFile($tpl)) {

                 $output = '[+js+]' . file_get_contents($tpl);
                 $ph = $this->getTplPlaceholders();
                 $ph['js'] = $this->renderJS($this->jsListEmpty, $ph);
                 $output = $this->DLTemplate->parseChunk('@CODE:' . $output, $ph);
 
                 return $output;
-            } else {
+            } else {

                 $this->modx->logEvent(0, 3, "Cannot load {$this->emptyTpl} .", $this->pluginName);
             }
         }
@@ -216,8 +216,8 @@ 
     /**
      * @return bool
      */
-    public function checkTable()
-    {
+    public function checkTable()

+    {

         $sql = "SHOW TABLES LIKE '{$this->_table}'";
 
         return $this->modx->db->getRecordCount($this->modx->db->query($sql));
@@ -226,8 +226,8 @@ 
     /**
      * @return mixed
      */
-    public function createTable()
-    {
+    public function createTable()

+    {

         $sql = '';
 
         return $this->modx->db->query($sql);
@@ -237,14 +237,14 @@ 
      * @param array $events
      * @param string $eventsType
      */
-    public function registerEvents($events = array(), $eventsType = '6')
-    {
+    public function registerEvents($events = array(), $eventsType = '6')

+    {

         $eventsTable = $this->modx->getFullTableName('system_eventnames');
-        foreach ($events as $event) {
+        foreach ($events as $event) {

             $result = $this->modx->db->select('`id`', $eventsTable, "`name` = '{$event}'");
-            if (!$this->modx->db->getRecordCount($result)) {
+            if (!$this->modx->db->getRecordCount($result)) {

                 $sql = "INSERT INTO {$eventsTable} VALUES (NULL, '{$event}', '{$eventsType}', '{$this->pluginName} Events')";
-                if (!$this->modx->db->query($sql)) {
+                if (!$this->modx->db->query($sql)) {

                     $this->modx->logEvent(0, 3, "Cannot register {$event} event.", $this->pluginName);
                 }
             }

assets/lib/Helpers/Assets.php

Spacing +5 added lines, -5 removed lines

@@ -73,7 +73,7 @@ 
         $output = '';
         $plugins = $this->modx->pluginEvent;
         //файл проверяется чтобы определить новую админку
-        if ((array_search('ManagerManager', $plugins['OnDocFormRender']) === false) || !file_exists(MODX_MANAGER_PATH . 'media/script/jquery/jquery.min.js')) {
+        if ((array_search('ManagerManager', $plugins['OnDocFormRender']) === false) || ! file_exists(MODX_MANAGER_PATH . 'media/script/jquery/jquery.min.js')) {
             $output .= $this->registerScript('jQuery', array(
                 'src'     => 'assets/js/jquery/jquery-1.9.1.min.js',
                 'version' => '1.9.1'
@@ -92,12 +92,12 @@ 
     public function registerScript($name, $params)
     {
         $out = '';
-        if (!isset($this->modx->loadedjscripts[$name])) {
+        if ( ! isset($this->modx->loadedjscripts[$name])) {
             $src = $params['src'];
             $remote = strpos($src, "http") !== false;
-            if (!$remote) {
+            if ( ! $remote) {
                 $src = $this->modx->config['site_url'] . $src;
-                if (!$this->fs->checkFile($params['src'])) {
+                if ( ! $this->fs->checkFile($params['src'])) {
                     $this->modx->logEvent(0, 3, 'Cannot load ' . $src, 'Assets helper');
 
                     return $out;
@@ -127,7 +127,7 @@ 
     public function registerScriptsList($list = array())
     {
         $out = '';
-        if (!is_array($list)) return $out;
+        if ( ! is_array($list)) return $out;
 
         foreach ($list as $script => $params) {
             $out .= $this->registerScript($script, $params);

Braces +27 added lines, -25 removed lines

@@ -5,8 +5,8 @@ 
 /**
  * Class AssetsHelper
  */
-class AssetsHelper
-{
+class AssetsHelper

+{

     /**
      * Объект DocumentParser - основной класс MODX
      * @var \DocumentParser
@@ -25,10 +25,10 @@ 
      *
      * @return self
      */
-    public static function getInstance(DocumentParser $modx)
-    {
+    public static function getInstance(DocumentParser $modx)

+    {

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

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

+    {

         $this->modx = $modx;
         $this->fs = \Helpers\FS::getInstance();
     }
@@ -50,8 +50,8 @@ 
      *
      * @return void
      */
-    private function __clone()
-    {
+    private function __clone()

+    {

 
     }
 
@@ -60,20 +60,20 @@ 
      *
      * @return void
      */
-    private function __wakeup()
-    {
+    private function __wakeup()

+    {

 
     }
 
     /**
      * @return string
      */
-    public function registerJQuery()
-    {
+    public function registerJQuery()

+    {

         $output = '';
         $plugins = $this->modx->pluginEvent;
         //файл проверяется чтобы определить новую админку
-        if ((array_search('ManagerManager', $plugins['OnDocFormRender']) === false) || !file_exists(MODX_MANAGER_PATH . 'media/script/jquery/jquery.min.js')) {
+        if ((array_search('ManagerManager', $plugins['OnDocFormRender']) === false) || !file_exists(MODX_MANAGER_PATH . 'media/script/jquery/jquery.min.js')) {

             $output .= $this->registerScript('jQuery', array(
                 'src'     => 'assets/js/jquery/jquery-1.9.1.min.js',
                 'version' => '1.9.1'
@@ -89,15 +89,15 @@ 
      * @param $params
      * @return string
      */
-    public function registerScript($name, $params)
-    {
+    public function registerScript($name, $params)

+    {

         $out = '';
-        if (!isset($this->modx->loadedjscripts[$name])) {
+        if (!isset($this->modx->loadedjscripts[$name])) {

             $src = $params['src'];
             $remote = strpos($src, "http") !== false;
-            if (!$remote) {
+            if (!$remote) {

                 $src = $this->modx->config['site_url'] . $src;
-                if (!$this->fs->checkFile($params['src'])) {
+                if (!$this->fs->checkFile($params['src'])) {

                     $this->modx->logEvent(0, 3, 'Cannot load ' . $src, 'Assets helper');
 
                     return $out;
@@ -106,9 +106,9 @@ 
 
             $tmp = explode('.', $src);
             $type = isset($params['type']) ? $params['type'] : end($tmp);
-            if ($type == 'js') {
+            if ($type == 'js') {

                 $out = '<script type="text/javascript" src="' . $src . '"></script>';
-            } else {
+            } else {

                 $media = isset($params['media']) ? " media=\"{$params['media']}\"" : '';
                 $out = "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$src}\"{$media}>";
             }
@@ -124,12 +124,14 @@ 
      * @param array $list
      * @return string
      */
-    public function registerScriptsList($list = array())
-    {
+    public function registerScriptsList($list = array())

+    {

         $out = '';
-        if (!is_array($list)) return $out;
+        if (!is_array($list)) {

+            return $out;

+        }

 
-        foreach ($list as $script => $params) {
+        foreach ($list as $script => $params) {

             $out .= $this->registerScript($script, $params);
         }