iNextrix / ASTPP

web_interface/astpp/system/helpers/cookie_helper.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
 	function set_cookie($name = '', $value = '', $expire = '', $domain = '', $path = '/', $prefix = '', $secure = FALSE)
 	{
 		// Set the config file options
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->input->set_cookie($name, $value, $expire, $domain, $path, $prefix, $secure);
 	}
 }
@@ -66,7 +66,7 @@ 
 {
 	function get_cookie($index = '', $xss_clean = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		$prefix = '';
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/helpers/inflector_helper.php

Spacing +18 added lines, -18 removed lines

@@ -105,24 +105,24 @@
 		$result = strval($str);
 	
 		$plural_rules = array(
-			'/^(ox)$/'                 => '\1\2en',     // ox
-			'/([m|l])ouse$/'           => '\1ice',      // mouse, louse
-			'/(matr|vert|ind)ix|ex$/'  => '\1ices',     // matrix, vertex, index
-			'/(x|ch|ss|sh)$/'          => '\1es',       // search, switch, fix, box, process, address
-			'/([^aeiouy]|qu)y$/'       => '\1ies',      // query, ability, agency
-			'/(hive)$/'                => '\1s',        // archive, hive
-			'/(?:([^f])fe|([lr])f)$/'  => '\1\2ves',    // half, safe, wife
-			'/sis$/'                   => 'ses',        // basis, diagnosis
-			'/([ti])um$/'              => '\1a',        // datum, medium
-			'/(p)erson$/'              => '\1eople',    // person, salesperson
-			'/(m)an$/'                 => '\1en',       // man, woman, spokesman
-			'/(c)hild$/'               => '\1hildren',  // child
-			'/(buffal|tomat)o$/'       => '\1\2oes',    // buffalo, tomato
-			'/(bu|campu)s$/'           => '\1\2ses',    // bus, campus
-			'/(alias|status|virus)/'   => '\1es',       // alias
-			'/(octop)us$/'             => '\1i',        // octopus
-			'/(ax|cris|test)is$/'      => '\1es',       // axis, crisis
-			'/s$/'                     => 's',          // no change (compatibility)
+			'/^(ox)$/'                 => '\1\2en', // ox
+			'/([m|l])ouse$/'           => '\1ice', // mouse, louse
+			'/(matr|vert|ind)ix|ex$/'  => '\1ices', // matrix, vertex, index
+			'/(x|ch|ss|sh)$/'          => '\1es', // search, switch, fix, box, process, address
+			'/([^aeiouy]|qu)y$/'       => '\1ies', // query, ability, agency
+			'/(hive)$/'                => '\1s', // archive, hive
+			'/(?:([^f])fe|([lr])f)$/'  => '\1\2ves', // half, safe, wife
+			'/sis$/'                   => 'ses', // basis, diagnosis
+			'/([ti])um$/'              => '\1a', // datum, medium
+			'/(p)erson$/'              => '\1eople', // person, salesperson
+			'/(m)an$/'                 => '\1en', // man, woman, spokesman
+			'/(c)hild$/'               => '\1hildren', // child
+			'/(buffal|tomat)o$/'       => '\1\2oes', // buffalo, tomato
+			'/(bu|campu)s$/'           => '\1\2ses', // bus, campus
+			'/(alias|status|virus)/'   => '\1es', // alias
+			'/(octop)us$/'             => '\1i', // octopus
+			'/(ax|cris|test)is$/'      => '\1es', // axis, crisis
+			'/s$/'                     => 's', // no change (compatibility)
 			'/$/'                      => 's',
 		);
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /*
 | -------------------------------------------------------------------
 | AUTO-LOADER

web_interface/astpp/system/helpers/captcha_helper.php

Spacing +18 added lines, -18 removed lines

@@ -113,7 +113,7 @@ 
 			$str = '';
 			for ($i = 0; $i < 8; $i++)
 			{
-				$str .= substr($pool, mt_rand(0, strlen($pool) -1), 1);
+				$str .= substr($pool, mt_rand(0, strlen($pool) - 1), 1);
 			}
 
 			$word = $str;
@@ -124,9 +124,9 @@ 
 		// -----------------------------------
 
 		$length	= strlen($word);
-		$angle	= ($length >= 6) ? rand(-($length-6), ($length-6)) : 0;
-		$x_axis	= rand(6, (360/$length)-16);
-		$y_axis = ($angle >= 0 ) ? rand($img_height, $img_width) : rand(6, $img_height);
+		$angle = ($length >= 6) ? rand(-($length - 6), ($length - 6)) : 0;
+		$x_axis	= rand(6, (360 / $length) - 16);
+		$y_axis = ($angle >= 0) ? rand($img_height, $img_width) : rand(6, $img_height);
 
 		// -----------------------------------
 		// Create image
@@ -146,9 +146,9 @@ 
 		//  Assign colors
 		// -----------------------------------
 
-		$bg_color		= imagecolorallocate ($im, 255, 255, 255);
-		$border_color	= imagecolorallocate ($im, 153, 102, 102);
-		$text_color		= imagecolorallocate ($im, 204, 153, 153);
+		$bg_color = imagecolorallocate($im, 255, 255, 255);
+		$border_color	= imagecolorallocate($im, 153, 102, 102);
+		$text_color		= imagecolorallocate($im, 204, 153, 153);
 		$grid_color		= imagecolorallocate($im, 255, 182, 182);
 		$shadow_color	= imagecolorallocate($im, 255, 240, 240);
 
@@ -162,7 +162,7 @@ 
 		//  Create the spiral pattern
 		// -----------------------------------
 
-		$theta		= 1;
+		$theta = 1;
 		$thetac		= 7;
 		$radius		= 16;
 		$circles	= 20;
@@ -171,13 +171,13 @@ 
 		for ($i = 0; $i < ($circles * $points) - 1; $i++)
 		{
 			$theta = $theta + $thetac;
-			$rad = $radius * ($i / $points );
+			$rad = $radius * ($i / $points);
 			$x = ($rad * cos($theta)) + $x_axis;
 			$y = ($rad * sin($theta)) + $y_axis;
 			$theta = $theta + $thetac;
 			$rad1 = $radius * (($i + 1) / $points);
 			$x1 = ($rad1 * cos($theta)) + $x_axis;
-			$y1 = ($rad1 * sin($theta )) + $y_axis;
+			$y1 = ($rad1 * sin($theta)) + $y_axis;
 			imageline($im, $x, $y, $x1, $y1, $grid_color);
 			$theta = $theta - $thetac;
 		}
@@ -191,27 +191,27 @@ 
 		if ($use_font == FALSE)
 		{
 			$font_size = 5;
-			$x = rand(0, $img_width/($length/3));
+			$x = rand(0, $img_width / ($length / 3));
 			$y = 0;
 		}
 		else
 		{
-			$font_size	= 16;
-			$x = rand(0, $img_width/($length/1.5));
-			$y = $font_size+2;
+			$font_size = 16;
+			$x = rand(0, $img_width / ($length / 1.5));
+			$y = $font_size + 2;
 		}
 
 		for ($i = 0; $i < strlen($word); $i++)
 		{
 			if ($use_font == FALSE)
 			{
-				$y = rand(0 , $img_height/2);
+				$y = rand(0, $img_height / 2);
 				imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
-				$x += ($font_size*2);
+				$x += ($font_size * 2);
 			}
 			else
 			{
-				$y = rand($img_height/2, $img_height-3);
+				$y = rand($img_height / 2, $img_height - 3);
 				imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));
 				$x += $font_size;
 			}
@@ -222,7 +222,7 @@ 
 		//  Create the border
 		// -----------------------------------
 
-		imagerectangle($im, 0, 0, $img_width-1, $img_height-1, $border_color);
+		imagerectangle($im, 0, 0, $img_width - 1, $img_height - 1, $border_color);
 
 		// -----------------------------------
 		//  Generate the image

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -51,8 +53,7 @@ 
 				{
 					$$key = $val;
 				}
-			}
-			else
+			} else
 			{
 				$$key = ( ! isset($data[$key])) ? $val : $data[$key];
 			}
@@ -136,8 +137,7 @@ 
 		if (function_exists('imagecreatetruecolor'))
 		{
 			$im = imagecreatetruecolor($img_width, $img_height);
-		}
-		else
+		} else
 		{
 			$im = imagecreate($img_width, $img_height);
 		}
@@ -193,8 +193,7 @@ 
 			$font_size = 5;
 			$x = rand(0, $img_width/($length/3));
 			$y = 0;
-		}
-		else
+		} else
 		{
 			$font_size	= 16;
 			$x = rand(0, $img_width/($length/1.5));
@@ -208,8 +207,7 @@ 
 				$y = rand(0 , $img_height/2);
 				imagestring($im, $font_size, $x, $y, substr($word, $i, 1), $text_color);
 				$x += ($font_size*2);
-			}
-			else
+			} else
 			{
 				$y = rand($img_height/2, $img_height-3);
 				imagettftext($im, $font_size, $angle, $x, $y, $text_color, $font_path, substr($word, $i, 1));

web_interface/astpp/system/helpers/template_inheritance_helper.php

Indentation +179 added lines, -179 removed lines

@@ -1,40 +1,40 @@ 
 <?php
-    /**
-     * Django - like template inheritance emulation for PHP
-     *
-     * @author Daniel Dornhardt <daniel AT dornhardt.com>
-     *
-     * I liked djangos template inheritance - system, so I decided to create
-     * something similar for PHP.
-     *
-     * It's not pretty, it's not well tested (yet), but from my intuition it should be
-     * simple to use and pretty fast.
-     *
-     * @copyright Copyright (c) 2008 by Daniel Dornhardt
-     * @license http://www.opensource.org/licenses/mit-license.php The MIT License
-     *
-     * Permission is hereby granted, free of charge, to any person
-     * obtaining a copy of this software and associated documentation
-     * files (the "Software"), to deal in the Software without
-     * restriction, including without limitation the rights to use,
-     * copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the
-     * Software is furnished to do so, subject to the following
-     * conditions:
-     *
-     * The above copyright notice and this permission notice shall be
-     * included in all copies or substantial portions of the Software.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-     * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-     * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-     * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-     * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-     * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-     * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-     * OTHER DEALINGS IN THE SOFTWARE.
-     *
-     */
+	/**
+	 * Django - like template inheritance emulation for PHP
+	 *
+	 * @author Daniel Dornhardt <daniel AT dornhardt.com>
+	 *
+	 * I liked djangos template inheritance - system, so I decided to create
+	 * something similar for PHP.
+	 *
+	 * It's not pretty, it's not well tested (yet), but from my intuition it should be
+	 * simple to use and pretty fast.
+	 *
+	 * @copyright Copyright (c) 2008 by Daniel Dornhardt
+	 * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+	 *
+	 * Permission is hereby granted, free of charge, to any person
+	 * obtaining a copy of this software and associated documentation
+	 * files (the "Software"), to deal in the Software without
+	 * restriction, including without limitation the rights to use,
+	 * copy, modify, merge, publish, distribute, sublicense, and/or sell
+	 * copies of the Software, and to permit persons to whom the
+	 * Software is furnished to do so, subject to the following
+	 * conditions:
+	 *
+	 * The above copyright notice and this permission notice shall be
+	 * included in all copies or substantial portions of the Software.
+	 *
+	 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+	 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+	 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+	 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+	 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+	 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+	 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+	 * OTHER DEALINGS IN THE SOFTWARE.
+	 *
+	 */
 
 /*
 
@@ -236,150 +236,150 @@ 
 
 That's it for now. If you have questions, ideas or problems, please write me at daniel AT dornhardt.com.
 */
-    if (! defined('TI_VIEWS_DIR') ) {
-        if (defined('APPPATH')) {
-            define('TI_VIEWS_DIR', APPPATH.'views/');
-        } else {
-            define('TI_VIEWS_DIR', '');
-        }
-    }
+	if (! defined('TI_VIEWS_DIR') ) {
+		if (defined('APPPATH')) {
+			define('TI_VIEWS_DIR', APPPATH.'views/');
+		} else {
+			define('TI_VIEWS_DIR', '');
+		}
+	}
 //    echo TI_VIEWS_DIR;
-    define('TI_MARKER_EXTEND_BLOCK_HERE', '{{{[[[{[{[{[INSERT_BASE_DATA_HERE]}]}]}]]]}}}');
-
-    /**
-     * Gather output from extended templates
-     *
-     * array('blockname' => 'blockContent', ...)
-     */
-    $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] = array();
-
-    /**
-     * keep the name of the last marker
-     */
-    $GLOBALS['TI_CURRENT_BLOCKNAME'] = '';
-
-    /**
-     * keep the name of the file we are extending right now
-     */
-    $GLOBALS['TI_CURRENT_BASE_TEMPLATE'] = '';
-
-    /**
-     * Called to extend some parts of the base template $filename with content from this file
-     *
-     * @param string $filename - filename of the base template
-     */
-    function extend($filename) {
+	define('TI_MARKER_EXTEND_BLOCK_HERE', '{{{[[[{[{[{[INSERT_BASE_DATA_HERE]}]}]}]]]}}}');
+
+	/**
+	 * Gather output from extended templates
+	 *
+	 * array('blockname' => 'blockContent', ...)
+	 */
+	$GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] = array();
+
+	/**
+	 * keep the name of the last marker
+	 */
+	$GLOBALS['TI_CURRENT_BLOCKNAME'] = '';
+
+	/**
+	 * keep the name of the file we are extending right now
+	 */
+	$GLOBALS['TI_CURRENT_BASE_TEMPLATE'] = '';
+
+	/**
+	 * Called to extend some parts of the base template $filename with content from this file
+	 *
+	 * @param string $filename - filename of the base template
+	 */
+	function extend($filename) {
 //    	echo "externd";
-        $GLOBALS['TI_CURRENT_BASE_TEMPLATE'] = $filename;
+		$GLOBALS['TI_CURRENT_BASE_TEMPLATE'] = $filename;
 //        exit();
-    }
-
-    /**
-     * End the extension process for this file. Needs to be called after all blocks
-     * have been set.
-     *
-     */
-    function end_extend() {
-    	//echo 'tttttttttttt';
-        if (isset($GLOBALS['CI'])) {
-            $GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
-        }
-        else {
-            include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
-        }
-    }
-
-    /**
-     * Start a top-level block. Its contents can be replaced from within child templates.
-     *
-     * @param string $blockname
-     */
-    function start_block_marker($blockname) {
-        // remember block name for end_block_marker()
-        $GLOBALS['TI_CURRENT_BLOCKNAME'] = $blockname;
-        // start caching this blocks output
-        ob_start();
-    }
-
-    /**
-     * End a top-level block. Its contents can be replaced from within child templates.
-     *
-     */
-    function end_block_marker() {
-        // get block content
-        $thisBlocksContent = ob_get_clean();
-        // check if we got data for this block from child templates
-        if (array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
-            // if yes, use that data instead of what's in this block
-            // - except we got a marker that the child wants us to include this blocks content
-            // in some places. If so, place our data into those spots.
-            $thisBlocksContent = str_replace(
-                TI_MARKER_EXTEND_BLOCK_HERE,
-                $thisBlocksContent,
-                $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']]
-            );
-        }
-        // output result
-        echo $thisBlocksContent;
-    }
-
-
-    /**
-     * Mark the start of a block as content to be embedded into the base template.
-     *
-     * @param string $blockname
-     */
-    function startblock($blockname) {
-        // remember block name for endblock()
-        $GLOBALS['TI_CURRENT_BLOCKNAME'] = $blockname;
-        // start caching this blocks output
-        ob_start();
-    }
-
-    /**
-     * Mark the end of a block as content to be embedded into the base template.
-     */
-    function endblock() {
-        // get block content
-        $thisBlocksContent = ob_get_clean();
-        // check if we got data for this block from child templates
-        if (array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
-            // check if we got a marker that the child wants us to include this blocks content
-            // in some places. If so, place our data into those spots.
-            $thisBlocksContent = str_replace(
-                TI_MARKER_EXTEND_BLOCK_HERE,
-                $thisBlocksContent,
-                $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']]
-            );
-        }
-        // save this blocks content for use in templates higher up in the hierarchy
-        $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']] = $thisBlocksContent;
-    }
-
-    /**
-     * Insert a marker at this position to add the content from the base templates to this block.
-     */
-    function get_extended_block() {
-        echo TI_MARKER_EXTEND_BLOCK_HERE;
-    }
-
-    /**
-     * Check if this block's contents will be needed.
-     * True if no child did override this block or a child needs this block's content
-     *
-     * @return bool
-     */
-    function block_rendering_neccessary() {
-        // check if no child did override this block
-        if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
-            return true;
-        }
-        // check if there is an extension marker in the child blocks data. If so, the
-        // rendering of this block is required
-        if (false === strpos($GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']], TI_MARKER_EXTEND_BLOCK_HERE)) {
-            return false;
-        } else {
-            return true;
-        }
-    }
+	}
+
+	/**
+	 * End the extension process for this file. Needs to be called after all blocks
+	 * have been set.
+	 *
+	 */
+	function end_extend() {
+		//echo 'tttttttttttt';
+		if (isset($GLOBALS['CI'])) {
+			$GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
+		}
+		else {
+			include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
+		}
+	}
+
+	/**
+	 * Start a top-level block. Its contents can be replaced from within child templates.
+	 *
+	 * @param string $blockname
+	 */
+	function start_block_marker($blockname) {
+		// remember block name for end_block_marker()
+		$GLOBALS['TI_CURRENT_BLOCKNAME'] = $blockname;
+		// start caching this blocks output
+		ob_start();
+	}
+
+	/**
+	 * End a top-level block. Its contents can be replaced from within child templates.
+	 *
+	 */
+	function end_block_marker() {
+		// get block content
+		$thisBlocksContent = ob_get_clean();
+		// check if we got data for this block from child templates
+		if (array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
+			// if yes, use that data instead of what's in this block
+			// - except we got a marker that the child wants us to include this blocks content
+			// in some places. If so, place our data into those spots.
+			$thisBlocksContent = str_replace(
+				TI_MARKER_EXTEND_BLOCK_HERE,
+				$thisBlocksContent,
+				$GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']]
+			);
+		}
+		// output result
+		echo $thisBlocksContent;
+	}
+
+
+	/**
+	 * Mark the start of a block as content to be embedded into the base template.
+	 *
+	 * @param string $blockname
+	 */
+	function startblock($blockname) {
+		// remember block name for endblock()
+		$GLOBALS['TI_CURRENT_BLOCKNAME'] = $blockname;
+		// start caching this blocks output
+		ob_start();
+	}
+
+	/**
+	 * Mark the end of a block as content to be embedded into the base template.
+	 */
+	function endblock() {
+		// get block content
+		$thisBlocksContent = ob_get_clean();
+		// check if we got data for this block from child templates
+		if (array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
+			// check if we got a marker that the child wants us to include this blocks content
+			// in some places. If so, place our data into those spots.
+			$thisBlocksContent = str_replace(
+				TI_MARKER_EXTEND_BLOCK_HERE,
+				$thisBlocksContent,
+				$GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']]
+			);
+		}
+		// save this blocks content for use in templates higher up in the hierarchy
+		$GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']] = $thisBlocksContent;
+	}
+
+	/**
+	 * Insert a marker at this position to add the content from the base templates to this block.
+	 */
+	function get_extended_block() {
+		echo TI_MARKER_EXTEND_BLOCK_HERE;
+	}
+
+	/**
+	 * Check if this block's contents will be needed.
+	 * True if no child did override this block or a child needs this block's content
+	 *
+	 * @return bool
+	 */
+	function block_rendering_neccessary() {
+		// check if no child did override this block
+		if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
+			return true;
+		}
+		// check if there is an extension marker in the child blocks data. If so, the
+		// rendering of this block is required
+		if (false === strpos($GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'][$GLOBALS['TI_CURRENT_BLOCKNAME']], TI_MARKER_EXTEND_BLOCK_HERE)) {
+			return false;
+		} else {
+			return true;
+		}
+	}
 ?>  
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -236,7 +236,7 @@ 
 
 That's it for now. If you have questions, ideas or problems, please write me at daniel AT dornhardt.com.
 */
-    if (! defined('TI_VIEWS_DIR') ) {
+    if ( ! defined('TI_VIEWS_DIR')) {
         if (defined('APPPATH')) {
             define('TI_VIEWS_DIR', APPPATH.'views/');
         } else {
@@ -285,7 +285,7 @@ 
             $GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
         }
         else {
-            include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
+            include realpath(TI_VIEWS_DIR.$GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
         }
     }
 
@@ -371,7 +371,7 @@ 
      */
     function block_rendering_neccessary() {
         // check if no child did override this block
-        if (!array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'] )) {
+        if ( ! array_key_exists($GLOBALS['TI_CURRENT_BLOCKNAME'], $GLOBALS['TI_EXTENDED_BASE_TEMPLATE_DATA'])) {
             return true;
         }
         // check if there is an extension marker in the child blocks data. If so, the

Braces +1 added lines, -2 removed lines

@@ -283,8 +283,7 @@
     	//echo 'tttttttttttt';
         if (isset($GLOBALS['CI'])) {
             $GLOBALS['CI']->load->view($GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
-        }
-        else {
+        } else {
             include realpath( TI_VIEWS_DIR . $GLOBALS['TI_CURRENT_BASE_TEMPLATE']);
         }
     }

web_interface/astpp/system/helpers/text_helper.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 			return $str;
 		}
 
-		preg_match('/^\s*+(?:\S++\s*+){1,'.(int) $limit.'}/', $str, $matches);
+		preg_match('/^\s*+(?:\S++\s*+){1,'.(int)$limit.'}/', $str, $matches);
 
 		if (strlen($str) == strlen($matches[0]))
 		{
@@ -117,9 +117,9 @@ 
 {
 	function ascii_to_entities($str)
 	{
-		$count	= 1;
-		$out	= '';
-		$temp	= array();
+		$count = 1;
+		$out = '';
+		$temp = array();
 
 		for ($i = 0, $s = strlen($str); $i < $s; $i++)
 		{
@@ -211,7 +211,7 @@ 
 		if ($all)
 		{
 			$str = str_replace(array("&amp;", "&lt;", "&gt;", "&quot;", "&apos;", "&#45;"),
-								array("&","<",">","\"", "'", "-"),
+								array("&", "<", ">", "\"", "'", "-"),
 								$str);
 		}
 
@@ -454,8 +454,8 @@ 
 				}
 
 				// Trim the word down
-				$temp .= substr($line, 0, $charlim-1);
-				$line = substr($line, $charlim-1);
+				$temp .= substr($line, 0, $charlim - 1);
+				$line = substr($line, $charlim - 1);
 			}
 
 			// If $temp contains data it means we had to split up an over-length

Braces +13 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -138,8 +140,7 @@ 
 				}
 
 				$out .= $str[$i];
-			}
-			else
+			} else
 			{
 				if (count($temp) == 0)
 				{
@@ -191,13 +192,11 @@ 
 				{
 					$out .= chr($digits);
 
-				}
-				elseif ($digits < 2048)
+				} elseif ($digits < 2048)
 				{
 					$out .= chr(192 + (($digits - ($digits % 64)) / 64));
 					$out .= chr(128 + ($digits % 64));
-				}
-				else
+				} else
 				{
 					$out .= chr(224 + (($digits - ($digits % 4096)) / 4096));
 					$out .= chr(128 + ((($digits % 4096) - ($digits % 64)) / 64));
@@ -256,8 +255,7 @@ 
 			if ($replacement != '')
 			{
 				$str = preg_replace("/({$delim})(".str_replace('\*', '\w*?', preg_quote($badword, '/')).")({$delim})/i", "\\1{$replacement}\\3", $str);
-			}
-			else
+			} else
 			{
 				$str = preg_replace("/({$delim})(".str_replace('\*', '\w*?', preg_quote($badword, '/')).")({$delim})/ie", "'\\1'.str_repeat('#', strlen('\\2')).'\\3'", $str);
 			}
@@ -369,8 +367,7 @@ 
 		if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php'))
 		{
 			include(APPPATH.'config/'.ENVIRONMENT.'/foreign_chars.php');
-		}
-		elseif (is_file(APPPATH.'config/foreign_chars.php'))
+		} elseif (is_file(APPPATH.'config/foreign_chars.php'))
 		{
 			include(APPPATH.'config/foreign_chars.php');
 		}
@@ -403,8 +400,9 @@ 
 	function word_wrap($str, $charlim = '76')
 	{
 		// Se the character limit
-		if ( ! is_numeric($charlim))
-			$charlim = 76;
+		if ( ! is_numeric($charlim)) {
+					$charlim = 76;
+		}
 
 		// Reduce multiple spaces
 		$str = preg_replace("| +|", " ", $str);
@@ -463,8 +461,7 @@ 
 			if ($temp != '')
 			{
 				$output .= $temp."\n".$line;
-			}
-			else
+			} else
 			{
 				$output .= $line;
 			}
@@ -521,8 +518,7 @@ 
 		if ($position === 1)
 		{
 			$end = substr($str, 0, -($max_length - strlen($beg)));
-		}
-		else
+		} else
 		{
 			$end = substr($str, -($max_length - strlen($beg)));
 		}

web_interface/astpp/system/helpers/number_helper.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 {
 	function byte_format($num, $precision = 1)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->lang->load('number');
 
 		if ($num >= 1000000000000)

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -45,23 +47,19 @@ 
 		{
 			$num = round($num / 1099511627776, $precision);
 			$unit = $CI->lang->line('terabyte_abbr');
-		}
-		elseif ($num >= 1000000000)
+		} elseif ($num >= 1000000000)
 		{
 			$num = round($num / 1073741824, $precision);
 			$unit = $CI->lang->line('gigabyte_abbr');
-		}
-		elseif ($num >= 1000000)
+		} elseif ($num >= 1000000)
 		{
 			$num = round($num / 1048576, $precision);
 			$unit = $CI->lang->line('megabyte_abbr');
-		}
-		elseif ($num >= 1000)
+		} elseif ($num >= 1000)
 		{
 			$num = round($num / 1024, $precision);
 			$unit = $CI->lang->line('kilobyte_abbr');
-		}
-		else
+		} else
 		{
 			$unit = $CI->lang->line('bytes');
 			return number_format($num).' '.$unit;

web_interface/astpp/system/language/english/ftp_lang.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-$lang['ftp_no_connection']			= "Unable to locate a valid connection ID. Please make sure you are connected before peforming any file routines.";
-$lang['ftp_unable_to_connect']		= "Unable to connect to your FTP server using the supplied hostname.";
+$lang['ftp_no_connection'] = "Unable to locate a valid connection ID. Please make sure you are connected before peforming any file routines.";
+$lang['ftp_unable_to_connect'] = "Unable to connect to your FTP server using the supplied hostname.";
 $lang['ftp_unable_to_login']		= "Unable to login to your FTP server. Please check your username and password.";
 $lang['ftp_unable_to_makdir']		= "Unable to create the directory you have specified.";
 $lang['ftp_unable_to_changedir']	= "Unable to change directories.";

web_interface/astpp/system/language/english/unit_test_lang.php

Spacing +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-$lang['ut_test_name']		= 'Test Name';
-$lang['ut_test_datatype']	= 'Test Datatype';
-$lang['ut_res_datatype']	= 'Expected Datatype';
-$lang['ut_result']			= 'Result';
-$lang['ut_undefined']		= 'Undefined Test Name';
+$lang['ut_test_name'] = 'Test Name';
+$lang['ut_test_datatype'] = 'Test Datatype';
+$lang['ut_res_datatype'] = 'Expected Datatype';
+$lang['ut_result'] = 'Result';
+$lang['ut_undefined'] = 'Undefined Test Name';
 $lang['ut_file']			= 'File Name';
 $lang['ut_line']			= 'Line Number';
 $lang['ut_passed']			= 'Passed';
@@ -16,9 +16,9 @@ 
 $lang['ut_string']			= 'String';
 $lang['ut_array']			= 'Array';
 $lang['ut_object']			= 'Object';
-$lang['ut_resource']		= 'Resource';
-$lang['ut_null']			= 'Null';
-$lang['ut_notes']			= 'Notes';
+$lang['ut_resource'] = 'Resource';
+$lang['ut_null'] = 'Null';
+$lang['ut_notes'] = 'Notes';
 
 
 /* End of file unit_test_lang.php */

web_interface/astpp/system/language/english/profiler_lang.php

Spacing +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-$lang['profiler_database']		= 'DATABASE';
+$lang['profiler_database'] = 'DATABASE';
 $lang['profiler_controller_info'] = 'CLASS/METHOD';
 $lang['profiler_benchmarks']	= 'BENCHMARKS';
-$lang['profiler_queries']		= 'QUERIES';
-$lang['profiler_get_data']		= 'GET DATA';
+$lang['profiler_queries'] = 'QUERIES';
+$lang['profiler_get_data'] = 'GET DATA';
 $lang['profiler_post_data']		= 'POST DATA';
 $lang['profiler_uri_string']	= 'URI STRING';
 $lang['profiler_memory_usage']	= 'MEMORY USAGE';
@@ -12,12 +12,12 @@ 
 $lang['profiler_session_data']	= 'SESSION DATA';
 $lang['profiler_headers']		= 'HTTP HEADERS';
 $lang['profiler_no_db']			= 'Database driver is not currently loaded';
-$lang['profiler_no_queries']	= 'No queries were run';
+$lang['profiler_no_queries'] = 'No queries were run';
 $lang['profiler_no_post']		= 'No POST data exists';
 $lang['profiler_no_get']		= 'No GET data exists';
 $lang['profiler_no_uri']		= 'No URI data exists';
-$lang['profiler_no_memory']		= 'Memory Usage Unavailable';
-$lang['profiler_no_profiles']	= 'No Profile data - all Profiler sections have been disabled.';
+$lang['profiler_no_memory'] = 'Memory Usage Unavailable';
+$lang['profiler_no_profiles'] = 'No Profile data - all Profiler sections have been disabled.';
 $lang['profiler_section_hide']	= 'Hide';
 $lang['profiler_section_show']	= 'Show';