Test Failed
Branch trunk (412648)
by SuperNova.WS
03:40
created
includes/includes/flt_mission_attack.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 */
8 8
 
9 9
 
10
-function flt_planet_capture(&$fleet_row, &$combat_data) {return sn_function_call('flt_planet_capture', array(&$fleet_row, &$combat_data, &$result));}
10
+function flt_planet_capture(&$fleet_row, &$combat_data) {return sn_function_call('flt_planet_capture', array(&$fleet_row, &$combat_data, &$result)); }
11 11
 function sn_flt_planet_capture(&$fleet_row, &$combat_data, &$result) {
12 12
   return $result;
13 13
 }
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
17 17
   $destination_user = $mission_data['dst_user'];
18 18
   $destination_planet = $mission_data['dst_planet'];
19 19
 
20
-  if(!$fleet_row) {
20
+  if (!$fleet_row) {
21 21
     return null;
22 22
   }
23 23
 
24
-  if(
24
+  if (
25 25
     // Нет данных о планете назначения или её владельце
26 26
     empty($destination_user) || empty($destination_planet) || !is_array($destination_user) || !is_array($destination_planet)
27 27
     ||
Please login to merge, or discard this patch.
includes/pages/battle_report.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 
16 16
   $combat_data = sn_ube_report_load(sys_get_param_str('cypher'));
17 17
 
18
-  if($combat_data != UBE_REPORT_NOT_FOUND) {
18
+  if ($combat_data != UBE_REPORT_NOT_FOUND) {
19 19
     sn_ube_report_generate($combat_data, $template_result);
20 20
     $template = gettemplate('ube_combat_report', $template);
21 21
     $template->assign_vars(array(
Please login to merge, or discard this patch.
includes/pages/techtree.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@
 block discarded – undo
14 14
   global $lang, $user, $planetrow;
15 15
 
16 16
   $tech_tree = array();
17
-  foreach(get_unit_param('techtree') as $unit_group_id => $unit_list)
17
+  foreach (get_unit_param('techtree') as $unit_group_id => $unit_list)
18 18
   {
19 19
     $tech_tree[] = array(
20 20
       'NAME' => $lang['tech'][$unit_group_id],
21 21
       'GROUP_ID' => $unit_group_id,
22 22
     );
23 23
 
24
-    foreach($unit_list as $unit_id)
24
+    foreach ($unit_list as $unit_id)
25 25
     {
26 26
       $sn_data_unit = get_unit_param($unit_id);
27 27
       $level_basic = $sn_data_unit[P_STACKABLE] ? 0 : mrc_get_level($user, $planetrow, $unit_id, false, true);
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,7 @@
 block discarded – undo
6 6
  * version 2.0 copyright (c) 2012 by Gorlum for http://supernova.ws
7 7
  */
8 8
 
9
-function sn_techtree_view($template = null)
10
-{
9
+function sn_techtree_view($template = null) {
11 10
   global $lang, $user, $planetrow;
12 11
 
13 12
   $tech_tree = array();
Please login to merge, or discard this patch.
includes/pages/contact.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
   $query = db_user_list("`authlevel` > 0 ORDER BY `authlevel` ASC");
19 19
 
20 20
   // while($row = db_fetch($query))
21
-  foreach($query as $row)
21
+  foreach ($query as $row)
22 22
   {
23 23
     $template_result['.']['contact'][] = array(
24 24
       'NAME'  => $row['username'],
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,8 +4,7 @@
 block discarded – undo
4 4
  * List of authorities: admin, ops, moders
5 5
  */
6 6
 
7
-function sn_contact_view($template = null)
8
-{
7
+function sn_contact_view($template = null) {
9 8
   global $template_result, $lang;
10 9
 
11 10
   $template = gettemplate('contact', $template);
Please login to merge, or discard this patch.
includes/vars_structures.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
       'factor' => 1.5,
16 16
     ),
17 17
     P_UNIT_PRODUCTION => array(
18
-      RES_METAL     => function ($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
19
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
18
+      RES_METAL     => function($level, $production_factor, $user, $planet_row) {return  40 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
19
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -13 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
20 20
     ),
21 21
     P_MINING_IS_MANAGED => true,
22 22
   ),
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
33 33
       'factor' => 1.6,
34 34
     ),
35 35
     P_UNIT_PRODUCTION => array(
36
-      RES_CRYSTAL   => function ($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
37
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
36
+      RES_CRYSTAL   => function($level, $production_factor, $user, $planet_row) {return  32 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
37
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -16 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
38 38
     ),
39 39
     P_MINING_IS_MANAGED => true,
40 40
   ),
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
       'factor' => 1.5,
52 52
     ),
53 53
     P_UNIT_PRODUCTION => array(
54
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28);},
55
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
54
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return  10 * $level * pow(1.1, $level) * (0.1 * $production_factor) * (-0.002 * $planet_row["temp_max"] + 1.28); },
55
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return -20 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
56 56
     ),
57 57
     P_MINING_IS_MANAGED => true,
58 58
   ),
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
       'factor' => 1.5,
70 70
     ),
71 71
     P_UNIT_PRODUCTION => array(
72
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor);},
72
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return ($planet_row["temp_max"] / 5 + 15) * $level * pow(1.1, $level) * (0.1 * $production_factor); },
73 73
     ),
74 74
     P_MINING_IS_MANAGED => true,
75 75
   ),
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
       'factor' => 1.8,
88 88
     ),
89 89
     P_UNIT_PRODUCTION => array(
90
-      RES_DEUTERIUM => function ($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor);},
91
-      RES_ENERGY    => function ($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor);},
90
+      RES_DEUTERIUM => function($level, $production_factor, $user, $planet_row) {return -10 * $level * pow(1.1, $level) * (0.1 * $production_factor); },
91
+      RES_ENERGY    => function($level, $production_factor, $user, $planet_row) {return  30 * $level * pow(1.05 + 0.01 * mrc_get_level($user, "", TECH_ENERGY), $level) * (0.1 * $production_factor); },
92 92
     ),
93 93
     P_MINING_IS_MANAGED => true,
94 94
   ),
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
       'factor' => 2,
106 106
     ),
107 107
     'storage' => array(
108
-      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
108
+      RES_METAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
109 109
     ),
110 110
   ),
111 111
 
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
       'factor' => 2,
122 122
     ),
123 123
     'storage' => array(
124
-      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
124
+      RES_CRYSTAL => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
125 125
     ),
126 126
   ),
127 127
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
       'factor' => 2,
138 138
     ),
139 139
     'storage' => array(
140
-      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level);},
140
+      RES_DEUTERIUM => function($level) {return BASE_STORAGE_SIZE * pow(1.5, $level); },
141 141
     ),
142 142
   ),
143 143
 
Please login to merge, or discard this patch.
includes/functions/int_banner_create.php 2 patches
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -30,29 +30,29 @@  discard block
 block discarded – undo
30 30
   }
31 31
   $size = getimagesize(SN_ROOT_PHYSICAL . $img_name);
32 32
   $im = imagecreatefrompng(SN_ROOT_PHYSICAL . $img_name);
33
-  $image = imagecreatetruecolor($size[0],$size[1]);
34
-  imagecopy($image,$im,0,0,0,0,$size[0],$size[1]);
33
+  $image = imagecreatetruecolor($size[0], $size[1]);
34
+  imagecopy($image, $im, 0, 0, 0, 0, $size[0], $size[1]);
35 35
   imagedestroy($im);
36 36
 
37 37
   // Colors
38 38
   $color = "FFFFFF";
39
-  $red = hexdec(substr($color,0,2));
40
-  $green = hexdec(substr($color,2,4));
41
-  $blue = hexdec(substr($color,4,6));
42
-  $select = imagecolorallocate($image,$red,$green,$blue);
39
+  $red = hexdec(substr($color, 0, 2));
40
+  $green = hexdec(substr($color, 2, 4));
41
+  $blue = hexdec(substr($color, 4, 6));
42
+  $select = imagecolorallocate($image, $red, $green, $blue);
43 43
   $txt_shadow = imagecolorallocatealpha($image, 255, 255, 255, 255);
44 44
   $txt_color = imagecolorallocatealpha($image, 255, 255, 255, 2);
45 45
   $txt_shadow2 = imagecolorallocatealpha($image, 255, 255, 255, 255);
46 46
   $txt_color2 = imagecolorallocatealpha($image, 255, 255, 255, 40);
47 47
 
48
-  $fonts = array (
48
+  $fonts = array(
49 49
     'userbar' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_userbar_font,
50 50
     'universe' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontUniverse,
51 51
     'raids' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontRaids,
52 52
     'info' => SN_ROOT_PHYSICAL . "design/fonts/" . $config->int_banner_fontInfo,
53 53
   );
54 54
 
55
-  if($id)
55
+  if ($id)
56 56
   {
57 57
     // Querys
58 58
     $user = db_user_by_id($id);
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
     $b_user = $user['username'];
63 63
     $b_ally = $user['ally_name'];
64 64
     $b_planet = $planet_row['name'];
65
-    $b_xyz = "[".$planet_row['galaxy'].":".$planet_row['system'].":".$planet_row['planet']."]";
66
-    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) ."/{$config->users_amount}";
65
+    $b_xyz = "[" . $planet_row['galaxy'] . ":" . $planet_row['system'] . ":" . $planet_row['planet'] . "]";
66
+    $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) . "/{$config->users_amount}";
67 67
   }
68 68
   else
69 69
   {
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
       imagettftext($image, 11, 0, 8, 26, $txt_shadow, $fonts['info'], $b_user);
86 86
       imagettftext($image, 11, 0, 6, 23, $txt_color, $fonts['info'], $b_user);
87 87
 
88
-      if($id)
88
+      if ($id)
89 89
       {
90 90
         // Player level - right-alligned
91 91
         $is = imagettfbbox(11, 0, $fonts['info'], $b_lvl);
@@ -94,37 +94,37 @@  discard block
 block discarded – undo
94 94
 
95 95
         // Ally name
96 96
         $is = imagettfbbox(9, 0, $fonts['info'], $b_ally);
97
-        imagettftext($image, 9, 0, 412-$is[2], 37, $txt_shadow, $fonts['info'], $b_ally);
98
-        imagettftext($image, 9, 0, 410-$is[2], 35, $txt_color, $fonts['info'], $b_ally);
97
+        imagettftext($image, 9, 0, 412 - $is[2], 37, $txt_shadow, $fonts['info'], $b_ally);
98
+        imagettftext($image, 9, 0, 410 - $is[2], 35, $txt_color, $fonts['info'], $b_ally);
99 99
 
100 100
         // Player b_planet
101
-        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet." ".$b_xyz);
102
-        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet." ".$b_xyz);
101
+        imagettftext($image, 6, 0, 8, 10, $txt_shadow2, $fonts['raids'], $b_planet . " " . $b_xyz);
102
+        imagettftext($image, 6, 0, 6, 9, $txt_color2, $fonts['raids'], $b_planet . " " . $b_xyz);
103 103
 
104 104
         //StatPoint
105
-        $b_points = $lang['ov_points'].": ".pretty_number($user['total_points']);
105
+        $b_points = $lang['ov_points'] . ": " . pretty_number($user['total_points']);
106 106
         $is = imagettfbbox(8, 0, $fonts['info'], $b_points);
107
-        imagettftext($image, 8, 0, 412-$is[2], 11, $txt_shadow, $fonts['info'], $b_points);
108
-        imagettftext($image, 8, 0, 410-$is[2], 9, $txt_color, $fonts['info'], $b_points);
107
+        imagettftext($image, 8, 0, 412 - $is[2], 11, $txt_shadow, $fonts['info'], $b_points);
108
+        imagettftext($image, 8, 0, 410 - $is[2], 9, $txt_color, $fonts['info'], $b_points);
109 109
 
110 110
         //Raids Total
111 111
         imagettftext($image, 6, 0, 8, 37, $txt_shadow2, $fonts['raids'], $lang['NumberOfRaids']);
112 112
         imagettftext($image, 6, 0, 6, 35, $txt_color2, $fonts['raids'], $lang['NumberOfRaids']);
113
-        $b_points = ": ".pretty_number($user['raids']);
113
+        $b_points = ": " . pretty_number($user['raids']);
114 114
         imagettftext($image, 6, 0, 61, 37, $txt_shadow2, $fonts['raids'], $b_points);
115 115
         imagettftext($image, 6, 0, 59, 35, $txt_color2, $fonts['raids'], $b_points);
116 116
 
117 117
         //Raids Won
118 118
         imagettftext($image, 6, 0, 8, 47, $txt_shadow2, $fonts['raids'], $lang['RaidsWin']);
119 119
         imagettftext($image, 6, 0, 6, 45, $txt_color2, $fonts['raids'], $lang['RaidsWin']);
120
-        $b_points = ": ".pretty_number($user['raidswin']);
120
+        $b_points = ": " . pretty_number($user['raidswin']);
121 121
         imagettftext($image, 6, 0, 61, 47, $txt_shadow2, $fonts['raids'], $b_points);
122 122
         imagettftext($image, 6, 0, 59, 45, $txt_color2, $fonts['raids'], $b_points);
123 123
 
124 124
         //Raids Lost
125 125
         imagettftext($image, 6, 0, 8, 57, $txt_shadow2, $fonts['raids'], $lang['RaidsLoose']);
126 126
         imagettftext($image, 6, 0, 6, 55, $txt_color2, $fonts['raids'], $lang['RaidsLoose']);
127
-        $b_points = ": ".pretty_number($user['raidsloose']);
127
+        $b_points = ": " . pretty_number($user['raidsloose']);
128 128
         imagettftext($image, 6, 0, 61, 57, $txt_shadow2, $fonts['raids'], $b_points);
129 129
         imagettftext($image, 6, 0, 59, 55, $txt_color2, $fonts['raids'], $b_points);
130 130
       }
@@ -137,25 +137,25 @@  discard block
 block discarded – undo
137 137
       $is = imagettfbbox(9, 0, $fonts['userbar'], $b_univ);
138 138
       $is = $size[0] - $is[2] - 2;
139 139
       imagettftext($image, 9, 0, $is, $size[1] - 3, $txt_shadow, $fonts['userbar'], $b_univ);
140
-      imagettftext($image, 9, 0, $is-1, $size[1] - 5, $txt_color, $fonts['userbar'], $b_univ);
141
-      imagettftext($image, 22, 0, $is-8, $size[1], $txt_color, $fonts['userbar'], '/');
140
+      imagettftext($image, 9, 0, $is - 1, $size[1] - 5, $txt_color, $fonts['userbar'], $b_univ);
141
+      imagettftext($image, 22, 0, $is - 8, $size[1], $txt_color, $fonts['userbar'], '/');
142 142
 
143 143
       // Player name
144 144
       imagettftext($image, 9, 0, 4, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_user);
145 145
       imagettftext($image, 9, 0, 2, $size[1] - 6, $txt_color, $fonts['userbar'], $b_user);
146 146
 
147
-      if($id)
147
+      if ($id)
148 148
       {
149 149
         // Player level - right-alligned
150 150
         $isp = imagettfbbox(9, 0, $fonts['userbar'], $b_lvl);
151
-        imagettftext($image, 9, 0, $is-$isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
152
-        imagettftext($image, 9, 0, $is-$isp[2] - 10 - 1, $size[1] - 4 - 1, $txt_color, $fonts['userbar'], $b_lvl);
151
+        imagettftext($image, 9, 0, $is - $isp[2] - 10, $size[1] - 4, $txt_shadow, $fonts['userbar'], $b_lvl);
152
+        imagettftext($image, 9, 0, $is - $isp[2] - 10 - 1, $size[1] - 4 - 1, $txt_color, $fonts['userbar'], $b_lvl);
153 153
       }
154 154
   }
155 155
 
156 156
   //And now convert it back to PNG-8
157
-  $im_result = imagecreate($size[0],$size[1]);
158
-  imagecopy($im_result,$image,0,0,0,0,$size[0],$size[1]);
157
+  $im_result = imagecreate($size[0], $size[1]);
158
+  imagecopy($im_result, $image, 0, 0, 0, 0, $size[0], $size[1]);
159 159
   imagedestroy($image);
160 160
   //And save it
161 161
   $imagetypes = imagetypes();
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,8 +11,7 @@  discard block
 block discarded – undo
11 11
 *   @version 1.0 copyright 2008 By e-Zobar for XNova
12 12
 */
13 13
 
14
-function int_banner_create($id, $type = 'userbar', $format = 'png')
15
-{
14
+function int_banner_create($id, $type = 'userbar', $format = 'png') {
16 15
 // banner.php?id=<userid>&type=<banner|userbar>&format=<png>
17 16
   global $config, $lang;
18 17
 
@@ -64,8 +63,7 @@  discard block
 block discarded – undo
64 63
     $b_planet = $planet_row['name'];
65 64
     $b_xyz = "[".$planet_row['galaxy'].":".$planet_row['system'].":".$planet_row['planet']."]";
66 65
     $b_lvl = ($user['total_rank'] ? $user['total_rank'] : $config->users_amount) ."/{$config->users_amount}";
67
-  }
68
-  else
66
+  } else
69 67
   {
70 68
     $b_user = $lang['ov_banner_empty_id'];
71 69
   }
Please login to merge, or discard this patch.
includes/functions/geoip.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-function geoip_status(){return sn_function_call('geoip_status', array(&$result));}
3
+function geoip_status() {return sn_function_call('geoip_status', array(&$result)); }
4 4
 function sn_geoip_status(&$result) {
5 5
   return $result = false;
6 6
 }
7 7
 
8
-function geoip_ip_info($ip){return sn_function_call('geoip_ip_info', array($ip, &$result));}
8
+function geoip_ip_info($ip) {return sn_function_call('geoip_ip_info', array($ip, &$result)); }
9 9
 function sn_geoip_ip_info($ip, &$result) {
10 10
   return $result = false;
11 11
 }
Please login to merge, or discard this patch.
includes/functions/ali_alliances.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@  discard block
 block discarded – undo
4 4
 {
5 5
   global $user;
6 6
 
7
-  if(!empty($ranks))
7
+  if (!empty($ranks))
8 8
   {
9
-    foreach($ranks as $rank => $rights)
9
+    foreach ($ranks as $rank => $rights)
10 10
     {
11 11
       $rights = implode(',', $rights);
12 12
       $ranklist .= $rights . ';';
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
       ORDER BY alliance_diplomacy_time, alliance_diplomacy_id;"
38 38
   );
39 39
 
40
-  while($record = db_fetch($query))
40
+  while ($record = db_fetch($query))
41 41
   {
42 42
     $temp_array[$record['alliance_diplomacy_contr_ally_id']] = $record;
43 43
   }
Please login to merge, or discard this patch.
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,7 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-function ali_rank_list_save($ranks)
4
-{
3
+function ali_rank_list_save($ranks) {
5 4
   global $user;
6 5
 
7 6
   if(!empty($ranks))
@@ -17,8 +16,7 @@  discard block
 block discarded – undo
17 16
   return $ranklist;
18 17
 }
19 18
 
20
-function ali_relations($ally_from, $ally_to = 0)
21
-{
19
+function ali_relations($ally_from, $ally_to = 0) {
22 20
   $ally_to = intval($ally_to);
23 21
   $ally_to = $ally_to ? " AND alliance_diplomacy_contr_ally_id = {$ally_to}" : '';
24 22
 
@@ -45,8 +43,7 @@  discard block
 block discarded – undo
45 43
   return $temp_array;
46 44
 }
47 45
 
48
-function ali_relation($ally_from, $ally_to)
49
-{
46
+function ali_relation($ally_from, $ally_to) {
50 47
   $relation = ali_relations($ally_from, $ally_to);
51 48
   return empty($relation) ? ALLY_DIPLOMACY_NEUTRAL : $relation[$ally_to]['alliance_diplomacy_relation'];
52 49
 }
Please login to merge, or discard this patch.
includes/functions/eco_get_planet_caps.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 function eco_get_planet_caps_modify_production(&$item, $key, $data) {
4 4
   static $modifiers;
5 5
 
6
-  if(!$modifiers) {
6
+  if (!$modifiers) {
7 7
     $modifiers = sn_get_groups('modifiers');
8 8
   }
9 9
   $item = floor(mrc_modify_value($data['user'], $data['planet'], $modifiers[MODIFIER_RESOURCE_PRODUCTION], $item));
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
   static $sn_group_modifiers, $config_resource_multiplier, $config_resource_multiplier_plain, $config_eco_scale_storage;
17 17
 
18
-  if(!$sn_group_modifiers) {
18
+  if (!$sn_group_modifiers) {
19 19
     $sn_group_modifiers = sn_get_groups('modifiers');
20 20
     $config_resource_multiplier = game_resource_multiplier();
21 21
     $config_resource_multiplier_plain = game_resource_multiplier(true);
@@ -26,15 +26,15 @@  discard block
 block discarded – undo
26 26
   $caps['storage'][RES_METAL][0] = $config->eco_planet_storage_metal;
27 27
   $caps['storage'][RES_CRYSTAL][0] = $config->eco_planet_storage_crystal;
28 28
   $caps['storage'][RES_DEUTERIUM][0] = $config->eco_planet_storage_deuterium;
29
-  foreach(sn_get_groups('storages') as $unit_id) {
30
-    foreach(get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
29
+  foreach (sn_get_groups('storages') as $unit_id) {
30
+    foreach (get_unit_param($unit_id, P_STORAGE) as $resource_id => $function) {
31 31
       $caps['storage'][$resource_id][$unit_id] = floor($config_eco_scale_storage *
32 32
         mrc_modify_value($user, $planet_row, $sn_group_modifiers[MODIFIER_RESOURCE_CAPACITY], $function(mrc_get_level($user, $planet_row, $unit_id)))
33 33
       );
34 34
     }
35 35
   }
36 36
 
37
-  if($planet_row['planet_type'] == PT_MOON) {
37
+  if ($planet_row['planet_type'] == PT_MOON) {
38 38
     return $caps;
39 39
   }
40 40
 
@@ -46,12 +46,12 @@  discard block
 block discarded – undo
46 46
   $caps['production_full'][RES_DEUTERIUM][0] = floor($config->deuterium_basic_income * $config_resource_multiplier * (isset($planet_density[RES_DEUTERIUM]) ? $planet_density[RES_DEUTERIUM] : 1));
47 47
   $caps['production_full'][RES_ENERGY][0] = floor($config->energy_basic_income * $config_resource_multiplier_plain * (isset($planet_density[RES_ENERGY]) ? $planet_density[RES_ENERGY] : 1));
48 48
 
49
-  foreach(sn_get_groups('factories') as $unit_id) {
49
+  foreach (sn_get_groups('factories') as $unit_id) {
50 50
     $unit_data = get_unit_param($unit_id);
51 51
     $unit_level = mrc_get_level($user, $planet_row, $unit_id);
52 52
     $unit_load = $planet_row[pname_factory_production_field_name($unit_id)];
53 53
 
54
-    foreach($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
54
+    foreach ($unit_data[P_UNIT_PRODUCTION] as $resource_id => $function) {
55 55
       $caps['production_full'][$resource_id][$unit_id] = $function($unit_level, $unit_load, $user, $planet_row)
56 56
         * ($resource_id == RES_ENERGY ? $config_resource_multiplier_plain : $config_resource_multiplier)
57 57
         * (isset($planet_density[$resource_id]) ? $planet_density[$resource_id] : 1);
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 
61 61
   array_walk_recursive($caps['production_full'], 'eco_get_planet_caps_modify_production', array('user' => $user, 'planet' => $planet_row));
62 62
 
63
-  foreach($caps['production_full'] as $resource_id => $resource_data) {
63
+  foreach ($caps['production_full'] as $resource_id => $resource_data) {
64 64
     $caps['total_production_full'][$resource_id] = array_sum($resource_data);
65 65
   }
66 66
 
67 67
   $caps['production'] = $caps['production_full'];
68 68
 
69
-  if($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
69
+  if ($caps['production'][RES_ENERGY][STRUC_MINE_FUSION]) {
70 70
     $deuterium_balance = array_sum($caps['production'][RES_DEUTERIUM]);
71 71
     $energy_balance = array_sum($caps['production'][RES_ENERGY]);
72
-    if($deuterium_balance < 0 || $energy_balance < 0) {
72
+    if ($deuterium_balance < 0 || $energy_balance < 0) {
73 73
       $caps['production'][RES_DEUTERIUM][STRUC_MINE_FUSION] = $caps['production'][RES_ENERGY][STRUC_MINE_FUSION] = 0;
74 74
     }
75 75
   }
76 76
 
77
-  foreach($caps['production'][RES_ENERGY] as $energy) {
77
+  foreach ($caps['production'][RES_ENERGY] as $energy) {
78 78
     $caps[RES_ENERGY][$energy >= 0 ? BUILD_CREATE : BUILD_DESTROY] += $energy;
79 79
   }
80 80
 
@@ -84,10 +84,10 @@  discard block
 block discarded – undo
84 84
     ? $caps[RES_ENERGY][BUILD_CREATE] / $caps[RES_ENERGY][BUILD_DESTROY]
85 85
     : 1;
86 86
 
87
-  foreach($caps['production'] as $resource_id => &$resource_data) {
88
-    if($caps['efficiency'] != 1) {
89
-      foreach($resource_data as $unit_id => &$resource_production) {
90
-        if(!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
87
+  foreach ($caps['production'] as $resource_id => &$resource_data) {
88
+    if ($caps['efficiency'] != 1) {
89
+      foreach ($resource_data as $unit_id => &$resource_production) {
90
+        if (!($unit_id == STRUC_MINE_FUSION && $resource_id == RES_DEUTERIUM) && $unit_id != 0 && !($resource_id == RES_ENERGY && $resource_production >= 0)) {
91 91
           $resource_production = $resource_production * $caps['efficiency'];
92 92
         }
93 93
       }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     $caps['total'][$resource_id] = $caps['total'][$resource_id] >= 0 ? floor($caps['total'][$resource_id]) : ceil($caps['total'][$resource_id]);
97 97
   }
98 98
 
99
-  foreach($caps['storage'] as $resource_id => &$resource_data) {
99
+  foreach ($caps['storage'] as $resource_id => &$resource_data) {
100 100
     $caps['total_storage'][$resource_id] = array_sum($resource_data);
101 101
   }
102 102
 
Please login to merge, or discard this patch.