AgelxNash / DocLister

assets/lib/SimpleTab/table.abstract.php

Spacing +2 added lines, -2 removed lines

@@ -123,13 +123,13 @@
         }
         $dir = $this->fs->takeFileDir($url);
         $iterator = new \FilesystemIterator($dir);
-        if (!$iterator->valid()) {
+        if ( ! $iterator->valid()) {
             rmdir($dir);
         }
         if ($cache) {
             return;
         }
-        $thumbsCache = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);
+        $thumbsCache = \APIhelpers::getkey($this->params, 'thumbsCache', $this->thumbsCache);
         $thumb = $thumbsCache . $url;
         if ($this->fs->checkFile($thumb)) {
             $this->deleteThumb($thumb, true);

Braces +48 added lines, -46 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->fs = \Helpers\FS::getInstance();
@@ -51,8 +51,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);
@@ -70,8 +70,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;
@@ -82,22 +82,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));
@@ -112,26 +112,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 = \APIhelpers::getkey($this->params,'thumbsCache',$this->thumbsCache);
         $thumb = $thumbsCache . $url;
-        if ($this->fs->checkFile($thumb)) {
+        if ($this->fs->checkFile($thumb)) {

             $this->deleteThumb($thumb, true);
         }
     }
@@ -141,8 +141,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");
 
@@ -155,8 +155,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);
@@ -165,8 +165,8 @@ 
     /**
      * @return array
      */
-    public function fieldNames()
-    {
+    public function fieldNames()

+    {

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

+    {

 
         $filename = $this->fs->takeFileName($name);
         $ext = $this->fs->takeFileExt($name);
@@ -194,8 +194,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);
@@ -205,25 +205,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,
@@ -240,9 +240,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();
@@ -250,9 +250,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;
@@ -262,16 +262,18 @@ 
     /**
      * @return array
      */
-    public function getParams()
-    {
+    public function getParams()

+    {

         return $this->params;
     }
 
     /**
      * @param array $params
      */
-    public function setParams($params = array())
-    {
-        if (is_array($params)) $this->params = $params;
+    public function setParams($params = array())

+    {

+        if (is_array($params)) {

+            $this->params = $params;

+        }

     }
 }