supernova-ws / SuperNova

admin/adm_user_analyze.php

Indentation +2 added lines, -2 removed lines

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

stat.php

Indentation +30 added lines, -30 removed lines

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

language/en/system.mo.php

Indentation +1 added lines, -1 removed lines

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

language/en/language.mo.php

Indentation +1 added lines, -1 removed lines

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

classes/Core/Repository.php

Indentation +1 added lines, -1 removed lines

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

language/ru/system.mo.php

Indentation +9 added lines, -9 removed lines

@@ -705,15 +705,15 @@
   ],
 
   'months' => [
-     1 =>'января',
-     2 =>'февраля',
-     3 =>'марта',
-     4 =>'апреля',
-     5 =>'мая',
-     6 =>'июня',
-     7 =>'июля',
-     8 =>'августа',
-     9 =>'сентября',
+      1 =>'января',
+      2 =>'февраля',
+      3 =>'марта',
+      4 =>'апреля',
+      5 =>'мая',
+      6 =>'июня',
+      7 =>'июля',
+      8 =>'августа',
+      9 =>'сентября',
     10 =>'октября',
     11 =>'ноября',
     12 =>'декабря'

classes/template.php

Indentation +75 added lines, -75 removed lines

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

fleet.php

Switch Indentation +131 added lines, -131 removed lines

@@ -77,121 +77,121 @@ 
 }
 
 switch ($fleet_page) {
-  case 3:
+    case 3:
 
-  case 2:
-    $fleet_group_mr = sys_get_param_id('fleet_group');
-    $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
-    $fleetarray = is_array($fleetarray) ? $fleetarray : array();
+    case 2:
+      $fleet_group_mr = sys_get_param_id('fleet_group');
+      $fleetarray     = json_decode(base64_decode(str_rot13(sys_get_param('usedfleet'))), true);
+      $fleetarray = is_array($fleetarray) ? $fleetarray : array();
 
-    foreach($fleetarray as $ship_id => &$ship_amount) {
-      if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
-        $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
-        die();
-      }
-      $ship_amount = floatval($ship_amount);
-    }
-
-    $UsedPlanet = false;
-    $YourPlanet = false;
-    $missiontype = array();
-    if ($planet > SN::$config->game_maxPlanet) {
-      $target_mission = MT_EXPLORE;
-      $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
-    } elseif ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-
-      if ($TargetPlanet['id_owner']) {
-        $UsedPlanet = true;
-        if ($TargetPlanet['id_owner'] == $user['id']) {
-          $YourPlanet = true;
+      foreach($fleetarray as $ship_id => &$ship_amount) {
+        if(!in_array($ship_id, sn_get_groups('fleet')) || (string)floatval($ship_amount) != $ship_amount || $ship_amount < 1) {
+          $debug->warning('Supplying wrong ship in ship list on fleet page', 'Hack attempt', 302, array('base_dump' => true));
+          die();
         }
+        $ship_amount = floatval($ship_amount);
       }
 
-      if (!$UsedPlanet) {
-        if ($fleetarray[SHIP_COLONIZER]) {
-          $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
-          $target_mission = MT_COLONIZE;
-          $planet_type = PT_PLANET;
-        } else {
-          messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
-        }
-      } else {
-        $recyclers = 0;
-        foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
-          $recyclers += $fleetarray[$recycler_id];
+      $UsedPlanet = false;
+      $YourPlanet = false;
+      $missiontype = array();
+      if ($planet > SN::$config->game_maxPlanet) {
+        $target_mission = MT_EXPLORE;
+        $missiontype[MT_EXPLORE] = $lang['type_mission'][MT_EXPLORE];
+      } elseif ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+
+        if ($TargetPlanet['id_owner']) {
+          $UsedPlanet = true;
+          if ($TargetPlanet['id_owner'] == $user['id']) {
+            $YourPlanet = true;
+          }
         }
-        if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
-          $target_mission = MT_RECYCLE;
-          $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
-        } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
-          if ($YourPlanet) {
-            $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
-            $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+        if (!$UsedPlanet) {
+          if ($fleetarray[SHIP_COLONIZER]) {
+            $missiontype[MT_COLONIZE] = $lang['type_mission'][MT_COLONIZE];
+            $target_mission = MT_COLONIZE;
+            $planet_type = PT_PLANET;
           } else {
-            // Not Your Planet
-            if ($fleetarray[SHIP_SPY]) {
-              // Only spy missions if any spy
-              $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
+            messageBox ("<font color=\"red\"><b>". $lang['fl_no_planet_type'] ."</b></font>", $lang['fl_error']);
+          }
+        } else {
+          $recyclers = 0;
+          foreach(sn_get_groups('flt_recyclers') as $recycler_id) {
+            $recyclers += $fleetarray[$recycler_id];
+          }
+          if ($recyclers > 0 && $planet_type == PT_DEBRIS) {
+            $target_mission = MT_RECYCLE;
+            $missiontype[MT_RECYCLE] = $lang['type_mission'][MT_RECYCLE];
+          } elseif ($planet_type == PT_PLANET || $planet_type == PT_MOON) {
+            if ($YourPlanet) {
+              $missiontype[MT_RELOCATE] = $lang['type_mission'][MT_RELOCATE];
+              $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
             } else {
-              // If no spies...
-              if ($fleet_group_mr) {
-                $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+              // Not Your Planet
+              if ($fleetarray[SHIP_SPY]) {
+                // Only spy missions if any spy
+                $missiontype[MT_SPY] = $lang['type_mission'][MT_SPY];
               } else {
-                $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
-                $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
-
-                $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
-
-                if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
-                  $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                // If no spies...
+                if ($fleet_group_mr) {
+                  $missiontype[MT_AKS] = $lang['type_mission'][MT_AKS];
+                } else {
+                  $missiontype[MT_ATTACK] = $lang['type_mission'][MT_ATTACK];
+                  $missiontype[MT_TRANSPORT] = $lang['type_mission'][MT_TRANSPORT];
+
+                  $missiontype[MT_HOLD] = $lang['type_mission'][MT_HOLD];
+
+                  if($planet_type == PT_MOON && $fleetarray[SHIP_HUGE_DEATH_STAR]) {
+                    $missiontype[MT_DESTROY] = $lang['type_mission'][MT_DESTROY];
+                  }
                 }
               }
             }
           }
         }
       }
-    }
-
-    if (!$target_mission && is_array($missiontype)) {
-      $target_mission = MT_ATTACK;
-    }
-
-//    $sn_group_missions = sn_get_groups('missions');
-//    foreach($sn_group_missions as $mission_id => $cork) {
-//      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
-//    }
-//
-//
-    ksort($missiontype);
-
-    $speed_percent = sys_get_param_int('speed', 10);
-    $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
-
-//    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
-    $fleet_speed   = $travel_data['fleet_speed'];
-    $distance      = $travel_data['distance'];
-    $duration      = $travel_data['duration'];
-    $consumption   = $travel_data['consumption'];
-  // No Break
-
-  case 1:
-    if ($galaxy && $system && $planet) {
-      $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
-
-      $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
-    }
-
-  case 0:
-    $template_result += array(
-      'thisgalaxy'      => $planetrow['galaxy'],
-      'thissystem'      => $planetrow['system'],
-      'thisplanet'      => $planetrow['planet'],
-      'thisplanet_type' => $planetrow['planet_type'],
-    );
-  // no break
+
+      if (!$target_mission && is_array($missiontype)) {
+        $target_mission = MT_ATTACK;
+      }
+
+  //    $sn_group_missions = sn_get_groups('missions');
+  //    foreach($sn_group_missions as $mission_id => $cork) {
+  //      $missiontype[$mission_id] = $lang['type_mission'][$mission_id];
+  //    }
+  //
+  //
+      ksort($missiontype);
+
+      $speed_percent = sys_get_param_int('speed', 10);
+      $travel_data   = flt_travel_data($user, $planetrow, array('galaxy' => $galaxy, 'system' => $system, 'planet' => $planet), $fleetarray, $speed_percent);
+
+  //    $fleet_speed   = flt_fleet_speed($user, $fleetarray);
+      $fleet_speed   = $travel_data['fleet_speed'];
+      $distance      = $travel_data['distance'];
+      $duration      = $travel_data['duration'];
+      $consumption   = $travel_data['consumption'];
+    // No Break
+
+    case 1:
+      if ($galaxy && $system && $planet) {
+        $check_type = $planet_type == PT_MOON ? PT_MOON : PT_PLANET;
+
+        $TargetPlanet = DBStaticPlanet::db_planet_by_gspt($galaxy, $system, $planet, $check_type);
+      }
+
+    case 0:
+      $template_result += array(
+        'thisgalaxy'      => $planetrow['galaxy'],
+        'thissystem'      => $planetrow['system'],
+        'thisplanet'      => $planetrow['planet'],
+        'thisplanet_type' => $planetrow['planet_type'],
+      );
+    // no break
 
 }
 
@@ -213,35 +213,35 @@ 
 }
 
 switch($fleet_page) {
-  case 1:
-    require('includes/includes/flt_page1.inc');
-  break;
-
-  case 2:
-    require_once('includes/includes/flt_page2.inc');
-    sn_fleet_page2();
-  break;
-
-  case 3:
-    require_once('includes/includes/flt_page3.inc');
-    sn_fleet_page3();
-  break;
-
-  case 4:
-    require('includes/includes/flt_page4.inc');
-  break;
-
-  case 5:
-    $template = gettemplate('fleet5', true);
-    $pageFleet5Gathering = new \Pages\Deprecated\PageFleet5Gathering();
-    $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template);
-    // Building list of own planets & moons
-    $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template);
-  break;
-
-  default:
-    define('SN_RENDER_NAVBAR_PLANET', true);
-
-    require('includes/includes/flt_page0.inc');
-  break;
+    case 1:
+      require('includes/includes/flt_page1.inc');
+    break;
+
+    case 2:
+      require_once('includes/includes/flt_page2.inc');
+      sn_fleet_page2();
+    break;
+
+    case 3:
+      require_once('includes/includes/flt_page3.inc');
+      sn_fleet_page3();
+    break;
+
+    case 4:
+      require('includes/includes/flt_page4.inc');
+    break;
+
+    case 5:
+      $template = gettemplate('fleet5', true);
+      $pageFleet5Gathering = new \Pages\Deprecated\PageFleet5Gathering();
+      $pageFleet5Gathering->modelFleet5Gathering($user, $planetrow, $template);
+      // Building list of own planets & moons
+      $pageFleet5Gathering->viewPage5Gathering($user, $planetrow, $template);
+    break;
+
+    default:
+      define('SN_RENDER_NAVBAR_PLANET', true);
+
+      require('includes/includes/flt_page0.inc');
+    break;
 }

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)