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();

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

language/en/system.mo.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 */
 
 if (!defined('INSIDE')) {
-	die('Hack attempt!');
+  die('Hack attempt!');
 }
 
 global $config;

language/en/language.mo.php

Indentation +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 */
 if (!defined('INSIDE')) 
 {
-	die('Hack attempt!');
+  die('Hack attempt!');
 }
 
 $lang_info = array(

language/ru/system.mo.php

Indentation +10 added lines, -10 removed lines

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

classes/template_compile.php

Indentation +62 added lines, -62 removed lines

@@ -55,9 +55,9 @@ 
   }
 
   /**
-  * Load template source from file
-  * @access private
-  */
+   * Load template source from file
+   * @access private
+   */
   function _tpl_load_file($handle, $store_in_db = false)
   {
     // Try and open template for read
@@ -100,10 +100,10 @@ 
   }
 
   /**
-  * Remove any PHP tags that do not belong, these regular expressions are derived from
-  * the ones that exist in zend_language_scanner.l
-  * @access private
-  */
+   * Remove any PHP tags that do not belong, these regular expressions are derived from
+   * the ones that exist in zend_language_scanner.l
+   * @access private
+   */
   function remove_php_tags(&$code)
   {
     // This matches the information gathered from the internal PHP lexer
@@ -117,9 +117,9 @@ 
   }
 
   /**
-  * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
-  * @access private
-  */
+   * The all seeing all doing compile method. Parts are inspired by or directly from Smarty
+   * @access private
+   */
   function compile($code, $no_echo = false, $echo_var = '')
   {
     global $config;
@@ -290,9 +290,9 @@ 
   }
 
   /**
-  * Compile variables
-  * @access private
-  */
+   * Compile variables
+   * @access private
+   */
   function compile_var_tags(&$text_blocks)
   {
     // including $lang variable
@@ -359,9 +359,9 @@ 
   }
 
   /**
-  * Compile blocks
-  * @access private
-  */
+   * Compile blocks
+   * @access private
+   */
   function compile_tag_block($tag_args)
   {
     $no_nesting = false;
@@ -447,14 +447,14 @@ 
     $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
 
     /**
-    * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
-    * <code>
-    * if (!$offset)
-    * {
-    *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
-    * }
-    * </code>
-    */
+     * The following uses foreach for iteration instead of a for loop, foreach is faster but requires PHP to make a copy of the contents of the array which uses more memory
+     * <code>
+     * if (!$offset)
+     * {
+     *   $tag_template_php .= 'foreach (' . $varref . ' as $_' . $tag_args . '_i => $_' . $tag_args . '_val){';
+     * }
+     * </code>
+     */
 
     $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
 //    $tag_template_php .= '$this->_block_counter["'. $tag_args . '"] = $_' . $tag_args . '_i;';
@@ -465,10 +465,10 @@ 
   }
 
   /**
-  * Compile IF tags - much of this is from Smarty with
-  * some adaptions for our block level methods
-  * @access private
-  */
+   * Compile IF tags - much of this is from Smarty with
+   * some adaptions for our block level methods
+   * @access private
+   */
   function compile_tag_if($tag_args, $elseif)
   {
     // Tokenize args for 'if' tag.
@@ -623,9 +623,9 @@ 
   }
 
   /**
-  * Compile DEFINE tags
-  * @access private
-  */
+   * Compile DEFINE tags
+   * @access private
+   */
   function compile_tag_define($tag_args, $op)
   {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
@@ -676,9 +676,9 @@ 
   }
 
   /**
-  * Compile INCLUDE tag
-  * @access private
-  */
+   * Compile INCLUDE tag
+   * @access private
+   */
   function compile_tag_include($tag_args)
   {
     // Process dynamic includes
@@ -691,19 +691,19 @@ 
   }
 
   /**
-  * Compile INCLUDE_PHP tag
-  * @access private
-  */
+   * Compile INCLUDE_PHP tag
+   * @access private
+   */
   function compile_tag_include_php($tag_args)
   {
     return "\$this->_php_include('$tag_args');";
   }
 
   /**
-  * parse expression
-  * This is from Smarty
-  * @access private
-  */
+   * parse expression
+   * This is from Smarty
+   * @access private
+   */
   function _parse_is_expr($is_arg, $tokens)
   {
     $expr_end = 0;
@@ -768,13 +768,13 @@ 
   }
 
   /**
-  * Generates a reference to the given variable inside the given (possibly nested)
-  * block namespace. This is a string of the form:
-  * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
-  * It's ready to be inserted into an "echo" line in one of the templates.
-  * NOTE: expects a trailing "." on the namespace.
-  * @access private
-  */
+   * Generates a reference to the given variable inside the given (possibly nested)
+   * block namespace. This is a string of the form:
+   * ' . $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['varname'] . '
+   * It's ready to be inserted into an "echo" line in one of the templates.
+   * NOTE: expects a trailing "." on the namespace.
+   * @access private
+   */
   function generate_block_varref($namespace, $varname, $echo = true, $defop = false)
   {
     // Strip the trailing period.
@@ -792,14 +792,14 @@ 
   }
 
   /**
-  * Generates a reference to the array of data values for the given
-  * (possibly nested) block namespace. This is a string of the form:
-  * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
-  *
-  * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
-  * NOTE: does not expect a trailing "." on the blockname.
-  * @access private
-  */
+   * Generates a reference to the array of data values for the given
+   * (possibly nested) block namespace. This is a string of the form:
+   * $this->_tpldata['parent'][$_parent_i]['$child1'][$_child1_i]['$child2'][$_child2_i]...['$childN']
+   *
+   * If $include_last_iterator is true, then [$_childN_i] will be appended to the form shown above.
+   * NOTE: does not expect a trailing "." on the blockname.
+   * @access private
+   */
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
   {
     // Get an array of the blocks involved.
@@ -835,9 +835,9 @@ 
   }
 
   /**
-  * Write compiled file to cache directory
-  * @access private
-  */
+   * Write compiled file to cache directory
+   * @access private
+   */
   function compile_write($handle, $data)
   {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
@@ -860,9 +860,9 @@ 
 
   // Gorlum's minifier BOF
   /**
-  * Minifies template w/i PHP code by removing extra spaces
-  * @access private
-  */
+   * Minifies template w/i PHP code by removing extra spaces
+   * @access private
+   */
   function minify($html)
   {
     global $config;

classes/Core/Repository.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
    */
   protected $_repository;
 
- /**
+  /**
    * @var ContainerPlus $_oldRepo
    */
   protected $_oldRepo;

classes/phpbb_hook.php

Indentation +224 added lines, -224 removed lines

@@ -16,7 +16,7 @@ 
 */
 if (!defined('IN_PHPBB'))
 {
-	exit;
+  exit;
 }
 
 /**
@@ -24,227 +24,227 @@ 
 */
 class phpbb_hook
 {
-	/**
-	* Registered hooks
-	*/
-	var $hooks = array();
-
-	/**
-	* Results returned by functions called
-	*/
-	var $hook_result = array();
-
-	/**
-	* internal pointer
-	*/
-	var $current_hook = NULL;
-
-	/**
-	* Initialize hook class.
-	*
-	* @param array $valid_hooks array containing the hookable functions/methods
-	*/
-	function phpbb_hook($valid_hooks)
-	{
-		foreach ($valid_hooks as $_null => $method)
-		{
-			$this->add_hook($method);
-		}
-
-		if (function_exists('phpbb_hook_register'))
-		{
-			phpbb_hook_register($this);
-		}
-	}
-
-	/**
-	* Register function/method to be called within hook
-	* This function is normally called by the modification/application to attach/register the functions.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
-	* @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
-	*/
-	function register($definition, $hook, $mode = 'normal')
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		// Method able to be hooked?
-		if (isset($this->hooks[$class][$function]))
-		{
-			switch ($mode)
-			{
-				case 'standalone':
-					if (!isset($this->hooks[$class][$function]['standalone']))
-					{
-						$this->hooks[$class][$function] = array('standalone' => $hook);
-					}
-					else
-					{
-						trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
-					}
-				break;
-
-				case 'first':
-				case 'last':
-					$this->hooks[$class][$function][$mode][] = $hook;
-				break;
-
-				case 'normal':
-				default:
-					$this->hooks[$class][$function]['normal'][] = $hook;
-				break;
-			}
-		}
-	}
-
-	/**
-	* Calling all functions/methods attached to a specified hook.
-	* Called by the function allowing hooks...
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return bool False if no hook got executed, true otherwise
-	*/
-	function call_hook($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]))
-		{
-			// Developer tries to call a hooked function within the hooked function...
-			if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
-			{
-				return false;
-			}
-
-			// Call the hook with the arguments attached and store result
-			$arguments = func_get_args();
-			$this->current_hook = array('class' => $class, 'function' => $function);
-			$arguments[0] = &$this;
-
-			// Call the hook chain...
-			if (isset($this->hooks[$class][$function]['standalone']))
-			{
-				$this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
-			}
-			else
-			{
-				foreach (array('first', 'normal', 'last') as $mode)
-				{
-					if (!isset($this->hooks[$class][$function][$mode]))
-					{
-						continue;
-					}
-
-					foreach ($this->hooks[$class][$function][$mode] as $hook)
-					{
-						$this->hook_result[$class][$function] = call_user_func_array($hook, $arguments);
-					}
-				}
-			}
-
-			$this->current_hook = NULL;
-			return true;
-		}
-
-		$this->current_hook = NULL;
-		return false;
-	}
-
-	/**
-	* Get result from previously called functions/methods for the same hook
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return mixed False if nothing returned if there is no result, else array('result' => ... )
-	*/
-	function previous_hook_result($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			return array('result' => $this->hook_result[$class][$function]);
-		}
-
-		return false;
-	}
-
-	/**
-	* Check if the called functions/methods returned something.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return bool True if results are there, false if not
-	*/
-	function hook_return($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	* Give actual result from called functions/methods back.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	* @return mixed The result
-	*/
-	function hook_return_result($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
-		{
-			$result = $this->hook_result[$class][$function];
-			unset($this->hook_result[$class][$function]);
-			return $result;
-		}
-
-		return;
-	}
-
-	/**
-	* Add new function to the allowed hooks.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	*/
-	function add_hook($definition)
-	{
-		if (!is_array($definition))
-		{
-			$definition = array('__global', $definition);
-		}
-
-		$this->hooks[$definition[0]][$definition[1]] = array();
-	}
-
-	/**
-	* Remove function from the allowed hooks.
-	*
-	* @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
-	*/
-	function remove_hook($definition)
-	{
-		$class = (!is_array($definition)) ? '__global' : $definition[0];
-		$function = (!is_array($definition)) ? $definition : $definition[1];
-
-		if (isset($this->hooks[$class][$function]))
-		{
-			unset($this->hooks[$class][$function]);
-
-			if (isset($this->hook_result[$class][$function]))
-			{
-				unset($this->hook_result[$class][$function]);
-			}
-		}
-	}
+  /**
+   * Registered hooks
+   */
+  var $hooks = array();
+
+  /**
+   * Results returned by functions called
+   */
+  var $hook_result = array();
+
+  /**
+   * internal pointer
+   */
+  var $current_hook = NULL;
+
+  /**
+   * Initialize hook class.
+   *
+   * @param array $valid_hooks array containing the hookable functions/methods
+   */
+  function phpbb_hook($valid_hooks)
+  {
+    foreach ($valid_hooks as $_null => $method)
+    {
+      $this->add_hook($method);
+    }
+
+    if (function_exists('phpbb_hook_register'))
+    {
+      phpbb_hook_register($this);
+    }
+  }
+
+  /**
+   * Register function/method to be called within hook
+   * This function is normally called by the modification/application to attach/register the functions.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @param mixed $hook The replacement function/method to be called. Passing function name or array with object/class definition
+   * @param string $mode Specify the priority/chain mode. 'normal' -> hook gets appended to the chain. 'standalone' -> only the specified hook gets called - later hooks are not able to overwrite this (E_NOTICE is triggered then). 'first' -> hook is called as the first one within the chain. 'last' -> hook is called as the last one within the chain.
+   */
+  function register($definition, $hook, $mode = 'normal')
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    // Method able to be hooked?
+    if (isset($this->hooks[$class][$function]))
+    {
+      switch ($mode)
+      {
+        case 'standalone':
+          if (!isset($this->hooks[$class][$function]['standalone']))
+          {
+            $this->hooks[$class][$function] = array('standalone' => $hook);
+          }
+          else
+          {
+            trigger_error('Hook not able to be called standalone, previous hook already standalone.', E_NOTICE);
+          }
+        break;
+
+        case 'first':
+        case 'last':
+          $this->hooks[$class][$function][$mode][] = $hook;
+        break;
+
+        case 'normal':
+        default:
+          $this->hooks[$class][$function]['normal'][] = $hook;
+        break;
+      }
+    }
+  }
+
+  /**
+   * Calling all functions/methods attached to a specified hook.
+   * Called by the function allowing hooks...
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return bool False if no hook got executed, true otherwise
+   */
+  function call_hook($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]))
+    {
+      // Developer tries to call a hooked function within the hooked function...
+      if ($this->current_hook !== NULL && $this->current_hook['class'] === $class && $this->current_hook['function'] === $function)
+      {
+        return false;
+      }
+
+      // Call the hook with the arguments attached and store result
+      $arguments = func_get_args();
+      $this->current_hook = array('class' => $class, 'function' => $function);
+      $arguments[0] = &$this;
+
+      // Call the hook chain...
+      if (isset($this->hooks[$class][$function]['standalone']))
+      {
+        $this->hook_result[$class][$function] = call_user_func_array($this->hooks[$class][$function]['standalone'], $arguments);
+      }
+      else
+      {
+        foreach (array('first', 'normal', 'last') as $mode)
+        {
+          if (!isset($this->hooks[$class][$function][$mode]))
+          {
+            continue;
+          }
+
+          foreach ($this->hooks[$class][$function][$mode] as $hook)
+          {
+            $this->hook_result[$class][$function] = call_user_func_array($hook, $arguments);
+          }
+        }
+      }
+
+      $this->current_hook = NULL;
+      return true;
+    }
+
+    $this->current_hook = NULL;
+    return false;
+  }
+
+  /**
+   * Get result from previously called functions/methods for the same hook
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return mixed False if nothing returned if there is no result, else array('result' => ... )
+   */
+  function previous_hook_result($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      return array('result' => $this->hook_result[$class][$function]);
+    }
+
+    return false;
+  }
+
+  /**
+   * Check if the called functions/methods returned something.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return bool True if results are there, false if not
+   */
+  function hook_return($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Give actual result from called functions/methods back.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   * @return mixed The result
+   */
+  function hook_return_result($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (!empty($this->hooks[$class][$function]) && isset($this->hook_result[$class][$function]))
+    {
+      $result = $this->hook_result[$class][$function];
+      unset($this->hook_result[$class][$function]);
+      return $result;
+    }
+
+    return;
+  }
+
+  /**
+   * Add new function to the allowed hooks.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   */
+  function add_hook($definition)
+  {
+    if (!is_array($definition))
+    {
+      $definition = array('__global', $definition);
+    }
+
+    $this->hooks[$definition[0]][$definition[1]] = array();
+  }
+
+  /**
+   * Remove function from the allowed hooks.
+   *
+   * @param mixed $definition Declaring function (with __FUNCTION__) or class with array(__CLASS__, __FUNCTION__)
+   */
+  function remove_hook($definition)
+  {
+    $class = (!is_array($definition)) ? '__global' : $definition[0];
+    $function = (!is_array($definition)) ? $definition : $definition[1];
+
+    if (isset($this->hooks[$class][$function]))
+    {
+      unset($this->hooks[$class][$function]);
+
+      if (isset($this->hook_result[$class][$function]))
+      {
+        unset($this->hook_result[$class][$function]);
+      }
+    }
+  }
 }

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();
@@ -79,9 +79,9 @@ 
   }
 
   /**
-  * Set template location
-  * @access public
-  */
+   * Set template location
+   * @access public
+   */
   function set_template()
   {
     global $user;
@@ -120,9 +120,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 $user;
@@ -161,10 +161,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))
@@ -191,9 +191,9 @@ 
   }
 
   /**
-  * Destroy template data set
-  * @access public
-  */
+   * Destroy template data set
+   * @access public
+   */
   function destroy()
   {
     $this->_tpldata = array('.' => array(0 => array()));
@@ -201,9 +201,9 @@ 
   }
 
   /**
-  * Reset/empty complete block
-  * @access public
-  */
+   * Reset/empty complete block
+   * @access public
+   */
   function destroy_block_vars($blockname)
   {
     if (strpos($blockname, '.') !== false)
@@ -231,9 +231,9 @@ 
   }
 
   /**
-  * Display handle
-  * @access public
-  */
+   * Display handle
+   * @access public
+   */
   function display($handle, $include_once = true)
   {
     /**
@@ -275,9 +275,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();
@@ -295,9 +295,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;
@@ -475,9 +475,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)
@@ -489,9 +489,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;
@@ -500,9 +500,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)
@@ -567,33 +567,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)
@@ -677,9 +677,9 @@ 
   }
 
   /**
-  * Include a separate template
-  * @access private
-  */
+   * Include a separate template
+   * @access private
+   */
   function _tpl_include($filename, $include = true)
   {
     // This is used to access global vars
@@ -709,9 +709,9 @@ 
   }
 
   /**
-  * Include a php-file
-  * @access private
-  */
+   * Include a php-file
+   * @access private
+   */
   function _php_include($filename)
   {
     $file = $this->rootPhysical . $filename;
@@ -726,9 +726,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['.']))