iNextrix / ASTPP

web_interface/astpp/system/database/drivers/mssql/mssql_driver.php

Indentation +21 added lines, -21 removed lines

@@ -293,13 +293,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Insert ID
-	*
-	* Returns the last id created in the Identity column.
-	*
-	* @access public
-	* @return integer
-	*/
+	 * Insert ID
+	 *
+	 * Returns the last id created in the Identity column.
+	 *
+	 * @access public
+	 * @return integer
+	 */
 	function insert_id()
 	{
 		$ver = self::_parse_major_version($this->version());
@@ -312,15 +312,15 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return int16 major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return int16 major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);
@@ -330,11 +330,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Version number query string
-	*
-	* @access public
-	* @return string
-	*/
+	 * Version number query string
+	 *
+	 * @access public
+	 * @return string
+	 */
 	function _version()
 	{
 		return "SELECT @@VERSION AS ver";

web_interface/astpp/system/database/drivers/sqlsrv/sqlsrv_driver.php

Indentation +21 added lines, -21 removed lines

@@ -277,13 +277,13 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Insert ID
-	*
-	* Returns the last id created in the Identity column.
-	*
-	* @access public
-	* @return integer
-	*/
+	 * Insert ID
+	 *
+	 * Returns the last id created in the Identity column.
+	 *
+	 * @access public
+	 * @return integer
+	 */
 	function insert_id()
 	{
 		return $this->query('select @@IDENTITY as insert_id')->row('insert_id');
@@ -292,15 +292,15 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Parse major version
-	*
-	* Grabs the major version number from the
-	* database server version string passed in.
-	*
-	* @access private
-	* @param string $version
-	* @return int16 major version number
-	*/
+	 * Parse major version
+	 *
+	 * Grabs the major version number from the
+	 * database server version string passed in.
+	 *
+	 * @access private
+	 * @param string $version
+	 * @return int16 major version number
+	 */
 	function _parse_major_version($version)
 	{
 		preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $version, $ver_info);
@@ -310,11 +310,11 @@ 
 	// --------------------------------------------------------------------
 
 	/**
-	* Version number query string
-	*
-	* @access public
-	* @return string
-	*/
+	 * Version number query string
+	 *
+	 * @access public
+	 * @return string
+	 */
 	function _version()
 	{
 		$info = sqlsrv_server_info($this->conn_id);

web_interface/astpp/system/database/DB_active_rec.php

Indentation +108 added lines, -108 removed lines

@@ -2016,138 +2016,138 @@
 
 
 /**
-	 * Insert__Update_Batch
-	 *
-         * Compiles an on duplicate key update string and runs the query
-         *
-         * @since     1.6.2
-         * @access    public
-         * @param     string    the table to retrieve the results from
-         * @param     array     an associative array of update value
-         * @return    object	 */
-    public function insert_update_batch($table = '', $set = NULL)
-    {
-            if ( ! is_null($set))
-            {
-                $this->set($set);
-            }
-
-            if (count($this->ar_set) == 0)
-            {
-                if ($this->db_debug)
-                {
-                        return $this->display_error('db_must_use_set');
-                }
-                    return FALSE;
-            }
-
-            if ($table == '')
-                    {
-                if ( ! isset($this->ar_from[0]))
-                {
-                    if ($this->db_debug)
-                    {
-                        return $this->display_error('db_must_set_table');
-                    }
-                    return FALSE;
-                }
+ * Insert__Update_Batch
+ *
+ * Compiles an on duplicate key update string and runs the query
+ *
+ * @since     1.6.2
+ * @access    public
+ * @param     string    the table to retrieve the results from
+ * @param     array     an associative array of update value
+ * @return    object	 */
+	public function insert_update_batch($table = '', $set = NULL)
+	{
+			if ( ! is_null($set))
+			{
+				$this->set($set);
+			}
+
+			if (count($this->ar_set) == 0)
+			{
+				if ($this->db_debug)
+				{
+						return $this->display_error('db_must_use_set');
+				}
+					return FALSE;
+			}
+
+			if ($table == '')
+					{
+				if ( ! isset($this->ar_from[0]))
+				{
+					if ($this->db_debug)
+					{
+						return $this->display_error('db_must_set_table');
+					}
+					return FALSE;
+				}
                 
-                $table = $this->ar_from[0];
-            }
+				$table = $this->ar_from[0];
+			}
     
         
 //            $sql = $this->_insert_update_batch($this->_protect_identifiers($this->dbprefix.$table), $this->ar_set );
 		for ($i = 1, $total = count($this->ar_set); $i < $total; $i++)
 		{
 
-		        $sql = $this->_insert_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_set[$this->_protect_identifiers($i)]);
+				$sql = $this->_insert_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_set[$this->_protect_identifiers($i)]);
 
 			//echo $sql;
 
 			$this->query($sql);
 		}
         
-            $this->_reset_write();
-            return $this->query($sql);
-     }
+			$this->_reset_write();
+			return $this->query($sql);
+	 }
 
 
 
   /**
-     * Insert_On_Duplicate_Update_Batch
-     *
-     * Compiles batch insert strings and runs the queries
-     * MODIFIED to do a MySQL 'ON DUPLICATE KEY UPDATE'
-     *
-     * @access public
-     * @param string the table to retrieve the results from
-     * @param array an associative array of insert values
-     * @return object
-     */
-     function insert_on_duplicate_update_batch($table = '', $set = NULL)
-     {
-          if ( ! is_null($set))
-          {
-                   $this->set_insert_batch($set);
-          }
+   * Insert_On_Duplicate_Update_Batch
+   *
+   * Compiles batch insert strings and runs the queries
+   * MODIFIED to do a MySQL 'ON DUPLICATE KEY UPDATE'
+   *
+   * @access public
+   * @param string the table to retrieve the results from
+   * @param array an associative array of insert values
+   * @return object
+   */
+	 function insert_on_duplicate_update_batch($table = '', $set = NULL)
+	 {
+		  if ( ! is_null($set))
+		  {
+				   $this->set_insert_batch($set);
+		  }
         
-          if (count($this->ar_set) == 0)
-          {
-                   if ($this->db_debug)
-                   {
-                    //No valid data array.  Folds in cases where keys and values did not match up
-                            return $this->display_error('db_must_use_set');
-                   }
-                   return FALSE;
-          }
-
-          if ($table == '')
-          {
-                  if ( ! isset($this->ar_from[0]))
-                  {
-                    if ($this->db_debug)
-                    {
-                             return $this->display_error('db_must_set_table');
-                    }
-                    return FALSE;
-                  }
-
-                  $table = $this->ar_from[0];
-          }
-          // Batch this baby
-          for ($i = 0, $total = count($this->ar_set); $i < $total; $i = $i + 500)
-          {
-                $sql = $this->_insert_on_duplicate_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_keys, array_slice($this->ar_set, $i, 500));
-
-                // echo $sql; 
-                $this->query($sql);
-          }
-          $this->_reset_write();
-          return TRUE;
-     }  
+		  if (count($this->ar_set) == 0)
+		  {
+				   if ($this->db_debug)
+				   {
+					//No valid data array.  Folds in cases where keys and values did not match up
+							return $this->display_error('db_must_use_set');
+				   }
+				   return FALSE;
+		  }
+
+		  if ($table == '')
+		  {
+				  if ( ! isset($this->ar_from[0]))
+				  {
+					if ($this->db_debug)
+					{
+							 return $this->display_error('db_must_set_table');
+					}
+					return FALSE;
+				  }
+
+				  $table = $this->ar_from[0];
+		  }
+		  // Batch this baby
+		  for ($i = 0, $total = count($this->ar_set); $i < $total; $i = $i + 500)
+		  {
+				$sql = $this->_insert_on_duplicate_update_batch($this->_protect_identifiers($table, TRUE, NULL, FALSE), $this->ar_keys, array_slice($this->ar_set, $i, 500));
+
+				// echo $sql; 
+				$this->query($sql);
+		  }
+		  $this->_reset_write();
+		  return TRUE;
+	 }  
 
 
 
 
 	/**
-          * Insert_on_duplicate_update_batch statement
-          *
-          * Generates a platform-specific insert string from the supplied data
-          * MODIFIED to include ON DUPLICATE UPDATE
-          *
-          * @access public
-        * @param string the table name
-          * @param array the insert keys
-          * @param array the insert values
-          * @return string
-          */
-         function _insert_on_duplicate_update_batch($table, $keys, $values)
-         {
-                  foreach($keys as $key)
-                  $update_fields[] = $key.'=VALUES('.$key.')';
+	 * Insert_on_duplicate_update_batch statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 * MODIFIED to include ON DUPLICATE UPDATE
+	 *
+	 * @access public
+	 * @param string the table name
+	 * @param array the insert keys
+	 * @param array the insert values
+	 * @return string
+	 */
+		 function _insert_on_duplicate_update_batch($table, $keys, $values)
+		 {
+				  foreach($keys as $key)
+				  $update_fields[] = $key.'=VALUES('.$key.')';
            
-                  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
-         } 
+				  return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
+		 } 
 
 
 	/**

web_interface/astpp/system/helpers/smiley_helper.php

Indentation +1 added lines, -1 removed lines

@@ -231,7 +231,7 @@
 	{
 		if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/smileys.php'))
 		{
-		    include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php');
+			include(APPPATH.'config/'.ENVIRONMENT.'/smileys.php');
 		}
 		elseif (file_exists(APPPATH.'config/smileys.php'))
 		{

web_interface/astpp/system/helpers/form_helper.php

Indentation +61 added lines, -61 removed lines

@@ -79,14 +79,14 @@ 
 	}

 }

 if(!function_exists('form_breadcrumb')){

-    function form_breadcrumb($info=''){

-     $form=false;

-     if(!empty($info))

+	function form_breadcrumb($info=''){

+	 $form=false;

+	 if(!empty($info))

  	$form.="<div class='breadcrumb'>

 	        <a href='".$info['url']."'>".$info['name']."</a>

 		</div>";

-    return $form;

-    }

+	return $form;

+	}

 }

 // ------------------------------------------------------------------------

 

@@ -183,7 +183,7 @@ 
 {

 	function form_input($data = '', $value = '', $extra = '')

 	{

-        	$data["class"] = "col-md-5 form-control";

+			$data["class"] = "col-md-5 form-control";

 		$defaults = array('type' => 'text', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value);

 

 		return "<input "._parse_form_attributes($data, $defaults).$extra." />";

@@ -198,7 +198,7 @@ 
 	function form_image($data = '', $value = '', $extra = '')

 	{

 		//print_r($data);exit;

-    	//$data["class"] = "col-md-5 form-control";

+		//$data["class"] = "col-md-5 form-control";

 		$defaults = array('type' => 'image', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => $value);

 		if($data['value'] != ''){

 			return	'<div class="col-md-5 no-padding">

@@ -212,9 +212,9 @@ 
                    		</span>

                    </div>

                </div>';

-        }else{

-        	return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

-        }	

+		}else{

+			return "<div class='col-md-5 no-padding'><image "._parse_form_attributes($data, $defaults).$extra." /></div>";

+		}	

 		

 	}

 }

@@ -224,9 +224,9 @@ 
 {

 	function form_img_delete($data = '', $value = '', $extra = '')

 	{

-	            //  echo '<pre>'; print_r($data); exit;

-        	//$data["class"] = "col-md-5 form-control";

-        	$data['value']='Delete';

+				//  echo '<pre>'; print_r($data); exit;

+			//$data["class"] = "col-md-5 form-control";

+			$data['value']='Delete';

 		$defaults = array('type' => 'button', 'name' => (( ! is_array($data)) ? $data : ''), 'value' => 'Delete');

 

 		return "<div class='col-md-5 no-padding'><input "._parse_form_attributes($data, $defaults).$extra." /></div>";

@@ -335,7 +335,7 @@ 
 	function form_multiselect($name = '', $options = array(), $selected = array(), $extra = '')

 	{

             

-            if ( ! strpos($extra, 'multiple'))

+			if ( ! strpos($extra, 'multiple'))

 		{

                 

 			$extra .= ' multiple="multiple"';

@@ -378,23 +378,23 @@ 
 

 		if ($extra != '') $extra = ' '.$extra;

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-                if(is_array($name)){

-                     $str=null;

-                     foreach($name as $key=>$value){

-                      if($key !='class' && $key!='disabled')

-                      $str.=$key."='$value' ";

-                     }

-                     if(isset($name['disabled']) && $name['disabled']== 'disabled'){

-                      $str.='disabled = "disabled"';

-                     }

-                               $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

-                }else{

-                    if(!empty($extra)){

-                        $form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

-                    }else{

-                        $form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

-                    }

-                }

+				if(is_array($name)){

+					 $str=null;

+					 foreach($name as $key=>$value){

+					  if($key !='class' && $key!='disabled')

+					  $str.=$key."='$value' ";

+					 }

+					 if(isset($name['disabled']) && $name['disabled']== 'disabled'){

+					  $str.='disabled = "disabled"';

+					 }

+							   $form = '<select '.$str." class='col-md-5 form-control selectpicker ".$name['class'].$extra."' data-live-search='true'>\n";

+				}else{

+					if(!empty($extra)){

+						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker ".$extra."' data-live-search='true'>\n";

+					}else{

+						$form = '<select  name="'.$name.'"' .$multiple." class='col-md-5 form-control selectpicker' data-live-search='true'>\n";

+					}

+				}

 //                if($extra != '' ){

 //                    $form .= '<option value=""></option>';

 //                }

@@ -423,10 +423,10 @@ 
 				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

 			}

 		}

-                if(isset($name['option_value']) && isset($name['option_text'])){

+				if(isset($name['option_value']) && isset($name['option_text'])){

 		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

 		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

-                }

+				}

 		$form .= '</select>';

 //echo $form; exit;

 		return $form;

@@ -451,16 +451,16 @@ 
 			}

 		}

 		if ($extra != '') $extra = ' '.$extra;

-                $class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+				$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

 		if(is_array($name) && !isset($name["id"])){

-                    $form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

-                }else if(is_array($name) && isset($name["id"])){

-                    $form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

-                }

-                else{

-                    $form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

-                }   

+					$form = '<select name="'.$name['name'].'"'." class='$class' data-live-search='true'>\n";

+				}else if(is_array($name) && isset($name["id"])){

+					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='$class' data-live-search='true'>\n";

+				}

+				else{

+					$form = '<select name="'.$name.'"' .$multiple." class='$class' data-live-search='true'>\n";

+				}   

 

 		$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

@@ -487,10 +487,10 @@ 
 				$form .= '<option value="'.$key.'"'.$sel.'>'.(string) $val."</option>\n";

 			}

 		}

-                if(isset($name['option_value']) && isset($name['option_text'])){

+				if(isset($name['option_value']) && isset($name['option_text'])){

 		  $sel= isset($name['value']) && $name['value']==$name['option_value']?'selected ="selected"':'';

 		  $form .= '<option value="'.$name['option_value'].'"'.$sel.'>'.(string) $name['option_text']."</option>\n";

-                }

+				}

 		$form .= '</select>';

 

 		return $form;

@@ -521,30 +521,30 @@ 
 		  ASTPP  3.0  For Search Display In

 		*/

 		if ($extra != '' && !is_array($extra)) $extra = ' '.$extra;

-	        /**********************************************************/

+			/**********************************************************/

 

-	    $class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

+		$class= isset($name['class']) && !empty($name['class']) ? "col-md-5 form-control selectpicker $name[class]" :"col-md-5 form-control selectpicker";

 

 		$multiple = (count($selected) > 1 && strpos($extra, 'multiple') === FALSE) ? ' multiple="multiple"' : '';

-                /*

+				/*

 		  ASTPP  3.0  For Search Display In

 		*/

-                if(empty($extra)){

-                /*********************************/

+				if(empty($extra)){

+				/*********************************/

 		if(is_array($name) && !isset($name["id"])){

-                    $form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-                }else if(is_array($name) && isset($name["id"])){

-                    $form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-                }else{

-                    $form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

-                }   

+					$form = '<select name="'.$name['name'].'"'." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				}else if(is_array($name) && isset($name["id"])){

+					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				}else{

+					$form = '<select name="'.$name.'"' .$multiple." class='col-md-5 form-control $class' style='margin-left:5px;' data-live-search='true'>\n";

+				}   

  /*

 		  ASTPP  3.0  For Search Display In

 		*/

-                }else{

+				}else{

 

-                    $form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

-                 }

+					$form = '<select name="'.$name['name'].'" id="'.$name['id'].'"'."class='".$extra['class']." $class' style='".$extra['style']."' data-live-search='true'>\n";

+				 }

 		//$form .= '<option value=""> --Select-- </option>';

 		foreach ($options as $key => $val)

 		{

@@ -693,11 +693,11 @@ 
 		$class=NULL;

 

 //echo "<pre>".$value; print_r($extra); exit;

-	    if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

+		if(isset($extra[$value]) && !empty($extra) && $extra[$value] == '0'){

 		$class='onoffswitch-inner';

-	    }else{

+		}else{

 		$class='onoffswitch-inner';

- 	    }

+ 		}

 /*            if(isset($extra) && $extra != ''){

 	      if(isset($extra[0])){

 	      if(strtolower($extra[0]) == 'enable' || $value == "0"){

@@ -1413,7 +1413,7 @@ 
 			if(strtolower(trim($value)) == strtolower(trim($selected)))

 			{

                             

-                            $form .= ' selected="selected" >';

+							$form .= ' selected="selected" >';

                                 

 			}

 			else

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

web_interface/astpp/cron/cron.php

Indentation +13 added lines, -13 removed lines

@@ -12,20 +12,20 @@ 
 
 // Set index.php location
 if (isset($config['CRON_CI_INDEX']) && $config['CRON_CI_INDEX'])
-    define('CRON_CI_INDEX', $config['CRON_CI_INDEX']);
+	define('CRON_CI_INDEX', $config['CRON_CI_INDEX']);
 else
-    define('CRON_CI_INDEX', '../index.php');
+	define('CRON_CI_INDEX', '../index.php');
 
 if (count($argv) <= 2)
-    if (count($config['argv'])) {
-        $path = $argv[1];
-        unset($argv[1]);
+	if (count($config['argv'])) {
+		$path = $argv[1];
+		unset($argv[1]);
 //        $argv = array_merge($argv, $config["argv"][$path]);
-        $argv[0] = $argv[0];
-        $argv[1] =$config["argv"][$path];
-        $_SERVER['argv'] = $argv;
-    } else
-        die('Use: php cron.php controller/method');
+		$argv[0] = $argv[0];
+		$argv[1] =$config["argv"][$path];
+		$_SERVER['argv'] = $argv;
+	} else
+		die('Use: php cron.php controller/method');
 
 // Simulate an HTTP request
 $_SERVER['PATH_INFO'] = $argv[1];
@@ -45,9 +45,9 @@ 
 $output = ob_get_contents();
 
 if (CRON_FLUSH_BUFFERS === TRUE)
-    while (@ob_end_flush());          // display buffer contents
-        else
-    ob_end_clean();
+	while (@ob_end_flush());          // display buffer contents
+		else
+	ob_end_clean();
 
 echo "\n";
 ?>

web_interface/astpp/application/controllers/broadcastemail.php

Indentation +17 added lines, -17 removed lines

@@ -22,26 +22,26 @@
 ###############################################################################
 
 class Broadcastemail extends CI_Controller {
-    function __construct()
-    {
+	function __construct()
+	{
 	parent::__construct();
 	if(!defined( 'CRON' ) )  
 	  exit();
-        $this->load->model("db_model");
-        $this->load->library("astpp/email_lib");
-    }
-    function broadcast_email(){
+		$this->load->model("db_model");
+		$this->load->library("astpp/email_lib");
+	}
+	function broadcast_email(){
 	
-       $where = array("status"=>"1");
-        $query = $this->db_model->getSelect("*", "mail_details", $where);
-        if($query->num_rows >0){
-            $account_data = $query->result_array();
-            foreach($account_data as $data_key =>$account_value){
-		     $account_value['history_id']=$account_value['id'];
-		     unset($account_value['id']);
-		     $this->email_lib->send_email('',$account_value,'',$account_value['attachment'],1,0,1);
-            }
-        }
-    }
+	   $where = array("status"=>"1");
+		$query = $this->db_model->getSelect("*", "mail_details", $where);
+		if($query->num_rows >0){
+			$account_data = $query->result_array();
+			foreach($account_data as $data_key =>$account_value){
+			 $account_value['history_id']=$account_value['id'];
+			 unset($account_value['id']);
+			 $this->email_lib->send_email('',$account_value,'',$account_value['attachment'],1,0,1);
+			}
+		}
+	}
 } 
 ?>

web_interface/astpp/application/controllers/getstatus.php

Indentation +5 added lines, -5 removed lines

@@ -27,16 +27,16 @@
 	{
 		parent::__construct();
 		$this->load->model("db_model");
-               $this->load->library("astpp/common");
+			   $this->load->library("astpp/common");
 	}
 	
 	
 	function customer_list_status($id){
 			 $post_data = $this->input->post();
-             $post_data['table']=$this->common->decode($post_data['table']);
-             $data['status']=$post_data['status'] =='true'? 0:1;
-             $result=$post_data['table'] =='accounts' && $post_data['id'] == 1 ? null:$this->db->update($post_data['table'],$data,array("id"=>$post_data['id']));
-             echo TRUE;
+			 $post_data['table']=$this->common->decode($post_data['table']);
+			 $data['status']=$post_data['status'] =='true'? 0:1;
+			 $result=$post_data['table'] =='accounts' && $post_data['id'] == 1 ? null:$this->db->update($post_data['table'],$data,array("id"=>$post_data['id']));
+			 echo TRUE;
 	}