supernova-ws / SuperNova

index.php

Spacing +3 added lines, -3 removed lines

@@ -5,14 +5,14 @@
  */
 global $template;
 
-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));
-  if($sn_page_name) {
+  if ($sn_page_name) {
     // Loading page-specific language files
 
     !empty($sn_mvc['model'][$sn_page_name]) and execute_hooks($sn_mvc['model'][$sn_page_name], $template, 'model', $sn_page_name);
     !empty($sn_mvc['view'][$sn_page_name]) and execute_hooks($sn_mvc['view'][$sn_page_name], $template, 'view', $sn_page_name);
-    if(!empty($template_result) && is_object($template)) {
+    if (!empty($template_result) && is_object($template)) {
       $template->assign_recursive($template_result);
     }
 

classes/Common/GlobalContainer.php

Spacing +11 added lines, -11 removed lines

@@ -65,55 +65,55 @@
 
     // Services --------------------------------------------------------------------------------------------------------
     // Default db
-    $gc->db = function (GlobalContainer $c) {
+    $gc->db = function(GlobalContainer $c) {
       classSupernova::$db = new \db_mysql($c);
 
       return classSupernova::$db;
     };
 
-    $gc->debug = function (GlobalContainer $c) {
+    $gc->debug = function(GlobalContainer $c) {
       return new \debug();
     };
 
-    $gc->cache = function (GlobalContainer $gc) {
+    $gc->cache = function(GlobalContainer $gc) {
       return new \classCache($gc->cachePrefix);
     };
 
-    $gc->config = function (GlobalContainer $gc) {
+    $gc->config = function(GlobalContainer $gc) {
       return new \classConfig($gc->cachePrefix);
     };
 
 
-    $gc->repository = function (GlobalContainer $gc) {
+    $gc->repository = function(GlobalContainer $gc) {
       return new \Repository($gc);
     };
 
-    $gc->storage = function (GlobalContainer $gc) {
+    $gc->storage = function(GlobalContainer $gc) {
       return new \Storage($gc);
     };
 
-    $gc->design = function (GlobalContainer $gc) {
+    $gc->design = function(GlobalContainer $gc) {
       return new \Design($gc);
     };
 
-    $gc->bbCodeParser = function (GlobalContainer $gc) {
+    $gc->bbCodeParser = function(GlobalContainer $gc) {
       return new \BBCodeParser($gc);
     };
 
 
     // Dummy objects ---------------------------------------------------------------------------------------------------
-    $gc->theUser = function (GlobalContainer $gc) {
+    $gc->theUser = function(GlobalContainer $gc) {
       return new \TheUser($gc);
     };
 
 
     // Models ----------------------------------------------------------------------------------------------------------
     $gc->skinEntityClass = 'SkinV2';
-    $gc->skinModel = function (GlobalContainer $gc) {
+    $gc->skinModel = function(GlobalContainer $gc) {
       return new \SkinModel($gc);
     };
 
-    $gc->textModel = function (GlobalContainer $gc) {
+    $gc->textModel = function(GlobalContainer $gc) {
       return new \TextModel($gc);
     };
 

classes/classSupernova.php

Spacing +75 added lines, -75 removed lines

@@ -180,7 +180,7 @@ 
 
 
   public static function log_file($message, $spaces = 0) {
-    if(self::$debug) {
+    if (self::$debug) {
       self::$debug->log_file($message, $spaces);
     }
   }
@@ -188,14 +188,14 @@ 
   // Перепаковывает массив на заданную глубину, убирая поля с null
   public static function array_repack(&$array, $level = 0) {
     // TODO $lock_table не нужна тут
-    if(!is_array($array)) return;
+    if (!is_array($array)) return;
 
-    foreach($array as $key => &$value) {
-      if($value === null) {
+    foreach ($array as $key => &$value) {
+      if ($value === null) {
         unset($array[$key]);
-      } elseif($level > 0 && is_array($value)) {
+      } elseif ($level > 0 && is_array($value)) {
         static::array_repack($value, $level - 1);
-        if(empty($value)) unset($array[$key]);
+        if (empty($value)) unset($array[$key]);
       }
     }
   }
@@ -204,7 +204,7 @@ 
   // TODO Вынести в отдельный объект
   public static function cache_repack($location_type, $record_id = 0) {
     // Если есть $user_id - проверяем, а надо ли перепаковывать?
-    if($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) return;
+    if ($record_id && isset(static::$data[$location_type][$record_id]) && static::$data[$location_type][$record_id] !== null) return;
 
     static::array_repack(static::$data[$location_type]);
     static::array_repack(static::$locator[$location_type], 3); // TODO У каждого типа локации - своя глубина!!!! Но можно и глубже ???
@@ -212,9 +212,9 @@ 
   }
   public static function cache_clear($location_type, $hard = true) {
     //print("<br />CACHE CLEAR {$cache_id} " . ($hard ? 'HARD' : 'SOFT') . "<br />");
-    if($hard && !empty(static::$data[$location_type])) {
+    if ($hard && !empty(static::$data[$location_type])) {
       // Здесь нельзя делать unset - надо записывать NULL, что бы это отразилось на зависимых записях
-      array_walk(static::$data[$location_type], function(&$item){$item = null;});
+      array_walk(static::$data[$location_type], function(&$item) {$item = null; });
     }
     static::$locator[$location_type] = array();
     static::$queries[$location_type] = array();
@@ -222,7 +222,7 @@ 
   }
   public static function cache_clear_all($hard = true) {
     //print('<br />CACHE CLEAR ALL<br />');
-    if($hard) {
+    if ($hard) {
       static::$data = array();
       static::cache_lock_unset_all();
     }
@@ -249,10 +249,10 @@ 
   */
   public static function cache_set($location_type, $record_id, $record, $force_overwrite = false, $skip_lock = false) {
     // нет идентификатора - выход
-    if(!($record_id = $record[static::$location_info[$location_type][P_ID]])) return;
+    if (!($record_id = $record[static::$location_info[$location_type][P_ID]])) return;
 
     $in_transaction = static::db_transaction_check(false);
-    if(
+    if (
       $force_overwrite
       ||
       // Не заменяются заблокированные записи во время транзакции
@@ -262,14 +262,14 @@ 
       !static::cache_isset($location_type, $record_id)
     ) {
       static::$data[$location_type][$record_id] = $record;
-      if($in_transaction && !$skip_lock) {
+      if ($in_transaction && !$skip_lock) {
         static::cache_lock_set($location_type, $record_id);
       }
     }
   }
   public static function cache_unset($cache_id, $safe_record_id) {
     // $record_id должен быть проверен заранее !
-    if(isset(static::$data[$cache_id][$safe_record_id]) && static::$data[$cache_id][$safe_record_id] !== null) {
+    if (isset(static::$data[$cache_id][$safe_record_id]) && static::$data[$cache_id][$safe_record_id] !== null) {
       // Выставляем запись в null
       static::$data[$cache_id][$safe_record_id] = null;
       // Очищаем кэш мягко - что бы удалить очистить связанные данные - кэш локаций и кэш запоросов и всё, что потребуется впредь
@@ -283,7 +283,7 @@ 
     return static::$locks[$location_type][$record_id] = true; // Не всегда - от результата
   }
   public static function cache_lock_unset($location_type, $record_id) {
-    if(isset(static::$locks[$location_type][$record_id]))
+    if (isset(static::$locks[$location_type][$record_id]))
       unset(static::$locks[$location_type][$record_id]);
     return true; // Не всегда - от результата
   }
@@ -313,13 +313,13 @@ 
    */
   public static function db_transaction_check($status = null) {
     $error_msg = false;
-    if($status && !static::$db_in_transaction) {
+    if ($status && !static::$db_in_transaction) {
       $error_msg = 'No transaction started for current operation';
-    } elseif($status === null && static::$db_in_transaction) {
+    } elseif ($status === null && static::$db_in_transaction) {
       $error_msg = 'Transaction is already started';
     }
 
-    if($error_msg) {
+    if ($error_msg) {
       // TODO - Убрать позже
       print('<h1>СООБЩИТЕ ЭТО АДМИНУ: sn_db_transaction_check() - ' . $error_msg . '</h1>');
       $backtrace = debug_backtrace();
@@ -340,7 +340,7 @@ 
     static::$transaction_id++;
     doquery('START TRANSACTION');
 
-    if($config->db_manual_lock_enabled) {
+    if ($config->db_manual_lock_enabled) {
       $config->db_loadItem('var_db_manually_locked');
       $config->db_saveItem('var_db_manually_locked', SN_TIME_SQL);
     }
@@ -382,7 +382,7 @@ 
    */
   public static function db_lock_tables($tables) {
     $tables = is_array($tables) ? $tables : array($tables => '');
-    foreach($tables as $table_name => $condition) {
+    foreach ($tables as $table_name => $condition) {
       self::$db->doquery("SELECT 1 FROM {{{$table_name}}}" . ($condition ? ' WHERE ' . $condition : ''));
     }
   }
@@ -431,14 +431,14 @@ 
   public static function db_get_record_list($location_type, $filter = '', $fetch = false, $no_return = false) {
     $query_cache = &static::$queries[$location_type][$filter];
 
-    if(!isset($query_cache) || $query_cache === null) {
+    if (!isset($query_cache) || $query_cache === null) {
       $location_info = &static::$location_info[$location_type];
       $id_field = $location_info[P_ID];
       $query_cache = array();
 
-      if(static::db_transaction_check(false)) {
+      if (static::db_transaction_check(false)) {
         // Проходим по всем родителям данной записи
-        foreach($location_info[P_OWNER_INFO] as $owner_data) {
+        foreach ($location_info[P_OWNER_INFO] as $owner_data) {
           $owner_location_type = $owner_data[P_LOCATION];
           $parent_id_list = array();
           // Выбираем родителей данного типа и соответствующие ИД текущего типа
@@ -452,14 +452,14 @@ 
             true
           );
 
-          while($row = db_fetch($query)) {
+          while ($row = db_fetch($query)) {
             // Исключаем из списка родительских ИД уже заблокированные записи
-            if(!static::cache_lock_get($owner_location_type, $row['parent_id']))
+            if (!static::cache_lock_get($owner_location_type, $row['parent_id']))
               $parent_id_list[$row['parent_id']] = $row['parent_id'];
           }
 
           // Если все-таки какие-то записи еще не заблокированы - вынимаем текущие версии из базы
-          if($indexes_str = implode(',', $parent_id_list)) {
+          if ($indexes_str = implode(',', $parent_id_list)) {
             $parent_id_field = static::$location_info[$owner_location_type][P_ID];
             static::db_get_record_list($owner_location_type,
               $parent_id_field . (count($parent_id_list) > 1 ? " IN ({$indexes_str})" : " = {$indexes_str}"), $fetch, true);
@@ -470,20 +470,20 @@ 
       $query = static::db_query_select(
         "SELECT * FROM {{{$location_info[P_TABLE_NAME]}}}" . (($filter = trim($filter)) ? " WHERE {$filter}" : '')
       );
-      while($row = db_fetch($query)) {
+      while ($row = db_fetch($query)) {
         static::cache_set($location_type, $row[$id_field], $row);
         $query_cache[$row[$id_field]] = &static::$data[$location_type][$row[$id_field]];
       }
     }
 
-    if($no_return) {
+    if ($no_return) {
       return true;
     } else {
       $result = false;
-      if(is_array($query_cache)) {
-        foreach($query_cache as $key => $value) {
+      if (is_array($query_cache)) {
+        foreach ($query_cache as $key => $value) {
           $result[$key] = $value;
-          if($fetch) break;
+          if ($fetch) break;
         }
       }
       return $fetch ? (is_array($result) ? reset($result) : false) : $result;
@@ -491,14 +491,14 @@ 
   }
 
   public static function db_upd_record_by_id($location_type, $record_id, $set) {
-    if(!($record_id = idval($record_id)) || !($set = trim($set))) return false;
+    if (!($record_id = idval($record_id)) || !($set = trim($set))) return false;
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET {$set} WHERE `{$id_field}` = {$record_id}")) // TODO Как-то вернуть может быть LIMIT 1 ?
     {
-      if(static::$db->db_affected_rows()) {
+      if (static::$db->db_affected_rows()) {
         // Обновляем данные только если ряд был затронут
         // TODO - переделать под работу со структурированными $set
 
@@ -513,14 +513,14 @@ 
     return $result;
   }
   public static function db_upd_record_list($location_type, $condition, $set) {
-    if(!($set = trim($set))) return false;
+    if (!($set = trim($set))) return false;
 
     $condition = trim($condition);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
 
-    if($result = static::db_query_update("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
+    if ($result = static::db_query_update("UPDATE {{{$table_name}}} SET " . $set . ($condition ? ' WHERE ' . $condition : ''))) {
 
-      if(static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) { // Обновляем данные только если ряд был затронут
         // Поскольку нам неизвестно, что и как обновилось - сбрасываем кэш этого типа полностью
         // TODO - когда будет структурированный $condition и $set - перепаковывать данные
         static::cache_clear($location_type, true);
@@ -533,8 +533,8 @@ 
   public static function db_ins_record($location_type, $set) {
     $set = trim($set);
     $table_name = static::$location_info[$location_type][P_TABLE_NAME];
-    if($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+    if ($result = static::db_query_insert("INSERT INTO `{{{$table_name}}}` SET {$set}")) {
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         $record_id = db_insert_id();
         // Вытаскиваем запись целиком, потому что в $set могли быть "данные по умолчанию"
@@ -550,14 +550,14 @@ 
 
   public static function db_del_record_by_id($location_type, $safe_record_id)
   {
-    if(!($safe_record_id = idval($safe_record_id))) return false;
+    if (!($safe_record_id = idval($safe_record_id))) return false;
 
     $location_info = &static::$location_info[$location_type];
     $id_field = $location_info[P_ID];
     $table_name = $location_info[P_TABLE_NAME];
-    if($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}"))
+    if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE `{$id_field}` = {$safe_record_id}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         static::cache_unset($location_type, $safe_record_id);
       }
@@ -567,14 +567,14 @@ 
   }
   public static function db_del_record_list($location_type, $condition)
   {
-    if(!($condition = trim($condition))) return false;
+    if (!($condition = trim($condition))) return false;
 
     $location_info = &static::$location_info[$location_type];
     $table_name = $location_info[P_TABLE_NAME];
 
-    if($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
+    if ($result = static::db_query_delete("DELETE FROM `{{{$table_name}}}` WHERE {$condition}"))
     {
-      if(static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
+      if (static::$db->db_affected_rows()) // Обновляем данные только если ряд был затронут
       {
         // Обнуление кэша, потому что непонятно, что поменялось
         static::cache_clear($location_type);
@@ -620,21 +620,21 @@ 
   public static function db_get_user_by_username($username_unsafe, $for_update = false, $fields = '*', $player = null, $like = false)
   {
     // TODO Проверить, кстати - а везде ли нужно выбирать юзеров или где-то все-таки ищутся Альянсы ?
-    if(!($username_unsafe = trim($username_unsafe))) return false;
+    if (!($username_unsafe = trim($username_unsafe))) return false;
 
     $user = null;
-    if(is_array(static::$data[LOC_USER]))
-    foreach(static::$data[LOC_USER] as $user_id => $user_data)
+    if (is_array(static::$data[LOC_USER]))
+    foreach (static::$data[LOC_USER] as $user_id => $user_data)
     {
-      if(is_array($user_data) && isset($user_data['username']))
+      if (is_array($user_data) && isset($user_data['username']))
       {
         // проверяем поле
         // TODO Возможно есть смысл всегда искать по strtolower - но может игрок захочет переименоваться с другим регистром? Проверить!
-        if((!$like && $user_data['username'] == $username_unsafe) || ($like && strtolower($user_data['username']) == strtolower($username_unsafe)))
+        if ((!$like && $user_data['username'] == $username_unsafe) || ($like && strtolower($user_data['username']) == strtolower($username_unsafe)))
         {
           // $user_as_ally = intval($user_data['user_as_ally']);
           $user_as_ally = idval($user_data['user_as_ally']);
-          if($player === null || ($player === true && !$user_as_ally) || ($player === false && $user_as_ally))
+          if ($player === null || ($player === true && !$user_as_ally) || ($player === false && $user_as_ally))
           {
             $user = $user_data;
             break;
@@ -643,13 +643,13 @@ 
       }
     }
 
-    if($user === null)
+    if ($user === null)
     {
       // Вытаскиваем запись
       $username_safe = db_escape($like ? strtolower($username_unsafe) : $username_unsafe); // тут на самом деле strtolower() лишняя, но пусть будет
 
       $user = static::db_query_select(
-        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '='). " '{$username_safe}'",
+        "SELECT * FROM {{users}} WHERE `username` " . ($like ? 'LIKE' : '=') . " '{$username_safe}'",
         true
       );
       static::cache_set(LOC_USER, $user['id'], $user); // В кэш-юзер так же заполнять индексы
@@ -659,14 +659,14 @@ 
   }
   // UNUSED
   public static function db_get_user_by_email($email_unsafe, $use_both = false, $for_update = false, $fields = '*') {
-    if(!($email_unsafe = strtolower(trim($email_unsafe)))) return false;
+    if (!($email_unsafe = strtolower(trim($email_unsafe)))) return false;
 
     $user = null;
-    if(is_array(static::$data[LOC_USER])) {
-      foreach(static::$data[LOC_USER] as $user_id => $user_data) {
-        if(is_array($user_data) && isset($user_data['email_2'])) {
+    if (is_array(static::$data[LOC_USER])) {
+      foreach (static::$data[LOC_USER] as $user_id => $user_data) {
+        if (is_array($user_data) && isset($user_data['email_2'])) {
           // проверяем поле
-          if(strtolower($user_data['email_2']) == $email_unsafe || ($use_both && strtolower($user_data['email']) == $email_unsafe)) {
+          if (strtolower($user_data['email_2']) == $email_unsafe || ($use_both && strtolower($user_data['email']) == $email_unsafe)) {
             $user = $user_data;
             break;
           }
@@ -674,7 +674,7 @@ 
       }
     }
 
-    if($user === null) {
+    if ($user === null) {
       // Вытаскиваем запись
       $email_safe = db_escape($email_unsafe);
       $user = static::db_query_select(
@@ -691,7 +691,7 @@ 
     $user = null;
     // TODO переделать на индексы
 
-    if($user === null && !empty($where_safe)) {
+    if ($user === null && !empty($where_safe)) {
       // Вытаскиваем запись
       $user = static::db_query_select(
         "SELECT * FROM {{users}} WHERE {$where_safe}",
@@ -729,7 +729,7 @@ 
   {
     // TODO запихивать в $data[LOC_LOCATION][$location_type][$location_id]
     $unit = static::db_get_record_by_id(LOC_UNIT, $unit_id, $for_update, $fields);
-    if(is_array($unit))
+    if (is_array($unit))
     {
       static::$locator[LOC_UNIT][$unit['unit_location_type']][$unit['unit_location_id']][$unit['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
     }
@@ -739,15 +739,15 @@ 
 
   public static function db_get_unit_list_by_location($user_id = 0, $location_type, $location_id)
   {
-    if(!($location_type = idval($location_type)) || !($location_id = idval($location_id))) return false;
+    if (!($location_type = idval($location_type)) || !($location_id = idval($location_id))) return false;
 
     $query_cache = &static::$locator[LOC_UNIT][$location_type][$location_id];
-    if(!isset($query_cache))
+    if (!isset($query_cache))
     {
       $got_data = static::db_get_record_list(LOC_UNIT, "unit_location_type = {$location_type} AND unit_location_id = {$location_id} AND " . static::db_unit_time_restrictions());
-      if(is_array($got_data))
+      if (is_array($got_data))
       {
-        foreach($got_data as $unit_id => $unit_data)
+        foreach ($got_data as $unit_id => $unit_data)
         {
           // static::$data[LOC_LOCATION][$location_type][$location_id][$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
           $query_cache[$unit_data['unit_snid']] = &static::$data[LOC_UNIT][$unit_id];
@@ -756,8 +756,8 @@ 
     }
 
     $result = false;
-    if(is_array($query_cache)) {
-      foreach($query_cache as $key => $value) {
+    if (is_array($query_cache)) {
+      foreach ($query_cache as $key => $value) {
         $result[$key] = $value;
       }
     }
@@ -795,7 +795,7 @@ 
    */
   public static function db_que_list_by_type_location($user_id, $planet_id = null, $que_type = false, $for_update = false)
   {
-    if(!$user_id)
+    if (!$user_id)
     {
       pdump(debug_backtrace());
       die('No user_id for que_get_que()');
@@ -805,14 +805,14 @@ 
 
     $query = array();
 
-    if($user_id = idval($user_id))
+    if ($user_id = idval($user_id))
       $query[] = "`que_player_id` = {$user_id}";
 
-    if($que_type == QUE_RESEARCH || $planet_id === null)
+    if ($que_type == QUE_RESEARCH || $planet_id === null)
       $query[] = "`que_planet_id` IS NULL";
-    elseif($planet_id)
+    elseif ($planet_id)
       $query[] = "(`que_planet_id` = {$planet_id}" . ($que_type ? '' : ' OR que_planet_id IS NULL') . ")";
-    if($que_type)
+    if ($que_type)
       $query[] = "`que_type` = {$que_type}";
 
     $ques['items'] = static::db_get_record_list(LOC_QUE, implode(' AND ', $query));
@@ -936,7 +936,7 @@ 
   }
 
 
-  public static function init_0_prepare () {
+  public static function init_0_prepare() {
     $dbsettings = array();
 
     require(SN_ROOT_PHYSICAL . "config" . DOT_PHP_EX);
@@ -973,7 +973,7 @@ 
   }
 
   public static function init_debug_state() {
-    if($_SERVER['SERVER_NAME'] == 'localhost' && !defined('BE_DEBUG')) {
+    if ($_SERVER['SERVER_NAME'] == 'localhost' && !defined('BE_DEBUG')) {
       define('BE_DEBUG', true);
     }
     // define('DEBUG_SQL_ONLINE', true); // Полный дамп запросов в рил-тайме. Подойдет любое значение
@@ -985,7 +985,7 @@ 
     defined('DEBUG_SQL_ERROR') && !defined('DEBUG_SQL_COMMENT') ? define('DEBUG_SQL_COMMENT', true) : false;
     defined('DEBUG_SQL_COMMENT_LONG') && !defined('DEBUG_SQL_COMMENT') ? define('DEBUG_SQL_COMMENT', true) : false;
 
-    if(defined('BE_DEBUG') || static::$config->debug) {
+    if (defined('BE_DEBUG') || static::$config->debug) {
       @define('BE_DEBUG', true);
       @ini_set('display_errors', 1);
       @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);

classes/sn_module.php

Spacing +34 added lines, -34 removed lines

@@ -104,13 +104,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;
@@ -121,8 +121,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;
       }
     }
@@ -132,13 +132,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);
       }
     }
@@ -149,34 +149,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);
         }
       }
@@ -192,50 +192,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;
       }
     }
@@ -251,7 +251,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);
     }
   }

classes/AjaxController.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 
     define('IN_AJAX', true);
 
-    if(!is_object($template)) {
+    if (!is_object($template)) {
       $template = gettemplate('_ajax', true);
     }
 
@@ -37,16 +37,16 @@ 
 
     $mode = sys_get_param_str('mode');
 
-    if(class_exists($className = 'Pages\\Page' . ucfirst($mode))) {
+    if (class_exists($className = 'Pages\\Page' . ucfirst($mode))) {
       /**
        * @var \Pages\IPage $page
        */
       $page = new $className();
-      if(method_exists($page, 'loadParams')) {
+      if (method_exists($page, 'loadParams')) {
         $page->loadParams();
       }
 
-      if(method_exists($page, $action = sys_get_param('action')) && $page->checkAction($action)) {
+      if (method_exists($page, $action = sys_get_param('action')) && $page->checkAction($action)) {
         $result = $page->$action();
         is_array($result) ? HelperArray::merge($template_result['AJAX'], $result) : false;
       }

classes/PTLTag.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     $this->raw = $stringTag;
 
     // Separating params - so there are will be no false-positives for template's variable names
-    if(strpos($this->raw, '|') !== false) {
+    if (strpos($this->raw, '|') !== false) {
       $this->params = explode('|', $this->raw);
       $this->resolved = $this->params[0];
       unset($this->params[0]);

classes/Pages/PageQuest.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
       QUEST_STATUS_COMPLETE => '',
     );
 
-    if(!isset($statuses[$this->filterQuestStatus])) {
+    if (!isset($statuses[$this->filterQuestStatus])) {
       $this->filterQuestStatus = QUEST_STATUS_ALL;
     }
   }

classes/TextModel.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
       }
     }
 
-    if(!isset($next)) {
+    if (!isset($next)) {
       $next = new TextEntity();
     }
 
@@ -119,7 +119,7 @@ 
       $prev = $this->getById($currentText->prev);
     }
 
-    if(!isset($prev)) {
+    if (!isset($prev)) {
       $prev = new TextEntity();
     }
 

classes/debug.php

Spacing +38 added lines, -39 removed lines

@@ -24,7 +24,7 @@ 
  * que esperabas!!! soy newbie!!! D':<
 */
 
-if(!defined('INSIDE')) {
+if (!defined('INSIDE')) {
   die("attemp hacking");
 }
 
@@ -37,16 +37,16 @@ 
   function log_file($message, $ident_change = 0) {
     static $ident = 0;
 
-    if(!defined('SN_DEBUG_LOG')) {
+    if (!defined('SN_DEBUG_LOG')) {
       return;
     }
 
-    if($this->log_file_handler === null) {
+    if ($this->log_file_handler === null) {
       $this->log_file_handler = @fopen(SN_ROOT_PHYSICAL . '/.logs/supernova.log', 'a+');
       @fwrite($this->log_file_handler, "\r\n\r\n");
     }
     $ident_change < 0 ? $ident += $ident_change * 2 : false;
-    if($this->log_file_handler) {
+    if ($this->log_file_handler) {
       @fwrite($this->log_file_handler, date(FMT_DATE_TIME_SQL, time()) . str_repeat(' ', $ident + 1) . $message . "\r\n");
     }
     $ident_change > 0 ? $ident += $ident_change * 2 : false;
@@ -81,8 +81,8 @@ 
     $result = array();
     $transaction_id = classSupernova::db_transaction_check(false) ? classSupernova::$transaction_id : classSupernova::$transaction_id++;
     $result[] = "tID {$transaction_id}";
-    foreach($backtrace as $a_trace) {
-      if(in_array($a_trace['function'], $exclude_functions)) {
+    foreach ($backtrace as $a_trace) {
+      if (in_array($a_trace['function'], $exclude_functions)) {
         continue;
       }
       $function =
@@ -98,7 +98,7 @@ 
 
       $result[] = "{$function} - '{$file}' Line {$a_trace['line']}";
 
-      if(!$long_comment) {
+      if (!$long_comment) {
         break;
       }
     }
@@ -107,26 +107,26 @@ 
   }
 
   function dump($dump = false, $force_base = false, $deadlock = false) {
-    if($dump === false) {
+    if ($dump === false) {
       return;
     }
 
     $error_backtrace = array();
     $base_dump = false;
 
-    if($force_base === true) {
+    if ($force_base === true) {
       $base_dump = true;
     }
 
-    if($dump === true) {
+    if ($dump === true) {
       $base_dump = true;
     } else {
-      if(!is_array($dump)) {
+      if (!is_array($dump)) {
         $dump = array('var' => $dump);
       }
 
-      foreach($dump as $dump_var_name => $dump_var) {
-        if($dump_var_name == 'base_dump') {
+      foreach ($dump as $dump_var_name => $dump_var) {
+        if ($dump_var_name == 'base_dump') {
           $base_dump = $dump_var;
         } else {
           $error_backtrace[$dump_var_name] = $dump_var;
@@ -134,26 +134,25 @@ 
       }
     }
 
-    if($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
+    if ($deadlock && ($q = db_fetch(classSupernova::$db->mysql_get_innodb_status()))) {
       $error_backtrace['deadlock'] = explode("\n", $q['Status']);
       $error_backtrace['locks'] = classSupernova::$locks;
       $error_backtrace['cSN_data'] = classSupernova::$data;
-      foreach($error_backtrace['cSN_data'] as &$location) {
-        foreach($location as $location_id => &$location_data) //          $location_data = $location_id;
+      foreach ($error_backtrace['cSN_data'] as &$location) {
+        foreach ($location as $location_id => &$location_data) //          $location_data = $location_id;
         {
-          $location_data = isset($location_data['username']) ? $location_data['username'] :
-            (isset($location_data['name']) ? $location_data['name'] : $location_id);
+          $location_data = isset($location_data['username']) ? $location_data['username'] : (isset($location_data['name']) ? $location_data['name'] : $location_id);
         }
       }
       $error_backtrace['cSN_queries'] = classSupernova::$queries;
     }
 
-    if($base_dump) {
-      if(is_array($this->log_array) && count($this->log_array) > 0) {
+    if ($base_dump) {
+      if (is_array($this->log_array) && count($this->log_array) > 0) {
         ;
       }
       {
-        foreach($this->log_array as $log) {
+        foreach ($this->log_array as $log) {
           $error_backtrace['queries'][] = $log;
         }
       }
@@ -184,14 +183,14 @@ 
   function error($message = 'There is a error on page', $title = 'Internal Error', $error_code = 500, $dump = true) {
     global $config, $sys_stop_log_hit, $lang, $sys_log_disabled, $user;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     sn_db_transaction_rollback();
 
-    if(classSupernova::$config->debug == 1) {
+    if (classSupernova::$config->debug == 1) {
       echo "<h2>{$title}</h2><br><font color=red>{$message}</font><br><hr>";
       echo "<table>{$this->log}</table>";
     }
@@ -201,7 +200,7 @@ 
     $error_text = db_escape($message);
     $error_backtrace = $this->dump($dump, true, strpos($message, 'Deadlock') !== false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($error_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -219,7 +218,7 @@ 
       ob_start();
       print("<hr>User ID {$user['id']} raised error code {$error_code} titled '{$title}' with text '{$error_text}' on page {$_SERVER['SCRIPT_NAME']}");
 
-      foreach($error_backtrace as $name => $value) {
+      foreach ($error_backtrace as $name => $value) {
         print('<hr>');
         pdump($value, $name);
       }
@@ -231,14 +230,14 @@ 
   function warning($message, $title = 'System Message', $log_code = 300, $dump = false) {
     global $user, $lang, $sys_log_disabled;
 
-    if(empty(classSupernova::$db->connected)) {
+    if (empty(classSupernova::$db->connected)) {
       // TODO - писать ошибку в файл
       die('SQL server currently unavailable. Please contact Administration...');
     }
 
     $error_backtrace = $this->dump($dump, false);
 
-    if(!$sys_log_disabled) {
+    if (!$sys_log_disabled) {
       $query = "INSERT INTO `{{logs}}` SET
         `log_time` = '" . time() . "', `log_code` = '" . db_escape($log_code) . "', `log_sender` = '" . db_escape($user['id']) . "',
         `log_username` = '" . db_escape($user['user_name']) . "', `log_title` = '" . db_escape($title) . "',  `log_text` = '" . db_escape($message) . "',
@@ -256,11 +255,11 @@ 
 // Dump variables nicer then var_dump()
 
 function dump($value, $varname = null, $level = 0, $dumper = '') {
-  if(isset($varname)) {
+  if (isset($varname)) {
     $varname .= " = ";
   }
 
-  if($level == -1) {
+  if ($level == -1) {
     $trans[' '] = '&there4;';
     $trans["\t"] = '&rArr;';
     $trans["\n"] = '&para;;';
@@ -269,7 +268,7 @@ 
 
     return strtr(htmlspecialchars($value), $trans);
   }
-  if($level == 0) {
+  if ($level == 0) {
 //    $dumper = '<pre>' . mt_rand(10, 99) . '|' . $varname;
     $dumper = mt_rand(10, 99) . '|' . $varname;
   }
@@ -277,22 +276,22 @@ 
   $type = gettype($value);
   $dumper .= $type;
 
-  if($type == 'string') {
+  if ($type == 'string') {
     $dumper .= '(' . strlen($value) . ')';
     $value = dump($value, '', -1);
-  } elseif($type == 'boolean') {
+  } elseif ($type == 'boolean') {
     $value = ($value ? 'true' : 'false');
-  } elseif($type == 'object') {
+  } elseif ($type == 'object') {
     $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);
     }
     $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);
     }
@@ -312,7 +311,7 @@ 
 //  $backtrace = $backtrace[1];
 
   $caller = '';
-  if(defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
+  if (defined('SN_DEBUG_PDUMP_CALLER') && SN_DEBUG_PDUMP_CALLER) {
     $caller = (!empty($backtrace[1]['class']) ? $backtrace[1]['class'] : '') .
       (!empty($backtrace[1]['type']) ? $backtrace[1]['type'] : '') .
       $backtrace[1]['function'] .
@@ -339,7 +338,7 @@ 
 }
 
 function pr($prePrint = false) {
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print(mt_rand() . "<br>");
@@ -349,7 +348,7 @@ 
   global $_PRINT_COUNT_VALUE;
   $_PRINT_COUNT_VALUE++;
 
-  if($prePrint) {
+  if ($prePrint) {
     print("<br>");
   }
   print($_PRINT_COUNT_VALUE . "<br>");