Completed
Push — work-fleets ( ec9dc8...d7065d )
by SuperNova.WS
06:07
created
includes/classes/DBStaticAlly.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -293,7 +293,7 @@
 block discarded – undo
293 293
   }
294 294
 
295 295
   /**
296
-   * @param $ranklist
296
+   * @param string $ranklist
297 297
    * @param $user
298 298
    */
299 299
   public static function db_ally_update_ranklist($ranklist, $user) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -72,12 +72,12 @@
 block discarded – undo
72 72
    */
73 73
   public static function db_ally_insert($ally_name_unsafe, $ally_tag_unsafe, $userId) {
74 74
     $ally = classSupernova::$db->doInsertSet(TABLE_ALLIANCE, array(
75
-      'ally_name'          => (string)$ally_name_unsafe,
76
-      'ally_tag'           => (string)$ally_tag_unsafe,
75
+      'ally_name'          => (string) $ally_name_unsafe,
76
+      'ally_tag'           => (string) $ally_tag_unsafe,
77 77
       'ally_owner'         => $userId,
78
-      'ally_owner_range'   => (string)classLocale::$lang['ali_leaderRank'],
79
-      'ally_members'       => (int)1,
80
-      'ranklist'           => (string)(classLocale::$lang['ali_defaultRankName'] . ",0,0,0,0,0"),
78
+      'ally_owner_range'   => (string) classLocale::$lang['ali_leaderRank'],
79
+      'ally_members'       => (int) 1,
80
+      'ranklist'           => (string) (classLocale::$lang['ali_defaultRankName'].",0,0,0,0,0"),
81 81
       'ally_register_time' => SN_TIME_NOW,
82 82
     ));
83 83
 
Please login to merge, or discard this patch.
includes/classes/DBStaticFleetACS.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 
76 76
 
77 77
   /**
78
-   * @param $fleet_group_id_list
78
+   * @param string $fleet_group_id_list
79 79
    */
80 80
   public static function db_acs_delete_by_list($fleet_group_id_list) {
81 81
     doquery("DELETE FROM {{aks}} WHERE `id` IN ({$fleet_group_id_list})");
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
    */
52 52
   public static function db_acs_insert($fleetid, $userId, $objFleet) {
53 53
     classSupernova::$db->doInsertSet(TABLE_AKS, array(
54
-      'name'           => classLocale::$lang['flt_acs_prefix'] . $fleetid,
54
+      'name'           => classLocale::$lang['flt_acs_prefix'].$fleetid,
55 55
       'teilnehmer'     => $userId,
56 56
       'flotten'        => $fleetid,
57 57
       'ankunft'        => $objFleet->time_arrive_to_target,
Please login to merge, or discard this patch.
admin/adm_user_analyze.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 define('INSTALL', false);
11 11
 define('IN_ADMIN', true);
12 12
 
13
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
13
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 
15 15
 if ($user['authlevel'] < 3) {
16 16
   AdminMessage(classLocale::$lang['adm_err_denied']);
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
   foreach ($value as $interval_data) {
112 112
     print("<tr>");
113 113
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
114
-    print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");
114
+    print("<td>".date(FMT_DATE_TIME_SQL, $user_record['onlinetime'])."</td>");
115 115
     print("</tr>");
116 116
   }
117 117
 }
Please login to merge, or discard this patch.
includes/classes/DbSqlAware.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@
 block discarded – undo
45 45
    */
46 46
   protected function quoteStringAsFieldByRef(&$string) {
47 47
     $string = $this->stringEscape($string);
48
-    if ((string)$string && '*' != $string) {
49
-      $string = '`' . $string . '`';
48
+    if ((string) $string && '*' != $string) {
49
+      $string = '`'.$string.'`';
50 50
     }
51 51
   }
52 52
 
Please login to merge, or discard this patch.
includes/classes/DbSqlLiteral.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
    * @return $this
32 32
    */
33 33
   public function literal($value) {
34
-    $this->literal = (string)$value;
34
+    $this->literal = (string) $value;
35 35
 
36 36
     return $this;
37 37
   }
@@ -64,10 +64,10 @@  discard block
 block discarded – undo
64 64
       $alias = $this->aliasFromField($functionName, $field);
65 65
     }
66 66
 
67
-    $this->literal = strtoupper($functionName) . '(' . $this->quoteField($field) . ')';
67
+    $this->literal = strtoupper($functionName).'('.$this->quoteField($field).')';
68 68
 
69 69
     if (self::SQL_LITERAL_ALIAS_NONE !== $alias && !empty($alias)) {
70
-      $this->literal .= ' AS `' . $alias . '`';
70
+      $this->literal .= ' AS `'.$alias.'`';
71 71
     }
72 72
 
73 73
     return $this;
@@ -124,10 +124,10 @@  discard block
 block discarded – undo
124 124
       $alias = $this->aliasFromField($functionName, $field);
125 125
     }
126 126
 
127
-    $this->literal = $this->quoteField($field) . ' IS NULL';
127
+    $this->literal = $this->quoteField($field).' IS NULL';
128 128
 
129 129
     if (!empty($alias)) {
130
-      $this->literal .= ' AS `' . $alias . '`';
130
+      $this->literal .= ' AS `'.$alias.'`';
131 131
     }
132 132
 
133 133
     return $this;
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
   }
27 27
 
28 28
   /**
29
-   * @param mixed $value
29
+   * @param string $value
30 30
    *
31 31
    * @return $this
32 32
    */
Please login to merge, or discard this patch.
includes/classes/DbSqlHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@
 block discarded – undo
15 15
    * @return string
16 16
    */
17 17
   public static function quoteComment($comment) {
18
-    if($comment == '') {
18
+    if ($comment == '') {
19 19
       return '';
20 20
     }
21 21
 
22
-    $comment = str_replace(array('/*', '*/'), '__',$comment);
22
+    $comment = str_replace(array('/*', '*/'), '__', $comment);
23 23
 
24
-    return "\r\n/*" . $comment . "*/";
24
+    return "\r\n/*".$comment."*/";
25 25
   }
26 26
 
27 27
 }
Please login to merge, or discard this patch.
includes/functions/flt_mission_missile.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -77,8 +77,8 @@  discard block
 block discarded – undo
77 77
     $crystal += $destroyed * $unit_info[P_COST][RES_CRYSTAL] / 4;
78 78
   }
79 79
 
80
-  $return['structures'] = $structures;     // Structures left after attack
81
-  $return['metal'] = floor($metal);   // Metal scraps
80
+  $return['structures'] = $structures; // Structures left after attack
81
+  $return['metal'] = floor($metal); // Metal scraps
82 82
   $return['crystal'] = floor($crystal); // Crystal scraps
83 83
 
84 84
   return $return;
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
         }
149 149
 
150 150
         if (!empty($message)) {
151
-          $message = classLocale::$lang['mip_defense_destroyed'] . $message . "{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
151
+          $message = classLocale::$lang['mip_defense_destroyed'].$message."{$classLocale['mip_recycled']}{$classLocale['Metal']}: {$attackResult['metal']}, {$classLocale['Crystal']}: {$attackResult['crystal']}<br>";
152 152
 
153 153
           DBStaticPlanet::db_planet_set_by_id($target_planet_row['id'], "`metal` = `metal` + {$attackResult['metal']}, `crystal` = `crystal` + {$attackResult['crystal']}");
154 154
         }
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 
166 166
       empty($message) ? $message = classLocale::$lang['mip_no_defense'] : false;
167 167
 
168
-      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message);
169
-      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage . $message);
168
+      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
169
+      DBStaticMessages::msg_send_simple_message($fleetRow['fleet_target_owner'], '', SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['mip_sender_amd'], classLocale::$lang['mip_subject_amd'], $message_vorlage.$message);
170 170
     }
171 171
     DBStaticFleetMissile::db_missile_delete($fleetRow);
172 172
   }
Please login to merge, or discard this patch.
messages.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 $template = gettemplate('viewreport', true);
6 6
 $template->assign_var('PAGE_HINT', classLocale::$lang['cr_view_hint']);
Please login to merge, or discard this patch.
blitz_register.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
3
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
4 4
 
5 5
 global $user;
6 6
 
7
-if($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
7
+if ($user['authlevel'] < AUTH_LEVEL_DEVELOPER) {
8 8
   $error_message = classSupernova::$config->game_mode == GAME_BLITZ ? 'sys_blitz_page_disabled' : (
9 9
   !classSupernova::$config->game_blitz_register ? 'sys_blitz_registration_disabled' : ''
10 10
   );
11 11
 
12
-  if($error_message) {
12
+  if ($error_message) {
13 13
     message(classLocale::$lang[$error_message], classLocale::$lang['sys_error'], 'overview.php', 10);
14 14
     die();
15 15
   }
@@ -18,16 +18,16 @@  discard block
 block discarded – undo
18 18
 $current_round = intval(classSupernova::$config->db_loadItem('game_blitz_register_round'));
19 19
 $current_price = intval(classSupernova::$config->db_loadItem('game_blitz_register_price'));
20 20
 
21
-if(classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
21
+if (classSupernova::$config->db_loadItem('game_blitz_register') == BLITZ_REGISTER_OPEN && (sys_get_param_str('register_me') || sys_get_param_str('register_me_not'))) {
22 22
   sn_db_transaction_start();
23 23
   $user = DBStaticUser::db_user_by_id($user['id'], true);
24 24
   $is_registered = db_blitz_reg_get_id_by_player_and_round($user, $current_round);
25
-  if(sys_get_param_str('register_me')) {
26
-    if(empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
25
+  if (sys_get_param_str('register_me')) {
26
+    if (empty($is_registered) && mrc_get_level($user, null, RES_METAMATTER) >= $current_price) {
27 27
       db_blitz_reg_insert($user, $current_round);
28 28
       classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION, -$current_price, "Регистрация в раунде {$current_round} Блица");
29 29
     }
30
-  } elseif(sys_get_param_str('register_me_not') && !empty($is_registered)) {
30
+  } elseif (sys_get_param_str('register_me_not') && !empty($is_registered)) {
31 31
     db_blitz_reg_delete($user, $current_round);
32 32
     classSupernova::$auth->account->metamatter_change(RPG_BLITZ_REGISTRATION_CANCEL, $current_price, "Отмена регистрации в раунде {$current_round} Блица");
33 33
   }
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
 $blitz_players = 0;
43 43
 $blitz_prize_dark_matter = 0;
44 44
 $blitz_prize_places = 0;
45
-if($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
46
-  if(sys_get_param_str('generate')) {
45
+if ($user['authlevel'] >= AUTH_LEVEL_DEVELOPER) {
46
+  if (sys_get_param_str('generate')) {
47 47
     $next_id = 0;
48 48
     $query = db_blitz_reg_get_random_id($current_round);
49
-    while($row = db_fetch($query)) {
49
+    while ($row = db_fetch($query)) {
50 50
       $next_id++;
51
-      $blitz_name = 'Игрок' . $next_id;
51
+      $blitz_name = 'Игрок'.$next_id;
52 52
       $blitz_password = sys_random_string(8);
53 53
       db_blitz_reg_update_with_name_and_password($blitz_name, $blitz_password, $row, $current_round);
54 54
     }
55
-  } elseif(sys_get_param_str('import_generated')) {
55
+  } elseif (sys_get_param_str('import_generated')) {
56 56
     // ЭТО НА БЛИЦЕ!!!
57 57
     DBStaticUser::db_player_list_blitz_delete_players();
58 58
     DBStaticPlanet::db_planets_purge();
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     $system = $system_step;
75 75
     $planet = round(Vector::$knownPlanets / 2);
76 76
 
77
-    foreach($imported_string as &$string_data) {
77
+    foreach ($imported_string as &$string_data) {
78 78
       $string_data = explode(',', $string_data);
79 79
       $username_safe = $string_data[0];
80 80
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
       $moon_row = uni_create_moon($galaxy, $system, $planet, $user_new['id'], 30, '', false);
96 96
 
97
-      if(($system += $system_step) >= Vector::$knownSystems) {
97
+      if (($system += $system_step) >= Vector::$knownSystems) {
98 98
         $galaxy++;
99 99
         $system = $system_step;
100 100
       }
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
     classSupernova::$config->db_saveItem('users_amount', classSupernova::$config->users_amount + $new_players);
105 105
     // pdump($imported_string);
106 106
     // generated_string
107
-  } elseif(sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
107
+  } elseif (sys_get_param_str('import_result') && ($blitz_result_string = sys_get_param_str('blitz_result_string'))) {
108 108
     $blitz_result = explode(';', $blitz_result_string);
109 109
     $blitz_last_update = $blitz_result[0]; // Пока не используется
110 110
     unset($blitz_result[0]);
111
-    foreach($blitz_result as $blitz_result_data) {
111
+    foreach ($blitz_result as $blitz_result_data) {
112 112
       $blitz_result_data = explode(',', $blitz_result_data);
113
-      if(count($blitz_result_data) == 5) {
113
+      if (count($blitz_result_data) == 5) {
114 114
         $blitz_result_data[1] = db_escape($blitz_result_data[1]);
115 115
         db_blitz_reg_update_results($blitz_result_data, $current_round);
116 116
       }
@@ -118,14 +118,14 @@  discard block
 block discarded – undo
118 118
     $blitz_result = array();
119 119
   }
120 120
 
121
-  if(classSupernova::$config->game_mode == GAME_BLITZ) {
121
+  if (classSupernova::$config->game_mode == GAME_BLITZ) {
122 122
     $blitz_result = array(classSupernova::$config->db_loadItem('var_stat_update'));
123
-    foreach(DBStaticUser::db_player_list_export_blitz_info() as $row) {
123
+    foreach (DBStaticUser::db_player_list_export_blitz_info() as $row) {
124 124
       $blitz_result[] = "{$row['id']},{$row['username']},{$row['onlinetime']},{$row['total_rank']},{$row['total_points']}";
125 125
     }
126 126
   } else {
127 127
     $query = db_blitz_reg_get_player_list($current_round);
128
-    while($row = db_fetch($query)) {
128
+    while ($row = db_fetch($query)) {
129 129
       $blitz_generated[] = "{$row['blitz_name']},{$row['blitz_password']}";
130 130
       $row['blitz_online'] ? $blitz_prize_players_active++ : false;
131 131
       $blitz_players++;
@@ -133,13 +133,13 @@  discard block
 block discarded – undo
133 133
     $blitz_prize_dark_matter = $blitz_prize_players_active * 20000;
134 134
     $blitz_prize_places = ceil($blitz_prize_players_active / 5);
135 135
 
136
-    if(sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
136
+    if (sys_get_param_str('prize_calculate') && $blitz_prize_players_active && ($blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter'))) {
137 137
       // $blitz_prize_dark_matter_actual = sys_get_param_int('blitz_prize_dark_matter');
138 138
       $blitz_prize_places_actual = sys_get_param_int('blitz_prize_places');
139 139
       sn_db_transaction_start();
140 140
       $query = db_blitz_reg_get_player_list_order_by_place($current_round);
141
-      while($row = db_fetch($query)) {
142
-        if(!$row['blitz_place']) {
141
+      while ($row = db_fetch($query)) {
142
+        if (!$row['blitz_place']) {
143 143
           continue;
144 144
         }
145 145
 
@@ -148,14 +148,14 @@  discard block
 block discarded – undo
148 148
 
149 149
         $reward = $blitz_prize_dark_matter_actual - $row['blitz_reward_dark_matter'];
150 150
         pdump("{{$row['id']}} {$row['blitz_name']}, Place {$row['blitz_place']}, Prize places {$blitz_prize_places_actual}, Prize {$reward}", $row['id']);
151
-        if($reward) {
151
+        if ($reward) {
152 152
           rpg_points_change($row['user_id'], RPG_BLITZ, $reward, sprintf(
153 153
             classLocale::$lang['sys_blitz_reward_log_message'], $row['blitz_place'], $row['blitz_name']
154 154
           ));
155 155
           db_blitz_reg_update_apply_results($reward, $row, $current_round);
156 156
         }
157 157
 
158
-        if(!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
158
+        if (!$blitz_prize_places_actual || $blitz_prize_dark_matter_actual < 1000) {
159 159
           break;
160 160
         }
161 161
       }
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
170 170
 
171 171
 $player_registered = false;
172 172
 $query = db_blitz_reg_get_player_list_and_users($current_round);
173
-while($row = db_fetch($query)) {
173
+while ($row = db_fetch($query)) {
174 174
   $tpl_player_data = array(
175 175
     'NAME' => player_nick_render_to_html($row, array('icons' => true, 'color' => true, 'ally' => true)),
176 176
   );
177 177
 
178
-  if(classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
178
+  if (classSupernova::$config->game_blitz_register == BLITZ_REGISTER_DISCLOSURE_NAMES) {
179 179
     // Вот так хитро, что бы не было не единого шанса попадания на страницу данных об игроках Блиц-сервера до закрытия раунда
180 180
     $tpl_player_data = array_merge($tpl_player_data, array(
181 181
       'ID'                       => $row['id'],
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
   }
189 189
 
190 190
   $template->assign_block_vars('registrations', $tpl_player_data);
191
-  if($row['id'] == $user['id']) {
191
+  if ($row['id'] == $user['id']) {
192 192
     $player_registered = $row;
193 193
   }
194 194
 }
Please login to merge, or discard this patch.