Completed
Push — work-fleets ( cb2521...9eb2f3 )
by SuperNova.WS
08:26
created
includes/alliance/ali_external_search.inc 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
3
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
4 4
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
5 5
 }
6 6
 
7 7
 $template = gettemplate('ali_search', true);
8 8
 
9 9
 $ali_search_text = sys_get_param_str('searchtext');
10
-if($ali_search_text) {
10
+if ($ali_search_text) {
11 11
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
12 12
 
13 13
   $search = DBStaticAlly::db_ally_search_by_name_or_tag($ali_search_text);
14
-  if(classSupernova::$db->db_num_rows($search)) {
15
-    while($ally_row = db_fetch($search)) {
14
+  if (classSupernova::$db->db_num_rows($search)) {
15
+    while ($ally_row = db_fetch($search)) {
16 16
       $template->assign_block_vars('alliances', array(
17 17
         'ID'          => $ally_row['id'],
18 18
         'TAG'         => $ally_row['ally_tag'],
Please login to merge, or discard this patch.
tests.int/FleetTest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 define('SN_IN_FLEET', true);
6 6
 define('SN_RENDER_NAVBAR_PLANET', true);
7 7
 
8
-include('../common.' . substr(strrchr(__FILE__, '.'), 1));
8
+include('../common.'.substr(strrchr(__FILE__, '.'), 1));
9 9
 
10 10
 // TODO - Переместить это куда-нибудь
11 11
 $fleet_page = sys_get_param_int('fleet_page', sys_get_param_int('mode'));
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
 //  break;
193 193
     }
194 194
 
195
-    if($exceptionCode !== null) {
196
-      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</span><br />');
195
+    if ($exceptionCode !== null) {
196
+      print('<span style="color: red; font-size: 200%;">FAILED! Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</span><br />');
197 197
       print('<div style="color: red; font-size: 200%;">NO EXCEPTION RAISED</div>');
198 198
       pdie();
199 199
     } else {
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
     if ($exceptionCode !== null && $e->getCode() === $exceptionCode) {
204 204
 //      print('<span style="color: darkgreen;">Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - passed</span><br />');
205 205
     } else {
206
-      print('<div style="color: red; font-size: 200%;">Expected Exception [' . $exceptionCode . ']: "' . classLocale::$lang['fl_attack_error'][$exceptionCode] . '" - FAILED!</div>');
207
-      print('<div style="color: red; font-size: 200%;">Got Exception [' . $e->getCode() . ']: "' . $e->getMessage() . '"/"' . classLocale::$lang['fl_attack_error'][$e->getCode()] . '" . "</div>');
206
+      print('<div style="color: red; font-size: 200%;">Expected Exception ['.$exceptionCode.']: "'.classLocale::$lang['fl_attack_error'][$exceptionCode].'" - FAILED!</div>');
207
+      print('<div style="color: red; font-size: 200%;">Got Exception ['.$e->getCode().']: "'.$e->getMessage().'"/"'.classLocale::$lang['fl_attack_error'][$e->getCode()].'" . "</div>');
208 208
       throw $e;
209 209
     }
210 210
   }
Please login to merge, or discard this patch.
buddy.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.
includes/functions/qst_quest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
     $template->assign_vars($quest_templatized);
180 180
     if (!empty($quest_templatized['quest_rewards_list'])) {
181 181
       foreach ($quest_templatized['quest_rewards_list'] as $quest_reward) {
182
-        $template->assign_block_vars(($block_name ? $block_name . '.' : '') . 'quest_rewards_list', $quest_reward);
182
+        $template->assign_block_vars(($block_name ? $block_name.'.' : '').'quest_rewards_list', $quest_reward);
183 183
       }
184 184
     }
185 185
   }
@@ -248,10 +248,10 @@  discard block
 block discarded – undo
248 248
 
249 249
         $comment_reward = array();
250 250
         foreach ($reward_list as $unit_id => $unit_amount) {
251
-          $comment_reward[] = $unit_amount . ' ' . classLocale::$lang['tech'][$unit_id];
251
+          $comment_reward[] = $unit_amount.' '.classLocale::$lang['tech'][$unit_id];
252 252
           $total_rewards[$user_id][$planet_id][$unit_id] += $unit_amount;
253 253
         }
254
-        $comment .= " {$classLocale['qst_msg_your_reward']} " . implode(',', $comment_reward);
254
+        $comment .= " {$classLocale['qst_msg_your_reward']} ".implode(',', $comment_reward);
255 255
 
256 256
         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);
257 257
 
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 
290 290
         if (!empty($resourcesChange)) {
291 291
           $planet_id = $planet_id == 0 && isset($user_row['id_planet']) ? $user_row['id_planet'] : $planet_id;
292
-          if($planet_id) {
292
+          if ($planet_id) {
293 293
             // update planet
294 294
             DBStaticPlanet::db_planet_update_resources($resourcesChange, $planet_id);
295 295
           } else {
Please login to merge, or discard this patch.
admin/adm_message_list.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
 define('INSTALL', false);
13 13
 define('IN_ADMIN', true);
14 14
 
15
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
15
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
16 16
 
17
-if($user['authlevel'] < 3) {
17
+if ($user['authlevel'] < 3) {
18 18
   AdminMessage(classLocale::$lang['adm_err_denied']);
19 19
 }
20 20
 
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
   ),
29 29
 );
30 30
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
31
-foreach(DBStaticMessages::$snMessageClassList as $key => $value) {
32
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
31
+foreach (DBStaticMessages::$snMessageClassList as $key => $value) {
32
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX) {
33 33
     continue;
34 34
   }
35 35
 
@@ -41,21 +41,21 @@  discard block
 block discarded – undo
41 41
 
42 42
 
43 43
 $deletedMessages = '';
44
-if($idMessageDelete = sys_get_param_id('msg_del')) {
44
+if ($idMessageDelete = sys_get_param_id('msg_del')) {
45 45
   DBStaticMessages::db_message_delete_by_id($idMessageDelete);
46 46
   $deletedMessages = $idMessageDelete;
47
-} elseif(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
47
+} elseif (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
48 48
   $message_delete = implode(', ', $message_delete);
49 49
   DBStaticMessages::db_message_list_delete_set($message_delete);
50 50
   $deletedMessages = $message_delete;
51 51
 }
52 52
 
53
-if($deletedMessages) {
53
+if ($deletedMessages) {
54 54
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted'], $deletedMessages)));
55 55
 }
56 56
 
57 57
 
58
-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'))) {
58
+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'))) {
59 59
   $delete_date = "{$year}-{$month}-{$day}";
60 60
   DBStaticMessages::db_message_list_delete_by_date($delete_date, $int_type_selected);
61 61
   $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 @@  discard block
 block discarded – undo
67 67
 
68 68
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
69 69
 
70
-if(sys_get_param('page_prev') && $int_page_current > 1) {
70
+if (sys_get_param('page_prev') && $int_page_current > 1) {
71 71
   $int_page_current--;
72
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
72
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
73 73
   $int_page_current++;
74 74
 }
75 75
 
76
-for($i = 1; $i <= $page_max; $i++) {
76
+for ($i = 1; $i <= $page_max; $i++) {
77 77
   $template->assign_block_vars('page', array('NUMBER' => $i));
78 78
 }
79 79
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 $StartRec = ($int_page_current - 1) * 25;
82 82
 
83 83
 $Messages = DBStaticMessages::db_message_list_admin_by_type($int_type_selected, $StartRec);
84
-while($row = db_fetch($Messages)) {
84
+while ($row = db_fetch($Messages)) {
85 85
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
86 86
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
87 87
   $row['TEXT'] = nl2br($row['TEXT']);
Please login to merge, or discard this patch.
announce.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
  */
10 10
 
11 11
 $allow_anonymous = true;
12
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
12
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
13 13
 
14 14
 nws_mark_read($user);
15 15
 $template = gettemplate('announce', true);
@@ -23,42 +23,42 @@  discard block
 block discarded – undo
23 23
 $mode = sys_get_param_str('mode');
24 24
 
25 25
 $announce = array();
26
-if($user['authlevel'] >= 3) {
27
-  if(!empty($text)) {
26
+if ($user['authlevel'] >= 3) {
27
+  if (!empty($text)) {
28 28
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
29 29
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
30 30
 
31
-    if($mode == 'edit') {
31
+    if ($mode == 'edit') {
32 32
       DBStaticNews::db_news_update_set($announce_time, $text, $detail_url, $announce_id);
33 33
       DBStaticSurvey::db_survey_delete_by_id($announce_id);
34 34
     } else {
35 35
       DBStaticNews::db_news_insert_set($announce_time, $text_unsafe, $detail_url_unsafe, $user['id'], $user['username']);
36 36
       $announce_id = classSupernova::$db->db_insert_id();
37 37
     }
38
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
38
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
39 39
       $survey_answers = explode("\r\n", $survey_answers);
40 40
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
41 41
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
42 42
       $survey_question_unsafe = sys_get_param_str_unsafe('survey_question');
43 43
       DBStaticSurvey::db_survey_insert($announce_id, $survey_question_unsafe, $survey_until);
44 44
       $survey_id = classSupernova::$db->db_insert_id();
45
-      foreach($survey_answers as $survey_answer) {
45
+      foreach ($survey_answers as $survey_answer) {
46 46
         $survey_answer_unsafe = trim($survey_answer);
47
-        if(empty($survey_answer_unsafe)) {
47
+        if (empty($survey_answer_unsafe)) {
48 48
           continue;
49 49
         }
50 50
         DBStaticSurveyAnswer::db_survey_answer_insert($survey_id, $survey_answer_unsafe);
51 51
       }
52 52
     }
53 53
 
54
-    if($announce_time <= SN_TIME_NOW) {
55
-      if($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
54
+    if ($announce_time <= SN_TIME_NOW) {
55
+      if ($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
56 56
         classSupernova::$config->db_saveItem('var_news_last', $announce_time);
57 57
       }
58 58
 
59
-      if(sys_get_param_int('news_mass_mail')) {
59
+      if (sys_get_param_int('news_mass_mail')) {
60 60
         $lang_news_more = classLocale::$lang['news_more'];
61
-        $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
61
+        $text = sys_get_param('text').($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
62 62
         DBStaticMessages::msgSendFromAdmin('*', classLocale::$lang['news_title'], $text);
63 63
       }
64 64
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
   }
69 69
 
70 70
   $survey_answers = '';
71
-  switch($mode) {
71
+  switch ($mode) {
72 72
     case 'del':
73 73
       DBStaticNews::db_news_delete_by_id($announce_id);
74 74
       $mode = '';
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
       $template->assign_var('ID', $announce_id);
80 80
     case 'copy':
81 81
       $announce = DBStaticNews::db_news_with_survey_select_by_id($announce_id);
82
-      if($announce['survey_id']) {
82
+      if ($announce['survey_id']) {
83 83
         $query = DBStaticSurveyAnswer::db_survey_answer_text_select_by_news($announce);
84
-        while($row = db_fetch($query)) {
84
+        while ($row = db_fetch($query)) {
85 85
           $survey_answers[] = $row['survey_answer_text'];
86 86
         }
87 87
         $survey_answers = implode("\r\n", $survey_answers);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     break;
90 90
   }
91 91
 } else {
92
-  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= ' . SN_TIME_NOW;
92
+  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= '.SN_TIME_NOW;
93 93
 }
94 94
 
95 95
 nws_render($template, $annQuery, 20);
Please login to merge, or discard this patch.
notes.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 
11 11
 use Vector\Vector;
12 12
 
13
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
13
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
14 14
 lng_include('notes');
15 15
 
16 16
 global $user;
@@ -18,17 +18,17 @@  discard block
 block discarded – undo
18 18
 $template = gettemplate('notes', true);
19 19
 
20 20
 $result = array();
21
-if(($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
21
+if (($result_message = sys_get_param_str('MESSAGE')) && isset(classLocale::$lang[$result_message])) {
22 22
   $result[] = array('STATUS' => sys_get_param_int('STATUS'), 'MESSAGE' => classLocale::$lang[$result_message]);
23 23
 }
24 24
 
25 25
 $note_id_edit = sys_get_param_id('note_id_edit');
26 26
 $note_title_unsafe = sys_get_param_str_unsafe('note_title');
27 27
 $note_text_unsafe = sys_get_param_str_unsafe('note_text');
28
-if(sys_get_param('note_delete')) {
28
+if (sys_get_param('note_delete')) {
29 29
   try {
30 30
     DBStaticNote::processDelete($user, $note_id_edit);
31
-  } catch(Exception $e) {
31
+  } catch (Exception $e) {
32 32
     $note_id_edit = 0;
33 33
     sn_db_transaction_rollback();
34 34
     $result[] = array(
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
       'MESSAGE' => classLocale::$lang[$e->getMessage()],
37 37
     );
38 38
   }
39
-} elseif(($note_title_unsafe = sys_get_param_str_unsafe('note_title')) || ($note_text_unsafe = sys_get_param_str('note_text'))) {
39
+} elseif (($note_title_unsafe = sys_get_param_str_unsafe('note_title')) || ($note_text_unsafe = sys_get_param_str('note_text'))) {
40 40
   $note_title_unsafe == classLocale::$lang['note_new_title'] ? $note_title_unsafe = '' : false;
41 41
   $note_text_unsafe == classLocale::$lang['note_new_text'] ? $note_text_unsafe = '' : false;
42 42
   try {
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     $note_system = max(0, min(sys_get_param_id('note_system'), Vector::$knownSystems));
45 45
     $note_planet = max(0, min(sys_get_param_id('note_planet'), Vector::$knownPlanets + 1));
46 46
 
47
-    if(!$note_text_unsafe && !$note_title_unsafe && !$note_galaxy && !$note_system && !$note_planet) {
47
+    if (!$note_text_unsafe && !$note_title_unsafe && !$note_galaxy && !$note_system && !$note_planet) {
48 48
       throw new Exception('note_err_note_empty', ERR_WARNING);
49 49
     }
50 50
 
@@ -53,15 +53,15 @@  discard block
 block discarded – undo
53 53
     $note_sticky = intval(sys_get_param_id('note_sticky')) ? 1 : 0;
54 54
 
55 55
     sn_db_transaction_start();
56
-    if($note_id_edit) {
56
+    if ($note_id_edit) {
57 57
       $check_note_id = DBStaticNote::db_note_get_id_and_owner($note_id_edit);
58
-      if(!$check_note_id) {
58
+      if (!$check_note_id) {
59 59
         throw new Exception('note_err_note_not_found', ERR_ERROR);
60 60
       }
61 61
     }
62 62
 
63
-    if($note_id_edit) {
64
-      if($check_note_id['owner'] != $user['id']) {
63
+    if ($note_id_edit) {
64
+      if ($check_note_id['owner'] != $user['id']) {
65 65
         throw new Exception('note_err_owner_wrong', ERR_ERROR);
66 66
       }
67 67
 
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
     }
72 72
 
73 73
     sn_db_transaction_commit();
74
-    sys_redirect('notes.php?STATUS=' . ERR_NONE . '&MESSAGE=' . ($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
74
+    sys_redirect('notes.php?STATUS='.ERR_NONE.'&MESSAGE='.($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added'));
75 75
 //    throw new exception($note_id_edit ? 'note_err_none_changed' : 'note_err_none_added', ERR_NONE);
76
-  } catch(Exception $e) {
76
+  } catch (Exception $e) {
77 77
     $note_id_edit = 0;
78 78
     sn_db_transaction_rollback();
79 79
     $result[] = array(
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
   }
84 84
 }
85 85
 
86
-if(!$note_id_edit) {
86
+if (!$note_id_edit) {
87 87
   note_assign($template, array(
88 88
     'id'          => 0,
89 89
     'time'        => SN_TIME_NOW,
@@ -96,13 +96,13 @@  discard block
 block discarded – undo
96 96
 
97 97
 $note_exist = false;
98 98
 $notes_query = DBStaticNote::db_note_list_by_owner($user['id']);
99
-while($note_row = db_fetch($notes_query)) {
99
+while ($note_row = db_fetch($notes_query)) {
100 100
   note_assign($template, $note_row);
101 101
   $note_exist = $note_exist || $note_row['id'] == $note_id_edit;
102 102
 }
103 103
 $note_id_edit = $note_exist ? $note_id_edit : 0;
104 104
 
105
-foreach($note_priority_classes as $note_priority_id => $note_priority_class) {
105
+foreach ($note_priority_classes as $note_priority_id => $note_priority_class) {
106 106
   $template->assign_block_vars('note_priority', array(
107 107
     'ID'    => $note_priority_id,
108 108
     'CLASS' => $note_priority_classes[$note_priority_id],
@@ -110,14 +110,14 @@  discard block
 block discarded – undo
110 110
   ));
111 111
 }
112 112
 
113
-foreach(classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
113
+foreach (classLocale::$lang['sys_planet_type'] as $planet_type_id => $planet_type_string) {
114 114
   $template->assign_block_vars('planet_type', array(
115 115
     'ID'   => $planet_type_id,
116 116
     'TEXT' => $planet_type_string,
117 117
   ));
118 118
 }
119 119
 
120
-foreach($result as $result_data) {
120
+foreach ($result as $result_data) {
121 121
   $template->assign_block_vars('result', $result_data);
122 122
 }
123 123
 
Please login to merge, or discard this patch.
includes/db/db_queries.php 2 patches
Doc Comments   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -169,6 +169,11 @@  discard block
 block discarded – undo
169 169
  */
170 170
 // OK v4
171 171
 // TODO - вынести в отдельный класс
172
+/**
173
+ * @param string $db_id_field_name
174
+ * @param string $db_table_name
175
+ * @param string $db_value_field_name
176
+ */
172 177
 function db_get_set_unique_id_value($current_value_unsafe, $db_id_field_name, $db_table_name, $db_value_field_name) {
173 178
   $current_value_safe = db_escape($current_value_unsafe);
174 179
   $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 @@  discard block
 block discarded – undo
487 492
 
488 493
 
489 494
 /**
490
- * @param $user_id
491
- * @param $change_type
495
+ * @param integer $user_id
496
+ * @param integer $change_type
492 497
  * @param $dark_matter
493 498
  * @param $comment_unsafe
494 499
  * @param $rowUserNameUnsafe
@@ -509,7 +514,7 @@  discard block
 block discarded – undo
509 514
 /**
510 515
  * @param $user_id_safe
511 516
  *
512
- * @return array|bool|mysqli_result|null
517
+ * @return integer
513 518
  */
514 519
 function db_referral_get_by_id($user_id_safe) {
515 520
   $old_referral = classSupernova::$db->doSelectFetch("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;");
@@ -540,9 +545,9 @@  discard block
 block discarded – undo
540 545
 
541 546
 // Quests ***********************************************************************************************************
542 547
 /**
543
- * @param $query_add_select
548
+ * @param string $query_add_select
544 549
  * @param $query_add_from
545
- * @param $query_add_where
550
+ * @param string $query_add_where
546 551
  *
547 552
  * @return array|bool|mysqli_result|null
548 553
  */
@@ -586,11 +591,11 @@  discard block
 block discarded – undo
586 591
 }
587 592
 
588 593
 /**
589
- * @param $quest_name_unsafe
590
- * @param $quest_type
591
- * @param $quest_description_unsafe
594
+ * @param string $quest_name_unsafe
595
+ * @param integer $quest_type
596
+ * @param string $quest_description_unsafe
592 597
  * @param $quest_conditions
593
- * @param $quest_rewards
598
+ * @param string $quest_rewards
594 599
  * @param $quest_id
595 600
  */
596 601
 function db_quest_update($quest_name_unsafe, $quest_type, $quest_description_unsafe, $quest_conditions, $quest_rewards, $quest_id) {
@@ -674,7 +679,7 @@  discard block
 block discarded – undo
674 679
 
675 680
 /**
676 681
  * @param $payment_id
677
- * @param $payment_status
682
+ * @param integer $payment_status
678 683
  * @param $comment_unsafe
679 684
  */
680 685
 function db_payment_update($payment_id, $payment_status, $comment_unsafe) {
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -4,11 +4,11 @@  discard block
 block discarded – undo
4 4
 
5 5
 function db_planet_list_admin_list($table_parent_columns, $planet_active, $active_time, $planet_type) {
6 6
   return classSupernova::$db->doSelect(
7
-    "SELECT p.*, u.username" . ($table_parent_columns ? ', p1.name AS parent_name' : '') .
7
+    "SELECT p.*, u.username".($table_parent_columns ? ', p1.name AS parent_name' : '').
8 8
     " FROM {{planets}} AS p
9 9
       LEFT JOIN {{users}} AS u ON u.id = p.id_owner" .
10
-    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '') .
11
-    " WHERE " . ($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
10
+    ($table_parent_columns ? ' LEFT JOIN {{planets}} AS p1 ON p1.id = p.parent_planet' : '').
11
+    " WHERE ".($planet_active ? "p.last_update >= {$active_time}" : "p.planet_type = {$planet_type}"));
12 12
 }
13 13
 
14 14
 function db_planet_list_search($searchtext) {
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
     ORDER BY
107 107
       sp.`{$Rank}_rank`, subject.{$source['id']}
108 108
     LIMIT
109
-      " . $start . ",100;";
109
+      ".$start.",100;";
110 110
     } else { // , UNIX_TIMESTAMP(CONCAT(YEAR(CURRENT_DATE), DATE_FORMAT(`user_birthday`, '-%m-%d'))) AS `nearest_birthday`
111 111
       $query_str =
112 112
         "SELECT
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
     ORDER BY
120 120
       subject.{$Rank} DESC, subject.{$source['id']}
121 121
     LIMIT
122
-      " . $start . ",100;";
122
+      ".$start.",100;";
123 123
     }
124 124
   } else {
125 125
     // TODO
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
   ORDER BY
137 137
     sp.`{$Rank}_rank`, subject.id
138 138
   LIMIT
139
-    " . $start . ",100;";
139
+    ".$start.",100;";
140 140
   }
141 141
 
142 142
   return classSupernova::$db->doSelect($query_str);
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 
145 145
 
146 146
 function db_stat_list_update_ally_stats() {
147
-  return ;
147
+  return;
148 148
 }
149 149
 
150 150
 function db_stat_list_delete_ally_player() {
@@ -394,9 +394,9 @@  discard block
 block discarded – undo
394 394
  */
395 395
 function db_payment_list_get($flt_payer, $flt_status, $flt_test, $flt_module) {
396 396
   $extra_conditions =
397
-    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '') .
398
-    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '') .
399
-    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '') .
397
+    ($flt_payer > 0 ? "AND payment_user_id = {$flt_payer} " : '').
398
+    ($flt_status >= 0 ? "AND payment_status = {$flt_status} " : '').
399
+    ($flt_test >= 0 ? "AND payment_test = {$flt_test} " : '').
400 400
     ($flt_module ? "AND payment_module_name = '{$flt_module}' " : '');
401 401
   $query = classSupernova::$db->doSelect("SELECT * FROM `{{payment}}` WHERE 1 {$extra_conditions} ORDER BY payment_id DESC;");
402 402
 
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 // Log Online *************************************************************************************************************
426 426
 function db_log_online_insert() {
427 427
   classSupernova::$db->doInsertSet(TABLE_LOG_USERS_ONLINE, array(
428
-    'online_count' => (int)classSupernova::$config->var_online_user_count,
428
+    'online_count' => (int) classSupernova::$config->var_online_user_count,
429 429
   ), DB_INSERT_IGNORE);
430 430
 }
431 431
 
@@ -450,9 +450,9 @@  discard block
 block discarded – undo
450 450
 function db_log_delete_update_and_stat_calc() {
451 451
   classSupernova::$db->doDeleteSimple(
452 452
     'DELETE FROM `{{logs}}` WHERE `log_code` IN ('
453
-    . LOG_INFO_DB_CHANGE . ', '
454
-    . LOG_INFO_MAINTENANCE . ', '
455
-    . LOG_INFO_STAT_PROCESS .
453
+    . LOG_INFO_DB_CHANGE.', '
454
+    . LOG_INFO_MAINTENANCE.', '
455
+    . LOG_INFO_STAT_PROCESS.
456 456
     ')'
457 457
   );
458 458
 }
@@ -521,10 +521,10 @@  discard block
 block discarded – undo
521 521
 function db_log_dark_matter_insert($user_id, $change_type, $dark_matter, $comment_unsafe, $rowUserNameUnsafe, $page_url_unsafe) {
522 522
   return classSupernova::$db->doInsertSet(TABLE_LOG_DARK_MATTER, array(
523 523
     'log_dark_matter_username' => $rowUserNameUnsafe,
524
-    'log_dark_matter_reason'   => (int)$change_type,
525
-    'log_dark_matter_amount'   => (float)$dark_matter,
526
-    'log_dark_matter_comment'  => (string)$comment_unsafe,
527
-    'log_dark_matter_page'     => (string)$page_url_unsafe,
524
+    'log_dark_matter_reason'   => (int) $change_type,
525
+    'log_dark_matter_amount'   => (float) $dark_matter,
526
+    'log_dark_matter_comment'  => (string) $comment_unsafe,
527
+    'log_dark_matter_page'     => (string) $page_url_unsafe,
528 528
     'log_dark_matter_sender'   => $user_id,
529 529
   ));
530 530
 }
@@ -693,9 +693,9 @@  discard block
 block discarded – undo
693 693
 function db_ube_report_get_best_battles() {
694 694
   $query = classSupernova::$db->doSelect("SELECT *
695 695
       FROM `{{ube_report}}`
696
-      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS . " DAY))
696
+      WHERE `ube_report_time_process` <  DATE(DATE_SUB(NOW(), INTERVAL " . MODULE_INFO_BEST_BATTLES_LOCK_DAYS." DAY))
697 697
       ORDER BY `ube_report_debris_total_in_metal` DESC, `ube_report_id` ASC
698
-      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW . ";");
698
+      LIMIT " . MODULE_INFO_BEST_BATTLES_REPORT_VIEW.";");
699 699
 
700 700
   return $query;
701 701
 }
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin_mail.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
3
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
4 4
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
5 5
 }
6 6
 
7
-if(!$user_can_send_mails) {
7
+if (!$user_can_send_mails) {
8 8
   message(classLocale::$lang['Denied_access'], classLocale::$lang['Send_circular_mail']);
9 9
 }
10 10
 
11 11
 $POST_text = sys_get_param_str('text');
12 12
 $internalAliSendTextUnsafe = sys_get_param_str_unsafe('text');
13
-if($internalAliSendTextUnsafe) {
14
-  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", '');
13
+if ($internalAliSendTextUnsafe) {
14
+  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", '');
15 15
 }
16 16
 
17
-$r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
18
-if($ranks) {
19
-  foreach($ranks as $id => $array) {
20
-    $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
17
+$r_list = "<option value=\"-1\">".classLocale::$lang['All_players']."</option>";
18
+if ($ranks) {
19
+  foreach ($ranks as $id => $array) {
20
+    $r_list .= "<option value=\"".$id."\">".$array['name']."</option>";
21 21
   }
22 22
 }
23 23
 
Please login to merge, or discard this patch.