ci-bonfire / Sprint

system/libraries/Cache/drivers/Cache_memcached.php

Braces +4 added lines, -8 removed lines

@@ -99,12 +99,10 @@ 
 		if (class_exists('Memcached', FALSE))
 		{
 			$this->_memcached = new Memcached();
-		}
-		elseif (class_exists('Memcache', FALSE))
+		} elseif (class_exists('Memcache', FALSE))
 		{
 			$this->_memcached = new Memcache();
-		}
-		else
+		} else
 		{
 			log_message('error', 'Cache: Failed to create Memcache(d) object; extension not loaded?');
 		}
@@ -124,8 +122,7 @@ 
 					TRUE,
 					$cache_server['weight']
 				);
-			}
-			else
+			} else
 			{
 				$this->_memcached->addServer(
 					$cache_server['hostname'],
@@ -172,8 +169,7 @@ 
 		if (get_class($this->_memcached) === 'Memcached')
 		{
 			return $this->_memcached->set($id, $data, $ttl);
-		}
-		elseif (get_class($this->_memcached) === 'Memcache')
+		} elseif (get_class($this->_memcached) === 'Memcache')
 		{
 			return $this->_memcached->set($id, $data, 0, $ttl);
 		}

system/libraries/Cache/drivers/Cache_redis.php

Braces +3 added lines, -6 removed lines

@@ -107,8 +107,7 @@ 
 			if ($config['socket_type'] === 'unix')
 			{
 				$success = $this->_redis->connect($config['socket']);
-			}
-			else // tcp socket
+			} else // tcp socket
 			{
 				$success = $this->_redis->connect($config['host'], $config['port'], $config['timeout']);
 			}
@@ -122,8 +121,7 @@ 
 			{
 				log_message('error', 'Cache: Redis authentication failed.');
 			}
-		}
-		catch (RedisException $e)
+		} catch (RedisException $e)
 		{
 			log_message('error', 'Cache: Redis connection refused ('.$e->getMessage().')');
 		}
@@ -175,8 +173,7 @@ 
 
 			isset($this->_serialized[$id]) OR $this->_serialized[$id] = TRUE;
 			$data = serialize($data);
-		}
-		elseif (isset($this->_serialized[$id]))
+		} elseif (isset($this->_serialized[$id]))
 		{
 			$this->_serialized[$id] = NULL;
 			$this->_redis->sRemove('_ci_redis_serialized', $id);

system/libraries/Calendar.php

Braces +12 added lines, -24 removed lines

@@ -184,12 +184,10 @@ 
 		if (empty($year))
 		{
 			$year = date('Y', $local_time);
-		}
-		elseif (strlen($year) === 1)
+		} elseif (strlen($year) === 1)
 		{
 			$year = '200'.$year;
-		}
-		elseif (strlen($year) === 2)
+		} elseif (strlen($year) === 2)
 		{
 			$year = '20'.$year;
 		}
@@ -197,8 +195,7 @@ 
 		if (empty($month))
 		{
 			$month = date('m', $local_time);
-		}
-		elseif (strlen($month) === 1)
+		} elseif (strlen($month) === 1)
 		{
 			$month = '0'.$month;
 		}
@@ -294,8 +291,7 @@ 
 						$temp = ($is_current_month === TRUE && $day == $cur_day) ?
 								$this->replacements['cal_cell_content_today'] : $this->replacements['cal_cell_content'];
 						$out .= str_replace(array('{content}', '{day}'), array($data[$day], $day), $temp);
-					}
-					else
+					} else
 					{
 						// Cells with no content
 						$temp = ($is_current_month === TRUE && $day == $cur_day) ?
@@ -304,8 +300,7 @@ 
 					}
 
 					$out .= ($is_current_month === TRUE && $day == $cur_day) ? $this->replacements['cal_cell_end_today'] : $this->replacements['cal_cell_end'];
-				}
-				elseif ($this->show_other_days === TRUE)
+				} elseif ($this->show_other_days === TRUE)
 				{
 					$out .= $this->replacements['cal_cell_start_other'];
 
@@ -315,16 +310,14 @@ 
 						$prev_month = $this->adjust_date($month - 1, $year);
 						$prev_month_days = $this->get_total_days($prev_month['month'], $prev_month['year']);
 						$out .= str_replace('{day}', $prev_month_days + $day, $this->replacements['cal_cell_other']);
-					}
-					else
+					} else
 					{
 						// Day of next month
 						$out .= str_replace('{day}', $day - $total_days, $this->replacements['cal_cell_other']);
 					}
 
 					$out .= $this->replacements['cal_cell_end_other'];
-				}
-				else
+				} else
 				{
 					// Blank cells
 					$out .= $this->replacements['cal_cell_start'].$this->replacements['cal_cell_blank'].$this->replacements['cal_cell_end'];
@@ -355,8 +348,7 @@ 
 		if ($this->month_type === 'short')
 		{
 			$month_names = array('01' => 'cal_jan', '02' => 'cal_feb', '03' => 'cal_mar', '04' => 'cal_apr', '05' => 'cal_may', '06' => 'cal_jun', '07' => 'cal_jul', '08' => 'cal_aug', '09' => 'cal_sep', '10' => 'cal_oct', '11' => 'cal_nov', '12' => 'cal_dec');
-		}
-		else
+		} else
 		{
 			$month_names = array('01' => 'cal_january', '02' => 'cal_february', '03' => 'cal_march', '04' => 'cal_april', '05' => 'cal_mayl', '06' => 'cal_june', '07' => 'cal_july', '08' => 'cal_august', '09' => 'cal_september', '10' => 'cal_october', '11' => 'cal_november', '12' => 'cal_december');
 		}
@@ -387,12 +379,10 @@ 
 		if ($this->day_type === 'long')
 		{
 			$day_names = array('sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday');
-		}
-		elseif ($this->day_type === 'short')
+		} elseif ($this->day_type === 'short')
 		{
 			$day_names = array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat');
-		}
-		else
+		} else
 		{
 			$day_names = array('su', 'mo', 'tu', 'we', 'th', 'fr', 'sa');
 		}
@@ -528,14 +518,12 @@ 
 				if (preg_match('/\{'.$val.'\}(.*?)\{\/'.$val.'\}/si', $this->template, $match))
 				{
 					$this->replacements[$val] = $match[1];
-				}
-				elseif (in_array($val, $today, TRUE))
+				} elseif (in_array($val, $today, TRUE))
 				{
 					$this->replacements[$val] = $this->replacements[substr($val, 0, -6)];
 				}
 			}
-		}
-		elseif (is_array($this->template))
+		} elseif (is_array($this->template))
 		{
 			$this->replacements = array_merge($this->replacements, $this->template);
 		}

system/libraries/Cart.php

Braces +3 added lines, -6 removed lines

@@ -147,8 +147,7 @@ 
 			{
 				$save_cart = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			foreach ($items as $val)
 			{
@@ -248,8 +247,7 @@ 
 		if (isset($items['options']) && count($items['options']) > 0)
 		{
 			$rowid = md5($items['id'].serialize($items['options']));
-		}
-		else
+		} else
 		{
 			// No options were submitted so we simply MD5 the product ID.
 			// Technically, we don't need to MD5 the ID in this case, but it makes
@@ -303,8 +301,7 @@ 
 			{
 				$save_cart = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			foreach ($items as $val)
 			{

system/libraries/Driver.php

Braces +2 added lines, -4 removed lines

@@ -173,8 +173,7 @@ 
 			if (class_exists($child_name, FALSE))
 			{
 				$class_name = $child_name;
-			}
-			else
+			} else
 			{
 				$msg = 'Unable to load the requested driver: '.$class_name;
 				log_message('error', $msg);
@@ -274,8 +273,7 @@ 
 			}
 
 			self::$_reflections[$class_name] = array($this->_methods, $this->_properties);
-		}
-		else
+		} else
 		{
 			list($this->_methods, $this->_properties) = self::$_reflections[$class_name];
 		}

system/libraries/Email.php

Braces +28 added lines, -47 removed lines

@@ -412,8 +412,7 @@ 
 		if (count($config) > 0)
 		{
 			$this->initialize($config);
-		}
-		else
+		} else
 		{
 			$this->_smtp_auth = ! ($this->smtp_user === '' && $this->smtp_pass === '');
 		}
@@ -458,8 +457,7 @@ 
 				if (method_exists($this, $method))
 				{
 					$this->$method($val);
-				}
-				else
+				} else
 				{
 					$this->$key = $val;
 				}
@@ -538,8 +536,7 @@ 
 			{
 				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
 				$name = '"'.addcslashes($name, "\0..\37\177'\"\\").'"';
-			}
-			else
+			} else
 			{
 				$name = $this->_prep_q_encoding($name);
 			}
@@ -672,8 +669,7 @@ 
 		if ($this->_get_protocol() === 'smtp' OR ($this->bcc_batch_mode && count($bcc) > $this->bcc_batch_size))
 		{
 			$this->_bcc_array = $bcc;
-		}
-		else
+		} else
 		{
 			$this->set_header('Bcc', implode(', ', $bcc));
 		}
@@ -752,8 +748,7 @@ 
 			$file_content = stream_get_contents($fp);
 			$mime = $this->_mime_types(pathinfo($file, PATHINFO_EXTENSION));
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			$file_content =& $file; // buffered file
 		}
@@ -1013,12 +1008,10 @@ 
 		if ($this->mailtype === 'html')
 		{
 			return (count($this->_attachments) === 0) ? 'html' : 'html-attach';
-		}
-		elseif	($this->mailtype === 'text' && count($this->_attachments) > 0)
+		} elseif	($this->mailtype === 'text' && count($this->_attachments) > 0)
 		{
 			return 'plain-attach';
-		}
-		else
+		} else
 		{
 			return 'plain';
 		}
@@ -1337,8 +1330,7 @@ 
 				{
 					$this->_header_str .= $hdr;
 					$this->_finalbody = $this->_body;
-				}
-				else
+				} else
 				{
 					$this->_finalbody = $hdr.$this->newline.$this->newline.$this->_body;
 				}
@@ -1351,8 +1343,7 @@ 
 				{
 					$hdr .= 'Content-Type: text/html; charset='.$this->charset.$this->newline
 						.'Content-Transfer-Encoding: quoted-printable';
-				}
-				else
+				} else
 				{
 					$hdr .= 'Content-Type: multipart/alternative; boundary="'.$this->_alt_boundary.'"';
 
@@ -1372,8 +1363,7 @@ 
 				if ($this->_get_protocol() === 'mail')
 				{
 					$this->_header_str .= $hdr;
-				}
-				else
+				} else
 				{
 					$this->_finalbody = $hdr.$this->newline.$this->newline.$this->_finalbody;
 				}
@@ -1496,8 +1486,7 @@ 
 			if (is_php('5.3'))
 			{
 				return quoted_printable_encode($str);
-			}
-			elseif (function_exists('imap_8bit'))
+			} elseif (function_exists('imap_8bit'))
 			{
 				return imap_8bit($str);
 			}
@@ -1544,8 +1533,7 @@ 
 				elseif ($ascii === 61)
 				{
 					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
-				}
-				elseif ( ! in_array($ascii, $ascii_safe_chars, TRUE))
+				} elseif ( ! in_array($ascii, $ascii_safe_chars, TRUE))
 				{
 					$char = $escape.strtoupper(sprintf('%02s', dechex($ascii)));
 				}
@@ -1613,8 +1601,7 @@ 
 				}
 
 				$chars = iconv_strlen($str, 'UTF-8');
-			}
-			elseif (MB_ENABLED === TRUE)
+			} elseif (MB_ENABLED === TRUE)
 			{
 				$chars = mb_strlen($str, 'UTF-8');
 			}
@@ -1637,8 +1624,7 @@ 
 				$output .= '?='.$this->crlf // EOL
 					.' =?'.$this->charset.'?Q?'.$chr; // New line
 				$length = 6 + strlen($this->charset) + $l; // Reset the length for the new line
-			}
-			else
+			} else
 			{
 				$output .= $chr;
 				$length += $l;
@@ -1749,8 +1735,7 @@ 
 			if ($this->protocol !== 'smtp')
 			{
 				$this->set_header('Bcc', implode(', ', $bcc));
-			}
-			else
+			} else
 			{
 				$this->_bcc_array = $bcc;
 			}
@@ -1833,8 +1818,7 @@ 
 		if ($this->_safe_mode === TRUE)
 		{
 			return mail($this->_recipients, $this->_subject, $this->_finalbody, $this->_header_str);
-		}
-		else
+		} else
 		{
 			// most documentation of sendmail using the "-f" flag lacks a space after it, however
 			// we've encountered servers that seem to require it to be in place.
@@ -1857,10 +1841,12 @@ 
 						$this->mailpath.' -oi -f '.$this->clean_email($this->_headers['From'])
 							.' -t -r '.$this->clean_email($this->_headers['Return-Path'])
 						, 'w'))
-		) // server probably has popen disabled, so nothing we can do to get a verbose error.
+		) {
+			// server probably has popen disabled, so nothing we can do to get a verbose error.
 		{
 			return FALSE;
 		}
+		}
 
 		fputs($fp, $this->_header_str);
 		fputs($fp, $this->_finalbody);
@@ -1955,8 +1941,7 @@ 
 		if ($this->smtp_keepalive)
 		{
 			$this->_send_command('reset');
-		}
-		else
+		} else
 		{
 			$this->_send_command('quit');
 		}
@@ -2030,8 +2015,7 @@ 
 						if ($this->_smtp_auth OR $this->_get_encoding() === '8bit')
 						{
 							$this->_send_data('EHLO '.$this->_get_hostname());
-						}
-						else
+						} else
 						{
 							$this->_send_data('HELO '.$this->_get_hostname());
 						}
@@ -2053,8 +2037,7 @@ 
 						if ($this->dsn)
 						{
 							$this->_send_data('RCPT TO:<'.$data.'> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;'.$data);
-						}
-						else
+						} else
 						{
 							$this->_send_data('RCPT TO:<'.$data.'>');
 						}
@@ -2120,11 +2103,12 @@ 
 
 		$reply = $this->_get_smtp_data();
 
-		if (strpos($reply, '503') === 0)	// Already authenticated
+		if (strpos($reply, '503') === 0) {
+			// Already authenticated
 		{
 			return TRUE;
 		}
-		elseif (strpos($reply, '334') !== 0)
+		} elseif (strpos($reply, '334') !== 0)
 		{
 			$this->_set_error_message('lang:email_failed_smtp_login', $reply);
 			return FALSE;
@@ -2176,8 +2160,7 @@ 
 				if ($timestamp === 0)
 				{
 					$timestamp = time();
-				}
-				elseif ($timestamp < (time() - $this->smtp_timeout))
+				} elseif ($timestamp < (time() - $this->smtp_timeout))
 				{
 					$result = FALSE;
 					break;
@@ -2185,8 +2168,7 @@ 
 
 				usleep(250000);
 				continue;
-			}
-			else
+			} else
 			{
 				$timestamp = 0;
 			}
@@ -2308,8 +2290,7 @@ 
 		if (sscanf($msg, 'lang:%s', $line) !== 1 OR FALSE === ($line = $CI->lang->line($line)))
 		{
 			$this->_debug_msg[] = str_replace('%s', $val, $msg).'<br />';
-		}
-		else
+		} else
 		{
 			$this->_debug_msg[] = str_replace('%s', $val, $line).'<br />';
 		}

system/libraries/Encryption.php

Braces +17 added lines, -34 removed lines

@@ -191,13 +191,11 @@ 
 				if ($this->_drivers[$params['driver']])
 				{
 					$this->_driver = $params['driver'];
-				}
-				else
+				} else
 				{
 					log_message('error', "Encryption: Driver '".$params['driver']."' is not available.");
 				}
-			}
-			else
+			} else
 			{
 				log_message('error', "Encryption: Unknown driver '".$params['driver']."' cannot be configured.");
 			}
@@ -236,8 +234,7 @@ 
 			if ( ! in_array($params['cipher'], mcrypt_list_algorithms(), TRUE))
 			{
 				log_message('error', 'Encryption: MCrypt cipher '.strtoupper($params['cipher']).' is not available.');
-			}
-			else
+			} else
 			{
 				$this->_cipher = $params['cipher'];
 			}
@@ -249,8 +246,7 @@ 
 			if ( ! isset($this->_modes['mcrypt'][$params['mode']]))
 			{
 				log_message('error', 'Encryption: MCrypt mode '.strtoupper($params['mode']).' is not available.');
-			}
-			else
+			} else
 			{
 				$this->_mode = $this->_modes['mcrypt'][$params['mode']];
 			}
@@ -269,8 +265,7 @@ 
 			if ($this->_handle = mcrypt_module_open($this->_cipher, '', $this->_mode, ''))
 			{
 				log_message('info', 'Encryption: MCrypt cipher '.strtoupper($this->_cipher).' initialized in '.strtoupper($this->_mode).' mode.');
-			}
-			else
+			} else
 			{
 				log_message('error', 'Encryption: Unable to initialize MCrypt with cipher '.strtoupper($this->_cipher).' in '.strtoupper($this->_mode).' mode.');
 			}
@@ -300,8 +295,7 @@ 
 			if ( ! isset($this->_modes['openssl'][$params['mode']]))
 			{
 				log_message('error', 'Encryption: OpenSSL mode '.strtoupper($params['mode']).' is not available.');
-			}
-			else
+			} else
 			{
 				$this->_mode = $this->_modes['openssl'][$params['mode']];
 			}
@@ -318,8 +312,7 @@ 
 			{
 				$this->_handle = NULL;
 				log_message('error', 'Encryption: Unable to initialize OpenSSL with method '.strtoupper($handle).'.');
-			}
-			else
+			} else
 			{
 				$this->_handle = $handle;
 				log_message('info', 'Encryption: OpenSSL initialized with method '.strtoupper($handle).'.');
@@ -564,14 +557,12 @@ 
 			{
 				$iv = self::substr($data, 0, $iv_size);
 				$data = self::substr($data, $iv_size);
-			}
-			else
+			} else
 			{
 				// MCrypt is dumb and this is ignored, only size matters
 				$iv = str_repeat("\x0", $iv_size);
 			}
-		}
-		else
+		} else
 		{
 			$iv = NULL;
 		}
@@ -617,8 +608,7 @@ 
 		{
 			$iv = self::substr($data, 0, $iv_size);
 			$data = self::substr($data, $iv_size);
-		}
-		else
+		} else
 		{
 			$iv = NULL;
 		}
@@ -657,8 +647,7 @@ 
 					'hmac_key' => NULL
 				)
 				: FALSE;
-		}
-		elseif ( ! isset($params['cipher'], $params['mode'], $params['key']))
+		} elseif ( ! isset($params['cipher'], $params['mode'], $params['key']))
 		{
 			return FALSE;
 		}
@@ -669,8 +658,7 @@ 
 			if ( ! isset($this->_modes[$this->_driver][$params['mode']]))
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
 			}
@@ -679,22 +667,19 @@ 
 		if (isset($params['hmac']) && $params['hmac'] === FALSE)
 		{
 			$params['hmac_digest'] = $params['hmac_key'] = NULL;
-		}
-		else
+		} else
 		{
 			if ( ! isset($params['hmac_key']))
 			{
 				return FALSE;
-			}
-			elseif (isset($params['hmac_digest']))
+			} elseif (isset($params['hmac_digest']))
 			{
 				$params['hmac_digest'] = strtolower($params['hmac_digest']);
 				if ( ! isset($this->_digests[$params['hmac_digest']]))
 				{
 					return FALSE;
 				}
-			}
-			else
+			} else
 			{
 				$params['hmac_digest'] = 'sha512';
 			}
@@ -847,8 +832,7 @@ 
 		if (empty($length) OR ! is_int($length))
 		{
 			$length = $this->_digests[$digest];
-		}
-		elseif ($length > (255 * $this->_digests[$digest]))
+		} elseif ($length > (255 * $this->_digests[$digest]))
 		{
 			return FALSE;
 		}
@@ -880,8 +864,7 @@ 
 		if ($key === 'mode')
 		{
 			return array_search($this->_mode, $this->_modes[$this->_driver], TRUE);
-		}
-		elseif (in_array($key, array('cipher', 'driver', 'drivers', 'digests'), TRUE))
+		} elseif (in_array($key, array('cipher', 'driver', 'drivers', 'digests'), TRUE))
 		{
 			return $this->{'_'.$key};
 		}

system/libraries/Form_validation.php

Braces +26 added lines, -52 removed lines

@@ -202,8 +202,7 @@ 
 		if ( ! is_string($field) OR $field === '' OR empty($rules))
 		{
 			return $this;
-		}
-		elseif ( ! is_array($rules))
+		} elseif ( ! is_array($rules))
 		{
 			// BC: Convert pipe-separated rules string to an array
 			if ( ! is_string($rules))
@@ -460,8 +459,7 @@ 
 			if ($row['is_array'] === TRUE)
 			{
 				$this->_field_data[$field]['postdata'] = $this->_reduce_array($validation_array, $row['keys']);
-			}
-			elseif (isset($validation_array[$field]))
+			} elseif (isset($validation_array[$field]))
 			{
 				$this->_field_data[$field]['postdata'] = $validation_array[$field];
 			}
@@ -534,8 +532,7 @@ 
 					{
 						$_POST[$row['field']] = $row['postdata'];
 					}
-				}
-				else
+				} else
 				{
 					// start with a reference
 					$post_ref =& $_POST;
@@ -544,8 +541,7 @@ 
 					if (count($row['keys']) === 1)
 					{
 						$post_ref =& $post_ref[current($row['keys'])];
-					}
-					else
+					} else
 					{
 						foreach ($row['keys'] as $val)
 						{
@@ -562,8 +558,7 @@ 
 						}
 
 						$post_ref = $array;
-					}
-					else
+					} else
 					{
 						$post_ref = $row['postdata'];
 					}
@@ -611,14 +606,12 @@ 
 						$rules = array(1 => $rule);
 						break;
 					}
-				}
-				elseif (is_callable($rule))
+				} elseif (is_callable($rule))
 				{
 					$callback = TRUE;
 					$rules = array(1 => $rule);
 					break;
-				}
-				elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
+				} elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
 				{
 					$callback = TRUE;
 					$rules = array(array($rule[0], $rule[1]));
@@ -644,12 +637,10 @@ 
 				if (isset($this->_field_data[$row['field']]['errors'][$type]))
 				{
 					$line = $this->_field_data[$row['field']]['errors'][$type];
-				}
-				elseif (isset($this->_error_messages[$type]))
+				} elseif (isset($this->_error_messages[$type]))
 				{
 					$line = $this->_error_messages[$type];
-				}
-				elseif (FALSE === ($line = $this->CI->lang->line('form_validation_'.$type))
+				} elseif (FALSE === ($line = $this->CI->lang->line('form_validation_'.$type))
 					// DEPRECATED support for non-prefixed keys
 					&& FALSE === ($line = $this->CI->lang->line($type, FALSE)))
 				{
@@ -691,8 +682,7 @@ 
 
 				$postdata = $this->_field_data[$row['field']]['postdata'][$cycles];
 				$_in_array = TRUE;
-			}
-			else
+			} else
 			{
 				// If we get an array field, but it's not expected - then it is most likely
 				// somebody messing with the form on the client side, so we'll just consider
@@ -711,12 +701,10 @@ 
 					$rule = substr($rule, 9);
 					$callback = TRUE;
 				}
-			}
-			elseif (is_callable($rule))
+			} elseif (is_callable($rule))
 			{
 				$callable = TRUE;
-			}
-			elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
+			} elseif (is_array($rule) && isset($rule[0], $rule[1]) && is_callable($rule[1]))
 			{
 				// We have a "named" callable, so save the name
 				$callable = $rule[0];
@@ -741,14 +729,12 @@ 
 					{
 						log_message('debug', 'Unable to find callback validation rule: '.$rule);
 						$result = FALSE;
-					}
-					else
+					} else
 					{
 						// Run the function and grab the result
 						$result = $this->CI->$rule($postdata, $param);
 					}
-				}
-				else
+				} else
 				{
 					$result = is_array($rule)
 						? $rule[0]->{$rule[1]}($postdata)
@@ -765,8 +751,7 @@ 
 				if ($_in_array === TRUE)
 				{
 					$this->_field_data[$row['field']]['postdata'][$cycles] = is_bool($result) ? $postdata : $result;
-				}
-				else
+				} else
 				{
 					$this->_field_data[$row['field']]['postdata'] = is_bool($result) ? $postdata : $result;
 				}
@@ -776,8 +761,7 @@ 
 				{
 					continue;
 				}
-			}
-			elseif ( ! method_exists($this, $rule))
+			} elseif ( ! method_exists($this, $rule))
 			{
 				// If our own wrapper function doesn't exist we see if a native PHP function does.
 				// Users can use any native PHP function call that has one param.
@@ -789,27 +773,23 @@ 
 					if ($_in_array === TRUE)
 					{
 						$this->_field_data[$row['field']]['postdata'][$cycles] = is_bool($result) ? $postdata : $result;
-					}
-					else
+					} else
 					{
 						$this->_field_data[$row['field']]['postdata'] = is_bool($result) ? $postdata : $result;
 					}
-				}
-				else
+				} else
 				{
 					log_message('debug', 'Unable to find validation rule: '.$rule);
 					$result = FALSE;
 				}
-			}
-			else
+			} else
 			{
 				$result = $this->$rule($postdata, $param);
 
 				if ($_in_array === TRUE)
 				{
 					$this->_field_data[$row['field']]['postdata'][$cycles] = is_bool($result) ? $postdata : $result;
-				}
-				else
+				} else
 				{
 					$this->_field_data[$row['field']]['postdata'] = is_bool($result) ? $postdata : $result;
 				}
@@ -827,8 +807,7 @@ 
 				elseif (isset($this->_field_data[$row['field']]['errors'][$rule]))
 				{
 					$line = $this->_field_data[$row['field']]['errors'][$rule];
-				}
-				elseif ( ! isset($this->_error_messages[$rule]))
+				} elseif ( ! isset($this->_error_messages[$rule]))
 				{
 					if (FALSE === ($line = $this->CI->lang->line('form_validation_'.$rule))
 						// DEPRECATED support for non-prefixed keys
@@ -836,8 +815,7 @@ 
 					{
 						$line = $this->CI->lang->line('form_validation_error_message_not_set').'('.$rule.')';
 					}
-				}
-				else
+				} else
 				{
 					$line = $this->_error_messages[$rule];
 				}
@@ -984,8 +962,7 @@ 
 			}
 
 			return '';
-		}
-		elseif (($field === '' OR $value === '') OR ($field !== $value))
+		} elseif (($field === '' OR $value === '') OR ($field !== $value))
 		{
 			return '';
 		}
@@ -1027,8 +1004,7 @@ 
 			}
 
 			return '';
-		}
-		elseif (($field === '' OR $value === '') OR ($field !== $value))
+		} elseif (($field === '' OR $value === '') OR ($field !== $value))
 		{
 			return '';
 		}
@@ -1202,14 +1178,12 @@ 
 		if (empty($str))
 		{
 			return FALSE;
-		}
-		elseif (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
+		} elseif (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
 		{
 			if (empty($matches[2]))
 			{
 				return FALSE;
-			}
-			elseif ( ! in_array($matches[1], array('http', 'https'), TRUE))
+			} elseif ( ! in_array($matches[1], array('http', 'https'), TRUE))
 			{
 				return FALSE;
 			}

system/libraries/Ftp.php

Braces +1 added lines, -2 removed lines

@@ -588,8 +588,7 @@
 				if (is_dir($locpath.$file) && $file[0] !== '.')
 				{
 					$this->mirror($locpath.$file.'/', $rempath.$file.'/');
-				}
-				elseif ($file[0] !== '.')
+				} elseif ($file[0] !== '.')
 				{
 					// Get the file extension so we can se the upload type
 					$ext = $this->_getext($file);