supernova-ws / SuperNova

includes/includes/mrc_mercenary.php

Doc Comments +4 added lines

@@ -26,6 +26,10 @@
   return true;
 }
 
+/**
+ * @param integer $mode
+ * @param integer $mercenary_id
+ */
 function mrc_mercenary_hire($mode, $user, $mercenary_id) {
   global $config, $lang, $sn_powerup_buy_discounts;
 

Spacing +27 added lines, -27 removed lines

@@ -4,13 +4,13 @@ 
 
 function mrc_officer_accessible(&$user, $mercenary_id) {
   $mercenary_info = get_unit_param($mercenary_id);
-  if(classSupernova::$config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS) {
+  if (classSupernova::$config->empire_mercenary_temporary || $mercenary_info[P_UNIT_TYPE] == UNIT_PLANS) {
     return true;
   }
 
-  if(isset($mercenary_info[P_REQUIRE])) {
-    foreach($mercenary_info[P_REQUIRE] as $unit_id => $unit_level) {
-      if(mrc_get_level($user, null, $unit_id) < $unit_level) {
+  if (isset($mercenary_info[P_REQUIRE])) {
+    foreach ($mercenary_info[P_REQUIRE] as $unit_id => $unit_level) {
+      if (mrc_get_level($user, null, $unit_id) < $unit_level) {
         return false;
       }
     }
@@ -26,35 +26,35 @@ 
     $is_permanent = $mode == UNIT_PLANS || !classSupernova::$config->empire_mercenary_temporary;
     $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? classSupernova::$config->ali_bonus_members : 1);
     $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-    if(!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
+    if (!in_array($mercenary_id, sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries'))) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_mercenary'], ERR_ERROR);
     }
 
-    if(!mrc_officer_accessible($user, $mercenary_id)) {
+    if (!mrc_officer_accessible($user, $mercenary_id)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_requirements'], ERR_ERROR);
     }
 
     $mercenary_level = sys_get_param_int('mercenary_level');
-    if($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
+    if ($mercenary_level < 0 || $mercenary_level > get_unit_param($mercenary_id, P_MAX_STACK)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_level'], ERR_ERROR);
     }
 
-    if($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
+    if ($mercenary_level && !array_key_exists($mercenary_period = sys_get_param_int('mercenary_period'), $sn_powerup_buy_discounts)) {
       throw new Exception(classLocale::$lang['mrc_msg_error_wrong_period'], ERR_ERROR);
     }
 
     sn_db_transaction_start();
 
     $mercenary_level_old = mrc_get_level($user, $planetrow, $mercenary_id, true, true);
-    if(classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
+    if (classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old && $mercenary_level) {
       throw new Exception(classLocale::$lang['mrc_msg_error_already_hired'], ERR_ERROR); // Can't hire already hired temp mercenary - dismiss first
-    } elseif(classSupernova::$config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
+    } elseif (classSupernova::$config->empire_mercenary_temporary && !$mercenary_level_old && !$mercenary_level) {
       throw new Exception('', ERR_NONE); // Can't dismiss (!$mercenary_level) not hired (!$mercenary_level_old) temp mercenary. But no error
     }
 
-    if($mercenary_level) {
+    if ($mercenary_level) {
       $darkmater_cost = eco_get_total_cost($mercenary_id, $mercenary_level);
-      if(!classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old) {
+      if (!classSupernova::$config->empire_mercenary_temporary && $mercenary_level_old) {
         $darkmater_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level_old);
         $darkmater_cost[BUILD_CREATE][RES_DARK_MATTER] -= $darkmater_cost_old[BUILD_CREATE][RES_DARK_MATTER];
       }
@@ -64,13 +64,13 @@ 
     }
     $darkmater_cost *= $cost_alliance_multiplyer;
 
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < $darkmater_cost) {
       throw new Exception(classLocale::$lang['mrc_msg_error_no_resource'], ERR_ERROR);
     }
 
-    if(($darkmater_cost && $mercenary_level) || !$is_permanent) {
+    if (($darkmater_cost && $mercenary_level) || !$is_permanent) {
       $unit_row = db_unit_by_location($user['id'], LOC_USER, $user['id'], $mercenary_id);
-      if(is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
+      if (is_array($unit_row) && ($dismiss_left_days = floor((strtotime($unit_row['unit_time_finish']) - SN_TIME_NOW) / PERIOD_DAY))) {
         $dismiss_full_cost = eco_get_total_cost($mercenary_id, $unit_row['unit_level']);
         $dismiss_full_cost = $dismiss_full_cost[BUILD_CREATE][RES_DARK_MATTER];
 
@@ -83,16 +83,16 @@ 
       db_unit_list_delete($user['id'], LOC_USER, $user['id'], $mercenary_id);
     }
 
-    if($darkmater_cost && $mercenary_level) {
+    if ($darkmater_cost && $mercenary_level) {
       db_unit_set_insert(
         "unit_player_id = {$user['id']},
-        unit_location_type = " . LOC_USER . ",
+        unit_location_type = ".LOC_USER.",
         unit_location_id = {$user['id']},
         unit_type = {$mode},
         unit_snid = {$mercenary_id},
         unit_level = {$mercenary_level},
-        unit_time_start = " . (!$is_permanent ? 'FROM_UNIXTIME(' . SN_TIME_NOW . ')' : 'null') . ",
-        unit_time_finish = " . (!$is_permanent ? 'FROM_UNIXTIME(' . (SN_TIME_NOW + $mercenary_period) . ')' : 'null')
+        unit_time_start = ".(!$is_permanent ? 'FROM_UNIXTIME('.SN_TIME_NOW.')' : 'null').",
+        unit_time_finish = " . (!$is_permanent ? 'FROM_UNIXTIME('.(SN_TIME_NOW + $mercenary_period).')' : 'null')
       );
 
       rpg_points_change($user['id'], $mode == UNIT_PLANS ? RPG_PLANS : RPG_MERCENARY, -($darkmater_cost),
@@ -100,7 +100,7 @@ 
     }
     sn_db_transaction_commit();
     sys_redirect($_SERVER['REQUEST_URI']);
-  } catch(Exception $e) {
+  } catch (Exception $e) {
     sn_db_transaction_rollback();
     $operation_result = array(
       'STATUS'  => in_array($e->getCode(), array(ERR_NONE, ERR_WARNING, ERR_ERROR)) ? $e->getCode() : ERR_ERROR,
@@ -118,7 +118,7 @@ 
   $mode = in_array($mode, array(UNIT_MERCENARIES, UNIT_PLANS)) ? $mode : UNIT_MERCENARIES;
   $is_permanent = $mode == UNIT_PLANS || !classSupernova::$config->empire_mercenary_temporary;
 
-  if($mercenary_id = sys_get_param_int('mercenary_id')) {
+  if ($mercenary_id = sys_get_param_int('mercenary_id')) {
     $operation_result = mrc_mercenary_hire($mode, $user, $mercenary_id);
   }
 
@@ -126,11 +126,11 @@ 
 
   $template = gettemplate('mrc_mercenary_hire', true);
 
-  if(!empty($operation_result)) {
+  if (!empty($operation_result)) {
     $template->assign_block_vars('result', $operation_result);
   }
 
-  foreach($sn_powerup_buy_discounts as $hire_period => $hire_discount) {
+  foreach ($sn_powerup_buy_discounts as $hire_period => $hire_discount) {
     $template->assign_block_vars('period', array(
       'LENGTH'   => $hire_period,
       'TEXT'     => classLocale::$lang['mrc_period_list'][$hire_period],
@@ -142,12 +142,12 @@ 
   $user_dark_matter = mrc_get_level($user, null, RES_DARK_MATTER);
   $cost_alliance_multiplyer = (SN_IN_ALLY === true && $mode == UNIT_PLANS ? classSupernova::$config->ali_bonus_members : 1);
   $cost_alliance_multiplyer = $cost_alliance_multiplyer >= 1 ? $cost_alliance_multiplyer : 1;
-  foreach(sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id) {
+  foreach (sn_get_groups($mode == UNIT_PLANS ? 'plans' : 'mercenaries') as $mercenary_id) {
     {
       $mercenary = get_unit_param($mercenary_id);
       $mercenary_bonus = $mercenary['bonus'];
       $mercenary_bonus = $mercenary_bonus >= 0 ? "+{$mercenary_bonus}" : "{$mercenary_bonus}";
-      switch($mercenary['bonus_type']) {
+      switch ($mercenary['bonus_type']) {
         case BONUS_PERCENT:
           $mercenary_bonus = "{$mercenary_bonus}% ";
         break;
@@ -164,7 +164,7 @@ 
       $mercenary_level = mrc_get_level($user, null, $mercenary_id, false, true);
       $mercenary_level_bonus = max(0, mrc_get_level($user, null, $mercenary_id) - $mercenary_level);
       $total_cost_old = 0;
-      if($is_permanent) {
+      if ($is_permanent) {
         $total_cost_old = eco_get_total_cost($mercenary_id, $mercenary_level);
         $total_cost_old = $total_cost_old[BUILD_CREATE][RES_DARK_MATTER] * $cost_alliance_multiplyer;
       }
@@ -193,7 +193,7 @@ 
       ));
 
       $upgrade_cost = 1;
-      for($i = classSupernova::$config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++) {
+      for ($i = classSupernova::$config->empire_mercenary_temporary ? 1 : $mercenary_level + 1; $mercenary['max'] ? ($i <= $mercenary['max']) : $upgrade_cost <= $user_dark_matter; $i++) {
         $total_cost = eco_get_total_cost($mercenary_id, $i);
         $total_cost[BUILD_CREATE][RES_DARK_MATTER] *= $cost_alliance_multiplyer;
         $upgrade_cost = $total_cost[BUILD_CREATE][RES_DARK_MATTER] - $total_cost_old;

docs/txt2html.php

Braces +22 added lines, -26 removed lines

@@ -2,7 +2,9 @@ 
 
 function dump($value,$varname = "",$level=0,$dumper = "")
 {
-  if ($varname) $varname .= " = ";
+  if ($varname) {
+    $varname .= " = ";
+  }
 
   if ($level==-1)
   {
@@ -13,7 +15,9 @@ 
     $trans["\0"]='⊕';
     return strtr(htmlspecialchars($value),$trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level==0) {
+    $dumper = '<pre>' . $varname;
+  }
 
   $type = gettype($value);
   $dumper .= $type;
@@ -22,9 +26,9 @@ 
   {
     $dumper .= '('.strlen($value).')';
     $value = dump($value,"",-1);
-  }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  } elseif ($type=='boolean') {
+    $value= ($value?'true':'false');
+  } elseif ($type=='object')
   {
     $props= get_class_vars(get_class($value));
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
@@ -34,8 +38,7 @@ 
       $dumper .= dump($value->$key,"",$level+1);
     }
     $value= '';
-  }
-  elseif ($type=='array')
+  } elseif ($type=='array')
   {
     $dumper .= '('.count($value).')';
     foreach($value as $key=>$val)
@@ -46,7 +49,9 @@ 
     $value= '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level==0) {
+    $dumper .= '</pre>';
+  }
   return $dumper;
 }
 
@@ -70,8 +75,7 @@ 
 if(substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
-}
-else
+} else
 {
   $path_prefix = '';
 }
@@ -119,8 +123,7 @@ 
       $buffer['name'] = $chapter[0];
     }
     $prev_chapter_is_header = true;
-  }
-  else
+  } else
   {
     $prev_chapter_is_header = false;
     foreach($chapter as &$note)
@@ -150,8 +153,7 @@ 
           if(!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
-          }
-          else
+          } else
           {
             $note_out['lines'][] = $buf_str;
           }
@@ -228,36 +230,31 @@ 
             if($matches[2])
             {
               buf_print("<ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("<ul>\r\n");
             }
             buf_print('<li>');
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
-          }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          } elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
             if(array_pop($depth))
             {
               buf_print("</ol>\r\n");
-            }
-            else
+            } else
             {
               buf_print("</ul>\r\n");
             }
             $last_spaces = $matches[1];
             buf_print('<li>');
-          }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          } elseif(strlen($last_spaces) == strlen($matches[1]))
           {
             if($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
-            }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            } elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -274,8 +271,7 @@ 
         if(array_pop($depth))
         {
           buf_print("</ol>\r\n");
-        }
-        else
+        } else
         {
           buf_print("</ul>\r\n");
         }

Spacing +61 added lines, -61 removed lines

@@ -1,58 +1,58 @@ 
 <?php
 
-function dump($value,$varname = "",$level=0,$dumper = "")
+function dump($value, $varname = "", $level = 0, $dumper = "")
 {
   if ($varname) $varname .= " = ";
 
-  if ($level==-1)
+  if ($level == -1)
   {
-    $trans[' ']='&there4;';
-    $trans["\t"]='&rArr;';
-    $trans["\n"]='&para;;';
-    $trans["\r"]='&lArr;';
-    $trans["\0"]='&oplus;';
-    return strtr(htmlspecialchars($value),$trans);
+    $trans[' '] = '&there4;';
+    $trans["\t"] = '&rArr;';
+    $trans["\n"] = '&para;;';
+    $trans["\r"] = '&lArr;';
+    $trans["\0"] = '&oplus;';
+    return strtr(htmlspecialchars($value), $trans);
   }
-  if ($level==0) $dumper = '<pre>' . $varname;
+  if ($level == 0) $dumper = '<pre>'.$varname;
 
   $type = gettype($value);
   $dumper .= $type;
 
-  if ($type=='string')
+  if ($type == 'string')
   {
     $dumper .= '('.strlen($value).')';
-    $value = dump($value,"",-1);
+    $value = dump($value, "", -1);
   }
-  elseif ($type=='boolean') $value= ($value?'true':'false');
-  elseif ($type=='object')
+  elseif ($type == 'boolean') $value = ($value ? 'true' : 'false');
+  elseif ($type == 'object')
   {
-    $props= get_class_vars(get_class($value));
+    $props = get_class_vars(get_class($value));
     $dumper .= '('.count($props).') <u>'.get_class($value).'</u>';
-    foreach($props as $key=>$val)
+    foreach ($props as $key=>$val)
     {
-      $dumper .= "\n".str_repeat("\t",$level+1).$key.' => ';
-      $dumper .= dump($value->$key,"",$level+1);
+      $dumper .= "\n".str_repeat("\t", $level + 1).$key.' => ';
+      $dumper .= dump($value->$key, "", $level + 1);
     }
-    $value= '';
+    $value = '';
   }
-  elseif ($type=='array')
+  elseif ($type == 'array')
   {
     $dumper .= '('.count($value).')';
-    foreach($value as $key=>$val)
+    foreach ($value as $key=>$val)
     {
-      $dumper .= "\n".str_repeat("\t",$level+1).dump($key,"",-1).' => ';
-      $dumper .= dump($val,"",$level+1);
+      $dumper .= "\n".str_repeat("\t", $level + 1).dump($key, "", -1).' => ';
+      $dumper .= dump($val, "", $level + 1);
     }
-    $value= '';
+    $value = '';
   }
   $dumper .= " <b>$value</b>";
-  if ($level==0) $dumper .= '</pre>';
+  if ($level == 0) $dumper .= '</pre>';
   return $dumper;
 }
 
 function pdump($value, $varname = '')
 {
-  print('<span style="text-align: left">' . dump($value, $varname) . '</span>');
+  print('<span style="text-align: left">'.dump($value, $varname).'</span>');
 }
 
 function debug($value, $varname = '')
@@ -67,7 +67,7 @@ 
   $output_buffer .= $string;
 }
 
-if(substr(getcwd(), -4) != 'docs')
+if (substr(getcwd(), -4) != 'docs')
 {
   $path_prefix = 'docs/';
 }
@@ -80,22 +80,22 @@ 
 
 $filename = 'changelog';
 
-$input =  file_get_contents($path_prefix . $filename . '.txt');
+$input = file_get_contents($path_prefix.$filename.'.txt');
 //$input = iconv('CP1251', 'UTF-8', $input);
 
 $input = preg_replace("/\r\n\d\d\d\d\-\d\d\-\d\d\ \d\d\:\d\d/", "[D] $0", $input);
 
-while(strpos($input, "\r\n\r\n") !== false)
+while (strpos($input, "\r\n\r\n") !== false)
 {
   $input = str_replace("\r\n\r\n", "\r\n", $input);
 }
-while(strpos($input, "~~~") !== false)
+while (strpos($input, "~~~") !== false)
 {
   $input = str_replace("~~~", "~~", $input);
 }
 $input = str_replace("\r\n~~", "~~", $input);
 
-while(strpos($input, "===") !== false)
+while (strpos($input, "===") !== false)
 {
   $input = str_replace("===", "==", $input);
 }
@@ -106,13 +106,13 @@ 
 $prev_chapter_is_header = false;
 $output = array();
 $buffer = array();
-foreach($input as &$chapter)
+foreach ($input as &$chapter)
 {
   $chapter = preg_split("/(\r\n[\[])/", $chapter, -1, PREG_SPLIT_NO_EMPTY); // , PREG_SPLIT_DELIM_CAPTURE
 
-  if(count($chapter) == 1 && !$prev_chapter_is_header)
+  if (count($chapter) == 1 && !$prev_chapter_is_header)
   {
-    if(!empty($chapter))
+    if (!empty($chapter))
     {
       $output[] = $buffer;
       $buffer = array();
@@ -123,7 +123,7 @@ 
   else
   {
     $prev_chapter_is_header = false;
-    foreach($chapter as &$note)
+    foreach ($chapter as &$note)
     {
       $note = explode("\r\n", $note);
       $new_note = true;
@@ -131,13 +131,13 @@ 
 
       $note_out = array();
 
-      foreach($note as &$line)
+      foreach ($note as &$line)
       {
-        if(!$line)
+        if (!$line)
         {
           continue;
         }
-        if($new_note)
+        if ($new_note)
         {
           // 78 - 3 = 75
           $note_out['style'] = $line[0];
@@ -145,9 +145,9 @@ 
         }
 
         $buf_str .= $line;
-        if(mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
+        if (mb_strlen($line, 'utf-8') < ($new_note ? 75 : 79))
         {
-          if(!isset($note_out['name']))
+          if (!isset($note_out['name']))
           {
             $note_out['name'] = $buf_str;
           }
@@ -201,31 +201,31 @@ 
   'D' => 'date',
 );
 
-foreach($output as $chapter)
+foreach ($output as $chapter)
 {
-  if(!$chapter)
+  if (!$chapter)
   {
     continue;
   }
 
   buf_print("<h1>{$chapter['name']}</h1>\r\n");
-  foreach($chapter['content'] as $block)
+  foreach ($chapter['content'] as $block)
   {
-    buf_print("<div class=\"{$styles[$block['style']]}\">" . ($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
-    buf_print(preg_replace("/\s{2,10}/", " ", $block['name']) . '<br />');
-    if(isset($block['lines']))
+    buf_print("<div class=\"{$styles[$block['style']]}\">".($block['style'] != 'D' ? "[{$block['style']}]&nbsp;" : ''));
+    buf_print(preg_replace("/\s{2,10}/", " ", $block['name']).'<br />');
+    if (isset($block['lines']))
     {
       $last_spaces = '';
       $depth = array();
-      foreach($block['lines'] as $line)
+      foreach ($block['lines'] as $line)
       {
-        if(preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
+        if (preg_match("/^(\s+)(\d*|\s)\.*\s*(.*)/", $line, $matches))
         {
           //$line = strlen($matches[1]) . '/' . $matches[2] . '/' . $matches[3];
           $line = $matches[3];
-          if(strlen($matches[1]) > strlen($last_spaces))
+          if (strlen($matches[1]) > strlen($last_spaces))
           {
-            if($matches[2])
+            if ($matches[2])
             {
               buf_print("<ol>\r\n");
             }
@@ -237,9 +237,9 @@ 
             $last_spaces = $matches[1];
             $depth[] = $matches[2];
           }
-          elseif(strlen($matches[1]) < strlen($last_spaces) && count($depth))
+          elseif (strlen($matches[1]) < strlen($last_spaces) && count($depth))
           {
-            if(array_pop($depth))
+            if (array_pop($depth))
             {
               buf_print("</ol>\r\n");
             }
@@ -250,14 +250,14 @@ 
             $last_spaces = $matches[1];
             buf_print('<li>');
           }
-          elseif(strlen($last_spaces) == strlen($matches[1]))
+          elseif (strlen($last_spaces) == strlen($matches[1]))
           {
-            if($matches[2] == '' && $depth[count($depth) - 1] != '')
+            if ($matches[2] == '' && $depth[count($depth) - 1] != '')
             {
               buf_print("</ol>\r\n");
               buf_print("<ul>\r\n");
             }
-            elseif($matches[2] != '' && $depth[count($depth) - 1] == '')
+            elseif ($matches[2] != '' && $depth[count($depth) - 1] == '')
             {
               buf_print("</ul>\r\n");
               buf_print("<ol>\r\n");
@@ -267,11 +267,11 @@ 
           }
         }
         $line = preg_replace("/\s{2,10}/", " ", $line);
-        buf_print($line . "<br />\r\n");
+        buf_print($line."<br />\r\n");
       }
-      while(count($depth))
+      while (count($depth))
       {
-        if(array_pop($depth))
+        if (array_pop($depth))
         {
           buf_print("</ol>\r\n");
         }
@@ -286,11 +286,11 @@ 
 }
 buf_print("</body>\r\n</html>\r\n");
 
-$html = file_get_contents($path_prefix . 'html/' . $filename . '.html');
-if($html != $output_buffer)
+$html = file_get_contents($path_prefix.'html/'.$filename.'.html');
+if ($html != $output_buffer)
 {
-  file_put_contents($path_prefix . 'html/' . $filename . '.html', $output_buffer);
-  if(!$path_prefix)
+  file_put_contents($path_prefix.'html/'.$filename.'.html', $output_buffer);
+  if (!$path_prefix)
   {
     print($output_buffer);
   }

stat.php

Indentation +30 added lines, -30 removed lines

@@ -50,52 +50,52 @@
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
 
 $stat_types = array(
-   STAT_TOTAL => array(
-     'type' => 'total',
-   ),
+    STAT_TOTAL => array(
+      'type' => 'total',
+    ),
 
-   STAT_FLEET => array(
-     'type' => 'fleet',
-   ),
+    STAT_FLEET => array(
+      'type' => 'fleet',
+    ),
 
-   STAT_TECH => array(
-     'type' => 'tech',
-   ),
+    STAT_TECH => array(
+      'type' => 'tech',
+    ),
 
-   STAT_BUILDING => array(
-     'type' => 'build',
-   ),
+    STAT_BUILDING => array(
+      'type' => 'build',
+    ),
 
-   STAT_DEFENSE => array(
-     'type' => 'defs',
-   ),
+    STAT_DEFENSE => array(
+      'type' => 'defs',
+    ),
 
-   STAT_RESOURCE => array(
-     'type' => 'res',
-   ),
+    STAT_RESOURCE => array(
+      'type' => 'res',
+    ),
 
-   STAT_RAID_TOTAL => array(
-     'type' => 'raids',
-   ),
+    STAT_RAID_TOTAL => array(
+      'type' => 'raids',
+    ),
 
-   STAT_RAID_WON => array(
-     'type' => 'raidswin',
-   ),
+    STAT_RAID_WON => array(
+      'type' => 'raidswin',
+    ),
 
-   STAT_RAID_LOST => array(
-     'type' => 'raidsloose',
-   ),
+    STAT_RAID_LOST => array(
+      'type' => 'raidsloose',
+    ),
 
   STAT_LVL_BUILDING => array(
-     'type' => 'lvl_minier',
+      'type' => 'lvl_minier',
   ),
 
   STAT_LVL_TECH => array(
-     'type' => 'player_rpg_tech_level',
+      'type' => 'player_rpg_tech_level',
   ),
 
   STAT_LVL_RAID => array(
-     'type' => 'lvl_raid',
+      'type' => 'lvl_raid',
   ),
 );
 stat_tpl_assign($template, $type, 'type', $stat_types, $sn_group_stat_common);

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,8 @@ 
   global $who;
 
   // $sn_group_stat_common = sn_get_groups('STAT_COMMON');
-  foreach($array as $key => $value) {
-    if($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
+  foreach ($array as $key => $value) {
+    if ($array_name == 'type' && $who == 2 && !in_array($key, $sn_group_stat_common)) {
       continue;
     }
 
@@ -28,7 +28,7 @@ 
 
 $allow_anonymous = true;
 
-include('common.' . substr(strrchr(__FILE__, '.'), 1));
+include('common.'.substr(strrchr(__FILE__, '.'), 1));
 
 lng_include('stat');
 
@@ -44,7 +44,7 @@ 
 $subject_list = array(
   1 => array('header' => classLocale::$lang['stat_player']),
 );
-if(!$source) {
+if (!$source) {
   $subject_list[2] = array('header' => classLocale::$lang['stat_allys']);
 }
 stat_tpl_assign($template, $who, 'subject', $subject_list, $sn_group_stat_common);
@@ -113,7 +113,7 @@ 
 
 $page_count = floor($record_count / 100);
 $pages = array();
-for($i = 0; $i <= $page_count; $i++) {
+for ($i = 0; $i <= $page_count; $i++) {
   $first_element = $i * 100 + 1;
   $last_element = $first_element + 99;
   $pages[$first_element] = array(
@@ -133,7 +133,7 @@ 
   );
 //pdump($row);
 
-  if($who == 1) {
+  if ($who == 1) {
     $row_stat['ALLY_NAME'] = $row['ally_name'];
     $row_stat['ALLY_ID'] = $row['ally_id'];
     empty($row['username']) ? $row['username'] = $row['name'] : false;

scheduler.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
 
 // require_once('includes/includes/scheduler_process.php');
 
-if(($result = scheduler_process()) && !defined('IN_ADMIN')) {
+if (($result = scheduler_process()) && !defined('IN_ADMIN')) {
   $result = htmlspecialchars($result, ENT_QUOTES, 'UTF-8');
   print(json_encode($result));
 }
 
-if(!defined('IN_ADMIN')) {
+if (!defined('IN_ADMIN')) {
   die();
 }

includes/alliance/ali_external_request.inc

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)
 {
   $debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -20,7 +20,7 @@ 
     header('Location: alliance.php');
   }
 
-  if($user_request['request_denied'])
+  if ($user_request['request_denied'])
   {
     $lang['request_text'] = sprintf($lang['ali_req_deny_msg'], $ally['ally_tag'], $user_request['request_text']);
   }
@@ -42,12 +42,12 @@ 
 
 $ally = doquery("SELECT * FROM {{alliance}} WHERE `id` ='{$id_ally}'", true);
 
-if(!$ally)
+if (!$ally)
 {
   message($lang['ali_sys_notFound'], $lang['ali_req_title']);
 }
 
-if($ally['ally_request_notallow'])
+if ($ally['ally_request_notallow'])
 {
   message($lang['ali_req_not_allowed'], $lang['ali_req_title']);
 }

Braces +1 added lines, -2 removed lines

@@ -115,8 +115,7 @@
     ));
 
     display($template, $lang['tech'][STRUC_MOON_GATE]);
-  }
-  else
+  } else
   {
     message($lang['gate_no_src_ga'], $lang['tech'][STRUC_MOON_GATE], "overview.php", 10);
   }

includes/includes/uni_rename.php

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
       sn_db_transaction_commit();
       sys_redirect("galaxy.php?mode=name&galaxy={$uni_galaxy}&system={$uni_system}");
     }
-  }
-  catch (exception $e)
+  } catch (exception $e)
   {
     sn_db_transaction_rollback();
     $template->assign_block_vars('result', array(

Spacing +7 added lines, -7 removed lines

@@ -11,12 +11,12 @@ 
     $uni_galaxy = sys_get_param_int('galaxy', $planetrow['galaxy']);
     $uni_system = sys_get_param_int('system');
 
-    if($uni_galaxy < 1 || $uni_galaxy > Vector::$knownGalaxies)
+    if ($uni_galaxy < 1 || $uni_galaxy > Vector::$knownGalaxies)
     {
       throw new exception(classLocale::$lang['uni_msg_error_wrong_galaxy'], ERR_ERROR);
     }
 
-    if($uni_system < 0 || $uni_system > Vector::$knownSystems)
+    if ($uni_system < 0 || $uni_system > Vector::$knownSystems)
     {
       throw new exception(classLocale::$lang['uni_msg_error_wrong_system'], ERR_ERROR);
     }
@@ -25,12 +25,12 @@ 
     $uni_row['universe_price'] += $uni_system ? classSupernova::$config->uni_price_system : classSupernova::$config->uni_price_galaxy;
     $uni_row['universe_name'] = strip_tags($uni_row['universe_name'] ? $uni_row['universe_name'] : ($uni_system ? "{$classLocale['sys_system']} [{$uni_galaxy}:{$uni_system}]" : "{$classLocale['sys_galaxy']} {$uni_galaxy}"));
 
-    if(sys_get_param_str('uni_name_submit'))
+    if (sys_get_param_str('uni_name_submit'))
     {
       $uni_row['universe_name'] = strip_tags(sys_get_param_str('uni_name'));
 
       $uni_price = sys_get_param_float('uni_price');
-      if($uni_price < $uni_row['universe_price'])
+      if ($uni_price < $uni_row['universe_price'])
       {
         throw new exception(classLocale::$lang['uni_msg_error_low_price'], ERR_ERROR);
       }
@@ -39,12 +39,12 @@ 
       sn_db_transaction_start();
       $user = db_user_by_id($user['id'], true);
       // if($user[get_unit_param(RES_DARK_MATTER, P_NAME)] < $uni_price)
-      if(mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
+      if (mrc_get_level($user, null, RES_DARK_MATTER) < $uni_price)
       {
         throw new exception(classLocale::$lang['uni_msg_error_no_dm'], ERR_ERROR);
       }
 
-      if(!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to " . sys_get_param_str_unsafe('uni_name')))
+      if (!rpg_points_change($user['id'], RPG_RENAME, -$uni_price, "Renaming [{$uni_galaxy}:{$uni_system}] to ".sys_get_param_str_unsafe('uni_name')))
       {
         throw new exception(classLocale::$lang['sys_msg_err_update_dm'], ERR_ERROR);
       }
@@ -74,4 +74,4 @@ 
     'PAGE_HINT'   => classLocale::$lang['uni_name_page_hint'],
   ));
 
-  display($template, classLocale::$lang['sys_universe'] . ' - ' . classLocale::$lang['uni_naming'], true, '', false);
+  display($template, classLocale::$lang['sys_universe'].' - '.classLocale::$lang['uni_naming'], true, '', false);

includes/includes/market_info.inc

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
 
     sn_db_transaction_commit();
     throw new Exception($info_action, ERR_NONE);
-  }
-  catch (Exception $e)
+  } catch (Exception $e)
   {
     sn_db_transaction_rollback();
 

Spacing +14 added lines, -14 removed lines

@@ -2,7 +2,7 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
+if (!defined('SN_IN_MARKET') || SN_IN_MARKET !== true)
 {
   classSupernova::$debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
@@ -17,54 +17,54 @@ 
 ));
 
 $info_action = sys_get_param_int('action');
-if($info_action)
+if ($info_action)
 {
   try
   {
     sn_db_transaction_start();
 
     $user = db_user_by_id($user['id'], true);
-    if(mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->rpg_cost_info)
+    if (mrc_get_level($user, null, RES_DARK_MATTER) < classSupernova::$config->rpg_cost_info)
     {
       throw new Exception(MARKET_NO_DM, ERR_ERROR);
     }
 
-    switch($info_action)
+    switch ($info_action)
     {
       case MARKET_INFO_PLAYER:
         $user_info_name_unsafe = sys_get_param_str_unsafe('user_info_name');
-        if(!$user_info_name_unsafe)
+        if (!$user_info_name_unsafe)
         {
           throw new Exception(MARKET_INFO_PLAYER_WRONG, ERR_ERROR);
         }
 
-        if(is_id($user_info_name_unsafe))
+        if (is_id($user_info_name_unsafe))
         {
           $user_info = db_user_by_id($user_info_name_unsafe, true, '`id`, `username`', true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           $user_info = db_user_by_username($user_info_name_unsafe, true, '`id`, `username`', true, true);
         }
-        if(!is_array($user_info))
+        if (!is_array($user_info))
         {
           throw new Exception(MARKET_INFO_PLAYER_NOT_FOUND, ERR_ERROR);
         }
-        if($user_info['id'] == $user['id'])
+        if ($user_info['id'] == $user['id'])
         {
           throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
         }
 
         $msg_text = array();
-        foreach(sn_get_groups('mercenaries') as $mercenary_id)
+        foreach (sn_get_groups('mercenaries') as $mercenary_id)
         {
-          $msg_text[] = "{$classLocale['tech'][$mercenary_id]} - " . (($mercenary_level = mrc_get_level($user_info, null, $mercenary_id)) ? "{$classLocale['sys_level']} {$mercenary_level}" : classLocale::$lang['eco_mrk_info_not_hired']);
+          $msg_text[] = "{$classLocale['tech'][$mercenary_id]} - ".(($mercenary_level = mrc_get_level($user_info, null, $mercenary_id)) ? "{$classLocale['sys_level']} {$mercenary_level}" : classLocale::$lang['eco_mrk_info_not_hired']);
         }
-        if($mercenary_level = mrc_get_level($user_info, null, UNIT_PREMIUM))
+        if ($mercenary_level = mrc_get_level($user_info, null, UNIT_PREMIUM))
         {
           $msg_text[] = "{$classLocale['tech'][UNIT_PREMIUM]} - {$mercenary_level} {$classLocale['sys_level']}";
         }
-        $msg_text = sprintf(classLocale::$lang['eco_mrk_info_player_message'], $user_info['id'], $user_info['username']) . "\r\n" . implode("\r\n", $msg_text);
+        $msg_text = sprintf(classLocale::$lang['eco_mrk_info_player_message'], $user_info['id'], $user_info['username'])."\r\n".implode("\r\n", $msg_text);
 
         msg_send_simple_message($user['id'], 0, SN_TIME_NOW, MSG_TYPE_SPY, classLocale::$lang['eco_mrk_info_msg_from'], "{$classLocale['eco_mrk_info_player']} ID {$user_info['id']} [{$user_info['username']}]", $msg_text, false, true);
       break;
@@ -74,7 +74,7 @@ 
       break;
     }
 
-    if(!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -classSupernova::$config->rpg_cost_info, "Using Black Market page {$classLocale['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
+    if (!rpg_points_change($user['id'], RPG_MARKET_INFO_MERCENARY, -classSupernova::$config->rpg_cost_info, "Using Black Market page {$classLocale['eco_mrk_info']} - getting info about user ID {$user_info['id']}"))
     {
       // TODO: throw new Exception(MARKET_INFO_PLAYER_SAME, ERR_ERROR);
     }

includes/includes/market_trader.inc

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
+if ((!defined('SN_IN_MARKET') || SN_IN_MARKET !== true) && (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true)) {
   $debug->error("Attempt to call market page mode {$mode} directly - not from market.php", 'Forbidden', 403);
 }
 
@@ -27,12 +27,12 @@ 
 
   // $dm_db_name = pname_resource_name(RES_DARK_MATTER);
   $exchangeTo = in_array($exchangeTo = sys_get_param_int('exchangeTo'), sn_get_groups('resources_trader')) ? $exchangeTo : 0;
-  if($exchangeTo && is_array($tradeList = $_POST['spend'])) {
+  if ($exchangeTo && is_array($tradeList = $_POST['spend'])) {
     $value = 0;
     $qry = array();
 
     sn_db_transaction_start();
-    if($planetrow['id_owner']) {
+    if ($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
     }
@@ -41,27 +41,27 @@ 
       $user = db_user_by_id($user['id'], true);
     }
 
-    foreach(sn_get_groups('resources_trader') as $resource_id) {
+    foreach (sn_get_groups('resources_trader') as $resource_id) {
       $amount = floatval($tradeList[$resource_id]);
-      if($amount < 0) {
+      if ($amount < 0) {
         $debug->error('Trying to supply negative resource amount on Black Market Page', 'Hack Attempt', 305);
       }
 
-      if($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
+      if ($resource_id == RES_DARK_MATTER && $exchangeTo == RES_DARK_MATTER) {
         continue;
       }
 
       $resource_db_name = pname_resource_name($resource_id);
-      if($exchangeTo == RES_DARK_MATTER) {
+      if ($exchangeTo == RES_DARK_MATTER) {
         $sign = '+';
         $amount = floor($tradeList[RES_DARK_MATTER] / 3 * $rates[RES_DARK_MATTER] / $rates[$resource_id]);
         $value += $amount;
       } else {
         $value += floor($amount * $rates[$resource_id] / $rates[$exchangeTo]);
-        if($resource_id == RES_DARK_MATTER) {
+        if ($resource_id == RES_DARK_MATTER) {
           $amount = 0;
         } else {
-          if(mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
+          if (mrc_get_level($user, $planetrow, $resource_id, true) < $amount) {
             $intError = MARKET_NO_RESOURCES;
             break;
           }
@@ -70,12 +70,12 @@ 
         }
       }
 
-      if($amount) {
+      if ($amount) {
         $qry[] = "`{$resource_db_name}` = `{$resource_db_name}` {$sign} {$amount}";
       }
     }
 
-    if($exchangeTo != RES_DARK_MATTER) {
+    if ($exchangeTo != RES_DARK_MATTER) {
       $amount = floor($value);
       $exchange_to_db_name = pname_resource_name($exchangeTo);
       $qry[] = "`{$exchange_to_db_name}` = `{$exchange_to_db_name}` + {$amount}";
@@ -86,7 +86,7 @@ 
     $intError = $value <= 0 ? MARKET_ZERO_DEAL : $intError;
     $intError = mrc_get_level($user, null, RES_DARK_MATTER) < $operation_cost ? MARKET_NO_DM : $intError;
 
-    if($intError == MARKET_DEAL) {
+    if ($intError == MARKET_DEAL) {
       $qry = implode(', ', $qry);
       $table = $planetrow['id_owner'] ? 'planets' : 'users';
 
@@ -111,8 +111,8 @@ 
     'EXCHANGE_TO_RESOURCE_ID' => $exchangeTo,
   ));
 
-  foreach(sn_get_groups('resources_trader') as $resource_id) {
-    if($resource_id == RES_DARK_MATTER) {
+  foreach (sn_get_groups('resources_trader') as $resource_id) {
+    if ($resource_id == RES_DARK_MATTER) {
       $amount = floor(mrc_get_level($user, null, RES_DARK_MATTER) - $config->rpg_cost_trader);
     } else {
       $amount = floor(mrc_get_level($user, $planetrow, $resource_id));

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
     if($planetrow['id_owner']) {
       $global_data = sys_o_get_updated($user, $planetrow, SN_TIME_NOW);
       $planetrow = $global_data['planet'];
-    }
-    else {
+    } else {
       // Locking user record
       $user = db_user_by_id($user['id'], true);
     }

includes/classes/auth_abstract.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
    */
   // OK 4.9
   public function __construct($filename = __FILE__) {
-    if($this->provider_id == ACCOUNT_PROVIDER_NONE) {
+    if ($this->provider_id == ACCOUNT_PROVIDER_NONE) {
       die('У всех провайдеров должен быть $provider_id!');
     }
 
@@ -133,7 +133,7 @@ 
   // OK 4.6
   public function player_name_suggest() {
     $name = '';
-    if(is_object($this->account) && !empty($this->account->account_email)) {
+    if (is_object($this->account) && !empty($this->account->account_email)) {
       list($name) = explode('@', $this->account->account_email);
     }