@@ -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() |
@@ -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'] = []; |
@@ -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 | } |
@@ -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 { |
@@ -30,14 +30,18 @@ |
||
30 | 30 | public function init($connect_options) |
31 | 31 | { |
32 | 32 | extract($connect_options); |
33 | - if (isset($db_name)) |
|
34 | - $this->db_name = $db_name; |
|
35 | - if (isset($encoding)) |
|
36 | - $this->encoding = $encoding; |
|
37 | - if (isset($table_prefix)) |
|
38 | - $this->table_prefix = $table_prefix; |
|
39 | - if (isset($noConnectAbort)) |
|
40 | - $this->noConnectAbort = $noConnectAbort; |
|
33 | + if (isset($db_name)) { |
|
34 | + $this->db_name = $db_name; |
|
35 | + } |
|
36 | + if (isset($encoding)) { |
|
37 | + $this->encoding = $encoding; |
|
38 | + } |
|
39 | + if (isset($table_prefix)) { |
|
40 | + $this->table_prefix = $table_prefix; |
|
41 | + } |
|
42 | + if (isset($noConnectAbort)) { |
|
43 | + $this->noConnectAbort = $noConnectAbort; |
|
44 | + } |
|
41 | 45 | |
42 | 46 | $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding"; |
43 | 47 | $dt = new \DateTime(); |
@@ -25,8 +25,9 @@ |
||
25 | 25 | |
26 | 26 | $result['payId'] = $data["InvId"]; |
27 | 27 | |
28 | - if (strtolower($data['SignatureValue']) == $hashGenerated) |
|
29 | - $result['status'] = 'success'; |
|
28 | + if (strtolower($data['SignatureValue']) == $hashGenerated) { |
|
29 | + $result['status'] = 'success'; |
|
30 | + } |
|
30 | 31 | |
31 | 32 | return $result; |
32 | 33 | } |
@@ -28,20 +28,24 @@ discard block |
||
28 | 28 | |
29 | 29 | // Проверка наличия необходимых параметров в POST-запросе |
30 | 30 | |
31 | - if (!isset($data["WMI_SIGNATURE"])) |
|
32 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE"); |
|
31 | + if (!isset($data["WMI_SIGNATURE"])) { |
|
32 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE"); |
|
33 | + } |
|
33 | 34 | |
34 | - if (!isset($data["WMI_PAYMENT_NO"])) |
|
35 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO"); |
|
35 | + if (!isset($data["WMI_PAYMENT_NO"])) { |
|
36 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO"); |
|
37 | + } |
|
36 | 38 | |
37 | - if (!isset($data["WMI_ORDER_STATE"])) |
|
38 | - $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE"); |
|
39 | + if (!isset($data["WMI_ORDER_STATE"])) { |
|
40 | + $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE"); |
|
41 | + } |
|
39 | 42 | |
40 | 43 | // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE |
41 | 44 | $params = []; |
42 | 45 | foreach ($data as $name => $value) { |
43 | - if ($name !== "WMI_SIGNATURE") |
|
44 | - $params[$name] = $value; |
|
46 | + if ($name !== "WMI_SIGNATURE") { |
|
47 | + $params[$name] = $value; |
|
48 | + } |
|
45 | 49 | } |
46 | 50 | |
47 | 51 | // Сортировка массива по именам ключей в порядке возрастания |
@@ -86,8 +90,9 @@ discard block |
||
86 | 90 | $config = static::getConfig(); |
87 | 91 | $merchantCurrency = static::getMerchantCurrency($currency); |
88 | 92 | |
89 | - if (!$description) |
|
90 | - $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
93 | + if (!$description) { |
|
94 | + $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME); |
|
95 | + } |
|
91 | 96 | |
92 | 97 | //Секретный ключ интернет-магазина |
93 | 98 | $key = $config['secret']; |
@@ -117,11 +122,12 @@ discard block |
||
117 | 122 | $fieldValues = ""; |
118 | 123 | |
119 | 124 | foreach ($fields as $value) { |
120 | - if (is_array($value)) |
|
121 | - foreach ($value as $v) { |
|
125 | + if (is_array($value)) { |
|
126 | + foreach ($value as $v) { |
|
122 | 127 | //Конвертация из текущей кодировки (UTF-8) |
123 | 128 | //необходима только если кодировка магазина отлична от Windows-1251 |
124 | 129 | $v = iconv("utf-8", "windows-1251", $v); |
130 | + } |
|
125 | 131 | $fieldValues .= $v; |
126 | 132 | } else { |
127 | 133 | //Конвертация из текущей кодировки (UTF-8) |
@@ -112,10 +112,11 @@ discard block |
||
112 | 112 | |
113 | 113 | $sizes = explode('x', $_GET['resize']); |
114 | 114 | $sizes[0] = intval($sizes[0]); |
115 | - if (isset($sizes[1])) |
|
116 | - $sizes[1] = intval($sizes[1]); |
|
117 | - else |
|
118 | - $sizes[1] = 0; |
|
115 | + if (isset($sizes[1])) { |
|
116 | + $sizes[1] = intval($sizes[1]); |
|
117 | + } else { |
|
118 | + $sizes[1] = 0; |
|
119 | + } |
|
119 | 120 | |
120 | 121 | if (!$sizes[0] || !$sizes[1]) { |
121 | 122 | header('HTTP/1.1 404 Not Found'); |
@@ -127,15 +128,16 @@ discard block |
||
127 | 128 | $dir = App::$primary->path; |
128 | 129 | |
129 | 130 | if (!empty($_GET['resize_crop'])) { |
130 | - if (in_array($_GET['resize_crop'], array('q', 'c'))) |
|
131 | - $crop = $_GET['resize_crop']; |
|
132 | - else |
|
133 | - $crop = 'c'; |
|
131 | + if (in_array($_GET['resize_crop'], array('q', 'c'))) { |
|
132 | + $crop = $_GET['resize_crop']; |
|
133 | + } else { |
|
134 | + $crop = 'c'; |
|
135 | + } |
|
136 | + } elseif (!empty($_GET['resize_quadro'])) { |
|
137 | + $crop = 'q'; |
|
138 | + } else { |
|
139 | + $crop = ''; |
|
134 | 140 | } |
135 | - elseif (!empty($_GET['resize_quadro'])) |
|
136 | - $crop = 'q'; |
|
137 | - else |
|
138 | - $crop = ''; |
|
139 | 141 | $pos = 'center'; |
140 | 142 | if (!empty($_GET['resize_pos']) && in_array($_GET['resize_pos'], array('top', 'center'))) { |
141 | 143 | $pos = $_GET['resize_pos']; |