injitools / cms-Inji

system/Inji/ComposerCmd.php

Doc Comments +4 added lines

@@ -58,6 +58,10 @@
         self::command('install', false, $path);
     }
 
+    /**
+     * @param string $command
+     * @param string $path
+     */
     static function command($command, $needOutput = true, $path = null)
     {
         include_once 'composer/vendor/autoload.php';

system/Inji/Tools.php

Doc Comments +1 added lines

@@ -216,6 +216,7 @@
      * @param  $number Integer Число на основе которого нужно сформировать окончание
      * @param  $endingsArray  Array Массив слов или окончаний для чисел (1, 4, 5),
      *         например array('яблоко', 'яблока', 'яблок')
+     * @param string[] $endingArray
      * @return String
      */
     static function getNumEnding($number, $endingArray)

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
     static function uriParse($uri)
     {
         $answerPos = strpos($uri, '?');
-        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
         foreach ($params as $key => $param) {
             if ($param != '') {
@@ -85,7 +85,7 @@ 
     static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center')
     {
         ini_set("gd.jpeg_ignore_warning", 1);
-        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
+        list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
         switch ($img_type) {
             case 1:
                 $img_type = 'gif';
@@ -108,14 +108,14 @@ 
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {
-                $imgX = floor(( $img_width - $img_height ) / 2);
+                $imgX = floor(($img_width - $img_height) / 2);
                 $imgY = 0;
                 $img_width = $img_height;
                 $new_width = $max_width;
                 $new_height = $max_height;
             } else {
                 $imgX = 0;
-                $imgY = floor(( $img_height - $img_width ) / 2);
+                $imgY = floor(($img_height - $img_width) / 2);
                 $img_height = $img_width;
                 $new_width = $max_width;
                 $new_height = $max_height;
@@ -136,7 +136,7 @@ 
             $new_width = $max_width;
             $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-            $imgX = (int) (($ow / 2) - ($img_width / 2) );
+            $imgX = (int) (($ow / 2) - ($img_width / 2));
             if ($pos == 'center') {
                 $imgY = (int) (($oh / 2) - ($img_height / 2));
             } else {

Braces +8 added lines, -6 removed lines

@@ -58,8 +58,9 @@ 
      */
     static function createDir($path)
     {
-        if (file_exists($path))
-            return true;
+        if (file_exists($path)) {
+                    return true;
+        }
 
         $path = explode('/', $path);
         $cur = '';
@@ -101,10 +102,11 @@ 
         $imagecreatefromX = "imagecreatefrom{$img_type}";
         $src_res = $imagecreatefromX($img_path);
 
-        if ($img_width / $max_width > $img_height / $max_height)
-            $separator = $img_width / $max_width;
-        else
-            $separator = $img_height / $max_height;
+        if ($img_width / $max_width > $img_height / $max_height) {
+                    $separator = $img_width / $max_width;
+        } else {
+                    $separator = $img_height / $max_height;
+        }
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {

system/modules/Db/objects/Mysql/Query.php

Doc Comments +6 added lines

@@ -29,6 +29,9 @@ 
     public $params = [];
     public $distinct = false;
 
+    /**
+     * @param  $instance
+     */
     function __construct($instance = null)
     {
         if (!$instance) {
@@ -47,6 +50,9 @@ 
         return $this->curInstance->pdo->lastInsertId();
     }
 
+    /**
+     * @param string $table
+     */
     public function select($table)
     {
         $this->operation = 'SELECT';

Spacing +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
                     }
                 }
                 $update = implode(',', $updates);
-                $query .=" SET {$update}";
+                $query .= " SET {$update}";
             case 'SELECT':
             case 'DELETE':
                 $this->buildWhere($this->where);

Braces +59 added lines, -46 removed lines

@@ -126,12 +126,14 @@ 
         if (!is_array($order)) {
             $this->order[] = "{$order} {$type}";
         } else {
-            foreach ($order as $item)
-                if (!is_array($item)) {
+            foreach ($order as $item) {
+                            if (!is_array($item)) {
                     call_user_func_array(array($this, 'order'), $order);
+            }
                     break;
-                } else
-                    $this->order($item);
+                } else {
+                                    $this->order($item);
+                }
         }
     }
 
@@ -140,8 +142,9 @@ 
         $start = intval($start);
         $len = intval($len);
         $this->limit = "LIMIT {$start}";
-        if ($len !== 0)
-            $this->limit .= ",{$len}";
+        if ($len !== 0) {
+                    $this->limit .= ",{$len}";
+        }
     }
 
     function buildJoin($table, $where = false, $type = 'LEFT', $alias = '')
@@ -154,10 +157,12 @@ 
             }
         } else {
             $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}";
-            if ($alias)
-                $join .= " AS `{$alias}`";
-            if ($where)
-                $join .= " ON {$where}";
+            if ($alias) {
+                            $join .= " AS `{$alias}`";
+            }
+            if ($where) {
+                            $join .= " ON {$where}";
+            }
         }
         return $join;
     }
@@ -166,69 +171,77 @@ 
     {
         $params = [];
         if (!is_array($where)) {
-            if (!$operation)
-                $operation = '=';
+            if (!$operation) {
+                            $operation = '=';
+            }
 
-            if ($concatenation === false)
-                $concatenation = 'AND';
-            elseif ($concatenation === true)
-                $concatenation = '';
+            if ($concatenation === false) {
+                            $concatenation = 'AND';
+            } elseif ($concatenation === true) {
+                            $concatenation = '';
+            }
 
-            if ($this->whereString == NULL)
-                $this->whereString = ' WHERE ';
+            if ($this->whereString == NULL) {
+                            $this->whereString = ' WHERE ';
+            }
 
             if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) {
-                if (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value))
-                    $value = "({$value})";
-                elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value))
-                    $value = "\"{$value}\"";
-            }
-            elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
+                if (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) {
+                                    $value = "({$value})";
+                } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) {
+                                    $value = "\"{$value}\"";
+                }
+            } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) {
                 $this->params[] = $value;
                 $value = "?";
             }
 
-            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ')
-                $this->whereString .= " {$where} {$operation} {$value} ";
-            else
-                $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
-        }
-        else {
+            if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') {
+                            $this->whereString .= " {$where} {$operation} {$value} ";
+            } else {
+                            $this->whereString .= "{$concatenation} {$where} {$operation} {$value} ";
+            }
+        } else {
             $i = -1;
             while (isset($where[++$i])) {
                 $item = $where[$i];
                 if (isset($where[$i + 1]) && !isset($where[$i - 1]) && is_array($where[$i])) {
                     if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(' && $this->whereString != 'WHERE ') {
-                        if (!isset($item[3]))
-                            $concatenation = 'AND';
-                        else
-                            $concatenation = $item[3];
+                        if (!isset($item[3])) {
+                                                    $concatenation = 'AND';
+                        } else {
+                                                    $concatenation = $item[3];
+                        }
 
                         $this->whereString .= "{$concatenation} ";
                     }
 
-                    if ($this->whereString != NULL)
-                        $this->whereString .= '(';
-                    else
-                        $this->whereString = 'WHERE (';
+                    if ($this->whereString != NULL) {
+                                            $this->whereString .= '(';
+                    } else {
+                                            $this->whereString = 'WHERE (';
+                    }
                 }
 
                 if (!is_array($item)) {
                     call_user_func_array(array($this, 'buildWhere'), $where);
                     break;
                 } else {
-                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(')
-                        if (!isset($item[3]))
+                    if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(') {
+                                            if (!isset($item[3]))
                             $concatenation = 'AND';
-                        else
-                            $concatenation = $item[3];
-                    elseif (substr($this->whereString, -1, 1) != '(')
-                        $this->whereString = 'WHERE ';
+                    } else {
+                                                    $concatenation = $item[3];
+                        }
+                    elseif (substr($this->whereString, -1, 1) != '(') {
+                                            $this->whereString = 'WHERE ';
+                    }
 
                     $this->buildWhere($item);
                 }
-                if (!isset($where[$i + 1]) && isset($where[$i - 1]))
-                    $this->whereString .= ') ';
+                if (!isset($where[$i + 1]) && isset($where[$i - 1])) {
+                                    $this->whereString .= ') ';
+                }
             }
         }
     }

system/modules/Modules/Modules.php

Doc Comments +4 added lines

@@ -45,6 +45,10 @@
         return $modelCols;
     }
 
+    /**
+     * @param string $colPrefix
+     * @param string $tableName
+     */
     function parseColsForTable($cols, $colPrefix, $tableName)
     {
 

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
     function parseColsForModel($cols = [])
     {
-        $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []];
+        $modelCols = ['labels' => [], 'cols' => [], 'relations' => []];
         foreach ($cols as $col) {
             $modelCols['labels'][$col['code']] = $col['label'];
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];

system/modules/Ui/objects/ActiveForm.php

Doc Comments +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
     /**
      * Draw error message
      * 
-     * @param text $errorText
+     * @param string $errorText
      */
     function drawError($errorText)
     {

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
                             $this->model->_params[$modelName::index()] = 0;
                         }
                         $relOptions['model']::fixPrefix($relOptions['col']);
-                        $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+                        $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
                 } elseif (!empty($modelName::$cols[$col])) {

system/modules/Ui/objects/DataManager.php

Doc Comments +4 added lines, -1 removed lines

@@ -319,6 +319,9 @@ 
         return $rows;
     }
 
+    /**
+     * @param DataManager $dataManager
+     */
     static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null)
     {
         $modelName = get_class($item);
@@ -668,7 +671,7 @@ 
     /**
      * Draw error message
      * 
-     * @param text $errorText
+     * @param string $errorText
      */
     function drawError($errorText)
     {

Indentation +12 added lines, -12 removed lines

@@ -608,22 +608,22 @@
         ?>
         <ul class="nav nav-list-categorys" data-col='tree_path'>
           <?php
-          $categoryModel = $this->managerOptions['categorys']['model'];
-          $order = [];
-          if (!empty($this->managerOptions['sortMode'])) {
-              $order[] = ['weight', 'asc'];
-          }
-          $categorys = $categoryModel::getList(['order' => $order]);
-          echo "<li>
+            $categoryModel = $this->managerOptions['categorys']['model'];
+            $order = [];
+            if (!empty($this->managerOptions['sortMode'])) {
+                $order[] = ['weight', 'asc'];
+            }
+            $categorys = $categoryModel::getList(['order' => $order]);
+            echo "<li>
                         <label class='nav-header'>
                             <a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-path ='/'>/</a> 
                         </label>
                     </li>";
-          foreach ($categorys as $category) {
-              if ($category->parent_id == 0)
-                  $this->showCategory($categorys, $category);
-          }
-          ?>
+            foreach ($categorys as $category) {
+                if ($category->parent_id == 0)
+                    $this->showCategory($categorys, $category);
+            }
+            ?>
         </ul>
         <?php
     }

Spacing +1 added lines, -1 removed lines

@@ -397,7 +397,7 @@
                         return $item->$colName;
                 }
             } elseif (!empty($modelName::$cols[$colName]['type'])) {
-                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
                     $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
                     return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";

Braces +3 added lines, -2 removed lines

@@ -620,8 +620,9 @@
                         </label>
                     </li>";
           foreach ($categorys as $category) {
-              if ($category->parent_id == 0)
-                  $this->showCategory($categorys, $category);
+              if ($category->parent_id == 0) {
+                                $this->showCategory($categorys, $category);
+              }
           }
           ?>
         </ul>

system/modules/Ui/objects/Form.php

Doc Comments +4 added lines

@@ -45,6 +45,10 @@
         \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/begin', $params);
     }
 
+    /**
+     * @param string $type
+     * @param string $name
+     */
     function input($type, $name, $label = '', $options = [])
     {
         switch ($type) {

system/modules/Ui/objects/Table.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
     public $attributes = [];
     public $indexCol = null;
 
+    /**
+     * @param string[] $cols
+     */
     function setCols($cols)
     {
         $this->cols = $cols;

system/modules/Users/Users.php

Doc Comments +6 added lines

@@ -92,6 +92,9 @@ 
         }
     }
 
+    /**
+     * @param string $user_mail
+     */
     function passre($user_mail)
     {
         $user = $this->get($user_mail, 'mail');
@@ -312,6 +315,9 @@ 
         return $user->id;
     }
 
+    /**
+     * @param string $pass
+     */
     function hashpass($pass)
     {
         return password_hash($pass, PASSWORD_DEFAULT);

Spacing +1 added lines, -1 removed lines

@@ -296,7 +296,7 @@
             $to = $user_mail;
             $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
-            $text .='<br />';
+            $text .= '<br />';
             $text .= '<br />';
             $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
             Tools::sendMail($from, $to, $subject, $text);

Braces +13 added lines, -10 removed lines

@@ -189,17 +189,20 @@
 
     public function get($idn = false, $ltype = 'id')
     {
-        if (!$idn)
-            return false;
+        if (!$idn) {
+                    return false;
+        }
 
-        if (is_numeric($idn) && $ltype != 'login')
-            $user = Users\User::get($idn, 'id');
-        elseif ($ltype == 'login')
-            $user = Users\User::get($idn, 'login');
-        else
-            $user = Users\User::get($idn, 'mail');
-        if (!$user)
-            return [];
+        if (is_numeric($idn) && $ltype != 'login') {
+                    $user = Users\User::get($idn, 'id');
+        } elseif ($ltype == 'login') {
+                    $user = Users\User::get($idn, 'login');
+        } else {
+                    $user = Users\User::get($idn, 'mail');
+        }
+        if (!$user) {
+                    return [];
+        }
 
         return $user;
     }