xpressengine / xe-core

classes/db/queryparts/limit/Limit.class.php

Braces +2 added lines, -4 removed lines

@@ -62,8 +62,7 @@ 
 		if($this->page)

 		{

 			return true;

-		}

-		else

+		} else

 		{

 			return false;

 		}

@@ -84,8 +83,7 @@ 
 		if($this->page)

 		{

 			return $this->start . ' , ' . $this->list_count->getValue();

-		}

-		else

+		} else

 		{

 			return $this->list_count->getValue();

 		}

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	function Limit($list_count, $page = NULL, $page_count = NULL)

 	{

 		$this->list_count = $list_count;

-		if($page)

+		if ($page)

 		{

 			$list_count_value = $list_count->getValue();

 			$page_value = $page->getValue();

@@ -59,7 +59,7 @@ 
 	 */

 	function isPageHandler()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return true;

 		}

@@ -81,9 +81,9 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

-			return $this->start . ' , ' . $this->list_count->getValue();

+			return $this->start.' , '.$this->list_count->getValue();

 		}

 		else

 		{

classes/db/queryparts/order/OrderByColumn.class.php

Spacing +2 added lines, -2 removed lines

@@ -59,11 +59,11 @@
 	function getArguments()

 	{

 		$args = array();

-		if(is_a($this->column_name, 'Argument'))

+		if (is_a($this->column_name, 'Argument'))

 		{

 			$args[] = $this->column_name;

 		}

-		if(is_a($this->sort_order, 'Argument'))

+		if (is_a($this->sort_order, 'Argument'))

 		{

 			$args[] = $this->sort_order;

 		}

classes/db/queryparts/table/MysqlTableWithHint.class.php

Braces +2 added lines, -4 removed lines

@@ -53,12 +53,10 @@
 			if($index_hint_type == 'USE')

 			{

 				$use_index_hint .= $index_hint->getIndexName() . ', ';

-			}

-			else if($index_hint_type == 'FORCE')

+			} else if($index_hint_type == 'FORCE')

 			{

 				$force_index_hint .= $index_hint->getIndexName() . ', ';

-			}

-			else if($index_hint_type == 'IGNORE')

+			} else if($index_hint_type == 'IGNORE')

 			{

 				$ignore_index_hint .= $index_hint->getIndexName() . ', ';

 			}

Spacing +13 added lines, -13 removed lines

@@ -47,33 +47,33 @@
 		$use_index_hint = '';

 		$force_index_hint = '';

 		$ignore_index_hint = '';

-		foreach($this->index_hints_list as $index_hint)

+		foreach ($this->index_hints_list as $index_hint)

 		{

 			$index_hint_type = $index_hint->getIndexHintType();

-			if($index_hint_type == 'USE')

+			if ($index_hint_type == 'USE')

 			{

-				$use_index_hint .= $index_hint->getIndexName() . ', ';

+				$use_index_hint .= $index_hint->getIndexName().', ';

 			}

-			else if($index_hint_type == 'FORCE')

+			else if ($index_hint_type == 'FORCE')

 			{

-				$force_index_hint .= $index_hint->getIndexName() . ', ';

+				$force_index_hint .= $index_hint->getIndexName().', ';

 			}

-			else if($index_hint_type == 'IGNORE')

+			else if ($index_hint_type == 'IGNORE')

 			{

-				$ignore_index_hint .= $index_hint->getIndexName() . ', ';

+				$ignore_index_hint .= $index_hint->getIndexName().', ';

 			}

 		}

-		if($use_index_hint != '')

+		if ($use_index_hint != '')

 		{

-			$result .= ' USE INDEX (' . substr($use_index_hint, 0, -2) . ') ';

+			$result .= ' USE INDEX ('.substr($use_index_hint, 0, -2).') ';

 		}

-		if($force_index_hint != '')

+		if ($force_index_hint != '')

 		{

-			$result .= ' FORCE INDEX (' . substr($force_index_hint, 0, -2) . ') ';

+			$result .= ' FORCE INDEX ('.substr($force_index_hint, 0, -2).') ';

 		}

-		if($ignore_index_hint != '')

+		if ($ignore_index_hint != '')

 		{

-			$result .= ' IGNORE INDEX (' . substr($ignore_index_hint, 0, -2) . ') ';

+			$result .= ' IGNORE INDEX ('.substr($ignore_index_hint, 0, -2).') ';

 		}

 		return $result;

 	}

classes/display/VirtualXMLDisplayHandler.php

Braces +2 added lines, -4 removed lines

@@ -32,13 +32,11 @@
 			if($redirect_url)
 			{
 				$output->url = $redirect_url;
-			}
-			else
+			} else
 			{
 				$output->url = $request_uri;
 			}
-		}
-		else
+		} else
 		{
 			if($message != 'fail')
 			{

Spacing +9 added lines, -9 removed lines

@@ -17,19 +17,19 @@ 
 		$request_url = Context::getRequestUri();
 		$output = new stdClass();
 
-		if(substr_compare($request_url, '/', -1) !== 0)
+		if (substr_compare($request_url, '/', -1) !== 0)
 		{
 			$request_url .= '/';
 		}
 
-		if($error === 0)
+		if ($error === 0)
 		{
-			if($message != 'success')
+			if ($message != 'success')
 			{
 				$output->message = $message;
 			}
 
-			if($redirect_url)
+			if ($redirect_url)
 			{
 				$output->url = $redirect_url;
 			}
@@ -40,7 +40,7 @@ 
 		}
 		else
 		{
-			if($message != 'fail')
+			if ($message != 'fail')
 			{
 				$output->message = $message;
 			}
@@ -50,15 +50,15 @@ 
 		$html[] = '<script type="text/javascript">';
 		$html[] = '//<![CDATA[';
 
-		if($output->message)
+		if ($output->message)
 		{
-			$html[] = 'alert("' . $output->message . '");';
+			$html[] = 'alert("'.$output->message.'");';
 		}
 
-		if($output->url)
+		if ($output->url)
 		{
 			$url = preg_replace('/#(.+)$/i', '', $output->url);
-			$html[] = 'self.location.href = "' . $request_url . 'common/tpl/redirect.html?redirect_url=' . urlencode($url) . '";';
+			$html[] = 'self.location.href = "'.$request_url.'common/tpl/redirect.html?redirect_url='.urlencode($url).'";';
 		}
 		$html[] = '//]]>';
 		$html[] = '</script>';

classes/display/XMLDisplayHandler.php

Spacing +5 added lines, -5 removed lines

@@ -31,25 +31,25 @@
 	 */
 	function _makeXmlDoc($obj)
 	{
-		if(!count($obj))
+		if (!count($obj))
 		{
 			return;
 		}
 
 		$xmlDoc = '';
 
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
-			if(is_numeric($key))
+			if (is_numeric($key))
 			{
 				$key = 'item';
 			}
 
-			if(is_string($val))
+			if (is_string($val))
 			{
 				$xmlDoc .= sprintf('<%s><![CDATA[%s]]></%s>%s', $key, $val, $key, "\n");
 			}
-			else if(!is_array($val) && !is_object($val))
+			else if (!is_array($val) && !is_object($val))
 			{
 				$xmlDoc .= sprintf('<%s>%s</%s>%s', $key, $val, $key, "\n");
 			}

Braces +2 added lines, -4 removed lines

@@ -48,12 +48,10 @@
 			if(is_string($val))
 			{
 				$xmlDoc .= sprintf('<%s><![CDATA[%s]]></%s>%s', $key, $val, $key, "\n");
-			}
-			else if(!is_array($val) && !is_object($val))
+			} else if(!is_array($val) && !is_object($val))
 			{
 				$xmlDoc .= sprintf('<%s>%s</%s>%s', $key, $val, $key, "\n");
-			}
-			else
+			} else
 			{
 				$xmlDoc .= sprintf('<%s>%s%s</%s>%s', $key, "\n", $this->_makeXmlDoc($val), $key, "\n");
 			}

classes/editor/EditorHandler.class.php

Spacing +2 added lines, -2 removed lines

@@ -20,12 +20,12 @@
 	{
 		Context::set('component_info', $info);
 
-		if(!$info->extra_vars)
+		if (!$info->extra_vars)
 		{
 			return;
 		}
 
-		foreach($info->extra_vars as $key => $val)
+		foreach ($info->extra_vars as $key => $val)
 		{
 			$this->{$key} = trim($val->value);
 		}

classes/extravar/Extravar.class.php

Braces +7 added lines, -14 removed lines

@@ -215,12 +215,10 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				} elseif(strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
-				}
-				elseif(strpos($value, ',') !== FALSE)
+				} elseif(strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -238,16 +236,13 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				} elseif(strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
-				}
-				elseif(strpos($value, ',') !== FALSE)
+				} elseif(strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
-				}
-				else
+				} else
 				{
 					$values = array($value);
 				}
@@ -263,12 +258,10 @@ 
 				if(is_array($value))
 				{
 					$values = $value;
-				}
-				elseif(strpos($value, '|@|') !== false)
+				} elseif(strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
-				}
-				else
+				} else
 				{
 					$values = array($value);
 				}

Spacing +65 added lines, -65 removed lines

@@ -51,12 +51,12 @@ 
 	 */
 	function setExtraVarKeys($extra_keys)
 	{
-		if(!is_array($extra_keys) || count($extra_keys) < 1)
+		if (!is_array($extra_keys) || count($extra_keys) < 1)
 		{
 			return;
 		}
 
-		foreach($extra_keys as $val)
+		foreach ($extra_keys as $val)
 		{
 			$obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value, $val->eid);
 			$this->keys[$val->idx] = $obj;
@@ -159,7 +159,7 @@ 
 	 */
 	function ExtraItem($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '')
 	{
-		if(!$idx)
+		if (!$idx)
 		{
 			return;
 		}
@@ -197,36 +197,36 @@ 
 	function _getTypeValue($type, $value)
 	{
 		$value = trim($value);
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'homepage' :
-				if($value && !preg_match('/^([a-z]+):\/\//i', $value))
+				if ($value && !preg_match('/^([a-z]+):\/\//i', $value))
 				{
-					$value = 'http://' . $value;
+					$value = 'http://'.$value;
 				}
 				return htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
 			case 'tel' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -235,15 +235,15 @@ 
 			case 'checkbox' :
 			case 'radio' :
 			case 'select' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== FALSE)
+				elseif (strpos($value, '|@|') !== FALSE)
 				{
 					$values = explode('|@|', $value);
 				}
-				elseif(strpos($value, ',') !== FALSE)
+				elseif (strpos($value, ',') !== FALSE)
 				{
 					$values = explode(',', $value);
 				}
@@ -253,18 +253,18 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
 				return $values;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$values = $value;
 				}
-				elseif(strpos($value, '|@|') !== false)
+				elseif (strpos($value, '|@|') !== false)
 				{
 					$values = explode('|@|', $value);
 				}
@@ -274,7 +274,7 @@ 
 				}
 
 				$values = array_values($values);
-				for($i = 0, $c = count($values); $i < $c; $i++)
+				for ($i = 0, $c = count($values); $i < $c; $i++)
 				{
 					$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 				}
@@ -308,10 +308,10 @@ 
 	{
 		$value = $this->_getTypeValue($this->type, $this->value);
 
-		switch($this->type)
+		switch ($this->type)
 		{
 			case 'homepage' :
-				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40) . '...' . substr($value, -10) : $value)) : "";
+				return ($value) ? (sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value) > 60 ? substr($value, 0, 40).'...'.substr($value, -10) : $value)) : "";
 
 			case 'email_address' :
 				return ($value) ? sprintf('<a href="mailto:%s">%s</a>', $value, $value) : "";
@@ -328,14 +328,14 @@ 
 			case 'checkbox' :
 			case 'select' :
 			case 'radio' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(',', $value);
 				}
 				return $value;
 
 			case 'kr_zip' :
-				if(is_array($value))
+				if (is_array($value))
 				{
 					return implode(' ', $value);
 				}
@@ -360,77 +360,77 @@ 
 		$name = $this->name;
 		$value = $this->_getTypeValue($this->type, $this->value);
 		$default = $this->_getTypeValue($this->type, $this->default);
-		$column_name = 'extra_vars' . $this->idx;
-		$tmp_id = $column_name . '-' . $id_num++;
+		$column_name = 'extra_vars'.$this->idx;
+		$tmp_id = $column_name.'-'.$id_num++;
 
 		$buff = array();
-		switch($type)
+		switch ($type)
 		{
 			// Homepage
 			case 'homepage' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="homepage" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
 				break;
 			// Email Address
 			case 'email_address' :
-				$buff[] = '<input type="text" name="' . $column_name . '" value="' . $value . '" class="email_address" />';
+				$buff[] = '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
 				break;
 			// Phone Number
 			case 'tel' :
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[0] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[1] . '" size="4" maxlength="4" class="tel" />';
-				$buff[] = '<input type="text" name="' . $column_name . '[]" value="' . $value[2] . '" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[0].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[1].'" size="4" maxlength="4" class="tel" />';
+				$buff[] = '<input type="text" name="'.$column_name.'[]" value="'.$value[2].'" size="4" maxlength="4" class="tel" />';
 				break;
 			// textarea
 			case 'textarea' :
-				$buff[] = '<textarea name="' . $column_name . '" rows="8" cols="42">' . $value . '</textarea>';
+				$buff[] = '<textarea name="'.$column_name.'" rows="8" cols="42">'.$value.'</textarea>';
 				break;
 			// multiple choice
 			case 'checkbox' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] ='  <li><input type="checkbox" name="' . $column_name . '[]" id="' . $tmp_id . '" value="' . htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '" ' . $checked . ' /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '  <li><input type="checkbox" name="'.$column_name.'[]" id="'.$tmp_id.'" value="'.htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'" '.$checked.' /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
 			// single choice
 			case 'select' :
-				$buff[] = '<select name="' . $column_name . '" class="select">';
-				foreach($default as $v)
+				$buff[] = '<select name="'.$column_name.'" class="select">';
+				foreach ($default as $v)
 				{
 					$selected = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$selected = ' selected="selected"';
 					}
-					$buff[] = '  <option value="' . $v . '" ' . $selected . '>' . $v . '</option>';
+					$buff[] = '  <option value="'.$v.'" '.$selected.'>'.$v.'</option>';
 				}
 				$buff[] = '</select>';
 				break;
 			// radio
 			case 'radio' :
 				$buff[] = '<ul>';
-				foreach($default as $v)
+				foreach ($default as $v)
 				{
 					$checked = '';
-					if($value && in_array(trim($v), $value))
+					if ($value && in_array(trim($v), $value))
 					{
 						$checked = ' checked="checked"';
 					}
 
 					// Temporary ID for labeling
-					$tmp_id = $column_name . '-' . $id_num++;
+					$tmp_id = $column_name.'-'.$id_num++;
 
-					$buff[] = '<li><input type="radio" name="' . $column_name . '" id="' . $tmp_id . '" ' . $checked . ' value="' . $v . '"  class="radio" /><label for="' . $tmp_id . '">' . $v . '</label></li>';
+					$buff[] = '<li><input type="radio" name="'.$column_name.'" id="'.$tmp_id.'" '.$checked.' value="'.$v.'"  class="radio" /><label for="'.$tmp_id.'">'.$v.'</label></li>';
 				}
 				$buff[] = '</ul>';
 				break;
@@ -439,43 +439,43 @@ 
 				// datepicker javascript plugin load
 				Context::loadJavascriptPlugin('ui.datepicker');
 
-				$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />'; 
-				$buff[] =	'<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
-				$buff[] =	'<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
-				$buff[] =	'<script type="text/javascript">';
+				$buff[] = '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'; 
+				$buff[] = '<input type="text" id="date_'.$column_name.'" value="'.zdate($value, 'Y-m-d').'" class="date" />';
+				$buff[] = '<input type="button" value="'.Context::getLang('cmd_delete').'" class="btn" id="dateRemover_'.$column_name.'" />';
+				$buff[] = '<script type="text/javascript">';
 				$buff[] = '//<![CDATA[';
-				$buff[] =	'(function($){';
-				$buff[] =	'$(function(){';
-				$buff[] =	'  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
-				$buff[] =	'    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
-				$buff[] =	'  };';
-				$buff[] =	'  $.extend(option,$.datepicker.regional[\'' . Context::getLangType() . '\']);';
-				$buff[] =	'  $("#date_' . $column_name . '").datepicker(option);';
-				$buff[] =	'  $("#dateRemover_' . $column_name . '").click(function(){';
-				$buff[] =	'    $(this).siblings("input").val("");';
-				$buff[] =	'    return false;';
-				$buff[] =	'  })';
-				$buff[] =	'});';
-				$buff[] =	'})(jQuery);';
+				$buff[] = '(function($){';
+				$buff[] = '$(function(){';
+				$buff[] = '  var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent:false, yearRange:\'-100:+10\', onSelect:function(){';
+				$buff[] = '    $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}';
+				$buff[] = '  };';
+				$buff[] = '  $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);';
+				$buff[] = '  $("#date_'.$column_name.'").datepicker(option);';
+				$buff[] = '  $("#dateRemover_'.$column_name.'").click(function(){';
+				$buff[] = '    $(this).siblings("input").val("");';
+				$buff[] = '    return false;';
+				$buff[] = '  })';
+				$buff[] = '});';
+				$buff[] = '})(jQuery);';
 				$buff[] = '//]]>';
 				$buff[] = '</script>';
 				break;
 			// address
 			case "kr_zip" :
-				if(($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel , 'getKrzipCodeSearchHtml' ))
+				if (($oKrzipModel = getModel('krzip')) && method_exists($oKrzipModel, 'getKrzipCodeSearchHtml'))
 				{
-					$buff[] =  $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
+					$buff[] = $oKrzipModel->getKrzipCodeSearchHtml($column_name, $value);
 				}
 				break;
 			// General text
 			default :
-				$buff[] =' <input type="text" name="' . $column_name . '" value="' . ($value ? $value : $default) . '" class="text" />';
+				$buff[] = ' <input type="text" name="'.$column_name.'" value="'.($value ? $value : $default).'" class="text" />';
 		}
-		if($this->desc)
+		if ($this->desc)
 		{
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($this->desc);
-			$buff[] = '<p>' . htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '</p>';
+			$buff[] = '<p>'.htmlspecialchars($this->desc, ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'</p>';
 		}
 		
 		return join(PHP_EOL, $buff);

classes/file/FileObject.class.php

Spacing +8 added lines, -8 removed lines

@@ -36,7 +36,7 @@ 
 	 */
 	function FileObject($path, $mode)
 	{
-		if($path != NULL)
+		if ($path != NULL)
 		{
 			$this->Open($path, $mode);
 		}
@@ -51,7 +51,7 @@ 
 	function append($file_name)
 	{
 		$target = new FileObject($file_name, "r");
-		while(!$target->feof())
+		while (!$target->feof())
 		{
 			$readstr = $target->read();
 			$this->write($readstr);
@@ -89,11 +89,11 @@ 
 	function write($str)
 	{
 		$len = strlen($str);
-		if(!$str || $len <= 0)
+		if (!$str || $len <= 0)
 		{
 			return FALSE;
 		}
-		if(!$this->fp)
+		if (!$this->fp)
 		{
 			return FALSE;
 		}
@@ -112,12 +112,12 @@ 
 	 */
 	function open($path, $mode)
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			$this->close();
 		}
 		$this->fp = fopen($path, $mode);
-		if(!is_resource($this->fp))
+		if (!is_resource($this->fp))
 		{
 			$this->fp = NULL;
 			return FALSE;
@@ -133,7 +133,7 @@ 
 	 */
 	function getPath()
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			return $this->path;
 		}
@@ -150,7 +150,7 @@ 
 	 */
 	function close()
 	{
-		if($this->fp != NULL)
+		if ($this->fp != NULL)
 		{
 			fclose($this->fp);
 			$this->fp = NULL;

Braces +1 added lines, -2 removed lines

@@ -136,8 +136,7 @@
 		if($this->fp != NULL)
 		{
 			return $this->path;
-		}
-		else
+		} else
 		{
 			return NULL;
 		}

classes/mobile/Mobile.class.php

Spacing +28 added lines, -28 removed lines

@@ -23,7 +23,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance;
-		if(!isset($theInstance))
+		if (!isset($theInstance))
 		{
 			$theInstance = new Mobile();
 		}
@@ -48,11 +48,11 @@ 
 	 */
 	function _isFromMobilePhone()
 	{
-		if($this->ismobile !== NULL)
+		if ($this->ismobile !== NULL)
 		{
 			return $this->ismobile;
 		}
-		if(Mobile::isMobileEnabled() === false || Context::get('full_browse') || $_COOKIE["FullBrowse"])
+		if (Mobile::isMobileEnabled() === false || Context::get('full_browse') || $_COOKIE["FullBrowse"])
 		{
 			return ($this->ismobile = false);
 		}
@@ -63,22 +63,22 @@ 
 		$this->ismobile = FALSE;
 
 		$m = Context::get('m');
-		if(strlen($m) == 1)
+		if (strlen($m) == 1)
 		{
-			if($m == "1")
+			if ($m == "1")
 			{
 				$this->ismobile = TRUE;
 			}
-			elseif($m == "0")
+			elseif ($m == "0")
 			{
 				$this->ismobile = FALSE;
 			}
 		}
-		elseif(isset($_COOKIE['mobile']))
+		elseif (isset($_COOKIE['mobile']))
 		{
-			if($_COOKIE['user-agent'] == md5($_SERVER['HTTP_USER_AGENT']))
+			if ($_COOKIE['user-agent'] == md5($_SERVER['HTTP_USER_AGENT']))
 			{
-				if($_COOKIE['mobile'] == 'true')
+				if ($_COOKIE['mobile'] == 'true')
 				{
 					$this->ismobile = TRUE;
 				}
@@ -92,7 +92,7 @@ 
 				$this->ismobile = FALSE;
 				setcookie("mobile", FALSE, 0, $xe_web_path);
 				setcookie("user-agent", FALSE, 0, $xe_web_path);
-				if(!$this->isMobilePadCheckByAgent() && $this->isMobileCheckByAgent())
+				if (!$this->isMobilePadCheckByAgent() && $this->isMobileCheckByAgent())
 				{
 					$this->ismobile = TRUE;
 				}
@@ -100,36 +100,36 @@ 
 		}
 		else
 		{
-			if($this->isMobilePadCheckByAgent())
+			if ($this->isMobilePadCheckByAgent())
 			{
 				$this->ismobile = FALSE;
 			}
 			else
 			{
-				if($this->isMobileCheckByAgent())
+				if ($this->isMobileCheckByAgent())
 				{
 					$this->ismobile = TRUE;
 				}
 			}
 		}
 
-		if($this->ismobile !== NULL)
+		if ($this->ismobile !== NULL)
 		{
-			if($this->ismobile == TRUE)
+			if ($this->ismobile == TRUE)
 			{
-				if($_COOKIE['mobile'] != 'true')
+				if ($_COOKIE['mobile'] != 'true')
 				{
 					$_COOKIE['mobile'] = 'true';
 					setcookie("mobile", 'true', 0, $xe_web_path);
 				}
 			}
-			elseif($_COOKIE['mobile'] != 'false')
+			elseif ($_COOKIE['mobile'] != 'false')
 			{
 				$_COOKIE['mobile'] = 'false';
 				setcookie("mobile", 'false', 0, $xe_web_path);
 			}
 
-			if($_COOKIE['user-agent'] != md5($_SERVER['HTTP_USER_AGENT']))
+			if ($_COOKIE['user-agent'] != md5($_SERVER['HTTP_USER_AGENT']))
 			{
 				setcookie("user-agent", md5($_SERVER['HTTP_USER_AGENT']), 0, $xe_web_path);
 			}
@@ -146,7 +146,7 @@ 
 	function isMobileCheckByAgent()
 	{
 		static $UACheck;
-		if(isset($UACheck))
+		if (isset($UACheck))
 		{
 			return $UACheck;
 		}
@@ -154,15 +154,15 @@ 
 		$oMobile = Mobile::getInstance();
 		$mobileAgent = array('iPod', 'iPhone', 'Android', 'BlackBerry', 'SymbianOS', 'Bada', 'Tizen', 'Kindle', 'Wii', 'SCH-', 'SPH-', 'CANU-', 'Windows Phone', 'Windows CE', 'POLARIS', 'Palm', 'Dorothy Browser', 'Mobile', 'Opera Mobi', 'Opera Mini', 'Minimo', 'AvantGo', 'NetFront', 'Nokia', 'LGPlayer', 'SonyEricsson', 'HTC');
 
-		if($oMobile->isMobilePadCheckByAgent())
+		if ($oMobile->isMobilePadCheckByAgent())
 		{
 			$UACheck = TRUE;
 			return TRUE;
 		}
 
-		foreach($mobileAgent as $agent)
+		foreach ($mobileAgent as $agent)
 		{
-			if(stripos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
+			if (stripos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
 			{
 				$UACheck = TRUE;
 				return TRUE;
@@ -180,7 +180,7 @@ 
 	function isMobilePadCheckByAgent()
 	{
 		static $UACheck;
-		if(isset($UACheck))
+		if (isset($UACheck))
 		{
 			return $UACheck;
 		}
@@ -190,21 +190,21 @@ 
 		// $exceptionAgent[0] contains exception agents for all exceptions.
 		$exceptionAgent = array(0 => array('Opera Mini', 'Opera Mobi'), 'Android' => 'Mobile');
 
-		foreach($padAgent as $agent)
+		foreach ($padAgent as $agent)
 		{
-			if(strpos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
+			if (strpos($_SERVER['HTTP_USER_AGENT'], $agent) !== FALSE)
 			{
-				if(!isset($exceptionAgent[$agent]))
+				if (!isset($exceptionAgent[$agent]))
 				{
 					$UACheck = TRUE;
 					return TRUE;
 				}
-				elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
+				elseif (strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
 				{
 					// If the agent is the Android, that can be either tablet and mobile phone.
-					foreach($exceptionAgent[0] as $val)
+					foreach ($exceptionAgent[0] as $val)
 					{
-						if(strpos($_SERVER['HTTP_USER_AGENT'], $val) !== FALSE)
+						if (strpos($_SERVER['HTTP_USER_AGENT'], $val) !== FALSE)
 						{
 							$UACheck = FALSE;
 							return FALSE;

Braces +8 added lines, -16 removed lines

@@ -68,26 +68,22 @@ 
 			if($m == "1")
 			{
 				$this->ismobile = TRUE;
-			}
-			elseif($m == "0")
+			} elseif($m == "0")
 			{
 				$this->ismobile = FALSE;
 			}
-		}
-		elseif(isset($_COOKIE['mobile']))
+		} elseif(isset($_COOKIE['mobile']))
 		{
 			if($_COOKIE['user-agent'] == md5($_SERVER['HTTP_USER_AGENT']))
 			{
 				if($_COOKIE['mobile'] == 'true')
 				{
 					$this->ismobile = TRUE;
-				}
-				else
+				} else
 				{
 					$this->ismobile = FALSE;
 				}
-			}
-			else
+			} else
 			{
 				$this->ismobile = FALSE;
 				setcookie("mobile", FALSE, 0, $xe_web_path);
@@ -97,14 +93,12 @@ 
 					$this->ismobile = TRUE;
 				}
 			}
-		}
-		else
+		} else
 		{
 			if($this->isMobilePadCheckByAgent())
 			{
 				$this->ismobile = FALSE;
-			}
-			else
+			} else
 			{
 				if($this->isMobileCheckByAgent())
 				{
@@ -122,8 +116,7 @@ 
 					$_COOKIE['mobile'] = 'true';
 					setcookie("mobile", 'true', 0, $xe_web_path);
 				}
-			}
-			elseif($_COOKIE['mobile'] != 'false')
+			} elseif($_COOKIE['mobile'] != 'false')
 			{
 				$_COOKIE['mobile'] = 'false';
 				setcookie("mobile", 'false', 0, $xe_web_path);
@@ -198,8 +191,7 @@ 
 				{
 					$UACheck = TRUE;
 					return TRUE;
-				}
-				elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
+				} elseif(strpos($_SERVER['HTTP_USER_AGENT'], $exceptionAgent[$agent]) === FALSE)
 				{
 					// If the agent is the Android, that can be either tablet and mobile phone.
 					foreach($exceptionAgent[0] as $val)