injitools / cms-Inji

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;

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>

system/modules/Geography/objects/SxGeo.php

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(

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