iNextrix / ASTPP

web_interface/astpp/system/database/drivers/sqlite/sqlite_driver.php

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -471,8 +473,7 @@ 
 		if (strpos($item, '.') !== FALSE)
 		{
 			$str = $this->_escape_char.str_replace('.', $this->_escape_char.'.'.$this->_escape_char, $item).$this->_escape_char;
-		}
-		else
+		} else
 		{
 			$str = $this->_escape_char.$item.$this->_escape_char;
 		}
@@ -627,8 +628,7 @@ 
 		if ($offset == 0)
 		{
 			$offset = '';
-		}
-		else
+		} else
 		{
 			$offset .= ", ";
 		}

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

Braces +9 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -335,13 +337,15 @@ 
 	 */
 	function count_all($table = '')
 	{
-		if ($table == '')
-			return '0';
+		if ($table == '') {
+					return '0';
+		}
 	
 		$query = $this->query("SELECT COUNT(*) AS numrows FROM " . $this->dbprefix . $table);
 		
-		if ($query->num_rows() == 0)
-			return '0';
+		if ($query->num_rows() == 0) {
+					return '0';
+		}
 
 		$row = $query->row();
 		$this->_reset_select();

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

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -96,8 +98,7 @@ 
 			if (is_numeric($field))
 			{
 				$sql .= "\n\t$attributes";
-			}
-			else
+			} else
 			{
 				$attributes = array_change_key_case($attributes, CASE_UPPER);
 
@@ -123,8 +124,7 @@ 
 				if (array_key_exists('NULL', $attributes) && $attributes['NULL'] === TRUE)
 				{
 					$sql .= ' NULL';
-				}
-				else
+				} else
 				{
 					$sql .= ' NOT NULL';
 				}
@@ -155,8 +155,7 @@ 
 				if (is_array($key))
 				{
 					$key = $this->db->_protect_identifiers($key);
-				}
-				else
+				} else
 				{
 					$key = array($this->db->_protect_identifiers($key));
 				}
@@ -208,8 +207,7 @@ 
 		if ($null === NULL)
 		{
 			$sql .= ' NULL';
-		}
-		else
+		} else
 		{
 			$sql .= ' NOT NULL';
 		}

web_interface/astpp/system/database/DB.php

Braces +6 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -56,8 +58,7 @@ 
 		}
 
 		$params = $db[$active_group];
-	}
-	elseif (is_string($params))
+	} elseif (is_string($params))
 	{
 
 		/* parse the URL from the DSN string
@@ -91,8 +92,7 @@ 
 				if (strtoupper($val) == "TRUE")
 				{
 					$val = TRUE;
-				}
-				elseif (strtoupper($val) == "FALSE")
+				} elseif (strtoupper($val) == "FALSE")
 				{
 					$val = FALSE;
 				}
@@ -128,8 +128,7 @@ 
 		{
 			eval('class CI_DB extends CI_DB_active_record { }');
 		}
-	}
-	else
+	} else
 	{
 		if ( ! class_exists('CI_DB'))
 		{

web_interface/astpp/system/database/DB_driver.php

Braces +12 added lines, -19 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -140,8 +142,7 @@ 
 					$this->display_error('db_unable_to_select', $this->database);
 				}
 				return FALSE;
-			}
-			else
+			} else
 			{
 				// We've selected the DB. Now we set the character set
 				if ( ! $this->db_set_charset($this->char_set, $this->dbcollat))
@@ -223,8 +224,7 @@ 
 		if (in_array($this->dbdriver, $driver_version_exceptions))
 		{
 			return $sql;
-		}
-		else
+		} else
 		{
 			$query = $this->query($sql);
 			return $query->row('ver');
@@ -683,12 +683,10 @@ 
 		if (is_string($str))
 		{
 			$str = "'".$this->escape_str($str)."'";
-		}
-		elseif (is_bool($str))
+		} elseif (is_bool($str))
 		{
 			$str = ($str === FALSE) ? 0 : 1;
-		}
-		elseif (is_null($str))
+		} elseif (is_null($str))
 		{
 			$str = 'NULL';
 		}
@@ -772,8 +770,7 @@ 
 				if (isset($row['TABLE_NAME']))
 				{
 					$retval[] = $row['TABLE_NAME'];
-				}
-				else
+				} else
 				{
 					$retval[] = array_shift($row);
 				}
@@ -839,8 +836,7 @@ 
 			if (isset($row['COLUMN_NAME']))
 			{
 				$retval[] = $row['COLUMN_NAME'];
-			}
-			else
+			} else
 			{
 				$retval[] = current($row);
 			}
@@ -940,8 +936,7 @@ 
 		if ( ! is_array($where))
 		{
 			$dest = array($where);
-		}
-		else
+		} else
 		{
 			$dest = array();
 			foreach ($where as $key => $val)
@@ -1011,8 +1006,7 @@ 
 				return $this->display_error('db_unsupported_function');
 			}
 			return FALSE;
-		}
-		else
+		} else
 		{
 			$args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null;
 
@@ -1163,8 +1157,7 @@ 
 		if ($native == TRUE)
 		{
 			$message = $error;
-		}
-		else
+		} else
 		{
 			$message = ( ! is_array($error)) ? array(str_replace('%s', $swap, $LANG->line($error))) : $error;
 		}

web_interface/astpp/system/database/DB_forge.php

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * Code Igniter
  *
@@ -115,8 +117,7 @@ 
 		if ($primary === TRUE)
 		{
 			$this->primary_keys[] = $key;
-		}
-		else
+		} else
 		{
 			$this->keys[] = $key;
 		}
@@ -150,8 +151,7 @@ 
 													)
 								));
 				$this->add_key('id', TRUE);
-			}
-			else
+			} else
 			{
 				if (strpos($field, ' ') === FALSE)
 				{

web_interface/astpp/system/database/DB_result.php

Braces +17 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -47,9 +49,13 @@ 
 	 */
 	public function result($type = 'object')
 	{
-		if ($type == 'array') return $this->result_array();
-		else if ($type == 'object') return $this->result_object();
-		else return $this->custom_result_object($type);
+		if ($type == 'array') {
+			return $this->result_array();
+		} else if ($type == 'object') {
+			return $this->result_object();
+		} else {
+			return $this->custom_result_object($type);
+		}
 	}
 
 	// --------------------------------------------------------------------
@@ -185,9 +191,13 @@ 
 			$n = 0;
 		}
 
-		if ($type == 'object') return $this->row_object($n);
-		else if ($type == 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+		if ($type == 'object') {
+			return $this->row_object($n);
+		} else if ($type == 'array') {
+			return $this->row_array($n);
+		} else {
+			return $this->custom_row_object($n, $type);
+		}
 	}
 
 	// --------------------------------------------------------------------

web_interface/astpp/system/database/DB_active_rec.php

Braces +23 added lines, -37 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -273,8 +275,7 @@ 
 					}
 				}
 
-			}
-			else
+			} else
 			{
 				$val = trim($val);
 
@@ -316,8 +317,7 @@ 
 			if ( ! in_array($type, array('LEFT', 'RIGHT', 'OUTER', 'INNER', 'LEFT OUTER', 'RIGHT OUTER')))
 			{
 				$type = '';
-			}
-			else
+			} else
 			{
 				$type .= ' ';
 			}
@@ -431,8 +431,7 @@ 
 				{
 					$k .= ' = ';
 				}
-			}
-			else
+			} else
 			{
 				$k = $this->_protect_identifiers($k, FALSE, $escape);
 			}
@@ -665,12 +664,10 @@ 
 			if ($side == 'before')
 			{
 				$like_statement = $prefix." $k $not LIKE '%{$v}'";
-			}
-			elseif ($side == 'after')
+			} elseif ($side == 'after')
 			{
 				$like_statement = $prefix." $k $not LIKE '{$v}%'";
-			}
-			else
+			} else
 			{
 				$like_statement = $prefix." $k $not LIKE '%{$v}%'";
 			}
@@ -820,8 +817,7 @@ 
 		{
 			$orderby = ''; // Random results want or don't need a field name
 			$direction = $this->_random_keyword;
-		}
-		elseif (trim($direction) != '')
+		} elseif (trim($direction) != '')
 		{
 			$direction = (in_array(strtoupper(trim($direction)), array('ASC', 'DESC'), TRUE)) ? ' '.$direction : ' ASC';
 		}
@@ -842,8 +838,7 @@ 
 			}
 
 			$orderby = implode(', ', $temp);
-		}
-		else if ($direction != $this->_random_keyword)
+		} else if ($direction != $this->_random_keyword)
 		{
 			$orderby = $this->_protect_identifiers($orderby);
 		}
@@ -919,8 +914,7 @@ 
 			if ($escape === FALSE)
 			{
 				$this->ar_set[$this->_protect_identifiers($k)] = $v;
-			}
-			else
+			} else
 			{
 				$this->ar_set[$this->_protect_identifiers($k, FALSE, TRUE)] = $this->escape($v);
 			}
@@ -1124,8 +1118,7 @@ 
 			if ($escape === FALSE)
 			{
 				$this->ar_set[] =  '('.implode(',', $row).')';
-			}
-			else
+			} else
 			{
 				$clean = array();
 
@@ -1398,8 +1391,7 @@ 
 				if ($k2 == $index)
 				{
 					$index_set = TRUE;
-				}
-				else
+				} else
 				{
 					$not[] = $k.'-'.$v;
 				}
@@ -1407,8 +1399,7 @@ 
 				if ($escape === FALSE)
 				{
 					$clean[$this->_protect_identifiers($k2)] = $v2;
-				}
-				else
+				} else
 				{
 					$clean[$this->_protect_identifiers($k2)] = $this->escape($v2);
 				}
@@ -1449,8 +1440,7 @@ 
 			}
 
 			$table = $this->ar_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->_protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -1488,8 +1478,7 @@ 
 			}
 
 			$table = $this->ar_from[0];
-		}
-		else
+		} else
 		{
 			$table = $this->_protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -1531,8 +1520,7 @@ 
 			}
 
 			$table = $this->ar_from[0];
-		}
-		elseif (is_array($table))
+		} elseif (is_array($table))
 		{
 			foreach ($table as $single_table)
 			{
@@ -1541,8 +1529,7 @@ 
 
 			$this->_reset_write();
 			return;
-		}
-		else
+		} else
 		{
 			$table = $this->_protect_identifiers($table, TRUE, NULL, FALSE);
 		}
@@ -1679,16 +1666,14 @@ 
 		if ($select_override !== FALSE)
 		{
 			$sql = $select_override;
-		}
-		else
+		} else
 		{
 			$sql = ( ! $this->ar_distinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
 			if (count($this->ar_select) == 0)
 			{
 				$sql .= '*';
-			}
-			else
+			} else
 			{
 				// Cycle through the "select" portion of the query and prep each column name.
 				// The reason we protect identifiers here rather then in the select() function
@@ -2143,8 +2128,9 @@ 
           */
          function _insert_on_duplicate_update_batch($table, $keys, $values)
          {
-                  foreach($keys as $key)
-                  $update_fields[] = $key.'=VALUES('.$key.')';
+                  foreach($keys as $key) {
+                                    $update_fields[] = $key.'=VALUES('.$key.')';
+                  }
            
                   return "INSERT INTO ".$table." (".implode(', ', $keys).") VALUES ".implode(', ', $values)." ON DUPLICATE KEY UPDATE ".implode(', ', $update_fields);
          } 

web_interface/astpp/system/helpers/file_helper.php

Braces +18 added lines, -31 removed lines

@@ -1,4 +1,6 @@ 
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) {
+	exit('No direct script access allowed');
+}
 /**
  * CodeIgniter
  *
@@ -139,8 +141,7 @@ 
 					{
 						delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $level + 1);
 					}
-				}
-				else
+				} else
 				{
 					unlink($path.DIRECTORY_SEPARATOR.$filename);
 				}
@@ -191,15 +192,13 @@ 
 				if (@is_dir($source_dir.$file) && strncmp($file, '.', 1) !== 0)
 				{
 					get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE);
-				}
-				elseif (strncmp($file, '.', 1) !== 0)
+				} elseif (strncmp($file, '.', 1) !== 0)
 				{
 					$_filedata[] = ($include_path == TRUE) ? $source_dir.$file : $file;
 				}
 			}
 			return $_filedata;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -244,8 +243,7 @@ 
 				if (@is_dir($source_dir.$file) AND strncmp($file, '.', 1) !== 0 AND $top_level_only === FALSE)
 				{
 					get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, TRUE);
-				}
-				elseif (strncmp($file, '.', 1) !== 0)
+				} elseif (strncmp($file, '.', 1) !== 0)
 				{
 					$_filedata[$file] = get_file_info($source_dir.$file);
 					$_filedata[$file]['relative_path'] = $relative_path;
@@ -253,8 +251,7 @@ 
 			}
 
 			return $_filedata;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -355,8 +352,7 @@ 
 			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 			{
 				include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
-			}
-			elseif (is_file(APPPATH.'config/mimes.php'))
+			} elseif (is_file(APPPATH.'config/mimes.php'))
 			{
 				include(APPPATH.'config/mimes.php');
 			}
@@ -373,13 +369,11 @@ 
 			{
 				// Multiple mime types, just give the first one
 				return current($mimes[$extension]);
-			}
-			else
+			} else
 			{
 				return $mimes[$extension];
 			}
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}
@@ -405,32 +399,25 @@ 
 		if (($perms & 0xC000) == 0xC000)
 		{
 			$symbolic = 's'; // Socket
-		}
-		elseif (($perms & 0xA000) == 0xA000)
+		} elseif (($perms & 0xA000) == 0xA000)
 		{
 			$symbolic = 'l'; // Symbolic Link
-		}
-		elseif (($perms & 0x8000) == 0x8000)
+		} elseif (($perms & 0x8000) == 0x8000)
 		{
 			$symbolic = '-'; // Regular
-		}
-		elseif (($perms & 0x6000) == 0x6000)
+		} elseif (($perms & 0x6000) == 0x6000)
 		{
 			$symbolic = 'b'; // Block special
-		}
-		elseif (($perms & 0x4000) == 0x4000)
+		} elseif (($perms & 0x4000) == 0x4000)
 		{
 			$symbolic = 'd'; // Directory
-		}
-		elseif (($perms & 0x2000) == 0x2000)
+		} elseif (($perms & 0x2000) == 0x2000)
 		{
 			$symbolic = 'c'; // Character special
-		}
-		elseif (($perms & 0x1000) == 0x1000)
+		} elseif (($perms & 0x1000) == 0x1000)
 		{
 			$symbolic = 'p'; // FIFO pipe
-		}
-		else
+		} else
 		{
 			$symbolic = 'u'; // Unknown
 		}