supernova-ws / SuperNova

includes/classes/DBStaticMessages.php

Doc Comments +6 added lines

@@ -467,6 +467,12 @@
   {$StartRec}, 25;");
   }
 
+  /**
+   * @param integer $message_type
+   * @param string $from_unsafe
+   * @param string $subject_unsafe
+   * @param string $text_unsafe
+   */
   public static function db_message_insert_all($message_type, $from_unsafe, $subject_unsafe, $text_unsafe) {
     $message_type_safe = intval($message_type);
     $from_safe = db_escape($from_unsafe);

Spacing +9 added lines, -9 removed lines

@@ -113,7 +113,7 @@ 
         sys_user_options_unpack($owner_row);
 
         if ($force || !$message_class['switchable'] || $owner_row["opt_{$message_class_name}"]) {
-          $insert_values[] = "('" . idval($owner) . "', '{$sender}', '{$timestamp}', '{$message_type}', '" . db_escape($from_unsafe) . "', '" . db_escape($subject_unsafe) . "', '" . db_escape($text_unsafe) . "')";
+          $insert_values[] = "('".idval($owner)."', '{$sender}', '{$timestamp}', '{$message_type}', '".db_escape($from_unsafe)."', '".db_escape($subject_unsafe)."', '".db_escape($text_unsafe)."')";
         }
 
         // TODO - allow sending HTML email only from admin
@@ -153,7 +153,7 @@ 
         array(),
         array(
           // TODO DANGER
-          '`id` IN (' . implode(',', $owners) . ')',
+          '`id` IN ('.implode(',', $owners).')',
         )
       );
     }
@@ -172,7 +172,7 @@ 
     $sendList = array();
     $list = '';
     $query = DBStaticUser::db_user_list(
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
       false, 'id, username');
     foreach ($query as $u) {
       $sendList[] = $u['id'];
@@ -261,7 +261,7 @@ 
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
       $re++;
     }
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
 
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
 
@@ -437,7 +437,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT * FROM {{messages}}
         WHERE
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
           OR
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -481,7 +481,7 @@ 
 FROM
   {{messages}} AS m
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
       "ORDER BY
   `message_id` DESC
 LIMIT
@@ -494,7 +494,7 @@ 
     $subject_safe = db_escape($subject_unsafe);
     $text_safe = db_escape($text_unsafe);
 
-    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
+    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type_safe}, '{$from_safe}', '{$subject_safe}', '{$text_safe}' FROM {{users}}");
   }
 
@@ -504,7 +504,7 @@ 
    * @return array|bool|mysqli_result|null
    */
   public static function db_message_count_by_type($int_type_selected) {
-    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
+    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
 
     return $page_max;
   }
@@ -539,7 +539,7 @@ 
    */
   public static function db_message_list_delete_by_date($delete_date, $int_type_selected) {
     $where = array();
-    if($int_type_selected >= 0) {
+    if ($int_type_selected >= 0) {
       $where['message_type'] = $int_type_selected;
     }
     classSupernova::$db->doDeleteDanger(

includes/db/db_queries.php

Doc Comments +15 added lines, -10 removed lines

@@ -169,6 +169,11 @@ 
  */
 // OK v4
 // TODO - вынести в отдельный класс
+/**
+ * @param string $db_id_field_name
+ * @param string $db_table_name
+ * @param string $db_value_field_name
+ */
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
   $current_value_safe = db_escape($current_value_unsafe);
   $value_id = classSupernova::$db->doSelectFetch("SELECT `{$db_id_field_name}` FROM {{{$db_table_name}}} WHERE `{$db_value_field_name}` = '{$current_value_safe}' LIMIT 1 FOR UPDATE");
@@ -487,8 +492,8 @@ 
 
 
 /**
- * @param $user_id
- * @param $change_type
+ * @param integer $user_id
+ * @param integer $change_type
  * @param $dark_matter
  * @param $comment_unsafe
  * @param $rowUserNameUnsafe
@@ -509,7 +514,7 @@ 
 /**
  * @param $user_id_safe
  *
- * @return array|bool|mysqli_result|null
+ * @return integer
  */
 function db_referral_get_by_id($user_id_safe) {
   $old_referral = classSupernova::$db->doSelectFetch("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;");
@@ -540,9 +545,9 @@ 
 
 // Quests ***********************************************************************************************************
 /**
- * @param $query_add_select
+ * @param string $query_add_select
  * @param $query_add_from
- * @param $query_add_where
+ * @param string $query_add_where
  *
  * @return array|bool|mysqli_result|null
  */
@@ -586,11 +591,11 @@ 
 }
 
 /**
- * @param $quest_name_unsafe
- * @param $quest_type
- * @param $quest_description_unsafe
+ * @param string $quest_name_unsafe
+ * @param integer $quest_type
+ * @param string $quest_description_unsafe
  * @param $quest_conditions
- * @param $quest_rewards
+ * @param string $quest_rewards
  * @param $quest_id
  */
 function db_quest_update($quest_name_unsafe, $quest_type, $quest_description_unsafe, $quest_conditions, $quest_rewards, $quest_id) {
@@ -674,7 +679,7 @@ 
 
 /**
  * @param $payment_id
- * @param $payment_status
+ * @param integer $payment_status
  * @param $comment_unsafe
  */
 function db_payment_update($payment_id, $payment_status, $comment_unsafe) {

Spacing +20 added lines, -20 removed lines

@@ -4,11 +4,11 @@ 
 
 function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
   return classSupernova::$db->doSelect(
-    "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
     " FROM {{planets}} AS p
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
 }
 
 function db_planet_list_search($searchtext) {
@@ -106,7 +106,7 @@ 
     ORDER BY
       sp.`{$Rank}_rank`, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
       $query_str =
         "SELECT
@@ -119,7 +119,7 @@ 
     ORDER BY
       subject.{$Rank} DESC, subject.{$source['id']}
     LIMIT
-      " . $start . ",100;";
+      ".$start.",100;";
     }
   } else {
     // TODO
@@ -136,7 +136,7 @@ 
   ORDER BY
     sp.`{$Rank}_rank`, subject.id
   LIMIT
-    " . $start . ",100;";
+    ".$start.",100;";
   }
 
   return classSupernova::$db->doSelect($query_str);
@@ -144,7 +144,7 @@ 
 
 
 function db_stat_list_update_ally_stats() {
-  return ;
+  return;
 }
 
 function db_stat_list_delete_ally_player() {
@@ -394,9 +394,9 @@ 
  */
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
   $extra_conditions =
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
   $query = classSupernova::$db->doSelect("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
 
@@ -425,7 +425,7 @@ 
 // Log Online *************************************************************************************************************
 function db_log_online_insert() {
   classSupernova::$db->doInsertSet(TABLE_LOG_USERS_ONLINE, array(
-    'online_count' => (int)classSupernova::$config->var_online_user_count,
+    'online_count' => (int) classSupernova::$config->var_online_user_count,
   ), DB_INSERT_IGNORE);
 }
 
@@ -450,9 +450,9 @@ 
 function db_log_delete_update_and_stat_calc() {
   classSupernova::$db->doDeleteSimple(
     'DELETE FROM `{{logs}}` WHERE `log_code` IN ('
-    . LOG_INFO_DB_CHANGE . ', '
-    . LOG_INFO_MAINTENANCE . ', '
-    . LOG_INFO_STAT_PROCESS .
+    . LOG_INFO_DB_CHANGE.', '
+    . LOG_INFO_MAINTENANCE.', '
+    . LOG_INFO_STAT_PROCESS.
     ')'
   );
 }
@@ -521,10 +521,10 @@ 
 function db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment_unsafe, $rowUserNameUnsafe, $page_url_unsafe) {
   return classSupernova::$db->doInsertSet(TABLE_LOG_DARK_MATTER, array(
     'log_dark_matter_username' => $rowUserNameUnsafe,
-    'log_dark_matter_reason'   => (int)$change_type,
-    'log_dark_matter_amount'   => (float)$dark_matter,
-    'log_dark_matter_comment'  => (string)$comment_unsafe,
-    'log_dark_matter_page'     => (string)$page_url_unsafe,
+    'log_dark_matter_reason'   => (int) $change_type,
+    'log_dark_matter_amount'   => (float) $dark_matter,
+    'log_dark_matter_comment'  => (string) $comment_unsafe,
+    'log_dark_matter_page'     => (string) $page_url_unsafe,
     'log_dark_matter_sender'   => $user_id,
   ));
 }
@@ -693,9 +693,9 @@ 
 function db_ube_report_get_best_battles() {
   $query = classSupernova::$db->doSelect("SELECT *
       FROM `{{ube_report}}`
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
 
   return $query;
 }

includes/alliance/ali_internal_admin_mail.inc

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_can_send_mails) {
+if (!$user_can_send_mails) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['Send_circular_mail']);
 }
 
 $POST_text = sys_get_param_str('text');
 $internalAliSendTextUnsafe = sys_get_param_str_unsafe('text');
-if($internalAliSendTextUnsafe) {
-  message(classLocale::$lang['members_who_recived_message'] . DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
+if ($internalAliSendTextUnsafe) {
+  message(classLocale::$lang['members_who_recived_message'].DBStaticMessages::msg_ali_send($internalAliSendTextUnsafe, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
 }
 
-$r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
-if($ranks) {
-  foreach($ranks as $id => $array) {
-    $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
+$r_list = "<option value=\"-1\">".classLocale::$lang['All_players']."</option>";
+if ($ranks) {
+  foreach ($ranks as $id => $array) {
+    $r_list .= "<option value=\"".$id."\">".$array['name']."</option>";
   }
 }
 

includes/classes/DBRow.php

Spacing +10 added lines, -10 removed lines

@@ -86,7 +86,7 @@ 
    * @param db_mysql|null $db
    */
   public static function setDb($db = null) {
-    if(empty($db) || !($db instanceof db_mysql)) {
+    if (empty($db) || !($db instanceof db_mysql)) {
       $db = null;
     }
     static::$db = !empty($db) || !class_exists('classSupernova', false) ? $db : classSupernova::$db;
@@ -149,7 +149,7 @@ 
   public function dbLoad($dbId, $lockSkip = false) {
     $dbId = idval($dbId);
     if ($dbId <= 0) {
-      classSupernova::$debug->error(get_called_class() . '::' . __METHOD__ . ' $dbId not positive = ' . $dbId);
+      classSupernova::$debug->error(get_called_class().'::'.__METHOD__.' $dbId not positive = '.$dbId);
 
       return;
     }
@@ -161,7 +161,7 @@ 
       $this->dbGetLockById($this->_dbId);
     }
 
-    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{" . static::$_table . "}}` WHERE `" . static::$_dbIdFieldName . "` = " . $this->_dbId . " LIMIT 1 FOR UPDATE;");
+    $db_row = classSupernova::$db->doSelectFetch("SELECT * FROM `{{".static::$_table."}}` WHERE `".static::$_dbIdFieldName."` = ".$this->_dbId." LIMIT 1 FOR UPDATE;");
     if (empty($db_row)) {
       return;
     }
@@ -193,7 +193,7 @@ 
     if ($this->isNew()) {
       // No DB_ID - new unit
       if ($this->isEmpty()) {
-        classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - object is empty on ' . get_called_class() . '::dbSave');
+        classSupernova::$debug->error(__FILE__.':'.__LINE__.' - object is empty on '.get_called_class().'::dbSave');
       }
       $this->dbInsert();
     } else {
@@ -202,7 +202,7 @@ 
         $this->dbDelete();
       } else {
         if (!sn_db_transaction_check(false)) {
-          classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - transaction should always be started on ' . get_called_class() . '::dbUpdate');
+          classSupernova::$debug->error(__FILE__.':'.__LINE__.' - transaction should always be started on '.get_called_class().'::dbUpdate');
         }
         $this->dbUpdate();
       }
@@ -230,13 +230,13 @@ 
   // TODO - protected
   public function dbInsert() {
     if (!$this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - record db_id is not empty on ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - record db_id is not empty on '.get_called_class().'::dbInsert');
     }
 
     $fieldSet = $this->dbMakeFieldSet(false);
 
     if (!static::$db->doInsertSet(static::$_table, $fieldSet)) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - error saving record ' . get_called_class() . '::dbInsert');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - error saving record '.get_called_class().'::dbInsert');
     }
     $this->_dbId = static::$db->db_insert_id();
 
@@ -250,7 +250,7 @@ 
   public function dbUpdate() {
     // TODO - Update
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbUpdate');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbUpdate');
     }
     $this->db_field_update($this->dbMakeFieldUpdate());
   }
@@ -261,7 +261,7 @@ 
   // TODO - protected
   public function dbDelete() {
     if ($this->isNew()) {
-      classSupernova::$debug->error(__FILE__ . ':' . __LINE__ . ' - unit db_id is empty on dbDelete');
+      classSupernova::$debug->error(__FILE__.':'.__LINE__.' - unit db_id is empty on dbDelete');
     }
     classSupernova::$gc->db->doDeleteRowWhere(static::$_table, array(static::$_dbIdFieldName => $this->_dbId));
     $this->_dbId = 0;
@@ -447,7 +447,7 @@ 
       }
     }
 
-    if(empty($set)) {
+    if (empty($set)) {
       $theResult = true;
     } else {
       $theResult = classSupernova::$db->doUpdateRowAdjust(

includes/classes/DBStaticUnit.php

Doc Comments +3 added lines

@@ -118,6 +118,9 @@
     return classSupernova::$gc->cacheOperator->db_ins_record(LOC_UNIT, $set);
   }
 
+  /**
+   * @param integer $unit_location_type
+   */
   public static function db_unit_list_delete($user_id = 0, $unit_location_type, $unit_location_id = 0, $unit_snid = 0) {
     $where = array('unit_location_type' => $unit_location_type);
     ($unit_location_id = idval($unit_location_id)) ? $where['unit_location_id'] = $unit_location_id : false;

Spacing +15 added lines, -15 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     if (classSupernova::$gc->snCache->isUnitLocatorNotSet($location_type, $location_id)) {
-      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions());
+      $got_data = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions());
       if (!empty($got_data) && is_array($got_data)) {
         foreach ($got_data as $unit_id => $unit_data) {
           classSupernova::$gc->snCache->setUnitLocatorByLocationAndIDs($location_type, $location_id, $unit_data);
@@ -59,9 +59,9 @@ 
 
   public static function db_unit_count_by_user_and_type_and_snid($user_id, $unit_type = 0, $unit_snid = 0) {
     $query = classSupernova::$db->doSelect(
-      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} " .
-      ($unit_type ? "AND `unit_type` = {$unit_type} " : '') .
-      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '') .
+      "SELECT unit_snid, sum(unit_level) as `qty`  FROM {{unit}} WHERE `unit_player_id` = {$user_id} ".
+      ($unit_type ? "AND `unit_type` = {$unit_type} " : '').
+      ($unit_snid ? "AND `unit_snid` = {$unit_snid} " : '').
       'GROUP BY `unit_snid`'
     );
     $result = array();
@@ -81,8 +81,8 @@ 
     WHERE
       f.fleet_owner = {$user_id} AND
       (f.fleet_start_planet_id = {$location_id} OR f.fleet_end_planet_id = {$location_id})
-      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = " . LOC_FLEET . " AND " . self::db_unit_time_restrictions() .
-      " LIMIT 1" .
+      AND u.unit_snid = {$unit_snid} AND u.`unit_location_type` = ".LOC_FLEET." AND ".self::db_unit_time_restrictions().
+      " LIMIT 1".
       ($for_update ? ' FOR UPDATE' : ''));
   }
 
@@ -90,7 +90,7 @@ 
   public static function db_unit_list_laboratories($user_id) {
     return classSupernova::$db->doSelect("SELECT DISTINCT unit_location_id AS `id`
     FROM {{unit}}
-    WHERE unit_player_id = {$user_id} AND unit_location_type = " . LOC_PLANET . " AND unit_level > 0 AND unit_snid IN (" . STRUC_LABORATORY . ", " . STRUC_LABORATORY_NANO . ");");
+    WHERE unit_player_id = {$user_id} AND unit_location_type = ".LOC_PLANET." AND unit_level > 0 AND unit_snid IN (".STRUC_LABORATORY.", ".STRUC_LABORATORY_NANO.");");
   }
 
   /**
@@ -136,7 +136,7 @@ 
     return classSupernova::$db->doSelect(
       "SELECT unit_player_id, unit_type, unit_snid, unit_level, count(*) AS unit_amount
     FROM `{{unit}}`
-    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions() .
+    WHERE unit_level > 0 AND " . self::db_unit_time_restrictions().
       " GROUP BY unit_player_id, unit_type, unit_snid, unit_level"
     );
   }
@@ -164,7 +164,7 @@ 
       ),
       array(
         'unit_time_finish IS NOT NULL',
-        "unit_time_finish < FROM_UNIXTIME(" . SN_TIME_NOW . ")",
+        "unit_time_finish < FROM_UNIXTIME(".SN_TIME_NOW.")",
       )
     );
   }
@@ -203,7 +203,7 @@ 
 
     $temp = DBStaticUnit::db_get_unit_by_location($user['id'], $unit_location, $location_id, $unit_id, true, 'unit_id');
     if (!empty($temp['unit_id'])) {
-      $result = (bool)classSupernova::$gc->cacheOperator->db_upd_record_by_id(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_upd_record_by_id(
         LOC_UNIT,
         $temp['unit_id'],
         array(),
@@ -214,15 +214,15 @@ 
     } else {
       $locationIdRendered = $unit_location == LOC_USER ? $user['id'] : $planet_id;
       $unitType = get_unit_param($unit_id, P_UNIT_TYPE);
-      $result = (bool)classSupernova::$gc->cacheOperator->db_ins_record(
+      $result = (bool) classSupernova::$gc->cacheOperator->db_ins_record(
         LOC_UNIT,
         array(
           'unit_player_id'     => $user['id'],
-          'unit_location_type' => (int)$unit_location,
+          'unit_location_type' => (int) $unit_location,
           'unit_location_id'   => $locationIdRendered,
-          'unit_type'          => (int)$unitType,
-          'unit_snid'          => (int)$unit_id,
-          'unit_level'         => (float)$unit_value,
+          'unit_type'          => (int) $unitType,
+          'unit_snid'          => (int) $unit_id,
+          'unit_level'         => (float) $unit_value,
         )
       );
     }

includes/includes/flt_page4.inc

Spacing +19 added lines, -19 removed lines

@@ -2,28 +2,28 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(SN_IN_FLEET !== true) {
+if (SN_IN_FLEET !== true) {
   classSupernova::$debug->error("Attempt to call FLEET page mode {$mode} directly - not from fleet.php", 'Forbidden', 403);
 }
 
 $fleetid = sys_get_param_id('fleetid');
 
-if(!is_numeric($fleetid) || empty($fleetid)) {
+if (!is_numeric($fleetid) || empty($fleetid)) {
   header("Location: fleet.php");
   exit();
 }
 
 $objFleet = new Fleet();
 $objFleet->dbLoad($fleetid);
-if(!$objFleet->dbId) {
+if (!$objFleet->dbId) {
   message(classLocale::$lang['fl_fleet_not_exists'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
+if ($objFleet->time_arrive_to_target <= SN_TIME_NOW || $objFleet->time_return_to_source < SN_TIME_NOW || $objFleet->isReturning()) {
   message(classLocale::$lang['fl_isback'], classLocale::$lang['fl_error']);
 }
 
-if($objFleet->playerOwnerId != $user['id']) {
+if ($objFleet->playerOwnerId != $user['id']) {
   classSupernova::$debug->warning(classLocale::$lang['fl_aks_hack_wrong_fleet'], 'Wrong Fleet Owner', 301);
   message(classLocale::$lang['fl_aks_hack_wrong_fleet'], classLocale::$lang['fl_error']);
 }
@@ -34,19 +34,19 @@ 
 
 !$aks && !$userToAdd_unsafe ? $userToAdd_unsafe = $user['username'] : false;
 
-if($userToAdd_unsafe) {
+if ($userToAdd_unsafe) {
   $userToAdd = db_escape($userToAdd_unsafe);
   $userToAddID = DBStaticUser::db_user_by_username($userToAdd_unsafe, false, 'id', true, true);
   $userToAddID = $userToAddID['id'];
 
-  if($objFleet->target_owner_id == $userToAddID) {
+  if ($objFleet->target_owner_id == $userToAddID) {
     message(classLocale::$lang['flt_aks_player_same'], classLocale::$lang['fl_error']);
   }
 
-  if($userToAddID) {
-    if(!$aks) {
+  if ($userToAddID) {
+    if (!$aks) {
       // No AСS exists - making one
-      if(!$objFleet->group_id) {
+      if (!$objFleet->group_id) {
         DBStaticFleetACS::db_acs_insert($fleetid, $user['id'], $objFleet);
 
         $aks = DBStaticFleetACS::db_acs_get_by_fleet($fleetid);
@@ -61,24 +61,24 @@ 
 
     $isUserExists = false;
     $invited_ar = explode(",", $aks['eingeladen']);
-    foreach($invited_ar as $inv) {
-      if($userToAddID == $inv) {
+    foreach ($invited_ar as $inv) {
+      if ($userToAddID == $inv) {
         $isUserExists = true;
       }
     }
 
-    if(count($invited_ar) >= 5) {
+    if (count($invited_ar) >= 5) {
       message(classLocale::$lang['flt_aks_error_too_much_players'], classLocale::$lang['fl_error']);
     }
 
-    if($isUserExists) {
+    if ($isUserExists) {
       $userToAdd_unsafe != $user['username'] ? $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited_already'], $userToAdd) : false;
     } else {
       $add_user_message_mr = sprintf(classLocale::$lang['fl_aks_player_invited'], $userToAdd);
-      if(!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
+      if (!(DBStaticFleetACS::db_acs_update($userToAddID, $fleetid))) {
         die(sprintf(classLocale::$lang['fl_aks_adding_error'], classSupernova::$db->db_error()));
       }
-      $aks['eingeladen'] .= ',' . $userToAddID;
+      $aks['eingeladen'] .= ','.$userToAddID;
     }
     DBStaticMessages::msg_send_simple_message($userToAddID, $user['id'], SN_TIME_NOW, MSG_TYPE_COMBAT, $user['username'], classLocale::$lang['fl_aks_invite_message_header'], sprintf(classLocale::$lang['fl_aks_invite_message'], $user['username']));
   } else {
@@ -94,8 +94,8 @@ 
   'MISSION_NAME' => classLocale::$lang['type_mission'][MT_ACS],
 ));
 
-if($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
-  foreach($members as $row) {
+if ($aks['eingeladen'] && is_array($members = classSupernova::$gc->cacheOperator->db_get_record_list(LOC_USER, "`id` in ({$aks['eingeladen']})")) && !empty($members)) {
+  foreach ($members as $row) {
     $template->assign_block_vars('invited', array(
       'NAME' => $row['username'],
     ));
@@ -120,7 +120,7 @@ 
 $fleet_data = tplParseFleetObject($objFleet, $i, $user);
 
 $template->assign_block_vars('fleets', $fleet_data['fleet']);
-foreach($fleet_data['ships'] as $ship_data) {
+foreach ($fleet_data['ships'] as $ship_data) {
   $template->assign_block_vars('fleets.ships', $ship_data);
 }
 

includes/classes/DBStaticUser.php

Doc Comments +8 added lines, -3 removed lines

@@ -104,6 +104,9 @@ 
     return $result;
   }
 
+  /**
+   * @param integer $config_user_birthday_range
+   */
   public static function db_user_list_to_celebrate($config_user_birthday_range) {
     $query = static::buildDBQ()
       ->field('id', 'username', 'user_birthday', 'user_birthday_celebrated')
@@ -193,6 +196,9 @@ 
   }
 
 
+  /**
+   * @param string $username_unsafe
+   */
   public static function db_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false) {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
     if (!($username_unsafe = trim($username_unsafe))) {
@@ -247,7 +253,6 @@ 
 
   /**
    * @param $user_id
-   * @param array $set
    * @param array $adjust
    *
    * @return array|bool|mysqli_result|null
@@ -264,8 +269,8 @@ 
    *    <p>array - запись пользователя с установленным полем ['id']</p>
    * @param bool      $for_update @deprecated
    * @param string    $fields @deprecated список полей или '*'/'' для всех полей
-   * @param null      $player
-   * @param bool|null $player Признак выбора записи пользователь типа "игрок"
+   * @param boolean      $player
+   * @param boolean $player Признак выбора записи пользователь типа "игрок"
    *    <p>null - Можно выбрать запись любого типа</p>
    *    <p>true - Выбирается только запись типа "игрок"</p>
    *    <p>false - Выбирается только запись типа "альянс"</p>

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
         ->where('`user_as_ally` IS NULL')
         ->orderBy(array('`id` DESC'));
 
-    return (string)$query->selectValue();
+    return (string) $query->selectValue();
   }
 
   /**
@@ -48,15 +48,15 @@ 
       static::buildDBQ()
         ->field('id')
         ->where("`user_as_ally` IS NULL")
-        ->where("`user_bot` = " . USER_BOT_PLAYER)
+        ->where("`user_bot` = ".USER_BOT_PLAYER)
         ->setForUpdate();
 
     return $query->selectIterator();
   }
 
   public static function db_user_lock_with_target_owner_and_acs($user, $planet = array()) {
-    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = " . idval($user['id']) .
-      (!empty($planet['id_owner']) ? ' OR `id` = ' . idval($planet['id_owner']) : '')
+    $query = "SELECT 1 FROM `{{users}}` WHERE `id` = ".idval($user['id']).
+      (!empty($planet['id_owner']) ? ' OR `id` = '.idval($planet['id_owner']) : '')
       . " FOR UPDATE";
 
     static::getDb()->doSelect($query);
@@ -73,7 +73,7 @@ 
       FROM `{{users}}` 
       WHERE 
         `user_as_ally` IS NULL" .
-        ($online ? ' AND `onlinetime` > ' . (SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
+        ($online ? ' AND `onlinetime` > '.(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : '')
     ));
   }
 
@@ -95,7 +95,7 @@ 
       ->fieldCount('r.id', 'referral_count')
       ->fieldSingleFunction('sum', 'r.dark_matter', 'referral_dm')
       ->join('LEFT JOIN {{referrals}} as r on r.id_partner = u.id')
-      ->where($online ? "`onlinetime` >= " . intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
+      ->where($online ? "`onlinetime` >= ".intval(SN_TIME_NOW - classSupernova::$config->game_users_online_timeout) : 'user_as_ally IS NULL')
       ->groupBy('u.id')
       ->orderBy("user_as_ally, {$sort} ASC");
 
@@ -113,7 +113,7 @@ 
       ->where('(`user_birthday_celebrated` IS NULL OR DATE_ADD(`user_birthday_celebrated`, INTERVAL 1 YEAR) < CURRENT_DATE)')
       ->where('`user_as_ally` IS NULL')
       ->having('`days_after_birthday` >= 0')
-      ->having('`days_after_birthday` < ' . intval($config_user_birthday_range))
+      ->having('`days_after_birthday` < '.intval($config_user_birthday_range))
       ->setForUpdate();
 
     $result = $query->selectIterator();
@@ -222,7 +222,7 @@ 
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = classSupernova::$db->doSelectFetch(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'"
+        "SELECT * FROM {{users}} WHERE `username` ".($like ? 'LIKE' : '=')." '{$username_safe}'"
         . " FOR UPDATE"
       );
       classSupernova::$gc->snCache->cache_set(LOC_USER, $user); // В кэш-юзер так же заполнять индексы
@@ -313,7 +313,7 @@ 
    * @param array $playerArray
    */
   public static function renderNameAndCoordinates($playerArray) {
-    return "{$playerArray['username']} " . uni_render_coordinates($playerArray);
+    return "{$playerArray['username']} ".uni_render_coordinates($playerArray);
   }
 
   /**
@@ -347,7 +347,7 @@ 
     foreach ($playerRowFieldChanges as $resourceId => $value) {
       $fields[pname_resource_name($resourceId)] = $value;
     }
-    if(!empty($fields)) {
+    if (!empty($fields)) {
       classSupernova::$gc->db->doUpdateRowAdjust(
         TABLE_USERS,
         array(),

includes/db.php

Doc Comments +3 added lines, -1 removed lines

@@ -16,7 +16,6 @@ 
  * @param       $user
  * @param       $planet
  * @param array $unit_list
- * @param null  $query
  */
 function db_change_resources(&$user, &$planet, $unit_list) {
   $group = sn_get_groups('resources_loot');
@@ -56,6 +55,9 @@ 
 
 }
 
+/**
+ * @param boolean $transaction_should_be_started
+ */
 function sn_db_transaction_check($transaction_should_be_started = null) {
   return classSupernova::$gc->db->getTransaction()->check($transaction_should_be_started);
 }

Spacing +4 added lines, -4 removed lines

@@ -24,22 +24,22 @@
   $locationType = sys_get_unit_location($user, $planet, key($unit_list));
 
   $resourcesChange = array();
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_resources() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_resources() вызван для не-ресурсов!');
     }
 
-    if(empty($unit_amount)) {
+    if (empty($unit_amount)) {
       continue;
     }
 
     $resourcesChange[pname_resource_name($unit_id)] += $unit_amount;
   }
 
-  if($locationType == LOC_USER) {
+  if ($locationType == LOC_USER) {
     $locationId = $user['id'];
   } else {
     $locationId = $planet['id'];

resources.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  *
  **/
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 /**
  * @param          $resource_id
@@ -36,7 +36,7 @@ 
   $storage_fill = $caps_real['total_storage'][$resource_id] ? floor(mrc_get_level($user, $planetrow, $resource_id) / $caps_real['total_storage'][$resource_id] * 100) : 0;
 
   $template->assign_block_vars('resources', array(
-    'NAME' => classLocale::$lang["sys_" . pname_resource_name($resource_id)],
+    'NAME' => classLocale::$lang["sys_".pname_resource_name($resource_id)],
 
     'HOURLY'  => pretty_number($totalProduction, true, true),
     'WEEKLY'  => pretty_number($totalProduction * 24 * 7, true, true),
@@ -76,12 +76,12 @@ 
       $planetrow[$field_name] = $percent;
       $SubQry[$field_name] = $percent;
     } else {
-      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
+      classSupernova::$debug->warning('Supplying wrong ID in production array - attempt to change some field - ID'.$prod_id, 'Resource Page', 301);
       continue;
     }
   }
 
-  if(!empty($SubQry)) {
+  if (!empty($SubQry)) {
     DBStaticPlanet::db_planet_update_set_by_id(
       $planetrow['id'],
       $SubQry