supernova-ws / SuperNova

includes/vars.php

Spacing +7 added lines, -7 removed lines

@@ -582,9 +582,9 @@ 
           2 => 0.01,
         ),
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.01, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.02, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.10, P_MESSAGE_ID => 0, ],
         ],
       ),
       FLT_EXPEDITION_OUTCOME_FOUND_RESOURCES => array(
@@ -596,9 +596,9 @@ 
           2 => 0.025,
         ),
         P_MISSION_EXPEDITION_OUTCOME_SECONDARY => [
-          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2,],
-          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1,],
-          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0,],
+          [P_CHANCE => 90, P_MULTIPLIER => 0.025, P_MESSAGE_ID => 2, ],
+          [P_CHANCE => 9, P_MULTIPLIER => 0.050, P_MESSAGE_ID => 1, ],
+          [P_CHANCE => 1, P_MULTIPLIER => 0.100, P_MESSAGE_ID => 0, ],
         ],
       ),
       FLT_EXPEDITION_OUTCOME_FOUND_DM        => array(
@@ -1265,7 +1265,7 @@ 
       UNIT_PLANS        => 'plans',
     ],
 
-    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet',],
+    GROUP_CAPITAL_BUILDING_BONUS_GROUPS => ['structures', 'defense', 'fleet', ],
 
   ),
 );

includes/template.php

Spacing +4 added lines, -4 removed lines

@@ -317,7 +317,7 @@ 
     renderFooter();
   }
 
-  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false;;
+  $user['authlevel'] >= 3 && $config->debug ? $debug->echo_log() : false; ;
 
   sn_db_disconnect();
 
@@ -629,7 +629,7 @@ 
   }
 }
 
-SN::$afterInit[] = function () {
+SN::$afterInit[] = function() {
   SN::$gc->pimp->add()->tpl_render_topnav($t = 'sn_tpl_render_topnav', [], null);
 };
 
@@ -700,7 +700,7 @@ 
     'QUE_ID'   => QUE_RESEARCH,
     'QUE_HTML' => 'topnav',
 
-    'RESEARCH_ONGOING' => (boolean)$user['que'],
+    'RESEARCH_ONGOING' => (boolean) $user['que'],
 
     'TIME_TEXT'       => sprintf($str_date_format, $time_now_parsed['year'], $lang['months'][$time_now_parsed['mon']], $time_now_parsed['mday'],
       $time_now_parsed['hours'], $time_now_parsed['minutes'], $time_now_parsed['seconds']
@@ -994,7 +994,7 @@ 
     'LANG'     => $language ? $language : '',
     'referral' => $id_ref ? '&id_ref=' . $id_ref : '',
 
-    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '',// "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
+    'REQUEST_PARAMS' => !empty($url_params) ? '?' . implode('&', $url_params) : '', // "?lang={$language}" . ($id_ref ? "&id_ref={$id_ref}" : ''),
     'FILENAME'       => basename($_SERVER['PHP_SELF']),
   ));
 

classes/template_compile.php

Indentation +55 added lines, -55 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 = '')
   {
     if ($echo_var)
@@ -288,9 +288,9 @@ 
   }
 
   /**
-  * Compile variables
-  * @access private
-  */
+   * Compile variables
+   * @access private
+   */
   function compile_var_tags(&$text_blocks)
   {
     // including $lang variable
@@ -363,9 +363,9 @@ 
   }
 
   /**
-  * Compile blocks
-  * @access private
-  */
+   * Compile blocks
+   * @access private
+   */
   function compile_tag_block($tag_args)
   {
     $no_nesting = false;
@@ -451,14 +451,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;';
@@ -469,10 +469,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.
@@ -627,9 +627,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);
@@ -680,9 +680,9 @@ 
   }
 
   /**
-  * Compile INCLUDE tag
-  * @access private
-  */
+   * Compile INCLUDE tag
+   * @access private
+   */
   function compile_tag_include($tag_args)
   {
     // Process dynamic includes
@@ -695,19 +695,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;
@@ -800,14 +800,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.
@@ -843,9 +843,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;
@@ -868,9 +868,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)
   {
     if(!SN::$config->tpl_minifier)

Spacing +14 added lines, -14 removed lines

@@ -141,9 +141,9 @@ 
 
     preg_match_all('#<!-- INCLUDE (\{\$?[A-Z0-9\-_]+\}|[a-zA-Z0-9\_\-\+\./]+) -->#', $code, $matches);
     $include_blocks = $matches[1];
-    if($include_blocks)
+    if ($include_blocks)
     {
-      foreach($include_blocks as &$included_file)
+      foreach ($include_blocks as &$included_file)
       {
         $included_file .= '.tpl.html';
       }
@@ -308,7 +308,7 @@ 
       $varname = $var_val[3];
       $new = $this->generate_block_varref($namespace, $varname, $var_val[2]);
 
-      if(!empty($var_val[4])) {
+      if (!empty($var_val[4])) {
         $new = \Ptl\PtlVariableDecorator::decorate($var_val[0], $new, $this->template);
       }
 
@@ -462,8 +462,8 @@ 
 
     $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;';
-    $tag_template_php .= '$_'. $tag_args . '_val = &' . $varref . '[$_'. $tag_args. '_i];';
-    $tag_template_php .= '$this->_block_value["'. $tag_args . '"] = &' . $varref . '[$_'. $tag_args. '_i];';
+    $tag_template_php .= '$_' . $tag_args . '_val = &' . $varref . '[$_' . $tag_args . '_i];';
+    $tag_template_php .= '$this->_block_value["' . $tag_args . '"] = &' . $varref . '[$_' . $tag_args . '_i];';
 
     return $tag_template_php;
   }
@@ -567,10 +567,10 @@ 
         break;
 
         case 'is':
-          $is_arg_start = ($tokens[$i-1] == ')') ? array_pop($is_arg_stack) : $i-1;
+          $is_arg_start = ($tokens[$i - 1] == ')') ? array_pop($is_arg_stack) : $i - 1;
           $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
 
-          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+          $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
           array_splice($tokens, $is_arg_start, sizeof($tokens), $new_tokens);
 
@@ -834,11 +834,11 @@ 
     }
     else if ($include_last_iterator)
     {
-      return '$_'. $blocks[$blockcount] . '_val';
+      return '$_' . $blocks[$blockcount] . '_val';
     }
     else
     {
-      return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
+      return '$_' . $blocks[$blockcount - 1] . '_val[\'' . $blocks[$blockcount] . '\']';
     }
   }
 
@@ -855,7 +855,7 @@ 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -873,7 +873,7 @@ 
   */
   function minify($html)
   {
-    if(!SN::$config->tpl_minifier)
+    if (!SN::$config->tpl_minifier)
     {
       return $html;
     }
@@ -885,14 +885,14 @@ 
     //$html = preg_replace('/[\r\n\t]+/', ' ', $html);
     $html = preg_replace('/>[\s]*</', '><', $html); // Strip spacechars between tags
     $html = preg_replace('/[\s]+/', ' ', $html); // Replace several spacechars with one space
-    if(!empty($pre[0]))
+    if (!empty($pre[0]))
     {
-      foreach($pre[0] as $tag)
+      foreach ($pre[0] as $tag)
       {
         $tag = preg_replace('/^\ *\/\/[^\<]*?$/m', ' ', $tag); // Strips comments - except those that contains HTML comment inside
         $tag = preg_replace('/[\ \t]{2,}/', ' ', $tag); // Replace several spaces by one
         $tag = preg_replace('/\s{2,}/', "\r\n", $tag); // Replace several linefeeds by one
-        $html = preg_replace('/#pre#/', $tag, $html,1);
+        $html = preg_replace('/#pre#/', $tag, $html, 1);
       }
     }
 

Braces +33 added lines, -66 removed lines

@@ -37,8 +37,7 @@ 
 *
 * @package phpBB3
 */
-class template_compile
-{
+class template_compile {
   var $template;
 
   // Various storage arrays
@@ -58,8 +57,7 @@ 
   * Load template source from file
   * @access private
   */
-  function _tpl_load_file($handle, $store_in_db = false)
-  {
+  function _tpl_load_file($handle, $store_in_db = false) {
     // Try and open template for read
     if (!file_exists($this->template->files[$handle]))
     {
@@ -67,8 +65,7 @@ 
       {
         return;
         trigger_error("template->_tpl_load_file(): File {$this->template->files[$handle]} does not exist or is empty", E_USER_ERROR);
-      }
-      else
+      } else
       {
         $this->template->files[$handle] = $this->template->files_inherit[$handle];
       }
@@ -104,8 +101,7 @@ 
   * the ones that exist in zend_language_scanner.l
   * @access private
   */
-  function remove_php_tags(&$code)
-  {
+  function remove_php_tags(&$code) {
     // This matches the information gathered from the internal PHP lexer
     $match = array(
       '#<([\?%])=?.*?\1>#s',
@@ -120,8 +116,7 @@ 
   * 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 = '')
-  {
+  function compile($code, $no_echo = false, $echo_var = '') {
     if ($echo_var)
     {
       global $$echo_var;
@@ -224,15 +219,13 @@ 
               $var = substr($temp, 2, -1);
               //$file = $this->template->_tpldata['DEFINE']['.'][$var];
               $temp = "\$this->_tpldata['DEFINE']['.']['$var']";
-            }
-            else
+            } else
             {
               $var = substr($temp, 1, -1);
               //$file = $this->template->_rootref[$var];
               $temp = "\$this->_rootref['$var']";
             }
-          }
-          else
+          } else
           {
             $file = $temp;
           }
@@ -291,8 +284,7 @@ 
   * Compile variables
   * @access private
   */
-  function compile_var_tags(&$text_blocks)
-  {
+  function compile_var_tags(&$text_blocks) {
     // including $lang variable
     // global $lang, $config; // NOT NEDEED - $lang now is global!
 
@@ -366,8 +358,7 @@ 
   * Compile blocks
   * @access private
   */
-  function compile_tag_block($tag_args)
-  {
+  function compile_tag_block($tag_args) {
     $no_nesting = false;
 
     // Is the designer wanting to call another loop in a loop?
@@ -390,8 +381,7 @@ 
       if ($match[2] < 0)
       {
         $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
-      }
-      else
+      } else
       {
         $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
       }
@@ -399,17 +389,14 @@ 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
         $loop_end = '$_' . $tag_args . '_count';
-      }
-      else if ($match[3] >= 0)
+      } else if ($match[3] >= 0)
       {
         $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
-      }
-      else //if ($match[3] < -1)
+      } else //if ($match[3] < -1)
       {
         $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
       }
-    }
-    else
+    } else
     {
       $loop_start = 0;
       $loop_end = '$_' . $tag_args . '_count';
@@ -422,8 +409,7 @@ 
     {
       // We need to implode $no_nesting times from the end...
       $block = array_slice($this->block_names, -$no_nesting);
-    }
-    else
+    } else
     {
       $block = $this->block_names;
     }
@@ -433,8 +419,7 @@ 
       // Block is not nested.
       $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
-    }
-    else
+    } else
     {
       // This block is nested.
       // Generate a namespace string for this block.
@@ -473,8 +458,7 @@ 
   * some adaptions for our block level methods
   * @access private
   */
-  function compile_tag_if($tag_args, $elseif)
-  {
+  function compile_tag_if($tag_args, $elseif) {
     // Tokenize args for 'if' tag.
     preg_match_all('/(?:
       "[^"\\\\]*(?:\\\\.[^"\\\\]*)*"         |
@@ -582,8 +566,7 @@ 
           if (preg_match('#^((?:[a-z0-9\-_]+\.)+)?(\$)?(?=[A-Za-z])([A-Za-z0-9\-_]+)#s', $token, $varrefs))
           {
             $token = (!empty($varrefs[1])) ? $this->generate_block_data_ref(substr($varrefs[1], 0, -1), true, $varrefs[2]) . '[\'' . $varrefs[3] . '\']' : (($varrefs[2]) ? '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $varrefs[3] . '\']' : '$this->_rootref[\'' . $varrefs[3] . '\']');
-          }
-          else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
+          } else if (preg_match('#^\.((?:[a-z0-9\-_]+\.?)+)$#s', $token, $varrefs))
           {
             // Allow checking if loops are set with .loopname
             // It is also possible to check the loop count by doing <!-- IF .loopname > 1 --> for example
@@ -599,8 +582,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -608,8 +590,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -630,8 +611,7 @@ 
   * Compile DEFINE tags
   * @access private
   */
-  function compile_tag_define($tag_args, $op)
-  {
+  function compile_tag_define($tag_args, $op) {
     preg_match('#^((?:[a-z0-9\-_]+\.)+)?\$(?=[A-Z])([A-Z0-9_\-]*)(?: = (\'?)([^\']*)(\'?))?$#', $tag_args, $match);
 
     if (empty($match[2]) || (!isset($match[4]) && $op))
@@ -654,8 +634,7 @@ 
 
       // Now replace the php code
       $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
-    }
-    else
+    } else
     {
       preg_match('#true|false|\.#i', $match[4], $type);
 
@@ -683,8 +662,7 @@ 
   * Compile INCLUDE tag
   * @access private
   */
-  function compile_tag_include($tag_args)
-  {
+  function compile_tag_include($tag_args) {
     // Process dynamic includes
     if ($tag_args[0] == '$')
     {
@@ -698,8 +676,7 @@ 
   * Compile INCLUDE_PHP tag
   * @access private
   */
-  function compile_tag_include_php($tag_args)
-  {
+  function compile_tag_include_php($tag_args) {
     return "\$this->_php_include('$tag_args');";
   }
 
@@ -708,8 +685,7 @@ 
   * This is from Smarty
   * @access private
   */
-  function _parse_is_expr($is_arg, $tokens)
-  {
+  function _parse_is_expr($is_arg, $tokens) {
     $expr_end = 0;
     $negate_expr = false;
 
@@ -717,8 +693,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -731,8 +706,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -744,8 +718,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -784,8 +757,7 @@ 
    *
    * @return string
    */
-  private function generate_block_varref($namespace, $varname, $defop = false)
-  {
+  private function generate_block_varref($namespace, $varname, $defop = false) {
     // Strip the trailing period.
     $namespace = substr($namespace, 0, -1);
 
@@ -808,8 +780,7 @@ 
   * NOTE: does not expect a trailing "." on the blockname.
   * @access private
   */
-  function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
-  {
+  function generate_block_data_ref($blockname, $include_last_iterator, $defop = false) {
     // Get an array of the blocks involved.
     $blocks = explode('.', $blockname);
     $blockcount = sizeof($blocks) - 1;
@@ -831,12 +802,10 @@ 
         $varref .= '[$_' . $blocks[$blockcount] . '_i]';
       }
       return $varref;
-    }
-    else if ($include_last_iterator)
+    } else if ($include_last_iterator)
     {
       return '$_'. $blocks[$blockcount] . '_val';
-    }
-    else
+    } else
     {
       return '$_'. $blocks[$blockcount - 1] . '_val[\''. $blocks[$blockcount]. '\']';
     }
@@ -846,8 +815,7 @@ 
   * Write compiled file to cache directory
   * @access private
   */
-  function compile_write($handle, $data)
-  {
+  function compile_write($handle, $data) {
     $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
 
     $data = "<?php if (!defined('INSIDE')) exit;" . ((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>' . $data);
@@ -871,8 +839,7 @@ 
   * Minifies template w/i PHP code by removing extra spaces
   * @access private
   */
-  function minify($html)
-  {
+  function minify($html) {
     if(!SN::$config->tpl_minifier)
     {
       return $html;

classes/template.php

Braces +29 added lines, -58 removed lines

@@ -22,8 +22,7 @@ 
 * Base Template class.
 * @package phpBB3
 */
-class template
-{
+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
@@ -82,8 +81,7 @@ 
   * Set template location
   * @access public
   */
-  function set_template()
-  {
+  function set_template() {
     global $user;
 
     if (file_exists($this->rootPhysical. 'styles/' . $user->theme['template_path'] . '/template'))
@@ -108,8 +106,7 @@ 
       {
         $this->inherit_root = $this->rootPhysical . 'styles/' . $user->theme['template_inherit_path'] . '/template';
       }
-    }
-    else
+    } else
     {
       trigger_error('Template path could not be found: styles/' . $user->theme['template_path'] . '/template', E_USER_ERROR);
     }
@@ -123,8 +120,7 @@ 
   * 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)
-  {
+  function set_custom_template($template_path, $template_name, $fallback_template_path = false) {
     global $user;
 
     // Make sure $template_path has no ending slash
@@ -145,8 +141,7 @@ 
 
       $this->inherit_root = $fallback_template_path;
       $this->orig_tpl_inherits_id = true;
-    }
-    else
+    } else
     {
       $this->orig_tpl_inherits_id = false;
     }
@@ -165,8 +160,7 @@ 
   * should be a hash of handle => filename pairs.
   * @access public
   */
-  function set_filenames($filename_array)
-  {
+  function set_filenames($filename_array) {
     if (!is_array($filename_array))
     {
       return false;
@@ -194,8 +188,7 @@ 
   * Destroy template data set
   * @access public
   */
-  function destroy()
-  {
+  function destroy() {
     $this->_tpldata = array('.' => array(0 => array()));
     $this->_rootref = &$this->_tpldata['.'][0];
   }
@@ -204,8 +197,7 @@ 
   * Reset/empty complete block
   * @access public
   */
-  function destroy_block_vars($blockname)
-  {
+  function destroy_block_vars($blockname) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -220,8 +212,7 @@ 
       }
 
       unset($str[$blocks[$blockcount]]);
-    }
-    else
+    } else
     {
       // Top-level block.
       unset($this->_tpldata[$blockname]);
@@ -234,8 +225,7 @@ 
   * Display handle
   * @access public
   */
-  function display($handle, $include_once = true)
-  {
+  function display($handle, $include_once = true) {
     if (defined('IN_ERROR_HANDLER'))
     {
       $is_enotice = error_reporting();
@@ -248,8 +238,7 @@ 
     if ($filename = $this->_tpl_load($handle))
     {
       ($include_once) ? include_once($filename) : include($filename);
-    }
-    else
+    } else
     {
       $this->evaluate($this->compiled_code[$handle]);
     }
@@ -261,8 +250,7 @@ 
   * 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)
-  {
+  function assign_display($handle, $template_var = '', $return_content = true, $include_once = false) {
     ob_start();
     $this->display($handle, $include_once);
     $contents = ob_get_clean();
@@ -281,8 +269,7 @@ 
   * Load a compiled template if possible, if not, recompile it
   * @access private
   */
-  function _tpl_load(&$handle)
-  {
+  function _tpl_load(&$handle) {
     global $user, $config;
 
     if (!isset($this->filename[$handle]))
@@ -303,8 +290,7 @@ 
     if (!file_exists($filename) || @filesize($filename) === 0)
     {
       $recompile = true;
-    }
-    else if ($config->load_tplcompile)
+    } else if ($config->load_tplcompile)
     {
       // No way around it: we need to check inheritance here
       if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle]))
@@ -387,15 +373,13 @@ 
               $this->files[$row['template_filename']] = $file;
               $this->files_inherit[$row['template_filename']] = $file;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
-            }
-            else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
+            } else if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id'])
             {
               // Ok, we have a situation. There is a file in the subtemplate, but nothing in the DB. We have to fix that.
               $force_reload = true;
               $this->files_template[$row['template_filename']] = $user->theme['template_inherits_id'];
             }
-          }
-          else
+          } else
           {
             $this->files_template[$row['template_filename']] = $user->theme['template_id'];
           }
@@ -405,8 +389,7 @@ 
             if ($row['template_filename'] == $this->filename[$handle])
             {
               $compile->_tpl_load_file($handle, true);
-            }
-            else
+            } else
             {
               $this->files[$row['template_filename']] = $file;
               $this->filename[$row['template_filename']] = $row['template_filename'];
@@ -421,8 +404,7 @@ 
           {
             $this->compiled_code[$handle] = $compile->compile(trim($row['template_data']));
             $compile->compile_write($handle, $this->compiled_code[$handle]);
-          }
-          else
+          } else
           {
             // Only bother compiling if it doesn't already exist
             if (!file_exists($this->cachepath . str_replace('/', '.', $row['template_filename']) . DOT_PHP_EX))
@@ -433,8 +415,7 @@ 
             }
           }
         }
-      }
-      else
+      } else
       {
         $file = $this->root . '/' . $row['template_filename'];
 
@@ -461,8 +442,7 @@ 
   * Assign key variable pairs from an array
   * @access public
   */
-  function assign_vars($vararray)
-  {
+  function assign_vars($vararray) {
     foreach ($vararray as $key => $val)
     {
       $this->_rootref[$key] = $val;
@@ -475,8 +455,7 @@ 
   * Assign a single variable to a single key
   * @access public
   */
-  function assign_var($varname, $varval)
-  {
+  function assign_var($varname, $varval) {
     $this->_rootref[$varname] = $varval;
 
     return true;
@@ -486,8 +465,7 @@ 
   * Assign key variable pairs from an array to a specified block
   * @access public
   */
-  function assign_block_vars($blockname, $vararray)
-  {
+  function assign_block_vars($blockname, $vararray) {
     if (strpos($blockname, '.') !== false)
     {
       // Nested block.
@@ -522,8 +500,7 @@ 
       // We're adding a new iteration to this block with the given
       // variable assignments.
       $str[$blocks[$blockcount]][] = $vararray;
-    }
-    else
+    } else
     {
       // Top-level block.
       $s_row_count = (isset($this->_tpldata[$blockname])) ? sizeof($this->_tpldata[$blockname]) : 0;
@@ -577,8 +554,7 @@ 
   * @return bool false on error, true on success
   * @access public
   */
-  function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert')
-  {
+  function alter_block_array($blockname, $vararray, $key = false, $mode = 'insert') {
     if (strpos($blockname, '.') !== false)
     {
       // Nested blocks are not supported
@@ -623,8 +599,7 @@ 
         $key = sizeof($this->_tpldata[$blockname]);
         unset($this->_tpldata[$blockname][($key - 1)]['S_LAST_ROW']);
         $vararray['S_LAST_ROW'] = true;
-      }
-      else if ($key === 0)
+      } else if ($key === 0)
       {
         unset($this->_tpldata[$blockname][0]['S_FIRST_ROW']);
         $vararray['S_FIRST_ROW'] = true;
@@ -663,8 +638,7 @@ 
   * Include a separate template
   * @access private
   */
-  function _tpl_include($filename, $include = true)
-  {
+  function _tpl_include($filename, $include = true) {
     // This is used to access global vars
     // global $lang, $config, $user; // Not needed!
 
@@ -694,8 +668,7 @@ 
   * Include a php-file
   * @access private
   */
-  function _php_include($filename)
-  {
+  function _php_include($filename) {
     $file = $this->rootPhysical . $filename;
 
     if (!file_exists($file))
@@ -711,8 +684,7 @@ 
   * Assign key variable pairs from an array with block support
   * @access public
   */
-  function assign_recursive($values, $name = '')
-  {
+  function assign_recursive($values, $name = '') {
     if(isset($values['.']))
     {
       $values_extra = $values['.'];
@@ -722,8 +694,7 @@ 
     if(!$name)
     {
       $this->assign_vars($values);
-    }
-    else
+    } else
     {
       $this->assign_block_vars($name, $values);
     }

classes/Pages/Deprecated/PageAdminMining.php

Spacing +3 added lines, -3 removed lines

@@ -29,19 +29,19 @@
         'ID'        => self::PAGE_SORT_BY_RANK,
         'HTML_ID'   => 'byTotalRank',
         'HTML_NAME' => '{ byTotalRank }',
-        'SQL_SORT'  => ['u.total_rank',],
+        'SQL_SORT'  => ['u.total_rank', ],
       ],
       self::PAGE_SORT_BY_ID => [
         'ID'        => self::PAGE_SORT_BY_ID,
         'HTML_ID'   => 'byId',
         'HTML_NAME' => '{ byId }',
-        'SQL_SORT'  => ['u.id',],
+        'SQL_SORT'  => ['u.id', ],
       ],
       self::PAGE_SORT_BY_NAME => [
         'ID'        => self::PAGE_SORT_BY_NAME,
         'HTML_ID'   => 'byName',
         'HTML_NAME' => '{ byName }',
-        'SQL_SORT'  => ['u.username',],
+        'SQL_SORT'  => ['u.username', ],
       ],
 
       self::PAGE_SORT_BY_POINTS => [

classes/Pages/Deprecated/PageAdminModules.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
   const SORT_BY_ACTIVITY = 1;
 
   private static $sorting = [
-    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED',],
-    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME',],
+    self::SORT_BY_PACKAGE  => ['PACKAGE', 'NAME', '!ACTIVE', '!INSTALLED', ],
+    self::SORT_BY_ACTIVITY => ['!ACTIVE', '!INSTALLED', 'PACKAGE', 'NAME', ],
   ];
 
   private static $sortFields = [];