supernova-ws / SuperNova

includes/classes/PropertyHider.php

Spacing +15 added lines, -15 removed lines

@@ -76,13 +76,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 PropertyAccessException('Property [' . get_called_class() . '::' . $name . '] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
+      throw new PropertyAccessException('Property ['.get_called_class().'::'.$name.'] already was adjusted so no SET is possible until dbSave', ERR_ERROR);
     }
   }
 
@@ -131,7 +131,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());
   }
 
 
@@ -175,15 +175,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;
@@ -274,7 +274,7 @@ 
    * @return string
    */
   protected function adjustPropertyString($name, $diff) {
-    return (string)$this->$name . (string)$diff;
+    return (string) $this->$name.(string) $diff;
   }
 
   /**
@@ -284,8 +284,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;
   }
@@ -297,7 +297,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;
   }
 
   /**
@@ -307,7 +307,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;
   }
 
   /**
@@ -317,7 +317,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;
   }
 
   /**
@@ -327,7 +327,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;
@@ -350,10 +350,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);

includes/classes/Common/Types.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
       break;
 
       case TYPE_ARRAY:
-        $value = (array)$value;
+        $value = (array) $value;
       break;
 
       case TYPE_STRING:
@@ -38,7 +38,7 @@ 
       case TYPE_EMPTY:
         // No-type defaults to string
       default:
-        $value = (string)$value;
+        $value = (string) $value;
       break;
     }
 

includes/functions/qst_quest.php

Spacing +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
     $template->assign_vars($quest_templatized);
     if (!empty($quest_templatized['quest_rewards_list'])) {
       foreach ($quest_templatized['quest_rewards_list'] as $quest_reward) {
-        $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward);
+        $template->assign_block_vars(($block_name ? $block_name.'.' : '').'quest_rewards_list', $quest_reward);
       }
     }
   }
@@ -248,10 +248,10 @@ 
 
         $comment_reward = array();
         foreach ($reward_list as $unit_id => $unit_amount) {
-          $comment_reward[] = $unit_amount . ' ' . classLocale::$lang['tech'][$unit_id];
+          $comment_reward[] = $unit_amount.' '.classLocale::$lang['tech'][$unit_id];
           $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount;
         }
-        $comment .= " {$classLocale['qst_msg_your_reward']} " . implode(',', $comment_reward);
+        $comment .= " {$classLocale['qst_msg_your_reward']} ".implode(',', $comment_reward);
 
         DBStaticMessages::msg_send_simple_message($user['id'], 0, SN_TIME_NOW, MSG_TYPE_ADMIN, classLocale::$lang['msg_from_admin'], classLocale::$lang['qst_msg_complete_subject'], $comment);
 
@@ -289,7 +289,7 @@ 
 
         if (!empty($resourcesChange)) {
           $planet_id = $planet_id == 0 && isset($user_row['id_planet']) ? $user_row['id_planet'] : $planet_id;
-          if($planet_id) {
+          if ($planet_id) {
             // update planet
             DBStaticPlanet::db_planet_update_resources($resourcesChange, $planet_id);
           } else {

admin/adm_message_list.php

Spacing +12 added lines, -12 removed lines

@@ -12,9 +12,9 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
@@ -28,8 +28,8 @@ 
   ),
 );
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
-foreach(DBStaticMessages::$snMessageClassList as $key => $value) {
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
+foreach (DBStaticMessages::$snMessageClassList as $key => $value) {
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
     continue;
   }
 
@@ -41,21 +41,21 @@ 
 
 
 $deletedMessages = '';
-if($idMessageDelete = sys_get_param_id('msg_del')) {
+if ($idMessageDelete = sys_get_param_id('msg_del')) {
   DBStaticMessages::db_message_delete_by_id($idMessageDelete);
   $deletedMessages = $idMessageDelete;
-} elseif(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
+} elseif (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
   $message_delete = implode(', ', $message_delete);
   DBStaticMessages::db_message_list_delete_set($message_delete);
   $deletedMessages = $message_delete;
 }
 
-if($deletedMessages) {
+if ($deletedMessages) {
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted'], $deletedMessages)));
 }
 
 
-if(sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
+if (sys_get_param('str_delete_date') && checkdate($month = sys_get_param_id('delete_month'), $day = sys_get_param_id('delete_day'), $year = sys_get_param_id('delete_year'))) {
   $delete_date = "{$year}-{$month}-{$day}";
   DBStaticMessages::db_message_list_delete_by_date($delete_date, $int_type_selected);
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted_date'], $allowed_types[$int_type_selected]['TEXT'], $delete_date)));
@@ -67,13 +67,13 @@ 
 
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
 
-if(sys_get_param('page_prev') && $int_page_current > 1) {
+if (sys_get_param('page_prev') && $int_page_current > 1) {
   $int_page_current--;
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
   $int_page_current++;
 }
 
-for($i = 1; $i <= $page_max; $i++) {
+for ($i = 1; $i <= $page_max; $i++) {
   $template->assign_block_vars('page', array('NUMBER' => $i));
 }
 
@@ -81,7 +81,7 @@ 
 $StartRec = ($int_page_current - 1) * 25;
 
 $Messages = DBStaticMessages::db_message_list_admin_by_type($int_type_selected, $StartRec);
-while($row = db_fetch($Messages)) {
+while ($row = db_fetch($Messages)) {
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
   $row['TEXT'] = nl2br($row['TEXT']);

includes/classes/RequestInfo.php

Spacing +7 added lines, -7 removed lines

@@ -87,15 +87,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 = classSupernova::$db->doSelectFetch("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE");
-      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 = classSupernova::$db->doSelectFetch("SELECT `device_id` FROM {{security_device}} WHERE `device_cypher` = '{$cypher_safe}' LIMIT 1 FOR UPDATE");
@@ -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;
     }
@@ -166,7 +166,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;
     }
 

includes/classes/UBE/UBEDebris.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
    */
   public function debris_add_resource($resource_id, $resource_amount) {
     // В обломках может быть только металл или кристалл
-    if($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
+    if ($resource_id != RES_METAL && $resource_id != RES_CRYSTAL) {
       return;
     }
     $this->debris[$resource_id] += $resource_amount;
@@ -38,7 +38,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_wrecks(array $wreckage, $is_simulator) {
-    foreach($wreckage as $resource_id => $resource_amount) {
+    foreach ($wreckage as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_SHIP_WRECKS_TO_DEBRIS_AVG
@@ -54,7 +54,7 @@ 
    * @param bool  $is_simulator
    */
   public function add_cargo_drop(array $dropped_resources, $is_simulator) {
-    foreach($dropped_resources as $resource_id => $resource_amount) {
+    foreach ($dropped_resources as $resource_id => $resource_amount) {
       $this->debris_add_resource($resource_id, floor($resource_amount *
         ($is_simulator
           ? UBE_CARGO_DROPPED_TO_DEBRIS_AVG
@@ -93,7 +93,7 @@ 
    * @param $moon_debris_left_part
    */
   public function debris_adjust_proportional($moon_debris_left_part) {
-    foreach($this->debris as $resource_id => &$resource_amount) {
+    foreach ($this->debris as $resource_id => &$resource_amount) {
       $resource_amount = floor($resource_amount * $moon_debris_left_part);
     }
   }
@@ -114,9 +114,9 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_debris_metal'          => (float)$this->debris_get_resource(RES_METAL),
-      'ube_report_debris_crystal'        => (float)$this->debris_get_resource(RES_CRYSTAL),
-      'ube_report_debris_total_in_metal' => (float)$this->debris_in_metal(),
+      'ube_report_debris_metal'          => (float) $this->debris_get_resource(RES_METAL),
+      'ube_report_debris_crystal'        => (float) $this->debris_get_resource(RES_CRYSTAL),
+      'ube_report_debris_total_in_metal' => (float) $this->debris_in_metal(),
     );
   }
 

includes/classes/UBE/UBEMoonCalculator.php

Spacing +21 added lines, -21 removed lines

@@ -70,7 +70,7 @@ 
 
     $debris_for_moon = $debris->debris_total();
 
-    if(!$debris_for_moon) {
+    if (!$debris_for_moon) {
       return;
     }
 
@@ -78,12 +78,12 @@ 
     $moon_chance = min($debris_for_moon / UBE_MOON_DEBRIS_PER_PERCENT, UBE_MOON_PERCENT_MAX); // TODO Configure
     $moon_chance = $moon_chance >= UBE_MOON_PERCENT_MIN ? $moon_chance : 0;
     $this->create_chance = $moon_chance;
-    if($moon_chance) {
-      if($is_simulator || mt_rand(1, 100) <= $moon_chance) {
+    if ($moon_chance) {
+      if ($is_simulator || mt_rand(1, 100) <= $moon_chance) {
         $this->status = UBE_MOON_CREATE_SUCCESS;
         $this->moon_diameter = round($is_simulator ? $moon_chance * 150 + 1999 : mt_rand($moon_chance * 100 + 1000, $moon_chance * 200 + 2999));
 
-        if($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
+        if ($debris_for_moon <= UBE_MOON_DEBRIS_MAX_SPENT) {
           $debris->_reset();
         } else {
           $moon_debris_left_percent = ($debris_for_moon - UBE_MOON_DEBRIS_MAX_SPENT) / $debris_for_moon;
@@ -102,7 +102,7 @@ 
    */
   protected function moon_destroy_try($reapers) {
     // TODO: $is_simulator
-    if($reapers <= 0) {
+    if ($reapers <= 0) {
       return;
     }
 
@@ -120,8 +120,8 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function calculate_moon(UBE $ube) {
-    if(UBE_MOON_EXISTS == $this->status) {
-      if($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
+    if (UBE_MOON_EXISTS == $this->status) {
+      if ($ube->mission_type_id == MT_DESTROY && $ube->combat_result == UBE_COMBAT_RESULT_WIN) {
         $reapers = $ube->fleet_list->ube_calculate_attack_reapers();
         $this->moon_destroy_try($reapers);
       }
@@ -135,12 +135,12 @@ 
    */
   public function report_generate_array() {
     return array(
-      'ube_report_moon'                    => (int)$this->status,
-      'ube_report_moon_chance'             => (int)$this->create_chance,
-      'ube_report_moon_size'               => (float)$this->moon_diameter,
-      'ube_report_moon_reapers'            => (int)$this->reapers_status,
-      'ube_report_moon_destroy_chance'     => (int)$this->destroy_chance,
-      'ube_report_moon_reapers_die_chance' => (int)$this->reaper_die_chance,
+      'ube_report_moon'                    => (int) $this->status,
+      'ube_report_moon_chance'             => (int) $this->create_chance,
+      'ube_report_moon_size'               => (float) $this->moon_diameter,
+      'ube_report_moon_reapers'            => (int) $this->reapers_status,
+      'ube_report_moon_destroy_chance'     => (int) $this->destroy_chance,
+      'ube_report_moon_reapers_die_chance' => (int) $this->reaper_die_chance,
     );
   }
 
@@ -171,11 +171,11 @@ 
    * @param $planet_id
    */
   public function db_apply_result($planet_info, $destination_user_id) {
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $moon_row = uni_create_moon($planet_info[PLANET_GALAXY], $planet_info[PLANET_SYSTEM], $planet_info[PLANET_PLANET], $destination_user_id, $this->moon_diameter, '', false);
       $this->moon_name = $moon_row['name'];
       unset($moon_row);
-    } elseif($this->status == UBE_MOON_DESTROY_SUCCESS) {
+    } elseif ($this->status == UBE_MOON_DESTROY_SUCCESS) {
       DBStaticPlanet::db_planet_delete_by_id($planet_info[PLANET_ID]);
     }
   }
@@ -184,18 +184,18 @@ 
     $classLocale = classLocale::$lang;
 
     $text_defender = '';
-    if($this->status == UBE_MOON_CREATE_SUCCESS) {
+    if ($this->status == UBE_MOON_CREATE_SUCCESS) {
       $text_defender .= "{$classLocale['ube_report_moon_created']} {$this->moon_diameter} {$classLocale['sys_kilometers_short']}<br /><br />";
-    } elseif($this->status == UBE_MOON_CREATE_FAILED) {
+    } elseif ($this->status == UBE_MOON_CREATE_FAILED) {
       $text_defender .= "{$classLocale['ube_report_moon_chance']} {$this->create_chance}%<br /><br />";
     }
 
-    if($ube->mission_type_id == MT_DESTROY) {
-      if($this->reapers_status == UBE_MOON_REAPERS_NONE) {
+    if ($ube->mission_type_id == MT_DESTROY) {
+      if ($this->reapers_status == UBE_MOON_REAPERS_NONE) {
         $text_defender .= classLocale::$lang['ube_report_moon_reapers_none'];
       } else {
         $text_defender .= "{$classLocale['ube_report_moon_reapers_wave']}. {$classLocale['ube_report_moon_reapers_chance']} {$this->destroy_chance}%. ";
-        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure'] . "<br />";
+        $text_defender .= classLocale::$lang[$this->status == UBE_MOON_DESTROY_SUCCESS ? 'ube_report_moon_reapers_success' : 'ube_report_moon_reapers_failure']."<br />";
 
         $text_defender .= "{$classLocale['ube_report_moon_reapers_outcome']} {$this->reaper_die_chance}%. ";
         $text_defender .= classLocale::$lang[$this->reapers_status == UBE_MOON_REAPERS_RETURNED ? 'ube_report_moon_reapers_survive' : 'ube_report_moon_reapers_died'];
@@ -220,7 +220,7 @@ 
    * @version 2016-02-25 23:42:45 41a4.68
    */
   public function ubeInitLoadStatis($destination_planet) {
-    if($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
+    if ($destination_planet['planet_type'] == PT_MOON || is_array($moon = DBStaticPlanet::db_planet_by_parent($destination_planet['id'], true, '`id`'))) {
       $this->status = UBE_MOON_EXISTS;
       $this->moon_diameter = !empty($moon['planet_type']) && $moon['planet_type'] == PT_MOON ? $moon['diameter'] : $destination_planet['diameter'];
       $this->reapers_status = UBE_MOON_REAPERS_NONE;

includes/classes/UBE/UBEReport.php

Spacing +32 added lines, -32 removed lines

@@ -13,14 +13,14 @@ 
    */
   public function sn_ube_report_save($ube) {
     // Если уже есть ИД репорта - значит репорт был взят из таблицы. С таким мы не работаем
-    if($ube->get_cypher()) {
+    if ($ube->get_cypher()) {
       return false;
     }
 
     // Генерируем уникальный секретный ключ и проверяем наличие в базе
     do {
       $ube->report_cypher = sys_random_string(32);
-    } while(classSupernova::$db->doSelectFetch("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
+    } while (classSupernova::$db->doSelectFetch("SELECT ube_report_cypher FROM {{ube_report}} WHERE ube_report_cypher = '{$ube->report_cypher}' LIMIT 1 FOR UPDATE"));
 
     // Инициализация таблицы для пакетной вставки информации
     $sql_perform = array(
@@ -106,21 +106,21 @@ 
 
     // Сохраняем общую информацию о бое
     classSupernova::$db->doInsertSet(TABLE_UBE_REPORT, array(
-        'ube_report_cypher'             => (string)$ube->report_cypher,
-        'ube_report_time_combat'        => (string)date(FMT_DATE_TIME_SQL, $ube->combat_timestamp),
-        'ube_report_time_spent'         => (float)$ube->time_spent,
-        'ube_report_combat_admin'       => (int)$ube->is_admin_in_combat,
-        'ube_report_mission_type'       => (int)$ube->mission_type_id,
-        'ube_report_combat_result'      => (int)$ube->combat_result,
-        'ube_report_combat_sfr'         => (int)$ube->is_small_fleet_recce,
-        'ube_report_planet_id'          => (int)$ube->ube_planet_info[PLANET_ID],
-        'ube_report_planet_name'        => (string)$ube->ube_planet_info[PLANET_NAME],
-        'ube_report_planet_size'        => (int)$ube->ube_planet_info[PLANET_SIZE],
-        'ube_report_planet_galaxy'      => (int)$ube->ube_planet_info[PLANET_GALAXY],
-        'ube_report_planet_system'      => (int)$ube->ube_planet_info[PLANET_SYSTEM],
-        'ube_report_planet_planet'      => (int)$ube->ube_planet_info[PLANET_PLANET],
-        'ube_report_planet_planet_type' => (int)$ube->ube_planet_info[PLANET_TYPE],
-        'ube_report_capture_result'     => (int)$ube->capture_result,
+        'ube_report_cypher'             => (string) $ube->report_cypher,
+        'ube_report_time_combat'        => (string) date(FMT_DATE_TIME_SQL, $ube->combat_timestamp),
+        'ube_report_time_spent'         => (float) $ube->time_spent,
+        'ube_report_combat_admin'       => (int) $ube->is_admin_in_combat,
+        'ube_report_mission_type'       => (int) $ube->mission_type_id,
+        'ube_report_combat_result'      => (int) $ube->combat_result,
+        'ube_report_combat_sfr'         => (int) $ube->is_small_fleet_recce,
+        'ube_report_planet_id'          => (int) $ube->ube_planet_info[PLANET_ID],
+        'ube_report_planet_name'        => (string) $ube->ube_planet_info[PLANET_NAME],
+        'ube_report_planet_size'        => (int) $ube->ube_planet_info[PLANET_SIZE],
+        'ube_report_planet_galaxy'      => (int) $ube->ube_planet_info[PLANET_GALAXY],
+        'ube_report_planet_system'      => (int) $ube->ube_planet_info[PLANET_SYSTEM],
+        'ube_report_planet_planet'      => (int) $ube->ube_planet_info[PLANET_PLANET],
+        'ube_report_planet_planet_type' => (int) $ube->ube_planet_info[PLANET_TYPE],
+        'ube_report_capture_result'     => (int) $ube->capture_result,
       )
       + $ube->debris->report_generate_array()
       + $ube->moon_calculator->report_generate_array()
@@ -129,22 +129,22 @@ 
 
     // Сохраняем общую информацию по игрокам
     $player_sides = $ube->players->get_player_sides();
-    foreach($player_sides as $player_id => $player_side) {
+    foreach ($player_sides as $player_id => $player_side) {
       $sql_perform['ube_report_player'][] = array(
         $ube_report_id,
         $player_id,
 
-        "'" . db_escape($ube->players[$player_id]->name) . "'",
+        "'".db_escape($ube->players[$player_id]->name)."'",
         $ube->players[$player_id]->getSide() == UBE_PLAYER_IS_ATTACKER ? 1 : 0,
 
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK),
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD),
-        (float)$ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ATTACK),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_SHIELD),
+        (float) $ube->players[$player_id]->player_bonus->calcBonus(P_ARMOR),
       );
     }
 
     // Всякая информация по флотам
-    foreach($ube->fleet_list->_container as $fleet_id => $UBEFleet) {
+    foreach ($ube->fleet_list->_container as $fleet_id => $UBEFleet) {
       // Сохраняем общую информацию по флотам
       $sql_perform['ube_report_fleet'][] = $UBEFleet->sql_generate_array($ube_report_id);
 
@@ -159,12 +159,12 @@ 
     $ube->rounds->sql_generate_unit_array($sql_perform['ube_report_unit'], $ube_report_id, $ube->fleet_list);
 
     // Пакетная вставка данных
-    foreach($sql_perform as $table_name => $table_data) {
-      if(count($table_data) < 2) {
+    foreach ($sql_perform as $table_name => $table_data) {
+      if (count($table_data) < 2) {
         continue;
       }
-      foreach($table_data as &$record_data) {
-        $record_data = '(' . implode(',', $record_data) . ')';
+      foreach ($table_data as &$record_data) {
+        $record_data = '('.implode(',', $record_data).')';
       }
       $fields = $table_data[0];
       unset($table_data[0]);
@@ -186,7 +186,7 @@ 
     $report_cypher = db_escape($report_cypher);
 
     $report_row = classSupernova::$db->doSelectFetch("SELECT * FROM {{ube_report}} WHERE ube_report_cypher = '{$report_cypher}' LIMIT 1");
-    if(!$report_row) {
+    if (!$report_row) {
       return UBE_REPORT_NOT_FOUND;
     }
 
@@ -202,7 +202,7 @@ 
    * @param     $template_result
    */
   public function sn_ube_report_generate(UBE $ube, &$template_result) {
-    if(!is_object($ube)) {
+    if (!is_object($ube)) {
       return;
     }
 
@@ -217,15 +217,15 @@ 
 
     // Координаты, тип и название планеты - если есть
 //R  $planet_owner_id = $combat_data[UBE_FLEETS][0][UBE_OWNER];
-    if(isset($ube->ube_planet_info)) {
+    if (isset($ube->ube_planet_info)) {
       $template_result += $ube->ube_planet_info;
       $template_result[PLANET_NAME] = str_replace(' ', '&nbsp;', htmlentities($template_result[PLANET_NAME], ENT_COMPAT, 'UTF-8'));
     }
 
     // Обломки
     $debris = array();
-    foreach(array(RES_METAL, RES_CRYSTAL) as $resource_id) {
-      if($resource_amount = $ube->debris->debris_get_resource($resource_id)) {
+    foreach (array(RES_METAL, RES_CRYSTAL) as $resource_id) {
+      if ($resource_amount = $ube->debris->debris_get_resource($resource_id)) {
         $debris[] = array(
           'NAME'   => classLocale::$lang['tech'][$resource_id],
           'AMOUNT' => pretty_number($resource_amount),

announce.php

Spacing +15 added lines, -15 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 $allow_anonymous = true;
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 nws_mark_read($user);
 $template = gettemplate('announce', true);
@@ -23,42 +23,42 @@ 
 $mode = sys_get_param_str('mode');
 
 $announce = array();
-if($user['authlevel'] >= 3) {
-  if(!empty($text)) {
+if ($user['authlevel'] >= 3) {
+  if (!empty($text)) {
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
 
-    if($mode == 'edit') {
+    if ($mode == 'edit') {
       DBStaticNews::db_news_update_set($announce_time, $text, $detail_url, $announce_id);
       DBStaticSurvey::db_survey_delete_by_id($announce_id);
     } else {
       DBStaticNews::db_news_insert_set($announce_time, $text_unsafe, $detail_url_unsafe, $user['id'], $user['username']);
       $announce_id = classSupernova::$db->db_insert_id();
     }
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
       $survey_answers = explode("\r\n", $survey_answers);
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
       $survey_question_unsafe = sys_get_param_str_unsafe('survey_question');
       DBStaticSurvey::db_survey_insert($announce_id, $survey_question_unsafe, $survey_until);
       $survey_id = classSupernova::$db->db_insert_id();
-      foreach($survey_answers as $survey_answer) {
+      foreach ($survey_answers as $survey_answer) {
         $survey_answer_unsafe = trim($survey_answer);
-        if(empty($survey_answer_unsafe)) {
+        if (empty($survey_answer_unsafe)) {
           continue;
         }
         DBStaticSurveyAnswer::db_survey_answer_insert($survey_id, $survey_answer_unsafe);
       }
     }
 
-    if($announce_time <= SN_TIME_NOW) {
-      if($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
+    if ($announce_time <= SN_TIME_NOW) {
+      if ($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
         classSupernova::$config->db_saveItem('var_news_last', $announce_time);
       }
 
-      if(sys_get_param_int('news_mass_mail')) {
+      if (sys_get_param_int('news_mass_mail')) {
         $lang_news_more = classLocale::$lang['news_more'];
-        $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
+        $text = sys_get_param('text').($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
         DBStaticMessages::msgSendFromAdmin('*', classLocale::$lang['news_title'], $text);
       }
     }
@@ -68,7 +68,7 @@ 
   }
 
   $survey_answers = '';
-  switch($mode) {
+  switch ($mode) {
     case 'del':
       DBStaticNews::db_news_delete_by_id($announce_id);
       $mode = '';
@@ -79,9 +79,9 @@ 
       $template->assign_var('ID', $announce_id);
     case 'copy':
       $announce = DBStaticNews::db_news_with_survey_select_by_id($announce_id);
-      if($announce['survey_id']) {
+      if ($announce['survey_id']) {
         $query = DBStaticSurveyAnswer::db_survey_answer_text_select_by_news($announce);
-        while($row = db_fetch($query)) {
+        while ($row = db_fetch($query)) {
           $survey_answers[] = $row['survey_answer_text'];
         }
         $survey_answers = implode("\r\n", $survey_answers);
@@ -89,7 +89,7 @@ 
     break;
   }
 } else {
-  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= ' . SN_TIME_NOW;
+  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= '.SN_TIME_NOW;
 }
 
 nws_render($template, $annQuery, 20);