supernova-ws / SuperNova

classes/skin.php

Spacing +26 added lines, -26 removed lines

@@ -152,7 +152,7 @@ 
    * Инициализация харнилища скинов
    */
   protected static function init() {
-    if(static::$is_init) {
+    if (static::$is_init) {
       return;
     }
 
@@ -165,7 +165,7 @@ 
 
     // Загружены ли уже данные по текущему скину?
 //pdump(static::$skin_list[$ini_path], 'static');
-    if(empty(static::$skin_list[$skin_path])) {
+    if (empty(static::$skin_list[$skin_path])) {
       // Прогружаем текущий скин
       static::$skin_list[$skin_path] = new skin($skin_path);
       static::$active = static::$skin_list[$skin_path];
@@ -191,9 +191,9 @@ 
     strpos($skin_path, 'skins/') !== false ? $skin_path = substr($skin_path, 6) : false;
     strpos($skin_path, '/') !== false ? $skin_path = str_replace('/', '', $skin_path) : false;
 
-    $this->root_http_relative = 'skins/' . $skin_path . '/'; // Пока стоит base="" в body SN_ROOT_VIRTUAL - не нужен
+    $this->root_http_relative = 'skins/'.$skin_path.'/'; // Пока стоит base="" в body SN_ROOT_VIRTUAL - не нужен
 //    $this->root_http = SN_ROOT_VIRTUAL . 'skins/' . $skin_path . '/'; // Всегда абсолютный путь от корня сайта
-    $this->root_physical_absolute = SN_ROOT_PHYSICAL . 'skins/' . $skin_path . '/';
+    $this->root_physical_absolute = SN_ROOT_PHYSICAL.'skins/'.$skin_path.'/';
     $this->name = $skin_path;
 //    pdump($this->root_folder);
     // Искать скин среди пользовательских - когда будет конструктор скинов
@@ -201,22 +201,22 @@ 
 
     $this->is_ini_present = false;
     // Проверка на корректность и существование пути
-    if(is_file($this->root_physical_absolute . 'skin.ini')) {
+    if (is_file($this->root_physical_absolute.'skin.ini')) {
       // Пытаемся распарсить файл
 
       // По секциям? images и config? Что бы не копировать конфигурацию? Или просто unset(__inherit) а затем заново записать
-      $this->config = parse_ini_file($this->root_physical_absolute . 'skin.ini');
-      if(!empty($this->config)) {
+      $this->config = parse_ini_file($this->root_physical_absolute.'skin.ini');
+      if (!empty($this->config)) {
 
         $this->is_ini_present = true;
 
-        if(!empty($this->config['_inherit'])) {
+        if (!empty($this->config['_inherit'])) {
           // Если скин наследует себя...
-          if($this->config['_inherit'] == $skin_path) {
+          if ($this->config['_inherit'] == $skin_path) {
             // TODO - определять более сложные случаи циклических ссылок в _inherit
             die('">circular skin inheritance!');
           }
-          if(empty(static::$skin_list[$this->config['_inherit']])) {
+          if (empty(static::$skin_list[$this->config['_inherit']])) {
             static::$skin_list[$this->config['_inherit']] = new skin($this->config['_inherit']);
           }
           $this->parent = static::$skin_list[$this->config['_inherit']];
@@ -232,15 +232,15 @@ 
     }
 
     // Пытаемся скомпилировать _no_image заранее
-    if(!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
+    if (!empty($this->config[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = $this->compile_try_path(SKIN_IMAGE_MISSED_FIELD, $this->config[SKIN_IMAGE_MISSED_FIELD]);
     }
 
     // Если нет заглушки
-    if(empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
+    if (empty($this->container[SKIN_IMAGE_MISSED_FIELD])) {
       $this->container[SKIN_IMAGE_MISSED_FIELD] = empty($this->parent)
         // Если нет парента - берем хардкод
-        ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL . SKIN_IMAGE_MISSED_FILE_PATH
+        ? $this->container[SKIN_IMAGE_MISSED_FIELD] = SN_ROOT_VIRTUAL.SKIN_IMAGE_MISSED_FILE_PATH
         // Если есть парент - берем у парента. У предков всегда всё есть
         : $this->parent->compile_image(SKIN_IMAGE_MISSED_FIELD, null);
     }
@@ -267,7 +267,7 @@ 
     $image_tag = $this->image_tag_parse($image_tag, $template);
 
     // Проверяем наличие ключа RIT в хранилища. В нём не может быть несуществующих файлов по построению
-    if(!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
+    if (!empty($this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]])) {
       return $this->container[$image_tag[SKIN_IMAGE_TAG_RESOLVED]];
     }
 
@@ -285,7 +285,7 @@ 
     // Нет - image ID не является путём к файлу. Пора обратиться к предкам за помощью...
     // Пытаемся вытащить путь из родителя и применить к нему свои параметры
     // Тащим по ID изображения, а не по ТЭГУ - мало ли что там делает с путём родитель и как преобразовывает его в строку?
-    if(empty($this->container[$image_id]) && !empty($this->parent)) {
+    if (empty($this->container[$image_id]) && !empty($this->parent)) {
       $this->container[$image_id] = $this->parent->compile_image($image_id, $template);
 
       // Если у родителя нет картинки - он вернет пустую строку. Тогда нам надо использовать заглушку - свою или родительскую
@@ -306,18 +306,18 @@ 
   protected function image_tag_parse($image_tag, $template) {
     $image_tag_ptl_resolved = $image_tag;
     // Есть переменные из темплейта ?
-    if(strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
+    if (strpos($image_tag_ptl_resolved, '[') !== false && is_object($template)) {
       // Что бы лишний раз не запускать регексп
       // TODO - многоуровневые вложения ?! Надо ли и где их можно применить
       preg_match_all('#(\[.+?\])#', $image_tag_ptl_resolved, $matches);
-      foreach($matches[0] as &$match) {
+      foreach ($matches[0] as &$match) {
         $var_name = str_replace(array('[', ']'), '', $match);
-        if(strpos($var_name, '.') !== false) {
+        if (strpos($var_name, '.') !== false) {
           // Вложенная переменная темплейта - на текущем уровне
           // TODO Вложенная переменная из корня через "!"
           list($block_name, $block_var) = explode('.', $var_name);
           isset($template->_block_value[$block_name][$block_var]) ? $image_tag_ptl_resolved = str_replace($match, $template->_block_value[$block_name][$block_var], $image_tag_ptl_resolved) : false;
-        } elseif(strpos($var_name, '$') !== false) {
+        } elseif (strpos($var_name, '$') !== false) {
           // Корневой DEFINE
           $define_name = substr($var_name, 1);
           isset($template->_tpldata['DEFINE']['.'][$define_name]) ? $image_tag_ptl_resolved = str_replace($match, $template->_tpldata['DEFINE']['.'][$define_name], $image_tag_ptl_resolved) : false;
@@ -328,7 +328,7 @@ 
       }
     }
 
-    if(strpos($image_tag_ptl_resolved, '|') !== false) {
+    if (strpos($image_tag_ptl_resolved, '|') !== false) {
       $params = explode('|', $image_tag_ptl_resolved);
       $image_id = $params[0];
       unset($params[0]);
@@ -358,9 +358,9 @@ 
   protected function compile_try_path($image_id, $file_path) {
     // Если первый символ пути '/' - значит это путь от HTTP-корня
     // Откусываем его и пользуем остальное
-    $relative_path = strpos($file_path, '/') !== 0 ? $this->root_http_relative . $file_path : substr($file_path, 1);
+    $relative_path = strpos($file_path, '/') !== 0 ? $this->root_http_relative.$file_path : substr($file_path, 1);
 
-    return is_file(SN_ROOT_PHYSICAL . $relative_path) ? $this->container[$image_id] = SN_ROOT_VIRTUAL . $relative_path : '';
+    return is_file(SN_ROOT_PHYSICAL.$relative_path) ? $this->container[$image_id] = SN_ROOT_VIRTUAL.$relative_path : '';
   }
 
 
@@ -392,13 +392,13 @@ 
     $image_string = $this->container[$image_tag];
 
     // Нет параметров - просто возвращаем значение по $image_name из контейнера
-    if(!empty($params) && is_array($params)) {
+    if (!empty($params) && is_array($params)) {
       // Здесь автоматически произойдёт упорядочивание параметров
 
       // Параметр 'html' - выводить изображение в виде HTML-тэга
-      if(in_array('html', $params)) {
-        $image_tag = $image_tag . '|html';
-        $image_string = '<img src="' . $image_string . '" />';
+      if (in_array('html', $params)) {
+        $image_tag = $image_tag.'|html';
+        $image_string = '<img src="'.$image_string.'" />';
         $this->container[$image_tag] = $image_string;
       }
     }

classes/classConfig.php

Spacing +16 added lines, -16 removed lines

@@ -190,9 +190,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -223,25 +223,25 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
 
     'fleet_update_interval' => 4,
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -255,13 +255,13 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'   => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview' => 3,    // How much last news to show in Overview page
+    'game_news_overview' => 3, // How much last news to show in Overview page
     // Noob protection
-    'game_noob_factor'   => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'   => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'   => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -311,8 +311,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'    => 50000, //
     'planet_teleport_timeout' => 86400, //
@@ -330,7 +330,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General

classes/UnitResourceLoot.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
   public static function _init($group_name = '') {
     parent::_init($group_name);
 
-    foreach(static::$_group_unit_id_list as $resource_id) {
+    foreach (static::$_group_unit_id_list as $resource_id) {
       static::$_group_pnames[$resource_id] = pname_resource_name($resource_id);
     }
 
@@ -48,13 +48,13 @@ 
 
     !is_array($resource_array) ? $resource_array = array() : false;
 
-    foreach($resource_array as $resource_id => $resource_actual_delta) {
-      if(!$resource_actual_delta) {
+    foreach ($resource_array as $resource_id => $resource_actual_delta) {
+      if (!$resource_actual_delta) {
         // No delta - no changes
         continue;
       }
 
-      $result[$prefix . static::$_group_pnames[$resource_id]] = $resource_actual_delta;
+      $result[$prefix.static::$_group_pnames[$resource_id]] = $resource_actual_delta;
     }
 
     return $result;

classes/classCache.php

Spacing +13 added lines, -13 removed lines

@@ -96,11 +96,11 @@ 
   public function __set($name, $value) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        self::$data[$this->prefix . $name] = $value;
+        self::$data[$this->prefix.$name] = $value;
       break;
 
       case CACHER_XCACHE:
-        xcache_set($this->prefix . $name, $value);
+        xcache_set($this->prefix.$name, $value);
       break;
     }
   }
@@ -108,11 +108,11 @@ 
   public function __get($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        return self::$data[$this->prefix . $name];
+        return self::$data[$this->prefix.$name];
       break;
 
       case CACHER_XCACHE:
-        return xcache_get($this->prefix . $name);
+        return xcache_get($this->prefix.$name);
       break;
     }
 
@@ -122,11 +122,11 @@ 
   public function __isset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        return isset(self::$data[$this->prefix . $name]);
+        return isset(self::$data[$this->prefix.$name]);
       break;
 
       case CACHER_XCACHE:
-        return xcache_isset($this->prefix . $name) && ($this->__get($name) !== null);
+        return xcache_isset($this->prefix.$name) && ($this->__get($name) !== null);
       break;
     }
 
@@ -136,25 +136,25 @@ 
   public function __unset($name) {
     switch (self::$mode) {
       case CACHER_NO_CACHE:
-        unset(self::$data[$this->prefix . $name]);
+        unset(self::$data[$this->prefix.$name]);
       break;
 
       case CACHER_XCACHE:
-        xcache_unset($this->prefix . $name);
+        xcache_unset($this->prefix.$name);
       break;
     }
   }
 
   public function unset_by_prefix($prefix_unset = '') {
     static $array_clear;
-    !$array_clear ? $array_clear = function (&$v, $k, $p) {
+    !$array_clear ? $array_clear = function(&$v, $k, $p) {
       strpos($k, $p) === 0 ? $v = null : false;
     } : false;
 
     switch (self::$mode) {
       case CACHER_NO_CACHE:
 //        array_walk(self::$data, create_function('&$v,$k,$p', 'if(strpos($k, $p) === 0)$v = NULL;'), $this->prefix.$prefix_unset);
-        array_walk(self::$data, $array_clear, $this->prefix . $prefix_unset);
+        array_walk(self::$data, $array_clear, $this->prefix.$prefix_unset);
 
         return true;
       break;
@@ -164,7 +164,7 @@ 
           return false;
         }
 
-        return xcache_unset_by_prefix($this->prefix . $prefix_unset);
+        return xcache_unset_by_prefix($this->prefix.$prefix_unset);
       break;
     }
 
@@ -202,7 +202,7 @@ 
     if ($this->$name[0] === null) {
       for ($i = count($name) - 1; $i > 0; $i--) {
         $cName = "{$name[$i]}_COUNT";
-        $cName1 = "{$name[$i-1]}_COUNT";
+        $cName1 = "{$name[$i - 1]}_COUNT";
         if ($this->$cName1 == null || $i == 1) {
           $this->$cName++;
         }
@@ -247,7 +247,7 @@ 
 
     for ($i = 1; $i < count($name); $i++) {
       $cName = "{$name[$i]}_COUNT";
-      $cName1 = "{$name[$i-1]}_COUNT";
+      $cName1 = "{$name[$i - 1]}_COUNT";
 
       if ($i == 1 || $this->$cName1 === null) {
         $this->$cName--;

classes/classSupernova.php

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
   public static function init_3_load_config_file() {
     $dbsettings = array();
 
-    require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
+    require(SN_ROOT_PHYSICAL."config".DOT_PHP_EX);
     self::$cache_prefix = !empty($dbsettings['cache_prefix']) ? $dbsettings['cache_prefix'] : $dbsettings['prefix'];
     self::$db_name = $dbsettings['name'];
     self::$sn_secret_word = $dbsettings['secretword'];

classes/PropertyHider.php

Spacing +15 added lines, -15 removed lines

@@ -79,13 +79,13 @@ 
 
   protected function checkPropertyExists($name) {
     if (!array_key_exists($name, $this->_properties)) {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] not exists', ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] not exists', ERR_ERROR);
     }
   }
 
   protected function checkOverwriteAdjusted($name) {
     if (array_key_exists($name, $this->propertiesAdjusted)) {
-      throw new ExceptionPropertyAccess('Property [' . get_called_class() . '::' . $name . '] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
+      throw new ExceptionPropertyAccess('Property ['.get_called_class().'::'.$name.'] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
     }
   }
 
@@ -134,7 +134,7 @@ 
    * @return boolean
    */
   public function isContainerEmpty() {
-    throw new Exception('PropertyHider::isContainerEmpty() is not implemented. You should implement it in class ' . get_called_class());
+    throw new Exception('PropertyHider::isContainerEmpty() is not implemented. You should implement it in class '.get_called_class());
   }
 
 
@@ -178,15 +178,15 @@ 
     $result = null;
     // Now deciding - will we call a protected setter or will we work with protected property
     // Todo - on init recalc all method_exists
-    if (method_exists($this, $methodName = $action . ucfirst($name))) {
+    if (method_exists($this, $methodName = $action.ucfirst($name))) {
       // If method exists - just calling it
       // TODO - should return TRUE if value changed or FALSE otherwise
       $result = call_user_func_array(array($this, $methodName), array($value));
     } elseif ($this->isPropertyActionAvailable($name, $action)) {
       // No setter exists - works directly with protected property
-      $result = $this->{$action . 'Property'}($name, $value);
+      $result = $this->{$action.'Property'}($name, $value);
     } else {
-      throw new ExceptionPropertyNotExists('Property [' . get_called_class() . '::' . $name . '] does not have ' . $action . 'ter/property to ' . $action, ERR_ERROR);
+      throw new ExceptionPropertyNotExists('Property ['.get_called_class().'::'.$name.'] does not have '.$action.'ter/property to '.$action, ERR_ERROR);
     }
 
     return $result;
@@ -277,7 +277,7 @@ 
    * @return string
    */
   protected function adjustPropertyString($name, $diff) {
-    return (string)$this->$name . (string)$diff;
+    return (string) $this->$name.(string) $diff;
   }
 
   /**
@@ -287,8 +287,8 @@ 
    * @return array
    */
   protected function adjustPropertyArray($name, $diff) {
-    $copy = (array)$this->$name;
-    HelperArray::merge($copy, (array)$diff, HelperArray::MERGE_PHP);
+    $copy = (array) $this->$name;
+    HelperArray::merge($copy, (array) $diff, HelperArray::MERGE_PHP);
 
     return $copy;
   }
@@ -300,7 +300,7 @@ 
    * @return int
    */
   protected function deltaInteger($name, $diff) {
-    return (int)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0) + (int)$diff;
+    return (int) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0) + (int) $diff;
   }
 
   /**
@@ -310,7 +310,7 @@ 
    * @return float
    */
   protected function deltaDouble($name, $diff) {
-    return (float)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0.0) + (float)$diff;
+    return (float) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, 0.0) + (float) $diff;
   }
 
   /**
@@ -320,7 +320,7 @@ 
    * @return string
    */
   protected function deltaString($name, $diff) {
-    return (string)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, '') . (string)$diff;
+    return (string) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, '').(string) $diff;
   }
 
   /**
@@ -330,7 +330,7 @@ 
    * @return array
    */
   protected function deltaArray($name, $diff) {
-    $copy = (array)HelperArray::keyExistsOr($this->propertiesAdjusted, $name, array());
+    $copy = (array) HelperArray::keyExistsOr($this->propertiesAdjusted, $name, array());
     HelperArray::merge($copy, $diff, HelperArray::MERGE_PHP);
 
     return $copy;
@@ -353,10 +353,10 @@ 
     // Capitalizing type name
     $methodName = explode(' ', $type);
     array_walk($methodName, 'DbSqlHelper::UCFirstByRef');
-    $methodName = $prefix . implode('', $methodName);
+    $methodName = $prefix.implode('', $methodName);
 
     if (!method_exists($this, $methodName)) {
-      throw new ExceptionTypeUnsupported('Type "' . $type . '" is unsupported in PropertyHider::propertyMethodResult');
+      throw new ExceptionTypeUnsupported('Type "'.$type.'" is unsupported in PropertyHider::propertyMethodResult');
     }
 
     return call_user_func(array($this, $methodName), $name, $diff);

classes/UnitList.php

Spacing +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
    */
   public function offsetSet($offset, $value) {
     if (isset($this->mapUnitIdToDb[$value->unitId])) {
-      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId ' . $value->unitId . ' already exists');
+      classSupernova::$debug->error('UnitList::offsetSet: Unit with UnitId '.$value->unitId.' already exists');
     }
     $this->mapUnitIdToDb[$value->unitId] = $value;
     parent::offsetSet($offset, $value);
@@ -202,7 +202,7 @@ 
 
   public function unitGetCount($unit_id) {
     if (empty($this->mapUnitIdToDb[$unit_id])) {
-      throw new Exception('Unit [' . $unit_id . '] is not exists in UnitList');
+      throw new Exception('Unit ['.$unit_id.'] is not exists in UnitList');
     }
 
     return $this->mapUnitIdToDb[$unit_id]->count;
@@ -247,7 +247,7 @@ 
    */
   public function unitsCostInMetal($shipCostInMetalPerPiece) {
     $shipsCostInMetal = array();
-    foreach($this->mapUnitIdToDb as $ship_id => $ship) {
+    foreach ($this->mapUnitIdToDb as $ship_id => $ship) {
       $shipsCostInMetal[$ship_id] = $ship->count * $shipCostInMetalPerPiece[$ship_id];
     }
 
@@ -329,7 +329,7 @@ 
      */
     $objFleet = $this->getLocatedAt();
     if (empty($objFleet)) {
-      throw new Exception('No fleet owner on UnitList::unitsRender() in ' . __FILE__ . '@' . __LINE__);
+      throw new Exception('No fleet owner on UnitList::unitsRender() in '.__FILE__.'@'.__LINE__);
     }
 
     $tplShips = array();
@@ -472,8 +472,8 @@ 
 
   // TODO - DEBUG - REMOVE =============================================================================================
   public function _dump() {
-    print(__FILE__ . ':' . __LINE__ . "<br />");
-    print("Located at " . $this->getLocationDbId() . " type " . $this->getLocationType() . "<br />");
+    print(__FILE__.':'.__LINE__."<br />");
+    print("Located at ".$this->getLocationDbId()." type ".$this->getLocationType()."<br />");
 
     print('<table border="1">');
     print('<tr>');
@@ -529,11 +529,11 @@ 
 
       print('<td>');
       $type = $unit->getType();
-      print("[{$type}] " . classLocale::$lang['tech'][$type]);
+      print("[{$type}] ".classLocale::$lang['tech'][$type]);
       print('</td>');
 
       print('<td>');
-      print("[{$unit->unitId}] " . classLocale::$lang['tech'][$unit->unitId]);
+      print("[{$unit->unitId}] ".classLocale::$lang['tech'][$unit->unitId]);
       print('</td>');
 
       print('<td>');

classes/SnDbCachedOperator.php

Spacing +10 added lines, -10 removed lines

@@ -193,13 +193,13 @@ 
    */
   // TODO - Change $filter to only array class
   public function db_get_record_list($location_type, $filter = '', $fetch = false, $no_return = false) {
-    if(is_array($filter)) {
+    if (is_array($filter)) {
       // TODO - TEMPORARY
       $filterString = array();
-      if(!empty($filter)) {
+      if (!empty($filter)) {
         foreach ($filter as $key => $value) {
-          if(!is_int($key)) {
-            $value = "`$key` = '" . $this->db->db_escape($value). "'";
+          if (!is_int($key)) {
+            $value = "`$key` = '".$this->db->db_escape($value)."'";
           }
           $filterString[$key] = $value;
         }
@@ -207,7 +207,7 @@ 
 
       $filterString = implode(',', $filterString);
     } else {
-      $filterString =  $filter;
+      $filterString = $filter;
     }
 
 
@@ -238,8 +238,8 @@ 
             $query = $this->db->doSelect(
               "SELECT
               distinct({{{$location_info[P_TABLE_NAME]}}}.{$owner_data[P_OWNER_FIELD]}) AS parent_id
-            FROM {{{$location_info[P_TABLE_NAME]}}}" .
-              ($filter ? ' WHERE ' . $filter : '') .
+            FROM {{{$location_info[P_TABLE_NAME]}}}".
+              ($filter ? ' WHERE '.$filter : '').
               ($fetch ? ' LIMIT 1' : ''));
           }
           while ($row = db_fetch($query)) {
@@ -254,7 +254,7 @@ 
             $indexes_str = implode(',', $parent_id_list);
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             $this->db_get_record_list($owner_location_type,
-              $parent_id_field . (
+              $parent_id_field.(
                 count($parent_id_list) > 1
                 ? " IN ({$indexes_str})"
                 : " = {$indexes_str}"
@@ -277,7 +277,7 @@ 
         );
       } else {
         $query = $this->db->doSelect(
-          "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" .
+          "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}".
           (($filter = trim($filter)) ? " WHERE {$filter}" : '')
           . " FOR UPDATE"
         );
@@ -455,7 +455,7 @@ 
   public function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
     foreach ($tables as $table_name => $condition) {
-      $this->db->doSelect("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
+      $this->db->doSelect("SELECT 1 FROM {{{$table_name}}}".($condition ? ' WHERE '.$condition : ''));
     }
   }
 }

includes/init.php

Spacing +41 added lines, -41 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Защита от двойного инита
-if(defined('INIT')) {
+if (defined('INIT')) {
   return;
 }
 
@@ -19,22 +19,22 @@ 
 define('SN_DEBUG_PDUMP_CALLER', true);
 
 // Бенчмарк
-register_shutdown_function(function () {
-  if(defined('IN_AJAX')) {
+register_shutdown_function(function() {
+  if (defined('IN_AJAX')) {
     return;
   }
 
   global $user, $locale_cache_statistic;
 
-  print('<hr><div class="benchmark">Benchmark ' . (microtime(true) - SN_TIME_MICRO) . 's, memory: ' . number_format(memory_get_usage() - SN_MEM_START) .
-    (!empty($locale_cache_statistic['misses']) ? ', LOCALE MISSED' : '') .
-    (class_exists('classSupernova') && is_object(classSupernova::$db) ? ', DB time: ' . classSupernova::$db->time_mysql_total . 'ms' : '') .
+  print('<hr><div class="benchmark">Benchmark '.(microtime(true) - SN_TIME_MICRO).'s, memory: '.number_format(memory_get_usage() - SN_MEM_START).
+    (!empty($locale_cache_statistic['misses']) ? ', LOCALE MISSED' : '').
+    (class_exists('classSupernova') && is_object(classSupernova::$db) ? ', DB time: '.classSupernova::$db->time_mysql_total.'ms' : '').
     '</div>');
-  if($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL . 'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL . 'badqrys.txt') > 0) {
+  if ($user['authlevel'] >= 2 && file_exists(SN_ROOT_PHYSICAL.'badqrys.txt') && @filesize(SN_ROOT_PHYSICAL.'badqrys.txt') > 0) {
     echo '<a href="badqrys.txt" target="_blank" style="color:red">', 'HACK ALERT!', '</a>';
   }
 
-  if(!empty($locale_cache_statistic['misses'])) {
+  if (!empty($locale_cache_statistic['misses'])) {
     print('<!--');
     pdump($locale_cache_statistic);
     print('-->');
@@ -54,46 +54,46 @@ 
 
 define('SN_TIME_NOW_GMT_STRING', gmdate(DATE_ATOM, SN_TIME_NOW));
 
-if(strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
+if (strpos(strtolower($_SERVER['SERVER_NAME']), 'google.') !== false) {
   define('SN_GOOGLE', true);
 }
 
 // Эти три строки должны быть В ЭТОМ ФАЙЛЕ, ПО ЭТОМУ ПУТИ и ПЕРЕД ЭТИМ ИНКЛЮДОМ!!!
-define('SN_ROOT_PHYSICAL', str_replace(array('\\', '//'), '/', dirname(__DIR__) . '/'));
+define('SN_ROOT_PHYSICAL', str_replace(array('\\', '//'), '/', dirname(__DIR__).'/'));
 define('SN_ROOT_PHYSICAL_STR_LEN', strlen(SN_ROOT_PHYSICAL));
 $phpbb_root_path = SN_ROOT_PHYSICAL; // Это нужно для работы PTL
 
-$sn_root_relative = str_replace(array('\\', '//'), '/', getcwd() . '/');
+$sn_root_relative = str_replace(array('\\', '//'), '/', getcwd().'/');
 //$sn_root_relative .= $sn_root_relative[strlen($sn_root_relative) - 1] == '/' ? '' : '/';
 $sn_root_relative = str_replace(SN_ROOT_PHYSICAL, '', $sn_root_relative);
 $sn_root_relative .= basename($_SERVER['SCRIPT_NAME']);
 $sn_root_relative = str_replace($sn_root_relative, '', $_SERVER['SCRIPT_NAME']);
 define('SN_ROOT_RELATIVE', $sn_root_relative);
 
-define('SN_ROOT_VIRTUAL', 'http' . (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . SN_ROOT_RELATIVE);
+define('SN_ROOT_VIRTUAL', 'http'.(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 's' : '').'://'.$_SERVER['HTTP_HOST'].SN_ROOT_RELATIVE);
 define('SN_ROOT_VIRTUAL_PARENT', str_replace('//google.', '//', SN_ROOT_VIRTUAL));
 
 $phpEx = strpos($phpEx = substr(strrchr(__FILE__, '.'), 1), '/') === false ? $phpEx : '';
-define('DOT_PHP_EX', '.' . $phpEx); // PHP extension on this server
+define('DOT_PHP_EX', '.'.$phpEx); // PHP extension on this server
 
 
 header('Content-type: text/html; charset=utf-8');
 ob_start();
 ini_set('error_reporting', E_ALL ^ E_NOTICE);
 
-empty($classRoot) ? $classRoot = SN_ROOT_PHYSICAL . 'classes/' : false;
-spl_autoload_register(function ($class) use ($classRoot) {
+empty($classRoot) ? $classRoot = SN_ROOT_PHYSICAL.'classes/' : false;
+spl_autoload_register(function($class) use ($classRoot) {
   $class = str_replace('\\', '/', $class);
-  if (file_exists($classRoot . $class . '.php')) {
-    require_once $classRoot . $class . '.php';
-  } elseif (file_exists($classRoot . 'UBE/' . $class . '.php')) {
-    require_once $classRoot . 'UBE/' . $class . '.php';
+  if (file_exists($classRoot.$class.'.php')) {
+    require_once $classRoot.$class.'.php';
+  } elseif (file_exists($classRoot.'UBE/'.$class.'.php')) {
+    require_once $classRoot.'UBE/'.$class.'.php';
   }
 });
 
 require_once 'constants.php';
-require_once SN_ROOT_PHYSICAL . "includes/db" . DOT_PHP_EX;
-require_once(SN_ROOT_PHYSICAL . "includes/init/init_functions" . DOT_PHP_EX);
+require_once SN_ROOT_PHYSICAL."includes/db".DOT_PHP_EX;
+require_once(SN_ROOT_PHYSICAL."includes/init/init_functions".DOT_PHP_EX);
 
 /**
  * @var classConfig    $config
@@ -111,8 +111,8 @@ 
 // define('BE_DEBUG', true); // Отладка боевого движка
 classSupernova::init_debug_state();
 
-require_once(SN_ROOT_PHYSICAL . "includes/vars/vars" . DOT_PHP_EX);
-require_once(SN_ROOT_PHYSICAL . "includes/general" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/vars/vars".DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/general".DOT_PHP_EX);
 
 init_update();
 
@@ -121,28 +121,28 @@ 
   ? trim(strip_tags($_GET['page']))
   : str_replace(DOT_PHP_EX, '', str_replace(SN_ROOT_RELATIVE, '', str_replace('\\', '/', $_SERVER['SCRIPT_NAME'])));
 define('INITIAL_PAGE', $sn_page_name_original);
-define('SN_COOKIE', (classSupernova::$config->COOKIE_NAME ? classSupernova::$config->COOKIE_NAME : 'SuperNova') . (defined('SN_GOOGLE') ? '_G' : ''));
-define('SN_COOKIE_I', SN_COOKIE . AUTH_COOKIE_IMPERSONATE_SUFFIX);
-define('SN_COOKIE_D', SN_COOKIE . '_D');
-define('SN_COOKIE_T', SN_COOKIE . '_T'); // Time measure cookie
-define('SN_COOKIE_F', SN_COOKIE . '_F'); // Font size cookie
-define('SN_COOKIE_U', SN_COOKIE . '_U'); // Current user cookie aka user ID
-define('SN_COOKIE_U_I', SN_COOKIE_U . AUTH_COOKIE_IMPERSONATE_SUFFIX); // Current impersonator user cookie aka impersonator user ID
+define('SN_COOKIE', (classSupernova::$config->COOKIE_NAME ? classSupernova::$config->COOKIE_NAME : 'SuperNova').(defined('SN_GOOGLE') ? '_G' : ''));
+define('SN_COOKIE_I', SN_COOKIE.AUTH_COOKIE_IMPERSONATE_SUFFIX);
+define('SN_COOKIE_D', SN_COOKIE.'_D');
+define('SN_COOKIE_T', SN_COOKIE.'_T'); // Time measure cookie
+define('SN_COOKIE_F', SN_COOKIE.'_F'); // Font size cookie
+define('SN_COOKIE_U', SN_COOKIE.'_U'); // Current user cookie aka user ID
+define('SN_COOKIE_U_I', SN_COOKIE_U.AUTH_COOKIE_IMPERSONATE_SUFFIX); // Current impersonator user cookie aka impersonator user ID
 define('TEMPLATE_NAME', classSupernova::$config->game_default_template ? classSupernova::$config->game_default_template : 'OpenGame');
-define('TEMPLATE_PATH', 'design/templates/' . TEMPLATE_NAME);
-define('TEMPLATE_DIR', SN_ROOT_PHYSICAL . TEMPLATE_PATH);
+define('TEMPLATE_PATH', 'design/templates/'.TEMPLATE_NAME);
+define('TEMPLATE_DIR', SN_ROOT_PHYSICAL.TEMPLATE_PATH);
 define('DEFAULT_SKINPATH', classSupernova::$config->game_default_skin ? classSupernova::$config->game_default_skin : 'skins/EpicBlue/');
 define('DEFAULT_LANG', classSupernova::$config->game_default_language ? classSupernova::$config->game_default_language : 'ru');
 define('FMT_DATE', classSupernova::$config->int_format_date ? classSupernova::$config->int_format_date : 'd.m.Y');
 define('FMT_TIME', classSupernova::$config->int_format_time ? classSupernova::$config->int_format_time : 'H:i:s');
-define('FMT_DATE_TIME', FMT_DATE . ' ' . FMT_TIME);
+define('FMT_DATE_TIME', FMT_DATE.' '.FMT_TIME);
 
 $HTTP_ACCEPT_LANGUAGE = DEFAULT_LANG;
 
-require_once(SN_ROOT_PHYSICAL . "includes/template" . DOT_PHP_EX);
+require_once(SN_ROOT_PHYSICAL."includes/template".DOT_PHP_EX);
 $template_result = array('.' => array('result' => array()));
 
-sn_sys_load_php_files(SN_ROOT_PHYSICAL . "includes/functions/", DOT_PHP_EX);
+sn_sys_load_php_files(SN_ROOT_PHYSICAL."includes/functions/", DOT_PHP_EX);
 
 
 // Подключаем все модули
@@ -152,7 +152,7 @@ 
 // Конфиг - часть манифеста?
 classSupernova::$auth = new core_auth();
 
-sn_sys_load_php_files(SN_ROOT_PHYSICAL . "modules/", DOT_PHP_EX, true);
+sn_sys_load_php_files(SN_ROOT_PHYSICAL."modules/", DOT_PHP_EX, true);
 // Здесь - потому что core_auth модуль лежит в другом каталоге и его нужно инициализировать отдельно
 
 // Подключаем дефолтную страницу
@@ -160,10 +160,10 @@ 
 // Сейчас мы делаем это здесь только для того, что бы содержание дефолтной страницы оказалось вверху. Что не факт, что нужно всегда
 // Но нужно, пока у нас есть не MVC-страницы
 $sn_page_data = $sn_data['pages'][$sn_page_name];
-$sn_page_name_file = 'includes/pages/' . $sn_page_data['filename'] . DOT_PHP_EX;
-if($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
+$sn_page_name_file = 'includes/pages/'.$sn_page_data['filename'].DOT_PHP_EX;
+if ($sn_page_name && isset($sn_page_data) && file_exists($sn_page_name_file)) {
   require_once($sn_page_name_file);
-  if(is_array($sn_page_data['options'])) {
+  if (is_array($sn_page_data['options'])) {
     classSupernova::$options = array_merge(classSupernova::$options, $sn_page_data['options']);
   }
 }
@@ -173,7 +173,7 @@ 
 
 
 // А теперь проверяем - поддерживают ли у нас загруженный код такую страницу
-if(!isset($sn_data['pages'][$sn_page_name])) {
+if (!isset($sn_data['pages'][$sn_page_name])) {
   $sn_page_name = '';
 }
 
@@ -181,6 +181,6 @@ 
 classLocale::$lang = $lang = classSupernova::$gc->localePlayer;
 classLocale::$lang->lng_switch(sys_get_param_str('lang'));
 
-if(!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
+if (!defined('DEBUG_INIT_SKIP_SECONDARY') || DEBUG_INIT_SKIP_SECONDARY !== true) {
   require_once "init_secondary.php";
 }