supernova-ws / SuperNova

time_probe.php

Spacing +4 added lines, -4 removed lines

@@ -13,11 +13,11 @@ 
 $time_server = $time_local  - $time_diff
 */
 
-if($font_size = sys_get_param_str('font_size')) {
-  if(strpos($font_size, '%') !== false) {
+if ($font_size = sys_get_param_str('font_size')) {
+  if (strpos($font_size, '%') !== false) {
     // Размер шрифта в процентах
     $font_size = min(max(floatval($font_size), FONT_SIZE_PERCENT_MIN), FONT_SIZE_PERCENT_MAX) . '%';
-  } elseif(strpos($font_size, 'px') !== false) {
+  } elseif (strpos($font_size, 'px') !== false) {
     // Размер шрифта в пикселях
     $font_size = min(max(floatval($font_size), FONT_SIZE_PIXELS_MIN), FONT_SIZE_PIXELS_MAX) . 'px';
   } else {
@@ -29,7 +29,7 @@ 
   classSupernova::$user_options[PLAYER_OPTION_BASE_FONT_SIZE] = $font_size;
 } else {
   $user_time_diff = playerTimeDiff::user_time_diff_get();
-  if($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
+  if ($user_time_diff[PLAYER_OPTION_TIME_DIFF_FORCED]) {
     $time_diff = intval($user_time_diff[PLAYER_OPTION_TIME_DIFF]);
   } else {
     $user_time_diff = playerTimeDiff::user_time_diff_probe();

docs/txt2html.php

Spacing +58 added lines, -58 removed lines

@@ -1,52 +1,52 @@ 
 <?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);
+    $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>';
-    foreach($props as $key=>$val)
+    $props = get_class_vars(get_class($value));
+    $dumper .= '(' . count($props) . ') <u>' . get_class($value) . '</u>';
+    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)
+    $dumper .= '(' . count($value) . ')';
+    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;
 }
 
@@ -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']))
+    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");
@@ -269,9 +269,9 @@ 
         $line = preg_replace("/\s{2,10}/", " ", $line);
         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");
         }
@@ -287,10 +287,10 @@ 
 buf_print("</body>\r\n</html>\r\n");
 
 $html = file_get_contents($path_prefix . 'html/' . $filename . '.html');
-if($html != $output_buffer)
+if ($html != $output_buffer)
 {
   file_put_contents($path_prefix . 'html/' . $filename . '.html', $output_buffer);
-  if(!$path_prefix)
+  if (!$path_prefix)
   {
     print($output_buffer);
   }

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");
         }

index.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-if(isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
+if (isset($sn_page_name) || ($sn_page_name = isset($_GET['page']) ? trim(strip_tags($_GET['page'])) : '')) {
   require_once('common.' . substr(strrchr(__FILE__, '.'), 1));
 // pdump($sn_mvc);
-  if($sn_page_name) {
+  if ($sn_page_name) {
     // Loading page-specific language files
     global $template;
     isset($sn_mvc['model'][$sn_page_name]) and execute_hooks($sn_mvc['model'][$sn_page_name], $template);
@@ -25,7 +25,7 @@ 
       }
     }
 */
-    if(!empty($template_result) && is_object($template)) {
+    if (!empty($template_result) && is_object($template)) {
       $template->assign_recursive($template_result);
     }
     display($template);

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 +5 added lines, -5 removed lines

@@ -11,8 +11,8 @@ 
   global $who, $lang;
 
   // $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;
     }
 
@@ -44,7 +44,7 @@ 
 $subject_list = array(
   1 => array('header' => $lang['stat_player']),
 );
-if(!$source) {
+if (!$source) {
   $subject_list[2] = array('header' => $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;

records.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 
 include('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(HIDE_BUILDING_RECORDS)
+if (HIDE_BUILDING_RECORDS)
 {
   return;
 }
@@ -34,7 +34,7 @@ 
 
 $user_name_cache = array();
 
-foreach($show_groups as $unit_group_id => $mode)
+foreach ($show_groups as $unit_group_id => $mode)
 {
   $template->assign_block_vars('records', array(
     'UNIT' => $lang['tech'][$unit_group_id],
@@ -43,15 +43,15 @@ 
   ));
   $unit_group = get_unit_param('techtree', $unit_group_id); // TODO - REWRITE!!!!
 
-  foreach($unit_group as $unit_id)
+  foreach ($unit_group as $unit_id)
   {
     $unit_name = &$lang['tech'][$unit_id];
-    if($unit_name)
+    if ($unit_name)
     {
       // TODO - ISUNITSTACKABLE!
       $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);
 
-      if($data_row)
+      if ($data_row)
       {
         $template->assign_block_vars('records', array(
           'UNIT' => $unit_name,

language/ru/system.mo.php

Indentation +10 added lines, -10 removed lines

@@ -689,15 +689,15 @@ 
   ),
 
   'months' => array(
-     1 =>'января',
-     2 =>'февраля',
-     3 =>'марта',
-     4 =>'апреля',
-     5 =>'мая',
-     6 =>'июня',
-     7 =>'июля',
-     8 =>'августа',
-     9 =>'сентября',
+      1 =>'января',
+      2 =>'февраля',
+      3 =>'марта',
+      4 =>'апреля',
+      5 =>'мая',
+      6 =>'июня',
+      7 =>'июля',
+      8 =>'августа',
+      9 =>'сентября',
     10 =>'октября',
     11 =>'ноября',
     12 =>'декабря'
@@ -993,7 +993,7 @@ 
     PASSWORD_RESTORE_ERROR_ACCOUNT_NOT_EXISTS => 'Внутренняя ошибка - при смене пароля аккаунт не найден! Сообщите об этой ошибке Администрации!',
     AUTH_PASSWORD_RESET_INSIDE_ERROR_NO_ACCOUNT_FOR_CONFIRMATION => 'ВНУТРЕННЯЯ ОШИБКА! Нет аккаунтов для сброса пароля при корректном коде подтверждения! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
     LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET => 'ВНУТРЕННЯЯ ОШИБКА! СООБЩИТЕ АДМИНИСТРАЦИИ! Не установлен аккаунт при cookie_set()! Пожалуйста, сообщите об этой ошибке Администрации Вселенной!',
- ),
+  ),
 
   'log_reg_email_title' => "Ваша регистрация на сервере %1\$s игры СуперНова",
   'log_reg_email_text' => "Подтверждение регистрации для %3\$s\r\n\r\n

Spacing +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
     REGISTER_ERROR_USERNAME_WRONG => 'Некорректное имя игрока',
     REGISTER_ERROR_ACCOUNT_NAME_EXISTS => 'Имя учётной записи уже занято. Попробуйте войти с этим именем и вашим паролем или воспользоваться сбросом пароля',
     REGISTER_ERROR_PASSWORD_INSECURE => 'Неправильный пароль. Пароль должен состоять минимум из ' . PASSWORD_LENGTH_MIN . ' символов',
-    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN. ' символов',
+    REGISTER_ERROR_USERNAME_SHORT => 'Слишком короткое имя. Имя должно состоять минимум из ' . LOGIN_LENGTH_MIN . ' символов',
     REGISTER_ERROR_PASSWORD_DIFFERENT => 'Пароль и проверочный пароль не совпадают. Проверьте правильность ввода',
     REGISTER_ERROR_EMAIL_EMPTY => 'Е-Мейл не может быть пустым',
     REGISTER_ERROR_EMAIL_WRONG => 'Введенный Е-Мейл не является допустимым адресом электронной почты. Проверьте написание Е-Мейла или используйте другой адрес почтового ящика',

dark_matter.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 include_once('common.' . substr(strrchr(__FILE__, '.'), 1));
 
-if(sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
+if (sn_module_get_active_count('payment') && !defined('SN_GOOGLE')) {
   sys_redirect('metamatter.php');
 }
 

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/vars.php

Indentation +74 added lines, -74 removed lines

@@ -16,23 +16,23 @@ 
 $sn_menu_admin_extra = array();
 
 $sn_mvc = array(
- 'model' => array(
-   'options' => array('sn_options_model'),
-   'chat' => array('sn_chat_model'),
-   'chat_add' => array('sn_chat_add_model'),
- ),
- 'view' => array(
-   'options' => array('sn_options_view'),
-   'chat' => array('sn_chat_view'),
-   'chat_msg' => array('sn_chat_msg_view'),
- ),
- 'controller' => array(),
- 'i18n' => array(
-   'options' => array(
-     'options' => 'options',
-     'messages' => 'messages',
-   ),
- ),
+  'model' => array(
+    'options' => array('sn_options_model'),
+    'chat' => array('sn_chat_model'),
+    'chat_add' => array('sn_chat_add_model'),
+  ),
+  'view' => array(
+    'options' => array('sn_options_view'),
+    'chat' => array('sn_chat_view'),
+    'chat_msg' => array('sn_chat_msg_view'),
+  ),
+  'controller' => array(),
+  'i18n' => array(
+    'options' => array(
+      'options' => 'options',
+      'messages' => 'messages',
+    ),
+  ),
 );
 
 $note_priority_classes = array(
@@ -120,62 +120,62 @@ 
   );
 
 $sn_message_class_list = array(
-   MSG_TYPE_NEW => array(
-     'name' => 'new_message',
-     'switchable' => false,
-     'email' => false,
-   ),
-   MSG_TYPE_ADMIN => array(
-     'name' => 'msg_admin',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_PLAYER => array(
-     'name' => 'mnl_joueur',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_ALLIANCE => array(
-     'name' => 'mnl_alliance',
-     'switchable' => false,
-     'email' => true,
-   ),
-   MSG_TYPE_SPY => array(
-     'name' => 'mnl_spy',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_COMBAT => array(
-     'name' => 'mnl_attaque',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_TRANSPORT => array(
-     'name' => 'mnl_transport',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_RECYCLE => array(
-     'name' => 'mnl_exploit',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_EXPLORE => array(
-     'name' => 'mnl_expedition',
-     'switchable' => true,
-     'email' => true,
-   ),
-   //     97 => 'mnl_general',
-   MSG_TYPE_QUE => array(
-     'name' => 'mnl_buildlist',
-     'switchable' => true,
-     'email' => true,
-   ),
-   MSG_TYPE_OUTBOX => array(
-     'name' => 'mnl_outbox',
-     'switchable' => false,
-     'email' => false,
-   ),
+    MSG_TYPE_NEW => array(
+      'name' => 'new_message',
+      'switchable' => false,
+      'email' => false,
+    ),
+    MSG_TYPE_ADMIN => array(
+      'name' => 'msg_admin',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_PLAYER => array(
+      'name' => 'mnl_joueur',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_ALLIANCE => array(
+      'name' => 'mnl_alliance',
+      'switchable' => false,
+      'email' => true,
+    ),
+    MSG_TYPE_SPY => array(
+      'name' => 'mnl_spy',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_COMBAT => array(
+      'name' => 'mnl_attaque',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_TRANSPORT => array(
+      'name' => 'mnl_transport',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_RECYCLE => array(
+      'name' => 'mnl_exploit',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_EXPLORE => array(
+      'name' => 'mnl_expedition',
+      'switchable' => true,
+      'email' => true,
+    ),
+    //     97 => 'mnl_general',
+    MSG_TYPE_QUE => array(
+      'name' => 'mnl_buildlist',
+      'switchable' => true,
+      'email' => true,
+    ),
+    MSG_TYPE_OUTBOX => array(
+      'name' => 'mnl_outbox',
+      'switchable' => false,
+      'email' => false,
+    ),
 );
 
 $sn_message_groups = array(
@@ -1027,7 +1027,7 @@ 
       SHIP_HUGE_DEATH_STAR => SHIP_HUGE_DEATH_STAR, SHIP_HUGE_SUPERNOVA => SHIP_HUGE_SUPERNOVA,
       SHIP_CARGO_SMALL => SHIP_CARGO_SMALL, SHIP_CARGO_BIG => SHIP_CARGO_BIG, SHIP_CARGO_SUPER => SHIP_CARGO_SUPER, SHIP_CARGO_HYPER => SHIP_CARGO_HYPER,
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
-     ),
+      ),
     // Defensive building list
     'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,

Spacing +23 added lines, -23 removed lines

@@ -97,7 +97,7 @@ 
   SNC_VER_ERROR_MISSMATCH_KEY_ID => 'error',
 );
 
-$tableList = array( 'aks', 'alliance', 'alliance_requests', 'announce', 'annonce', 'banned', 'buddy', 'chat', 'config', 'counter',
+$tableList = array('aks', 'alliance', 'alliance_requests', 'announce', 'annonce', 'banned', 'buddy', 'chat', 'config', 'counter',
   'errors', 'fleets', 'fleet_log', 'galaxy', 'iraks', 'logs', 'log_dark_matter', 'messages', 'notes', 'planets', 'quest',
   'quest_status', 'referrals', 'rw', 'statpoints', 'users'
 );
@@ -188,14 +188,14 @@ 
 $user_option_list = array();
 
 $user_option_list[OPT_MESSAGE] = array();
-foreach($sn_message_class_list as $message_class_id => $message_class_data)
+foreach ($sn_message_class_list as $message_class_id => $message_class_data)
 {
-  if($message_class_data['switchable'])
+  if ($message_class_data['switchable'])
   {
     $user_option_list[OPT_MESSAGE]["opt_{$message_class_data['name']}"] = 1;
   }
 
-  if($message_class_data['email'])
+  if ($message_class_data['email'])
   {
     $user_option_list[OPT_MESSAGE]["opt_email_{$message_class_data['name']}"] = 0;
   }
@@ -778,7 +778,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_HYDROGEN,
         UNIT_PLANET_DENSITY_RARITY => 30, // 1, // 40.00, // * 1/121 0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.20, RES_CRYSTAL => 0.60, RES_DEUTERIUM => 7.10,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -787,7 +787,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_METHANE,
         UNIT_PLANET_DENSITY_RARITY =>  130, // 6, // 6.67, // * 6,0	4,95868
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.55, RES_CRYSTAL => 0.85, RES_DEUTERIUM => 4.60,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -796,7 +796,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_ICE_WATER,
         UNIT_PLANET_DENSITY_RARITY =>  450, //20, // 2.00, // * 20,0	16,52893
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.86, RES_CRYSTAL => 0.95, RES_DEUTERIUM => 2.20,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -806,7 +806,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_RAW,
         UNIT_PLANET_DENSITY_RARITY => 20, // 1, // 40.00, // *1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.40, RES_CRYSTAL => 12.37, RES_DEUTERIUM => 0.50,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -815,7 +815,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_SILICATE,
         UNIT_PLANET_DENSITY_RARITY => 140, // 5.71, // * 7,0	5,78512
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.67, RES_CRYSTAL => 4.50, RES_DEUTERIUM => 0.85,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -824,7 +824,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_CRYSTAL_STONE,
         UNIT_PLANET_DENSITY_RARITY => 500, // 1.90, // * 21,0	17,35537
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95, ),
+        UNIT_RESOURCES => array(RES_METAL => 0.80, RES_CRYSTAL => 2.00, RES_DEUTERIUM => 0.95,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -834,7 +834,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_STANDARD,
         UNIT_PLANET_DENSITY_RARITY => 1000, // 1.0, // * 40,0	33,05785
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_NORMAL,
-        UNIT_RESOURCES => array(RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00, ),
+        UNIT_RESOURCES => array(RES_METAL => 1.00, RES_CRYSTAL => 1.00, RES_DEUTERIUM => 1.00,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -844,7 +844,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_ORE,
         UNIT_PLANET_DENSITY_RARITY => 550, // 2.11, // * 19,0	15,70248
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_AVERAGE,
-        UNIT_RESOURCES => array(RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80, ),
+        UNIT_RESOURCES => array(RES_METAL => 1.60, RES_CRYSTAL => 0.90, RES_DEUTERIUM => 0.80,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 999,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 0,
       ),
@@ -853,7 +853,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_PERIDOT,
         UNIT_PLANET_DENSITY_RARITY => 120, // 8.00, // * 5,0	4,13223
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_GOOD,
-        UNIT_RESOURCES => array(RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55, ),
+        UNIT_RESOURCES => array(RES_METAL => 4.71, RES_CRYSTAL => 0.80, RES_DEUTERIUM => 0.55,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 200,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 6,
       ),
@@ -862,7 +862,7 @@ 
         UNIT_PLANET_DENSITY_INDEX => PLANET_DENSITY_METAL_RAW,
         UNIT_PLANET_DENSITY_RARITY => 25, // 40.00, // * 1,0	0,82645
         UNIT_PLANET_DENSITY_RICHNESS => PLANET_DENSITY_RICHNESS_PERFECT,
-        UNIT_RESOURCES => array(RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25, ),
+        UNIT_RESOURCES => array(RES_METAL => 8.00, RES_CRYSTAL => 0.40, RES_DEUTERIUM => 0.25,),
         UNIT_PLANET_DENSITY_MAX_SECTORS => 150,
         UNIT_PLANET_DENSITY_MIN_ASTROTECH => 11,
       ),
@@ -992,7 +992,7 @@ 
     ),
 
     // Tech list
-    'tech'      => array (
+    'tech'      => array(
       TECH_ARMOR => TECH_ARMOR, TECH_WEAPON => TECH_WEAPON, TECH_SHIELD => TECH_SHIELD,
       TECH_SPY => TECH_SPY, TECH_COMPUTER => TECH_COMPUTER,
       TECH_ENERGY => TECH_ENERGY, TECH_LASER => TECH_LASER, TECH_ION => TECH_ION, TECH_PLASMA => TECH_PLASMA, TECH_HYPERSPACE => TECH_HYPERSPACE,
@@ -1003,7 +1003,7 @@ 
     ),
 
     // Mercenaries
-    'mercenaries' => array (
+    'mercenaries' => array(
       MRC_STOCKMAN => MRC_STOCKMAN, MRC_SPY => MRC_SPY, MRC_ACADEMIC => MRC_ACADEMIC,
       MRC_ADMIRAL => MRC_ADMIRAL, MRC_COORDINATOR => MRC_COORDINATOR, MRC_NAVIGATOR => MRC_NAVIGATOR,
     ),
@@ -1029,7 +1029,7 @@ 
       SHIP_RECYCLER => SHIP_RECYCLER, SHIP_COLONIZER => SHIP_COLONIZER, SHIP_SPY => SHIP_SPY, SHIP_SATTELITE_SOLAR => SHIP_SATTELITE_SOLAR
      ),
     // Defensive building list
-    'defense'   => array (UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
+    'defense'   => array(UNIT_DEF_TURRET_MISSILE => UNIT_DEF_TURRET_MISSILE, UNIT_DEF_TURRET_LASER_SMALL => UNIT_DEF_TURRET_LASER_SMALL,
                           UNIT_DEF_TURRET_LASER_BIG => UNIT_DEF_TURRET_LASER_BIG, UNIT_DEF_TURRET_GAUSS => UNIT_DEF_TURRET_GAUSS,
                           UNIT_DEF_TURRET_ION => UNIT_DEF_TURRET_ION, UNIT_DEF_TURRET_PLASMA => UNIT_DEF_TURRET_PLASMA,
 
@@ -1039,7 +1039,7 @@ 
     ),
 
     // Missiles list
-    'missile'   => array (UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET, ),
+    'missile'   => array(UNIT_DEF_MISSILE_INTERCEPTOR => UNIT_DEF_MISSILE_INTERCEPTOR, UNIT_DEF_MISSILE_INTERPLANET => UNIT_DEF_MISSILE_INTERPLANET,),
 
     // Combat units list
     'combat'    => array(
@@ -1079,9 +1079,9 @@ 
     ),
 
     // Resource list
-    'resources' => array ( 0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'),
+    'resources' => array(0 => 'metal', 1 => 'crystal', 2 => 'deuterium', 3 => 'dark_matter'),
     // Resources all
-    'resources_all' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER, ),
+    'resources_all' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY, RES_DARK_MATTER => RES_DARK_MATTER, RES_METAMATTER => RES_METAMATTER,),
     // Resources can be produced on planet
     'resources_planet' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_ENERGY => RES_ENERGY),
     // Resources can be looted from planet
@@ -1100,13 +1100,13 @@ 
     ),
 
     // Resources that can be tradeable in market trader AND be a quest_rewards
-    'quest_rewards' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER, ),
+    'quest_rewards' => array(RES_METAL => RES_METAL, RES_CRYSTAL => RES_CRYSTAL, RES_DEUTERIUM => RES_DEUTERIUM, RES_DARK_MATTER => RES_DARK_MATTER,),
 
 //      // Ques list
 //      'ques' => array(QUE_STRUCTURES, QUE_HANGAR, QUE_RESEARCH),
 
-    'STAT_COMMON' => array(STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE, ),
-    'STAT_PLAYER' => array(STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID, ),
+    'STAT_COMMON' => array(STAT_TOTAL => STAT_TOTAL, STAT_FLEET => STAT_FLEET, STAT_TECH => STAT_TECH, STAT_BUILDING => STAT_BUILDING, STAT_DEFENSE => STAT_DEFENSE, STAT_RESOURCE => STAT_RESOURCE,),
+    'STAT_PLAYER' => array(STAT_RAID_TOTAL => STAT_RAID_TOTAL, STAT_RAID_WON => STAT_RAID_WON, STAT_RAID_LOST => STAT_RAID_LOST, STAT_LVL_BUILDING => STAT_LVL_BUILDING, STAT_LVL_TECH => STAT_LVL_TECH, STAT_LVL_RAID => STAT_LVL_RAID,),
   ),
 
   'pages' => array(