Completed
Branch trunk (78000f)
by SuperNova.WS
25:55 queued 09:00
created
resources.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -46,11 +46,11 @@  discard block
 block discarded – undo
46 46
   ));
47 47
 };
48 48
 
49
-$ValidList['percent'] = array (  0,  10,  20,  30,  40,  50,  60,  70,  80,  90, 100 );
49
+$ValidList['percent'] = array(0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100);
50 50
 $template = gettemplate('resources', true);
51 51
 
52 52
 $transmutation_result = sn_sys_planet_core_transmute($user, $planetrow);
53
-if(!empty($transmutation_result))
53
+if (!empty($transmutation_result))
54 54
 {
55 55
   $template->assign_block_vars('result', $transmutation_result); // array('STATUS' => $transmutation_result['STATUS'], 'MESSAGE' => $transmutation_result['MESSAGE']));
56 56
 }
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
 $production = $_POST['production'];
60 60
 //$SubQry     = '';
61 61
 $SubQry     = array();
62
-if(is_array($production)) {
63
-  foreach($production as $prod_id => $percent) {
64
-    if($percent > 100 || $percent < 0) {
62
+if (is_array($production)) {
63
+  foreach ($production as $prod_id => $percent) {
64
+    if ($percent > 100 || $percent < 0) {
65 65
       $debug->warning('Supplying wrong production percent (less then 0 or greater then 100)', 'Hack attempt', 302, array('base_dump' => true));
66 66
       die();
67 67
     }
68 68
 
69 69
     $prod_id = intval($prod_id);
70
-    if(in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
70
+    if (in_array($prod_id, $sn_group_factories) && get_unit_param($prod_id, P_MINING_IS_MANAGED)) {
71 71
       $field_name              = pname_factory_production_field_name($prod_id);
72 72
       $percent                 = floor($percent / 10);
73 73
       $planetrow[$field_name]  = $percent;
74 74
       //$SubQry                 .= "`{$field_name}` = '{$percent}',";
75
-      $SubQry[]                 = "`{$field_name}` = '{$percent}'";
75
+      $SubQry[] = "`{$field_name}` = '{$percent}'";
76 76
     } else {
77 77
       $debug->warning('Supplying wrong ID in production array - attempt to change some field - ID' . $prod_id, 'Resource Page', 301);
78 78
       continue;
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
   'ENERGY_TYPE'    => pretty_number($caps_real['production'][RES_ENERGY][0], true, true),
109 109
 ));
110 110
 
111
-foreach($sn_group_factories as $unit_id)
111
+foreach ($sn_group_factories as $unit_id)
112 112
 {
113
-  if(mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
113
+  if (mrc_get_level($user, $planetrow, $unit_id) > 0 && get_unit_param($unit_id))
114 114
   {
115 115
     $level_plain = mrc_get_level($user, $planetrow, $unit_id, false, true);
116 116
     $template->assign_block_vars('production', array(
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,7 @@
 block discarded – undo
24 24
 
25 25
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
26 26
 
27
-function int_calc_storage_bar($resource_id)
28
-{
27
+function int_calc_storage_bar($resource_id) {
29 28
   global $lang, $template, $caps_real, $planetrow, $user;
30 29
 
31 30
   $totalProduction      = $caps_real['total'][$resource_id];
Please login to merge, or discard this patch.
admin/adm_log_main.php 2 patches
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,12 +22,10 @@  discard block
 block discarded – undo
22 22
 if($delete = sys_get_param_id('delete'))
23 23
 {
24 24
   doquery("DELETE FROM `{{logs}}` WHERE `log_id` = {$delete} LIMIT 1;");
25
-}
26
-elseif(sys_get_param_str('delete_update_info'))
25
+} elseif(sys_get_param_str('delete_update_info'))
27 26
 {
28 27
   doquery("DELETE FROM `{{logs}}` WHERE `log_code` in (103, 180, 191);");
29
-}
30
-elseif(sys_get_param_str('deleteall') == 'yes')
28
+} elseif(sys_get_param_str('deleteall') == 'yes')
31 29
 {
32 30
 //  doquery("TRUNCATE TABLE `{{logs}}`");
33 31
 }
@@ -51,8 +49,7 @@  discard block
 block discarded – undo
51 49
     }
52 50
   }
53 51
   $template->assign_vars($errorInfo);
54
-}
55
-else
52
+} else
56 53
 {
57 54
   $template = gettemplate('admin/adm_log_main', true);
58 55
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -18,26 +18,26 @@  discard block
 block discarded – undo
18 18
 
19 19
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
20 20
 
21
-if($delete = sys_get_param_id('delete'))
21
+if ($delete = sys_get_param_id('delete'))
22 22
 {
23 23
   doquery("DELETE FROM `{{logs}}` WHERE `log_id` = {$delete} LIMIT 1;");
24 24
 }
25
-elseif(sys_get_param_str('delete_update_info'))
25
+elseif (sys_get_param_str('delete_update_info'))
26 26
 {
27 27
   doquery("DELETE FROM `{{logs}}` WHERE `log_code` in (103, 180, 191);");
28 28
 }
29
-elseif(sys_get_param_str('deleteall') == 'yes')
29
+elseif (sys_get_param_str('deleteall') == 'yes')
30 30
 {
31 31
 //  doquery("TRUNCATE TABLE `{{logs}}`");
32 32
 }
33 33
 
34
-if($detail = sys_get_param_id('detail'))
34
+if ($detail = sys_get_param_id('detail'))
35 35
 {
36 36
   $template = gettemplate('admin/adm_log_main_detail', true);
37 37
 
38 38
   $errorInfo = doquery("SELECT * FROM `{{logs}}` WHERE `log_id` = {$detail} LIMIT 1;", true);
39 39
   $error_dump = unserialize($errorInfo['log_dump']);
40
-  if(is_array($error_dump))
40
+  if (is_array($error_dump))
41 41
   {
42 42
     foreach ($error_dump as $key => $value)
43 43
     {
@@ -57,11 +57,11 @@  discard block
 block discarded – undo
57 57
 
58 58
   $i = 0;
59 59
   $query = doquery("SELECT * FROM `{{logs}}` ORDER BY log_id DESC LIMIT 100;");
60
-  while($u = db_fetch($query))
60
+  while ($u = db_fetch($query))
61 61
   {
62 62
     $i++;
63 63
     $v = array();
64
-    foreach($u as $key => $value)
64
+    foreach ($u as $key => $value)
65 65
     {
66 66
       $v[strtoupper($key)] = $value;
67 67
     }
Please login to merge, or discard this patch.
admin/adm_message_list.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,8 +72,7 @@
 block discarded – undo
72 72
 if(sys_get_param('page_prev') && $int_page_current > 1)
73 73
 {
74 74
   $int_page_current--;
75
-}
76
-elseif(sys_get_param('page_next') && $int_page_current < $page_max)
75
+} elseif(sys_get_param('page_next') && $int_page_current < $page_max)
77 76
 {
78 77
   $int_page_current++;
79 78
 }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
  *
9 9
  */
10 10
 
11
-define('INSIDE'  , true);
12
-define('INSTALL' , false);
11
+define('INSIDE', true);
12
+define('INSTALL', false);
13 13
 define('IN_ADMIN', true);
14 14
 
15 15
 require('../common.' . substr(strrchr(__FILE__, '.'), 1));
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
   ),
29 29
 );
30 30
 $template->assign_block_vars('int_type_selected', $allowed_types[-1]);
31
-foreach($sn_message_class_list as $key => $value)
31
+foreach ($sn_message_class_list as $key => $value)
32 32
 {
33
-  if($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX)
33
+  if ($key == MSG_TYPE_NEW || $key == MSG_TYPE_OUTBOX)
34 34
   {
35 35
     continue;
36 36
   }
@@ -43,19 +43,19 @@  discard block
 block discarded – undo
43 43
 
44 44
 
45 45
 $message_delete = sys_get_param_id('msg_del');
46
-if(sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete))
46
+if (sys_get_param('str_delete_selected') && is_array($message_delete = sys_get_param('selected')) && !empty($message_delete))
47 47
 {
48 48
   $message_delete = implode(', ', $message_delete);
49 49
 }
50 50
 
51
-if($message_delete)
51
+if ($message_delete)
52 52
 {
53 53
   doquery("DELETE FROM {{messages}} WHERE `message_id` in ({$message_delete});");
54 54
   $template->assign_block_vars('result', array('MESSAGE' => sprintf($lang['mlst_messages_deleted'], $message_delete)));
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
 {
60 60
   $delete_date = "{$year}-{$month}-{$day}";
61 61
   doquery("DELETE FROM {{messages}} WHERE message_time <= UNIX_TIMESTAMP('{$delete_date}')" . ($int_type_selected >= 0 ? " AND `message_type` = {$int_type_selected}" : ''));
@@ -68,16 +68,16 @@  discard block
 block discarded – undo
68 68
 
69 69
 $int_page_current = min(sys_get_param_id('int_page_current', 1), $page_max);
70 70
 
71
-if(sys_get_param('page_prev') && $int_page_current > 1)
71
+if (sys_get_param('page_prev') && $int_page_current > 1)
72 72
 {
73 73
   $int_page_current--;
74 74
 }
75
-elseif(sys_get_param('page_next') && $int_page_current < $page_max)
75
+elseif (sys_get_param('page_next') && $int_page_current < $page_max)
76 76
 {
77 77
   $int_page_current++;
78 78
 }
79 79
 
80
-for($i = 1; $i <= $page_max; $i++)
80
+for ($i = 1; $i <= $page_max; $i++)
81 81
 {
82 82
   $template->assign_block_vars('page', array('NUMBER' => $i));
83 83
 }
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 $StartRec = ($int_page_current - 1) * 25;
86 86
 
87 87
 $Messages = db_message_list_admin_by_type($int_type_selected, $StartRec);
88
-while($row = db_fetch($Messages))
88
+while ($row = db_fetch($Messages))
89 89
 {
90 90
   $row['FROM'] = htmlentities($row['FROM'], ENT_COMPAT, 'UTF-8');
91 91
   $row['OWNER_NAME'] = htmlentities($row['OWNER_NAME'], ENT_COMPAT, 'UTF-8');
Please login to merge, or discard this patch.
admin/includes/admin_planet_edit.inc.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
3
+function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list)); }
4 4
 function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
5 5
 {
6 6
   global $lang;
@@ -19,19 +19,19 @@  discard block
 block discarded – undo
19 19
   return $mode;
20 20
 }
21 21
 
22
-function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
22
+function admin_planet_edit_template(&$template, $edit_planet_row, $mode) {return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode)); }
23 23
 function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
24 24
 {
25 25
   global $lang;
26 26
 
27 27
   $unit_list = sn_get_groups($mode);
28
-  if(empty($unit_list))
28
+  if (empty($unit_list))
29 29
   {
30 30
     return;
31 31
   }
32 32
   $name_list = $lang['tech'];
33 33
 
34
-  foreach($unit_list as $unit_id)
34
+  foreach ($unit_list as $unit_id)
35 35
   {
36 36
     $template->assign_block_vars('unit', array(
37 37
       'ID'    => $unit_id,
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
42 42
   }
43 43
 }
44 44
 
45
-function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
45
+function admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode)); }
46 46
 function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
47 47
 {
48
-  if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
48
+  if ($unit_amount && in_array($unit_id, sn_get_groups($mode)))
49 49
   {
50 50
     $unit_amount = round($unit_amount);
51 51
     $unit_name = get_unit_param($unit_id, P_NAME);
Please login to merge, or discard this patch.
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,8 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 function admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list){return sn_function_call('admin_planet_edit_mode', array(&$template, &$admin_planet_edit_mode_list));}
4
-function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list)
5
-{
4
+function sn_admin_planet_edit_mode(&$template, &$admin_planet_edit_mode_list) {
6 5
   global $lang;
7 6
 
8 7
   $admin_planet_edit_mode_list = array_merge(isset($admin_planet_edit_mode_list) ? $admin_planet_edit_mode_list : array(), array(
@@ -20,8 +19,7 @@  discard block
 block discarded – undo
20 19
 }
21 20
 
22 21
 function admin_planet_edit_template(&$template, $edit_planet_row, $mode){return sn_function_call('admin_planet_edit_template', array(&$template, $edit_planet_row, $mode));}
23
-function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode)
24
-{
22
+function sn_admin_planet_edit_template(&$template, $edit_planet_row, $mode) {
25 23
   global $lang;
26 24
 
27 25
   $unit_list = sn_get_groups($mode);
@@ -43,15 +41,13 @@  discard block
 block discarded – undo
43 41
 }
44 42
 
45 43
 function admin_planet_edit_query_string($unit_id, $unit_amount, $mode){return sn_function_call('admin_planet_edit_query_string', array($unit_id, $unit_amount, $mode));}
46
-function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode)
47
-{
44
+function sn_admin_planet_edit_query_string($unit_id, $unit_amount, $mode) {
48 45
   if($unit_amount && in_array($unit_id, sn_get_groups($mode)))
49 46
   {
50 47
     $unit_amount = round($unit_amount);
51 48
     $unit_name = get_unit_param($unit_id, P_NAME);
52 49
     $result = "{$unit_name} = GREATEST(0, {$unit_name} + ({$unit_amount}))";
53
-  }
54
-  else
50
+  } else
55 51
   {
56 52
     $result = '';
57 53
   }
Please login to merge, or discard this patch.
banned.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@
 block discarded – undo
19 19
 $template = gettemplate('banned_body', true);
20 20
 
21 21
 $query = doquery("SELECT * FROM {{banned}} ORDER BY `ban_id` DESC;");
22
-$i=0;
23
-while($ban_row = db_fetch($query))
22
+$i = 0;
23
+while ($ban_row = db_fetch($query))
24 24
 {
25 25
   $template->assign_block_vars('banlist', array(
26 26
     'USER_NAME'   => $ban_row['ban_user_name'],
Please login to merge, or discard this patch.
buildings.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
 $mode = sys_get_param_escaped('mode');
22 22
 $mode = (!$mode || $mode == 'buildings') ? QUE_STRUCTURES : ($mode == 'fleet' ? SUBQUE_FLEET : ($mode == 'defense' ? SUBQUE_DEFENSE : ($mode == 'research' ? QUE_RESEARCH : $mode)));
23 23
 
24
-if($building_sort = sys_get_param_id('sort_elements')) {
25
-  if(!empty($lang['player_option_building_sort'][$building_sort])) {
24
+if ($building_sort = sys_get_param_id('sort_elements')) {
25
+  if (!empty($lang['player_option_building_sort'][$building_sort])) {
26 26
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT, $mode)] = $building_sort;
27 27
     classSupernova::$user_options[array(PLAYER_OPTION_BUILDING_SORT_INVERSE, $mode)] = sys_get_param_id('sort_elements_inverse', 0);
28 28
   }
Please login to merge, or discard this patch.
time_probe.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,11 +13,11 @@  discard block
 block discarded – undo
13 13
 $time_server = $time_local  - $time_diff
14 14
 */
15 15
 
16
-if($font_size = sys_get_param_str('font_size')) {
17
-  if(strpos($font_size, '%') !== false) {
16
+if ($font_size = sys_get_param_str('font_size')) {
17
+  if (strpos($font_size, '%') !== false) {
18 18
     // Размер шрифта в процентах
19 19
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
20
-  } elseif(strpos($font_size, 'px') !== false) {
20
+  } elseif (strpos($font_size, 'px') !== false) {
21 21
     // Размер шрифта в пикселях
22 22
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
23 23
   } else {
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
30 30
 } else {
31 31
   $user_time_diff = playerTimeDiff::user_time_diff_get();
32
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
32
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
33 33
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
34 34
   } else {
35 35
     $user_time_diff = playerTimeDiff::user_time_diff_probe();
Please login to merge, or discard this patch.
docs/txt2html.php 2 patches
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -1,52 +1,52 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-function dump($value,$varname = "",$level=0,$dumper = "")
3
+function dump($value, $varname = "", $level = 0, $dumper = "")
4 4
 {
5 5
   if ($varname) $varname .= " = ";
6 6
 
7
-  if ($level==-1)
7
+  if ($level == -1)
8 8
   {
9
-    $trans[' ']='&there4;';
10
-    $trans["\t"]='&rArr;';
11
-    $trans["\n"]='&para;;';
12
-    $trans["\r"]='&lArr;';
13
-    $trans["\0"]='&oplus;';
14
-    return strtr(htmlspecialchars($value),$trans);
9
+    $trans[' '] = '&there4;';
10
+    $trans["\t"] = '&rArr;';
11
+    $trans["\n"] = '&para;;';
12
+    $trans["\r"] = '&lArr;';
13
+    $trans["\0"] = '&oplus;';
14
+    return strtr(htmlspecialchars($value), $trans);
15 15
   }
16
-  if ($level==0) $dumper = '<pre>' . $varname;
16
+  if ($level == 0) $dumper = '<pre>' . $varname;
17 17
 
18 18
   $type = gettype($value);
19 19
   $dumper .= $type;
20 20
 
21
-  if ($type=='string')
21
+  if ($type == 'string')
22 22
   {
23
-    $dumper .= '('.strlen($value).')';
24
-    $value = dump($value,"",-1);
23
+    $dumper .= '(' . strlen($value) . ')';
24
+    $value = dump($value, "", -1);
25 25
   }
26
-  elseif ($type=='boolean') $value= ($value?'true':'false');
27
-  elseif ($type=='object')
26
+  elseif ($type == 'boolean') $value = ($value ? 'true' : 'false');
27
+  elseif ($type == 'object')
28 28
   {
29
-    $props= get_class_vars(get_class($value));
30
-    $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
31
-    foreach($props as $key=>$val)
29
+    $props = get_class_vars(get_class($value));
30
+    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
31
+    foreach ($props as $key=>$val)
32 32
     {
33
-      $dumper .= "\n".str_repeat("\t",$level+1).$key.' => ';
34
-      $dumper .= dump($value->$key,"",$level+1);
33
+      $dumper .= "\n" . str_repeat("\t", $level + 1) . $key . ' => ';
34
+      $dumper .= dump($value->$key, "", $level + 1);
35 35
     }
36
-    $value= '';
36
+    $value = '';
37 37
   }
38
-  elseif ($type=='array')
38
+  elseif ($type == 'array')
39 39
   {
40
-    $dumper .= '('.count($value).')';
41
-    foreach($value as $key=>$val)
40
+    $dumper .= '(' . count($value) . ')';
41
+    foreach ($value as $key=>$val)
42 42
     {
43
-      $dumper .= "\n".str_repeat("\t",$level+1).dump($key,"",-1).' => ';
44
-      $dumper .= dump($val,"",$level+1);
43
+      $dumper .= "\n" . str_repeat("\t", $level + 1) . dump($key, "", -1) . ' => ';
44
+      $dumper .= dump($val, "", $level + 1);
45 45
     }
46
-    $value= '';
46
+    $value = '';
47 47
   }
48 48
   $dumper .= " <b>$value</b>";
49
-  if ($level==0) $dumper .= '</pre>';
49
+  if ($level == 0) $dumper .= '</pre>';
50 50
   return $dumper;
51 51
 }
52 52
 
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
   $output_buffer .= $string;
68 68
 }
69 69
 
70
-if(substr(getcwd(), -4) != 'docs')
70
+if (substr(getcwd(), -4) != 'docs')
71 71
 {
72 72
   $path_prefix = 'docs/';
73 73
 }
@@ -80,22 +80,22 @@  discard block
 block discarded – undo
80 80
 
81 81
 $filename = 'changelog';
82 82
 
83
-$input =  file_get_contents($path_prefix . $filename . '.txt');
83
+$input = file_get_contents($path_prefix . $filename . '.txt');
84 84
 //$input = iconv('CP1251', 'UTF-8', $input);
85 85
 
86 86
 $input = preg_replace("/\r\n\d\d\d\d\-\d\d\-\d\d\ \d\d\:\d\d/", "[D] $0", $input);
87 87
 
88
-while(strpos($input, "\r\n\r\n") !== false)
88
+while (strpos($input, "\r\n\r\n") !== false)
89 89
 {
90 90
   $input = str_replace("\r\n\r\n", "\r\n", $input);
91 91
 }
92
-while(strpos($input, "~~~") !== false)
92
+while (strpos($input, "~~~") !== false)
93 93
 {
94 94
   $input = str_replace("~~~", "~~", $input);
95 95
 }
96 96
 $input = str_replace("\r\n~~", "~~", $input);
97 97
 
98
-while(strpos($input, "===") !== false)
98
+while (strpos($input, "===") !== false)
99 99
 {
100 100
   $input = str_replace("===", "==", $input);
101 101
 }
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
 $prev_chapter_is_header = false;
107 107
 $output = array();
108 108
 $buffer = array();
109
-foreach($input as &$chapter)
109
+foreach ($input as &$chapter)
110 110
 {
111 111
   $chapter = preg_split("/(\r\n[\[])/", $chapter, -1, PREG_SPLIT_NO_EMPTY); // , PREG_SPLIT_DELIM_CAPTURE
112 112
 
113
-  if(count($chapter) == 1 && !$prev_chapter_is_header)
113
+  if (count($chapter) == 1 && !$prev_chapter_is_header)
114 114
   {
115
-    if(!empty($chapter))
115
+    if (!empty($chapter))
116 116
     {
117 117
       $output[] = $buffer;
118 118
       $buffer = array();
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
   else
124 124
   {
125 125
     $prev_chapter_is_header = false;
126
-    foreach($chapter as &$note)
126
+    foreach ($chapter as &$note)
127 127
     {
128 128
       $note = explode("\r\n", $note);
129 129
       $new_note = true;
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
131 131
 
132 132
       $note_out = array();
133 133
 
134
-      foreach($note as &$line)
134
+      foreach ($note as &$line)
135 135
       {
136
-        if(!$line)
136
+        if (!$line)
137 137
         {
138 138
           continue;
139 139
         }
140
-        if($new_note)
140
+        if ($new_note)
141 141
         {
142 142
           // 78 - 3 = 75
143 143
           $note_out['style'] = $line[0];
@@ -145,9 +145,9 @@  discard block
 block discarded – undo
145 145
         }
146 146
 
147 147
         $buf_str .= $line;
148
-        if(mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
148
+        if (mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
149 149
         {
150
-          if(!isset($note_out['name']))
150
+          if (!isset($note_out['name']))
151 151
           {
152 152
             $note_out['name'] = $buf_str;
153 153
           }
@@ -201,31 +201,31 @@  discard block
 block discarded – undo
201 201
   'D' => 'date',
202 202
 );
203 203
 
204
-foreach($output as $chapter)
204
+foreach ($output as $chapter)
205 205
 {
206
-  if(!$chapter)
206
+  if (!$chapter)
207 207
   {
208 208
     continue;
209 209
   }
210 210
 
211 211
   buf_print("<h1>{$chapter['name']}</h1>\r\n");
212
-  foreach($chapter['content'] as $block)
212
+  foreach ($chapter['content'] as $block)
213 213
   {
214 214
     buf_print("<div class=\"{$styles[$block['style']]}\">" . ($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
215 215
     buf_print(preg_replace("/\s{2,10}/", " ", $block['name']) . '<br />');
216
-    if(isset($block['lines']))
216
+    if (isset($block['lines']))
217 217
     {
218 218
       $last_spaces = '';
219 219
       $depth = array();
220
-      foreach($block['lines'] as $line)
220
+      foreach ($block['lines'] as $line)
221 221
       {
222
-        if(preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
222
+        if (preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
223 223
         {
224 224
           //$line = strlen($matches[1]) . '/' . $matches[2] . '/' . $matches[3];
225 225
           $line = $matches[3];
226
-          if(strlen($matches[1]) > strlen($last_spaces))
226
+          if (strlen($matches[1]) > strlen($last_spaces))
227 227
           {
228
-            if($matches[2])
228
+            if ($matches[2])
229 229
             {
230 230
               buf_print("<ol>\r\n");
231 231
             }
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
237 237
             $last_spaces = $matches[1];
238 238
             $depth[] = $matches[2];
239 239
           }
240
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
240
+          elseif (strlen($matches[1]) < strlen($last_spaces) && count($depth))
241 241
           {
242
-            if(array_pop($depth))
242
+            if (array_pop($depth))
243 243
             {
244 244
               buf_print("</ol>\r\n");
245 245
             }
@@ -250,14 +250,14 @@  discard block
 block discarded – undo
250 250
             $last_spaces = $matches[1];
251 251
             buf_print('<li>');
252 252
           }
253
-          elseif(strlen($last_spaces) == strlen($matches[1]))
253
+          elseif (strlen($last_spaces) == strlen($matches[1]))
254 254
           {
255
-            if($matches[2] == '' && $depth[count($depth) - 1] != '')
255
+            if ($matches[2] == '' && $depth[count($depth) - 1] != '')
256 256
             {
257 257
               buf_print("</ol>\r\n");
258 258
               buf_print("<ul>\r\n");
259 259
             }
260
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
260
+            elseif ($matches[2] != '' && $depth[count($depth) - 1] == '')
261 261
             {
262 262
               buf_print("</ul>\r\n");
263 263
               buf_print("<ol>\r\n");
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
         $line = preg_replace("/\s{2,10}/", " ", $line);
270 270
         buf_print($line . "<br />\r\n");
271 271
       }
272
-      while(count($depth))
272
+      while (count($depth))
273 273
       {
274
-        if(array_pop($depth))
274
+        if (array_pop($depth))
275 275
         {
276 276
           buf_print("</ol>\r\n");
277 277
         }
@@ -287,10 +287,10 @@  discard block
 block discarded – undo
287 287
 buf_print("</body>\r\n</html>\r\n");
288 288
 
289 289
 $html = file_get_contents($path_prefix . 'html/' . $filename . '.html');
290
-if($html != $output_buffer)
290
+if ($html != $output_buffer)
291 291
 {
292 292
   file_put_contents($path_prefix . 'html/' . $filename . '.html', $output_buffer);
293
-  if(!$path_prefix)
293
+  if (!$path_prefix)
294 294
   {
295 295
     print($output_buffer);
296 296
   }
Please login to merge, or discard this patch.
Braces   +26 added lines, -34 removed lines patch added patch discarded remove patch
@@ -1,8 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-function dump($value,$varname = "",$level=0,$dumper = "")
4
-{
5
-  if ($varname) $varname .= " = ";
3
+function dump($value,$varname = "",$level=0,$dumper = "") {
4
+  if ($varname) {
5
+    $varname .= " = ";
6
+  }
6 7
 
7 8
   if ($level==-1)
8 9
   {
@@ -13,7 +14,9 @@  discard block
 block discarded – undo
13 14
     $trans["\0"]='&oplus;';
14 15
     return strtr(htmlspecialchars($value),$trans);
15 16
   }
16
-  if ($level==0) $dumper = '<pre>' . $varname;
17
+  if ($level==0) {
18
+    $dumper = '<pre>' . $varname;
19
+  }
17 20
 
18 21
   $type = gettype($value);
19 22
   $dumper .= $type;
@@ -22,9 +25,9 @@  discard block
 block discarded – undo
22 25
   {
23 26
     $dumper .= '('.strlen($value).')';
24 27
     $value = dump($value,"",-1);
25
-  }
26
-  elseif ($type=='boolean') $value= ($value?'true':'false');
27
-  elseif ($type=='object')
28
+  } elseif ($type=='boolean') {
29
+    $value= ($value?'true':'false');
30
+  } elseif ($type=='object')
28 31
   {
29 32
     $props= get_class_vars(get_class($value));
30 33
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
@@ -34,8 +37,7 @@  discard block
 block discarded – undo
34 37
       $dumper .= dump($value->$key,"",$level+1);
35 38
     }
36 39
     $value= '';
37
-  }
38
-  elseif ($type=='array')
40
+  } elseif ($type=='array')
39 41
   {
40 42
     $dumper .= '('.count($value).')';
41 43
     foreach($value as $key=>$val)
@@ -46,22 +48,21 @@  discard block
 block discarded – undo
46 48
     $value= '';
47 49
   }
48 50
   $dumper .= " <b>$value</b>";
49
-  if ($level==0) $dumper .= '</pre>';
51
+  if ($level==0) {
52
+    $dumper .= '</pre>';
53
+  }
50 54
   return $dumper;
51 55
 }
52 56
 
53
-function pdump($value, $varname = '')
54
-{
57
+function pdump($value, $varname = '') {
55 58
   print('<span style="text-align: left">' . dump($value, $varname) . '</span>');
56 59
 }
57 60
 
58
-function debug($value, $varname = '')
59
-{
61
+function debug($value, $varname = '') {
60 62
   return pdump($value, $varname);
61 63
 }
62 64
 
63
-function buf_print($string)
64
-{
65
+function buf_print($string) {
65 66
   global $output_buffer;
66 67
 
67 68
   $output_buffer .= $string;
@@ -70,8 +71,7 @@  discard block
 block discarded – undo
70 71
 if(substr(getcwd(), -4) != 'docs')
71 72
 {
72 73
   $path_prefix = 'docs/';
73
-}
74
-else
74
+} else
75 75
 {
76 76
   $path_prefix = '';
77 77
 }
@@ -119,8 +119,7 @@  discard block
 block discarded – undo
119 119
       $buffer['name'] = $chapter[0];
120 120
     }
121 121
     $prev_chapter_is_header = true;
122
-  }
123
-  else
122
+  } else
124 123
   {
125 124
     $prev_chapter_is_header = false;
126 125
     foreach($chapter as &$note)
@@ -150,8 +149,7 @@  discard block
 block discarded – undo
150 149
           if(!isset($note_out['name']))
151 150
           {
152 151
             $note_out['name'] = $buf_str;
153
-          }
154
-          else
152
+          } else
155 153
           {
156 154
             $note_out['lines'][] = $buf_str;
157 155
           }
@@ -228,36 +226,31 @@  discard block
 block discarded – undo
228 226
             if($matches[2])
229 227
             {
230 228
               buf_print("<ol>\r\n");
231
-            }
232
-            else
229
+            } else
233 230
             {
234 231
               buf_print("<ul>\r\n");
235 232
             }
236 233
             buf_print('<li>');
237 234
             $last_spaces = $matches[1];
238 235
             $depth[] = $matches[2];
239
-          }
240
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
236
+          } elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
241 237
           {
242 238
             if(array_pop($depth))
243 239
             {
244 240
               buf_print("</ol>\r\n");
245
-            }
246
-            else
241
+            } else
247 242
             {
248 243
               buf_print("</ul>\r\n");
249 244
             }
250 245
             $last_spaces = $matches[1];
251 246
             buf_print('<li>');
252
-          }
253
-          elseif(strlen($last_spaces) == strlen($matches[1]))
247
+          } elseif(strlen($last_spaces) == strlen($matches[1]))
254 248
           {
255 249
             if($matches[2] == '' && $depth[count($depth) - 1] != '')
256 250
             {
257 251
               buf_print("</ol>\r\n");
258 252
               buf_print("<ul>\r\n");
259
-            }
260
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
253
+            } elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
261 254
             {
262 255
               buf_print("</ul>\r\n");
263 256
               buf_print("<ol>\r\n");
@@ -274,8 +267,7 @@  discard block
 block discarded – undo
274 267
         if(array_pop($depth))
275 268
         {
276 269
           buf_print("</ol>\r\n");
277
-        }
278
-        else
270
+        } else
279 271
         {
280 272
           buf_print("</ul>\r\n");
281 273
         }
Please login to merge, or discard this patch.
records.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
13 13
 
14
-if(HIDE_BUILDING_RECORDS)
14
+if (HIDE_BUILDING_RECORDS)
15 15
 {
16 16
   return;
17 17
 }
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 $user_name_cache = array();
36 36
 
37
-foreach($show_groups as $unit_group_id => $mode)
37
+foreach ($show_groups as $unit_group_id => $mode)
38 38
 {
39 39
   $template->assign_block_vars('records', array(
40 40
     'UNIT' => $lang['tech'][$unit_group_id],
@@ -43,15 +43,15 @@  discard block
 block discarded – undo
43 43
   ));
44 44
   $unit_group = get_unit_param('techtree', $unit_group_id); // TODO - REWRITE!!!!
45 45
 
46
-  foreach($unit_group as $unit_id)
46
+  foreach ($unit_group as $unit_id)
47 47
   {
48 48
     $unit_name = &$lang['tech'][$unit_id];
49
-    if($unit_name)
49
+    if ($unit_name)
50 50
     {
51 51
       // TODO - ISUNITSTACKABLE!
52 52
       $data_row = $unit_group_id == UNIT_SHIPS || $unit_group_id == UNIT_DEFENCE ? db_unit_records_sum($unit_id, $user_skip_list_unit) : db_unit_records_plain($unit_id, $user_skip_list_unit);
53 53
 
54
-      if($data_row)
54
+      if ($data_row)
55 55
       {
56 56
         $template->assign_block_vars('records', array(
57 57
           'UNIT' => $unit_name,
Please login to merge, or discard this patch.