Completed
Push — work-fleets ( cb2521...9eb2f3 )
by SuperNova.WS
08:26
created
classes/DbSqlLiteral.php 2 patches
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.
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.
classes/DBStatic/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.
classes/DBStatic/DBStaticChat.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
   /**
21 21
    * @param $user_id
22
-   * @param $nickUnsafe
22
+   * @param string $nickUnsafe
23 23
    * @param $ally_id
24 24
    * @param $message_unsafe
25 25
    * @param $chat_message_sender_name_unsafe
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
    * @param $alliance
55 55
    * @param $where_add
56 56
    * @param $start_row
57
-   * @param $page_limit
57
+   * @param integer $page_limit
58 58
    *
59 59
    * @return array|bool|mysqli_result|null
60 60
    */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
       JOIN {{users}} AS u ON u.id = cp.chat_player_player_id
13 13
     WHERE
14 14
       `chat_player_refresh_last` >= '{$sql_date}'
15
-      AND (`banaday` IS NULL OR `banaday` <= " . SN_TIME_NOW . ")
15
+      AND (`banaday` IS NULL OR `banaday` <= ".SN_TIME_NOW.")
16 16
       {$ally_add}
17 17
     ORDER BY authlevel DESC, `username`");
18 18
   }
Please login to merge, or discard this patch.
classes/DBStatic/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.
classes/DBStatic/DBStaticFleetBashing.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
   /**
6 6
    * @param $user
7 7
    * @param $planet_dst
8
-   * @param $time_limit
8
+   * @param integer $time_limit
9 9
    *
10 10
    * @return array|bool|mysqli_result|null
11 11
    */
Please login to merge, or discard this patch.
classes/DBStatic/DBStaticFleetMissile.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -2,6 +2,10 @@
 block discarded – undo
2 2
 
3 3
 class DBStaticFleetMissile {
4 4
 
5
+  /**
6
+   * @param double $arrival
7
+   * @param integer $target_structure
8
+   */
5 9
   public static function db_missile_insert($target_coord, $user, $planetrow, $arrival, $fleet_ship_count, $target_structure) {
6 10
     classSupernova::$db->doInsert(
7 11
       "INSERT INTO `{{iraks}}` SET
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
    * @return array|bool|mysqli_result|null
24 24
    */
25 25
   public static function db_missile_list_by_arrival() {
26
-    $iraks = classSupernova::$db->doSelect("SELECT * FROM `{{iraks}}` WHERE `fleet_end_time` <= " . SN_TIME_NOW . " FOR UPDATE;");
26
+    $iraks = classSupernova::$db->doSelect("SELECT * FROM `{{iraks}}` WHERE `fleet_end_time` <= ".SN_TIME_NOW." FOR UPDATE;");
27 27
 
28 28
     return $iraks;
29 29
   }
Please login to merge, or discard this patch.
classes/DBStatic/DBStaticMessages.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -467,6 +467,12 @@
 block discarded – undo
467 467
   {$StartRec}, 25;");
468 468
   }
469 469
 
470
+  /**
471
+   * @param integer $message_type
472
+   * @param string $from_unsafe
473
+   * @param string $subject_unsafe
474
+   * @param string $text_unsafe
475
+   */
470 476
   public static function db_message_insert_all($message_type, $from_unsafe, $subject_unsafe, $text_unsafe) {
471 477
     $message_type_safe = intval($message_type);
472 478
     $from_safe = db_escape($from_unsafe);
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         sys_user_options_unpack($owner_row);
114 114
 
115 115
         if ($force || !$message_class['switchable'] || $owner_row["opt_{$message_class_name}"]) {
116
-          $insert_values[] = "('" . idval($owner) . "', '{$sender}', '{$timestamp}', '{$message_type}', '" . db_escape($from_unsafe) . "', '" . db_escape($subject_unsafe) . "', '" . db_escape($text_unsafe) . "')";
116
+          $insert_values[] = "('".idval($owner)."', '{$sender}', '{$timestamp}', '{$message_type}', '".db_escape($from_unsafe)."', '".db_escape($subject_unsafe)."', '".db_escape($text_unsafe)."')";
117 117
         }
118 118
 
119 119
         // TODO - allow sending HTML email only from admin
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         array(),
154 154
         array(
155 155
           // TODO DANGER
156
-          '`id` IN (' . implode(',', $owners) . ')',
156
+          '`id` IN ('.implode(',', $owners).')',
157 157
         )
158 158
       );
159 159
     }
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
     $sendList = array();
173 173
     $list = '';
174 174
     $query = DBStaticUser::db_user_list(
175
-      "ally_id = '{$ally_id}'" . ($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
175
+      "ally_id = '{$ally_id}'".($ally_rank_id >= 0 ? " AND ally_rank_id = {$ally_rank_id}" : ''),
176 176
       false, 'id, username');
177 177
     foreach ($query as $u) {
178 178
       $sendList[] = $u['id'];
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
       $subject_unsafe = substr($subject_unsafe, strlen(classLocale::$lang['msg_answer_prefix']));
262 262
       $re++;
263 263
     }
264
-    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'] . $subject_unsafe : false;
264
+    $re ? $subject_unsafe = classLocale::$lang['msg_answer_prefix'].$subject_unsafe : false;
265 265
 
266 266
     $subject_unsafe = $subject_unsafe ? $subject_unsafe : classLocale::$lang['msg_subject_default'];
267 267
 
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
     return classSupernova::$db->doSelect(
438 438
       "SELECT * FROM {{messages}}
439 439
         WHERE
440
-          `message_type` = '" . MSG_TYPE_PLAYER . "' AND
440
+          `message_type` = '" . MSG_TYPE_PLAYER."' AND
441 441
           ((`message_owner` = '{$user['id']}' AND `message_sender` = '{$recipient_id}')
442 442
           OR
443 443
           (`message_sender` = '{$user['id']}' AND `message_owner` = '{$recipient_id}')) ORDER BY `message_time` DESC LIMIT 20;");
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
 FROM
482 482
   {{messages}} AS m
483 483
   LEFT JOIN {{users}} AS u ON u.id = m.message_owner " .
484
-      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '') .
484
+      ($int_type_selected >= 0 ? "WHERE `message_type` = {$int_type_selected} " : '').
485 485
       "ORDER BY
486 486
   `message_id` DESC
487 487
 LIMIT
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
     $subject_safe = db_escape($subject_unsafe);
495 495
     $text_safe = db_escape($text_unsafe);
496 496
 
497
-    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) ' .
497
+    return classSupernova::$db->doInsertComplex('INSERT INTO {{messages}} (`message_owner`, `message_sender`, `message_time`, `message_type`, `message_from`, `message_subject`, `message_text`) '.
498 498
       "SELECT `id`, 0, unix_timestamp(now()), {$message_type_safe}, '{$from_safe}', '{$subject_safe}', '{$text_safe}' FROM {{users}}");
499 499
   }
500 500
 
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
    * @return array|bool|mysqli_result|null
505 505
    */
506 506
   public static function db_message_count_by_type($int_type_selected) {
507
-    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`' . ($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
507
+    $page_max = classSupernova::$db->doSelectFetch('SELECT COUNT(*) AS `max` FROM `{{messages}}`'.($int_type_selected >= 0 ? " WHERE `message_type` = {$int_type_selected};" : ''));
508 508
 
509 509
     return $page_max;
510 510
   }
Please login to merge, or discard this patch.
classes/DBStatic/DBStaticNews.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@
 block discarded – undo
50 50
 
51 51
   /**
52 52
    * @param template $template
53
-   * @param          $query_where
54
-   * @param          $query_limit
53
+   * @param          string $query_where
54
+   * @param          integer $query_limit
55 55
    *
56 56
    * @return array|bool|mysqli_result|null
57 57
    */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
       LEFT JOIN {{survey}} AS s ON s.survey_announce_id = a.idAnnounce
44 44
       LEFT JOIN {{users}} AS u ON u.id = a.user_id
45 45
     {$query_where}
46
-    ORDER BY `tsTimeStamp` DESC, idAnnounce" .
46
+    ORDER BY `tsTimeStamp` DESC, idAnnounce".
47 47
       ($query_limit ? " LIMIT {$query_limit}" : ''));
48 48
 
49 49
     $template->assign_var('NEWS_COUNT', classSupernova::$db->db_num_rows($announce_list));
Please login to merge, or discard this patch.
classes/DBStatic/DBStaticPlanet.php 2 patches
Doc Comments   +14 added lines patch added patch discarded remove patch
@@ -21,11 +21,19 @@  discard block
 block discarded – undo
21 21
     return empty($result) ? null : $result;
22 22
   }
23 23
 
24
+  /**
25
+   * @param integer $galaxy
26
+   * @param integer $system
27
+   * @param integer $planet
28
+   */
24 29
   public static function db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') {
25 30
     return classSupernova::db_get_record_list(LOC_PLANET,
26 31
       "{{planets}}.`galaxy` = {$galaxy} AND {{planets}}.`system` = {$system} AND {{planets}}.`planet` = {$planet} AND {{planets}}.`planet_type` = {$planet_type}", true);
27 32
   }
28 33
 
34
+  /**
35
+   * @param integer $planet_type
36
+   */
29 37
   public static function db_planet_by_gspt($galaxy, $system, $planet, $planet_type, $for_update = false, $fields = '*') {
30 38
     $galaxy = intval($galaxy);
31 39
     $system = intval($system);
@@ -120,6 +128,9 @@  discard block
 block discarded – undo
120 128
       "`id_owner` = '{$user_row['id']}' {$conditions} ORDER BY {$order_by}");
121 129
   }
122 130
 
131
+  /**
132
+   * @param integer $planet_id
133
+   */
123 134
   public static function db_planet_list_by_user_or_planet($user_id, $planet_id) {
124 135
     if(!($user_id = idval($user_id)) && !($planet_id = idval($planet_id))) {
125 136
       return false;
@@ -138,6 +149,9 @@  discard block
 block discarded – undo
138 149
     return classSupernova::db_upd_record_by_id(LOC_PLANET, $planet_id, $set);
139 150
   }
140 151
 
152
+  /**
153
+   * @param integer $ui_planet_type
154
+   */
141 155
   public static function db_planet_set_by_gspt($ui_galaxy, $ui_system, $ui_planet, $ui_planet_type = PT_ALL, $set) {
142 156
     if(!($set = trim($set))) {
143 157
       return false;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -7 removed lines patch added patch discarded remove patch
@@ -65,11 +65,10 @@  discard block
 block discarded – undo
65 65
   }
66 66
 
67 67
   public static function db_planet_by_vector($vector, $prefix = '', $for_update = false, $fields = '*') {
68
-    $galaxy = isset($vector[$prefix . 'galaxy']) ? intval($vector[$prefix . 'galaxy']) : 0;
69
-    $system = isset($vector[$prefix . 'system']) ? intval($vector[$prefix . 'system']) : 0;
70
-    $planet = isset($vector[$prefix . 'planet']) ? intval($vector[$prefix . 'planet']) : 0;
71
-    $planet_type = isset($vector[$prefix . 'planet_type']) ? intval($vector[$prefix . 'planet_type']) :
72
-      (isset($vector[$prefix . 'type']) ? intval($vector[$prefix . 'type']) : 0);
68
+    $galaxy = isset($vector[$prefix.'galaxy']) ? intval($vector[$prefix.'galaxy']) : 0;
69
+    $system = isset($vector[$prefix.'system']) ? intval($vector[$prefix.'system']) : 0;
70
+    $planet = isset($vector[$prefix.'planet']) ? intval($vector[$prefix.'planet']) : 0;
71
+    $planet_type = isset($vector[$prefix.'planet_type']) ? intval($vector[$prefix.'planet_type']) : (isset($vector[$prefix.'type']) ? intval($vector[$prefix.'type']) : 0);
73 72
     $planet_type = $planet_type == PT_DEBRIS ? PT_PLANET : $planet_type;
74 73
 
75 74
     return DBStaticPlanet::db_planet_by_gspt_safe($galaxy, $system, $planet, $planet_type, $for_update, $fields);
@@ -120,7 +119,7 @@  discard block
 block discarded – undo
120 119
     }
121 120
 
122 121
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,
123
-      "`planet_type` = " . PT_MOON . " AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
122
+      "`planet_type` = ".PT_MOON." AND `id_owner` = {$user_id} AND `id` != {$this_moon_id}");
124 123
   }
125 124
 
126 125
   public static function db_planet_list_in_system($galaxy, $system) {
@@ -146,7 +145,7 @@  discard block
 block discarded – undo
146 145
     );
147 146
     $order_by = classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT];
148 147
     empty($sort_orders[$order_by]) ? $order_by = SORT_ID : false;
149
-    $order_by = $sort_orders[$order_by] . ' ' . (classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
148
+    $order_by = $sort_orders[$order_by].' '.(classSupernova::$user_options[PLAYER_OPTION_PLANET_SORT_INVERSE] == SORT_ASCENDING ? 'ASC' : 'DESC');
150 149
 
151 150
     // Compilating query
152 151
     return classSupernova::$gc->cacheOperator->db_get_record_list(LOC_PLANET,
Please login to merge, or discard this patch.