supernova-ws / SuperNova

includes/classes/UBE/UBEDebug.php

Spacing +12 added lines, -12 removed lines

@@ -11,7 +11,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_header() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -48,7 +48,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump(UBEUnit $unit, $desc = '', UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -75,7 +75,7 @@ 
 //  print("<td>" . $this->units_lost . "</td>");
 //  print("<td>" . $this->units_restored . "</td>");
 //  print("<td>" . $this->capacity . "</td>");
-    print("<td>" . round($unit->share_of_side_armor, 4) . "</td>");
+    print("<td>".round($unit->share_of_side_armor, 4)."</td>");
     print('</tr>');
   }
 
@@ -86,7 +86,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_footer() {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -101,16 +101,16 @@ 
    * @return UBEUnit
    */
   public static function unit_dump_defender(UBEUnit $attacking_unit_pool, UBEUnit $defending_unit_pool, $defending_fleet_id) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return null;
     }
 
     $classLocale = classLocale::$lang;
 
-    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}" .
-      ' attacks ' .
-      $defending_fleet_id . '@' . "[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}" .
-      ' with ' . pretty_number($defending_unit_pool->attack_income) .
+    print("[{$attacking_unit_pool->unitId}]{$classLocale['tech'][$attacking_unit_pool->unitId]}".
+      ' attacks '.
+      $defending_fleet_id.'@'."[{$defending_unit_pool->unitId}]{$classLocale['tech'][$defending_unit_pool->unitId]}".
+      ' with '.pretty_number($defending_unit_pool->attack_income).
       '<br>'
     );
     $before = clone $defending_unit_pool;
@@ -127,7 +127,7 @@ 
    * @version 41a6.49
    */
   public static function unit_dump_delta(UBEUnit $unit, $field, UBEUnit $before = null) {
-    if(!defined('DEBUG_UBE')) {
+    if (!defined('DEBUG_UBE')) {
       return;
     }
 
@@ -136,8 +136,8 @@ 
     print(pretty_number($unit->$field));
     print("</td>");
     print("<td>");
-    if(!empty($before)) {
-      print('' . pretty_number($unit->$field - $before->$field) . '');
+    if (!empty($before)) {
+      print(''.pretty_number($unit->$field - $before->$field).'');
     }
     print("</td>");
   }

includes/classes/UBE/UBEFleet.php

Spacing +64 added lines, -64 removed lines

@@ -162,20 +162,20 @@ 
       $this->owner_id,
       $this->db_id,
 
-      (float)$this->UBE_PLANET[PLANET_ID],
-      "'" . db_escape($this->UBE_PLANET[PLANET_NAME]) . "'",
-      (int)$this->UBE_PLANET[PLANET_GALAXY],
-      (int)$this->UBE_PLANET[PLANET_SYSTEM],
-      (int)$this->UBE_PLANET[PLANET_PLANET],
-      (int)$this->UBE_PLANET[PLANET_TYPE],
-
-      (float)$this->resource_list[RES_METAL],
-      (float)$this->resource_list[RES_CRYSTAL],
-      (float)$this->resource_list[RES_DEUTERIUM],
-
-      (float)$this->fleet_bonus->calcBonus(P_ATTACK),
-      (float)$this->fleet_bonus->calcBonus(P_SHIELD),
-      (float)$this->fleet_bonus->calcBonus(P_ARMOR),
+      (float) $this->UBE_PLANET[PLANET_ID],
+      "'".db_escape($this->UBE_PLANET[PLANET_NAME])."'",
+      (int) $this->UBE_PLANET[PLANET_GALAXY],
+      (int) $this->UBE_PLANET[PLANET_SYSTEM],
+      (int) $this->UBE_PLANET[PLANET_PLANET],
+      (int) $this->UBE_PLANET[PLANET_TYPE],
+
+      (float) $this->resource_list[RES_METAL],
+      (float) $this->resource_list[RES_CRYSTAL],
+      (float) $this->resource_list[RES_DEUTERIUM],
+
+      (float) $this->fleet_bonus->calcBonus(P_ATTACK),
+      (float) $this->fleet_bonus->calcBonus(P_SHIELD),
+      (float) $this->fleet_bonus->calcBonus(P_ARMOR),
     );
   }
 
@@ -190,13 +190,13 @@ 
     $this->group_id = $objFleet->group_id;
 
     $fleet_unit_list = $objFleet->shipsGetArray();
-    foreach($fleet_unit_list as $unit_id => $unit_count) {
-      if(!$unit_count) {
+    foreach ($fleet_unit_list as $unit_id => $unit_count) {
+      if (!$unit_count) {
         continue;
       }
 
       $unit_type = get_unit_param($unit_id, P_UNIT_TYPE);
-      if($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
+      if ($unit_type == UNIT_SHIPS || $unit_type == UNIT_DEFENCE) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
@@ -232,13 +232,13 @@ 
 //      }
 //    }
 
-    foreach($sn_group_combat as $unit_id) {
-      if($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
+    foreach ($sn_group_combat as $unit_id) {
+      if ($unit_count = mrc_get_level($player_db_row, $planet_row, $unit_id)) {
         $this->unit_list->unitAdjustCount($unit_id, $unit_count);
       }
     }
 
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
       $this->resource_list[$resource_id] = floor(mrc_get_level($player_db_row, $planet_row, $resource_id));
     }
 
@@ -297,27 +297,27 @@ 
       $ube_report_id,
       $this->db_id,
 
-      (float)$this->resources_lost_on_units[RES_METAL],
-      (float)$this->resources_lost_on_units[RES_CRYSTAL],
-      (float)$this->resources_lost_on_units[RES_DEUTERIUM],
-      (float)$this->cargo_dropped[RES_METAL],
-      (float)$this->cargo_dropped[RES_CRYSTAL],
-      (float)$this->cargo_dropped[RES_DEUTERIUM],
-      (float)$this->resources_looted[RES_METAL],
-      (float)$this->resources_looted[RES_CRYSTAL],
-      (float)$this->resources_looted[RES_DEUTERIUM],
-      (float)$this->resources_lost_in_metal[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_METAL],
+      (float) $this->resources_lost_on_units[RES_CRYSTAL],
+      (float) $this->resources_lost_on_units[RES_DEUTERIUM],
+      (float) $this->cargo_dropped[RES_METAL],
+      (float) $this->cargo_dropped[RES_CRYSTAL],
+      (float) $this->cargo_dropped[RES_DEUTERIUM],
+      (float) $this->resources_looted[RES_METAL],
+      (float) $this->resources_looted[RES_CRYSTAL],
+      (float) $this->resources_looted[RES_DEUTERIUM],
+      (float) $this->resources_lost_in_metal[RES_METAL],
     );
   }
 
   public function report_render_outcome_side_fleet() {
     $UBE_DEFENCE_RESTORE = array();
     $UBE_UNITS_LOST = array();
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_restored) {
         $UBE_DEFENCE_RESTORE[$UBEUnit->unitId] = $UBEUnit->units_restored;
       }
-      if($UBEUnit->units_lost) {
+      if ($UBEUnit->units_lost) {
         $UBE_UNITS_LOST[$UBEUnit->unitId] = $UBEUnit->units_lost;
       }
     }
@@ -342,16 +342,16 @@ 
    */
   protected function report_render_outcome_side_fleet_line(&$array, $lang_header_index) {
     $result = array();
-    if(!empty($array)) {
-      foreach($array as $unit_id => $unit_count) {
-        if($unit_count) {
+    if (!empty($array)) {
+      foreach ($array as $unit_id => $unit_count) {
+        if ($unit_count) {
           $result[] = array(
             'NAME' => classLocale::$lang['tech'][$unit_id],
             'LOSS' => pretty_number($unit_count),
           );
         }
       }
-      if($lang_header_index && count($result)) {
+      if ($lang_header_index && count($result)) {
         array_unshift($result, array('NAME' => classLocale::$lang[$lang_header_index]));
       }
     }
@@ -364,16 +364,16 @@ 
     $fleet_id = $this->db_id;
 
     $unit_sort_order = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
-      if($UBEUnit->units_lost || $UBEUnit->units_restored) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
+      if ($UBEUnit->units_lost || $UBEUnit->units_restored) {
         $unit_sort_order++;
         $sql_perform_report_unit[] = array(
           $ube_report_id,
           $fleet_id,
 
           $UBEUnit->unitId,
-          (float)$UBEUnit->units_restored,
-          (float)$UBEUnit->units_lost,
+          (float) $UBEUnit->units_restored,
+          (float) $UBEUnit->units_lost,
 
           $unit_sort_order,
         );
@@ -389,9 +389,9 @@ 
   function ube_combat_result_calculate_resources() {
     $resource_delta_fleet = array();
     // Если во флоте остались юниты или это планета - генерируем изменение ресурсов
-    foreach(sn_get_groups('resources_loot') as $resource_id) {
-      $resource_change = (float)$this->resources_looted[$resource_id] + (float)$this->cargo_dropped[$resource_id];
-      if($resource_change) {
+    foreach (sn_get_groups('resources_loot') as $resource_id) {
+      $resource_change = (float) $this->resources_looted[$resource_id] + (float) $this->cargo_dropped[$resource_id];
+      if ($resource_change) {
         $resource_delta_fleet[$resource_id] = -($resource_change);
       }
     }
@@ -424,12 +424,12 @@ 
     );
 
     $this->fleet_capacity = 0;
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $this->fleet_capacity += $UBEUnit->capacity * $UBEUnit->getCount();
 
-      if($UBEUnit->units_lost) {
-        foreach($UBEUnit->price as $resource_id => $unit_resource_price) {
-          if(!$unit_resource_price) {
+      if ($UBEUnit->units_lost) {
+        foreach ($UBEUnit->price as $resource_id => $unit_resource_price) {
+          if (!$unit_resource_price) {
             continue;
           }
 
@@ -437,7 +437,7 @@ 
           $this->resources_lost_on_units[$resource_id] += $resources_lost;
           // Если это корабль - прибавляем потери к обломкам на орбите
           // TODO - опция выбрасывания обороны в обломки
-          if($UBEUnit->getType() == UNIT_SHIPS) {
+          if ($UBEUnit->getType() == UNIT_SHIPS) {
             $this->resources_lost_on_ships[$resource_id] += $resources_lost;
           }
         }
@@ -449,11 +449,11 @@ 
 
     // Если емкость трюмов меньше количество ресурсов - часть ресов выбрасываем нахуй
     // На планете ($fleet_id = 0) ресурсы в космос не выбрасываются
-    if($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
+    if ($this->db_id != 0 && $this->fleet_capacity < $fleet_total_resources) {
       $drop_share = 1 - $this->fleet_capacity / $fleet_total_resources; // Какая часть ресурсов выброшена
-      foreach($this->resource_list as $resource_id => &$resource_amount) {
+      foreach ($this->resource_list as $resource_id => &$resource_amount) {
         // Не просчитываем ресурсы, которых нет на борту кораблей флота
-        if(!$resource_amount) {
+        if (!$resource_amount) {
           continue;
         }
 
@@ -474,19 +474,19 @@ 
     $objFleet2->setDbId($this->db_id);
 
     // Если это была миссия Уничтожения И звезда смерти взорвалась И мы работаем с аттакерами - значит все аттакеры умерли
-    if($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
+    if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER && $reapers_status == UBE_MOON_REAPERS_DIED) {
       $objFleet2->dbDelete();
-    } elseif($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
+    } elseif ($ship_count_initial == 0) { // $ship_count_lost == $ship_count_initial ||
       $objFleet2->dbDelete();
     } else {
-      if($ship_count_lost) {
+      if ($ship_count_lost) {
         // Просматриваем результаты изменения флотов
-        foreach($this->unit_list->_container as $UBEUnit) {
+        foreach ($this->unit_list->_container as $UBEUnit) {
           // Перебираем аутком на случай восстановления юнитов
 //          if(($units_left = $UBEUnit->getCount() - (float)$UBEUnit->units_lost) > 0) {
 //            $fleet_real_array[$UBEUnit->unitId] = $units_left;
 //          };
-          if(floatval($UBEUnit->units_lost) != 0) {
+          if (floatval($UBEUnit->units_lost) != 0) {
             $objFleet2->shipAdjustCount($UBEUnit->unitId, floatval($UBEUnit->units_lost));
           };
         }
@@ -496,7 +496,7 @@ 
       $objFleet2->resourcesAdjust($resource_delta_fleet);
 
       // Если защитник и не РМФ - отправляем флот назад
-      if($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
+      if ($this->is_attacker == UBE_PLAYER_IS_ATTACKER || ($this->is_attacker == UBE_PLAYER_IS_DEFENDER && !$is_small_fleet_recce)) {
         $objFleet2->markReturned();
       }
       $objFleet2->dbSave();
@@ -526,7 +526,7 @@ 
   public function calculate_unit_partial_data(UBEASA $side_ASA) {
     $this->fleet_share_of_side_armor = $this->total_stats[P_ARMOR] / $side_ASA->getArmor();
 
-    foreach($this->unit_list->_container as $UBEUnit) {
+    foreach ($this->unit_list->_container as $UBEUnit) {
       $UBEUnit->share_of_side_armor = $UBEUnit->pool_armor / $side_ASA->getArmor();
     }
   }
@@ -538,9 +538,9 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function attack_fleets(UBEFleetList $fleet_list, $is_simulator) {
-    foreach($fleet_list->_container as $defending_fleet) {
+    foreach ($fleet_list->_container as $defending_fleet) {
       // Не атакуются флоты на своей стороне
-      if($this->is_attacker == $defending_fleet->is_attacker) {
+      if ($this->is_attacker == $defending_fleet->is_attacker) {
         continue;
       }
       $this->attack_fleet($defending_fleet, $is_simulator);
@@ -556,12 +556,12 @@ 
   public function attack_fleet(UBEFleet $defending_fleet, $is_simulator) {
     UBEDebug::unit_dump_header();
 
-    foreach($this->unit_list->_container as $attacking_unit_pool) {
+    foreach ($this->unit_list->_container as $attacking_unit_pool) {
       UBEDebug::unit_dump($attacking_unit_pool, 'attacker');
 
       // if($attack_unit_count <= 0) continue; // TODO: Это пока нельзя включать - вот если будут "боевые порядки юнитов..."
-      foreach($defending_fleet->unit_list->_container as $defending_unit_pool) {
-        if($defending_unit_pool->isEmpty()) {
+      foreach ($defending_fleet->unit_list->_container as $defending_unit_pool) {
+        if ($defending_unit_pool->isEmpty()) {
           continue;
         }
 

includes/classes/UnitList.php

Spacing +7 added lines, -7 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;
@@ -321,7 +321,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();
@@ -464,8 +464,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>');
@@ -521,11 +521,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>');

includes/classes/RequestInfo.php

Spacing +12 added lines, -12 removed lines

@@ -89,15 +89,15 @@ 
     // Инфа об устройстве и браузере - общая для всех
     sn_db_transaction_start();
     $this->device_cypher = $_COOKIE[SN_COOKIE_D];
-    if($this->device_cypher) {
+    if ($this->device_cypher) {
       $cypher_safe = db_escape($this->device_cypher);
       $device_id = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
-      if(!empty($device_id['device_id'])) {
+      if (!empty($device_id['device_id'])) {
         $this->device_id = $device_id['device_id'];
       }
     }
 
-    if($this->device_id <= 0) {
+    if ($this->device_id <= 0) {
       do {
         $cypher_safe = db_escape($this->device_cypher = sys_random_string());
         $row = doquery("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE", true);
@@ -118,10 +118,10 @@ 
     $this->page_address_id = db_get_set_unique_id_value($this->page_address, 'url_id', 'security_url', 'url_string');
     sn_db_transaction_commit();
 
-    if($this->write_full_url) {
+    if ($this->write_full_url) {
       sn_db_transaction_start();
       $this->page_url = substr($_SERVER['REQUEST_URI'], strlen(SN_ROOT_RELATIVE));
-      if(strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
+      if (strpos($_SERVER['REQUEST_URI'], '/simulator.php') === 0) {
         $this->page_url = '/simulator.php';
       }
       $this->page_url_id = db_get_set_unique_id_value($this->page_url, 'url_id', 'security_url', 'url_string');
@@ -144,7 +144,7 @@ 
    */
   public function db_security_entry_insert($user_id_unsafe) {
     // TODO $user_id = !empty(self::$user['id']) ? self::$user['id'] : 'NULL';
-    if(empty($user_id_unsafe)) {
+    if (empty($user_id_unsafe)) {
       // self::flog('Нет ИД пользователя');
       return true;
     }
@@ -154,8 +154,8 @@ 
     // self::flog('Вставляем запись системы безопасности');
     return doquery(
       "INSERT IGNORE INTO {{security_player_entry}} (`player_id`, `device_id`, `browser_id`, `user_ip`, `user_proxy`)
-        VALUES ({$user_id_safe}," . $this->device_id . "," . $this->browser_id . "," .
-      $this->ip_v4_int . ", '" . db_escape($this->ip_v4_proxy_chain) . "');"
+        VALUES ({$user_id_safe},".$this->device_id.",".$this->browser_id.",".
+      $this->ip_v4_int.", '".db_escape($this->ip_v4_proxy_chain)."');"
     );
   }
 
@@ -167,7 +167,7 @@ 
   public function db_counter_insert($user_id_unsafe) {
     global $sys_stop_log_hit;
 
-    if($sys_stop_log_hit || !classSupernova::$config->game_counter) {
+    if ($sys_stop_log_hit || !classSupernova::$config->game_counter) {
       return;
     }
 
@@ -177,14 +177,14 @@ 
     classSupernova::$db->isWatching = true;
     doquery(
       "INSERT INTO {{counter}} SET
-        `visit_time` = '" . SN_TIME_SQL. "',
+        `visit_time` = '" . SN_TIME_SQL."',
         `user_id` = {$user_id_safe},
         `device_id` = {$this->device_id},
         `browser_id` = {$this->browser_id},
         `user_ip` = {$this->ip_v4_int},
         `user_proxy` = '{$proxy_safe}',
-        `page_url_id` = {$this->page_address_id}" .
-        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '' ).
+        `page_url_id` = {$this->page_address_id}".
+        ($this->write_full_url ? ", `plain_url_id` = {$this->page_url_id}" : '').
       ";");
 
     classSupernova::$db->isWatching = false;

includes/classes/template.php

Spacing +32 added lines, -32 removed lines

@@ -61,10 +61,10 @@ 
   {
     global $phpbb_root_path, $user;
 
-    if (file_exists($phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template'))
+    if (file_exists($phpbb_root_path.'styles/'.$user->theme['template_path'].'/template'))
     {
-      $this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
-      $this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
+      $this->root = $phpbb_root_path.'styles/'.$user->theme['template_path'].'/template';
+      $this->cachepath = $phpbb_root_path.'cache/tpl_'.str_replace('_', '-', $user->theme['template_path']).'_';
 
       if ($this->orig_tpl_storedb === null)
       {
@@ -81,12 +81,12 @@ 
 
       if ($user->theme['template_inherits_id'])
       {
-        $this->inherit_root = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template';
+        $this->inherit_root = $phpbb_root_path.'styles/'.$user->theme['template_inherit_path'].'/template';
       }
     }
     else
     {
-      trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
+      trigger_error('Template path could not be found: styles/'.$user->theme['template_path'].'/template', E_USER_ERROR);
     }
 
     $this->_rootref = &$this->_tpldata['.'][0];
@@ -109,7 +109,7 @@ 
     }
 
     $this->root = $template_path;
-    $this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
+    $this->cachepath = $phpbb_root_path.'cache/ctpl_'.str_replace('_', '-', $template_name).'_';
 
     if ($fallback_template_path !== false)
     {
@@ -154,11 +154,11 @@ 
       }
 
       $this->filename[$handle] = $filename;
-      $this->files[$handle] = $this->root . '/' . $filename;
+      $this->files[$handle] = $this->root.'/'.$filename;
 
       if ($this->inherit_root)
       {
-        $this->files_inherit[$handle] = $this->inherit_root . '/' . $filename;
+        $this->files_inherit[$handle] = $this->inherit_root.'/'.$filename;
       }
     }
 
@@ -235,7 +235,7 @@ 
     }
     else
     {
-      eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
+      eval(' ?>'.$this->compiled_code[$handle].'<?php ');
     }
 
     return true;
@@ -280,7 +280,7 @@ 
     //$user->theme['template_storedb'] = $this->orig_tpl_storedb;
     //$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
 
-    $filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . DOT_PHP_EX;
+    $filename = $this->cachepath.str_replace('/', '.', $this->filename[$handle]).DOT_PHP_EX;
     //$this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
 
     $recompile = false;
@@ -309,7 +309,7 @@ 
 
     if (!class_exists('template_compile'))
     {
-      include($phpbb_root_path . 'includes/functions_template' . DOT_PHP_EX);
+      include($phpbb_root_path.'includes/functions_template'.DOT_PHP_EX);
     }
 
     // Inheritance - we point to another template file for this one. Equality is also used for store_db
@@ -348,10 +348,10 @@ 
       foreach ($ids as $id)
       {
         $sql = 'SELECT *
-        FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-        WHERE template_id = ' . $id . "
-          AND (template_filename = '" . $db->sql_escape($this->filename[$handle]) . "'
-            OR template_included " . $db->sql_like_expression($db->any_char . $this->filename[$handle] . ':' . $db->any_char) . ')';
+        FROM ' . STYLES_TEMPLATE_DATA_TABLE.'
+        WHERE template_id = ' . $id."
+          AND (template_filename = '" . $db->sql_escape($this->filename[$handle])."'
+            OR template_included " . $db->sql_like_expression($db->any_char.$this->filename[$handle].':'.$db->any_char).')';
 
         $result = $db->sql_query($sql);
         while ($row = $db->sql_fetchrow($result))
@@ -365,14 +365,14 @@ 
       {
         foreach ($rows as $row)
         {
-          $file = $this->root . '/' . $row['template_filename'];
+          $file = $this->root.'/'.$row['template_filename'];
           $force_reload = false;
           if ($row['template_id'] != $user->theme['template_id'])
           {
             // make sure that we are not overlooking a file not in the db yet
             if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'] && !file_exists($file))
             {
-              $file = $this->inherit_root . '/' . $row['template_filename'];
+              $file = $this->inherit_root.'/'.$row['template_filename'];
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
@@ -414,7 +414,7 @@ 
           else
           {
             // Only bother compiling if it doesn't already exist
-            if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
+            if (!file_exists($this->cachepath.str_replace('/', '.', $row['template_filename']).DOT_PHP_EX))
             {
               $this->filename[$row['template_filename']] = $row['template_filename'];
               $compile->compile_write($row['template_filename'], $compile->compile(trim($row['template_data'])));
@@ -425,11 +425,11 @@ 
       }
       else
       {
-        $file = $this->root . '/' . $row['template_filename'];
+        $file = $this->root.'/'.$row['template_filename'];
 
         if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'] && !file_exists($file))
         {
-          $file = $this->inherit_root . '/' . $row['template_filename'];
+          $file = $this->inherit_root.'/'.$row['template_filename'];
           $this->files[$row['template_filename']] = $file;
           $this->files_inherit[$row['template_filename']] = $file;
           $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
@@ -622,7 +622,7 @@ 
       // Re-position template blocks
       for ($i = sizeof($this->_tpldata[$blockname]); $i > $key; $i--)
       {
-        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i-1];
+        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i - 1];
         $this->_tpldata[$blockname][$i]['S_ROW_COUNT'] = $i;
       }
 
@@ -656,10 +656,10 @@ 
   {
     $handle = $filename;
     $this->filename[$handle] = $filename;
-    $this->files[$handle] = $this->root . '/' . $filename;
+    $this->files[$handle] = $this->root.'/'.$filename;
     if ($this->inherit_root)
     {
-      $this->files_inherit[$handle] = $this->inherit_root . '/' . $filename;
+      $this->files_inherit[$handle] = $this->inherit_root.'/'.$filename;
     }
 
     $filename = $this->_tpl_load($handle);
@@ -673,7 +673,7 @@ 
         include($filename);
         return;
       }
-      eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
+      eval(' ?>'.$this->compiled_code[$handle].'<?php ');
     }
   }
 
@@ -685,12 +685,12 @@ 
   {
     global $phpbb_root_path;
 
-    $file = $phpbb_root_path . $filename;
+    $file = $phpbb_root_path.$filename;
 
     if (!file_exists($file))
     {
       // trigger_error cannot be used here, as the output already started
-      echo 'template->_php_include(): File ' . htmlspecialchars($file) . ' does not exist or is empty';
+      echo 'template->_php_include(): File '.htmlspecialchars($file).' does not exist or is empty';
       return;
     }
     include($file);
@@ -702,13 +702,13 @@ 
   */
   function assign_recursive($values, $name = '')
   {
-    if(isset($values['.']))
+    if (isset($values['.']))
     {
       $values_extra = $values['.'];
       unset($values['.']);
     }
 
-    if(!$name)
+    if (!$name)
     {
       $this->assign_vars($values);
     }
@@ -717,12 +717,12 @@ 
       $this->assign_block_vars($name, $values);
     }
 
-    if(isset($values_extra))
+    if (isset($values_extra))
     {
-      foreach($values_extra as $sub_array_name => $sub_array)
+      foreach ($values_extra as $sub_array_name => $sub_array)
       {
-        $new_name = $name . ($name ? '.' : '') . $sub_array_name;
-        foreach($sub_array as $sub_element)
+        $new_name = $name.($name ? '.' : '').$sub_array_name;
+        foreach ($sub_array as $sub_element)
         {
           $this->assign_recursive($sub_element, $new_name);
         }

includes/classes/functions_template.php

Spacing +48 added lines, -48 removed lines

@@ -91,7 +91,7 @@ 
         'template_data'     => trim(@file_get_contents($this->template->files[$handle])),
       );
 
-      $sql = 'INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+      $sql = 'INSERT INTO '.STYLES_TEMPLATE_DATA_TABLE.' '.$db->sql_build_array('INSERT', $sql_ary);
       $db->sql_query($sql);
     }
   }
@@ -138,9 +138,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -169,7 +169,7 @@ 
       {
         case 'BEGIN':
           $this->block_else_level[] = false;
-          $compile_blocks[] = '<?php ' . $this->compile_tag_block($block_val[2]) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_block($block_val[2]).' ?>';
         break;
 
         case 'BEGINELSE':
@@ -179,11 +179,11 @@ 
 
         case 'END':
           array_pop($this->block_names);
-          $compile_blocks[] = '<?php ' . ((array_pop($this->block_else_level)) ? '}' : '}}') . ' ?>';
+          $compile_blocks[] = '<?php '.((array_pop($this->block_else_level)) ? '}' : '}}').' ?>';
         break;
 
         case 'IF':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_if($block_val[2], false) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_if($block_val[2], false).' ?>';
         break;
 
         case 'ELSE':
@@ -191,7 +191,7 @@ 
         break;
 
         case 'ELSEIF':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_if($block_val[2], true) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_if($block_val[2], true).' ?>';
         break;
 
         case 'ENDIF':
@@ -199,11 +199,11 @@ 
         break;
 
         case 'DEFINE':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], true) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_define($block_val[2], true).' ?>';
         break;
 
         case 'UNDEFINE':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], false) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_define($block_val[2], false).' ?>';
         break;
 
         case 'INCLUDE':
@@ -234,7 +234,7 @@ 
             $file = $temp;
           }
 
-          $compile_blocks[] = '<?php ' . $this->compile_tag_include($temp) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_include($temp).' ?>';
 
           // No point in checking variable includes
           if ($file)
@@ -244,11 +244,11 @@ 
         break;
 
         case 'INCLUDEPHP':
-          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php ' . $this->compile_tag_include_php(array_shift($includephp_blocks)) . ' ?>' : '';
+          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php '.$this->compile_tag_include_php(array_shift($includephp_blocks)).' ?>' : '';
         break;
 
         case 'PHP':
-          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php ' . array_shift($php_blocks) . ' ?>' : '';
+          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php '.array_shift($php_blocks).' ?>' : '';
         break;
 
         default:
@@ -263,7 +263,7 @@ 
     for ($i = 0, $size = sizeof($text_blocks); $i < $size; $i++)
     {
       $trim_check_text = trim($text_blocks[$i]);
-      $template_php .= (!$no_echo) ? (($trim_check_text != '') ? $text_blocks[$i] : '') . ((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '') : (($trim_check_text != '') ? $text_blocks[$i] : '') . ((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '');
+      $template_php .= (!$no_echo) ? (($trim_check_text != '') ? $text_blocks[$i] : '').((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '') : (($trim_check_text != '') ? $text_blocks[$i] : '').((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '');
     }
 
     // Remove unused opening/closing tags
@@ -278,7 +278,7 @@ 
     // we'll strip out such occurences, minimising such switching
     if ($no_echo)
     {
-      return "\$$echo_var .= '" . $template_php . "'";
+      return "\$$echo_var .= '".$template_php."'";
     }
 
     return $template_php;
@@ -373,30 +373,30 @@ 
 
       if ($match[2] < 0)
       {
-        $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
+        $loop_start = '($_'.$tag_args.'_count '.$match[2].' < 0 ? 0 : $_'.$tag_args.'_count '.$match[2].')';
       }
       else
       {
-        $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
+        $loop_start = '($_'.$tag_args.'_count < '.$match[2].' ? $_'.$tag_args.'_count : '.$match[2].')';
       }
 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
-        $loop_end = '$_' . $tag_args . '_count';
+        $loop_end = '$_'.$tag_args.'_count';
       }
       else if ($match[3] >= 0)
       {
-        $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
+        $loop_end = '('.($match[3] + 1).' > $_'.$tag_args.'_count ? $_'.$tag_args.'_count : '.($match[3] + 1).')';
       }
       else //if ($match[3] < -1)
       {
-        $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
+        $loop_end = '$_'.$tag_args.'_count'.($match[3] + 1);
       }
     }
     else
     {
       $loop_start = 0;
-      $loop_end = '$_' . $tag_args . '_count';
+      $loop_end = '$_'.$tag_args.'_count';
     }
 
     $tag_template_php = '';
@@ -415,7 +415,7 @@ 
     if (sizeof($block) < 2)
     {
       // Block is not nested.
-      $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
+      $tag_template_php = '$_'.$tag_args."_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
     }
     else
@@ -429,10 +429,10 @@ 
       $varref = $this->generate_block_data_ref($namespace, false);
 
       // Create the for loop code to iterate over this block.
-      $tag_template_php = '$_' . $tag_args . '_count = (isset(' . $varref . ')) ? sizeof(' . $varref . ') : 0;';
+      $tag_template_php = '$_'.$tag_args.'_count = (isset('.$varref.')) ? sizeof('.$varref.') : 0;';
     }
 
-    $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
+    $tag_template_php .= 'if ($_'.$tag_args.'_count) {';
 
     /**
     * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
@@ -444,10 +444,10 @@ 
     * </code>
     */
 
-    $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
+    $tag_template_php .= 'for ($_'.$tag_args.'_i = '.$loop_start.'; $_'.$tag_args.'_i < '.$loop_end.'; ++$_'.$tag_args.'_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_'.$tag_args.'_val = &'.$varref.'[$_'.$tag_args.'_i];';
+    $tag_template_php .= '$this->_block_value["'.$tag_args.'"] = &'.$varref.'[$_'.$tag_args.'_i];';
 
     return $tag_template_php;
   }
@@ -551,10 +551,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -565,7 +565,7 @@ 
         default:
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
-            $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
+            $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]).'[\''.$varrefs[3].'\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\''.$varrefs[3].'\']' : '$this->_rootref[\''.$varrefs[3].'\']');
           }
           else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
@@ -582,20 +582,20 @@ 
               $varref = $this->generate_block_data_ref($namespace, true);
 
               // Add the block reference for the last child.
-              $varref .= "['" . $block . "']";
+              $varref .= "['".$block."']";
             }
             else
             {
               $varref = '$this->_tpldata';
 
               // Add the block reference for the last child.
-              $varref .= "['" . $blocks[0] . "']";
+              $varref .= "['".$blocks[0]."']";
             }
             $token = "sizeof($varref)";
           }
           else if (!empty($token))
           {
-            $token = '(' . $token . ')';
+            $token = '('.$token.')';
           }
 
         break;
@@ -607,7 +607,7 @@ 
     {
       $tokens = array('false');
     }
-    return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $tokens) . ') { ');
+    return (($elseif) ? '} else if (' : 'if (').(implode(' ', $tokens).') { ');
   }
 
   /**
@@ -625,7 +625,7 @@ 
 
     if (!$op)
     {
-      return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
+      return 'unset('.(($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true).'[\''.$match[2].'\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\''.$match[2].'\']').');';
     }
 
     // Are we a string?
@@ -637,7 +637,7 @@ 
       $match[4] = $this->compile($match[4]);
 
       // Now replace the php code
-      $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
+      $match[4] = "'".str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4])."'";
     }
     else
     {
@@ -660,7 +660,7 @@ 
       }
     }
 
-    return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $match[4] . ';';
+    return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true).'[\''.$match[2].'\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\''.$match[2].'\']').' = '.$match[4].';';
   }
 
   /**
@@ -801,24 +801,24 @@ 
       // Build up the string with everything but the last child.
       for ($i = 0; $i < $blockcount; $i++)
       {
-        $varref .= "['" . $blocks[$i] . "'][\$_" . $blocks[$i] . '_i]';
+        $varref .= "['".$blocks[$i]."'][\$_".$blocks[$i].'_i]';
       }
       // Add the block reference for the last child.
-      $varref .= "['" . $blocks[$blockcount] . "']";
+      $varref .= "['".$blocks[$blockcount]."']";
       // Add the iterator for the last child if requried.
       if ($include_last_iterator)
       {
-        $varref .= '[$_' . $blocks[$blockcount] . '_i]';
+        $varref .= '[$_'.$blocks[$blockcount].'_i]';
       }
       return $varref;
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_'.$blocks[$blockcount].'_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_'.$blocks[$blockcount - 1].'_val[\''.$blocks[$blockcount].'\']';
     }
   }
 
@@ -828,14 +828,14 @@ 
   */
   function compile_write($handle, $data)
   {
-    $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
+    $filename = $this->template->cachepath.str_replace('/', '.', $this->template->filename[$handle]).DOT_PHP_EX;
 
-    $data = "<?php if (!defined('INSIDE')) exit;" . ((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>' . $data);
+    $data = "<?php if (!defined('INSIDE')) exit;".((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>'.$data);
 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -852,7 +852,7 @@ 
   */
   private function minify($html)
   {
-    if(!classSupernova::$config->tpl_minifier)
+    if (!classSupernova::$config->tpl_minifier)
     {
       return $html;
     }
@@ -862,14 +862,14 @@ 
     $html = preg_replace('/(<script[^>]*?>.*?<\/script>)/si', '#pre#', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

includes/classes/sn_module_payment.php

Spacing +70 added lines, -70 removed lines

@@ -450,7 +450,7 @@ 
   public function compile_request($request) {
     global $user;
 
-    if(!(classSupernova::$auth->account instanceof Account)) {
+    if (!(classSupernova::$auth->account instanceof Account)) {
       // TODO - throw new Exception(lang['pay_msg_mm_request_amount_invalid'], SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT);
     }
     $this->account = classSupernova::$auth->account;
@@ -471,15 +471,15 @@ 
     $this->payment_currency = classSupernova::$config->payment_currency_default;
     $this->payment_amount = self::currency_convert($this->payment_dark_matter_paid, 'MM_', $this->payment_currency);
 
-    if(empty($this->payment_external_currency) && !empty($this->config['currency'])) {
+    if (empty($this->payment_external_currency) && !empty($this->config['currency'])) {
       $this->payment_external_currency = $this->config['currency'];
     }
-    if(empty($this->payment_external_currency)) {
+    if (empty($this->payment_external_currency)) {
       throw new Exception(classLocale::$lang['pay_error_internal_no_external_currency_set'], SN_PAYMENT_ERROR_INTERNAL_NO_EXTERNAL_CURRENCY_SET);
     }
 
     $this->payment_external_amount = self::currency_convert($this->payment_dark_matter_paid, 'MM_', $this->payment_external_currency);
-    if($this->payment_external_amount < 0.01) {
+    if ($this->payment_external_amount < 0.01) {
       throw new Exception(classLocale::$lang['pay_msg_mm_request_amount_invalid'], SN_PAYMENT_REQUEST_ERROR_UNIT_AMOUNT);
     }
 
@@ -488,7 +488,7 @@ 
     $this->generate_description();
 
     $this->db_insert();
-    if(!$this->is_exists) {
+    if (!$this->is_exists) {
       throw new Exception(classLocale::$lang['pay_msg_request_error_db_payment_create'], SN_PAYMENT_REQUEST_DB_ERROR_PAYMENT_CREATE);
     }
   }
@@ -500,26 +500,26 @@ 
    * @throws Exception
    */
   protected function payment_request_process($options = array()) {
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       throw new Exception(classLocale::$lang['pay_msg_module_disabled'], SN_MODULE_DISABLED);
     }
 
     // Если есть payment_id - загружаем под него данные
-    if(!empty($this->payment_params['payment_id'])) {
+    if (!empty($this->payment_params['payment_id'])) {
       $this->request_payment_id = sys_get_param_id($this->payment_params['payment_id']);
-      if(!$this->request_payment_id) {
+      if (!$this->request_payment_id) {
         throw new Exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_INTERNAL_ID_WRONG);
       }
 
-      if(!$this->db_get_by_id($this->request_payment_id)) {
+      if (!$this->db_get_by_id($this->request_payment_id)) {
         throw new Exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_INTERNAL_ID_WRONG);
       }
 
       // Проверяем - был ли этот платеж обработан?
       // TODO - Статусы бывают разные. Нужен спецфлаг payment_processed
-      if($this->payment_status != PAYMENT_STATUS_NONE) {
+      if ($this->payment_status != PAYMENT_STATUS_NONE) {
         sn_db_transaction_rollback();
-        sys_redirect(SN_ROOT_VIRTUAL . 'metamatter.php?payment_id=' . $this->payment_id);
+        sys_redirect(SN_ROOT_VIRTUAL.'metamatter.php?payment_id='.$this->payment_id);
         die();
       }
     }
@@ -527,89 +527,89 @@ 
     // Пытаемся получить из запроса ИД аккаунта
     $request_account_id = !empty($this->payment_params['account_id']) ? sys_get_param_id($this->payment_params['account_id']) : 0;
     // Если в запросе нет ИД аккаунта - пытаемся использовать payment_account_id
-    if(empty($request_account_id) && !empty($this->payment_account_id)) {
+    if (empty($request_account_id) && !empty($this->payment_account_id)) {
       $request_account_id = $this->payment_account_id;
     }
     // Если теперь у нас нету ИД аккаунта ни в запросе, ни в записи таблицы - можно паниковать
-    if(empty($request_account_id)) {
+    if (empty($request_account_id)) {
       // TODO - аккаунт
       throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'], $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
     }
     // Если нет записи в таблице - тогда берем payment_account_id из запроса
-    if(empty($this->payment_account_id)) {
+    if (empty($this->payment_account_id)) {
       $this->payment_account_id = $request_account_id;
     }
     // Если у нас отличаются ИД аккаунта в запросе и ИД аккаунта в записи - тоже можно паниковать
-    if($this->payment_account_id != $request_account_id) {
+    if ($this->payment_account_id != $request_account_id) {
       // TODO - Поменять сообщение об ошибке
       throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'], $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
     }
     // Проверяем существование аккаунта с данным ИД
-    if(!$this->account->db_get_by_id($this->payment_account_id)) {
-      throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'] . ' ID ' . $this->payment_account_id, $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
+    if (!$this->account->db_get_by_id($this->payment_account_id)) {
+      throw new Exception(classLocale::$lang['pay_msg_request_user_invalid'].' ID '.$this->payment_account_id, $this->retranslate_error(SN_PAYMENT_REQUEST_USER_NOT_FOUND, $options));
     }
 
     // TODO Проверка на сервер_ид - как бы и не нужна, наверное?
-    if(!empty($this->payment_params['server_id'])) {
+    if (!empty($this->payment_params['server_id'])) {
       $this->request_server_id = sys_get_param_str($this->payment_params['server_id']);
-      if(SN_ROOT_VIRTUAL != $this->request_server_id) {
-        throw new Exception(classLocale::$lang['pay_msg_request_server_wrong'] . " {$this->request_server_id} вместо " . SN_ROOT_VIRTUAL, SN_PAYMENT_REQUEST_SERVER_WRONG);
+      if (SN_ROOT_VIRTUAL != $this->request_server_id) {
+        throw new Exception(classLocale::$lang['pay_msg_request_server_wrong']." {$this->request_server_id} вместо ".SN_ROOT_VIRTUAL, SN_PAYMENT_REQUEST_SERVER_WRONG);
       }
     }
 
     // Сверка количества оплаченной ММ с учётом бонусов
-    if(!empty($this->payment_params['payment_dark_matter_gained'])) {
+    if (!empty($this->payment_params['payment_dark_matter_gained'])) {
       $request_mm_amount = sys_get_param_id($this->payment_params['payment_dark_matter_gained']);
-      if($request_mm_amount != $this->payment_dark_matter_gained && $this->is_loaded) {
-        throw new Exception(classLocale::$lang['pay_msg_mm_request_amount_invalid'] . " пришло {$request_mm_amount} ММ вместо {$this->payment_dark_matter_gained} ММ", SN_PAYMENT_REQUEST_MM_AMOUNT_INVALID);
+      if ($request_mm_amount != $this->payment_dark_matter_gained && $this->is_loaded) {
+        throw new Exception(classLocale::$lang['pay_msg_mm_request_amount_invalid']." пришло {$request_mm_amount} ММ вместо {$this->payment_dark_matter_gained} ММ", SN_PAYMENT_REQUEST_MM_AMOUNT_INVALID);
       }
       empty($this->payment_dark_matter_gained) ? $this->payment_dark_matter_gained = $request_mm_amount : false;
     }
-    if(empty($this->payment_dark_matter_paid)) {
+    if (empty($this->payment_dark_matter_paid)) {
       // TODO - обратный расчёт из gained
     }
 
     // Проверка наличия внешнего ИД платежа
-    if(!empty($this->payment_params['payment_external_id'])) {
+    if (!empty($this->payment_params['payment_external_id'])) {
       $request_payment_external_id = sys_get_param_id($this->payment_params['payment_external_id']);
-      if(empty($request_payment_external_id)) {
+      if (empty($request_payment_external_id)) {
         throw new exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_EXTERNAL_ID_WRONG);
-      } elseif(!empty($this->payment_external_id) && $this->payment_external_id != $request_payment_external_id) {
+      } elseif (!empty($this->payment_external_id) && $this->payment_external_id != $request_payment_external_id) {
         // TODO - Может быть поменять сообщение
         throw new exception(classLocale::$lang['pay_msg_request_payment_id_invalid'], SN_PAYMENT_REQUEST_EXTERNAL_ID_WRONG);
       }
       $this->payment_external_id = $request_payment_external_id;
     }
     // Сверка суммы, запрошенной СН к оплате
-    if(!empty($this->payment_params['payment_external_money'])) {
+    if (!empty($this->payment_params['payment_external_money'])) {
       $request_money_out = sys_get_param_float($this->payment_params['payment_external_money']);
-      if($request_money_out != $this->payment_external_amount && $this->is_loaded) {
-        throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid'] . " пришло {$request_money_out} денег вместо {$this->payment_external_amount} денег", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
+      if ($request_money_out != $this->payment_external_amount && $this->is_loaded) {
+        throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid']." пришло {$request_money_out} денег вместо {$this->payment_external_amount} денег", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
       }
       empty($this->payment_external_amount) ? $this->payment_external_amount = $request_money_out : false;
     }
     // Заполняем поле валюты платёжной системы
-    if(!empty($this->payment_params['payment_external_currency'])) {
+    if (!empty($this->payment_params['payment_external_currency'])) {
       $this->payment_external_currency = sys_get_param_str($this->payment_params['payment_external_currency']);
-      if(empty($this->payment_external_currency)) {
+      if (empty($this->payment_external_currency)) {
         // TODO - поменять сообщение
-        throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid'] . " {$this->payment_external_currency}", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
+        throw new Exception(classLocale::$lang['pay_msg_request_payment_amount_invalid']." {$this->payment_external_currency}", SN_PAYMENT_REQUEST_CURRENCY_AMOUNT_INVALID);
       }
     }
-    if(empty($this->payment_external_currency)) {
+    if (empty($this->payment_external_currency)) {
       $this->payment_external_currency = $this->config['currency'];
     }
 
     // Заполнение внутренней суммы и валюты из внешних данных
-    if(empty($this->payment_currency)) {
+    if (empty($this->payment_currency)) {
       $this->payment_currency = classSupernova::$config->payment_currency_default;
     }
-    if(empty($this->payment_amount) && !empty($this->payment_external_currency)) {
+    if (empty($this->payment_amount) && !empty($this->payment_external_currency)) {
       $this->payment_amount = self::currency_convert($this->payment_external_amount, $this->payment_external_currency, $this->payment_currency);
     }
 
     // TODO - Тестовый режим
-    if(!empty($this->payment_params['test'])) {
+    if (!empty($this->payment_params['test'])) {
       $this->payment_test = $this->config['test'] || sys_get_param_int($this->payment_params['test']);
     }
 
@@ -636,21 +636,21 @@ 
     sn_db_transaction_start();
     try {
       $response = $this->payment_request_process();
-    } catch(Exception $e) {
+    } catch (Exception $e) {
       $response['result'] = $e->getCode();
       $response['message'] = $e->getMessage();
     }
 
-    if($response['result'] == SN_PAYMENT_REQUEST_OK) {
+    if ($response['result'] == SN_PAYMENT_REQUEST_OK) {
       sn_db_transaction_commit();
-      classSupernova::$debug->warning('Результат операции: код ' . $response['result'] . ' сообщение "' . $response['message'] . '"', 'Успешный платёж', LOG_INFO_PAYMENT);
+      classSupernova::$debug->warning('Результат операции: код '.$response['result'].' сообщение "'.$response['message'].'"', 'Успешный платёж', LOG_INFO_PAYMENT);
     } else {
       sn_db_transaction_rollback();
-      classSupernova::$debug->warning('Результат операции: код ' . $response['result'] . ' сообщение "' . $response['message'] . '"', 'Ошибка платежа', LOG_INFO_PAYMENT, true);
+      classSupernova::$debug->warning('Результат операции: код '.$response['result'].' сообщение "'.$response['message'].'"', 'Ошибка платежа', LOG_INFO_PAYMENT, true);
     }
 
     // Переводим код результата из СН в код платежной системы
-    if(is_array($this->result_translations) && !empty($this->result_translations)) {
+    if (is_array($this->result_translations) && !empty($this->result_translations)) {
       $response['result'] = isset($this->result_translations[$response['result']]) ? $this->result_translations[$response['result']] : $this->result_translations[SN_PAYMENT_REQUEST_UNDEFINED_ERROR];
     }
 
@@ -673,7 +673,7 @@ 
     $currency_from = strtolower($currency_from);
     $currency_to = strtolower($currency_to);
 
-    if($currency_from != $currency_to) {
+    if ($currency_from != $currency_to) {
       $exchange_from = get_exchange_rate($currency_from);
       $exchange_to = get_exchange_rate($currency_to);
 
@@ -697,10 +697,10 @@ 
   public static function bonus_calculate($dark_matter, $direct = true, $return_bonus = false) {
     $bonus = 0;
     $dark_matter_new = $dark_matter;
-    if(!empty(self::$bonus_table) && $dark_matter >= self::$bonus_table[0]) {
-      if($direct) {
-        foreach(self::$bonus_table as $dm_for_bonus => $multiplier) {
-          if($dm_for_bonus <= $dark_matter) {
+    if (!empty(self::$bonus_table) && $dark_matter >= self::$bonus_table[0]) {
+      if ($direct) {
+        foreach (self::$bonus_table as $dm_for_bonus => $multiplier) {
+          if ($dm_for_bonus <= $dark_matter) {
             $dark_matter_new = $dark_matter * (1 + $multiplier);
             $bonus = $multiplier;
           } else {
@@ -708,9 +708,9 @@ 
           }
         }
       } else {
-        foreach(self::$bonus_table as $dm_for_bonus => $multiplier) {
+        foreach (self::$bonus_table as $dm_for_bonus => $multiplier) {
           $temp = $dm_for_bonus * (1 + $multiplier);
-          if($dark_matter >= $temp) {
+          if ($dark_matter >= $temp) {
             $dark_matter_new = round($dark_matter / (1 + $multiplier));
             $bonus = $multiplier;
           } else {
@@ -764,30 +764,30 @@ 
     );
 
     $replace = false;
-    if($this->payment_id) {
+    if ($this->payment_id) {
       $payment['payment_id'] = $this->payment_id;
       $replace = true;
     }
 
     $query = array();
-    foreach($payment as $key => $value) {
-      $value = is_string($value) ? '"' . db_escape($value) . '"' : $value;
+    foreach ($payment as $key => $value) {
+      $value = is_string($value) ? '"'.db_escape($value).'"' : $value;
       $query[] = "`{$key}` = {$value}";
     }
 
-    $this->db->doquery(($replace ? 'REPLACE' : 'INSERT') . ' INTO `{{payment}}` SET ' . implode(',', $query) . ';');
+    $this->db->doquery(($replace ? 'REPLACE' : 'INSERT').' INTO `{{payment}}` SET '.implode(',', $query).';');
 
     return $this->db_get_by_id($this->db->db_insert_id());
   }
 
 
   function payment_adjust_mm_new() {
-    if(!$this->payment_test) {
+    if (!$this->payment_test) {
       // Not a test payment. Adding DM to account
       $this->account = new Account($this->db);
       $this->account->db_get_by_id($this->payment_account_id);
       $result = $this->account->metamatter_change(RPG_PURCHASE, $this->payment_dark_matter_gained, $this->payment_comment);
-      if(!$result) {
+      if (!$result) {
         throw new Exception('Ошибка начисления ММ', SN_METAMATTER_ERROR_ADJUST);
       }
     }
@@ -796,25 +796,25 @@ 
   function payment_cancel(&$payment) {
     die('{НЕ РАБОТАЕТ! СООБЩИТЕ АДМИНИСТРАЦИИ!}');
 
-    if(!isset($payment['payment_status'])) {
+    if (!isset($payment['payment_status'])) {
       throw new exception(classLocale::$lang['pay_msg_request_payment_not_found'], SN_PAYMENT_REQUEST_ORDER_NOT_FOUND);
     }
 
-    if($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
-      $safe_comment = db_escape($payment['payment_comment'] = classLocale::$lang['pay_msg_request_payment_cancelled'] .' ' . $payment['payment_comment']);
+    if ($payment['payment_status'] == PAYMENT_STATUS_COMPLETE) {
+      $safe_comment = db_escape($payment['payment_comment'] = classLocale::$lang['pay_msg_request_payment_cancelled'].' '.$payment['payment_comment']);
 
-      if(!$payment['payment_test']) {
+      if (!$payment['payment_test']) {
         $result = $this->account->metamatter_change(RPG_PURCHASE_CANCEL, -$payment['payment_dark_matter_gained'], $payment['payment_comment']);
-        if(!$result) {
+        if (!$result) {
           throw new exception('Ошибка начисления ММ', SN_METAMATTER_ERROR_ADJUST);
         }
       }
       $payment['payment_status'] = PAYMENT_STATUS_CANCELED;
       db_payment_update($payment, $safe_comment);
       throw new exception(classLocale::$lang['pay_msg_request_payment_cancel_complete'], SN_PAYMENT_REQUEST_OK);
-    } elseif($payment['payment_status'] == PAYMENT_STATUS_CANCELED) {
+    } elseif ($payment['payment_status'] == PAYMENT_STATUS_CANCELED) {
       throw new exception(classLocale::$lang['pay_msg_request_payment_cancelled_already'], SN_PAYMENT_REQUEST_OK);
-    } elseif($payment['payment_status'] == PAYMENT_STATUS_NONE) {
+    } elseif ($payment['payment_status'] == PAYMENT_STATUS_NONE) {
       throw new exception(classLocale::$lang['pay_msg_request_payment_cancel_not_complete'], SN_PAYMENT_REQUEST_PAYMENT_NOT_COMPLETE);
     }
   }
@@ -828,8 +828,8 @@ 
 
   protected function db_complete_payment() {
     // TODO - поле payment_processed
-    if($this->payment_status == PAYMENT_STATUS_NONE) {
-      if(!defined('PAYMENT_EXPIRE_TIME') || PAYMENT_EXPIRE_TIME == 0 || empty($this->payment_date) || strtotime($this->payment_date) + PAYMENT_EXPIRE_TIME <= SN_TIME_NOW) {
+    if ($this->payment_status == PAYMENT_STATUS_NONE) {
+      if (!defined('PAYMENT_EXPIRE_TIME') || PAYMENT_EXPIRE_TIME == 0 || empty($this->payment_date) || strtotime($this->payment_date) + PAYMENT_EXPIRE_TIME <= SN_TIME_NOW) {
         $this->payment_adjust_mm_new();
         $this->payment_status = PAYMENT_STATUS_COMPLETE;
       } else {
@@ -876,7 +876,7 @@ 
   protected function db_assign_payment($payment = null) {
     $this->payment_reset();
 
-    if(is_array($payment) && isset($payment['payment_id'])) {
+    if (is_array($payment) && isset($payment['payment_id'])) {
       $this->payment_id = $payment['payment_id'];
       $this->payment_status = $payment['payment_status'];
       $this->payment_date = $payment['payment_date'];
@@ -918,11 +918,11 @@ 
   protected function generate_description() {
     // TODO - системная локализация
     $this->description_generated = array(
-      PAYMENT_DESCRIPTION_100 => substr("{$this->payment_dark_matter_gained} ММ аккаунт [{$this->account->account_name}] ID {$this->account->account_id} на " . SN_ROOT_VIRTUAL, 0, 100),
-      PAYMENT_DESCRIPTION_250 => substr("Оплата {$this->payment_dark_matter_gained} ММ для аккаунта [{$this->payment_user_name}] ID {$this->payment_user_id} на сервере " . SN_ROOT_VIRTUAL, 0, 250),
-      PAYMENT_DESCRIPTION_MAX => ($this->payment_test ? "ТЕСТОВЫЙ ПЛАТЕЖ! " : '') .
-        "Платеж от аккаунта '{$this->payment_account_name}' ID {$this->payment_account_id} игрока '{$this->payment_user_name}' ID {$this->payment_user_id} на сервере " . SN_ROOT_VIRTUAL .
-        " сумма {$this->payment_amount} {$this->payment_currency} за {$this->payment_dark_matter_paid} ММ (начислено {$this->payment_dark_matter_gained} ММ)" .
+      PAYMENT_DESCRIPTION_100 => substr("{$this->payment_dark_matter_gained} ММ аккаунт [{$this->account->account_name}] ID {$this->account->account_id} на ".SN_ROOT_VIRTUAL, 0, 100),
+      PAYMENT_DESCRIPTION_250 => substr("Оплата {$this->payment_dark_matter_gained} ММ для аккаунта [{$this->payment_user_name}] ID {$this->payment_user_id} на сервере ".SN_ROOT_VIRTUAL, 0, 250),
+      PAYMENT_DESCRIPTION_MAX => ($this->payment_test ? "ТЕСТОВЫЙ ПЛАТЕЖ! " : '').
+        "Платеж от аккаунта '{$this->payment_account_name}' ID {$this->payment_account_id} игрока '{$this->payment_user_name}' ID {$this->payment_user_id} на сервере ".SN_ROOT_VIRTUAL.
+        " сумма {$this->payment_amount} {$this->payment_currency} за {$this->payment_dark_matter_paid} ММ (начислено {$this->payment_dark_matter_gained} ММ)".
         " через '{$this->manifest['name']}' сумма {$this->payment_external_amount} {$this->payment_external_currency}",
     );
   }

includes/classes/db_mysql_v4.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     !mysql_select_db($settings['name'])
       ? classSupernova::$debug->error_fatal('DB error - cannot find DB on server', $this->mysql_error())
       : false;
-    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL ' . self::DB_MYSQL_TRANSACTION_REPEATABLE_READ . ';')
+    !$this->mysql_query('SET SESSION TRANSACTION ISOLATION LEVEL '.self::DB_MYSQL_TRANSACTION_REPEATABLE_READ.';')
       ? classSupernova::$debug->error_fatal('DB error - cannot set desired isolation level', $this->mysql_error())
       : false;
 

includes/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;