supernova-ws / SuperNova

admin/adm_user_analyze.php

Indentation +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
     0 => $row['visit_time'], // start
     1 => $row['visit_time'], // end
   )
-   //: false
-   ;
+    //: false
+    ;
 }
 
 $session_list = array();

Spacing +16 added lines, -16 removed lines

@@ -10,22 +10,22 @@ 
 define('INSTALL', false);
 define('IN_ADMIN', true);
 
-require('../common.' . substr(strrchr(__FILE__, '.'), 1));
+require('../common.'.substr(strrchr(__FILE__, '.'), 1));
 
-if($user['authlevel'] < 3) {
+if ($user['authlevel'] < 3) {
   AdminMessage(classLocale::$lang['adm_err_denied']);
 }
 
 // define('SESSION_INTERRUPT', 15*60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
 // define('SUSPICIOUS_LONG', 2 * 60*60); // Тогда это увеличиваем до, скажем суток - и там смотрим
 
-define('SESSION_INTERRUPT', 1 * 60*60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
-define('SUSPICIOUS_LONG', 16 * 60*60); // Тогда это увеличиваем до, скажем суток - и там смотрим
+define('SESSION_INTERRUPT', 1 * 60 * 60); // Можно увеличить до 4 часов - никито не может сидеть 2 суток с перерывом менее 4 часов
+define('SUSPICIOUS_LONG', 16 * 60 * 60); // Тогда это увеличиваем до, скажем суток - и там смотрим
 
 
 function check_suspicious(&$session, &$session_list_last_id, &$row) {
   $session[2] = $session[1] - $session[0];
-  if($session[2] > SUSPICIOUS_LONG)
+  if ($session[2] > SUSPICIOUS_LONG)
   {
     $session[2] = pretty_time($session[2]);
     $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -46,24 +46,24 @@ 
 $session_list = array();
 $query = db_counter_list_by_week();
 $session = array();
-if($row = db_fetch($query)) {
+if ($row = db_fetch($query)) {
   $session = array(
     0 => strtotime($row['visit_time']), // start
     1 => strtotime($row['visit_time']), // end
   );
   $last_id = $row['user_id'];
 }
-while($row = db_fetch($query)) {
+while ($row = db_fetch($query)) {
   $row['visit_time'] = strtotime($row['visit_time']);
-  if($last_id == $row['user_id']) {
+  if ($last_id == $row['user_id']) {
     // Тот же юзер
-    if($row['visit_time'] - $session[1] <= SESSION_INTERRUPT) { // Та же сессия
+    if ($row['visit_time'] - $session[1] <= SESSION_INTERRUPT) { // Та же сессия
       $session[1] = $row['visit_time'];
     } else {
       // Новая сессия
 //      check_suspicious($session, $session_list[$last_id], $row);
       $session[2] = $session[1] - $session[0];
-      if($session[2] > SUSPICIOUS_LONG)
+      if ($session[2] > SUSPICIOUS_LONG)
       {
         $session[2] = pretty_time($session[2]);
         $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -78,7 +78,7 @@ 
   } else {
 //    check_suspicious($session, $session_list[$last_id], $row);
     $session[2] = $session[1] - $session[0];
-      if($session[2] > SUSPICIOUS_LONG)
+      if ($session[2] > SUSPICIOUS_LONG)
       {
         $session[2] = pretty_time($session[2]);
         $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -93,11 +93,11 @@ 
   }
 }
 
-if($last_id) {
+if ($last_id) {
   // check_suspicious($session, $session_list[$last_id], $row = array('time' => 0));
   $session[2] = $session[1] - $session[0];
 
-  if($session[2] > SUSPICIOUS_LONG)
+  if ($session[2] > SUSPICIOUS_LONG)
   {
     $session[2] = pretty_time($session[2]);
     $session[0] = date(FMT_DATE_TIME_SQL, $session[0]);
@@ -111,12 +111,12 @@ 
 print("<td>ID</td><td>Username</td><td>Start</td><td>End</td><td>Length</td>");
 print("<td>Last online</td>");
 print("</tr>");
-foreach($session_list as $user_id => $value) {
+foreach ($session_list as $user_id => $value) {
   $user_record = db_player_list_online_by_id($user_id);
-  foreach($value as $interval_data) {
+  foreach ($value as $interval_data) {
     print("<tr>");
     print("<td>{$user_id}</td><td>{$user_record['username']}</td><td>{$interval_data[0]}</td><td>{$interval_data[1]}</td><td>{$interval_data[2]}</td>");
-    print("<td>" . date(FMT_DATE_TIME_SQL, $user_record['onlinetime']) . "</td>");
+    print("<td>".date(FMT_DATE_TIME_SQL, $user_record['onlinetime'])."</td>");
     print("</tr>");
   }
 }

stat.php

Indentation +30 added lines, -30 removed lines

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

Spacing +6 added lines, -6 removed lines

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

scheduler.php

Spacing +2 added lines, -2 removed lines

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

includes/alliance/ali_external_request.inc

Spacing +4 added lines, -4 removed lines

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

includes/includes/market_trader.inc

Spacing +14 added lines, -14 removed lines

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

includes/classes/core_classes.php

Spacing +13 added lines, -13 removed lines

@@ -38,8 +38,8 @@ 
     !is_array($offset) ? $offset = array($offset) : false;
 
     $current_leaf = $this->__get(reset($offset));
-    while(($leaf_index = next($offset)) !== false) {
-      if(!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
+    while (($leaf_index = next($offset)) !== false) {
+      if (!isset($current_leaf) || !is_array($current_leaf) || !isset($current_leaf[$leaf_index])) {
         unset($current_leaf);
         break;
       }
@@ -64,9 +64,9 @@ 
 
     !is_array($offset) ? $offset = array($offset) : false;
 
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
       $result = $this->__get(reset($offset));
-      while(($leaf_index = next($offset)) !== false) {
+      while (($leaf_index = next($offset)) !== false) {
         $result = $result[$leaf_index];
       }
     }
@@ -91,12 +91,12 @@ 
    */
   public function offsetSet($offset, $value = null) {
     // Если нет никакого индекса - значит нечего записывать
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($offset) && count($offset) == 1) {
+    if (is_array($offset) && count($offset) == 1) {
       // Разворачиваем его в индекс
       $offset = array(reset($offset) => $value);
       unset($value);
@@ -104,20 +104,20 @@ 
     }
 
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($offset) && isset($value)) {
+    if (is_array($offset) && isset($value)) {
       // TODO - а не переделать ли это всё на __isset() ??
 //pdump($offset, '$offset');
 //pdump($value, '$value');
       // Вытаскиваем корневой элемент
       $root = $this->__get(reset($offset));
       $current_leaf = &$root;
-      while(($leaf_index = next($offset)) !== false) {
+      while (($leaf_index = next($offset)) !== false) {
         !is_array($current_leaf[$leaf_index]) ? $current_leaf[$leaf_index] = array() : false;
         $current_leaf = &$current_leaf[$leaf_index];
       }
 //pdump($current_leaf, '$current_leaf');
 //pdump($value, '$value');
-      if($current_leaf != $value) {
+      if ($current_leaf != $value) {
         $current_leaf = $value;
 //pdump(reset($offset), 'reset($offset)');
 //pdump($root, '$root');
@@ -128,7 +128,7 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($offset) ? $offset = array($offset => $value) : false;
 
-      foreach($offset as $key => $value) {
+      foreach ($offset as $key => $value) {
         $this->__get($key) !== $value ? $this->__set($key, $value) : false;
       }
     }
@@ -149,13 +149,13 @@ 
    */
   public function offsetUnset($offset) {
     // Если нет никакого индекса - значит нечего записывать
-    if(!isset($offset) || (is_array($offset) && empty($offset))) {
+    if (!isset($offset) || (is_array($offset) && empty($offset))) {
       return;
     }
 
     !is_array($offset) ? $offset = array($offset) : false;
 
-    if($this->offsetExists($offset)) {
+    if ($this->offsetExists($offset)) {
 //pdump($offset);
       // Перематываем массив в конец
       $key_to_delete = end($offset);
@@ -163,7 +163,7 @@ 
 //pdump($key_to_delete, '$key_to_delete');
       $parent_offset = $offset;
       array_pop($parent_offset);
-      if(!count($parent_offset)) {
+      if (!count($parent_offset)) {
         // В массиве был один элемент - мы удаляем в корне. Просто удаляем элемент
         $this->__unset($key_to_delete);
       } else {

includes/classes/Confirmation.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
       // $query = static::$db->doquery("SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' AND `type` = {$confirmation_type_safe} FOR UPDATE", true);
       // Тип не нужен для проверки - код подтверждения должен быть уникален от слова "совсем"
       $query = $this->db->doquery("SELECT `id` FROM {{confirmations}} WHERE `code` = '{$confirm_code_safe}' FOR UPDATE", true);
-    } while($query);
+    } while ($query);
 
     $this->db->doquery(
       "REPLACE INTO {{confirmations}}

includes/classes/template.php

Indentation +75 added lines, -75 removed lines

@@ -25,11 +25,11 @@ 
 class template
 {
   /** variable that holds all the data we'll be substituting into
-  * the compiled templates. Takes form:
-  * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
-  * if it's a root-level variable, it'll be like this:
-  * --> $this->_tpldata[.][0][varname] == value
-  */
+   * the compiled templates. Takes form:
+   * --> $this->_tpldata[block][iteration#][child][iteration#][child2][iteration#][variablename] == value
+   * if it's a root-level variable, it'll be like this:
+   * --> $this->_tpldata[.][0][varname] == value
+   */
   var $_tpldata = array('.' => array(0 => array()));
   var $_rootref;
 //  var $_block_counter = array();
@@ -60,9 +60,9 @@ 
   var $parsed = false;
 
   /**
-  * Set template location
-  * @access public
-  */
+   * Set template location
+   * @access public
+   */
   function set_template()
   {
     global $phpbb_root_path, $user;
@@ -101,9 +101,9 @@ 
   }
 
   /**
-  * Set custom template location (able to use directory outside of phpBB)
-  * @access public
-  */
+   * Set custom template location (able to use directory outside of phpBB)
+   * @access public
+   */
   function set_custom_template($template_path, $template_name, $fallback_template_path = false)
   {
     global $phpbb_root_path, $user;
@@ -142,10 +142,10 @@ 
   }
 
   /**
-  * Sets the template filenames for handles. $filename_array
-  * should be a hash of handle => filename pairs.
-  * @access public
-  */
+   * Sets the template filenames for handles. $filename_array
+   * should be a hash of handle => filename pairs.
+   * @access public
+   */
   function set_filenames($filename_array)
   {
     if (!is_array($filename_array))
@@ -172,9 +172,9 @@ 
   }
 
   /**
-  * Destroy template data set
-  * @access public
-  */
+   * Destroy template data set
+   * @access public
+   */
   function destroy()
   {
     $this->_tpldata = array('.' => array(0 => array()));
@@ -182,9 +182,9 @@ 
   }
 
   /**
-  * Reset/empty complete block
-  * @access public
-  */
+   * Reset/empty complete block
+   * @access public
+   */
   function destroy_block_vars($blockname)
   {
     if (strpos($blockname, '.') !== false)
@@ -212,9 +212,9 @@ 
   }
 
   /**
-  * Display handle
-  * @access public
-  */
+   * Display handle
+   * @access public
+   */
   function display($handle, $include_once = true)
   {
     global $user, $phpbb_hook, $lang, $config;
@@ -248,9 +248,9 @@ 
   }
 
   /**
-  * Display the handle and assign the output to a template variable or return the compiled result.
-  * @access public
-  */
+   * Display the handle and assign the output to a template variable or return the compiled result.
+   * @access public
+   */
   function assign_display($handle, $template_var = '', $return_content = true, $include_once = false)
   {
     ob_start();
@@ -268,9 +268,9 @@ 
   }
 
   /**
-  * Load a compiled template if possible, if not, recompile it
-  * @access private
-  */
+   * Load a compiled template if possible, if not, recompile it
+   * @access private
+   */
   function _tpl_load(&$handle)
   {
     global $user, $config;
@@ -453,9 +453,9 @@ 
   }
 
   /**
-  * Assign key variable pairs from an array
-  * @access public
-  */
+   * Assign key variable pairs from an array
+   * @access public
+   */
   function assign_vars($vararray)
   {
     foreach ($vararray as $key => $val)
@@ -467,9 +467,9 @@ 
   }
 
   /**
-  * Assign a single variable to a single key
-  * @access public
-  */
+   * Assign a single variable to a single key
+   * @access public
+   */
   function assign_var($varname, $varval)
   {
     $this->_rootref[$varname] = $varval;
@@ -478,9 +478,9 @@ 
   }
 
   /**
-  * Assign key variable pairs from an array to a specified block
-  * @access public
-  */
+   * Assign key variable pairs from an array to a specified block
+   * @access public
+   */
   function assign_block_vars($blockname, $vararray)
   {
     if (strpos($blockname, '.') !== false)
@@ -545,33 +545,33 @@ 
   }
 
   /**
-  * Change already assigned key variable pair (one-dimensional - single loop entry)
-  *
-  * An example of how to use this function:
-  * {@example alter_block_array.php}
-  *
-  * @param  string  $blockname  the blockname, for example 'loop'
-  * @param  array $vararray the var array to insert/add or merge
-  * @param  mixed $key    Key to search for
-  *
-  * array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
-  *
-  * int: Position [the position to change or insert at directly given]
-  *
-  * If key is false the position is set to 0
-  * If key is true the position is set to the last entry
-  *
-  * @param  string  $mode   Mode to execute (valid modes are 'insert' and 'change')
-  *
-  * If insert, the vararray is inserted at the given position (position counting from zero).
-  * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
-  *
-  * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
-  * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
-  *
-  * @return bool false on error, true on success
-  * @access public
-  */
+   * Change already assigned key variable pair (one-dimensional - single loop entry)
+   *
+   * An example of how to use this function:
+   * {@example alter_block_array.php}
+   *
+   * @param  string  $blockname  the blockname, for example 'loop'
+   * @param  array $vararray the var array to insert/add or merge
+   * @param  mixed $key    Key to search for
+   *
+   * array: KEY => VALUE [the key/value pair to search for within the loop to determine the correct position]
+   *
+   * int: Position [the position to change or insert at directly given]
+   *
+   * If key is false the position is set to 0
+   * If key is true the position is set to the last entry
+   *
+   * @param  string  $mode   Mode to execute (valid modes are 'insert' and 'change')
+   *
+   * If insert, the vararray is inserted at the given position (position counting from zero).
+   * If change, the current block gets merged with the vararray (resulting in new key/value pairs be added and existing keys be replaced by the new value).
+   *
+   * Since counting begins by zero, inserting at the last position will result in this array: array(vararray, last positioned array)
+   * and inserting at position 1 will result in this array: array(first positioned array, vararray, following vars)
+   *
+   * @return bool false on error, true on success
+   * @access public
+   */
   function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
   {
     if (strpos($blockname, '.') !== false)
@@ -655,9 +655,9 @@ 
   }
 
   /**
-  * Include a separate template
-  * @access private
-  */
+   * Include a separate template
+   * @access private
+   */
   function _tpl_include($filename, $include = true)
   {
     global $lang, $config;
@@ -686,9 +686,9 @@ 
   }
 
   /**
-  * Include a php-file
-  * @access private
-  */
+   * Include a php-file
+   * @access private
+   */
   function _php_include($filename)
   {
     global $phpbb_root_path;
@@ -705,9 +705,9 @@ 
   }
 
   /**
-  * Assign key variable pairs from an array with block support
-  * @access public
-  */
+   * Assign key variable pairs from an array with block support
+   * @access public
+   */
   function assign_recursive($values, $name = '')
   {
     if(isset($values['.']))

Spacing +32 added lines, -32 removed lines

@@ -61,10 +61,10 @@ 
   {
     global $phpbb_root_path, $user;
 
-    if (file_exists($phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template'))
+    if (file_exists($phpbb_root_path.'styles/'.$user->theme['template_path'].'/template'))
     {
-      $this->root = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template';
-      $this->cachepath = $phpbb_root_path . 'cache/tpl_' . str_replace('_', '-', $user->theme['template_path']) . '_';
+      $this->root = $phpbb_root_path.'styles/'.$user->theme['template_path'].'/template';
+      $this->cachepath = $phpbb_root_path.'cache/tpl_'.str_replace('_', '-', $user->theme['template_path']).'_';
 
       if ($this->orig_tpl_storedb === null)
       {
@@ -81,12 +81,12 @@ 
 
       if ($user->theme['template_inherits_id'])
       {
-        $this->inherit_root = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template';
+        $this->inherit_root = $phpbb_root_path.'styles/'.$user->theme['template_inherit_path'].'/template';
       }
     }
     else
     {
-      trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
+      trigger_error('Template path could not be found: styles/'.$user->theme['template_path'].'/template', E_USER_ERROR);
     }
 
     $this->_rootref = &$this->_tpldata['.'][0];
@@ -109,7 +109,7 @@ 
     }
 
     $this->root = $template_path;
-    $this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
+    $this->cachepath = $phpbb_root_path.'cache/ctpl_'.str_replace('_', '-', $template_name).'_';
 
     if ($fallback_template_path !== false)
     {
@@ -154,11 +154,11 @@ 
       }
 
       $this->filename[$handle] = $filename;
-      $this->files[$handle] = $this->root . '/' . $filename;
+      $this->files[$handle] = $this->root.'/'.$filename;
 
       if ($this->inherit_root)
       {
-        $this->files_inherit[$handle] = $this->inherit_root . '/' . $filename;
+        $this->files_inherit[$handle] = $this->inherit_root.'/'.$filename;
       }
     }
 
@@ -235,7 +235,7 @@ 
     }
     else
     {
-      eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
+      eval(' ?>'.$this->compiled_code[$handle].'<?php ');
     }
 
     return true;
@@ -280,7 +280,7 @@ 
     //$user->theme['template_storedb'] = $this->orig_tpl_storedb;
     //$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
 
-    $filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . DOT_PHP_EX;
+    $filename = $this->cachepath.str_replace('/', '.', $this->filename[$handle]).DOT_PHP_EX;
     //$this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
 
     $recompile = false;
@@ -309,7 +309,7 @@ 
 
     if (!class_exists('template_compile'))
     {
-      include($phpbb_root_path . 'includes/functions_template' . DOT_PHP_EX);
+      include($phpbb_root_path.'includes/functions_template'.DOT_PHP_EX);
     }
 
     // Inheritance - we point to another template file for this one. Equality is also used for store_db
@@ -348,10 +348,10 @@ 
       foreach ($ids as $id)
       {
         $sql = 'SELECT *
-        FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
-        WHERE template_id = ' . $id . "
-          AND (template_filename = '" . $db->sql_escape($this->filename[$handle]) . "'
-            OR template_included " . $db->sql_like_expression($db->any_char . $this->filename[$handle] . ':' . $db->any_char) . ')';
+        FROM ' . STYLES_TEMPLATE_DATA_TABLE.'
+        WHERE template_id = ' . $id."
+          AND (template_filename = '" . $db->sql_escape($this->filename[$handle])."'
+            OR template_included " . $db->sql_like_expression($db->any_char.$this->filename[$handle].':'.$db->any_char).')';
 
         $result = $db->sql_query($sql);
         while ($row = $db->sql_fetchrow($result))
@@ -365,14 +365,14 @@ 
       {
         foreach ($rows as $row)
         {
-          $file = $this->root . '/' . $row['template_filename'];
+          $file = $this->root.'/'.$row['template_filename'];
           $force_reload = false;
           if ($row['template_id'] != $user->theme['template_id'])
           {
             // make sure that we are not overlooking a file not in the db yet
             if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'] && !file_exists($file))
             {
-              $file = $this->inherit_root . '/' . $row['template_filename'];
+              $file = $this->inherit_root.'/'.$row['template_filename'];
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
@@ -414,7 +414,7 @@ 
           else
           {
             // Only bother compiling if it doesn't already exist
-            if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
+            if (!file_exists($this->cachepath.str_replace('/', '.', $row['template_filename']).DOT_PHP_EX))
             {
               $this->filename[$row['template_filename']] = $row['template_filename'];
               $compile->compile_write($row['template_filename'], $compile->compile(trim($row['template_data'])));
@@ -425,11 +425,11 @@ 
       }
       else
       {
-        $file = $this->root . '/' . $row['template_filename'];
+        $file = $this->root.'/'.$row['template_filename'];
 
         if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'] && !file_exists($file))
         {
-          $file = $this->inherit_root . '/' . $row['template_filename'];
+          $file = $this->inherit_root.'/'.$row['template_filename'];
           $this->files[$row['template_filename']] = $file;
           $this->files_inherit[$row['template_filename']] = $file;
           $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
@@ -622,7 +622,7 @@ 
       // Re-position template blocks
       for ($i = sizeof($this->_tpldata[$blockname]); $i > $key; $i--)
       {
-        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i-1];
+        $this->_tpldata[$blockname][$i] = $this->_tpldata[$blockname][$i - 1];
         $this->_tpldata[$blockname][$i]['S_ROW_COUNT'] = $i;
       }
 
@@ -656,10 +656,10 @@ 
   {
     $handle = $filename;
     $this->filename[$handle] = $filename;
-    $this->files[$handle] = $this->root . '/' . $filename;
+    $this->files[$handle] = $this->root.'/'.$filename;
     if ($this->inherit_root)
     {
-      $this->files_inherit[$handle] = $this->inherit_root . '/' . $filename;
+      $this->files_inherit[$handle] = $this->inherit_root.'/'.$filename;
     }
 
     $filename = $this->_tpl_load($handle);
@@ -673,7 +673,7 @@ 
         include($filename);
         return;
       }
-      eval(' ?>' . $this->compiled_code[$handle] . '<?php ');
+      eval(' ?>'.$this->compiled_code[$handle].'<?php ');
     }
   }
 
@@ -685,12 +685,12 @@ 
   {
     global $phpbb_root_path;
 
-    $file = $phpbb_root_path . $filename;
+    $file = $phpbb_root_path.$filename;
 
     if (!file_exists($file))
     {
       // trigger_error cannot be used here, as the output already started
-      echo 'template->_php_include(): File ' . htmlspecialchars($file) . ' does not exist or is empty';
+      echo 'template->_php_include(): File '.htmlspecialchars($file).' does not exist or is empty';
       return;
     }
     include($file);
@@ -702,13 +702,13 @@ 
   */
   function assign_recursive($values, $name = '')
   {
-    if(isset($values['.']))
+    if (isset($values['.']))
     {
       $values_extra = $values['.'];
       unset($values['.']);
     }
 
-    if(!$name)
+    if (!$name)
     {
       $this->assign_vars($values);
     }
@@ -717,12 +717,12 @@ 
       $this->assign_block_vars($name, $values);
     }
 
-    if(isset($values_extra))
+    if (isset($values_extra))
     {
-      foreach($values_extra as $sub_array_name => $sub_array)
+      foreach ($values_extra as $sub_array_name => $sub_array)
       {
-        $new_name = $name . ($name ? '.' : '') . $sub_array_name;
-        foreach($sub_array as $sub_element)
+        $new_name = $name.($name ? '.' : '').$sub_array_name;
+        foreach ($sub_array as $sub_element)
         {
           $this->assign_recursive($sub_element, $new_name);
         }

includes/classes/auth_abstract.php

Spacing +2 added lines, -2 removed lines

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