Completed
Push — work-fleets ( 8474eb...046d2e )
by SuperNova.WS
08:49
created
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.
includes/alliance/ali_internal_admin_mail.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,22 +1,22 @@
 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
-if($POST_text) {
13
-  message(classLocale::$lang['members_who_recived_message'] . DBStaticMessages::msg_ali_send($POST_text, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
12
+if ($POST_text) {
13
+  message(classLocale::$lang['members_who_recived_message'].DBStaticMessages::msg_ali_send($POST_text, classLocale::$lang['ali_adm_msg_subject'], sys_get_param_int('r')), classLocale::$lang['Circular_sended'], "alliance.php", '');
14 14
 }
15 15
 
16
-$r_list = "<option value=\"-1\">" . classLocale::$lang['All_players'] . "</option>";
17
-if($ranks) {
18
-  foreach($ranks as $id => $array) {
19
-    $r_list .= "<option value=\"" . $id . "\">" . $array['name'] . "</option>";
16
+$r_list = "<option value=\"-1\">".classLocale::$lang['All_players']."</option>";
17
+if ($ranks) {
18
+  foreach ($ranks as $id => $array) {
19
+    $r_list .= "<option value=\"".$id."\">".$array['name']."</option>";
20 20
   }
21 21
 }
22 22
 
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);
@@ -21,41 +21,41 @@  discard block
 block discarded – undo
21 21
 $mode = sys_get_param_str('mode');
22 22
 
23 23
 $announce = array();
24
-if($user['authlevel'] >= 3) {
25
-  if(!empty($text)) {
24
+if ($user['authlevel'] >= 3) {
25
+  if (!empty($text)) {
26 26
     $announce_time = strtotime($announce_time, SN_TIME_NOW);
27 27
     $announce_time = $announce_time ? $announce_time : SN_TIME_NOW;
28 28
 
29
-    if($mode == 'edit') {
29
+    if ($mode == 'edit') {
30 30
       DBStaticNews::db_news_update_set($announce_time, $text, $detail_url, $announce_id);
31 31
       DBStaticSurvey::db_survey_delete_by_id($announce_id);
32 32
     } else {
33 33
       DBStaticNews::db_news_insert_set($announce_time, $text, $detail_url, $user);
34 34
       $announce_id = db_insert_id();
35 35
     }
36
-    if(($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
36
+    if (($survey_question = sys_get_param_str('survey_question')) && ($survey_answers = sys_get_param('survey_answers'))) {
37 37
       $survey_answers = explode("\r\n", $survey_answers);
38 38
       $survey_until = strtotime($survey_until = sys_get_param_str('survey_until'), SN_TIME_NOW);
39 39
       $survey_until = date(FMT_DATE_TIME_SQL, $survey_until ? $survey_until : SN_TIME_NOW + PERIOD_DAY * 1);
40 40
       DBStaticSurvey::db_survey_insert($announce_id, $survey_question, $survey_until);
41 41
       $survey_id = db_insert_id();
42
-      foreach($survey_answers as $survey_answer) {
42
+      foreach ($survey_answers as $survey_answer) {
43 43
         $survey_answer = db_escape(trim($survey_answer));
44
-        if(empty($survey_answer)) {
44
+        if (empty($survey_answer)) {
45 45
           continue;
46 46
         }
47 47
         DBStaticSurveyAnswer::db_survey_answer_insert($survey_id, $survey_answer);
48 48
       }
49 49
     }
50 50
 
51
-    if($announce_time <= SN_TIME_NOW) {
52
-      if($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
51
+    if ($announce_time <= SN_TIME_NOW) {
52
+      if ($announce_time > classSupernova::$config->var_news_last && $announce_time == SN_TIME_NOW) {
53 53
         classSupernova::$config->db_saveItem('var_news_last', $announce_time);
54 54
       }
55 55
 
56
-      if(sys_get_param_int('news_mass_mail')) {
56
+      if (sys_get_param_int('news_mass_mail')) {
57 57
         $lang_news_more = classLocale::$lang['news_more'];
58
-        $text = sys_get_param('text') . ($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
58
+        $text = sys_get_param('text').($detail_url ? " <a href=\"{$detail_url}\"><span class=\"positive\">{$lang_news_more}</span></a>" : '');
59 59
         DBStaticMessages::msgSendFromAdmin('*', classLocale::$lang['news_title'], $text);
60 60
       }
61 61
     }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
   }
66 66
 
67 67
   $survey_answers = '';
68
-  switch($mode) {
68
+  switch ($mode) {
69 69
     case 'del':
70 70
       DBStaticNews::db_news_delete_by_id($announce_id);
71 71
       $mode = '';
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
       $template->assign_var('ID', $announce_id);
77 77
     case 'copy':
78 78
       $announce = DBStaticNews::db_news_with_survey_select_by_id($announce_id);
79
-      if($announce['survey_id']) {
79
+      if ($announce['survey_id']) {
80 80
         $query = DBStaticSurveyAnswer::db_survey_answer_text_select_by_news($announce);
81
-        while($row = db_fetch($query)) {
81
+        while ($row = db_fetch($query)) {
82 82
           $survey_answers[] = $row['survey_answer_text'];
83 83
         }
84 84
         $survey_answers = implode("\r\n", $survey_answers);
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     break;
87 87
   }
88 88
 } else {
89
-  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= ' . SN_TIME_NOW;
89
+  $annQuery = 'WHERE UNIX_TIMESTAMP(`tsTimeStamp`) <= '.SN_TIME_NOW;
90 90
 }
91 91
 
92 92
 nws_render($template, $annQuery, 20);
Please login to merge, or discard this patch.
includes/pages/options.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
   $language_new = sys_get_param_str('langer', $user['lang']);
14 14
 
15
-  if($language_new != $user['lang']) {
15
+  if ($language_new != $user['lang']) {
16 16
     classLocale::$lang->lng_switch($language_new);
17 17
   }
18 18
 
@@ -21,41 +21,41 @@  discard block
 block discarded – undo
21 21
 
22 22
   $FMT_DATE = preg_replace(array('/d/', '/m/', '/Y/'), array('DD', 'MM', 'YYYY'), FMT_DATE);
23 23
 
24
-  if(sys_get_param_str('mode') == 'change') {
25
-    if($user['authlevel'] > 0) {
24
+  if (sys_get_param_str('mode') == 'change') {
25
+    if ($user['authlevel'] > 0) {
26 26
       $planet_protection = sys_get_param_int('adm_pl_prot') ? $user['authlevel'] : 0;
27 27
       DBStaticPlanet::db_planet_set_by_owner($user['id'], "`id_level` = '{$planet_protection}'");
28 28
       DBStaticUser::db_user_set_by_id($user['id'], "`admin_protection` = '{$planet_protection}'");
29 29
       $user['admin_protection'] = $planet_protection;
30 30
     }
31 31
 
32
-    if(sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
32
+    if (sys_get_param_int('vacation') && !classSupernova::$config->user_vacation_disable) {
33 33
       sn_db_transaction_start();
34
-      if($user['authlevel'] < 3) {
35
-        if($user['vacation_next'] > SN_TIME_NOW) {
34
+      if ($user['authlevel'] < 3) {
35
+        if ($user['vacation_next'] > SN_TIME_NOW) {
36 36
           message(classLocale::$lang['opt_vacation_err_timeout'], classLocale::$lang['Error'], 'index.php?page=options', 5);
37 37
           die();
38 38
         }
39 39
 
40
-        if(FleetList::fleet_count_flying($user['id'])) {
40
+        if (FleetList::fleet_count_flying($user['id'])) {
41 41
           message(classLocale::$lang['opt_vacation_err_your_fleet'], classLocale::$lang['Error'], 'index.php?page=options', 5);
42 42
           die();
43 43
         }
44 44
 
45 45
         $que = que_get($user['id'], false);
46
-        if(!empty($que)) {
46
+        if (!empty($que)) {
47 47
           message(classLocale::$lang['opt_vacation_err_que'], classLocale::$lang['Error'], 'index.php?page=options', 5);
48 48
           die();
49 49
         }
50 50
 
51 51
         $query = classSupernova::db_get_record_list(LOC_PLANET, "`id_owner` = {$user['id']}");
52
-        foreach($query as $planet) {
52
+        foreach ($query as $planet) {
53 53
           // $planet = sys_o_get_updated($user, $planet, SN_TIME_NOW);
54 54
           // $planet = $planet['planet'];
55 55
 
56 56
           $classConfig = classSupernova::$config;
57 57
           DBStaticPlanet::db_planet_set_by_id($planet['id'],
58
-            "last_update = " . SN_TIME_NOW . ", energy_used = '0', energy_max = '0',
58
+            "last_update = ".SN_TIME_NOW.", energy_used = '0', energy_max = '0',
59 59
             metal_perhour = '{$classConfig->metal_basic_income}', crystal_perhour = '{$classConfig->crystal_basic_income}', deuterium_perhour = '{$classConfig->deuterium_basic_income}',
60 60
             metal_mine_porcent = '0', crystal_mine_porcent = '0', deuterium_sintetizer_porcent = '0', solar_plant_porcent = '0',
61 61
             fusion_plant_porcent = '0', solar_satelit_porcent = '0', ship_sattelite_sloth_porcent = 0"
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
       sn_db_transaction_commit();
69 69
     }
70 70
 
71
-    foreach($user_option_list as $option_group_id => $option_group) {
72
-      foreach($option_group as $option_name => $option_value) {
73
-        if($user[$option_name] !== null) {
71
+    foreach ($user_option_list as $option_group_id => $option_group) {
72
+      foreach ($option_group as $option_name => $option_value) {
73
+        if ($user[$option_name] !== null) {
74 74
           $user[$option_name] = sys_get_param_str($option_name);
75 75
         } else {
76 76
           $user[$option_name] = $option_value;
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
     $player_options = sys_get_param('options');
84
-    if(!empty($player_options)) {
85
-      array_walk($player_options, function (&$value) {
84
+    if (!empty($player_options)) {
85
+      array_walk($player_options, function(&$value) {
86 86
         // TODO - Когда будет больше параметров - сделать больше проверок
87 87
         $value = intval($value);
88 88
       });
@@ -93,15 +93,15 @@  discard block
 block discarded – undo
93 93
 
94 94
     $username = substr(sys_get_param_str_unsafe('username'), 0, 32);
95 95
     $username_safe = db_escape($username);
96
-    if($username && $user['username'] != $username && classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
96
+    if ($username && $user['username'] != $username && classSupernova::$config->game_user_changename != SERVER_PLAYER_NAME_CHANGE_NONE && sys_get_param_int('username_confirm') && !strpbrk($username, LOGIN_REGISTER_CHARACTERS_PROHIBITED)) {
97 97
       // проверка на корректность
98 98
       sn_db_transaction_start();
99 99
       $name_check = db_player_name_history_get_name_by_name($username_safe);
100
-      if(!$name_check || $name_check['player_id'] == $user['id']) {
100
+      if (!$name_check || $name_check['player_id'] == $user['id']) {
101 101
         $user = DBStaticUser::db_user_by_id($user['id'], true);
102
-        switch(classSupernova::$config->game_user_changename) {
102
+        switch (classSupernova::$config->game_user_changename) {
103 103
           case SERVER_PLAYER_NAME_CHANGE_PAY:
104
-            if(mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
104
+            if (mrc_get_level($user, $planetrow, RES_DARK_MATTER) < classSupernova::$config->game_user_changename_cost) {
105 105
               $template_result['.']['result'][] = array(
106 106
                 'STATUS'  => ERR_ERROR,
107 107
                 'MESSAGE' => classLocale::$lang['opt_msg_name_change_err_no_dm'],
@@ -131,18 +131,18 @@  discard block
 block discarded – undo
131 131
       sn_db_transaction_commit();
132 132
     }
133 133
 
134
-    if($new_password = sys_get_param('newpass1')) {
134
+    if ($new_password = sys_get_param('newpass1')) {
135 135
       try {
136
-        if($new_password != sys_get_param('newpass2')) {
136
+        if ($new_password != sys_get_param('newpass2')) {
137 137
           throw new Exception(classLocale::$lang['opt_err_pass_unmatched'], ERR_WARNING);
138 138
         }
139 139
 
140
-        if(!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
140
+        if (!classSupernova::$auth->password_change(sys_get_param('db_password'), $new_password)) {
141 141
           throw new Exception(classLocale::$lang['opt_err_pass_wrong'], ERR_WARNING);
142 142
         }
143 143
 
144 144
         throw new Exception(classLocale::$lang['opt_msg_pass_changed'], ERR_NONE);
145
-      } catch(Exception $e) {
145
+      } catch (Exception $e) {
146 146
         $template_result['.']['result'][] = array(
147 147
           'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
148 148
           'MESSAGE' => $e->getMessage()
@@ -164,12 +164,12 @@  discard block
 block discarded – undo
164 164
     $user['gender'] = $user['gender'] == GENDER_UNKNOWN ? $gender : $user['gender'];
165 165
 
166 166
     try {
167
-      if($user['birthday']) {
167
+      if ($user['birthday']) {
168 168
         throw new exception();
169 169
       }
170 170
 
171 171
       $user_birthday = sys_get_param_str_unsafe('user_birthday');
172
-      if(!$user_birthday || $user_birthday == $FMT_DATE) {
172
+      if (!$user_birthday || $user_birthday == $FMT_DATE) {
173 173
         throw new exception();
174 174
       }
175 175
 
@@ -179,16 +179,16 @@  discard block
 block discarded – undo
179 179
       $pos['Y'] = strpos(FMT_DATE, 'Y');
180 180
       asort($pos);
181 181
       $i = 0;
182
-      foreach($pos as &$position) {
182
+      foreach ($pos as &$position) {
183 183
         $position = ++$i;
184 184
       }
185 185
 
186
-      $regexp = "/" . preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE) . "/";
187
-      if(!preg_match($regexp, $user_birthday, $match)) {
186
+      $regexp = "/".preg_replace(array('/\\\\/', '/\//', '/\./', '/\-/', '/d/', '/m/', '/Y/'), array('\\\\\\', '\/', '\.', '\-', '(\d?\d)', '(\d?\d)', '(\d{4})'), FMT_DATE)."/";
187
+      if (!preg_match($regexp, $user_birthday, $match)) {
188 188
         throw new exception();
189 189
       }
190 190
 
191
-      if(!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
191
+      if (!checkdate($match[$pos['m']], $match[$pos['d']], $match[$pos['Y']])) {
192 192
         throw new exception();
193 193
       }
194 194
 
@@ -196,13 +196,13 @@  discard block
 block discarded – undo
196 196
       // EOF black magic! Now we have valid SQL date in $user['user_birthday'] - independent of date format
197 197
 
198 198
       $year = date('Y', SN_TIME_NOW);
199
-      if(mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
199
+      if (mktime(0, 0, 0, $match[$pos['m']], $match[$pos['d']], $year) > SN_TIME_NOW) {
200 200
         $year--;
201 201
       }
202 202
       $user['user_birthday_celebrated'] = db_escape("{$year}-{$match[$pos['m']]}-{$match[$pos['d']]}");
203 203
 
204 204
       $user_birthday = ", `user_birthday` = '{$user['user_birthday']}', `user_birthday_celebrated` = '{$user['user_birthday_celebrated']}'";
205
-    } catch(exception $e) {
205
+    } catch (exception $e) {
206 206
       $user_birthday = '';
207 207
     }
208 208
 
@@ -212,14 +212,14 @@  discard block
 block discarded – undo
212 212
     $template_result['.']['result'][] = $avatar_upload_result;
213 213
 
214 214
     $user_time_diff = playerTimeDiff::user_time_diff_get();
215
-    if(sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
215
+    if (sys_get_param_int('PLAYER_OPTION_TIME_DIFF_FORCED')) {
216 216
       playerTimeDiff::user_time_diff_set(array(
217 217
         PLAYER_OPTION_TIME_DIFF              => sys_get_param_int('PLAYER_OPTION_TIME_DIFF'),
218 218
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
219 219
         PLAYER_OPTION_TIME_DIFF_FORCED       => 1,
220 220
         PLAYER_OPTION_TIME_DIFF_MEASURE_TIME => SN_TIME_SQL,
221 221
       ));
222
-    } elseif(sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
222
+    } elseif (sys_get_param_int('opt_time_diff_clear') || $user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
223 223
       playerTimeDiff::user_time_diff_set(array(
224 224
         PLAYER_OPTION_TIME_DIFF              => '',
225 225
         PLAYER_OPTION_TIME_DIFF_UTC_OFFSET   => 0,
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
       'STATUS'  => ERR_NONE,
240 240
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
241 241
     );
242
-  } elseif(sys_get_param_str('result') == 'ok') {
242
+  } elseif (sys_get_param_str('result') == 'ok') {
243 243
     $template_result['.']['result'][] = array(
244 244
       'STATUS'  => ERR_NONE,
245 245
       'MESSAGE' => classLocale::$lang['opt_msg_saved']
@@ -262,9 +262,9 @@  discard block
 block discarded – undo
262 262
 
263 263
   $template = gettemplate('options', $template);
264 264
 
265
-  $dir = dir(SN_ROOT_PHYSICAL . 'skins');
266
-  while(($entry = $dir->read()) !== false) {
267
-    if(is_dir("skins/{$entry}") && $entry[0] != '.') {
265
+  $dir = dir(SN_ROOT_PHYSICAL.'skins');
266
+  while (($entry = $dir->read()) !== false) {
267
+    if (is_dir("skins/{$entry}") && $entry[0] != '.') {
268 268
       $template_result['.']['skin_list'][] = array(
269 269
         'VALUE'    => $entry,
270 270
         'NAME'     => $entry,
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
   }
275 275
   $dir->close();
276 276
 
277
-  foreach(classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
277
+  foreach (classLocale::$lang['opt_planet_sort_options'] as $key => &$value) {
278 278
     $template_result['.']['planet_sort_options'][] = array(
279 279
       'VALUE'    => $key,
280 280
       'NAME'     => $value,
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
     );
283 283
   }
284 284
 
285
-  foreach(classLocale::$lang['sys_gender_list'] as $key => $value) {
285
+  foreach (classLocale::$lang['sys_gender_list'] as $key => $value) {
286 286
     $template_result['.']['gender_list'][] = array(
287 287
       'VALUE'    => $key,
288 288
       'NAME'     => $value,
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
   }
292 292
 
293 293
   $lang_list = lng_get_list();
294
-  foreach($lang_list as $lang_id => $lang_data) {
294
+  foreach ($lang_list as $lang_id => $lang_data) {
295 295
     $template_result['.']['languages'][] = array(
296 296
       'VALUE'    => $lang_id,
297 297
       'NAME'     => $lang_data['LANG_NAME_NATIVE'],
@@ -300,8 +300,8 @@  discard block
 block discarded – undo
300 300
   }
301 301
 
302 302
 
303
-  if(isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
304
-    foreach(classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
303
+  if (isset(classLocale::$lang['menu_customize_show_hide_button_state'])) {
304
+    foreach (classLocale::$lang['menu_customize_show_hide_button_state'] as $key => $value) {
305 305
       $template->assign_block_vars('menu_customize_show_hide_button_state', array(
306 306
         'ID'   => $key,
307 307
         'NAME' => $value,
@@ -408,10 +408,10 @@  discard block
 block discarded – undo
408 408
     'PAGE_HEADER' => classLocale::$lang['opt_header'],
409 409
   ));
410 410
 
411
-  foreach($user_option_list as $option_group_id => $option_group) {
412
-    if($option_group_id == OPT_MESSAGE) {
413
-      foreach(DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
414
-        if($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
411
+  foreach ($user_option_list as $option_group_id => $option_group) {
412
+    if ($option_group_id == OPT_MESSAGE) {
413
+      foreach (DBStaticMessages::$snMessageClassList as $message_class_id => $message_class_data) {
414
+        if ($message_class_data['switchable'] || ($message_class_data['email'] && classSupernova::$config->game_email_pm)) {
415 415
           $option_name = $message_class_data['name'];
416 416
 
417 417
           $template->assign_block_vars("options_{$option_group_id}", array(
@@ -423,8 +423,8 @@  discard block
 block discarded – undo
423 423
         }
424 424
       }
425 425
     } else {
426
-      foreach($option_group as $option_name => $option_value) {
427
-        if(array_key_exists($option_name, $user_option_types)) {
426
+      foreach ($option_group as $option_name => $option_value) {
427
+        if (array_key_exists($option_name, $user_option_types)) {
428 428
           $option_type = $user_option_types[$option_name];
429 429
         } else {
430 430
           $option_type = 'switch';
Please login to merge, or discard this patch.
admin/adm_message_list.php 1 patch
Spacing   +11 added lines, -11 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,17 +41,17 @@  discard block
 block discarded – undo
41 41
 
42 42
 
43 43
 $message_delete = sys_get_param_id('msg_del');
44
-if(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
44
+if (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete)) {
45 45
   $message_delete = implode(', ', $message_delete);
46 46
 }
47 47
 
48
-if($message_delete) {
48
+if ($message_delete) {
49 49
   DBStaticMessages::db_message_list_delete_set($message_delete);
50 50
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted'], $message_delete)));
51 51
 }
52 52
 
53 53
 
54
-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'))) {
54
+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'))) {
55 55
   $delete_date = "{$year}-{$month}-{$day}";
56 56
   DBStaticMessages::db_message_list_delete_by_date($delete_date, $int_type_selected);
57 57
   $template->assign_block_vars('result', array('MESSAGE' => sprintf(classLocale::$lang['mlst_messages_deleted_date'], $allowed_types[$int_type_selected]['TEXT'], $delete_date)));
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
63 63
 
64 64
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
65 65
 
66
-if(sys_get_param('page_prev') && $int_page_current > 1) {
66
+if (sys_get_param('page_prev') && $int_page_current > 1) {
67 67
   $int_page_current--;
68
-} elseif(sys_get_param('page_next') && $int_page_current < $page_max) {
68
+} elseif (sys_get_param('page_next') && $int_page_current < $page_max) {
69 69
   $int_page_current++;
70 70
 }
71 71
 
72
-for($i = 1; $i <= $page_max; $i++) {
72
+for ($i = 1; $i <= $page_max; $i++) {
73 73
   $template->assign_block_vars('page', array('NUMBER' => $i));
74 74
 }
75 75
 
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 $StartRec = ($int_page_current - 1) * 25;
78 78
 
79 79
 $Messages = DBStaticMessages::db_message_list_admin_by_type($int_type_selected, $StartRec);
80
-while($row = db_fetch($Messages)) {
80
+while ($row = db_fetch($Messages)) {
81 81
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
82 82
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
83 83
   $row['TEXT'] = nl2br($row['TEXT']);
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.