ci-bonfire / Sprint

system/database/drivers/sqlite3/sqlite3_driver.php

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 			return ( ! $this->password)
 				? new SQLite3($this->database)
 				: new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
-		}
-		catch (Exception $e)
+		} catch (Exception $e)
 		{
 			return FALSE;
 		}

system/database/drivers/sqlite3/sqlite3_forge.php

Braces +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			if ( ! @unlink($this->db->database))
 			{
 				return $this->db->db_debug ? $this->db->display_error('db_unable_to_drop') : FALSE;
-			}
-			elseif ( ! empty($this->db->data_cache['db_names']))
+			} elseif ( ! empty($this->db->data_cache['db_names']))
 			{
 				$key = array_search(strtolower($this->db->database), array_map('strtolower', $this->db->data_cache['db_names']), TRUE);
 				if ($key !== FALSE)

system/database/drivers/sqlite3/sqlite3_result.php

Braces +1 added lines, -2 removed lines

@@ -158,8 +158,7 @@
 		if (($row = $this->result_id->fetchArray(SQLITE3_ASSOC)) === FALSE)
 		{
 			return FALSE;
-		}
-		elseif ($class_name === 'stdClass')
+		} elseif ($class_name === 'stdClass')
 		{
 			return (object) $row;
 		}

system/database/drivers/sqlsrv/sqlsrv_driver.php

Braces +2 added lines, -4 removed lines

@@ -375,8 +375,7 @@ 
 		if (isset($sqlsrv_error['SQLSTATE']))
 		{
 			$error['code'] = isset($sqlsrv_error['code']) ? $sqlsrv_error['SQLSTATE'].'/'.$sqlsrv_error['code'] : $sqlsrv_error['SQLSTATE'];
-		}
-		elseif (isset($sqlsrv_error['code']))
+		} elseif (isset($sqlsrv_error['code']))
 		{
 			$error['code'] = $sqlsrv_error['code'];
 		}
@@ -480,8 +479,7 @@ 
 			if (count($this->qb_select) === 0)
 			{
 				$select = '*'; // Inevitable
-			}
-			else
+			} else
 			{
 				// Use only field names and their aliases, everything else is out of our scope.
 				$select = array();

system/helpers/captcha_helper.php

Braces +7 added lines, -14 removed lines

@@ -87,8 +87,7 @@ 
 			if ( ! is_array($data) && empty($$key))
 			{
 				$$key = $val;
-			}
-			else
+			} else
 			{
 				$$key = isset($data[$key]) ? $data[$key] : $val;
 			}
@@ -137,8 +136,7 @@ 
 					{
 						$word .= $pool[random_int(0, $rand_max)];
 					}
-				}
-				catch (Exception $e)
+				} catch (Exception $e)
 				{
 					// This means fallback to the next possible
 					// alternative to random_int()
@@ -215,8 +213,7 @@ 
 			{
 				$word .= $pool[mt_rand(0, $rand_max)];
 			}
-		}
-		elseif ( ! is_string($word))
+		} elseif ( ! is_string($word))
 		{
 			$word = (string) $word;
 		}
@@ -284,8 +281,7 @@ 
 			($font_size > 5) && $font_size = 5;
 			$x = mt_rand(0, $img_width / ($length / 3));
 			$y = 0;
-		}
-		else
+		} else
 		{
 			($font_size > 30) && $font_size = 30;
 			$x = mt_rand(0, $img_width / ($length / 1.5));
@@ -299,8 +295,7 @@ 
 				$y = mt_rand(0 , $img_height / 2);
 				imagestring($im, $font_size, $x, $y, $word[$i], $colors['text']);
 				$x += ($font_size * 2);
-			}
-			else
+			} else
 			{
 				$y = mt_rand($img_height / 2, $img_height - 3);
 				imagettftext($im, $font_size, $angle, $x, $y, $colors['text'], $font_path, $word[$i]);
@@ -320,13 +315,11 @@ 
 		{
 			$img_filename = $now.'.jpg';
 			imagejpeg($im, $img_path.$img_filename);
-		}
-		elseif (function_exists('imagepng'))
+		} elseif (function_exists('imagepng'))
 		{
 			$img_filename = $now.'.png';
 			imagepng($im, $img_path.$img_filename);
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

system/helpers/date_helper.php

Braces +12 added lines, -19 removed lines

@@ -104,8 +104,7 @@ 
 		if ($datestr === '')
 		{
 			return '';
-		}
-		elseif (empty($time))
+		} elseif (empty($time))
 		{
 			$time = now();
 		}
@@ -283,8 +282,7 @@ 
 		if ($month < 1 OR $month > 12)
 		{
 			return 0;
-		}
-		elseif ( ! is_numeric($year) OR strlen($year) !== 4)
+		} elseif ( ! is_numeric($year) OR strlen($year) !== 4)
 		{
 			$year = date('Y');
 		}
@@ -420,8 +418,7 @@ 
 		if ($fmt === 'us')
 		{
 			$r .= date('h', $time).':'.date('i', $time);
-		}
-		else
+		} else
 		{
 			$r .= date('H', $time).':'.date('i', $time);
 		}
@@ -477,8 +474,7 @@ 
 			if ($ampm[0] === 'p' && $hour < 12)
 			{
 				$hour += 12;
-			}
-			elseif ($ampm[0] === 'a' && $hour === 12)
+			} elseif ($ampm[0] === 'a' && $hour === 12)
 			{
 				$hour = 0;
 			}
@@ -505,8 +501,7 @@ 
 		if (empty($bad_date))
 		{
 			return 'Unknown';
-		}
-		elseif (empty($format))
+		} elseif (empty($format))
 		{
 			$format = 'U';
 		}
@@ -518,8 +513,7 @@ 
 			{
 				$year  = substr($bad_date, 0, 4);
 				$month = substr($bad_date, 4, 2);
-			}
-			else
+			} else
 			{
 				$month  = substr($bad_date, 0, 2);
 				$year   = substr($bad_date, 2, 4);
@@ -732,8 +726,7 @@ 
 			{
 				$arg = new DateTime();
 				$arg->setTimestamp($mixed);
-			}
-			else
+			} else
 			{
 				$arg = (int) $mixed;
 			}
@@ -764,23 +757,23 @@ 
 			$arg = new DateTime();
 			$arg->setDate(date('Y', $mixed), date('n', $mixed), date('j', $mixed));
 			$arg->setTime(date('G', $mixed), date('i', $mixed), date('s', $mixed));
-		}
-		else
+		} else
 		{
 			$arg = (int) $mixed;
 		}
 		$range[] = $from->format($format);
 
-		if (is_int($arg)) // Day intervals
+		if (is_int($arg)) {
+			// Day intervals
 		{
 			do
 			{
 				$from->modify('+1 day');
+		}
 				$range[] = $from->format($format);
 			}
 			while (--$arg > 0);
-		}
-		else // end date UNIX timestamp
+		} else // end date UNIX timestamp
 		{
 			for ($from->modify('+1 day'), $end_check = $arg->format('Ymd'); $from->format('Ymd') < $end_check; $from->modify('+1 day'))
 			{

system/helpers/directory_helper.php

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 				if (($directory_depth < 1 OR $new_depth > 0) && is_dir($source_dir.$file))
 				{
 					$filedata[$file] = directory_map($source_dir.$file, $new_depth, $hidden);
-				}
-				else
+				} else
 				{
 					$filedata[] = $file;
 				}

system/helpers/download_helper.php

Braces +2 added lines, -4 removed lines

@@ -66,8 +66,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -77,8 +76,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}

system/helpers/file_helper.php

Braces +10 added lines, -20 removed lines

@@ -141,8 +141,7 @@ 
 				if (is_dir($path.DIRECTORY_SEPARATOR.$filename) && $filename[0] !== '.')
 				{
 					delete_files($path.DIRECTORY_SEPARATOR.$filename, $del_dir, $htdocs, $_level + 1);
-				}
-				elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
+				} elseif ($htdocs !== TRUE OR ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
 				{
 					@unlink($path.DIRECTORY_SEPARATOR.$filename);
 				}
@@ -190,8 +189,7 @@ 
 				if (is_dir($source_dir.$file) && $file[0] !== '.')
 				{
 					get_filenames($source_dir.$file.DIRECTORY_SEPARATOR, $include_path, TRUE);
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					$_filedata[] = ($include_path === TRUE) ? $source_dir.$file : $file;
 				}
@@ -242,8 +240,7 @@ 
 				if (is_dir($source_dir.$file) && $file[0] !== '.' && $top_level_only === FALSE)
 				{
 					get_dir_file_info($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, TRUE);
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					$_filedata[$file] = get_file_info($source_dir.$file);
 					$_filedata[$file]['relative_path'] = $relative_path;
@@ -382,32 +379,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
 		}