injitools / cms-Inji

system/modules/Users/Users.php

Braces +13 added lines, -10 removed lines

@@ -236,17 +236,20 @@
      * @return boolean|\Users\User
      */
     public function get($idn, $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;
     }

system/modules/Sliders/widgets/slider.php

Braces +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 if (!empty($alias)) {
     $slider = Sliders\Slider::get($alias, 'alias');
 }
-if(empty($slider)){
+if(empty($slider)) {
     echo 'Slider not found';
     return;
 }

system/modules/Ecommerce/objects/DeliveryProvider/PickPoint.php

Braces +5 added lines, -2 removed lines

@@ -35,8 +35,11 @@
         $contents = curl_exec($c);
         curl_close($c);
 
-        if ($contents) return $contents;
-        else return FALSE;
+        if ($contents) {
+            return $contents;
+        } else {
+            return FALSE;
+        }
     }
 
     static function deliveryTime($cart) {

system/modules/Ui/widgets/Form/autocomplete.php

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 if (!empty($options['attributes'])) {
     $attributes = array_merge($attributes, $options['attributes']);
 }
-if(!empty($attributes['onchange'])){
+if(!empty($attributes['onchange'])) {
     unset($attributes['onchange']);
 }
 echo Html::el('input', $attributes, '', null);

system/modules/Exchange1c/objects/Mode/Info.php

Braces +2 added lines, -4 removed lines

@@ -13,11 +13,9 @@
 
 use Exchange1c\Exchange;
 
-class Info extends \Exchange1c\Mode
-{
+class Info extends \Exchange1c\Mode {
 
-    public function process()
-    {
+    public function process() {
         echo "version=2.03";
         $this->end();
     }

system/modules/Migrations/objects/Parser/Object.php

Braces +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
                     $deleteIf = json_decode($this->object->delete_empty, true);
                     foreach ($deleteIf['params'] as $paramId) {
                         if ($model->{$this->object->params[$paramId]->value} === '') {
-                            if($model->pk()){
+                            if($model->pk()) {
                                 $model->delete();
                             }
                             return 0;

system/modules/Ecommerce/widgets/formInputs/cdekChooser.php

Braces +1 added lines, -2 removed lines

@@ -56,8 +56,7 @@
                 echo '<b>Заполните поле: Город</b>';
             }
         }
-    }
-    else {
+    } else {
         echo '<b>Заполните поле: '.$field->name.'</b>';
     }
     ?>

system/modules/Geography/objects/SxGeo.php

Braces +70 added lines, -52 removed lines

@@ -52,13 +52,17 @@ 
 	public $batch_mode  = false;
 	public $memory_mode = false;
 
-	public function __construct($db_file = 'SxGeo.dat', $type = SXGEO_FILE){
+	public function __construct($db_file = 'SxGeo.dat', $type = SXGEO_FILE) {
 		$this->fh = fopen($db_file, 'rb');
 		// Сначала убеждаемся, что есть файл базы данных
 		$header = fread($this->fh, 40); // В версии 2.2 заголовок увеличился на 8 байт
-		if(substr($header, 0, 3) != 'SxG') die("Can't open {$db_file}\n");
+		if(substr($header, 0, 3) != 'SxG') {
+		    die("Can't open {$db_file}\n");
+		}
 		$info = unpack('Cver/Ntime/Ctype/Ccharset/Cb_idx_len/nm_idx_len/nrange/Ndb_items/Cid_len/nmax_region/nmax_city/Nregion_size/Ncity_size/nmax_country/Ncountry_size/npack_size', substr($header, 3));
-		if($info['b_idx_len'] * $info['m_idx_len'] * $info['range'] * $info['db_items'] * $info['time'] * $info['id_len'] == 0) die("Wrong file format {$db_file}\n");
+		if($info['b_idx_len'] * $info['m_idx_len'] * $info['range'] * $info['db_items'] * $info['time'] * $info['id_len'] == 0) {
+		    die("Wrong file format {$db_file}\n");
+		}
 		$this->range       = $info['range'];
 		$this->b_idx_len   = $info['b_idx_len'];
 		$this->m_idx_len   = $info['m_idx_len'];
@@ -92,65 +96,76 @@ 
 		$this->info['cities_begin']  = $this->info['regions_begin'] + $info['region_size'];
 	}
 
-	protected function search_idx($ipn, $min, $max){
-		if($this->batch_mode){
-			while($max - $min > 8){
+	protected function search_idx($ipn, $min, $max) {
+		if($this->batch_mode) {
+			while($max - $min > 8) {
 				$offset = ($min + $max) >> 1;
-				if ($ipn > $this->m_idx_arr[$offset]) $min = $offset;
-				else $max = $offset;
+				if ($ipn > $this->m_idx_arr[$offset]) {
+				    $min = $offset;
+				} else {
+				    $max = $offset;
+				}
 			}
 			while ($ipn > $this->m_idx_arr[$min] && $min++ < $max){};
-		}
-		else {
-			while($max - $min > 8){
+		} else {
+			while($max - $min > 8) {
 				$offset = ($min + $max) >> 1;
-				if ($ipn > substr($this->m_idx_str, $offset*4, 4)) $min = $offset;
-				else $max = $offset;
+				if ($ipn > substr($this->m_idx_str, $offset*4, 4)) {
+				    $min = $offset;
+				} else {
+				    $max = $offset;
+				}
 			}
 			while ($ipn > substr($this->m_idx_str, $min*4, 4) && $min++ < $max){};
 		}
 		return  $min;
 	}
 
-	protected function search_db($str, $ipn, $min, $max){
+	protected function search_db($str, $ipn, $min, $max) {
 		if($max - $min > 1) {
 			$ipn = substr($ipn, 1);
-			while($max - $min > 8){
+			while($max - $min > 8) {
 				$offset = ($min + $max) >> 1;
-				if ($ipn > substr($str, $offset * $this->block_len, 3)) $min = $offset;
-				else $max = $offset;
+				if ($ipn > substr($str, $offset * $this->block_len, 3)) {
+				    $min = $offset;
+				} else {
+				    $max = $offset;
+				}
 			}
 			while ($ipn >= substr($str, $min * $this->block_len, 3) && ++$min < $max){};
-		}
-		else {
+		} else {
 			$min++;
 		}
 		return hexdec(bin2hex(substr($str, $min * $this->block_len - $this->id_len, $this->id_len)));
 	}
 
-	public function get_num($ip){
+	public function get_num($ip) {
 		$ip1n = (int)$ip; // Первый байт
-		if($ip1n == 0 || $ip1n == 10 || $ip1n == 127 || $ip1n >= $this->b_idx_len || false === ($ipn = ip2long($ip))) return false;
+		if($ip1n == 0 || $ip1n == 10 || $ip1n == 127 || $ip1n >= $this->b_idx_len || false === ($ipn = ip2long($ip))) {
+		    return false;
+		}
 		$ipn = pack('N', $ipn);
 		$this->ip1c = chr($ip1n);
 		// Находим блок данных в индексе первых байт
-		if ($this->batch_mode){
+		if ($this->batch_mode) {
 			$blocks = array('min' => $this->b_idx_arr[$ip1n-1], 'max' => $this->b_idx_arr[$ip1n]);
-		}
-		else {
+		} else {
 			$blocks = unpack("Nmin/Nmax", substr($this->b_idx_str, ($ip1n - 1) * 4, 8));
 		}
-		if ($blocks['max'] - $blocks['min'] > $this->range){
+		if ($blocks['max'] - $blocks['min'] > $this->range) {
 			// Ищем блок в основном индексе
 			$part = $this->search_idx($ipn, floor($blocks['min'] / $this->range), floor($blocks['max'] / $this->range)-1);
 			// Нашли номер блока в котором нужно искать IP, теперь находим нужный блок в БД
 			$min = $part > 0 ? $part * $this->range : 0;
 			$max = $part > $this->m_idx_len ? $this->db_items : ($part+1) * $this->range;
 			// Нужно проверить чтобы блок не выходил за пределы блока первого байта
-			if($min < $blocks['min']) $min = $blocks['min'];
-			if($max > $blocks['max']) $max = $blocks['max'];
-		}
-		else {
+			if($min < $blocks['min']) {
+			    $min = $blocks['min'];
+			}
+			if($max > $blocks['max']) {
+			    $max = $blocks['max'];
+			}
+		} else {
 			$min = $blocks['min'];
 			$max = $blocks['max'];
 		}
@@ -158,14 +173,13 @@ 
 		// Находим нужный диапазон в БД
 		if ($this->memory_mode) {
 			return $this->search_db($this->db, $ipn, $min, $max);
-		}
-		else {
+		} else {
 			fseek($this->fh, $this->db_begin + $min * $this->block_len);
 			return $this->search_db(fread($this->fh, $len * $this->block_len), $ipn, 0, $len);
 		}
 	}
 
-	protected function readData($seek, $max, $type){
+	protected function readData($seek, $max, $type) {
 		$raw = '';
 		if($seek && $max) {
 			if ($this->memory_mode) {
@@ -178,47 +192,49 @@ 
 		return $this->unpack($this->pack[$type], $raw);
 	}
 
-	protected function parseCity($seek, $full = false){
-		if(!$this->pack) return false;
+	protected function parseCity($seek, $full = false) {
+		if(!$this->pack) {
+		    return false;
+		}
 		$only_country = false;
-		if($seek < $this->country_size){
+		if($seek < $this->country_size) {
 			$country = $this->readData($seek, $this->max_country, 0);
 			$city = $this->unpack($this->pack[2]);
 			$city['lat'] = $country['lat'];
 			$city['lon'] = $country['lon'];
 			$only_country = true;
-		}
-		else {
+		} else {
 			$city = $this->readData($seek, $this->max_city, 2);
 			$country = array('id' => $city['country_id'], 'iso' => $this->id2iso[$city['country_id']]);
 			unset($city['country_id']);
 		}
 		if($full) {
 			$region = $this->readData($city['region_seek'], $this->max_region, 1);
-			if(!$only_country) $country = $this->readData($region['country_seek'], $this->max_country, 0);
+			if(!$only_country) {
+			    $country = $this->readData($region['country_seek'], $this->max_country, 0);
+			}
 			unset($city['region_seek']);
 			unset($region['country_seek']);
 			return array('city' => $city, 'region' => $region, 'country' => $country);
-		}
-		else {
+		} else {
 			unset($city['region_seek']);
 			return array('city' => $city, 'country' => array('id' => $country['id'], 'iso' => $country['iso']));
 		}
 	}
 
-	protected function unpack($pack, $item = ''){
+	protected function unpack($pack, $item = '') {
 		$unpacked = array();
 		$empty = empty($item);
 		$pack = explode('/', $pack);
 		$pos = 0;
-		foreach($pack AS $p){
+		foreach($pack AS $p) {
 			list($type, $name) = explode(':', $p);
 			$type0 = $type{0};
 			if($empty) {
 				$unpacked[$name] = $type0 == 'b' || $type0 == 'c' ? '' : 0;
 				continue;
 			}
-			switch($type0){
+			switch($type0) {
 				case 't':
 				case 'T': $l = 1; break;
 				case 's':
@@ -232,7 +248,7 @@ 
 				default: $l = 4;
 			}
 			$val = substr($item, $pos, $l);
-			switch($type0){
+			switch($type0) {
 				case 't': $v = unpack('c', $val); break;
 				case 'T': $v = unpack('C', $val); break;
 				case 's': $v = unpack('s', $val); break;
@@ -256,32 +272,34 @@ 
 		return $unpacked;
 	}
 
-	public function get($ip){
+	public function get($ip) {
 		return $this->max_city ? $this->getCity($ip) : $this->getCountry($ip);
 	}
-	public function getCountry($ip){
+	public function getCountry($ip) {
 		if($this->max_city) {
 			$tmp = $this->parseCity($this->get_num($ip));
 			return $tmp['country']['iso'];
+		} else {
+		    return $this->id2iso[$this->get_num($ip)];
 		}
-		else return $this->id2iso[$this->get_num($ip)];
 	}
-	public function getCountryId($ip){
+	public function getCountryId($ip) {
 		if($this->max_city) {
 			$tmp = $this->parseCity($this->get_num($ip));
 			return $tmp['country']['id'];
+		} else {
+		    return $this->get_num($ip);
 		}
-		else return $this->get_num($ip);
 	}
-	public function getCity($ip){
+	public function getCity($ip) {
 		$seek = $this->get_num($ip);
 		return $seek ? $this->parseCity($seek) : false;
 	}
-	public function getCityFull($ip){
+	public function getCityFull($ip) {
 		$seek = $this->get_num($ip);
 		return $seek ? $this->parseCity($seek, 1) : false;
 	}
-	public function about(){
+	public function about() {
 		$charset = array('utf-8', 'latin1', 'cp1251');
 		$types   = array('n/a', 'SxGeo Country', 'SxGeo City RU', 'SxGeo City EN', 'SxGeo City', 'SxGeo City Max RU', 'SxGeo City Max EN', 'SxGeo City Max');
 		return array(

system/modules/Geography/Geography.php

Braces +25 added lines, -10 removed lines

@@ -70,7 +70,9 @@ 
         preg_match("/(Country|City|Max)/", pathinfo($url, PATHINFO_BASENAME), $m);
         $type = $m[1];
         $dat_file = $types[$type];
-        if ($info) echo "Скачиваем архив с сервера\n";
+        if ($info) {
+            echo "Скачиваем архив с сервера\n";
+        }
 
         $fp = fopen($dat_file_dir . '/SxGeoTmp.zip', 'wb');
         $ch = curl_init($url);
@@ -79,7 +81,9 @@ 
             CURLOPT_HTTPHEADER => file_exists($last_updated_file) ? array("If-Modified-Since: " . file_get_contents($last_updated_file)) : array(),
         ));
         if (!curl_exec($ch)) {
-            if ($info) echo 'Ошибка при скачивании архива';
+            if ($info) {
+                echo 'Ошибка при скачивании архива';
+            }
             return;
         }
         $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
@@ -87,29 +91,40 @@ 
         fclose($fp);
         if ($code == 304) {
             @unlink($dat_file_dir . '/SxGeoTmp.zip');
-            if ($info) echo "Архив не обновился, с момента предыдущего скачивания\n";
+            if ($info) {
+                echo "Архив не обновился, с момента предыдущего скачивания\n";
+            }
             return;
         }
 
-        if ($info) echo "Архив с сервера скачан\n";
-// Распаковываем архив
+        if ($info) {
+            echo "Архив с сервера скачан\n";
+        }
+        // Распаковываем архив
         $fp = fopen('zip://' . $dat_file_dir . '/SxGeoTmp.zip#' . $dat_file, 'rb');
         $fw = fopen($dat_file_dir . '/' . $dat_file, 'wb');
         if (!$fp) {
-            if ($info)
-                echo "Не получается открыть\n";
+            if ($info) {
+                            echo "Не получается открыть\n";
+            }
             return;
         }
-        if ($info) echo "Распаковываем архив\n";
+        if ($info) {
+            echo "Распаковываем архив\n";
+        }
         stream_copy_to_stream($fp, $fw);
         fclose($fp);
         fclose($fw);
         if (filesize($dat_file) == 0) {
-            if ($info) echo 'Ошибка при распаковке архива';
+            if ($info) {
+                echo 'Ошибка при распаковке архива';
+            }
         }
         @unlink($dat_file_dir . '/SxGeoTmp.zip');
         file_put_contents($last_updated_file, gmdate('D, d M Y H:i:s') . ' GMT');
-        if ($info) echo "Перемещен файл в {$dat_file_dir}/{$dat_file}\n";
+        if ($info) {
+            echo "Перемещен файл в {$dat_file_dir}/{$dat_file}\n";
+        }
 
     }