diegoangel / informe-gei

_post/ez_sql_core.php

Doc Comments +16 added lines

@@ -68,6 +68,9 @@ 
 		*  Returns array of host and port. If port is omitted, returns $default
 		*/
 
+		/**
+		 * @param string $host
+		 */
 		function get_host_port( $host, $default = false )
 		{
 			$port = $default;
@@ -218,6 +221,9 @@ 
 		*  Return the the query as a result set - see docs for more details
 		*/
 
+		/**
+		 * @param string $output
+		 */
 		function get_results($query=null, $output = OBJECT)
 		{
 
@@ -296,6 +302,10 @@ 
 		*  store_cache
 		*/
 
+		/**
+		 * @param string $query
+		 * @param boolean $is_insert
+		 */
 		function store_cache($query,$is_insert)
 		{
 
@@ -332,6 +342,9 @@ 
 		*  get_cache
 		*/
 
+		/**
+		 * @param string $query
+		 */
 		function get_cache($query)
 		{
 
@@ -561,6 +574,9 @@ 
 			return round($this->timer_get_cur() - $this->timers[$timer_name],2);
 		}
 
+		/**
+		 * @param integer $timer_name
+		 */
 		function timer_update_global($timer_name)
 		{
 			if ( $this->do_profile )

Spacing +83 added lines, -86 removed lines

@@ -27,8 +27,8 @@ 
 	class ezSQLcore
 	{
 
-		var $trace            = false;  // same as $debug_all
-		var $debug_all        = false;  // same as $trace
+		var $trace            = false; // same as $debug_all
+		var $debug_all        = false; // same as $trace
 		var $debug_called     = false;
 		var $vardump_called   = false;
 		var $show_errors      = true;
@@ -68,14 +68,14 @@ 
 		*  Returns array of host and port. If port is omitted, returns $default
 		*/
 
-		function get_host_port( $host, $default = false )
+		function get_host_port($host, $default = false)
 		{
 			$port = $default;
-			if ( false !== strpos( $host, ':' ) ) {
-				list( $host, $port ) = explode( ':', $host );
+			if (false !== strpos($host, ':')) {
+				list($host, $port) = explode(':', $host);
 				$port = (int) $port;
 			}
-			return array( $host, $port );
+			return array($host, $port);
 		}
 
 		/**********************************************************************
@@ -88,8 +88,7 @@ 
 			$this->last_error = $err_str;
 
 			// Capture all errors to an error array no matter what happens
-			$this->captured_errors[] = array
-			(
+			$this->captured_errors[] = array(
 				'error_str' => $err_str,
 				'query'     => $this->last_query
 			);
@@ -126,63 +125,63 @@ 
 		*  Get one variable from the DB - see docs for more detail
 		*/
 
-		function get_var($query=null,$x=0,$y=0)
+		function get_var($query = null, $x = 0, $y = 0)
 		{
 
 			// Log how the function was called
 			$this->func_call = "\$db->get_var(\"$query\",$x,$y)";
 
 			// If there is a query then perform it if not then use cached results..
-			if ( $query )
+			if ($query)
 			{
 				$this->query($query);
 			}
 
 			// Extract var out of cached results based x,y vals
-			if ( $this->last_result[$y] )
+			if ($this->last_result[$y])
 			{
 				$values = array_values(get_object_vars($this->last_result[$y]));
 			}
 
 			// If there is a value return it else return null
-			return (isset($values[$x]) && $values[$x]!=='')?$values[$x]:null;
+			return (isset($values[$x]) && $values[$x] !== '') ? $values[$x] : null;
 		}
 
 		/**********************************************************************
 		*  Get one row from the DB - see docs for more detail
 		*/
 
-		function get_row($query=null,$output=OBJECT,$y=0)
+		function get_row($query = null, $output = OBJECT, $y = 0)
 		{
 
 			// Log how the function was called
 			$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 
 			// If there is a query then perform it if not then use cached results..
-			if ( $query )
+			if ($query)
 			{
 				$this->query($query);
 			}
 
 			// If the output is an object then return object using the row offset..
-			if ( $output == OBJECT )
+			if ($output == OBJECT)
 			{
-				return $this->last_result[$y]?$this->last_result[$y]:null;
+				return $this->last_result[$y] ? $this->last_result[$y] : null;
 			}
 			// If the output is an associative array then return row as such..
-			elseif ( $output == ARRAY_A )
+			elseif ($output == ARRAY_A)
 			{
-				return $this->last_result[$y]?get_object_vars($this->last_result[$y]):null;
+				return $this->last_result[$y] ? get_object_vars($this->last_result[$y]) : null;
 			}
 			// If the output is an numerical array then return row as such..
-			elseif ( $output == ARRAY_N )
+			elseif ($output == ARRAY_N)
 			{
-				return $this->last_result[$y]?array_values(get_object_vars($this->last_result[$y])):null;
+				return $this->last_result[$y] ? array_values(get_object_vars($this->last_result[$y])) : null;
 			}
 			// If invalid output type was specified..
 			else
 			{
-				$this->show_errors ? trigger_error(" \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N",E_USER_WARNING) : null;
+				$this->show_errors ? trigger_error(" \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N", E_USER_WARNING) : null;
 			}
 
 		}
@@ -192,22 +191,22 @@ 
 		*  see docs for usage and info
 		*/
 
-		function get_col($query=null,$x=0)
+		function get_col($query = null, $x = 0)
 		{
 
 			$new_array = array();
 
 			// If there is a query then perform it if not then use cached results..
-			if ( $query )
+			if ($query)
 			{
 				$this->query($query);
 			}
 
 			// Extract the column values
 			$j = count($this->last_result);
-			for ( $i=0; $i < $j; $i++ )
+			for ($i = 0; $i < $j; $i++)
 			{
-				$new_array[$i] = $this->get_var(null,$x,$i);
+				$new_array[$i] = $this->get_var(null, $x, $i);
 			}
 
 			return $new_array;
@@ -218,34 +217,34 @@ 
 		*  Return the the query as a result set - see docs for more details
 		*/
 
-		function get_results($query=null, $output = OBJECT)
+		function get_results($query = null, $output = OBJECT)
 		{
 
 			// Log how the function was called
 			$this->func_call = "\$db->get_results(\"$query\", $output)";
 
 			// If there is a query then perform it if not then use cached results..
-			if ( $query )
+			if ($query)
 			{
 				$this->query($query);
 			}
 
 			// Send back array of objects. Each row is an object
-			if ( $output == OBJECT )
+			if ($output == OBJECT)
 			{
 				return $this->last_result;
 			}
-			elseif ( $output == ARRAY_A || $output == ARRAY_N )
+			elseif ($output == ARRAY_A || $output == ARRAY_N)
 			{
-				if ( $this->last_result )
+				if ($this->last_result)
 				{
-					$i=0;
-					foreach( $this->last_result as $row )
+					$i = 0;
+					foreach ($this->last_result as $row)
 					{
 
 						$new_array[$i] = get_object_vars($row);
 
-						if ( $output == ARRAY_N )
+						if ($output == ARRAY_N)
 						{
 							$new_array[$i] = array_values($new_array[$i]);
 						}
@@ -268,15 +267,15 @@ 
 		* see docs for more info and usage
 		*/
 
-		function get_col_info($info_type="name",$col_offset=-1)
+		function get_col_info($info_type = "name", $col_offset = -1)
 		{
 
-			if ( $this->col_info )
+			if ($this->col_info)
 			{
-				if ( $col_offset == -1 )
+				if ($col_offset == -1)
 				{
-					$i=0;
-					foreach($this->col_info as $col )
+					$i = 0;
+					foreach ($this->col_info as $col)
 					{
 						$new_array[$i] = $col->{$info_type};
 						$i++;
@@ -296,33 +295,32 @@ 
 		*  store_cache
 		*/
 
-		function store_cache($query,$is_insert)
+		function store_cache($query, $is_insert)
 		{
 
 			// The would be cache file for this query
 			$cache_file = $this->cache_dir.'/'.md5($query);
 
 			// disk caching of queries
-			if ( $this->use_disk_cache && ( $this->cache_queries && ! $is_insert ) || ( $this->cache_inserts && $is_insert ))
+			if ($this->use_disk_cache && ($this->cache_queries && !$is_insert) || ($this->cache_inserts && $is_insert))
 			{
-				if ( ! is_dir($this->cache_dir) )
+				if (!is_dir($this->cache_dir))
 				{
 					$this->register_error("Could not open cache dir: $this->cache_dir");
-					$this->show_errors ? trigger_error("Could not open cache dir: $this->cache_dir",E_USER_WARNING) : null;
+					$this->show_errors ? trigger_error("Could not open cache dir: $this->cache_dir", E_USER_WARNING) : null;
 				}
 				else
 				{
 					// Cache all result values
-					$result_cache = array
-					(
+					$result_cache = array(
 						'col_info' => $this->col_info,
 						'last_result' => $this->last_result,
 						'num_rows' => $this->num_rows,
 						'return_value' => $this->num_rows,
 					);
 					file_put_contents($cache_file, serialize($result_cache));
-					if( file_exists($cache_file . ".updating") )
-						unlink($cache_file . ".updating");
+					if (file_exists($cache_file.".updating"))
+						unlink($cache_file.".updating");
 				}
 			}
 
@@ -339,13 +337,13 @@ 
 			$cache_file = $this->cache_dir.'/'.md5($query);
 
 			// Try to get previously cached version
-			if ( $this->use_disk_cache && file_exists($cache_file) )
+			if ($this->use_disk_cache && file_exists($cache_file))
 			{
 				// Only use this cache file if less than 'cache_timeout' (hours)
-				if ( (time() - filemtime($cache_file)) > ($this->cache_timeout*3600) &&
-					!(file_exists($cache_file . ".updating") && (time() - filemtime($cache_file . ".updating") < 60)) )
+				if ((time() - filemtime($cache_file)) > ($this->cache_timeout * 3600) &&
+					!(file_exists($cache_file.".updating") && (time() - filemtime($cache_file.".updating") < 60)))
 				{
-					touch($cache_file . ".updating"); // Show that we in the process of updating the cache
+					touch($cache_file.".updating"); // Show that we in the process of updating the cache
 				}
 				else
 				{
@@ -358,7 +356,7 @@ 
 					$this->from_disk_cache = true;
 
 					// If debug ALL queries
-					$this->trace || $this->debug_all ? $this->debug() : null ;
+					$this->trace || $this->debug_all ? $this->debug() : null;
 
 					return $result_cache['return_value'];
 				}
@@ -371,7 +369,7 @@ 
 		*  formatted and easy to understand way - any type: Object, Var or Array
 		*/
 
-		function vardump($mixed='')
+		function vardump($mixed = '')
 		{
 
 			// Start outup buffering
@@ -380,16 +378,16 @@ 
 			echo "<p><table><tr><td bgcolor=ffffff><blockquote><font color=000090>";
 			echo "<pre><font face=arial>";
 
-			if ( ! $this->vardump_called )
+			if (!$this->vardump_called)
 			{
 				echo "<font color=800080><b>ezSQL</b> (v".EZSQL_VERSION.") <b>Variable Dump..</b></font>\n\n";
 			}
 
-			$var_type = gettype ($mixed);
-			print_r(($mixed?$mixed:"<font color=red>No Value / False</font>"));
-			echo "\n\n<b>Type:</b> " . ucfirst($var_type) . "\n";
-			echo "<b>Last Query</b> [$this->num_queries]<b>:</b> ".($this->last_query?$this->last_query:"NULL")."\n";
-			echo "<b>Last Function Call:</b> " . ($this->func_call?$this->func_call:"None")."\n";
+			$var_type = gettype($mixed);
+			print_r(($mixed ? $mixed : "<font color=red>No Value / False</font>"));
+			echo "\n\n<b>Type:</b> ".ucfirst($var_type)."\n";
+			echo "<b>Last Query</b> [$this->num_queries]<b>:</b> ".($this->last_query ? $this->last_query : "NULL")."\n";
+			echo "<b>Last Function Call:</b> ".($this->func_call ? $this->func_call : "None")."\n";
 			echo "<b>Last Rows Returned:</b> ".count($this->last_result)."\n";
 			echo "</font></pre></font></blockquote></td></tr></table>".$this->donation();
 			echo "\n<hr size=1 noshade color=dddddd>";
@@ -399,7 +397,7 @@ 
 			ob_end_clean();
 
 			// Only echo output if it is turned on
-			if ( $this->debug_echo_is_on )
+			if ($this->debug_echo_is_on)
 			{
 				echo $html;
 			}
@@ -425,7 +423,7 @@ 
 		* (abstracted into a seperate file to save server overhead).
 		*/
 
-		function debug($print_to_screen=true)
+		function debug($print_to_screen = true)
 		{
 
 			// Start outup buffering
@@ -434,17 +432,17 @@ 
 			echo "<blockquote>";
 
 			// Only show ezSQL credits once..
-			if ( ! $this->debug_called )
+			if (!$this->debug_called)
 			{
 				echo "<font color=800080 face=arial size=2><b>ezSQL</b> (v".EZSQL_VERSION.") <b>Debug..</b></font><p>\n";
 			}
 
-			if ( $this->last_error )
+			if ($this->last_error)
 			{
 				echo "<font face=arial size=2 color=000099><b>Last Error --</b> [<font color=000000><b>$this->last_error</b></font>]<p>";
 			}
 
-			if ( $this->from_disk_cache )
+			if ($this->from_disk_cache)
 			{
 				echo "<font face=arial size=2 color=000099><b>Results retrieved from disk cache</b></font><p>";
 			}
@@ -455,7 +453,7 @@ 
 				echo "<font face=arial size=2 color=000099><b>Query Result..</b></font>";
 				echo "<blockquote>";
 
-			if ( $this->col_info )
+			if ($this->col_info)
 			{
 
 				// =====================================================
@@ -465,7 +463,7 @@ 
 				echo "<tr bgcolor=eeeeee><td nowrap valign=bottom><font color=555599 face=arial size=2><b>(row)</b></font></td>";
 
 
-				for ( $i=0, $j=count($this->col_info); $i < $j; $i++ )
+				for ($i = 0, $j = count($this->col_info); $i < $j; $i++)
 				{
 					/* when selecting count(*) the maxlengh is not set, size is set instead. */
 					echo "<td nowrap align=left valign=top><font size=1 color=555599 face=arial>{$this->col_info[$i]->type}";
@@ -483,16 +481,16 @@ 
 				// ======================================================
 				// print main results
 
-			if ( $this->last_result )
+			if ($this->last_result)
 			{
 
-				$i=0;
-				foreach ( $this->get_results(null,ARRAY_N) as $one_row )
+				$i = 0;
+				foreach ($this->get_results(null, ARRAY_N) as $one_row)
 				{
 					$i++;
 					echo "<tr bgcolor=ffffff><td bgcolor=eeeeee nowrap align=middle><font size=2 color=555599 face=arial>$i</font></td>";
 
-					foreach ( $one_row as $item )
+					foreach ($one_row as $item)
 					{
 						echo "<td nowrap><font face=arial size=2>$item</font></td>";
 					}
@@ -503,7 +501,7 @@ 
 			} // if last result
 			else
 			{
-				echo "<tr bgcolor=ffffff><td colspan=".(count($this->col_info)+1)."><font face=arial size=2>No Results</font></td></tr>";
+				echo "<tr bgcolor=ffffff><td colspan=".(count($this->col_info) + 1)."><font face=arial size=2>No Results</font></td></tr>";
 			}
 
 			echo "</table>";
@@ -521,7 +519,7 @@ 
 			ob_end_clean();
 
 			// Only echo output if it is turned on
-			if ( $this->debug_echo_is_on && $print_to_screen)
+			if ($this->debug_echo_is_on && $print_to_screen)
 			{
 				echo $html;
 			}
@@ -547,8 +545,8 @@ 
 
 		function timer_get_cur()
 		{
-			list($usec, $sec) = explode(" ",microtime());
-			return ((float)$usec + (float)$sec);
+			list($usec, $sec) = explode(" ", microtime());
+			return ((float) $usec + (float) $sec);
 		}
 
 		function timer_start($timer_name)
@@ -558,15 +556,14 @@ 
 
 		function timer_elapsed($timer_name)
 		{
-			return round($this->timer_get_cur() - $this->timers[$timer_name],2);
+			return round($this->timer_get_cur() - $this->timers[$timer_name], 2);
 		}
 
 		function timer_update_global($timer_name)
 		{
-			if ( $this->do_profile )
+			if ($this->do_profile)
 			{
-				$this->profile_times[] = array
-				(
+				$this->profile_times[] = array(
 					'query' => $this->last_query,
 					'time' => $this->timer_elapsed($timer_name)
 				);
@@ -595,30 +592,30 @@ 
 
 		function get_set($params)
 		{
-			if( !is_array( $params ) )
+			if (!is_array($params))
 			{
-				$this->register_error( 'get_set() parameter invalid. Expected array in '.__FILE__.' on line '.__LINE__);
+				$this->register_error('get_set() parameter invalid. Expected array in '.__FILE__.' on line '.__LINE__);
 				return;
 			}
 			$sql = array();
-			foreach ( $params as $field => $val )
+			foreach ($params as $field => $val)
 			{
-				if ( $val === 'true' || $val === true )
+				if ($val === 'true' || $val === true)
 					$val = 1;
-				if ( $val === 'false' || $val === false )
+				if ($val === 'false' || $val === false)
 					$val = 0;
 
-				switch( $val ){
+				switch ($val) {
 					case 'NOW()' :
 					case 'NULL' :
 					  $sql[] = "$field = $val";
 						break;
 					default :
-						$sql[] = "$field = '".$this->escape( $val )."'";
+						$sql[] = "$field = '".$this->escape($val)."'";
 				}
 			}
 
-			return implode( ', ' , $sql );
+			return implode(', ', $sql);
 		}
 
 		/**
@@ -628,7 +625,7 @@ 
 		 * @param bool $increase Set to true to increase query count (internal usage)
 		 * @return int Returns query count base on $all
 		 */
-		function count ($all = true, $increase = false) {
+		function count($all = true, $increase = false) {
 			if ($increase) {
 				$this->num_queries++;
 				$this->conn_queries++;

Braces +14 added lines, -16 removed lines

@@ -234,8 +234,7 @@ 
 			if ( $output == OBJECT )
 			{
 				return $this->last_result;
-			}
-			elseif ( $output == ARRAY_A || $output == ARRAY_N )
+			} elseif ( $output == ARRAY_A || $output == ARRAY_N )
 			{
 				if ( $this->last_result )
 				{
@@ -254,8 +253,7 @@ 
 					}
 
 					return $new_array;
-				}
-				else
+				} else
 				{
 					return array();
 				}
@@ -282,8 +280,7 @@ 
 						$i++;
 					}
 					return $new_array;
-				}
-				else
+				} else
 				{
 					return $this->col_info[$col_offset]->{$info_type};
 				}
@@ -309,8 +306,7 @@ 
 				{
 					$this->register_error("Could not open cache dir: $this->cache_dir");
 					$this->show_errors ? trigger_error("Could not open cache dir: $this->cache_dir",E_USER_WARNING) : null;
-				}
-				else
+				} else
 				{
 					// Cache all result values
 					$result_cache = array
@@ -321,8 +317,9 @@ 
 						'return_value' => $this->num_rows,
 					);
 					file_put_contents($cache_file, serialize($result_cache));
-					if( file_exists($cache_file . ".updating") )
-						unlink($cache_file . ".updating");
+					if( file_exists($cache_file . ".updating") ) {
+											unlink($cache_file . ".updating");
+					}
 				}
 			}
 
@@ -346,8 +343,7 @@ 
 					!(file_exists($cache_file . ".updating") && (time() - filemtime($cache_file . ".updating") < 60)) )
 				{
 					touch($cache_file . ".updating"); // Show that we in the process of updating the cache
-				}
-				else
+				} else
 				{
 					$result_cache = unserialize(file_get_contents($cache_file));
 
@@ -603,10 +599,12 @@ 
 			$sql = array();
 			foreach ( $params as $field => $val )
 			{
-				if ( $val === 'true' || $val === true )
-					$val = 1;
-				if ( $val === 'false' || $val === false )
-					$val = 0;
+				if ( $val === 'true' || $val === true ) {
+									$val = 1;
+				}
+				if ( $val === 'false' || $val === false ) {
+									$val = 0;
+				}
 
 				switch( $val ){
 					case 'NOW()' :

_post/func.php

Spacing +12 added lines, -12 removed lines

@@ -7,12 +7,12 @@ 
 	echo "</pre>";
 }
 
-function returnSectorGas($arr,$sector,$gas)
+function returnSectorGas($arr, $sector, $gas)
 {
 
-	foreach($arr as $val)
+	foreach ($arr as $val)
 	{
-		if($val['sector'] == $sector && $val['gas'] == $gas)
+		if ($val['sector'] == $sector && $val['gas'] == $gas)
 		{
 			return $val['total'];
 		}
@@ -21,12 +21,12 @@ 
 	return 0;
 }
 
-function returnSectorAno($arr,$sector,$ano)
+function returnSectorAno($arr, $sector, $ano)
 {
 
-	foreach($arr as $val)
+	foreach ($arr as $val)
 	{
-		if($val['sector'] == $sector && $val['ano'] == $ano)
+		if ($val['sector'] == $sector && $val['ano'] == $ano)
 		{
 			return $val['total'];
 		}
@@ -35,12 +35,12 @@ 
 	return 0;
 }
 
-function returnSubactividadAno($arr,$subactividad,$ano)
+function returnSubactividadAno($arr, $subactividad, $ano)
 {
 
-	foreach($arr as $val)
+	foreach ($arr as $val)
 	{
-		if(trim($val['nombre']) == trim($subactividad) && $val['ano'] == $ano)
+		if (trim($val['nombre']) == trim($subactividad) && $val['ano'] == $ano)
 		{
 			return $val['valor'];
 		}
@@ -49,12 +49,12 @@ 
 	return 0;
 }
 
-function returnCategoriaAno($arr,$categoria,$ano)
+function returnCategoriaAno($arr, $categoria, $ano)
 {
 
-	foreach($arr as $val)
+	foreach ($arr as $val)
 	{
-		if(trim($val['nombre']) == trim($categoria) && $val['ano'] == $ano)
+		if (trim($val['nombre']) == trim($categoria) && $val['ano'] == $ano)
 		{
 			return $val['valor'];
 		}

_post/config.php

Spacing +12 added lines, -12 removed lines

@@ -2,28 +2,28 @@
 
 	if ($_SERVER['HTTP_HOST'] == 'chali.thet.com.ar') {
 		
-		define("DB_USER"		, "root");		// <-- mysql db user
-		define("DB_PASSWORD"	, "root");	// <-- mysql db password
-		define("DB_NAME"		, "min_ambiente");		// <-- mysql db pname
-		define("DB_HOST"		, "127.0.0.1");			// <-- mysql server host
+		define("DB_USER", "root"); // <-- mysql db user
+		define("DB_PASSWORD", "root"); // <-- mysql db password
+		define("DB_NAME", "min_ambiente"); // <-- mysql db pname
+		define("DB_HOST", "127.0.0.1"); // <-- mysql server host
 	
 	}
 
 	if ($_SERVER['HTTP_HOST'] == 'thet.com.ar') {
 		
-		define("DB_USER"		, "thet_minamb");		// <-- mysql db user
-		define("DB_PASSWORD"	, "VeDwOtr3ChPF");	// <-- mysql db password
-		define("DB_NAME"		, "thet_minamb");		// <-- mysql db pname
-		define("DB_HOST"		, "localhost");			// <-- mysql server host
+		define("DB_USER", "thet_minamb"); // <-- mysql db user
+		define("DB_PASSWORD", "VeDwOtr3ChPF"); // <-- mysql db password
+		define("DB_NAME", "thet_minamb"); // <-- mysql db pname
+		define("DB_HOST", "localhost"); // <-- mysql server host
 	
 	}
 
 	if ($_SERVER['HTTP_HOST'] == 'vminventariogei-test.medioambiente.gov.ar') {
 		
-		define("DB_USER"		, "ibegtest");		// <-- mysql db user
-		define("DB_PASSWORD"	, "aTDjmJcDC4LFZK9R");	// <-- mysql db password
-		define("DB_NAME"		, "ibegtest");		// <-- mysql db pname
-		define("DB_HOST"		, "localhost");			// <-- mysql server host
+		define("DB_USER", "ibegtest"); // <-- mysql db user
+		define("DB_PASSWORD", "aTDjmJcDC4LFZK9R"); // <-- mysql db password
+		define("DB_NAME", "ibegtest"); // <-- mysql db pname
+		define("DB_HOST", "localhost"); // <-- mysql server host
 	
 	}
 

_post/ajax.php

Spacing +76 added lines, -76 removed lines

@@ -4,14 +4,14 @@ 
 
 include "init.php";
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'run' )
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'run')
 {
 
 }
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-sector' && !empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] == 'all')
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-sector' && !empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] == 'all')
 {
-	$ano = (int)$_REQUEST['ano'];
+	$ano = (int) $_REQUEST['ano'];
 
 	$arrReturn = array();
 
@@ -21,16 +21,16 @@ 
 			WHERE e.ano = $ano
 			GROUP BY e.sector_id";
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 	$i = 1;
 
-	foreach($arr as $a)
+	foreach ($arr as $a)
 	{
 		$arrReturn['sector_'.$i][] 		= $a['nombre'];
 		$arrReturn['sector_'.$i][] 		= $a['total'];
-		$arrReturn['colores'][] 		= $a['color'];
-		$arrReturn['descripciones'][] 	= $a['descripcion'];
+		$arrReturn['colores'][] = $a['color'];
+		$arrReturn['descripciones'][] = $a['descripcion'];
 
 		$i++;
 	}
@@ -45,10 +45,10 @@ 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-sector' && !empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] != 'all')
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-sector' && !empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] != 'all')
 {
-	$ano 		= (int)$_REQUEST['ano'];
-	$sector_id 	= (int)$_REQUEST['sector_id'];
+	$ano = (int) $_REQUEST['ano'];
+	$sector_id = (int) $_REQUEST['sector_id'];
 
 	$sql = "SELECT SUM(e.valor) as total, a.id, a.nombre
 			FROM emision e 
@@ -60,9 +60,9 @@ 
 			GROUP BY a.id
 			ORDER BY a.nombre";
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
-	foreach($arr as $a)
+	foreach ($arr as $a)
 	{
 		$arrActividades = array('label'=>$a['nombre'], 'value'=>round($a['total']));
 
@@ -77,13 +77,13 @@ 
 					GROUP BY a.id
 					ORDER BY a.nombre";
 
-		if($arr2 = $db->get_results($sql,ARRAY_A))
+		if ($arr2 = $db->get_results($sql, ARRAY_A))
 		{
 			$arrSubactividades = array();
 
 			$i = 0;
 
-			foreach($arr2 as $a2)
+			foreach ($arr2 as $a2)
 			{
 				$arrSubactividades[$i] = array('label'=>$a2['nombre'], 'value'=>round($a2['total']));
 
@@ -101,11 +101,11 @@ 
 
 					// echo $sql."<br/>";
 
-					if($arr3 = $db->get_results($sql,ARRAY_A))
+					if ($arr3 = $db->get_results($sql, ARRAY_A))
 					{
 						$arrCategorias = array();
 
-						foreach($arr3 as $a3)
+						foreach ($arr3 as $a3)
 						{
 							$arrCategorias[] = array('label'=>$a3['nombre'], 'value'=>round($a3['total']));
 						}
@@ -134,12 +134,12 @@ 
 
 
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-gases' )
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-gases')
 {
 
 	
 
-	$ano = (int)$_REQUEST['ano'];
+	$ano = (int) $_REQUEST['ano'];
 
 	$arrReturn = array();
 
@@ -148,15 +148,15 @@ 
 			LEFT JOIN gas g ON (e.gas_id = g.id)
 			where e.ano = $ano GROUP BY e.gas_id ORDER BY total DESC";
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 
 	$arrReturn['gases'][] = 'x';
 	$arrReturn['valores'][] = 'Gases';
 
-	foreach($arr as $a)
+	foreach ($arr as $a)
 	{
-		$arrReturn['gases'][] 	= (strpos($a['nombre'], ',')) ? '"'.$a['nombre'].'"' : $a['nombre'];
+		$arrReturn['gases'][] = (strpos($a['nombre'], ',')) ? '"'.$a['nombre'].'"' : $a['nombre'];
 		$arrReturn['valores'][] = round($a['total']);
 		$arrReturn['colores'][] = $a['color'];
 	}
@@ -166,11 +166,11 @@ 
 
 }
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-gases-sector' )
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'distribucion-gases-sector')
 {
 
 
-	$ano = (int)$_REQUEST['ano'];
+	$ano = (int) $_REQUEST['ano'];
 
 	$arrReturn = array();
 
@@ -181,7 +181,7 @@ 
 			LEFT JOIN gas g ON (e.gas_id = g.id)
 			where e.ano = $ano GROUP BY e.gas_id ORDER BY total DESC";
 
-	$arrGases = $db->get_results($sql,ARRAY_A);
+	$arrGases = $db->get_results($sql, ARRAY_A);
 	
 	
 	
@@ -203,20 +203,20 @@ 
 			LEFT JOIN sector s ON (e.sector_id = s.id)
 			where e.ano = $ano GROUP BY e.gas_id, e.sector_id ORDER BY total DESC";
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 	$column = 2;
 
 
 
-	foreach($arrSectores as $sector)
+	foreach ($arrSectores as $sector)
 	{
 		$arrReturn['column_'.$column][] = $sector;
 
-		foreach($arrGases as $gas)
+		foreach ($arrGases as $gas)
 		{
 
-			$arrReturn['column_'.$column][] = returnSectorGas($arr,$sector,$gas['nombre']);
+			$arrReturn['column_'.$column][] = returnSectorGas($arr, $sector, $gas['nombre']);
 			
 		}
 
@@ -225,7 +225,7 @@ 
 
 	$arrReturnGases = array('x');
 	
-	foreach($arrGases as $gas)
+	foreach ($arrGases as $gas)
 	{
 
 		$arrReturnGases[] = $gas['nombre'];
@@ -247,10 +247,10 @@ 
 
 
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'evolucion-sector')
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'evolucion-sector')
 {
 
-	$ano = (int)$_REQUEST['ano'];
+	$ano = (int) $_REQUEST['ano'];
 
 	$arrReturn = array();
 
@@ -258,32 +258,32 @@ 
 			FROM sector s 
 			WHERE 1 ";
 
-	$sql.= 	(!empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] != 'all') ? "AND s.id = ".$_REQUEST['sector_id'] : '';
+	$sql .= (!empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] != 'all') ? "AND s.id = ".$_REQUEST['sector_id'] : '';
 
-	$sql.= " ORDER BY s.nombre ";
+	$sql .= " ORDER BY s.nombre ";
 
-	$arrSectores = $db->get_results($sql,ARRAY_A);
+	$arrSectores = $db->get_results($sql, ARRAY_A);
 
 	$sql = "SELECT s.nombre as sector, e.ano, sum(e.valor) as total
 			FROM emision e
 			LEFT JOIN sector s ON (e.sector_id = s.id)
 			where 1 ";
 
-	$sql.= 	(!empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] != 'all') ? "AND e.sector_id = ".$_REQUEST['sector_id'] : '';
+	$sql .= (!empty($_REQUEST['sector_id']) && $_REQUEST['sector_id'] != 'all') ? "AND e.sector_id = ".$_REQUEST['sector_id'] : '';
 
-	$sql.= " GROUP BY e.ano, s.nombre
+	$sql .= " GROUP BY e.ano, s.nombre
 			ORDER BY e.ano, s.nombre";
 
 	// echo $sql;
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 	$arrAnos = array();
 	$arrValores = array();
 	$arrColores = array();
 
 
-	for($i=1990;$i<=2014;$i++)
+	for ($i = 1990; $i <= 2014; $i++)
 	{
 		$arrAnos[] = $i;
 	}
@@ -292,15 +292,15 @@ 
 
 	$column = 2;
 
-	foreach($arrSectores as $sector)
+	foreach ($arrSectores as $sector)
 	{
 		$arrReturn['column_'.$column][] = $sector['nombre'];
-		$arrReturn['colores'][] =  $sector['color'];
+		$arrReturn['colores'][] = $sector['color'];
 
-		foreach($arrAnos as $ano)
+		foreach ($arrAnos as $ano)
 		{
 
-			$arrReturn['column_'.$column][] = returnSectorAno($arr,$sector['nombre'],$ano);
+			$arrReturn['column_'.$column][] = returnSectorAno($arr, $sector['nombre'], $ano);
 			
 		}
 
@@ -323,10 +323,10 @@ 
 
 
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'evolucion-sector-subactividad')
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'evolucion-sector-subactividad')
 {
 
-	$ano = (int)$_REQUEST['ano'];
+	$ano = (int) $_REQUEST['ano'];
 
 	$arrReturn = array();
 
@@ -336,34 +336,34 @@ 
 			INNER JOIN sector s ON (a.sector_id = s.id)
 			WHERE 1 ";
 
-	$sql.= 	(!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."'" : '';
+	$sql .= (!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."'" : '';
 
-	$sql.= " ORDER BY sub.nombre ";
+	$sql .= " ORDER BY sub.nombre ";
 
 	// echo $sql;
 
-	$arrSubactividades = $db->get_results($sql,ARRAY_A);
+	$arrSubactividades = $db->get_results($sql, ARRAY_A);
 
 	$sql = "SELECT sub.nombre, e.ano, SUM(e.valor) as valor
 			FROM emision e
 			INNER JOIN subactividad sub ON (e.subactividad_id = sub.id)
 			INNER JOIN sector s ON (e.sector_id = s.id)";
 
-	$sql.= 	(!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."'" : '';
+	$sql .= (!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."'" : '';
 
-	$sql.= " GROUP BY e.ano, sub.nombre
+	$sql .= " GROUP BY e.ano, sub.nombre
 			ORDER BY e.ano, sub.nombre";
 
 	// echo $sql;
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 	$arrAnos = array();
 	$arrValores = array();
 	$arrColores = array();
 
 
-	for($i=1990;$i<=2014;$i++)
+	for ($i = 1990; $i <= 2014; $i++)
 	{
 		$arrAnos[] = $i;
 	}
@@ -373,14 +373,14 @@ 
 	// pr($arrSubactividades);
 	// pr($arr);
 
-	foreach($arrSubactividades as $subactividad)
+	foreach ($arrSubactividades as $subactividad)
 	{
 		$arrReturn['column_'.$column][] = $subactividad['nombre'];
 		$arrReturn['groups'][] = $subactividad['nombre'];
 
-		foreach($arrAnos as $ano)
+		foreach ($arrAnos as $ano)
 		{
-			$arrReturn['column_'.$column][] = returnSubactividadAno($arr,$subactividad['nombre'],$ano);
+			$arrReturn['column_'.$column][] = returnSubactividadAno($arr, $subactividad['nombre'], $ano);
 		}
 
 		$column++;
@@ -403,10 +403,10 @@ 
 
 
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'evolucion-sector-subactividad-categoria')
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'evolucion-sector-subactividad-categoria')
 {
 
-	$ano = (int)$_REQUEST['ano'];
+	$ano = (int) $_REQUEST['ano'];
 
 	$arrReturn = array();
 
@@ -417,14 +417,14 @@ 
 			INNER JOIN categoria c ON (e.categoria_id = c.id)
 			WHERE 1 ";
 
-	$sql.= 	(!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."' " : '';
-	$sql.= 	(!empty($_REQUEST['subactividad_nombre']) && $_REQUEST['subactividad_nombre'] != 'all') ? "AND sub.nombre = '".$_REQUEST['subactividad_nombre']."' " : '';
+	$sql .= (!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."' " : '';
+	$sql .= (!empty($_REQUEST['subactividad_nombre']) && $_REQUEST['subactividad_nombre'] != 'all') ? "AND sub.nombre = '".$_REQUEST['subactividad_nombre']."' " : '';
 
-	$sql.= "ORDER BY c.nombre";
+	$sql .= "ORDER BY c.nombre";
 
 	// echo ($sql);
 
-	$arrCategorias = $db->get_results($sql,ARRAY_A);
+	$arrCategorias = $db->get_results($sql, ARRAY_A);
 
 
 
@@ -436,15 +436,15 @@ 
 			INNER JOIN sector s ON (e.sector_id = s.id) 
 			INNER JOIN categoria c ON (e.categoria_id = c.id)
 			WHERE 1 ";
-	$sql.= 	(!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."' " : '';
-	$sql.= 	(!empty($_REQUEST['subactividad_nombre']) && $_REQUEST['subactividad_nombre'] != 'all') ? "AND sub.nombre = '".$_REQUEST['subactividad_nombre']."' " : '';
+	$sql .= (!empty($_REQUEST['sector_nombre']) && $_REQUEST['sector_nombre'] != 'all') ? "AND s.nombre = '".$_REQUEST['sector_nombre']."' " : '';
+	$sql .= (!empty($_REQUEST['subactividad_nombre']) && $_REQUEST['subactividad_nombre'] != 'all') ? "AND sub.nombre = '".$_REQUEST['subactividad_nombre']."' " : '';
 
-	$sql.= 	" GROUP BY e.ano, c.nombre
+	$sql .= " GROUP BY e.ano, c.nombre
 			ORDER BY sub.nombre, e.ano, c.nombre";
 
 	// echo ($sql);
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 	// echo $sql;die();
 
@@ -453,7 +453,7 @@ 
 	$arrColores = array();
 
 
-	for($i=1990;$i<=2014;$i++)
+	for ($i = 1990; $i <= 2014; $i++)
 	{
 		$arrAnos[] = $i;
 	}
@@ -463,14 +463,14 @@ 
 	// pr($arrCategorias);
 	// pr($arr);
 
-	foreach($arrCategorias as $categoria)
+	foreach ($arrCategorias as $categoria)
 	{
 		$arrReturn['column_'.$column][] = $categoria['nombre'];
 		$arrReturn['groups'][] = $categoria['nombre'];
 
-		foreach($arrAnos as $ano)
+		foreach ($arrAnos as $ano)
 		{
-			$arrReturn['column_'.$column][] = returnCategoriaAno($arr,$categoria['nombre'],$ano);
+			$arrReturn['column_'.$column][] = returnCategoriaAno($arr, $categoria['nombre'], $ano);
 		}
 
 		$column++;
@@ -493,12 +493,12 @@ 
 
 
 
-if( !empty($_REQUEST['f']) && $_REQUEST['f'] == 'indicador')
+if (!empty($_REQUEST['f']) && $_REQUEST['f'] == 'indicador')
 {
-	$indicador_id = (int)$_REQUEST['indicador_id'];
+	$indicador_id = (int) $_REQUEST['indicador_id'];
 
 	$sql = "SELECT * FROM indicador WHERE id = $indicador_id";	
-	$arrIndicador = $db->get_row($sql,ARRAY_A);
+	$arrIndicador = $db->get_row($sql, ARRAY_A);
 
 	$arrReturn = array();
 
@@ -508,21 +508,21 @@ 
 			WHERE indicador_id = $indicador_id
 			ORDER BY ano ASC";
 
-	$arr = $db->get_results($sql,ARRAY_A);
+	$arr = $db->get_results($sql, ARRAY_A);
 
 
 
-	foreach($arr as $a)
+	foreach ($arr as $a)
 	{
 		// SI EL NOMBRE TIENE UNA COMA LO TENGO QUE PONER ENTRE COMILLAS
-		$arrAnos[]	= $a['ano'];
+		$arrAnos[] = $a['ano'];
 		$arrValor[] = $a['valor'];
 	}
 
-	$arrAnos = array_merge( array('x'), $arrAnos );
+	$arrAnos = array_merge(array('x'), $arrAnos);
 	$arrReturn['column_1'] = $arrAnos;
 
-	$arrValor = array_merge( array($arrIndicador['nombre']), $arrValor );
+	$arrValor = array_merge(array($arrIndicador['nombre']), $arrValor);
 	$arrReturn['column_2'] = $arrValor;
 
 	$arrReturn['unidad'] = $arrIndicador['unidad'];

_post/ez_sql_mysqli.php

Indentation +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	*  ezSQL error strings - mySQLi
 	*/
     
-    global $ezsql_mysqli_str;
+	global $ezsql_mysqli_str;
 
 	$ezsql_mysqli_str = array
 	(
@@ -188,9 +188,9 @@ 
 				$this->select($this->dbname, $this->encoding);
 			}
                         
-                        if ( get_magic_quotes_gpc() ) {
+						if ( get_magic_quotes_gpc() ) {
 				$str = stripslashes($str);
-                        }                        
+						}                        
 
 			return $this->dbh->escape_string($str);
 		}

Spacing +47 added lines, -48 removed lines

@@ -14,8 +14,7 @@ 
     
     global $ezsql_mysqli_str;
 
-	$ezsql_mysqli_str = array
-	(
+	$ezsql_mysqli_str = array(
 		1 => 'Require $dbuser and $dbpassword to connect to a database server',
 		2 => 'Error establishing mySQLi database connection. Correct user/password? Correct hostname? Database server running?',
 		3 => 'Require $dbname to select a database',
@@ -27,8 +26,8 @@ 
 	*  ezSQL Database specific class - mySQLi
 	*/
 
-	if ( ! function_exists ('mysqli_connect') ) die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine');
-	if ( ! class_exists ('ezSQLcore') ) die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
+	if (!function_exists('mysqli_connect')) die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine');
+	if (!class_exists('ezSQLcore')) die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
 
 	class ezSQL_mysqli extends ezSQLcore
 	{
@@ -46,12 +45,12 @@ 
 		*  same time as initialising the ezSQL_mysqli class
 		*/
 
-		function __construct($dbuser='', $dbpassword='', $dbname='', $dbhost='localhost', $encoding='')
+		function __construct($dbuser = '', $dbpassword = '', $dbname = '', $dbhost = 'localhost', $encoding = '')
 		{
 			$this->dbuser = $dbuser;
 			$this->dbpassword = $dbpassword;
 			$this->dbname = $dbname;
-			list( $this->dbhost, $this->dbport ) = $this->get_host_port( $dbhost, 3306 );
+			list($this->dbhost, $this->dbport) = $this->get_host_port($dbhost, 3306);
 			$this->encoding = $encoding;
 		}
 
@@ -60,11 +59,11 @@ 
 		*  and select a mySQL database at the same time
 		*/
 
-		function quick_connect($dbuser='', $dbpassword='', $dbname='', $dbhost='localhost', $dbport='3306', $encoding='')
+		function quick_connect($dbuser = '', $dbpassword = '', $dbname = '', $dbhost = 'localhost', $dbport = '3306', $encoding = '')
 		{
 			$return_val = false;
-			if ( ! $this->connect($dbuser, $dbpassword, $dbhost, $dbport) ) ;
-			else if ( ! $this->select($dbname,$encoding) ) ;
+			if (!$this->connect($dbuser, $dbpassword, $dbhost, $dbport));
+			else if (!$this->select($dbname, $encoding));
 			else $return_val = true;
 			return $return_val;
 		}
@@ -73,7 +72,7 @@ 
 		*  Try to connect to mySQL database server
 		*/
 
-		function connect($dbuser='', $dbpassword='', $dbhost='localhost', $dbport=false)
+		function connect($dbuser = '', $dbpassword = '', $dbhost = 'localhost', $dbport = false)
 		{
 			global $ezsql_mysqli_str; $return_val = false;
 			
@@ -81,28 +80,28 @@ 
 			$this->timer_start('db_connect_time');
 			
 			// If port not specified (new connection issued), get it
-			if( ! $dbport ) {
-				list( $dbhost, $dbport ) = $this->get_host_port( $dbhost, 3306 );
+			if (!$dbport) {
+				list($dbhost, $dbport) = $this->get_host_port($dbhost, 3306);
 			}
 			
 			// Must have a user and a password
-			if ( ! $dbuser )
+			if (!$dbuser)
 			{
 				$this->register_error($ezsql_mysqli_str[1].' in '.__FILE__.' on line '.__LINE__);
-				$this->show_errors ? trigger_error($ezsql_mysqli_str[1],E_USER_WARNING) : null;
+				$this->show_errors ? trigger_error($ezsql_mysqli_str[1], E_USER_WARNING) : null;
 			}
 			// Try to establish the server database handle
 			else
 			{
-				$this->dbh = new mysqli($dbhost,$dbuser,$dbpassword, '', $dbport);
+				$this->dbh = new mysqli($dbhost, $dbuser, $dbpassword, '', $dbport);
 
 				$this->dbh->set_charset("utf8");				
 
 				// Check for connection problem
-				if( $this->dbh->connect_errno )
+				if ($this->dbh->connect_errno)
 				{
 					$this->register_error($ezsql_mysqli_str[2].' in '.__FILE__.' on line '.__LINE__);
-					$this->show_errors ? trigger_error($ezsql_mysqli_str[2],E_USER_WARNING) : null;
+					$this->show_errors ? trigger_error($ezsql_mysqli_str[2], E_USER_WARNING) : null;
 				}
 				else
 				{
@@ -123,47 +122,47 @@ 
 		*  Try to select a mySQL database
 		*/
 
-		function select($dbname='', $encoding='')
+		function select($dbname = '', $encoding = '')
 		{
 			global $ezsql_mysqli_str; $return_val = false;
 
 			// Must have a database name
-			if ( ! $dbname )
+			if (!$dbname)
 			{
 				$this->register_error($ezsql_mysqli_str[3].' in '.__FILE__.' on line '.__LINE__);
-				$this->show_errors ? trigger_error($ezsql_mysqli_str[3],E_USER_WARNING) : null;
+				$this->show_errors ? trigger_error($ezsql_mysqli_str[3], E_USER_WARNING) : null;
 			}
 
 			// Must have an active database connection
-			else if ( ! $this->dbh )
+			else if (!$this->dbh)
 			{
 				$this->register_error($ezsql_mysqli_str[4].' in '.__FILE__.' on line '.__LINE__);
-				$this->show_errors ? trigger_error($ezsql_mysqli_str[4],E_USER_WARNING) : null;
+				$this->show_errors ? trigger_error($ezsql_mysqli_str[4], E_USER_WARNING) : null;
 			}
 
 			// Try to connect to the database
-			else if ( !@$this->dbh->select_db($dbname) )
+			else if (!@$this->dbh->select_db($dbname))
 			{
 				// Try to get error supplied by mysql if not use our own
-				if ( !$str = @$this->dbh->error)
+				if (!$str = @$this->dbh->error)
 					  $str = $ezsql_mysqli_str[5];
 
 				$this->register_error($str.' in '.__FILE__.' on line '.__LINE__);
-				$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;
+				$this->show_errors ? trigger_error($str, E_USER_WARNING) : null;
 			}
 			else
 			{
 				$this->dbname = $dbname;
-				if($encoding!='')
+				if ($encoding != '')
 				{
-					$encoding = strtolower(str_replace("-","",$encoding));
+					$encoding = strtolower(str_replace("-", "", $encoding));
 					$charsets = array();
 					$result = $this->dbh->query("SHOW CHARACTER SET");
-					while($row = $result->fetch_array(MYSQLI_ASSOC))
+					while ($row = $result->fetch_array(MYSQLI_ASSOC))
 					{
 						$charsets[] = $row["Charset"];
 					}
-					if(in_array($encoding,$charsets)){
+					if (in_array($encoding, $charsets)) {
 						$this->dbh->set_charset($encoding);
 					}
 				}
@@ -182,13 +181,13 @@ 
 		function escape($str)
 		{
 			// If there is no existing database connection then try to connect
-			if ( ! isset($this->dbh) || ! $this->dbh )
+			if (!isset($this->dbh) || !$this->dbh)
 			{
 				$this->connect($this->dbuser, $this->dbpassword, $this->dbhost, $this->dbport);
 				$this->select($this->dbname, $this->encoding);
 			}
                         
-                        if ( get_magic_quotes_gpc() ) {
+                        if (get_magic_quotes_gpc()) {
 				$str = stripslashes($str);
                         }                        
 
@@ -213,10 +212,10 @@ 
 		{
 
 			// This keeps the connection alive for very long running scripts
-			if ( $this->count(false) >= 500 )
+			if ($this->count(false) >= 500)
 			{
 				$this->disconnect();
-				$this->quick_connect($this->dbuser,$this->dbpassword,$this->dbname,$this->dbhost,$this->dbport,$this->encoding);
+				$this->quick_connect($this->dbuser, $this->dbpassword, $this->dbname, $this->dbhost, $this->dbport, $this->encoding);
 			}
 
 			// Initialise return
@@ -241,13 +240,13 @@ 
 			$this->timer_start($this->num_queries);
 
 			// Use core file cache function
-			if ( $cache = $this->get_cache($query) )
+			if ($cache = $this->get_cache($query))
 			{
 				// Keep tack of how long all queries have taken
 				$this->timer_update_global($this->num_queries);
 
 				// Trace all queries
-				if ( $this->use_trace_log )
+				if ($this->use_trace_log)
 				{
 					$this->trace_log[] = $this->debug(false);
 				}
@@ -256,12 +255,12 @@ 
 			}
 
 			// If there is no existing database connection then try to connect
-			if ( ! isset($this->dbh) || ! $this->dbh )
+			if (!isset($this->dbh) || !$this->dbh)
 			{
 				$this->connect($this->dbuser, $this->dbpassword, $this->dbhost, $this->dbport);
-				$this->select($this->dbname,$this->encoding);
+				$this->select($this->dbname, $this->encoding);
 				// No existing connection at this point means the server is unreachable
-				if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno )
+				if (!isset($this->dbh) || !$this->dbh || $this->dbh->connect_errno)
 					return false;
 			}
 
@@ -269,21 +268,21 @@ 
 			$this->result = @$this->dbh->query($query);
 
 			// If there is an error then take note of it..
-			if ( $str = @$this->dbh->error )
+			if ($str = @$this->dbh->error)
 			{
 				$this->register_error($str);
-				$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;
+				$this->show_errors ? trigger_error($str, E_USER_WARNING) : null;
 				return false;
 			}
 
 			// Query was a Data Manipulation Query (insert, delete, update, replace, ...)
-			if ( !is_object($this->result) )
+			if (!is_object($this->result))
 			{
 				$is_insert = true;
 				$this->rows_affected = @$this->dbh->affected_rows;
 
 				// Take note of the insert_id
-				if ( preg_match("/^(insert|replace)\s+/i",$query) )
+				if (preg_match("/^(insert|replace)\s+/i", $query))
 				{
 					$this->insert_id = @$this->dbh->insert_id;
 				}
@@ -297,7 +296,7 @@ 
 				$is_insert = false;
 
 				// Take note of column info
-				$i=0;
+				$i = 0;
 				while ($i < @$this->result->field_count)
 				{
 					$this->col_info[$i] = @$this->result->fetch_field();
@@ -305,8 +304,8 @@ 
 				}
 
 				// Store Query Results
-				$num_rows=0;
-				while ( $row = @$this->result->fetch_object() )
+				$num_rows = 0;
+				while ($row = @$this->result->fetch_object())
 				{
 					// Store relults as an objects within main array
 					$this->last_result[$num_rows] = $row;
@@ -323,16 +322,16 @@ 
 			}
 
 			// disk caching of queries
-			$this->store_cache($query,$is_insert);
+			$this->store_cache($query, $is_insert);
 
 			// If debug ALL queries
-			$this->trace || $this->debug_all ? $this->debug() : null ;
+			$this->trace || $this->debug_all ? $this->debug() : null;
 
 			// Keep tack of how long all queries have taken
 			$this->timer_update_global($this->num_queries);
 
 			// Trace all queries
-			if ( $this->use_trace_log )
+			if ($this->use_trace_log)
 			{
 				$this->trace_log[] = $this->debug(false);
 			}

Braces +17 added lines, -11 removed lines

@@ -27,8 +27,12 @@ 
 	*  ezSQL Database specific class - mySQLi
 	*/
 
-	if ( ! function_exists ('mysqli_connect') ) die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine');
-	if ( ! class_exists ('ezSQLcore') ) die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
+	if ( ! function_exists ('mysqli_connect') ) {
+		die('<b>Fatal Error:</b> ezSQL_mysql requires mySQLi Lib to be compiled and or linked in to the PHP engine');
+	}
+	if ( ! class_exists ('ezSQLcore') ) {
+		die('<b>Fatal Error:</b> ezSQL_mysql requires ezSQLcore (ez_sql_core.php) to be included/loaded before it can be used');
+	}
 
 	class ezSQL_mysqli extends ezSQLcore
 	{
@@ -65,7 +69,9 @@ 
 			$return_val = false;
 			if ( ! $this->connect($dbuser, $dbpassword, $dbhost, $dbport) ) ;
 			else if ( ! $this->select($dbname,$encoding) ) ;
-			else $return_val = true;
+			else {
+				$return_val = true;
+			}
 			return $return_val;
 		}
 
@@ -103,8 +109,7 @@ 
 				{
 					$this->register_error($ezsql_mysqli_str[2].' in '.__FILE__.' on line '.__LINE__);
 					$this->show_errors ? trigger_error($ezsql_mysqli_str[2],E_USER_WARNING) : null;
-				}
-				else
+				} else
 				{
 					$this->dbuser = $dbuser;
 					$this->dbpassword = $dbpassword;
@@ -145,13 +150,13 @@ 
 			else if ( !@$this->dbh->select_db($dbname) )
 			{
 				// Try to get error supplied by mysql if not use our own
-				if ( !$str = @$this->dbh->error)
-					  $str = $ezsql_mysqli_str[5];
+				if ( !$str = @$this->dbh->error) {
+									  $str = $ezsql_mysqli_str[5];
+				}
 
 				$this->register_error($str.' in '.__FILE__.' on line '.__LINE__);
 				$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;
-			}
-			else
+			} else
 			{
 				$this->dbname = $dbname;
 				if($encoding!='')
@@ -261,8 +266,9 @@ 
 				$this->connect($this->dbuser, $this->dbpassword, $this->dbhost, $this->dbport);
 				$this->select($this->dbname,$this->encoding);
 				// No existing connection at this point means the server is unreachable
-				if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno )
-					return false;
+				if ( ! isset($this->dbh) || ! $this->dbh || $this->dbh->connect_errno ) {
+									return false;
+				}
 			}
 
 			// Perform the query via std mysql_query function..