onericcomputing / mmanager-module-builder

src/Extensions/Database/ezSQLcore.php

Spacing +84 added lines, -87 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,11 +463,11 @@ 
 				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}";
-					if (!isset($this->col_info[$i]->max_length))
+					if ( ! isset($this->col_info[$i]->max_length))
 					{
 						echo "{$this->col_info[$i]->size}";
 					} else {
@@ -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()' :

src/Extensions/Database/ezSQL_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
 	(
@@ -185,9 +185,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 +54 added lines, -55 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,25 +80,25 @@ 
 			$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);
 				// 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
 				{
@@ -120,47 +119,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);
 					}
 				}
@@ -179,13 +178,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);
                         }                        
 
@@ -210,10 +209,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
@@ -238,13 +237,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);
 				}
@@ -253,12 +252,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;
 			}
 
@@ -266,21 +265,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;
 				}
@@ -294,7 +293,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();
@@ -302,8 +301,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;
@@ -320,16 +319,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);
 			}
@@ -368,21 +367,21 @@ 
 		*/
 		function execute()
 		{
-			if($this->s_query != '')
+			if ($this->s_query != '')
 			{
 				$query = $this->s_query;
 
-				if(!empty($this->s_params))
+				if ( ! empty($this->s_params))
 				{
-					foreach($this->s_params as $param => $value)
+					foreach ($this->s_params as $param => $value)
 					{
 						$count = 0;
 						$query = str_replace($param, $value, $query, $count);
-						if($count == 0)
+						if ($count == 0)
 						{
-							$str = $query .' no parameter was changed';
-							$this->register_error($str .' in '.__FILE__.' on line '.__LINE__);
-							$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;
+							$str = $query.' no parameter was changed';
+							$this->register_error($str.' in '.__FILE__.' on line '.__LINE__);
+							$this->show_errors ? trigger_error($str, E_USER_WARNING) : null;
 						}
 					}
 				}

Braces +18 added lines, -13 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;
 		}
 
@@ -100,8 +106,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;
@@ -142,13 +147,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!='')
@@ -258,8 +263,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..
@@ -391,8 +397,7 @@ 
 				$this->s_params = array();
 
 				return $this->query($query);
-			}
-			else
+			} else
 			{
 				return NULL;
 			}

src/Extensions/Woocommerce/Functions.php

Indentation +44 added lines, -44 removed lines

@@ -34,39 +34,39 @@ 
 	}
 	public function getUserKeys() {
 		return array(
-	    	'store_url' => $this->getOption('home'),
-	    	'consumer_key' => $this->getOption('wpt_wc_api_consumer_consumer_key'),
-	    	'consumer_secret' => $this->getOption('wpt_wc_api_consumer_consumer_secret')
-	    );
+			'store_url' => $this->getOption('home'),
+			'consumer_key' => $this->getOption('wpt_wc_api_consumer_consumer_key'),
+			'consumer_secret' => $this->getOption('wpt_wc_api_consumer_consumer_secret')
+		);
 	}
 	public function get($endpoint, $params) {
 		if ($this->synched()) {
 			try {
-			    // Array of response results.
-			    $woocommerce = $this->wc_api_connect();
-			    $results = $woocommerce->get($endpoint, $params);
-			    // Example: ['customers' => [[ 'id' => 8, 'created_at' => '2015-05-06T17:43:51Z', 'email' => ...
+				// Array of response results.
+				$woocommerce = $this->wc_api_connect();
+				$results = $woocommerce->get($endpoint, $params);
+				// Example: ['customers' => [[ 'id' => 8, 'created_at' => '2015-05-06T17:43:51Z', 'email' => ...
 
-			    // Last request data.
-			    $lastRequest = $woocommerce->http->getRequest();
-			    $lastRequest->getUrl(); // Requested URL (string).
-			    $lastRequest->getMethod(); // Request method (string).
-			    $lastRequest->getParameters(); // Request parameters (array).
-			    $lastRequest->getHeaders(); // Request headers (array).
-			    $lastRequest->getBody(); // Request body (JSON).
+				// Last request data.
+				$lastRequest = $woocommerce->http->getRequest();
+				$lastRequest->getUrl(); // Requested URL (string).
+				$lastRequest->getMethod(); // Request method (string).
+				$lastRequest->getParameters(); // Request parameters (array).
+				$lastRequest->getHeaders(); // Request headers (array).
+				$lastRequest->getBody(); // Request body (JSON).
 
-			    // Last response data.
-			    $lastResponse = $woocommerce->http->getResponse();
-			    $lastResponse->getCode(); // Response code (int).
-			    $lastResponse->getHeaders(); // Response headers (array).
-			    $lastResponse->getBody(); // Response body (JSON).
+				// Last response data.
+				$lastResponse = $woocommerce->http->getResponse();
+				$lastResponse->getCode(); // Response code (int).
+				$lastResponse->getHeaders(); // Response headers (array).
+				$lastResponse->getBody(); // Response body (JSON).
 
-			    return $results;
+				return $results;
 
 			} catch (HttpClientException $e) {
-			    $e->getMessage(); // Error message.
-			    $e->getRequest(); // Last request data.
-			    $e->getResponse(); // Last response data.
+				$e->getMessage(); // Error message.
+				$e->getRequest(); // Last request data.
+				$e->getResponse(); // Last response data.
 			}
 		}
 	}
@@ -131,32 +131,32 @@ 
 	 * @return \Automattic\WooCommerce\Client|bool
 	 */
 	public function wc_api_connect() {
-	    static $connection;
+		static $connection;
 	 
-	    if ( isset( $connection ) ) {
-	        return $connection;
-	    }
+		if ( isset( $connection ) ) {
+			return $connection;
+		}
 	 
-	    $keys = $this->getUserKeys();
+		$keys = $this->getUserKeys();
 
-	    if ( ! $keys ) {
-	        $connection = false;
+		if ( ! $keys ) {
+			$connection = false;
 	 
-	        return $connection;
-	    }
+			return $connection;
+		}
 	 
-	    $connection = new Client(
-    		$keys['store_url'],
-    		$keys['consumer_key'],
-    		$keys['consumer_secret'],
-    		array(
-    			'wp_api'     => true,
-    			'version'    => 'wc/v2',
-    			'verify_ssl' => false, // Allow self-signed certificates (remove for prod)
-    		)
-	    );
+		$connection = new Client(
+			$keys['store_url'],
+			$keys['consumer_key'],
+			$keys['consumer_secret'],
+			array(
+				'wp_api'     => true,
+				'version'    => 'wc/v2',
+				'verify_ssl' => false, // Allow self-signed certificates (remove for prod)
+			)
+		);
 	 
-	    return $connection;
+		return $connection;
 	}
 }
 

Spacing +2 added lines, -2 removed lines

@@ -133,13 +133,13 @@
 	public function wc_api_connect() {
 	    static $connection;
 	 
-	    if ( isset( $connection ) ) {
+	    if (isset($connection)) {
 	        return $connection;
 	    }
 	 
 	    $keys = $this->getUserKeys();
 
-	    if ( ! $keys ) {
+	    if ( ! $keys) {
 	        $connection = false;
 	 
 	        return $connection;

src/Extensions/Mrepair/MRepair.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		$fn = new Functions();
 		return $fn->generateRepairReference();
 	}
-	public static function implodeAddress($id=null, $context) {
+	public static function implodeAddress($id = null, $context) {
 		$fn = new Functions();
 		return $fn->implodeAddress($id, $context);
 	}

src/Extensions/Mrepair/Functions.php

Indentation +7 added lines, -7 removed lines

@@ -129,13 +129,13 @@
 		return 'REPAIR-'.date('ymd').'-'.strtoupper($this->generateRandomString());
 	}
 	public function generateRandomString($length = 5) {
-	    $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	    $charactersLength = strlen($characters);
-	    $randomString = '';
-	    for ($i = 0; $i < $length; $i++) {
-	        $randomString .= $characters[rand(0, $charactersLength - 1)];
-	    }
-	    return $randomString;
+		$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+		$charactersLength = strlen($characters);
+		$randomString = '';
+		for ($i = 0; $i < $length; $i++) {
+			$randomString .= $characters[rand(0, $charactersLength - 1)];
+		}
+		return $randomString;
 	}
 	public function getTicketIssueTypes($id = null) {
 		if ( ! $id) {

Spacing +7 added lines, -7 removed lines

@@ -193,7 +193,7 @@ 
 				if ($appointment->appointment_datetime) {
 					array_push($list, array(
 						'id' => $appointment->id,
-						'title' => $appointment->ticket_reference . ' ( '.$appointment->appointment_datetime.' ) ',
+						'title' => $appointment->ticket_reference.' ( '.$appointment->appointment_datetime.' ) ',
 						'start' => $appointment->appointment_datetime,
 					));
 				}
@@ -213,7 +213,7 @@ 
 	}
 	
 	public function getRepairStatuses($id = null, $str = false) {
-		$statuses =  array(
+		$statuses = array(
 			'1' => __('label_new'),
 			'2' => __('label_progress'),
 			'3' => __('label_resolved'),
@@ -224,7 +224,7 @@ 
 			'8' => __('label_customer_reply')
 		);
 
-		if ( !$id && ! $str) {
+		if ( ! $id && ! $str) {
 			return $statuses;
 		} else {
 			return $statuses[$id]; 
@@ -232,8 +232,8 @@ 
 	} 
 	
 	public function getAppointmentTypes($id = null, $str = false) {
-		if ( !$id ) {
-			$id =  1;
+		if ( ! $id) {
+			$id = 1;
 		}
 		$types = array(
 			'1' => array('id' => 1, 'value' => __('label_in_shop')),
@@ -241,7 +241,7 @@ 
 			'3' => array('id' => 3, 'value' => __('label_phone_call')),
 		);
 
-		if ( !$id && ! $str) {
+		if ( ! $id && ! $str) {
 			return $types;
 		} else {
 			return $types[$id]['value']; 
@@ -291,7 +291,7 @@ 
 		return [];
 	}
 
-	public function implodeAddress($id=null, $context) {
+	public function implodeAddress($id = null, $context) {
 		
 		switch ($context) {
 			case 'client':

src/Contract/LoggerAwareInterface.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
  */
 interface LoggerAwareInterface
 {
-    /**
-     * Sets a logger instance on the object
-     *
-     * @param LoggerInterface $logger
-     * @return void
-     */
-    public function setLogger(LoggerInterface $logger);
+	/**
+	 * Sets a logger instance on the object
+	 *
+	 * @param LoggerInterface $logger
+	 * @return void
+	 */
+	public function setLogger(LoggerInterface $logger);
 }
\ No newline at end of file

src/Contract/LoggerInterface.php

Indentation +84 added lines, -84 removed lines

@@ -22,96 +22,96 @@
 
 interface LoggerInterface
 {
-    /**
-     * System is unusable.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function emergency($message, array $context = array());
+	/**
+	 * System is unusable.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function emergency($message, array $context = array());
 
-    /**
-     * Action must be taken immediately.
-     *
-     * Example: Entire website down, database unavailable, etc. This should
-     * trigger the SMS alerts and wake you up.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function alert($message, array $context = array());
+	/**
+	 * Action must be taken immediately.
+	 *
+	 * Example: Entire website down, database unavailable, etc. This should
+	 * trigger the SMS alerts and wake you up.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function alert($message, array $context = array());
 
-    /**
-     * Critical conditions.
-     *
-     * Example: Application component unavailable, unexpected exception.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function critical($message, array $context = array());
+	/**
+	 * Critical conditions.
+	 *
+	 * Example: Application component unavailable, unexpected exception.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function critical($message, array $context = array());
 
-    /**
-     * Runtime errors that do not require immediate action but should typically
-     * be logged and monitored.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function error($message, array $context = array());
+	/**
+	 * Runtime errors that do not require immediate action but should typically
+	 * be logged and monitored.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function error($message, array $context = array());
 
-    /**
-     * Exceptional occurrences that are not errors.
-     *
-     * Example: Use of deprecated APIs, poor use of an API, undesirable things
-     * that are not necessarily wrong.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function warning($message, array $context = array());
+	/**
+	 * Exceptional occurrences that are not errors.
+	 *
+	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
+	 * that are not necessarily wrong.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function warning($message, array $context = array());
 
-    /**
-     * Normal but significant events.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function notice($message, array $context = array());
+	/**
+	 * Normal but significant events.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function notice($message, array $context = array());
 
-    /**
-     * Interesting events.
-     *
-     * Example: User logs in, SQL logs.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function info($message, array $context = array());
+	/**
+	 * Interesting events.
+	 *
+	 * Example: User logs in, SQL logs.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function info($message, array $context = array());
 
-    /**
-     * Detailed debug information.
-     *
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function debug($message, array $context = array());
+	/**
+	 * Detailed debug information.
+	 *
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function debug($message, array $context = array());
 
-    /**
-     * Logs with an arbitrary level.
-     *
-     * @param mixed $level
-     * @param string $message
-     * @param array $context
-     * @return void
-     */
-    public function log($level, $message, array $context = array());
+	/**
+	 * Logs with an arbitrary level.
+	 *
+	 * @param mixed $level
+	 * @param string $message
+	 * @param array $context
+	 * @return void
+	 */
+	public function log($level, $message, array $context = array());
 }
\ No newline at end of file

src/Contract/CacheInterface.php

Indentation +100 added lines, -100 removed lines

@@ -22,111 +22,111 @@
 
 interface CacheInterface
 {
-    /**
-     * Fetches a value from the cache.
-     *
-     * @param string $key     The unique key of this item in the cache.
-     * @param mixed  $default Default value to return if the key does not exist.
-     *
-     * @return mixed The value of the item from the cache, or $default in case of cache miss.
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function get($key, $default = null);
+	/**
+	 * Fetches a value from the cache.
+	 *
+	 * @param string $key     The unique key of this item in the cache.
+	 * @param mixed  $default Default value to return if the key does not exist.
+	 *
+	 * @return mixed The value of the item from the cache, or $default in case of cache miss.
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if the $key string is not a legal value.
+	 */
+	public function get($key, $default = null);
 
-    /**
-     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
-     *
-     * @param string                 $key   The key of the item to store.
-     * @param mixed                  $value The value of the item to store, must be serializable.
-     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
-     *                                      the driver supports TTL then the library may set a default value
-     *                                      for it or let the driver take care of that.
-     *
-     * @return bool True on success and false on failure.
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function set($key, $value, $ttl = null);
+	/**
+	 * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+	 *
+	 * @param string                 $key   The key of the item to store.
+	 * @param mixed                  $value The value of the item to store, must be serializable.
+	 * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+	 *                                      the driver supports TTL then the library may set a default value
+	 *                                      for it or let the driver take care of that.
+	 *
+	 * @return bool True on success and false on failure.
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if the $key string is not a legal value.
+	 */
+	public function set($key, $value, $ttl = null);
 
-    /**
-     * Delete an item from the cache by its unique key.
-     *
-     * @param string $key The unique cache key of the item to delete.
-     *
-     * @return bool True if the item was successfully removed. False if there was an error.
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function delete($key);
+	/**
+	 * Delete an item from the cache by its unique key.
+	 *
+	 * @param string $key The unique cache key of the item to delete.
+	 *
+	 * @return bool True if the item was successfully removed. False if there was an error.
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if the $key string is not a legal value.
+	 */
+	public function delete($key);
 
-    /**
-     * Wipes clean the entire cache's keys.
-     *
-     * @return bool True on success and false on failure.
-     */
-    public function clear();
+	/**
+	 * Wipes clean the entire cache's keys.
+	 *
+	 * @return bool True on success and false on failure.
+	 */
+	public function clear();
 
-    /**
-     * Obtains multiple cache items by their unique keys.
-     *
-     * @param iterable $keys    A list of keys that can obtained in a single operation.
-     * @param mixed    $default Default value to return for keys that do not exist.
-     *
-     * @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if $keys is neither an array nor a Traversable,
-     *   or if any of the $keys are not a legal value.
-     */
-    public function getMultiple($keys, $default = null);
+	/**
+	 * Obtains multiple cache items by their unique keys.
+	 *
+	 * @param iterable $keys    A list of keys that can obtained in a single operation.
+	 * @param mixed    $default Default value to return for keys that do not exist.
+	 *
+	 * @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if $keys is neither an array nor a Traversable,
+	 *   or if any of the $keys are not a legal value.
+	 */
+	public function getMultiple($keys, $default = null);
 
-    /**
-     * Persists a set of key => value pairs in the cache, with an optional TTL.
-     *
-     * @param iterable               $values A list of key => value pairs for a multiple-set operation.
-     * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
-     *                                       the driver supports TTL then the library may set a default value
-     *                                       for it or let the driver take care of that.
-     *
-     * @return bool True on success and false on failure.
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if $values is neither an array nor a Traversable,
-     *   or if any of the $values are not a legal value.
-     */
-    public function setMultiple($values, $ttl = null);
+	/**
+	 * Persists a set of key => value pairs in the cache, with an optional TTL.
+	 *
+	 * @param iterable               $values A list of key => value pairs for a multiple-set operation.
+	 * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
+	 *                                       the driver supports TTL then the library may set a default value
+	 *                                       for it or let the driver take care of that.
+	 *
+	 * @return bool True on success and false on failure.
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if $values is neither an array nor a Traversable,
+	 *   or if any of the $values are not a legal value.
+	 */
+	public function setMultiple($values, $ttl = null);
 
-    /**
-     * Deletes multiple cache items in a single operation.
-     *
-     * @param iterable $keys A list of string-based keys to be deleted.
-     *
-     * @return bool True if the items were successfully removed. False if there was an error.
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if $keys is neither an array nor a Traversable,
-     *   or if any of the $keys are not a legal value.
-     */
-    public function deleteMultiple($keys);
+	/**
+	 * Deletes multiple cache items in a single operation.
+	 *
+	 * @param iterable $keys A list of string-based keys to be deleted.
+	 *
+	 * @return bool True if the items were successfully removed. False if there was an error.
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if $keys is neither an array nor a Traversable,
+	 *   or if any of the $keys are not a legal value.
+	 */
+	public function deleteMultiple($keys);
 
-    /**
-     * Determines whether an item is present in the cache.
-     *
-     * NOTE: It is recommended that has() is only to be used for cache warming type purposes
-     * and not to be used within your live applications operations for get/set, as this method
-     * is subject to a race condition where your has() will return true and immediately after,
-     * another script can remove it making the state of your app out of date.
-     *
-     * @param string $key The cache item key.
-     *
-     * @return bool
-     *
-     * @throws \Mmanager\Exception\InvalidArgumentException
-     *   MUST be thrown if the $key string is not a legal value.
-     */
-    public function has($key);
+	/**
+	 * Determines whether an item is present in the cache.
+	 *
+	 * NOTE: It is recommended that has() is only to be used for cache warming type purposes
+	 * and not to be used within your live applications operations for get/set, as this method
+	 * is subject to a race condition where your has() will return true and immediately after,
+	 * another script can remove it making the state of your app out of date.
+	 *
+	 * @param string $key The cache item key.
+	 *
+	 * @return bool
+	 *
+	 * @throws \Mmanager\Exception\InvalidArgumentException
+	 *   MUST be thrown if the $key string is not a legal value.
+	 */
+	public function has($key);
 }
\ No newline at end of file

src/BootstrapTable.php

Spacing +13 added lines, -13 removed lines

@@ -103,23 +103,23 @@ 
 			foreach ($orders as &$order) {
 				if ($order->amount_paid > 0 AND $order->order_status == 'Refunded')
 				{
-					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix') . sprintf( "%04s", $order->order_number ) : get_option('credit_note_prefix') . sprintf( "%04s", $order->order_number );
+					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix').sprintf("%04s", $order->order_number) : get_option('credit_note_prefix').sprintf("%04s", $order->order_number);
 				}
 				elseif ($order->order_status == 'Refunded')
 				{
-					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix') . sprintf( "%04s", $order->order_number ) : get_option('credit_note_prefix') . sprintf( "%04s", $order->order_number );
+					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix').sprintf("%04s", $order->order_number) : get_option('credit_note_prefix').sprintf("%04s", $order->order_number);
 				}
 				elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid')
 				{
-					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short') . sprintf( "%04s", $order->order_number ) : get_option('sale_order_prefix') . sprintf( "%04s", $order->order_number );
+					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number);
 				}
-				elseif( $order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed')
+				elseif ($order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed')
 				{
-					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short') . sprintf( "%04s", $order->order_number ) : get_option('sale_order_prefix') . sprintf( "%04s", $order->order_number );
+					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number);
 				}
 				else
 				{
-					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short') . sprintf( "%04s", $order->order_number ) : get_option('sale_order_prefix') . sprintf( "%04s", $order->order_number );
+					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short').sprintf("%04s", $order->order_number) : get_option('sale_order_prefix').sprintf("%04s", $order->order_number);
 				}
 				array_push($this->list, array(
 					'id' 				  => $order->id,
@@ -127,9 +127,9 @@ 
 					'number_prefix'   	  => $number_prefix,
 					'order_number'   	  => $order->order_number,
 					'enc_order_number'    => _eID($order->order_number),
-					'name_company'		  => $invoiceObj->getCustomer($order->client_id,'name_company'),
-					'date'				  => _fdate( language_string_to_locale_notation( get_option('user_language', 'users_options') ), $order->date ),
-					'due_date'			  => _fdate( language_string_to_locale_notation( get_option('user_language', 'users_options') ), $order->due_date ),
+					'name_company'		  => $invoiceObj->getCustomer($order->client_id, 'name_company'),
+					'date'				  => _fdate(language_string_to_locale_notation(get_option('user_language', 'users_options')), $order->date),
+					'due_date'			  => _fdate(language_string_to_locale_notation(get_option('user_language', 'users_options')), $order->due_date),
 					'total'				  => format_number($order->total),
 					'amount_due'		  => format_number($order->amount_due),
 					'amount_paid'		  => format_number($order->amount_paid),
@@ -155,7 +155,7 @@ 
 			foreach ($clients as &$client) {
 				if (isset($client->client_address1) && $client->client_postcode && $client->client_city && $client->client_country)
 				{
-					$address = $client->client_address1 . ' ' . $client->client_postcode . ' ' . $client->client_city . ' ' . get_countries($client->client_country);
+					$address = $client->client_address1.' '.$client->client_postcode.' '.$client->client_city.' '.get_countries($client->client_country);
 				}
 				else
 				{
@@ -174,7 +174,7 @@ 
 					'client_tax_number'	  => isset($client->client_tax_number) ? $client->client_tax_number : "",
 					'client_bank_number'  => isset($client->client_bank_number) ? $client->client_bank_number : "",
 					'client_status_str'   => status_str($client->client_status),
-					'client_date_created' => _fdate( language_string_to_locale_notation( get_option('user_language', 'users_options') ), $client->client_date_created)
+					'client_date_created' => _fdate(language_string_to_locale_notation(get_option('user_language', 'users_options')), $client->client_date_created)
 					)
 				);
 			}
@@ -207,7 +207,7 @@ 
 					'qrcode'         	  => $item->qrcode,
 					'barcode'         	  => $item->barcode,
 					'hasqrbar'         	  => $hasqrbar,
-					'item_status_str'     => '0.00' !== $item->current_stock ? $item->current_stock .' ' .item_status_str($item->item_status) : '' .' ' .item_status_str($item->item_status)
+					'item_status_str'     => '0.00' !== $item->current_stock ? $item->current_stock.' '.item_status_str($item->item_status) : ''.' '.item_status_str($item->item_status)
 					)
 				);
 			}
@@ -234,7 +234,7 @@ 
 					'price'		  		  =>format_number($item->price),
 					'tax_percent'		  => $item->tax_percent,
 					'item_status'         => $item->item_status,
-					'item_status_str'     => '0.00' !== $item->current_stock ? $item->current_stock .' ' .item_status_str($item->item_status) : '' .' ' .item_status_str($item->item_status)
+					'item_status_str'     => '0.00' !== $item->current_stock ? $item->current_stock.' '.item_status_str($item->item_status) : ''.' '.item_status_str($item->item_status)
 					)
 				);
 			}

Braces +5 added lines, -10 removed lines

@@ -104,20 +104,16 @@ 
 				if ($order->amount_paid > 0 AND $order->order_status == 'Refunded')
 				{
 					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix') . sprintf( "%04s", $order->order_number ) : get_option('credit_note_prefix') . sprintf( "%04s", $order->order_number );
-				}
-				elseif ($order->order_status == 'Refunded')
+				} elseif ($order->order_status == 'Refunded')
 				{
 					$number_prefix = null == get_option('credit_note_prefix') ? __('credit_note_prefix') . sprintf( "%04s", $order->order_number ) : get_option('credit_note_prefix') . sprintf( "%04s", $order->order_number );
-				}
-				elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid')
+				} elseif ($order->amount_paid > 0 AND $order->amount_due > 0 AND $order->order_status !== 'Paid')
 				{
 					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short') . sprintf( "%04s", $order->order_number ) : get_option('sale_order_prefix') . sprintf( "%04s", $order->order_number );
-				}
-				elseif( $order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed')
+				} elseif( $order->order_status == 'Expired' || $order->order_status == 'Open' || $order->order_status == 'Pending' || $order->order_status == 'Failed')
 				{
 					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short') . sprintf( "%04s", $order->order_number ) : get_option('sale_order_prefix') . sprintf( "%04s", $order->order_number );
-				}
-				else
+				} else
 				{
 					$number_prefix = null == get_option('sale_order_prefix') ? __('sale_order_prefix_short') . sprintf( "%04s", $order->order_number ) : get_option('sale_order_prefix') . sprintf( "%04s", $order->order_number );
 				}
@@ -156,8 +152,7 @@ 
 				if (isset($client->client_address1) && $client->client_postcode && $client->client_city && $client->client_country)
 				{
 					$address = $client->client_address1 . ' ' . $client->client_postcode . ' ' . $client->client_city . ' ' . get_countries($client->client_country);
-				}
-				else
+				} else
 				{
 					$address = false;
 				}