@@ -35,7 +35,7 @@ |
||
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | -require_once( INJI_SYSTEM_DIR . '/init.php' ); |
|
| 38 | +require_once(INJI_SYSTEM_DIR . '/init.php'); |
|
| 39 | 39 | /** |
| 40 | 40 | * System error messages |
| 41 | 41 | */ |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | $html = "<{$tag}"; |
| 25 | 25 | if ($attributes && is_array($attributes)) { |
| 26 | 26 | foreach ($attributes as $key => $value) { |
| 27 | - $html .=" {$key} = '"; |
|
| 27 | + $html .= " {$key} = '"; |
|
| 28 | 28 | if (!is_array($value)) { |
| 29 | 29 | $html .= addcslashes($value, "'"); |
| 30 | 30 | } else { |
@@ -86,7 +86,7 @@ |
||
| 86 | 86 | echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>"; |
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | - echo '<tr><th>Summary</th><th>' . round(( microtime(true) - $this->startTime), 5) . '</th></tr>'; |
|
| 89 | + echo '<tr><th>Summary</th><th>' . round((microtime(true) - $this->startTime), 5) . '</th></tr>'; |
|
| 90 | 90 | echo '<tr><th>Memory</th><th>' . $this->convertSize(memory_get_peak_usage()) . ' of ' . ini_get('memory_limit') . '</th></tr></table></div>'; |
| 91 | 91 | } |
| 92 | 92 | |
@@ -79,10 +79,12 @@ discard block |
||
| 79 | 79 | if (!empty($log['status'])) { |
| 80 | 80 | echo "<tr class = '{$log['status']}'><td>{$log['name']}</td><td>{$log['status']}</td></tr>"; |
| 81 | 81 | } else { |
| 82 | - if (empty($log['end'])) |
|
| 83 | - $log['end'] = microtime(true); |
|
| 84 | - if (empty($log['start'])) |
|
| 85 | - $log['start'] = microtime(true); |
|
| 82 | + if (empty($log['end'])) { |
|
| 83 | + $log['end'] = microtime(true); |
|
| 84 | + } |
|
| 85 | + if (empty($log['start'])) { |
|
| 86 | + $log['start'] = microtime(true); |
|
| 87 | + } |
|
| 86 | 88 | echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>"; |
| 87 | 89 | } |
| 88 | 90 | } |
@@ -93,12 +95,13 @@ discard block |
||
| 93 | 95 | function convertSize($size) |
| 94 | 96 | { |
| 95 | 97 | |
| 96 | - if ($size < 1024) |
|
| 97 | - return $size . "B"; |
|
| 98 | - elseif ($size < 1048576) |
|
| 99 | - return round($size / 1024, 2) . "KB"; |
|
| 100 | - else |
|
| 101 | - return round($size / 1048576, 2) . "MB"; |
|
| 98 | + if ($size < 1024) { |
|
| 99 | + return $size . "B"; |
|
| 100 | + } elseif ($size < 1048576) { |
|
| 101 | + return round($size / 1024, 2) . "KB"; |
|
| 102 | + } else { |
|
| 103 | + return round($size / 1048576, 2) . "MB"; |
|
| 104 | + } |
|
| 102 | 105 | } |
| 103 | 106 | |
| 104 | 107 | function __destruct() |
@@ -1035,7 +1035,7 @@ |
||
| 1035 | 1035 | } else { |
| 1036 | 1036 | $cols .= '*'; |
| 1037 | 1037 | } |
| 1038 | - $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
| 1038 | + $cols .= ') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : ''); |
|
| 1039 | 1039 | App::$cur->db->cols = $cols; |
| 1040 | 1040 | if (!empty($options['group'])) { |
| 1041 | 1041 | App::$cur->db->group($options['group']); |
@@ -718,17 +718,21 @@ discard block |
||
| 718 | 718 | if (!$query) { |
| 719 | 719 | return []; |
| 720 | 720 | } |
| 721 | - if (!empty($options['where'])) |
|
| 722 | - $query->where($options['where']); |
|
| 721 | + if (!empty($options['where'])) { |
|
| 722 | + $query->where($options['where']); |
|
| 723 | + } |
|
| 723 | 724 | if (!empty($options['group'])) { |
| 724 | 725 | $query->group($options['group']); |
| 725 | 726 | } |
| 726 | - if (!empty($options['order'])) |
|
| 727 | - $query->order($options['order']); |
|
| 728 | - if (!empty($options['join'])) |
|
| 729 | - $query->join($options['join']); |
|
| 730 | - if (!empty($options['distinct'])) |
|
| 731 | - $query->distinct = $options['distinct']; |
|
| 727 | + if (!empty($options['order'])) { |
|
| 728 | + $query->order($options['order']); |
|
| 729 | + } |
|
| 730 | + if (!empty($options['join'])) { |
|
| 731 | + $query->join($options['join']); |
|
| 732 | + } |
|
| 733 | + if (!empty($options['distinct'])) { |
|
| 734 | + $query->distinct = $options['distinct']; |
|
| 735 | + } |
|
| 732 | 736 | |
| 733 | 737 | foreach (static::$relJoins as $join) { |
| 734 | 738 | $query->join($join[0], $join[1]); |
@@ -754,14 +758,14 @@ discard block |
||
| 754 | 758 | } |
| 755 | 759 | static::$needJoin = []; |
| 756 | 760 | |
| 757 | - if (!empty($options['limit'])) |
|
| 758 | - $limit = (int) $options['limit']; |
|
| 759 | - else { |
|
| 761 | + if (!empty($options['limit'])) { |
|
| 762 | + $limit = (int) $options['limit']; |
|
| 763 | + } else { |
|
| 760 | 764 | $limit = 0; |
| 761 | 765 | } |
| 762 | - if (!empty($options['start'])) |
|
| 763 | - $start = (int) $options['start']; |
|
| 764 | - else { |
|
| 766 | + if (!empty($options['start'])) { |
|
| 767 | + $start = (int) $options['start']; |
|
| 768 | + } else { |
|
| 765 | 769 | $start = 0; |
| 766 | 770 | } |
| 767 | 771 | if ($limit || $start) { |
@@ -1020,21 +1024,23 @@ discard block |
||
| 1020 | 1024 | if (!empty($options['where'])) { |
| 1021 | 1025 | static::fixPrefix($options['where'], 'first'); |
| 1022 | 1026 | } |
| 1023 | - if (!empty($options['where'])) |
|
| 1024 | - $query->where($options['where']); |
|
| 1025 | - if (!empty($options['join'])) |
|
| 1026 | - $query->join($options['join']); |
|
| 1027 | + if (!empty($options['where'])) { |
|
| 1028 | + $query->where($options['where']); |
|
| 1029 | + } |
|
| 1030 | + if (!empty($options['join'])) { |
|
| 1031 | + $query->join($options['join']); |
|
| 1032 | + } |
|
| 1027 | 1033 | if (!empty($options['order'])) { |
| 1028 | 1034 | $query->order($options['order']); |
| 1029 | 1035 | } |
| 1030 | - if (!empty($options['limit'])) |
|
| 1031 | - $limit = (int) $options['limit']; |
|
| 1032 | - else { |
|
| 1036 | + if (!empty($options['limit'])) { |
|
| 1037 | + $limit = (int) $options['limit']; |
|
| 1038 | + } else { |
|
| 1033 | 1039 | $limit = 0; |
| 1034 | 1040 | } |
| 1035 | - if (!empty($options['start'])) |
|
| 1036 | - $start = (int) $options['start']; |
|
| 1037 | - else { |
|
| 1041 | + if (!empty($options['start'])) { |
|
| 1042 | + $start = (int) $options['start']; |
|
| 1043 | + } else { |
|
| 1038 | 1044 | $start = 0; |
| 1039 | 1045 | } |
| 1040 | 1046 | if ($limit || $start) { |
@@ -1112,8 +1118,9 @@ discard block |
||
| 1112 | 1118 | |
| 1113 | 1119 | $values = []; |
| 1114 | 1120 | foreach ($cols as $col => $param) { |
| 1115 | - if (isset($params[$col])) |
|
| 1116 | - $values[$col] = $params[$col]; |
|
| 1121 | + if (isset($params[$col])) { |
|
| 1122 | + $values[$col] = $params[$col]; |
|
| 1123 | + } |
|
| 1117 | 1124 | } |
| 1118 | 1125 | if (empty($values)) { |
| 1119 | 1126 | return false; |
@@ -1296,8 +1303,9 @@ discard block |
||
| 1296 | 1303 | $values = []; |
| 1297 | 1304 | |
| 1298 | 1305 | foreach ($this->cols() as $col => $param) { |
| 1299 | - if (isset($this->_params[$col])) |
|
| 1300 | - $values[$col] = $this->_params[$col]; |
|
| 1306 | + if (isset($this->_params[$col])) { |
|
| 1307 | + $values[$col] = $this->_params[$col]; |
|
| 1308 | + } |
|
| 1301 | 1309 | } |
| 1302 | 1310 | if (empty($values) && empty($options['empty'])) { |
| 1303 | 1311 | return false; |
@@ -1457,8 +1465,9 @@ discard block |
||
| 1457 | 1465 | { |
| 1458 | 1466 | |
| 1459 | 1467 | foreach (static::relations() as $relName => $rel) { |
| 1460 | - if ($rel['col'] == $col) |
|
| 1461 | - return $relName; |
|
| 1468 | + if ($rel['col'] == $col) { |
|
| 1469 | + return $relName; |
|
| 1470 | + } |
|
| 1462 | 1471 | } |
| 1463 | 1472 | return NULL; |
| 1464 | 1473 | } |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | if (!empty($_SESSION['_INJI_MSG'])) { |
| 23 | 23 | foreach ($_SESSION['_INJI_MSG'] as $key => $msg) { |
| 24 | 24 | if ($msg['text'] == $text) { |
| 25 | - $msg['count'] ++; |
|
| 25 | + $msg['count']++; |
|
| 26 | 26 | return true; |
| 27 | 27 | } |
| 28 | 28 | } |
@@ -52,8 +52,9 @@ |
||
| 52 | 52 | */ |
| 53 | 53 | static function get($clean = false) |
| 54 | 54 | { |
| 55 | - if (empty($_SESSION['_INJI_MSG'])) |
|
| 56 | - return []; |
|
| 55 | + if (empty($_SESSION['_INJI_MSG'])) { |
|
| 56 | + return []; |
|
| 57 | + } |
|
| 57 | 58 | $msgs = $_SESSION['_INJI_MSG']; |
| 58 | 59 | if ($clean) { |
| 59 | 60 | $_SESSION['_INJI_MSG'] = []; |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | static function uriParse($uri) |
| 39 | 39 | { |
| 40 | 40 | $answerPos = strpos($uri, '?'); |
| 41 | - $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1); |
|
| 41 | + $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1); |
|
| 42 | 42 | |
| 43 | 43 | foreach ($params as $key => $param) { |
| 44 | 44 | if ($param != '') { |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') |
| 86 | 86 | { |
| 87 | 87 | ini_set("gd.jpeg_ignore_warning", 1); |
| 88 | - list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path); |
|
| 88 | + list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path); |
|
| 89 | 89 | switch ($img_type) { |
| 90 | 90 | case 1: |
| 91 | 91 | $img_type = 'gif'; |
@@ -108,14 +108,14 @@ discard block |
||
| 108 | 108 | |
| 109 | 109 | if ($crop === true || $crop == 'q') { |
| 110 | 110 | if ($img_width > $img_height) { |
| 111 | - $imgX = floor(( $img_width - $img_height ) / 2); |
|
| 111 | + $imgX = floor(($img_width - $img_height) / 2); |
|
| 112 | 112 | $imgY = 0; |
| 113 | 113 | $img_width = $img_height; |
| 114 | 114 | $new_width = $max_width; |
| 115 | 115 | $new_height = $max_height; |
| 116 | 116 | } else { |
| 117 | 117 | $imgX = 0; |
| 118 | - $imgY = floor(( $img_height - $img_width ) / 2); |
|
| 118 | + $imgY = floor(($img_height - $img_width) / 2); |
|
| 119 | 119 | $img_height = $img_width; |
| 120 | 120 | $new_width = $max_width; |
| 121 | 121 | $new_height = $max_height; |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | $new_width = $max_width; |
| 137 | 137 | $new_height = $max_height; |
| 138 | 138 | //Находим начальные координаты (центрируем новое изображение) |
| 139 | - $imgX = (int) (($ow / 2) - ($img_width / 2) ); |
|
| 139 | + $imgX = (int) (($ow / 2) - ($img_width / 2)); |
|
| 140 | 140 | if ($pos == 'center') { |
| 141 | 141 | $imgY = (int) (($oh / 2) - ($img_height / 2)); |
| 142 | 142 | } else { |
@@ -58,8 +58,9 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | static function createDir($path) |
| 60 | 60 | { |
| 61 | - if (file_exists($path)) |
|
| 62 | - return true; |
|
| 61 | + if (file_exists($path)) { |
|
| 62 | + return true; |
|
| 63 | + } |
|
| 63 | 64 | |
| 64 | 65 | $path = explode('/', $path); |
| 65 | 66 | $cur = ''; |
@@ -101,10 +102,11 @@ discard block |
||
| 101 | 102 | $imagecreatefromX = "imagecreatefrom{$img_type}"; |
| 102 | 103 | $src_res = $imagecreatefromX($img_path); |
| 103 | 104 | |
| 104 | - if ($img_width / $max_width > $img_height / $max_height) |
|
| 105 | - $separator = $img_width / $max_width; |
|
| 106 | - else |
|
| 107 | - $separator = $img_height / $max_height; |
|
| 105 | + if ($img_width / $max_width > $img_height / $max_height) { |
|
| 106 | + $separator = $img_width / $max_width; |
|
| 107 | + } else { |
|
| 108 | + $separator = $img_height / $max_height; |
|
| 109 | + } |
|
| 108 | 110 | |
| 109 | 111 | if ($crop === true || $crop == 'q') { |
| 110 | 112 | if ($img_width > $img_height) { |
@@ -15,8 +15,9 @@ discard block |
||
| 15 | 15 | if (!$app) { |
| 16 | 16 | $app = $this->app->type; |
| 17 | 17 | } |
| 18 | - if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) |
|
| 19 | - return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
| 18 | + if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) { |
|
| 19 | + return $this->config['access']['accessTree'][$app]['deniedUrl']; |
|
| 20 | + } |
|
| 20 | 21 | |
| 21 | 22 | return '/'; |
| 22 | 23 | } |
@@ -50,8 +51,9 @@ discard block |
||
| 50 | 51 | return true; |
| 51 | 52 | } |
| 52 | 53 | |
| 53 | - if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) |
|
| 54 | - return false; |
|
| 54 | + if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) { |
|
| 55 | + return false; |
|
| 56 | + } |
|
| 55 | 57 | |
| 56 | 58 | return true; |
| 57 | 59 | } |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | $widgetSize = !empty($section['size']) ? $section['size'] : 1; |
| 12 | - $rowSum+=$widgetSize; |
|
| 12 | + $rowSum += $widgetSize; |
|
| 13 | 13 | ?> |
| 14 | 14 | <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div> |
| 15 | 15 | <?php |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | |
| 56 | 56 | function newQuery() |
| 57 | 57 | { |
| 58 | - if($this->QueryClassName) { |
|
| 58 | + if ($this->QueryClassName) { |
|
| 59 | 59 | return new $this->QueryClassName($this->connection); |
| 60 | 60 | } |
| 61 | 61 | return false; |
@@ -16,8 +16,9 @@ |
||
| 16 | 16 | $param = isset($this->config['default']) ? $this->config['default'] : 'local'; |
| 17 | 17 | } |
| 18 | 18 | if (!is_array($param)) { |
| 19 | - if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) |
|
| 20 | - return false; |
|
| 19 | + if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) { |
|
| 20 | + return false; |
|
| 21 | + } |
|
| 21 | 22 | |
| 22 | 23 | $db = $dbOption; |
| 23 | 24 | } else { |