injitools / cms-Inji

system/Inji/Log.php

Doc Comments +3 added lines

@@ -89,6 +89,9 @@
         App::$cur->log->forceView = $bool;
     }
 
+    /**
+     * @param integer $size
+     */
     public function convertSize($size) {
 
         if ($size < 1024) {

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

Spacing +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;

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

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
                 </div>
                 <script>
                   inji.onLoad(function () {
-                    inji.Ui.customSelect.bind($('#<?=$id;?>'));
+                    inji.Ui.customSelect.bind($('#<?=$id; ?>'));
                   })
                 </script>
                 <?php
@@ -58,7 +58,7 @@ 
         }
     }
     else {
-        echo '<b>Заполните поле: '.$field->name.'</b>';
+        echo '<b>Заполните поле: ' . $field->name . '</b>';
     }
     ?>
 </div>

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

Doc Comments +12 added lines

@@ -92,6 +92,11 @@ 
 		$this->info['cities_begin']  = $this->info['regions_begin'] + $info['region_size'];
 	}
 
+	/**
+	 * @param string $ipn
+	 * @param double $min
+	 * @param double $max
+	 */
 	protected function search_idx($ipn, $min, $max){
 		if($this->batch_mode){
 			while($max - $min > 8){
@@ -112,6 +117,10 @@ 
 		return  $min;
 	}
 
+	/**
+	 * @param string $str
+	 * @param string $ipn
+	 */
 	protected function search_db($str, $ipn, $min, $max){
 		if($max - $min > 1) {
 			$ipn = substr($ipn, 1);
@@ -165,6 +174,9 @@ 
 		}
 	}
 
+	/**
+	 * @param integer $type
+	 */
 	protected function readData($seek, $max, $type){
 		$raw = '';
 		if($seek && $max) {

Indentation +281 added lines, -281 removed lines

@@ -14,298 +14,298 @@
 define ('SXGEO_MEMORY', 1);
 define ('SXGEO_BATCH',  2);
 class SxGeo {
-	protected $fh;
-	protected $ip1c;
-	protected $info;
-	protected $range;
-	protected $db_begin;
-	protected $b_idx_str;
-	protected $m_idx_str;
-	protected $b_idx_arr;
-	protected $m_idx_arr;
-	protected $m_idx_len;
-	protected $db_items;
-	protected $country_size;
-	protected $db;
-	protected $regions_db;
-	protected $cities_db;
+    protected $fh;
+    protected $ip1c;
+    protected $info;
+    protected $range;
+    protected $db_begin;
+    protected $b_idx_str;
+    protected $m_idx_str;
+    protected $b_idx_arr;
+    protected $m_idx_arr;
+    protected $m_idx_len;
+    protected $db_items;
+    protected $country_size;
+    protected $db;
+    protected $regions_db;
+    protected $cities_db;
 
-	public $id2iso = array(
-		'', 'AP', 'EU', 'AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'CW', 'AO', 'AQ', 'AR', 'AS', 'AT', 'AU',
-		'AW', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BM', 'BN', 'BO', 'BR', 'BS',
-		'BT', 'BV', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF', 'CG', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN',
-		'CO', 'CR', 'CU', 'CV', 'CX', 'CY', 'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG',
-		'EH', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'SX', 'GA', 'GB', 'GD', 'GE', 'GF',
-		'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HM', 'HN',
-		'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IN', 'IO', 'IQ', 'IR', 'IS', 'IT', 'JM', 'JO', 'JP', 'KE',
-		'KG', 'KH', 'KI', 'KM', 'KN', 'KP', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR',
-		'LS', 'LT', 'LU', 'LV', 'LY', 'MA', 'MC', 'MD', 'MG', 'MH', 'MK', 'ML', 'MM', 'MN', 'MO', 'MP',
-		'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NF', 'NG', 'NI',
-		'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PK', 'PL', 'PM', 'PN',
-		'PR', 'PS', 'PT', 'PW', 'PY', 'QA', 'RE', 'RO', 'RU', 'RW', 'SA', 'SB', 'SC', 'SD', 'SE', 'SG',
-		'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SO', 'SR', 'ST', 'SV', 'SY', 'SZ', 'TC', 'TD', 'TF',
-		'TG', 'TH', 'TJ', 'TK', 'TM', 'TN', 'TO', 'TL', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'UM',
-		'US', 'UY', 'UZ', 'VA', 'VC', 'VE', 'VG', 'VI', 'VN', 'VU', 'WF', 'WS', 'YE', 'YT', 'RS', 'ZA',
-		'ZM', 'ME', 'ZW', 'A1', 'XK', 'O1', 'AX', 'GG', 'IM', 'JE', 'BL', 'MF', 'BQ', 'SS'
-	);
+    public $id2iso = array(
+        '', 'AP', 'EU', 'AD', 'AE', 'AF', 'AG', 'AI', 'AL', 'AM', 'CW', 'AO', 'AQ', 'AR', 'AS', 'AT', 'AU',
+        'AW', 'AZ', 'BA', 'BB', 'BD', 'BE', 'BF', 'BG', 'BH', 'BI', 'BJ', 'BM', 'BN', 'BO', 'BR', 'BS',
+        'BT', 'BV', 'BW', 'BY', 'BZ', 'CA', 'CC', 'CD', 'CF', 'CG', 'CH', 'CI', 'CK', 'CL', 'CM', 'CN',
+        'CO', 'CR', 'CU', 'CV', 'CX', 'CY', 'CZ', 'DE', 'DJ', 'DK', 'DM', 'DO', 'DZ', 'EC', 'EE', 'EG',
+        'EH', 'ER', 'ES', 'ET', 'FI', 'FJ', 'FK', 'FM', 'FO', 'FR', 'SX', 'GA', 'GB', 'GD', 'GE', 'GF',
+        'GH', 'GI', 'GL', 'GM', 'GN', 'GP', 'GQ', 'GR', 'GS', 'GT', 'GU', 'GW', 'GY', 'HK', 'HM', 'HN',
+        'HR', 'HT', 'HU', 'ID', 'IE', 'IL', 'IN', 'IO', 'IQ', 'IR', 'IS', 'IT', 'JM', 'JO', 'JP', 'KE',
+        'KG', 'KH', 'KI', 'KM', 'KN', 'KP', 'KR', 'KW', 'KY', 'KZ', 'LA', 'LB', 'LC', 'LI', 'LK', 'LR',
+        'LS', 'LT', 'LU', 'LV', 'LY', 'MA', 'MC', 'MD', 'MG', 'MH', 'MK', 'ML', 'MM', 'MN', 'MO', 'MP',
+        'MQ', 'MR', 'MS', 'MT', 'MU', 'MV', 'MW', 'MX', 'MY', 'MZ', 'NA', 'NC', 'NE', 'NF', 'NG', 'NI',
+        'NL', 'NO', 'NP', 'NR', 'NU', 'NZ', 'OM', 'PA', 'PE', 'PF', 'PG', 'PH', 'PK', 'PL', 'PM', 'PN',
+        'PR', 'PS', 'PT', 'PW', 'PY', 'QA', 'RE', 'RO', 'RU', 'RW', 'SA', 'SB', 'SC', 'SD', 'SE', 'SG',
+        'SH', 'SI', 'SJ', 'SK', 'SL', 'SM', 'SN', 'SO', 'SR', 'ST', 'SV', 'SY', 'SZ', 'TC', 'TD', 'TF',
+        'TG', 'TH', 'TJ', 'TK', 'TM', 'TN', 'TO', 'TL', 'TR', 'TT', 'TV', 'TW', 'TZ', 'UA', 'UG', 'UM',
+        'US', 'UY', 'UZ', 'VA', 'VC', 'VE', 'VG', 'VI', 'VN', 'VU', 'WF', 'WS', 'YE', 'YT', 'RS', 'ZA',
+        'ZM', 'ME', 'ZW', 'A1', 'XK', 'O1', 'AX', 'GG', 'IM', 'JE', 'BL', 'MF', 'BQ', 'SS'
+    );
 
-	public $batch_mode  = false;
-	public $memory_mode = false;
+    public $batch_mode  = false;
+    public $memory_mode = false;
 
-	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");
-		$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");
-		$this->range       = $info['range'];
-		$this->b_idx_len   = $info['b_idx_len'];
-		$this->m_idx_len   = $info['m_idx_len'];
-		$this->db_items    = $info['db_items'];
-		$this->id_len      = $info['id_len'];
-		$this->block_len   = 3 + $this->id_len;
-		$this->max_region  = $info['max_region'];
-		$this->max_city    = $info['max_city'];
-		$this->max_country = $info['max_country'];
-		$this->country_size= $info['country_size'];
-		$this->batch_mode  = $type & SXGEO_BATCH;
-		$this->memory_mode = $type & SXGEO_MEMORY;
-		$this->pack        = $info['pack_size'] ? explode("\0", fread($this->fh, $info['pack_size'])) : '';
-		$this->b_idx_str   = fread($this->fh, $info['b_idx_len'] * 4);
-		$this->m_idx_str   = fread($this->fh, $info['m_idx_len'] * 4);
+    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");
+        $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");
+        $this->range       = $info['range'];
+        $this->b_idx_len   = $info['b_idx_len'];
+        $this->m_idx_len   = $info['m_idx_len'];
+        $this->db_items    = $info['db_items'];
+        $this->id_len      = $info['id_len'];
+        $this->block_len   = 3 + $this->id_len;
+        $this->max_region  = $info['max_region'];
+        $this->max_city    = $info['max_city'];
+        $this->max_country = $info['max_country'];
+        $this->country_size= $info['country_size'];
+        $this->batch_mode  = $type & SXGEO_BATCH;
+        $this->memory_mode = $type & SXGEO_MEMORY;
+        $this->pack        = $info['pack_size'] ? explode("\0", fread($this->fh, $info['pack_size'])) : '';
+        $this->b_idx_str   = fread($this->fh, $info['b_idx_len'] * 4);
+        $this->m_idx_str   = fread($this->fh, $info['m_idx_len'] * 4);
 
-		$this->db_begin = ftell($this->fh);
-		if ($this->batch_mode) {
-			$this->b_idx_arr = array_values(unpack("N*", $this->b_idx_str)); // Быстрее в 5 раз, чем с циклом
-			unset ($this->b_idx_str);
-			$this->m_idx_arr = str_split($this->m_idx_str, 4); // Быстрее в 5 раз чем с циклом
-			unset ($this->m_idx_str);
-		}
-		if ($this->memory_mode) {
-			$this->db  = fread($this->fh, $this->db_items * $this->block_len);
-			$this->regions_db = $info['region_size'] > 0 ? fread($this->fh, $info['region_size']) : '';
-			$this->cities_db  = $info['city_size'] > 0 ? fread($this->fh, $info['city_size']) : '';
-		}
-		$this->info = $info;
-		$this->info['regions_begin'] = $this->db_begin + $this->db_items * $this->block_len;
-		$this->info['cities_begin']  = $this->info['regions_begin'] + $info['region_size'];
-	}
+        $this->db_begin = ftell($this->fh);
+        if ($this->batch_mode) {
+            $this->b_idx_arr = array_values(unpack("N*", $this->b_idx_str)); // Быстрее в 5 раз, чем с циклом
+            unset ($this->b_idx_str);
+            $this->m_idx_arr = str_split($this->m_idx_str, 4); // Быстрее в 5 раз чем с циклом
+            unset ($this->m_idx_str);
+        }
+        if ($this->memory_mode) {
+            $this->db  = fread($this->fh, $this->db_items * $this->block_len);
+            $this->regions_db = $info['region_size'] > 0 ? fread($this->fh, $info['region_size']) : '';
+            $this->cities_db  = $info['city_size'] > 0 ? fread($this->fh, $info['city_size']) : '';
+        }
+        $this->info = $info;
+        $this->info['regions_begin'] = $this->db_begin + $this->db_items * $this->block_len;
+        $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){
-				$offset = ($min + $max) >> 1;
-				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){
-				$offset = ($min + $max) >> 1;
-				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_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;
+            }
+            while ($ipn > $this->m_idx_arr[$min] && $min++ < $max){};
+        }
+        else {
+            while($max - $min > 8){
+                $offset = ($min + $max) >> 1;
+                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){
-		if($max - $min > 1) {
-			$ipn = substr($ipn, 1);
-			while($max - $min > 8){
-				$offset = ($min + $max) >> 1;
-				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 {
-			$min++;
-		}
-		return hexdec(bin2hex(substr($str, $min * $this->block_len - $this->id_len, $this->id_len)));
-	}
+    protected function search_db($str, $ipn, $min, $max){
+        if($max - $min > 1) {
+            $ipn = substr($ipn, 1);
+            while($max - $min > 8){
+                $offset = ($min + $max) >> 1;
+                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 {
+            $min++;
+        }
+        return hexdec(bin2hex(substr($str, $min * $this->block_len - $this->id_len, $this->id_len)));
+    }
 
-	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;
-		$ipn = pack('N', $ipn);
-		$this->ip1c = chr($ip1n);
-		// Находим блок данных в индексе первых байт
-		if ($this->batch_mode){
-			$blocks = array('min' => $this->b_idx_arr[$ip1n-1], 'max' => $this->b_idx_arr[$ip1n]);
-		}
-		else {
-			$blocks = unpack("Nmin/Nmax", substr($this->b_idx_str, ($ip1n - 1) * 4, 8));
-		}
-		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 {
-			$min = $blocks['min'];
-			$max = $blocks['max'];
-		}
-		$len = $max - $min;
-		// Находим нужный диапазон в БД
-		if ($this->memory_mode) {
-			return $this->search_db($this->db, $ipn, $min, $max);
-		}
-		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);
-		}
-	}
+    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;
+        $ipn = pack('N', $ipn);
+        $this->ip1c = chr($ip1n);
+        // Находим блок данных в индексе первых байт
+        if ($this->batch_mode){
+            $blocks = array('min' => $this->b_idx_arr[$ip1n-1], 'max' => $this->b_idx_arr[$ip1n]);
+        }
+        else {
+            $blocks = unpack("Nmin/Nmax", substr($this->b_idx_str, ($ip1n - 1) * 4, 8));
+        }
+        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 {
+            $min = $blocks['min'];
+            $max = $blocks['max'];
+        }
+        $len = $max - $min;
+        // Находим нужный диапазон в БД
+        if ($this->memory_mode) {
+            return $this->search_db($this->db, $ipn, $min, $max);
+        }
+        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){
-		$raw = '';
-		if($seek && $max) {
-			if ($this->memory_mode) {
-				$raw = substr($type == 1 ? $this->regions_db : $this->cities_db, $seek, $max);
-			} else {
-				fseek($this->fh, $this->info[$type == 1 ? 'regions_begin' : 'cities_begin'] + $seek);
-				$raw = fread($this->fh, $max);
-			}
-		}
-		return $this->unpack($this->pack[$type], $raw);
-	}
+    protected function readData($seek, $max, $type){
+        $raw = '';
+        if($seek && $max) {
+            if ($this->memory_mode) {
+                $raw = substr($type == 1 ? $this->regions_db : $this->cities_db, $seek, $max);
+            } else {
+                fseek($this->fh, $this->info[$type == 1 ? 'regions_begin' : 'cities_begin'] + $seek);
+                $raw = fread($this->fh, $max);
+            }
+        }
+        return $this->unpack($this->pack[$type], $raw);
+    }
 
-	protected function parseCity($seek, $full = false){
-		if(!$this->pack) return false;
-		$only_country = false;
-		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 {
-			$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);
-			unset($city['region_seek']);
-			unset($region['country_seek']);
-			return array('city' => $city, 'region' => $region, 'country' => $country);
-		}
-		else {
-			unset($city['region_seek']);
-			return array('city' => $city, 'country' => array('id' => $country['id'], 'iso' => $country['iso']));
-		}
-	}
+    protected function parseCity($seek, $full = false){
+        if(!$this->pack) return false;
+        $only_country = false;
+        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 {
+            $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);
+            unset($city['region_seek']);
+            unset($region['country_seek']);
+            return array('city' => $city, 'region' => $region, 'country' => $country);
+        }
+        else {
+            unset($city['region_seek']);
+            return array('city' => $city, 'country' => array('id' => $country['id'], 'iso' => $country['iso']));
+        }
+    }
 
-	protected function unpack($pack, $item = ''){
-		$unpacked = array();
-		$empty = empty($item);
-		$pack = explode('/', $pack);
-		$pos = 0;
-		foreach($pack AS $p){
-			list($type, $name) = explode(':', $p);
-			$type0 = $type{0};
-			if($empty) {
-				$unpacked[$name] = $type0 == 'b' || $type0 == 'c' ? '' : 0;
-				continue;
-			}
-			switch($type0){
-				case 't':
-				case 'T': $l = 1; break;
-				case 's':
-				case 'n':
-				case 'S': $l = 2; break;
-				case 'm':
-				case 'M': $l = 3; break;
-				case 'd': $l = 8; break;
-				case 'c': $l = (int)substr($type, 1); break;
-				case 'b': $l = strpos($item, "\0", $pos)-$pos; break;
-				default: $l = 4;
-			}
-			$val = substr($item, $pos, $l);
-			switch($type0){
-				case 't': $v = unpack('c', $val); break;
-				case 'T': $v = unpack('C', $val); break;
-				case 's': $v = unpack('s', $val); break;
-				case 'S': $v = unpack('S', $val); break;
-				case 'm': $v = unpack('l', $val . (ord($val{2}) >> 7 ? "\xff" : "\0")); break;
-				case 'M': $v = unpack('L', $val . "\0"); break;
-				case 'i': $v = unpack('l', $val); break;
-				case 'I': $v = unpack('L', $val); break;
-				case 'f': $v = unpack('f', $val); break;
-				case 'd': $v = unpack('d', $val); break;
+    protected function unpack($pack, $item = ''){
+        $unpacked = array();
+        $empty = empty($item);
+        $pack = explode('/', $pack);
+        $pos = 0;
+        foreach($pack AS $p){
+            list($type, $name) = explode(':', $p);
+            $type0 = $type{0};
+            if($empty) {
+                $unpacked[$name] = $type0 == 'b' || $type0 == 'c' ? '' : 0;
+                continue;
+            }
+            switch($type0){
+                case 't':
+                case 'T': $l = 1; break;
+                case 's':
+                case 'n':
+                case 'S': $l = 2; break;
+                case 'm':
+                case 'M': $l = 3; break;
+                case 'd': $l = 8; break;
+                case 'c': $l = (int)substr($type, 1); break;
+                case 'b': $l = strpos($item, "\0", $pos)-$pos; break;
+                default: $l = 4;
+            }
+            $val = substr($item, $pos, $l);
+            switch($type0){
+                case 't': $v = unpack('c', $val); break;
+                case 'T': $v = unpack('C', $val); break;
+                case 's': $v = unpack('s', $val); break;
+                case 'S': $v = unpack('S', $val); break;
+                case 'm': $v = unpack('l', $val . (ord($val{2}) >> 7 ? "\xff" : "\0")); break;
+                case 'M': $v = unpack('L', $val . "\0"); break;
+                case 'i': $v = unpack('l', $val); break;
+                case 'I': $v = unpack('L', $val); break;
+                case 'f': $v = unpack('f', $val); break;
+                case 'd': $v = unpack('d', $val); break;
 
-				case 'n': $v = current(unpack('s', $val)) / pow(10, $type{1}); break;
-				case 'N': $v = current(unpack('l', $val)) / pow(10, $type{1}); break;
+                case 'n': $v = current(unpack('s', $val)) / pow(10, $type{1}); break;
+                case 'N': $v = current(unpack('l', $val)) / pow(10, $type{1}); break;
 
-				case 'c': $v = rtrim($val, ' '); break;
-				case 'b': $v = $val; $l++; break;
-			}
-			$pos += $l;
-			$unpacked[$name] = is_array($v) ? current($v) : $v;
-		}
-		return $unpacked;
-	}
+                case 'c': $v = rtrim($val, ' '); break;
+                case 'b': $v = $val; $l++; break;
+            }
+            $pos += $l;
+            $unpacked[$name] = is_array($v) ? current($v) : $v;
+        }
+        return $unpacked;
+    }
 
-	public function get($ip){
-		return $this->max_city ? $this->getCity($ip) : $this->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)];
-	}
-	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);
-	}
-	public function getCity($ip){
-		$seek = $this->get_num($ip);
-		return $seek ? $this->parseCity($seek) : false;
-	}
-	public function getCityFull($ip){
-		$seek = $this->get_num($ip);
-		return $seek ? $this->parseCity($seek, 1) : false;
-	}
-	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(
-			'Created' => date('Y.m.d', $this->info['time']),
-			'Timestamp' => $this->info['time'],
-			'Charset' => $charset[$this->info['charset']],
-			'Type' => $types[$this->info['type']],
-			'Byte Index' => $this->b_idx_len,
-			'Main Index' => $this->m_idx_len,
-			'Blocks In Index Item' => $this->range,
-			'IP Blocks' => $this->db_items,
-			'Block Size' => $this->block_len,
-			'City' => array(
-				'Max Length' => $this->max_city,
-				'Total Size' => $this->info['city_size'],
-			),
-			'Region' => array(
-				'Max Length' => $this->max_region,
-				'Total Size' => $this->info['region_size'],
-			),
-			'Country' => array(
-				'Max Length' => $this->max_country,
-				'Total Size' => $this->info['country_size'],
-			),
-		);
-	}
+    public function get($ip){
+        return $this->max_city ? $this->getCity($ip) : $this->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)];
+    }
+    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);
+    }
+    public function getCity($ip){
+        $seek = $this->get_num($ip);
+        return $seek ? $this->parseCity($seek) : false;
+    }
+    public function getCityFull($ip){
+        $seek = $this->get_num($ip);
+        return $seek ? $this->parseCity($seek, 1) : false;
+    }
+    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(
+            'Created' => date('Y.m.d', $this->info['time']),
+            'Timestamp' => $this->info['time'],
+            'Charset' => $charset[$this->info['charset']],
+            'Type' => $types[$this->info['type']],
+            'Byte Index' => $this->b_idx_len,
+            'Main Index' => $this->m_idx_len,
+            'Blocks In Index Item' => $this->range,
+            'IP Blocks' => $this->db_items,
+            'Block Size' => $this->block_len,
+            'City' => array(
+                'Max Length' => $this->max_city,
+                'Total Size' => $this->info['city_size'],
+            ),
+            'Region' => array(
+                'Max Length' => $this->max_region,
+                'Total Size' => $this->info['region_size'],
+            ),
+            'Country' => array(
+                'Max Length' => $this->max_country,
+                'Total Size' => $this->info['country_size'],
+            ),
+        );
+    }
 }
\ No newline at end of file

Spacing +51 added lines, -51 removed lines

@@ -10,9 +10,9 @@ 
 |   http://sypex.net/bsd_license.txt                                        |
 \***************************************************************************/
 namespace Geography;
-define ('SXGEO_FILE', 0);
-define ('SXGEO_MEMORY', 1);
-define ('SXGEO_BATCH',  2);
+define('SXGEO_FILE', 0);
+define('SXGEO_MEMORY', 1);
+define('SXGEO_BATCH', 2);
 class SxGeo {
 	protected $fh;
 	protected $ip1c;
@@ -52,13 +52,13 @@ 
 	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'];
@@ -68,7 +68,7 @@ 
 		$this->max_region  = $info['max_region'];
 		$this->max_city    = $info['max_city'];
 		$this->max_country = $info['max_country'];
-		$this->country_size= $info['country_size'];
+		$this->country_size = $info['country_size'];
 		$this->batch_mode  = $type & SXGEO_BATCH;
 		$this->memory_mode = $type & SXGEO_MEMORY;
 		$this->pack        = $info['pack_size'] ? explode("\0", fread($this->fh, $info['pack_size'])) : '';
@@ -83,7 +83,7 @@ 
 			unset ($this->m_idx_str);
 		}
 		if ($this->memory_mode) {
-			$this->db  = fread($this->fh, $this->db_items * $this->block_len);
+			$this->db = fread($this->fh, $this->db_items * $this->block_len);
 			$this->regions_db = $info['region_size'] > 0 ? fread($this->fh, $info['region_size']) : '';
 			$this->cities_db  = $info['city_size'] > 0 ? fread($this->fh, $info['city_size']) : '';
 		}
@@ -92,35 +92,35 @@ 
 		$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;
 			}
-			while ($ipn > $this->m_idx_arr[$min] && $min++ < $max){};
+			while ($ipn > $this->m_idx_arr[$min] && $min++ < $max) {};
 		}
 		else {
-			while($max - $min > 8){
+			while ($max - $min > 8) {
 				$offset = ($min + $max) >> 1;
-				if ($ipn > substr($this->m_idx_str, $offset*4, 4)) $min = $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){};
+			while ($ipn > substr($this->m_idx_str, $min * 4, 4) && $min++ < $max) {};
 		}
 		return  $min;
 	}
 
-	protected function search_db($str, $ipn, $min, $max){
-		if($max - $min > 1) {
+	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;
 			}
-			while ($ipn >= substr($str, $min * $this->block_len, 3) && ++$min < $max){};
+			while ($ipn >= substr($str, $min * $this->block_len, 3) && ++$min < $max) {};
 		}
 		else {
 			$min++;
@@ -128,27 +128,27 @@ 
 		return hexdec(bin2hex(substr($str, $min * $this->block_len - $this->id_len, $this->id_len)));
 	}
 
-	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;
+	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;
 		$ipn = pack('N', $ipn);
 		$this->ip1c = chr($ip1n);
 		// Находим блок данных в индексе первых байт
-		if ($this->batch_mode){
-			$blocks = array('min' => $this->b_idx_arr[$ip1n-1], 'max' => $this->b_idx_arr[$ip1n]);
+		if ($this->batch_mode) {
+			$blocks = array('min' => $this->b_idx_arr[$ip1n - 1], 'max' => $this->b_idx_arr[$ip1n]);
 		}
 		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);
+			$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;
+			$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'];
+			if ($min < $blocks['min']) $min = $blocks['min'];
+			if ($max > $blocks['max']) $max = $blocks['max'];
 		}
 		else {
 			$min = $blocks['min'];
@@ -165,9 +165,9 @@ 
 		}
 	}
 
-	protected function readData($seek, $max, $type){
+	protected function readData($seek, $max, $type) {
 		$raw = '';
-		if($seek && $max) {
+		if ($seek && $max) {
 			if ($this->memory_mode) {
 				$raw = substr($type == 1 ? $this->regions_db : $this->cities_db, $seek, $max);
 			} else {
@@ -178,10 +178,10 @@ 
 		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'];
@@ -193,9 +193,9 @@ 
 			$country = array('id' => $city['country_id'], 'iso' => $this->id2iso[$city['country_id']]);
 			unset($city['country_id']);
 		}
-		if($full) {
+		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);
@@ -206,19 +206,19 @@ 
 		}
 	}
 
-	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) {
+			if ($empty) {
 				$unpacked[$name] = $type0 == 'b' || $type0 == 'c' ? '' : 0;
 				continue;
 			}
-			switch($type0){
+			switch ($type0) {
 				case 't':
 				case 'T': $l = 1; break;
 				case 's':
@@ -227,12 +227,12 @@ 
 				case 'm':
 				case 'M': $l = 3; break;
 				case 'd': $l = 8; break;
-				case 'c': $l = (int)substr($type, 1); break;
-				case 'b': $l = strpos($item, "\0", $pos)-$pos; break;
+				case 'c': $l = (int) substr($type, 1); break;
+				case 'b': $l = strpos($item, "\0", $pos) - $pos; break;
 				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 +256,32 @@ 
 		return $unpacked;
 	}
 
-	public function get($ip){
+	public function get($ip) {
 		return $this->max_city ? $this->getCity($ip) : $this->getCountry($ip);
 	}
-	public function getCountry($ip){
-		if($this->max_city) {
+	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)];
 	}
-	public function getCountryId($ip){
-		if($this->max_city) {
+	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);
 	}
-	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(

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

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     public function updateDb() {
         // Обновление файла базы данных Sypex Geo
         // Настройки
-        $url = 'https://sypexgeo.net/files/SxGeoCity_utf8.zip';  // Путь к скачиваемому файлу
+        $url = 'https://sypexgeo.net/files/SxGeoCity_utf8.zip'; // Путь к скачиваемому файлу
         $dat_file_dir = App::$primary->path . $this->geographyDbDir; // Каталог в который сохранять dat-файл
         $last_updated_file = $dat_file_dir . '/SxGeo.upd'; // Файл в котором хранится дата последнего обновления
         $info = false; // Вывод сообщений о работе, true заменить на false после установки в cron

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";
+        }
 
     }
 

system/modules/Ui/objects/ActiveForm/Input/Select.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $inputOptions = [
             'value' => $this->value(),
             'disabled' => $this->readOnly(),
-            'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName) ? $this->modelName : $this->activeForm->modelName, $inputName,[],$this->activeForm->model)
+            'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName) ? $this->modelName : $this->activeForm->modelName, $inputName, [], $this->activeForm->model)
         ];
         $modelName = '';
 

system/modules/Ecommerce/appControllers/CartController.php

Spacing +2 added lines, -2 removed lines

@@ -298,8 +298,8 @@
         /**
          * @var \Ecommerce\Cart\Item[] $cartItems
          */
-        $cartItems =[];
-        foreach ($cart->cartItems as $cartItem){
+        $cartItems = [];
+        foreach ($cart->cartItems as $cartItem) {
             $cartItems[$cartItem->price->item_offer_id] = $cartItem;
         }
         if (!empty($this->ecommerce->config['cartAddToggle']) && isset($cartItems[$offer->id])) {

Braces +1 added lines, -1 removed lines

@@ -299,7 +299,7 @@
          * @var \Ecommerce\Cart\Item[] $cartItems
          */
         $cartItems =[];
-        foreach ($cart->cartItems as $cartItem){
+        foreach ($cart->cartItems as $cartItem) {
             $cartItems[$cartItem->price->item_offer_id] = $cartItem;
         }
         if (!empty($this->ecommerce->config['cartAddToggle']) && isset($cartItems[$offer->id])) {

system/modules/Daemon/Daemon.php

Doc Comments +3 added lines

@@ -92,6 +92,9 @@
         return $path;
     }
 
+    /**
+     * @param string $item
+     */
     function unserialize($item) {
         try {
             return $this->serializer()->unserialize($item);

system/modules/Ecommerce/appControllers/EcommerceController.php

Spacing +1 added lines, -1 removed lines

@@ -310,7 +310,7 @@
         if (!$item) {
             Tools::redirect('/ecommerce/', 'Такой товар не найден');
         }
-        if(!$item->isVisible()){
+        if (!$item->isVisible()) {
             Tools::redirect('/ecommerce/', 'Этот товар сейчас недоступен');
         }
         $active = $item->category_id;

Braces +1 added lines, -1 removed lines

@@ -310,7 +310,7 @@
         if (!$item) {
             Tools::redirect('/ecommerce/', 'Такой товар не найден');
         }
-        if(!$item->isVisible()){
+        if(!$item->isVisible()) {
             Tools::redirect('/ecommerce/', 'Этот товар сейчас недоступен');
         }
         $active = $item->category_id;