Completed
Push — trunk ( d06df9...f48ee3 )
by SuperNova.WS
11:23
created
jumpgate.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -118,8 +118,7 @@
 block discarded – undo
118 118
     ));
119 119
 
120 120
     SnTemplate::display($template, $lang['tech'][STRUC_MOON_GATE]);
121
-  }
122
-  else
121
+  } else
123 122
   {
124 123
     SnTemplate::messageBox($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
125 124
   }
Please login to merge, or discard this patch.
includes/pages/chat.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -4,8 +4,7 @@  discard block
 block discarded – undo
4 4
  *
5 5
  */
6 6
 
7
-function sn_chat_model()
8
-{
7
+function sn_chat_model() {
9 8
   global $config, $user, $template_result, $lang;
10 9
 
11 10
   $config->array_set('users', $user['id'], 'chat_last_activity', SN_TIME_MICRO);
@@ -44,15 +43,13 @@  discard block
 block discarded – undo
44 43
 
45 44
   $template_result['PAGE_HEADER'] = $page_title;
46 45
 }
47
-function sn_chat_view($template = null)
48
-{
46
+function sn_chat_view($template = null) {
49 47
   $template = SnTemplate::gettemplate('chat_body', $template);
50 48
 
51 49
   return $template;
52 50
 }
53 51
 
54
-function sn_chat_add_model()
55
-{
52
+function sn_chat_add_model() {
56 53
   global $config, $user;
57 54
 
58 55
   define('IN_AJAX', true);
@@ -82,8 +79,7 @@  discard block
 block discarded – undo
82 79
 
83 80
   die();
84 81
 }
85
-function sn_chat_msg_view($template = null)
86
-{
82
+function sn_chat_msg_view($template = null) {
87 83
   global $config, $user, $lang;
88 84
 
89 85
   define('IN_AJAX', true);
@@ -105,8 +101,7 @@  discard block
 block discarded – undo
105 101
       'TIME' => date(FMT_DATE_TIME, htmlentities(SN_CLIENT_TIME_LOCAL, ENT_QUOTES, 'utf-8')),
106 102
       'DISABLE' => true,
107 103
     );
108
-  }
109
-  else
104
+  } else
110 105
   {
111 106
     $alliance = sys_get_param_str('ally') && $user['ally_id'] ? $user['ally_id'] : 0;
112 107
 
@@ -127,8 +122,7 @@  discard block
 block discarded – undo
127 122
       }
128 123
 
129 124
       $page = min($page_count, max(0, sys_get_param_int('sheet')));
130
-    }
131
-    else
125
+    } else
132 126
     {
133 127
       $last_message = sys_get_param_id('last_message');
134 128
       $where_add = $last_message ? "AND `messageid` > {$last_message}" : '';
@@ -174,8 +168,7 @@  discard block
 block discarded – undo
174 168
   {
175 169
     $pageTitle = "{$lang['chat_history']} - {$lang[$alliance ? 'chat_ally' : 'chat_common']}";
176 170
     SnTemplate::display($template, $pageTitle);
177
-  }
178
-  else
171
+  } else
179 172
   {
180 173
     $result['last_message'] = $last_message;
181 174
     $result['html'] = SnTemplate::templateRenderToHtml($template);
Please login to merge, or discard this patch.
includes/alliance/ali_info.inc 1 patch
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -26,16 +26,14 @@  discard block
 block discarded – undo
26 26
     $lang['Go_out_welldone'] = str_replace("%s", $ally_name, $lang['Go_out_welldone']);
27 27
     SnTemplate::messageBox(sprintf($lang['ali_info_leave_success'], $ally['ally_name']), $lang['sys_alliance']);
28 28
   }
29
-}
30
-elseif($mode == 'ainfo')
29
+} elseif($mode == 'ainfo')
31 30
 {
32 31
   $tag = sys_get_param_str('tag');
33 32
   $id_ally = sys_get_param_id('a');
34 33
   if($tag)
35 34
   {
36 35
     $ally = doquery("SELECT * FROM {{alliance}} WHERE ally_tag='{$tag}' LIMIT 1;", '', true);
37
-  }
38
-  elseif($id_ally)
36
+  } elseif($id_ally)
39 37
   {
40 38
     $ally = doquery("SELECT * FROM {{alliance}} WHERE id='{$id_ally}' LIMIT 1;", '', true);
41 39
   }
@@ -55,20 +53,17 @@  discard block
 block discarded – undo
55 53
     'USER_ALLY_ID' => $user['ally_id'],
56 54
   ));
57 55
   $page_header          = $lang['sys_alliance'];
58
-}
59
-else
56
+} else
60 57
 {
61 58
   $page_header = $lang['your_alliance'];
62 59
 
63 60
   if($ally['ally_owner'] == $user['id'])
64 61
   {
65 62
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : $lang['Founder'];
66
-  }
67
-  elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
63
+  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name']))
68 64
   {
69 65
     $range = $ranks[$user['ally_rank_id']]['name'];
70
-  }
71
-  else
66
+  } else
72 67
   {
73 68
     $range = $lang['member'];
74 69
   }
Please login to merge, or discard this patch.
includes/alliance/ali_internal_admin_diplomacy.inc 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@  discard block
 block discarded – undo
68 68
       ->doInsert();
69 69
 
70 70
     $accept_offer = false;
71
-  }
72
-  else
71
+  } else
73 72
   {
74 73
     $accept_offer = true;
75 74
     $autoAccept = true;
@@ -81,8 +80,7 @@  discard block
 block discarded – undo
81 80
       'alliance_negotiation_relation' => $alliance_negotiation_relation,
82 81
     );
83 82
   }
84
-}
85
-else
83
+} else
86 84
 {
87 85
   $offer_id = sys_get_param_id('offer_id');
88 86
   if($offer_id)
@@ -93,31 +91,26 @@  discard block
 block discarded – undo
93 91
     if(!$negotiation)
94 92
     {
95 93
       SnTemplate::messageBox($lang['ali_dip_err_offer_none'], $page_title);
96
-    }
97
-    elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
94
+    } elseif($negotiation['alliance_negotiation_ally_id'] != $user['ally_id'] && $negotiation['alliance_negotiation_contr_ally_id'] != $user['ally_id'])
98 95
     {
99 96
       // TODO: Add log of hack attempt
100 97
       SnTemplate::messageBox($lang['ali_dip_err_offer_alien'], $page_title);
101
-    }
102
-    elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
98
+    } elseif($negotiation['alliance_negotiation_ally_id'] == $user['ally_id'])
103 99
     {
104 100
       if($offer_answer == 'accept')
105 101
       {
106 102
         // TODO: Add log of hack attempt
107 103
         SnTemplate::messageBox($lang['ali_dip_err_offer_accept_own'], $page_title);
108
-      }
109
-      elseif($offer_answer == 'deny')
104
+      } elseif($offer_answer == 'deny')
110 105
       {
111 106
         doquery("DELETE FROM {{alliance_negotiation}} WHERE alliance_negotiation_id = {$offer_id} LIMIT 1;");
112 107
       }
113
-    }
114
-    else
108
+    } else
115 109
     {
116 110
       if($offer_answer == 'accept')
117 111
       {
118 112
         $accept_offer = true;
119
-      }
120
-      elseif($offer_answer == 'deny')
113
+      } elseif($offer_answer == 'deny')
121 114
       {
122 115
         DBStaticAlly::db_ally_negotiation_update_status_1($offer_id);
123 116
       }
Please login to merge, or discard this patch.