supernova-ws / SuperNova

classes/sn_module.php

Spacing +36 added lines, -36 removed lines

@@ -127,13 +127,13 @@ 
     // Trying to load configuration from file
     $config_exists = false;
     // Конфигурация может лежать в config_path в манифеста или в корне модуля
-    if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+    if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
       $config_exists = true;
-    } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+    } elseif (file_exists($config_filename = dirname($filename) . '/config.php')) {
       $config_exists = true;
     }
 
-    if($config_exists) {
+    if ($config_exists) {
       include($config_filename);
       $module_config_array = $class_module_name . '_config';
       $this->config = $$module_config_array;
@@ -144,8 +144,8 @@ 
   }
 
   protected function __patch_menu(&$sn_menu_extra, &$menu_patch) {
-    if(isset($menu_patch) && is_array($menu_patch) && !empty($menu_patch)) {
-      foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    if (isset($menu_patch) && is_array($menu_patch) && !empty($menu_patch)) {
+      foreach ($menu_patch as $menu_item_name => $menu_item_data) {
         $sn_menu_extra[$menu_item_name] = $menu_item_data;
       }
     }
@@ -155,13 +155,13 @@ 
   public function initialize() {
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
     // Setting constants - if any
-    if(isset($this->manifest['constants']) && is_array($this->manifest['constants']) && !empty($this->manifest['constants'])) {
-      foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    if (isset($this->manifest['constants']) && is_array($this->manifest['constants']) && !empty($this->manifest['constants'])) {
+      foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
         defined($constant_name) or define($constant_name, $constant_value);
       }
     }
@@ -172,34 +172,34 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(!empty($this->manifest['vars'])) {
+    if (!empty($this->manifest['vars'])) {
       $vars_assigned = array();
-      foreach($this->manifest['vars'] as $var_name => $var_value) {
+      foreach ($this->manifest['vars'] as $var_name => $var_value) {
         $sub_vars = explode('[', str_replace(']', '', $var_name));
         $var_name = $sub_vars[0];
 
-        if(!isset($vars_assigned[$var_name])) {
+        if (!isset($vars_assigned[$var_name])) {
           $vars_assigned[$var_name] = true;
           global $$var_name;
         }
 
         $pointer = &$$var_name;
-        if(($n = count($sub_vars)) > 1) {
-          for($i = 1; $i < $n; $i++) {
-            if(defined($sub_vars[$i])) {
+        if (($n = count($sub_vars)) > 1) {
+          for ($i = 1; $i < $n; $i++) {
+            if (defined($sub_vars[$i])) {
               $sub_vars[$i] = constant($sub_vars[$i]);
             }
 
-            if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+            if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
               $pointer[$sub_vars[$i]] = array();
             }
             $pointer = &$pointer[$sub_vars[$i]];
           }
         }
 
-        if(!isset($pointer) || !is_array($pointer)) {
+        if (!isset($pointer) || !is_array($pointer)) {
           $pointer = $var_value;
-        } elseif(is_array($$var_name)) {
+        } elseif (is_array($$var_name)) {
           $pointer = array_merge_recursive_numeric($pointer, $var_value);
         }
       }
@@ -209,9 +209,9 @@ 
     global $functions;
     sn_sys_handler_add($functions, $this->manifest['functions'], $this);
 
-    foreach($this->functions as $functionName => $callableList) {
+    foreach ($this->functions as $functionName => $callableList) {
       !is_array($callableList) ? $callableList = [$callableList] : false;
-      foreach($callableList as $callable) {
+      foreach ($callableList as $callable) {
         sys_handler_add_one($functions, $functionName, $callable, static::class, '');
       }
     }
@@ -222,50 +222,50 @@ 
     isset($this->manifest['menu_admin']) and $this->__patch_menu($sn_menu_admin_extra, $this->manifest['menu_admin']);
 
     global $sn_mvc;
-    foreach($sn_mvc as $handler_type => &$handler_data) {
+    foreach ($sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
 
-    if(isset($this->manifest['i18n']) && is_array($this->manifest['i18n']) && !empty($this->manifest['i18n'])) {
-      foreach($this->manifest['i18n'] as $i18n_page_name => &$i18n_file_list) {
-        foreach($i18n_file_list as &$i18n_file_data) {
-          if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    if (isset($this->manifest['i18n']) && is_array($this->manifest['i18n']) && !empty($this->manifest['i18n'])) {
+      foreach ($this->manifest['i18n'] as $i18n_page_name => &$i18n_file_list) {
+        foreach ($i18n_file_list as &$i18n_file_data) {
+          if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
             $i18n_file_data['path'] = $this->manifest['root_relative'];
           }
         }
-        if(!isset($sn_mvc['i18n'][$i18n_page_name])) {
+        if (!isset($sn_mvc['i18n'][$i18n_page_name])) {
           $sn_mvc['i18n'][$i18n_page_name] = array();
         }
         $sn_mvc['i18n'][$i18n_page_name] += $i18n_file_list;
       }
     }
 
-    if(!empty($this->manifest['javascript']) && is_array($this->manifest['javascript'])) {
-      foreach($this->manifest['javascript'] as $javascript_page_name => &$javascript_list) {
+    if (!empty($this->manifest['javascript']) && is_array($this->manifest['javascript'])) {
+      foreach ($this->manifest['javascript'] as $javascript_page_name => &$javascript_list) {
         !isset($sn_mvc['javascript'][$javascript_page_name]) ? $sn_mvc['javascript'][$javascript_page_name] = array() : false;
-        foreach($javascript_list as $script_name => &$script_content) {
+        foreach ($javascript_list as $script_name => &$script_content) {
           $sn_mvc['javascript'][$javascript_page_name][$script_name] = $script_content;
         }
       }
     }
 
-    if(!empty($this->manifest['css']) && is_array($this->manifest['css'])) {
-      foreach($this->manifest['css'] as $javascript_page_name => &$javascript_list) {
+    if (!empty($this->manifest['css']) && is_array($this->manifest['css'])) {
+      foreach ($this->manifest['css'] as $javascript_page_name => &$javascript_list) {
         !isset($sn_mvc['css'][$javascript_page_name]) ? $sn_mvc['css'][$javascript_page_name] = array() : false;
-        foreach($javascript_list as $script_name => &$script_content) {
+        foreach ($javascript_list as $script_name => &$script_content) {
           $sn_mvc['css'][$javascript_page_name][$script_name] = $script_content;
         }
       }
     }
 
-    if(!empty($this->manifest['navbar_prefix_button']) && is_array($this->manifest['navbar_prefix_button'])) {
-      foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    if (!empty($this->manifest['navbar_prefix_button']) && is_array($this->manifest['navbar_prefix_button'])) {
+      foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
         $sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
       }
     }
 
-    if(!empty($this->manifest['navbar_main_button']) && is_array($this->manifest['navbar_main_button'])) {
-      foreach($this->manifest['navbar_main_button'] as $button_image => $button_url_relative) {
+    if (!empty($this->manifest['navbar_main_button']) && is_array($this->manifest['navbar_main_button'])) {
+      foreach ($this->manifest['navbar_main_button'] as $button_image => $button_url_relative) {
         $sn_mvc['navbar_main_button'][$button_image] = $button_url_relative;
       }
     }
@@ -281,7 +281,7 @@ 
    */
   protected function __mvcRegisterPagesOld($pages) {
     !is_array($this->manifest['mvc']['pages']) ? $this->manifest['mvc']['pages'] = array() : false;
-    if(is_array($pages) && !empty($pages)) {
+    if (is_array($pages) && !empty($pages)) {
       $this->manifest['mvc']['pages'] = array_merge($this->manifest['mvc']['pages'], $pages);
     }
   }

admin/adm_payment.php

Spacing +5 added lines, -5 removed lines

@@ -18,13 +18,13 @@ 
 
 messageBoxAdminAccessDenied(AUTH_LEVEL_ADMINISTRATOR);
 
-$template  = gettemplate('admin/adm_payment', true);
+$template = gettemplate('admin/adm_payment', true);
 
 $payer_list = array(
   -1 => $lang['adm_pay_filter_all'],
 );
 $query = doquery("SELECT payment_user_id, payment_user_name FROM `{{payment}}` GROUP BY payment_user_id ORDER BY payment_user_name");
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $payer_list[$row['payment_user_id']] = '[' . $row['payment_user_id'] . '] ' . $row['payment_user_name'];
 }
 tpl_assign_select($template, 'payer', $payer_list);
@@ -33,7 +33,7 @@ 
   '' => $lang['adm_pay_filter_all'],
 );
 $query = doquery("SELECT distinct payment_module_name FROM `{{payment}}` ORDER BY payment_module_name");
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $module_list[$row['payment_module_name']] = $row['payment_module_name'];
 }
 tpl_assign_select($template, 'module', $module_list);
@@ -69,9 +69,9 @@ 
 
 
 //while($row = db_fetch($query)) {
-foreach($query as $row) {
+foreach ($query as $row) {
   $row2 = array();
-  foreach($row as $key => $value) {
+  foreach ($row as $key => $value) {
     $row2[strtoupper($key)] = $value;
   }
   $template->assign_block_vars('payment', $row2);

classes/Account.php

Spacing +23 added lines, -23 removed lines

@@ -89,8 +89,8 @@ 
     $this->secret_word = classSupernova::$sn_secret_word;
 
     $snTableNames = $this->db->schema()->getSnTables();
-    foreach($this->table_check as $table_name) {
-      if(empty($snTableNames[$table_name])) {
+    foreach ($this->table_check as $table_name) {
+      if (empty($snTableNames[$table_name])) {
         die('Если вы видите это сообщение первый раз после обновления релиза - просто перегрузите страницу.<br />
               В противном случае - сообщите Администрации сервера об ошибке.<br/>
               Не хватает таблицы для работы системы авторизации: ' . $table_name);
@@ -114,7 +114,7 @@ 
    */
   // OK v4.6
   public function password_change($old_password_unsafe, $new_password_unsafe, $salt_unsafe = null) {
-    if(!$this->password_check($old_password_unsafe)) {
+    if (!$this->password_check($old_password_unsafe)) {
       return false;
     }
 
@@ -135,7 +135,7 @@ 
   // OK v4.5
   public function assign_from_db_row($row) {
     $this->reset();
-    if(empty($row) || !is_array($row)) {
+    if (empty($row) || !is_array($row)) {
       return false;
     }
     $this->account_id = $row['account_id'];
@@ -200,7 +200,7 @@ 
     $this->reset();
 
     $email_safe = $this->db->db_escape($email_unsafe);
-    if($email_safe) {
+    if ($email_safe) {
       $account_row = $this->db->doquery("SELECT * FROM {{account}} WHERE LOWER(`account_email`) = LOWER('{$email_safe}') FOR UPDATE;", true);
 
       return $this->assign_from_db_row($account_row);
@@ -273,11 +273,11 @@ 
         `account_email` = LOWER('{$email_safe}'),
         `account_language` = '{$language_safe}'"
     );
-    if(!$result) {
+    if (!$result) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
-    if(!($account_id = $this->db->db_insert_id())) {
+    if (!($account_id = $this->db->db_insert_id())) {
       throw new Exception(REGISTER_ERROR_ACCOUNT_CREATE, ERR_ERROR);
     }
 
@@ -307,7 +307,7 @@ 
       WHERE `account_id` = '{$account_id_safe}'"
     ) ? true : false;
 
-    if($result) {
+    if ($result) {
       $result = $this->db_get_by_id($this->account_id);
     }
 
@@ -396,7 +396,7 @@ 
   public function metamatter_change($change_type, $metamatter, $comment = false, $already_changed = false) {
     global $debug, $mm_change_legit, $config, $sn_module;
 
-    if(!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
+    if (!$this->is_exists || !($metamatter = round(floatval($metamatter)))) {
       $debug->error('Ошибка при попытке манипуляции с ММ');
       return false;
     }
@@ -405,7 +405,7 @@ 
 
     $mm_change_legit = true;
     // $sn_data_metamatter_db_name = pname_resource_name(RES_METAMATTER);
-    if($already_changed) {
+    if ($already_changed) {
       $metamatter_total_delta = 0;
       $result = -1;
     } else {
@@ -418,7 +418,7 @@ 
           ($metamatter_total_delta ? ", `account_immortal` = IF(`account_metamatter_total` + '{$metamatter_total_delta}' >= {$config->player_metamatter_immortal} AND `account_immortal` IS NULL, NOW(), `account_immortal`), `account_metamatter_total` = `account_metamatter_total` + '{$metamatter_total_delta}'" : '') .
         " WHERE `account_id` = {$account_id_safe}"
       );
-      if(!$result) {
+      if (!$result) {
         $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
       }
       $result = classSupernova::$db->db_affected_rows();
@@ -426,7 +426,7 @@ 
       $this->awardImmortal($metamatter, $config, $sn_module);
     }
 
-    if(empty(core_auth::$user['id'])) {
+    if (empty(core_auth::$user['id'])) {
       $user_list = PlayerToAccountTranslate::db_translate_get_users_from_account_list(core_auth::$main_provider->provider_id, $this->account_id);
       reset($user_list);
       $user_id_unsafe = key($user_list);
@@ -435,30 +435,30 @@ 
     }
     $user_id_safe = $this->db->db_escape($user_id_unsafe);
 
-    if(!$result) {
+    if (!$result) {
       $debug->error("Error adjusting Metamatter for player ID {$this->account_id} (Player Not Found?) with {$metamatter}. Reason: {$comment}", 'Metamatter Change', 402);
     }
 
-    if(!$already_changed) {
+    if (!$already_changed) {
       $this->account_metamatter += $metamatter;
       $this->account_metamatter_total += $metamatter_total_delta;
     }
 
-    if(is_array($comment)) {
+    if (is_array($comment)) {
       $comment = call_user_func_array('sprintf', $comment);
     }
 
     $result = $this->db_mm_log_insert($comment, $change_type, $metamatter, $user_id_unsafe);
 
-    if($metamatter > 0 && !empty($user_id_safe)) {
+    if ($metamatter > 0 && !empty($user_id_safe)) {
       $old_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1 FOR UPDATE;", '', true);
-      if($old_referral['id']) {
+      if ($old_referral['id']) {
         $dark_matter_from_metamatter = $metamatter * AFFILIATE_MM_TO_REFERRAL_DM;
         doquery("UPDATE {{referrals}} SET dark_matter = dark_matter + '{$dark_matter_from_metamatter}' WHERE `id` = {$user_id_safe} LIMIT 1;");
         $new_referral = doquery("SELECT * FROM {{referrals}} WHERE `id` = {$user_id_safe} LIMIT 1;", '', true);
 
         $partner_bonus = floor($new_referral['dark_matter'] / $config->rpg_bonus_divisor) - ($old_referral['dark_matter'] >= $config->rpg_bonus_minimum ? floor($old_referral['dark_matter'] / $config->rpg_bonus_divisor) : 0);
-        if($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
+        if ($partner_bonus > 0 && $new_referral['dark_matter'] >= $config->rpg_bonus_minimum) {
           rpg_points_change($new_referral['id_partner'], RPG_REFERRAL_BOUGHT_MM, $partner_bonus, "Incoming MM From Referral ID {$user_id_safe}");
         }
       }
@@ -474,7 +474,7 @@ 
    * @throws Exception
    */
   public function cookieSet($rememberMe = false, $domain = null) {
-    if(!$this->is_exists) {
+    if (!$this->is_exists) {
       throw new Exception(LOGIN_ERROR_NO_ACCOUNT_FOR_COOKIE_SET, ERR_ERROR);
     }
 
@@ -493,7 +493,7 @@ 
   // OK v4.1
   public function cookieClear($domain = null) {
     // Автоматически вообще-то - если установлена кука имперсонатора - то чистим обычную, а куку имперсонатора - копируем в неё
-    if(!empty($_COOKIE[$this->cookie_name_impersonate])) {
+    if (!empty($_COOKIE[$this->cookie_name_impersonate])) {
       sn_setcookie($this->cookie_name, $_COOKIE[$this->cookie_name_impersonate], SN_TIME_NOW + PERIOD_YEAR, $this->sn_root_path, $domain);
       sn_setcookie($this->cookie_name_impersonate, '', SN_TIME_NOW - PERIOD_WEEK, $this->sn_root_path, $domain);
     } else {
@@ -503,14 +503,14 @@ 
 
   public function cookieLogin(&$rememberMe = false) {
     // Пытаемся войти по куке
-    if(!empty($_COOKIE[$this->cookie_name])) {
-      if(count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
+    if (!empty($_COOKIE[$this->cookie_name])) {
+      if (count(explode("/%/", $_COOKIE[$this->cookie_name])) < 4) {
         list($account_id_unsafe, $cookie_password_hash_salted, $user_remember_me) = explode(AUTH_COOKIE_DELIMETER, $_COOKIE[$this->cookie_name]);
       } else {
         list($account_id_unsafe, $user_name, $cookie_password_hash_salted, $user_remember_me) = explode("/%/", $_COOKIE[$this->cookie_name]);
       }
 
-      if(
+      if (
         $this->db_get_by_id($account_id_unsafe)
         && ($this->password_encode_for_cookie($this->account_password) == $cookie_password_hash_salted)
       ) {

classes/Helpers/PagingRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
       $this->addFirstLast();
     }
 
-    if(!empty($this->result)) {
+    if (!empty($this->result)) {
       $template = gettemplate('_paging');
       $template->assign_recursive([
         'PAGING_ROOT' => $this->rootUrl,

classes/Helpers/URLHelper.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
       }
     }
 
-    if(!empty($paramList)) {
+    if (!empty($paramList)) {
       $strParams = implode('&', $paramList);
     }
 

classes/Deprecated/PageMessage.php

Spacing +2 added lines, -2 removed lines

@@ -328,7 +328,7 @@ 
         ORDER BY `message_time` DESC;";
     }
 
-    if($this->showAll) {
+    if ($this->showAll) {
       $message_query = $this->db->selectIterator($message_query);
     } else {
       $message_query = new DbSqlPaging($message_query, PAGING_PAGE_SIZE_DEFAULT_MESSAGES, sys_get_param_int(PagingRenderer::KEYWORD));
@@ -483,7 +483,7 @@ 
       $this->mode = sys_get_param_str('msg_delete') ? static::MESSAGES_MODE_DELETE : sys_get_param_str('mode');
     }
 
-    if($this->showAll = sys_get_param_str('msg_show_all') ? true : false) {
+    if ($this->showAll = sys_get_param_str('msg_show_all') ? true : false) {
       $this->mode = static::MESSAGES_MODE_MESSAGES;
     }
 

classes/Alliance/AllianceMember.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
    * @return bool
    */
   public function changeTitle(AllianceTitle $title) {
-    if(!$title instanceof AllianceTitle) {
+    if (!$title instanceof AllianceTitle) {
       return false;
     }
 

classes/Alliance/AllianceTitleList.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         continue;
       }
 
-      $result[] = (string)$title;
+      $result[] = (string) $title;
     }
 
     return implode(';', $result);
@@ -67,7 +67,7 @@ 
    * Updates title names and access rights with current ones
    */
   public function updateTitles() {
-    $this->alliance->titleList = (string)$this;
+    $this->alliance->titleList = (string) $this;
   }
 
   protected function extractTitles() {

classes/Bonus/BonusAtom.php

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
    * @return int
    */
   public static function calcBonusPower($unitInfo) {
-    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] :
-      (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
+    return isset($unitInfo[P_BONUS_VALUE]) ? $unitInfo[P_BONUS_VALUE] : (static::calcBonusType($unitInfo) == BONUS_ABILITY ? 1 : 0);
   }
 
   /**