supernova-ws / SuperNova

includes/classes/template_compile.php

Doc Comments +8 added lines

@@ -47,6 +47,7 @@ 
 
   /**
   * constuctor
+  * @param template $template
   */
   function template_compile(&$template)
   {
@@ -463,6 +464,7 @@ 
   * Compile IF tags - much of this is from Smarty with
   * some adaptions for our block level methods
   * @access private
+  * @param boolean $elseif
   */
   function compile_tag_if($tag_args, $elseif)
   {
@@ -620,6 +622,7 @@ 
   /**
   * Compile DEFINE tags
   * @access private
+  * @param boolean $op
   */
   function compile_tag_define($tag_args, $op)
   {
@@ -698,6 +701,7 @@ 
   * parse expression
   * This is from Smarty
   * @access private
+  * @param string $is_arg
   */
   function _parse_is_expr($is_arg, $tokens)
   {
@@ -794,6 +798,8 @@ 
   * 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
+  * @param string $blockname
+  * @param boolean $include_last_iterator
   */
   function generate_block_data_ref($blockname, $include_last_iterator, $defop = false)
   {
@@ -832,6 +838,7 @@ 
   /**
   * Write compiled file to cache directory
   * @access private
+  * @param string $data
   */
   function compile_write($handle, $data)
   {
@@ -857,6 +864,7 @@ 
   /**
   * Minifies template w/i PHP code by removing extra spaces
   * @access private
+  * @return string
   */
   function minify($html)
   {

Indentation +63 added lines, -63 removed lines

@@ -44,17 +44,17 @@ 
   var $block_else_level = array();
 
   /**
-  * constuctor
-  */
+   * constuctor
+   */
   function template_compile(&$template)
   {
     $this->template = &$template;
   }
 
   /**
-  * 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
@@ -97,10 +97,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
@@ -114,9 +114,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)
@@ -285,9 +285,9 @@ 
   }
 
   /**
-  * Compile variables
-  * @access private
-  */
+   * Compile variables
+   * @access private
+   */
   function compile_var_tags(&$text_blocks)
   {
     // change template varrefs into PHP varrefs
@@ -347,9 +347,9 @@ 
   }
 
   /**
-  * Compile blocks
-  * @access private
-  */
+   * Compile blocks
+   * @access private
+   */
   function compile_tag_block($tag_args)
   {
     $no_nesting = false;
@@ -435,14 +435,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;';
@@ -453,10 +453,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.
@@ -611,9 +611,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);
@@ -664,9 +664,9 @@ 
   }
 
   /**
-  * Compile INCLUDE tag
-  * @access private
-  */
+   * Compile INCLUDE tag
+   * @access private
+   */
   function compile_tag_include($tag_args)
   {
     // Process dynamic includes
@@ -679,19 +679,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;
@@ -756,13 +756,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.
@@ -780,14 +780,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.
@@ -823,9 +823,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;
@@ -848,8 +848,8 @@ 
 
   // Gorlum's minifier BOF
   /**
-  * Minifies template w/i PHP code by removing extra spaces
-  */
+   * Minifies template w/i PHP code by removing extra spaces
+   */
   private function minify($html)
   {
     if(!classSupernova::$config->tpl_minifier)

Spacing +48 added lines, -48 removed lines

@@ -91,7 +91,7 @@ 
         'template_data'     => trim(@file_get_contents($this->template->files[$handle])),
       );
 
-      $sql = 'INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+      $sql = 'INSERT INTO '.STYLES_TEMPLATE_DATA_TABLE.' '.$db->sql_build_array('INSERT', $sql_ary);
       $db->sql_query($sql);
     }
   }
@@ -138,9 +138,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';
       }
@@ -169,7 +169,7 @@ 
       {
         case 'BEGIN':
           $this->block_else_level[] = false;
-          $compile_blocks[] = '<?php ' . $this->compile_tag_block($block_val[2]) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_block($block_val[2]).' ?>';
         break;
 
         case 'BEGINELSE':
@@ -179,11 +179,11 @@ 
 
         case 'END':
           array_pop($this->block_names);
-          $compile_blocks[] = '<?php ' . ((array_pop($this->block_else_level)) ? '}' : '}}') . ' ?>';
+          $compile_blocks[] = '<?php '.((array_pop($this->block_else_level)) ? '}' : '}}').' ?>';
         break;
 
         case 'IF':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_if($block_val[2], false) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_if($block_val[2], false).' ?>';
         break;
 
         case 'ELSE':
@@ -191,7 +191,7 @@ 
         break;
 
         case 'ELSEIF':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_if($block_val[2], true) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_if($block_val[2], true).' ?>';
         break;
 
         case 'ENDIF':
@@ -199,11 +199,11 @@ 
         break;
 
         case 'DEFINE':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], true) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_define($block_val[2], true).' ?>';
         break;
 
         case 'UNDEFINE':
-          $compile_blocks[] = '<?php ' . $this->compile_tag_define($block_val[2], false) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_define($block_val[2], false).' ?>';
         break;
 
         case 'INCLUDE':
@@ -234,7 +234,7 @@ 
             $file = $temp;
           }
 
-          $compile_blocks[] = '<?php ' . $this->compile_tag_include($temp) . ' ?>';
+          $compile_blocks[] = '<?php '.$this->compile_tag_include($temp).' ?>';
 
           // No point in checking variable includes
           if ($file)
@@ -244,11 +244,11 @@ 
         break;
 
         case 'INCLUDEPHP':
-          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php ' . $this->compile_tag_include_php(array_shift($includephp_blocks)) . ' ?>' : '';
+          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php '.$this->compile_tag_include_php(array_shift($includephp_blocks)).' ?>' : '';
         break;
 
         case 'PHP':
-          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php ' . array_shift($php_blocks) . ' ?>' : '';
+          $compile_blocks[] = (classSupernova::$config->tpl_allow_php) ? '<?php '.array_shift($php_blocks).' ?>' : '';
         break;
 
         default:
@@ -263,7 +263,7 @@ 
     for ($i = 0, $size = sizeof($text_blocks); $i < $size; $i++)
     {
       $trim_check_text = trim($text_blocks[$i]);
-      $template_php .= (!$no_echo) ? (($trim_check_text != '') ? $text_blocks[$i] : '') . ((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '') : (($trim_check_text != '') ? $text_blocks[$i] : '') . ((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '');
+      $template_php .= (!$no_echo) ? (($trim_check_text != '') ? $text_blocks[$i] : '').((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '') : (($trim_check_text != '') ? $text_blocks[$i] : '').((isset($compile_blocks[$i])) ? $compile_blocks[$i] : '');
     }
 
     // Remove unused opening/closing tags
@@ -278,7 +278,7 @@ 
     // we'll strip out such occurences, minimising such switching
     if ($no_echo)
     {
-      return "\$$echo_var .= '" . $template_php . "'";
+      return "\$$echo_var .= '".$template_php."'";
     }
 
     return $template_php;
@@ -373,30 +373,30 @@ 
 
       if ($match[2] < 0)
       {
-        $loop_start = '($_' . $tag_args . '_count ' . $match[2] . ' < 0 ? 0 : $_' . $tag_args . '_count ' . $match[2] . ')';
+        $loop_start = '($_'.$tag_args.'_count '.$match[2].' < 0 ? 0 : $_'.$tag_args.'_count '.$match[2].')';
       }
       else
       {
-        $loop_start = '($_' . $tag_args . '_count < ' . $match[2] . ' ? $_' . $tag_args . '_count : ' . $match[2] . ')';
+        $loop_start = '($_'.$tag_args.'_count < '.$match[2].' ? $_'.$tag_args.'_count : '.$match[2].')';
       }
 
       if (strlen($match[3]) < 1 || $match[3] == -1)
       {
-        $loop_end = '$_' . $tag_args . '_count';
+        $loop_end = '$_'.$tag_args.'_count';
       }
       else if ($match[3] >= 0)
       {
-        $loop_end = '(' . ($match[3] + 1) . ' > $_' . $tag_args . '_count ? $_' . $tag_args . '_count : ' . ($match[3] + 1) . ')';
+        $loop_end = '('.($match[3] + 1).' > $_'.$tag_args.'_count ? $_'.$tag_args.'_count : '.($match[3] + 1).')';
       }
       else //if ($match[3] < -1)
       {
-        $loop_end = '$_' . $tag_args . '_count' . ($match[3] + 1);
+        $loop_end = '$_'.$tag_args.'_count'.($match[3] + 1);
       }
     }
     else
     {
       $loop_start = 0;
-      $loop_end = '$_' . $tag_args . '_count';
+      $loop_end = '$_'.$tag_args.'_count';
     }
 
     $tag_template_php = '';
@@ -415,7 +415,7 @@ 
     if (sizeof($block) < 2)
     {
       // Block is not nested.
-      $tag_template_php = '$_' . $tag_args . "_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
+      $tag_template_php = '$_'.$tag_args."_count = (isset(\$this->_tpldata['$tag_args'])) ? sizeof(\$this->_tpldata['$tag_args']) : 0;";
       $varref = "\$this->_tpldata['$tag_args']";
     }
     else
@@ -429,10 +429,10 @@ 
       $varref = $this->generate_block_data_ref($namespace, false);
 
       // Create the for loop code to iterate over this block.
-      $tag_template_php = '$_' . $tag_args . '_count = (isset(' . $varref . ')) ? sizeof(' . $varref . ') : 0;';
+      $tag_template_php = '$_'.$tag_args.'_count = (isset('.$varref.')) ? sizeof('.$varref.') : 0;';
     }
 
-    $tag_template_php .= 'if ($_' . $tag_args . '_count) {';
+    $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
@@ -444,10 +444,10 @@ 
     * </code>
     */
 
-    $tag_template_php .= 'for ($_' . $tag_args . '_i = ' . $loop_start . '; $_' . $tag_args . '_i < ' . $loop_end . '; ++$_' . $tag_args . '_i){';
+    $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;
   }
@@ -551,10 +551,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);
 
@@ -565,7 +565,7 @@ 
         default:
           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] . '\']');
+            $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))
           {
@@ -582,20 +582,20 @@ 
               $varref = $this->generate_block_data_ref($namespace, true);
 
               // Add the block reference for the last child.
-              $varref .= "['" . $block . "']";
+              $varref .= "['".$block."']";
             }
             else
             {
               $varref = '$this->_tpldata';
 
               // Add the block reference for the last child.
-              $varref .= "['" . $blocks[0] . "']";
+              $varref .= "['".$blocks[0]."']";
             }
             $token = "sizeof($varref)";
           }
           else if (!empty($token))
           {
-            $token = '(' . $token . ')';
+            $token = '('.$token.')';
           }
 
         break;
@@ -607,7 +607,7 @@ 
     {
       $tokens = array('false');
     }
-    return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $tokens) . ') { ');
+    return (($elseif) ? '} else if (' : 'if (').(implode(' ', $tokens).') { ');
   }
 
   /**
@@ -625,7 +625,7 @@ 
 
     if (!$op)
     {
-      return 'unset(' . (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ');';
+      return 'unset('.(($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true).'[\''.$match[2].'\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\''.$match[2].'\']').');';
     }
 
     // Are we a string?
@@ -637,7 +637,7 @@ 
       $match[4] = $this->compile($match[4]);
 
       // Now replace the php code
-      $match[4] = "'" . str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4]) . "'";
+      $match[4] = "'".str_replace(array('<?php echo ', '; ?>'), array("' . ", " . '"), $match[4])."'";
     }
     else
     {
@@ -660,7 +660,7 @@ 
       }
     }
 
-    return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true) . '[\'' . $match[2] . '\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\'' . $match[2] . '\']') . ' = ' . $match[4] . ';';
+    return (($match[1]) ? $this->generate_block_data_ref(substr($match[1], 0, -1), true, true).'[\''.$match[2].'\']' : '$this->_tpldata[\'DEFINE\'][\'.\'][\''.$match[2].'\']').' = '.$match[4].';';
   }
 
   /**
@@ -801,24 +801,24 @@ 
       // Build up the string with everything but the last child.
       for ($i = 0; $i < $blockcount; $i++)
       {
-        $varref .= "['" . $blocks[$i] . "'][\$_" . $blocks[$i] . '_i]';
+        $varref .= "['".$blocks[$i]."'][\$_".$blocks[$i].'_i]';
       }
       // Add the block reference for the last child.
-      $varref .= "['" . $blocks[$blockcount] . "']";
+      $varref .= "['".$blocks[$blockcount]."']";
       // Add the iterator for the last child if requried.
       if ($include_last_iterator)
       {
-        $varref .= '[$_' . $blocks[$blockcount] . '_i]';
+        $varref .= '[$_'.$blocks[$blockcount].'_i]';
       }
       return $varref;
     }
     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].'\']';
     }
   }
 
@@ -828,14 +828,14 @@ 
   */
   function compile_write($handle, $data)
   {
-    $filename = $this->template->cachepath . str_replace('/', '.', $this->template->filename[$handle]) . DOT_PHP_EX;
+    $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);
+    $data = "<?php if (!defined('INSIDE')) exit;".((strpos($data, '<?php') === 0) ? substr($data, 5) : ' ?>'.$data);
 
     if ($fp = @fopen($filename, 'wb'))
     {
       @flock($fp, LOCK_EX);
-      @fwrite ($fp, $data);
+      @fwrite($fp, $data);
       @flock($fp, LOCK_UN);
       @fclose($fp);
 
@@ -852,7 +852,7 @@ 
   */
   private function minify($html)
   {
-    if(!classSupernova::$config->tpl_minifier)
+    if (!classSupernova::$config->tpl_minifier)
     {
       return $html;
     }
@@ -862,14 +862,14 @@ 
     $html = preg_replace('/(<script[^>]*?>.*?<\/script>)/si', '#pre#', $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 +18 added lines, -36 removed lines

@@ -66,8 +66,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];
       }
@@ -225,15 +224,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;
           }
@@ -381,8 +378,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] . ')';
       }
@@ -390,17 +386,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';
@@ -413,8 +406,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;
     }
@@ -424,8 +416,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.
@@ -573,8 +564,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
@@ -590,8 +580,7 @@ 
 
               // Add the block reference for the last child.
               $varref .= "['" . $block . "']";
-            }
-            else
+            } else
             {
               $varref = '$this->_tpldata';
 
@@ -599,8 +588,7 @@ 
               $varref .= "['" . $blocks[0] . "']";
             }
             $token = "sizeof($varref)";
-          }
-          else if (!empty($token))
+          } else if (!empty($token))
           {
             $token = '(' . $token . ')';
           }
@@ -645,8 +633,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);
 
@@ -708,8 +695,7 @@ 
     {
       $negate_expr = true;
       $expr_type = array_shift($tokens);
-    }
-    else
+    } else
     {
       $expr_type = $first_token;
     }
@@ -722,8 +708,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "!(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "!($is_arg & 1)";
         }
@@ -735,8 +720,7 @@ 
           $expr_end++;
           $expr_arg = $tokens[$expr_end++];
           $expr = "(($is_arg / $expr_arg) % $expr_arg)";
-        }
-        else
+        } else
         {
           $expr = "($is_arg & 1)";
         }
@@ -818,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]. '\']';
     }

includes/classes/userOptions.php

Doc Comments +3 added lines

@@ -151,6 +151,9 @@
   }
 
 
+  /**
+   * @param integer $user_id
+   */
   public function __construct($user_id) {
     $this->user_change($user_id);
   }

Spacing +37 added lines, -37 removed lines

@@ -122,30 +122,30 @@ 
 
     $update_cache = false;
 
-    if(!empty($this->to_write)) {
-      foreach($this->to_write as $key => $cork) {
+    if (!empty($this->to_write)) {
+      foreach ($this->to_write as $key => $cork) {
         $value = is_array($this->data[$key]) ? serialize($this->data[$key]) : $this->data[$key]; // Сериализация для массивов при сохранении в БД
-        $this->to_write[$key] = "({$this->user_id}, '" . db_escape($key) . "', '" . db_escape($value) . "')";
+        $this->to_write[$key] = "({$this->user_id}, '".db_escape($key)."', '".db_escape($value)."')";
       }
 
-      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES " . implode(',', $this->to_write));
+      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES ".implode(',', $this->to_write));
 
       $this->to_write = array();
       $update_cache = true;
     }
 
-    if(!empty($this->to_delete)) {
-      foreach($this->to_delete as $key => &$value) {
-        $value = is_string($key) ? "'". db_escape($key) . "'" : $key;
+    if (!empty($this->to_delete)) {
+      foreach ($this->to_delete as $key => &$value) {
+        $value = is_string($key) ? "'".db_escape($key)."'" : $key;
       }
 
-      classSupernova::$db->doDelete("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (". implode(',', $this->to_delete) . ") ");
+      classSupernova::$db->doDelete("DELETE FROM {{player_options}} WHERE `player_id` = {$this->user_id} AND `option_id` IN (".implode(',', $this->to_delete).") ");
 
       $this->to_delete = array();
       $update_cache = true;
     }
 
-    if($update_cache) {
+    if ($update_cache) {
       $field_name = $this->cached_name();
       classSupernova::$cache->$field_name = $this->data;
     }
@@ -164,11 +164,11 @@ 
     $this->load();
   }
   protected function cached_name() {
-    return 'options_' . $this->user_id;
+    return 'options_'.$this->user_id;
   }
 
   protected function load() {
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
@@ -176,7 +176,7 @@ 
     $this->to_write = array();
     $this->to_delete = array();
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       $this->loaded = true;
       return;
     }
@@ -184,13 +184,13 @@ 
     $field_name = $this->cached_name();
     $a_data = classSupernova::$cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace_recursive($this->data, $a_data);
       return;
     }
 
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -267,7 +267,7 @@ 
   }
 
   protected function cached_name() {
-    return 'options_' . $this->user_id;
+    return 'options_'.$this->user_id;
   }
 
   // TODO - serialize/unserialize options
@@ -275,14 +275,14 @@ 
     // Если в массиве индекса только один элемент - значит это просто индекс
     is_array($option_id) && count($option_id) == 1 ? $option_id = reset($option_id) : false;
 
-    if(!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
+    if (!isset($this->data[is_array($option_id) ? reset($option_id) : $option_id])) {
       $this->load();
     }
 
-    if(is_array($option_id)) {
+    if (is_array($option_id)) {
       $result = $this->data;
-      foreach($option_id as $sub_key) {
-        if(!isset($result) || !isset($result[$sub_key])) {
+      foreach ($option_id as $sub_key) {
+        if (!isset($result) || !isset($result[$sub_key])) {
           $result = null;
           break;
         }
@@ -300,12 +300,12 @@ 
    * @param null|mixed $value
    */
   public function __set($option, $value = null) {
-    if(empty($option) || !$this->user_id) {
+    if (empty($option) || !$this->user_id) {
       return;
     }
 
     // Если в массиве индекса только один элемент - значит это просто индекс
-    if(is_array($option) && count($option) == 1) {
+    if (is_array($option) && count($option) == 1) {
       // Разворачиваем его в индекс
       $option = array(reset($option) => $value);
       unset($value);
@@ -314,13 +314,13 @@ 
 
     $to_write = array();
     // Адресация многомерного массива через массив индексов в $option
-    if(is_array($option) && isset($value)) {
+    if (is_array($option) && isset($value)) {
       $a_data = &$this->data;
-      foreach($option as $option_id) {
+      foreach ($option as $option_id) {
         !is_array($a_data[$option_id]) ? $a_data[$option_id] = array() : false;
         $a_data = &$a_data[$option_id];
       }
-      if($a_data != $value) {
+      if ($a_data != $value) {
         $a_data = $value;
         $to_write[reset($option)] = null;
       }
@@ -328,11 +328,11 @@ 
       // Пакетная запись из массива ключ -> значение
       !is_array($option) ? $option = array($option => $value) : false;
 
-      foreach($option as $option_id => $option_value) {
-        if($this->data[$option_id] !== $option_value) {
+      foreach ($option as $option_id => $option_value) {
+        if ($this->data[$option_id] !== $option_value) {
           // TODO - вынести отдельно в обработчик
-          if($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON &&  $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
-            sn_setcookie(SN_COOKIE . '_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
+          if ($option_id == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON && $option_value == PLAYER_OPTION_MENU_HIDE_SHOW_BUTTON_HIDDEN) {
+            sn_setcookie(SN_COOKIE.'_menu_hidden', '0', time() - PERIOD_WEEK, SN_ROOT_RELATIVE);
           }
 
           $this->data[$option_id] = $option_value;
@@ -341,40 +341,40 @@ 
       }
     }
 
-    if(!empty($to_write)) {
+    if (!empty($to_write)) {
       $field_name = $this->cached_name();
       classSupernova::$cache->$field_name = $this->data;
 
-      foreach($to_write as $option_id => &$option_value) {
+      foreach ($to_write as $option_id => &$option_value) {
         $option_value = is_array($this->data[$option_id]) ? serialize($this->data[$option_id]) : $this->data[$option_id]; // Сериализация для массивов при сохранении в БД
-        $to_write[$option_id] = "({$this->user_id}, '" . db_escape($option_id) . "', '" . db_escape($option_value) . "')";
+        $to_write[$option_id] = "({$this->user_id}, '".db_escape($option_id)."', '".db_escape($option_value)."')";
       }
 
-      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES " . implode(',', $to_write));
+      classSupernova::$db->doReplace("REPLACE INTO `{{player_options}}` (`player_id`, `option_id`, `value`) VALUES ".implode(',', $to_write));
     }
   }
 
   protected function load() {
-    if($this->loaded) {
+    if ($this->loaded) {
       return;
     }
 
     $this->data = $this->defaults;
 
-    if(!$this->user_id) {
+    if (!$this->user_id) {
       return;
     }
 
     $field_name = $this->cached_name();
     $a_data = classSupernova::$cache->$field_name;
 
-    if(!empty($a_data)) {
+    if (!empty($a_data)) {
       $this->data = array_replace($this->data, $a_data);
       return;
     }
 
     $query = classSupernova::$db->doSelect("SELECT * FROM `{{player_options}}` WHERE `player_id` = {$this->user_id} FOR UPDATE");
-    while($row = db_fetch($query)) {
+    while ($row = db_fetch($query)) {
       // $this->data[$row['option_id']] = $row['value'];
       $this->data[$row['option_id']] = is_string($row['value']) && ($temp = unserialize($row['value'])) !== false ? $temp : $row['value']; // Десериализация
     }
@@ -390,7 +390,7 @@ 
     return $this->__get($offset);
   }
   public function offsetSet($offset, $value) {
-    if(!is_null($offset)) {
+    if (!is_null($offset)) {
       // $this->data[$offset] = $value;
       $this->__set($offset, $value);
     } else {

includes/classes/oldArrayAccessNd.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/classConfig.php

Spacing +16 added lines, -16 removed lines

@@ -190,9 +190,9 @@ 
     'advGoogleLeftMenuCode'        => '(Place here code for banner)',
 
     // Alliance bonus calculations
-    'ali_bonus_algorithm'          => 0,  // Bonus calculation algorithm
+    'ali_bonus_algorithm'          => 0, // Bonus calculation algorithm
     'ali_bonus_brackets'           => 10, // Brackets count for ALI_BONUS_BY_RANK
-    'ali_bonus_brackets_divisor'   => 10,// Bonus divisor for ALI_BONUS_BY_RANK
+    'ali_bonus_brackets_divisor'   => 10, // Bonus divisor for ALI_BONUS_BY_RANK
     'ali_bonus_divisor'            => 10000000, // Rank divisor for ALI_BONUS_BY_POINTS
     'ali_bonus_members'            => 10, // Minumum alliace size to start using bonus
 
@@ -223,25 +223,25 @@ 
     'deuterium_basic_income'       => 0,
     'eco_scale_storage'            => 1,
     'eco_stockman_fleet'           => '', // Black Market - Starting amount of s/h ship merchant to sell
-    'eco_stockman_fleet_populate'  => 1,  // Populate empty Stockman fleet with ships or not
+    'eco_stockman_fleet_populate'  => 1, // Populate empty Stockman fleet with ships or not
     'empire_mercenary_base_period' => PERIOD_MONTH, // Base
     'empire_mercenary_temporary'   => 0, // Temporary empire-wide mercenaries
     'energy_basic_income'          => 0,
 
     // Bashing protection settings
-    'fleet_bashing_attacks'        => 3,      // Max amount of attack per wave - 3 by default
-    'fleet_bashing_interval'       => 1800,   // Maximum interval between attacks when they still count as one wave - 30m by default
-    'fleet_bashing_scope'          => 86400,  // Interval on which bashing waves counts - 24h by default
-    'fleet_bashing_war_delay'      => 43200,  // Delay before start bashing after declaring war to alliance - 12h by default
-    'fleet_bashing_waves'          => 3,      // Max amount of waves per day - 3 by default
+    'fleet_bashing_attacks'        => 3, // Max amount of attack per wave - 3 by default
+    'fleet_bashing_interval'       => 1800, // Maximum interval between attacks when they still count as one wave - 30m by default
+    'fleet_bashing_scope'          => 86400, // Interval on which bashing waves counts - 24h by default
+    'fleet_bashing_war_delay'      => 43200, // Delay before start bashing after declaring war to alliance - 12h by default
+    'fleet_bashing_waves'          => 3, // Max amount of waves per day - 3 by default
 
     'Fleet_Cdr'   => 30,
     'fleet_speed' => 1,
 
     'fleet_update_interval' => 4,
 
-    'game_adminEmail'       => 'root@localhost',    // Admin's email to show to users
-    'game_counter'          => 0,  // Does built-in page hit counter is on?
+    'game_adminEmail'       => 'root@localhost', // Admin's email to show to users
+    'game_counter'          => 0, // Does built-in page hit counter is on?
     // Defaults
     'game_default_language' => 'ru',
     'game_default_skin'     => 'skins/EpicBlue/',
@@ -255,13 +255,13 @@ 
     'game_maxSystem'      => 199,
     'game_maxPlanet'      => 15,
     // Game global settings
-    'game_mode'           => 0,           // 0 - SuperNova, 1 - oGame
+    'game_mode'           => 0, // 0 - SuperNova, 1 - oGame
     'game_name'           => 'SuperNova', // Server name (would be on banners and on top of left menu)
 
     'game_news_actual'   => 259200, // How long announcement would be marked as "New". In seconds. Default - 3 days
-    'game_news_overview' => 3,    // How much last news to show in Overview page
+    'game_news_overview' => 3, // How much last news to show in Overview page
     // Noob protection
-    'game_noob_factor'   => 5,    // Multiplier to divide "stronger" and "weaker" users
+    'game_noob_factor'   => 5, // Multiplier to divide "stronger" and "weaker" users
     'game_noob_points'   => 5000, // Below this point user threated as noob. 0 to disable
 
     'game_multiaccount_enabled' => 0, // 1 - allow interactions for players with same IP (multiaccounts)
@@ -311,8 +311,8 @@ 
     'payment_currency_exchange_wmu' => 30,
     'payment_currency_exchange_wmz' => 1,
 
-    'payment_lot_price' => 1,     // Lot price in default currency
-    'payment_lot_size'  => 2500,  // Lot size. Also service as minimum amount of DM that could be bought with one transaction
+    'payment_lot_price' => 1, // Lot price in default currency
+    'payment_lot_size'  => 2500, // Lot size. Also service as minimum amount of DM that could be bought with one transaction
 
     'planet_teleport_cost'    => 50000, //
     'planet_teleport_timeout' => 86400, //
@@ -330,7 +330,7 @@ 
     'resource_multiplier'     => 1,
 
     //Roleplay system
-    'rpg_bonus_divisor'       => 10,    // Amount of DM referral shoud get for partner have 1 DM bonus
+    'rpg_bonus_divisor'       => 10, // Amount of DM referral shoud get for partner have 1 DM bonus
     'rpg_bonus_minimum'       => 10000, // Minimum DM ammount for starting paying bonuses to affiliate
 
     // Black Market - General

includes/includes/upd_helpers.php

Spacing +12 added lines, -12 removed lines

@@ -15,10 +15,10 @@ 
   // classSupernova::$db->sn_db_connect();
   if (!(strpos($query, '{{') === false)) {
     foreach ($update_tables as $tableName => $cork) {
-      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix . $tableName, $query);
+      $query = str_replace("{{{$tableName}}}", classSupernova::$db->db_prefix.$tableName, $query);
     }
   }
-  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for ' . $query . ': ' . classSupernova::$db->db_error()) : false;
+  !($result = classSupernova::$db->db_sql_query($query)) ? die('Query error for '.$query.': '.classSupernova::$db->db_error()) : false;
 
   return $result;
 }
@@ -85,7 +85,7 @@ 
   global $update_tables, $update_indexes, $update_indexes_full, $update_foreigns;
 
   $tableName = $prefixed ? str_replace(classSupernova::$config->db_prefix, '', $prefix_table_name) : $prefix_table_name;
-  $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix . $prefix_table_name;
+  $prefix_table_name = $prefixed ? $prefix_table_name : classSupernova::$config->db_prefix.$prefix_table_name;
 
   upd_unset_table_info($tableName);
 
@@ -100,7 +100,7 @@ 
     $update_indexes_full[$tableName][$r1['Key_name']][$r1['Column_name']] = $r1;
   }
 
-  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '" . db_escape(classSupernova::$db_name) . "' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
+  $q1 = upd_do_query("SELECT * FROM `information_schema`.`KEY_COLUMN_USAGE` WHERE `TABLE_SCHEMA` = '".db_escape(classSupernova::$db_name)."' AND TABLE_NAME = '{$prefix_table_name}' AND REFERENCED_TABLE_NAME is not null;", true);
   while ($r1 = db_fetch($q1)) {
     $table_referenced = str_replace(classSupernova::$config->db_prefix, '', $r1['REFERENCED_TABLE_NAME']);
 
@@ -160,7 +160,7 @@ 
     $result = upd_do_query("CREATE TABLE IF NOT EXISTS `{$db_prefix}{$table_name}` {$declaration}");
     $error = classSupernova::$db->db_error();
     if ($error) {
-      die("Creating error for table `{$table_name}`: {$error}<br />" . dump($declaration));
+      die("Creating error for table `{$table_name}`: {$error}<br />".dump($declaration));
     }
     upd_do_query('set foreign_key_checks = 1;', true);
     upd_load_table_info($table_name, false);
@@ -175,10 +175,10 @@ 
     "SELECT {$fields}
     FROM {{unit}}
     WHERE
-      `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND " . DBStaticUnit::db_unit_time_restrictions() .
-    ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '') .
-    ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '') .
-    " LIMIT 1" .
+      `unit_location_type` = {$location_type} AND `unit_location_id` = {$location_id} AND ".DBStaticUnit::db_unit_time_restrictions().
+    ($user_id = intval($user_id) ? " AND `unit_player_id` = {$user_id}" : '').
+    ($unit_snid = intval($unit_snid) ? " AND `unit_snid` = {$unit_snid}" : '').
+    " LIMIT 1".
     ($for_update ? ' FOR UPDATE' : '')
   ));
 }
@@ -259,7 +259,7 @@ 
     foreach ($table_data as $record_id => $conditions) {
       $where = '';
       if (!empty($conditions['where'])) {
-        $where = 'WHERE ' . implode(' AND ', $conditions['where']);
+        $where = 'WHERE '.implode(' AND ', $conditions['where']);
       }
 
       $fields = array();
@@ -268,12 +268,12 @@ 
           $condition = "`{$field_name}` = ";
           $value = '';
           if ($field_data['delta']) {
-            $value = "`{$field_name}`" . ($field_data['delta'] >= 0 ? '+' : '') . $field_data['delta'];
+            $value = "`{$field_name}`".($field_data['delta'] >= 0 ? '+' : '').$field_data['delta'];
           } elseif ($field_data['set']) {
             $value = (is_string($field_data['set']) ? "'{$field_data['set']}'" : $field_data['set']);
           }
           if ($value) {
-            $fields[] = $condition . $value;
+            $fields[] = $condition.$value;
           }
         }
       }

includes/classes/FleetValidator.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
     'checkSpeedPercentOld'       => FLIGHT_FLEET_SPEED_WRONG,
     'checkTargetInUniverse'      => FLIGHT_VECTOR_BEYOND_UNIVERSE,
     'checkTargetNotSource'       => FLIGHT_VECTOR_SAME_SOURCE,
-    'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN,  // tODO
+    'checkSenderNoVacation'      => FLIGHT_PLAYER_VACATION_OWN, // tODO
     'checkTargetNoVacation'      => FLIGHT_PLAYER_VACATION,
     'checkFleetNotEmpty'         => FLIGHT_SHIPS_NO_SHIPS,
     // 'checkUnitsPositive'         => FLIGHT_SHIPS_NEGATIVE, // Unused - 'cause it's not allowed to put negative units into Unit class
@@ -133,7 +133,7 @@ 
 
       $checkResult = call_user_func(array($this, $condition));
       defined('DEBUG_FLEET_MISSION_VALIDATE_DUMP_STEPS')
-        ? pdump($action, $condition . ' ' . ($checkResult ? 'TRUE' : 'FALSE')) : false;
+        ? pdump($action, $condition.' '.($checkResult ? 'TRUE' : 'FALSE')) : false;
 
       // If check failed and there no alternative actions - throw exception
       // Shortcut ACTION => FAIL_STATUS instead of ACTION => array(false => FAIL_STATUS)
@@ -156,7 +156,7 @@ 
         $this->checkMissionRestrictions($action);
       } else {
         // No - then just performing action
-        if($exception) {
+        if ($exception) {
           throw new ExceptionFleetInvalid($action, $action);
         } else {
           return $action;
@@ -598,10 +598,10 @@ 
   protected function checkMissionPrefix($name, $prefix) {
     $result = false;
     if (strpos($name, $prefix) === 0) {
-      $mission = 'MT_' . strtoupper(substr($name, strlen($prefix)));
+      $mission = 'MT_'.strtoupper(substr($name, strlen($prefix)));
       if (!defined($mission)) {
         // TODO - Ну, как-то получше это обделать
-        throw new Exception('Mission type "' . $mission . '" is not defined', FLIGHT_MISSION_UNKNOWN);
+        throw new Exception('Mission type "'.$mission.'" is not defined', FLIGHT_MISSION_UNKNOWN);
       }
 
       $result = constant($mission);

includes/classes/Mission/MissionFactory.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
    * @throws ExceptionFleetInvalid
    */
   public static function build($missionType, $fleet) {
-    if (!empty(self::$missions[$missionType]) && class_exists($className = __NAMESPACE__ . '\\' . self::$missions[$missionType])) {
+    if (!empty(self::$missions[$missionType]) && class_exists($className = __NAMESPACE__.'\\'.self::$missions[$missionType])) {
       $result = new $className($fleet);
     } else {
       throw new ExceptionFleetInvalid("Mission type {$missionType} unknown", FLIGHT_MISSION_UNKNOWN);

includes/classes/sn_module.php

Spacing +34 added lines, -34 removed lines

@@ -72,10 +72,10 @@ 
   }
 
   function loadModuleRootConfig() {
-    require SN_ROOT_PHYSICAL . 'config.php';
+    require SN_ROOT_PHYSICAL.'config.php';
 
-    $module_config_array = get_class($this) . '_config';
-    if(!empty($$module_config_array) && is_array($$module_config_array)) {
+    $module_config_array = get_class($this).'_config';
+    if (!empty($$module_config_array) && is_array($$module_config_array)) {
       $this->config = $$module_config_array;
 
       return true;
@@ -93,17 +93,17 @@ 
 
     // TODO: Load configuration from DB. Manifest setting
     // Trying to load configuration from file
-    if(!$config_exists = $this->loadModuleRootConfig()) {
+    if (!$config_exists = $this->loadModuleRootConfig()) {
       // Конфигурация может лежать в config_path в манифеста или в корне модуля
-      if(isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'] . '/config.php')) {
+      if (isset($this->manifest['config_path']) && file_exists($config_filename = $this->manifest['config_path'].'/config.php')) {
         $config_exists = true;
-      } elseif(file_exists($config_filename = dirname($filename) . '/config.php')) {
+      } elseif (file_exists($config_filename = dirname($filename).'/config.php')) {
         $config_exists = true;
       }
 
-      if($config_exists) {
+      if ($config_exists) {
         include($config_filename);
-        $module_config_array = $class_module_name . '_config';
+        $module_config_array = $class_module_name.'_config';
         $this->config = $$module_config_array;
       }
     }
@@ -118,7 +118,7 @@ 
 
     // Checking module status - is it installed and active
     $this->check_status();
-    if(!$this->manifest['active']) {
+    if (!$this->manifest['active']) {
       return;
     }
 
@@ -138,11 +138,11 @@ 
 
   protected function setSystemConstants() {
     // Setting constants - if any
-    if(empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
+    if (empty($this->manifest['constants']) || !is_array($this->manifest['constants'])) {
       return;
     }
 
-    foreach($this->manifest['constants'] as $constant_name => $constant_value) {
+    foreach ($this->manifest['constants'] as $constant_name => $constant_value) {
       !defined($constant_name) ? define($constant_name, $constant_value) : false;
     }
   }
@@ -154,48 +154,48 @@ 
     // New values from module variables will overwrite previous values (for root variables) and array elements with corresponding indexes (for arrays)
     // Constants as array indexes are honored - it's make valid such declarations as 'sn_data[ques][QUE_STRUCTURES]'
     $this->manifest['vars'] = $this->__assign_vars();
-    if(empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
+    if (empty($this->manifest['vars']) || !is_array($this->manifest['vars'])) {
       return;
     }
 
     $vars_assigned = array();
-    foreach($this->manifest['vars'] as $var_name => $var_value) {
+    foreach ($this->manifest['vars'] as $var_name => $var_value) {
       $sub_vars = explode('[', str_replace(']', '', $var_name));
       $var_name = $sub_vars[0];
 
-      if(!isset($vars_assigned[$var_name])) {
+      if (!isset($vars_assigned[$var_name])) {
         $vars_assigned[$var_name] = true;
         global $$var_name;
       }
 
       $pointer = &$$var_name;
-      if(($n = count($sub_vars)) > 1) {
-        for($i = 1; $i < $n; $i++) {
-          if(defined($sub_vars[$i])) {
+      if (($n = count($sub_vars)) > 1) {
+        for ($i = 1; $i < $n; $i++) {
+          if (defined($sub_vars[$i])) {
             $sub_vars[$i] = constant($sub_vars[$i]);
           }
 
-          if(!isset($pointer[$sub_vars[$i]]) && $i != $n) {
+          if (!isset($pointer[$sub_vars[$i]]) && $i != $n) {
             $pointer[$sub_vars[$i]] = array();
           }
           $pointer = &$pointer[$sub_vars[$i]];
         }
       }
 
-      if(!isset($pointer) || !is_array($pointer)) {
+      if (!isset($pointer) || !is_array($pointer)) {
         $pointer = $var_value;
-      } elseif(is_array($$var_name)) {
+      } elseif (is_array($$var_name)) {
         $pointer = array_merge_recursive_numeric($pointer, $var_value);
       }
     }
   }
 
   protected function mergeMenu(&$sn_menu_extra, &$menu_patch) {
-    if(!is_array($menu_patch)) {
+    if (!is_array($menu_patch)) {
       return;
     }
 
-    foreach($menu_patch as $menu_item_name => $menu_item_data) {
+    foreach ($menu_patch as $menu_item_name => $menu_item_data) {
       $sn_menu_extra[$menu_item_name] = $menu_item_data;
     }
   }
@@ -204,34 +204,34 @@ 
     // Overriding function if any
     sn_sys_handler_add(classSupernova::$functions, $this->manifest['functions'], $this);
 
-    foreach(classSupernova::$sn_mvc as $handler_type => &$handler_data) {
+    foreach (classSupernova::$sn_mvc as $handler_type => &$handler_data) {
       sn_sys_handler_add($handler_data, $this->manifest['mvc'][$handler_type], $this, $handler_type);
     }
   }
 
   protected function mergeNavbarButton() {
-    if(empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
+    if (empty($this->manifest['navbar_prefix_button']) || !is_array($this->manifest['navbar_prefix_button'])) {
       return;
     }
 
-    foreach($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
+    foreach ($this->manifest['navbar_prefix_button'] as $button_image => $button_url_relative) {
       classSupernova::$sn_mvc['navbar_prefix_button'][$button_image] = $button_url_relative;
     }
   }
 
   protected function mergeI18N() {
     $arrayName = 'i18n';
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
-      foreach($contentList as &$i18n_file_data) {
-        if(is_array($i18n_file_data) && !$i18n_file_data['path']) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
+      foreach ($contentList as &$i18n_file_data) {
+        if (is_array($i18n_file_data) && !$i18n_file_data['path']) {
           $i18n_file_data['path'] = $this->manifest['root_relative'];
         }
       }
-      if(!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
+      if (!isset(classSupernova::$sn_mvc[$arrayName][$pageName])) {
         classSupernova::$sn_mvc[$arrayName][$pageName] = array();
       }
       classSupernova::$sn_mvc[$arrayName][$pageName] += $contentList;
@@ -239,13 +239,13 @@ 
   }
 
   protected function mergeArraySpecial($arrayName) {
-    if(empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
+    if (empty($this->manifest[$arrayName]) || !is_array($this->manifest[$arrayName])) {
       return;
     }
 
-    foreach($this->manifest[$arrayName] as $pageName => &$contentList) {
+    foreach ($this->manifest[$arrayName] as $pageName => &$contentList) {
       !isset(classSupernova::$sn_mvc[$arrayName][$pageName]) ? classSupernova::$sn_mvc[$arrayName][$pageName] = array() : false;
-      foreach($contentList as $contentName => &$content) {
+      foreach ($contentList as $contentName => &$content) {
         classSupernova::$sn_mvc[$arrayName][$pageName][$contentName] = $content;
       }
     }
@@ -299,7 +299,7 @@ 
           $load_order[$loaded_module_name] = $level;
         }
       }
-    } while($prev_order != $load_order);
+    } while ($prev_order != $load_order);
 
     asort($load_order);
 

includes/alliance/ali_external_search.inc

Spacing +4 added lines, -4 removed lines

@@ -1,18 +1,18 @@
 <?php
 
-if(!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
+if (!defined('SN_IN_ALLY') || SN_IN_ALLY !== true) {
   classSupernova::$debug->error("Attempt to call ALLIANCE page mode {$mode} directly - not from alliance.php", 'Forbidden', 403);
 }
 
 $template = gettemplate('ali_search', true);
 
 $ali_search_text = sys_get_param_str('searchtext');
-if($ali_search_text) {
+if ($ali_search_text) {
   $template->assign_var('SEARCH_TEXT', $ali_search_text);
 
   $search = DBStaticAlly::db_ally_search_by_name_or_tag($ali_search_text);
-  if(classSupernova::$db->db_num_rows($search)) {
-    while($ally_row = db_fetch($search)) {
+  if (classSupernova::$db->db_num_rows($search)) {
+    while ($ally_row = db_fetch($search)) {
       $template->assign_block_vars('alliances', array(
         'ID'          => $ally_row['id'],
         'TAG'         => $ally_row['ally_tag'],