supernova-ws / SuperNova

includes/classes/FleetList.php

Spacing +25 added lines, -25 removed lines

@@ -33,18 +33,18 @@ 
     $fleets_added = array();
 
     $query = doquery(
-      "SELECT * FROM `{{fleets}}`" .
-      (!empty($where_safe) ? " WHERE {$where_safe}" : '') .
+      "SELECT * FROM `{{fleets}}`".
+      (!empty($where_safe) ? " WHERE {$where_safe}" : '').
       " FOR UPDATE;"
     );
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       /**
        * @var Fleet $fleet
        */
       $fleet = $this->_createElement();
       $fleet->dbRowParse($row);
 
-      if(isset($this[$fleet->dbId])) {
+      if (isset($this[$fleet->dbId])) {
         // Нужно ли ????
         classSupernova::$debug->error('Fleet list already set');
       }
@@ -121,11 +121,11 @@ 
   public static function dbGetFleetListCurrentTick() {
     return static::dbGetFleetList(
       "
-    (`fleet_start_time` <= " . SN_TIME_NOW . " AND `fleet_mess` = 0)
+    (`fleet_start_time` <= " . SN_TIME_NOW." AND `fleet_mess` = 0)
     OR
-    (`fleet_end_stay` <= " . SN_TIME_NOW . " AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
+    (`fleet_end_stay` <= " . SN_TIME_NOW." AND `fleet_end_stay` > 0 AND `fleet_mess` = 0)
     OR
-    (`fleet_end_time` <= " . SN_TIME_NOW . ")");
+    (`fleet_end_time` <= " . SN_TIME_NOW.")");
   }
 
   /**
@@ -145,7 +145,7 @@ 
     AND `fleet_end_planet` = {$planet_row['planet']}
     AND `fleet_end_type`   = {$planet_row['planet_type']}
     AND `fleet_owner` = {$fleet_owner_id}
-    AND `fleet_mission` IN (" . MT_ATTACK . "," . MT_ACS . "," . MT_DESTROY . ")
+    AND `fleet_mission` IN (".MT_ATTACK.",".MT_ACS.",".MT_DESTROY.")
     AND `fleet_mess` = 0"
     );
   }
@@ -170,7 +170,7 @@ 
    * @return static
    */
   public static function dbGetFleetListAndMissileByCoordinates($coordinates, $for_phalanx = false) {
-    if(empty($coordinates) || !is_array($coordinates)) {
+    if (empty($coordinates) || !is_array($coordinates)) {
       return array();
     }
 
@@ -199,8 +199,8 @@ 
      * @var Fleet[] $array_of_Fleet
      */
     $array_of_Fleet = array();
-    if(!empty($fleet_db_list) && $fleet_db_list->count()) {
-      foreach($fleet_db_list->_container as $fleet_id => $objFleet) {
+    if (!empty($fleet_db_list) && $fleet_db_list->count()) {
+      foreach ($fleet_db_list->_container as $fleet_id => $objFleet) {
         $array_of_Fleet[$fleet_id] = $objFleet;
       }
       $planet_fleets = flt_get_fleets_to_planet_by_array_of_Fleet($array_of_Fleet);
@@ -225,16 +225,16 @@ 
     return static::dbGetFleetList(
       "(
       fleet_start_galaxy = {$galaxy}
-      AND fleet_start_system = {$system}" .
-      ($planet ? " AND fleet_start_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 1") .
+      AND fleet_start_system = {$system}".
+      ($planet ? " AND fleet_start_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_start_type = {$planet_type}" : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 1").
       ") OR (
       fleet_end_galaxy = {$galaxy}
-      AND fleet_end_system = {$system}" .
-      ($planet ? " AND fleet_end_planet = {$planet}" : '') .
-      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '') .
-      ($for_phalanx ? '' : " AND fleet_mess = 0") .
+      AND fleet_end_system = {$system}".
+      ($planet ? " AND fleet_end_planet = {$planet}" : '').
+      ($planet_type != PT_ALL ? " AND fleet_end_type = {$planet_type} " : '').
+      ($for_phalanx ? '' : " AND fleet_mess = 0").
       ")"
     );
   }
@@ -246,10 +246,10 @@ 
    */
   public function dbMergeMissileList($where) {
     $query = doquery(
-      "SELECT * FROM `{{iraks}}`" .
-      (!empty($where) ? " WHERE {$where}" : '') .
+      "SELECT * FROM `{{iraks}}`".
+      (!empty($where) ? " WHERE {$where}" : '').
       " FOR UPDATE;");
-    while($missile_db_row = db_fetch($query)) {
+    while ($missile_db_row = db_fetch($query)) {
       /**
        * @var Fleet $objFleet
        */
@@ -271,7 +271,7 @@ 
    */
   public static function dbGetFleetListAndMissileINCOMING($owner_id) {
     $owner_id_safe = idval($owner_id);
-    if(empty($owner_id_safe)) {
+    if (empty($owner_id_safe)) {
       return array();
     }
 
@@ -305,10 +305,10 @@ 
    */
   public static function fleet_count_flying($player_id, $mission_id = 0) {
     $player_id_safe = idval($player_id);
-    if(!empty($player_id_safe)) {
+    if (!empty($player_id_safe)) {
       $mission_id_safe = intval($mission_id);
       $result = static::db_fleet_count(
-        "`fleet_owner` = {$player_id_safe}" .
+        "`fleet_owner` = {$player_id_safe}".
         ($mission_id_safe ? " AND `fleet_mission` = {$mission_id_safe}" : '')
       );
     } else {

includes/init/init_functions.php

Spacing +14 added lines, -14 removed lines

@@ -2,25 +2,25 @@ 
 
 // ------------------------------------------------------------------------------------------------------------------------------
 function sn_sys_load_php_files($dir_name, $load_extension = 'php', $modules = false) {
-  if(file_exists($dir_name)) {
+  if (file_exists($dir_name)) {
     $dir = opendir($dir_name);
-    while(($file = readdir($dir)) !== false) {
-      if($file == '..' || $file == '.') {
+    while (($file = readdir($dir)) !== false) {
+      if ($file == '..' || $file == '.') {
         continue;
       }
 
-      $full_filename = $dir_name . $file;
-      if($modules && is_dir($full_filename)) {
-        if(file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
+      $full_filename = $dir_name.$file;
+      if ($modules && is_dir($full_filename)) {
+        if (file_exists($full_filename = "{$full_filename}/{$file}.{$load_extension}")) {
           require_once($full_filename);
           // Registering module
-          if(class_exists($file)) {
+          if (class_exists($file)) {
             new $file($full_filename);
           }
         }
       } else {
         $extension = substr($full_filename, -strlen($load_extension));
-        if($extension == $load_extension) {
+        if ($extension == $load_extension) {
           require_once($full_filename);
         }
       }
@@ -38,12 +38,12 @@ 
  *
  */
 function init_update() {
-  $update_file = SN_ROOT_PHYSICAL . "includes/update" . DOT_PHP_EX;
-  if(file_exists($update_file)) {
-    if(filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
-      if(defined('IN_ADMIN')) {
+  $update_file = SN_ROOT_PHYSICAL."includes/update".DOT_PHP_EX;
+  if (file_exists($update_file)) {
+    if (filemtime($update_file) > classSupernova::$config->db_loadItem('var_db_update') || classSupernova::$config->db_loadItem('db_version') < DB_VERSION) {
+      if (defined('IN_ADMIN')) {
         sn_db_transaction_start(); // Для защиты от двойного запуска апдейта - начинаем транзакцию. Так запись в базе будет блокирована
-        if(SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
+        if (SN_TIME_NOW >= classSupernova::$config->db_loadItem('var_db_update_end')) {
           classSupernova::$config->db_saveItem('var_db_update_end', SN_TIME_NOW + (classSupernova::$config->upd_lock_time ? classSupernova::$config->upd_lock_time : 300));
           sn_db_transaction_commit();
 
@@ -53,7 +53,7 @@ 
           $current_time = time();
           classSupernova::$config->db_saveItem('var_db_update', $current_time);
           classSupernova::$config->db_saveItem('var_db_update_end', $current_time);
-        } elseif(filemtime($update_file) > classSupernova::$config->var_db_update) {
+        } elseif (filemtime($update_file) > classSupernova::$config->var_db_update) {
           $timeout = classSupernova::$config->var_db_update_end - SN_TIME_NOW;
           die(
             "Обновляется база данных. Рассчетное время окончания - {$timeout} секунд (время обновления может увеличиваться). Пожалуйста, подождите...<br />

includes/db.php

Spacing +14 added lines, -14 removed lines

@@ -11,7 +11,7 @@ 
 
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
-  if($query && $object_id) {
+  if ($query && $object_id) {
     return classSupernova::db_upd_record_by_id($tablename == 'users' ? LOC_USER : LOC_PLANET, $object_id, $query);
     // return doquery("UPDATE {{{$tablename}}} SET {$query} WHERE `id` = '{$object_id}' LIMIT 1;");
   }
@@ -28,15 +28,15 @@ 
 
   $group = sn_get_groups('resources_loot');
 
-  foreach($unit_list as $unit_id => $unit_amount) {
-    if(!in_array($unit_id, $group)) {
+  foreach ($unit_list as $unit_id => $unit_amount) {
+    if (!in_array($unit_id, $group)) {
       // TODO - remove later
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: db_change_units() вызван для не-ресурсов!</h1>');
       pdump(debug_backtrace());
       die('db_change_units() вызван для не-ресурсов!');
     }
 
-    if(!$unit_amount) {
+    if (!$unit_amount) {
       continue;
     }
 
@@ -45,7 +45,7 @@ 
     $unit_location = sys_get_unit_location($user, $planet, $unit_id);
 
     // Changing value in object
-    switch($unit_location) {
+    switch ($unit_location) {
       case LOC_USER:
         $user[$unit_db_name] += $unit_amount;
         break;
@@ -67,30 +67,30 @@ 
   $field_set = '';
   $value_set = '';
 
-  switch($type) {
+  switch ($type) {
     case 'delete':
       $query = 'DELETE FROM';
       break;
 
     case 'insert':
       $query = 'INSERT INTO';
-      if(isset($options['__multi'])) {
+      if (isset($options['__multi'])) {
         // Here we generate mass-insert set
         break;
       }
     case 'update':
-      if(!$query) {
+      if (!$query) {
         $query = 'UPDATE';
       }
 
-      foreach($values as $field => &$value) {
+      foreach ($values as $field => &$value) {
         $value_type = gettype($value);
         if ($value_type == 'string') {
-          $value = "'" . db_escape($value) . "'";
+          $value = "'".db_escape($value)."'";
         }
         $value = "`{$field}` = {$value}";
       }
-      $field_set = 'SET ' . implode(', ', $values);
+      $field_set = 'SET '.implode(', ', $values);
       break;
 
   };
@@ -111,12 +111,12 @@ 
   $field_set['__IS_SAFE'] = true;
 }
 function sn_db_field_set_make_safe($field_set, $serialize = false) {
-  if(!is_array($field_set)) {
+  if (!is_array($field_set)) {
     die('$field_set is not an array!');
   }
 
   $result = array();
-  foreach($field_set as $field => $value) {
+  foreach ($field_set as $field => $value) {
     $field = db_escape(trim($field));
     switch (true) {
       case is_int($value):
@@ -132,7 +132,7 @@ 
         $serialize ? $value = serialize($value) : die('$value is object or array with no $serialize');
 
       case is_string($value):
-        $value = '"' . db_escape($value) . '"';
+        $value = '"'.db_escape($value).'"';
         break;
 
       case is_null($value):

Doc Comments +9 added lines

@@ -9,6 +9,9 @@ 
 
 require_once('db/db_queries.php');
 
+/**
+ * @param string $tablename
+ */
 function db_change_units_perform($query, $tablename, $object_id) {
   $query = implode(',', $query);
   if($query && $object_id) {
@@ -60,6 +63,9 @@ 
   db_change_units_perform($query[LOC_USER], 'users', $user['id']);
   db_change_units_perform($query[LOC_PLANET], 'planets', $planet['id']);
 }
+/**
+ * @param string $table
+ */
 function sn_db_perform($table, $values, $type = 'insert', $options = false) {
   $field_set = '';
 
@@ -153,6 +159,9 @@ 
 
 
 
+/**
+ * @param boolean $transaction_should_be_started
+ */
 function sn_db_transaction_check($transaction_should_be_started = null) {
   return classSupernova::$gc->db->getTransaction()->check($transaction_should_be_started);
 }

includes/alliance/ali_info.inc

Spacing +14 added lines, -14 removed lines

@@ -1,37 +1,37 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_info', true);
 
-if($mode == 'exit') {
-  if($ally['ally_owner'] == $user['id']) {
+if ($mode == 'exit') {
+  if ($ally['ally_owner'] == $user['id']) {
     message(classLocale::$lang['Owner_cant_go_out'], classLocale::$lang['Alliance']);
   }
 
-  if(sys_get_param_int('ali_info_leave_confirm')) {
+  if (sys_get_param_int('ali_info_leave_confirm')) {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_id` = null, `ally_name` = null, `ally_tag` = null, `ally_register_time` = 0, `ally_rank_id` = 0");
     db_ally_list_recalc_counts();
     sn_db_transaction_commit();
     message(sprintf(classLocale::$lang['ali_info_leave_success'], $ally['ally_name']), classLocale::$lang['sys_alliance']);
   }
-} elseif($mode == 'ainfo') {
+} elseif ($mode == 'ainfo') {
   $tag = sys_get_param_str('tag');
   $id_ally = sys_get_param_id('a');
-  if($tag) {
+  if ($tag) {
     $ally = db_ally_get_by_tag($tag);
-  } elseif($id_ally) {
+  } elseif ($id_ally) {
     $ally = db_ally_get_by_id($id_ally);
   }
 
-  if(!$ally) {
+  if (!$ally) {
     message(classLocale::$lang['ali_sys_notFound'], classLocale::$lang['Ally_info_1']);
   }
 
-  if(!$ally['ally_description']) {
+  if (!$ally['ally_description']) {
     $ally['ally_description'] = classLocale::$lang['Ally_nodescription'];
   }
 
@@ -43,9 +43,9 @@ 
 } else {
   $page_header = classLocale::$lang['your_alliance'];
 
-  if($ally['ally_owner'] == $user['id']) {
+  if ($ally['ally_owner'] == $user['id']) {
     $range = $ally['ally_owner_range'] ? $ally['ally_owner_range'] : classLocale::$lang['Founder'];
-  } elseif($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
+  } elseif ($user['ally_rank_id'] != 0 && isset($ranks[$user['ally_rank_id']]['name'])) {
     $range = $ranks[$user['ally_rank_id']]['name'];
   } else {
     $range = classLocale::$lang['member'];
@@ -86,8 +86,8 @@ 
 ));
 
 $relations = ali_relations($ally['id']);
-foreach($relations as $relation) {
-  if($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
+foreach ($relations as $relation) {
+  if ($relation['alliance_diplomacy_contr_ally_id'] && $relation['alliance_diplomacy_ally_id']) {
     $template->assign_block_vars('relation', array(
       'NAME'     => $relation['alliance_diplomacy_contr_ally_name'],
       'RELATION' => classLocale::$lang['ali_dip_relations'][$relation['alliance_diplomacy_relation']],
@@ -106,4 +106,4 @@ 
 
 ali_render();
 
-display($template, classLocale::$lang['your_alliance'] . ' [' . $ally['ally_name'] . ']');
+display($template, classLocale::$lang['your_alliance'].' ['.$ally['ally_name'].']');

includes/alliance/ali_internal_admin.inc

Spacing +19 added lines, -19 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
-if(!$user_admin) {
+if (!$user_admin) {
   message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
 }
 
@@ -20,7 +20,7 @@ 
 $allyTextID = ($allyTextID < 1 || $allyTextID > 3) ? 1 : $allyTextID;
 
 
-if(sys_get_param_str('isSaveOptions')) {
+if (sys_get_param_str('isSaveOptions')) {
   require_once('includes/includes/sys_avatar.php');
 
   $new_image = $ally['ally_image'];
@@ -32,46 +32,46 @@ 
 //  $template->assign_block_vars('result', $avatar_upload_result);
 
   $ally_changeset = array();
-  if(($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
+  if (($new_tag = sys_get_param_str_unsafe('tag', $ally['ally_tag'])) && $new_tag != $ally['ally_tag']) {
     $new_tag = db_escape($new_tag);
     $ally_changeset[] = "`ally_tag`='{$new_tag}'";
     db_user_set_by_id($ally['ally_user_id'], "`username`='[{$new_tag}]'");
   }
-  if(($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
+  if (($new_name = sys_get_param_str_unsafe('name', $ally['ally_name'])) && $new_name != $ally['ally_name']) {
     $new_name = db_escape($new_name);
     $ally_changeset[] = "`ally_name`='{$new_name}'";
   }
 
-  if(($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
+  if (($new_owner_rank = sys_get_param_str_unsafe('owner_range', $ally['ally_owner_range'])) && $new_owner_rank != $ally['ally_owner_range']) {
     $new_owner_rank = db_escape($new_owner_rank);
     $ally_changeset[] = "`ally_owner_range` = '{$new_owner_rank}'";
   }
-  if(($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
+  if (($new_web = sys_get_param_str_unsafe('web', $ally['ally_web'])) && $new_web != $ally['ally_web']) {
     $new_web = db_escape($new_web);
     $ally_changeset[] = "`ally_web` = '{$new_web}'";
   }
   $new_request = sys_get_param_int('request_notallow', $ally['ally_request_notallow']);
   $ally_changeset[] = "`ally_request_notallow` = '{$new_request}'";
-  if($new_image != $ally['ally_image']) {
+  if ($new_image != $ally['ally_image']) {
     $new_image = intval($new_image);
     $ally_changeset[] = "`ally_image` = '{$new_image}'";
   }
 
-  if(!empty($ally_changeset)) {
+  if (!empty($ally_changeset)) {
     db_ally_update_by_changeset($ally_changeset, $ally);
     sys_redirect('alliance.php?mode=admin&edit=ally');
   }
-} elseif(sys_get_param_str('isSaveText')) {
+} elseif (sys_get_param_str('isSaveText')) {
   $text = sys_get_param_str_both('text');
   db_ally_update_texts($text_list, $allyTextID, $text, $ally);
   $ally[$text_list[$allyTextID]['db_field']] = $text['unsafe'];
-} elseif(sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isTransfer') && $idNewLeader = sys_get_param_id('idNewLeader')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
 
   $newLeader = db_user_by_id($idNewLeader, false, `ally_id`);
-  if($newLeader['ally_id'] == $user['ally_id']) {
+  if ($newLeader['ally_id'] == $user['ally_id']) {
     sn_db_transaction_start();
     db_user_set_by_id($user['id'], "`ally_rank_id`='0'");
     db_ally_update_owner($idNewLeader, $user);
@@ -79,8 +79,8 @@ 
     sn_db_transaction_commit();
     sys_redirect('alliance.php');
   }
-} elseif(sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
-  if(!$isAllyOwner) {
+} elseif (sys_get_param_str('isDisband') && sys_get_param_str('isConfirmDisband')) {
+  if (!$isAllyOwner) {
     message(classLocale::$lang['Denied_access'], classLocale::$lang['ally_admin']);
   }
   sn_db_transaction_start();
@@ -93,7 +93,7 @@ 
 $request = db_ally_request_count_by_id($ally);
 
 $template->assign_vars(array(
-  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'] . ': ' . intval($request['request_count']) . '. ' . classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
+  'request_count'           => $request['request_count'] ? classLocale::$lang['ali_req_requestCount'].': '.intval($request['request_count']).'. '.classLocale::$lang['ali_req_check'] : classLocale::$lang['ali_req_emptyList'],
   'text'                    => $ally[$text_list[$allyTextID]['db_field']],
   'request_type'            => classLocale::$lang[$text_list[$allyTextID]['text_type']],
   't'                       => $allyTextID,
@@ -126,7 +126,7 @@ 
   $userAllyAdmins = db_user_list("`ally_id`= {$ally['id']}", false, '`id`, `username`');
   unset($tmp);
   // while ($userAllyAdmin = db_fetch($userAllyAdmins))
-  foreach($userAllyAdmins as $userAllyAdmin) {
+  foreach ($userAllyAdmins as $userAllyAdmin) {
 // pdump($userAllyAdmin);
     $tmp .= "<option value={$userAllyAdmin['id']}>{$userAllyAdmin['username']}</option>";
   }
@@ -134,8 +134,8 @@ 
   $template->assign_var('adminMembers', $tmp);
 }
 
-foreach($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
-  if(!$sn_ali_admin_action_locale['title']) {
+foreach ($sn_ali_admin_internal as $sn_ali_admin_action => $sn_ali_admin_action_locale) {
+  if (!$sn_ali_admin_action_locale['title']) {
     continue;
   }
   $template->assign_block_vars('admin_actions', array(

includes/alliance/ali_internal_admin_rights.inc

Spacing +9 added lines, -9 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)
 {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
@@ -14,7 +14,7 @@ 
 $new_rank_name = sys_get_param_str('newRankName');
 if ($new_rank_name)
 {
-  foreach($ally_rights as $fieldName)
+  foreach ($ally_rights as $fieldName)
   {
     $newRank[$fieldName] = 0;
   }
@@ -28,9 +28,9 @@ 
 {
   unset($ranks);
 
-  foreach($rankListInput as $rankID => $rank)
+  foreach ($rankListInput as $rankID => $rank)
   {
-    foreach($ally_rights as $rightName)
+    foreach ($ally_rights as $rightName)
     {
       $ranks[$rankID][$rightName] = $rank[$rightName] ? 1 : 0;
     }
@@ -41,7 +41,7 @@ 
 $d = sys_get_param_int('d');
 if ($d && isset($ranks[$d]))
 {
-  if(count($ranks) == 1)
+  if (count($ranks) == 1)
   {
     message(classLocale::$lang['ali_adm_lastRank'], classLocale::$lang['ali_adm_rights_title']);
   }
@@ -53,17 +53,17 @@ 
 
 if (count($ranks))
 {
-  foreach($ranks as $rankID => $rank)
+  foreach ($ranks as $rankID => $rank)
   {
     $rank_data = array(
       'ID'   => $rankID,
       'NAME' => $rank['name'],
     );
 
-    for($i = 1; $i < count($rank); $i++)
+    for ($i = 1; $i < count($rank); $i++)
     {
-      $rank_data['R' . $i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '') ;
-      $rank_data['N' . $i] = $ally_rights[$i];
+      $rank_data['R'.$i] = (($rank[$ally_rights[$i]] == 1) ? ' checked' : '');
+      $rank_data['N'.$i] = $ally_rights[$i];
     }
 
     $template->assign_block_vars('rank', $rank_data);

includes/db/db_helpers.php

Spacing +7 added lines, -7 removed lines

@@ -27,19 +27,19 @@
  */
 function db_set_make_safe_string($set, $delta = false) {
   $set_safe = array();
-  foreach($set as $field => $value) {
-    if(empty($field)) {
+  foreach ($set as $field => $value) {
+    if (empty($field)) {
       continue;
     }
 
-    $field = '`' . db_escape($field) . '`';
+    $field = '`'.db_escape($field).'`';
     $new_value = $value;
-    if($value === null) {
+    if ($value === null) {
       $new_value = 'NULL';
-    } elseif(is_string($value) && (string)($new_value = floatval($value)) != (string)$value) {
+    } elseif (is_string($value) && (string) ($new_value = floatval($value)) != (string) $value) {
       // non-float
-      $new_value = '"' . db_escape($value) . '"';
-    } elseif($delta) {
+      $new_value = '"'.db_escape($value).'"';
+    } elseif ($delta) {
       // float and DELTA-set
       $new_value = "{$field} + ({$new_value})";
     }

includes/init_secondary.php

Spacing +24 added lines, -24 removed lines

@@ -2,19 +2,19 @@ 
 
 $classLocale = classLocale::$lang;
 
-if(classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
-  include(SN_ROOT_PHYSICAL . 'ajax_version_check' . DOT_PHP_EX);
+if (classSupernova::$config->server_updater_check_auto && classSupernova::$config->server_updater_check_last + classSupernova::$config->server_updater_check_period <= SN_TIME_NOW) {
+  include(SN_ROOT_PHYSICAL.'ajax_version_check'.DOT_PHP_EX);
 }
 
-if(classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
-  require_once(SN_ROOT_PHYSICAL . "includes/includes/user_birthday_celebrate" . DOT_PHP_EX);
+if (classSupernova::$config->user_birthday_gift && SN_TIME_NOW - classSupernova::$config->user_birthday_celebrate > PERIOD_DAY) {
+  require_once(SN_ROOT_PHYSICAL."includes/includes/user_birthday_celebrate".DOT_PHP_EX);
   sn_user_birthday_celebrate();
 }
 
-if(!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
+if (!classSupernova::$config->var_online_user_count || classSupernova::$config->var_online_user_time + 30 < SN_TIME_NOW) {
   classSupernova::$config->db_saveItem('var_online_user_count', db_user_count(true));
   classSupernova::$config->db_saveItem('var_online_user_time', SN_TIME_NOW);
-  if(classSupernova::$config->server_log_online) {
+  if (classSupernova::$config->server_log_online) {
     db_log_online_insert();
   }
 }
@@ -41,7 +41,7 @@ 
 $template_result[F_ACCOUNT_IS_AUTHORIZED] = $sys_user_logged_in = !empty($user) && isset($user['id']) && $user['id'];
 //pdump($template_result[F_ACCOUNT_IS_AUTHORIZED]);die();
 
-if(!empty($user['id'])) {
+if (!empty($user['id'])) {
   classSupernova::$user_options->user_change($user['id']);
 }
 
@@ -54,15 +54,15 @@ 
     : false
   );
 
-if($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
-  $prohibited_characters = array_map(function ($value) {
-    return "'" . htmlentities($value, ENT_QUOTES, 'UTF-8') . "'";
+if ($template_result[F_LOGIN_STATUS] == LOGIN_ERROR_USERNAME_RESTRICTED_CHARACTERS) {
+  $prohibited_characters = array_map(function($value) {
+    return "'".htmlentities($value, ENT_QUOTES, 'UTF-8')."'";
   }, str_split(LOGIN_REGISTER_CHARACTERS_PROHIBITED));
   $template_result[F_LOGIN_MESSAGE] .= implode(', ', $prohibited_characters);
 }
 
 
-if(defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
+if (defined('DEBUG_AUTH') && DEBUG_AUTH && !defined('IN_AJAX')) {
   pdump("Отключи отладку перед продакшном!");
 }
 
@@ -76,17 +76,17 @@ 
   ? define('INSTALL_MODE', GAME_DISABLE_INSTALL)
   : false;
 
-if($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
+if ($template_result[F_GAME_DISABLE] = classSupernova::$config->game_disable) {
   $template_result[F_GAME_DISABLE_REASON] = sys_bbcodeParse(
     classSupernova::$config->game_disable == GAME_DISABLE_REASON
       ? classSupernova::$config->game_disable_reason
       : classLocale::$lang['sys_game_disable_reason'][classSupernova::$config->game_disable]
   );
-  if(defined('IN_API')) {
+  if (defined('IN_API')) {
     return;
   }
 
-  if(
+  if (
     ($user['authlevel'] < 1 || !(defined('IN_ADMIN') && IN_ADMIN))
     &&
     !(defined('INSTALL_MODE') && defined('LOGIN_LOGOUT'))
@@ -100,8 +100,8 @@ 
 
 // TODO ban
 // TODO $skip_ban_check
-if($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
-  if(defined('IN_API')) {
+if ($template_result[F_BANNED_STATUS] && !$skip_ban_check) {
+  if (defined('IN_API')) {
     return;
   }
 
@@ -119,15 +119,15 @@ 
 // pdump($allow_anonymous, '$allow_anonymous');
 // pdump($sys_user_logged_in, '$sys_user_logged_in');
 
-if($sys_user_logged_in && INITIAL_PAGE == 'login') {
-  sys_redirect(SN_ROOT_VIRTUAL . 'overview.php');
-} elseif($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
+if ($sys_user_logged_in && INITIAL_PAGE == 'login') {
+  sys_redirect(SN_ROOT_VIRTUAL.'overview.php');
+} elseif ($account_logged_in && !$sys_user_logged_in) { // empty(core_auth::$user['id'])
 //  pdump($sn_page_name);
 //  pdump(INITIAL_PAGE);
 //  die('{Тут должна быть ваша реклама. Точнее - ввод имени игрока}');
-} elseif(!$allow_anonymous && !$sys_user_logged_in) {
+} elseif (!$allow_anonymous && !$sys_user_logged_in) {
   // sn_setcookie(SN_COOKIE, '', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
-  sys_redirect(SN_ROOT_VIRTUAL . 'login.php');
+  sys_redirect(SN_ROOT_VIRTUAL.'login.php');
 }
 
 $user_time_diff = playerTimeDiff::user_time_diff_get();
@@ -146,16 +146,16 @@ 
 
 global $skip_fleet_update;
 $skip_fleet_update = $skip_fleet_update || $supernova->options['fleet_update_skip'] || defined('IN_ADMIN');
-if(
+if (
   !$skip_fleet_update
   && !(defined('IN_AJAX') && IN_AJAX === true)
   && SN_TIME_NOW - strtotime(classSupernova::$config->fleet_update_last) > classSupernova::$config->fleet_update_interval
 ) {
-  require_once(SN_ROOT_PHYSICAL . "includes/includes/flt_flying_fleet_handler2" . DOT_PHP_EX);
+  require_once(SN_ROOT_PHYSICAL."includes/includes/flt_flying_fleet_handler2".DOT_PHP_EX);
   flt_flying_fleet_handler($skip_fleet_update);
 }
 
-if(!defined('IN_AJAX')) {
+if (!defined('IN_AJAX')) {
   print("Scheduled processes is disabled<br />");
 }
 // scheduler_process();

includes/general_pname.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 function pname_factory_production_field_name($factory_unit_id)
 {
-  return get_unit_param($factory_unit_id, P_NAME) . '_porcent';
+  return get_unit_param($factory_unit_id, P_NAME).'_porcent';
 }
 
 /**