xpressengine / xe-core

classes/db/queryparts/expression/ClickCountExpression.class.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	{

 		parent::SelectExpression($column_name, $alias);

 

-		if(!is_bool($click_count))

+		if (!is_bool($click_count))

 		{

 			// error_log("Click_count value for $column_name was not boolean", 0);

 			$this->click_count = false;

@@ -47,7 +47,7 @@ 
 	function getExpression()

 	{

 		$db_type = Context::getDBType();

-		if($db_type == 'cubrid')

+		if ($db_type == 'cubrid')

 		{

 			return "INCR($this->column_name)";

 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

classes/db/queryparts/expression/InsertExpression.class.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 

 	function getValue($with_values = true)

 	{

-		if($with_values)

+		if ($with_values)

 		{

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

 		}

@@ -40,12 +40,12 @@ 
 

 	function show()

 	{

-		if(!$this->argument)

+		if (!$this->argument)

 		{

 			return false;

 		}

 		$value = $this->argument->getValue();

-		if(!isset($value))

+		if (!isset($value))

 		{

 			return false;

 		}

@@ -59,7 +59,7 @@ 
 

 	function getArguments()

 	{

-		if($this->argument)

+		if ($this->argument)

 		{

 			return array($this->argument);

 		}

Braces +1 added lines, -2 removed lines

@@ -111,8 +111,7 @@
 		if($this->limit)

 		{

 			return $this->limit->toString();

-		}

-		else

+		} else

 		{

 			return "";

 		}

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/HTMLDisplayHandler.php

Braces +7 added lines, -14 removed lines

@@ -23,8 +23,7 @@ 
 			if($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
-			}
-			else
+			} else
 			{
 				$skin = $oModule->module_config->skin;
 			}
@@ -44,13 +43,11 @@ 
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$template_path = $oModule->getTemplatePath();
 				}
-			}
-			else
+			} else
 			{
 				$template_path = $oModule->getTemplatePath();
 			}
@@ -228,8 +225,7 @@ 
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
-		}
-		else
+		} else
 		{
 			$this->_loadJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'common_layout');
@@ -402,8 +398,7 @@ 
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/css/xe.css', '', '', -1000000), true);
-		}
-		else
+		} else
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.min.js', 'head', 'lt IE 9', -111000), true);
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -110000), true);
@@ -424,8 +419,7 @@ 
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.bootstrap.css', '', '', 1), true);
 				$oContext->loadFile(array('./modules/admin/tpl/js/jquery.tmpl.js', '', '', 1), true);
 				$oContext->loadFile(array('./modules/admin/tpl/js/jquery.jstree.js', '', '', 1), true);
-			}
-			else
+			} else
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.min.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -458,8 +452,7 @@ 
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
 			$oContext->loadFile(array('./common/css/xe.css', '', '', -1000000), true);
 			$oContext->loadFile(array('./common/css/mobile.css', '', '', -1000000), true);
-		}
-		else
+		} else
 		{
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -110000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true);

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 	/**
 	 * get layout setting view.
-	 * @return void
+	 * @return string|null
 	 */
 	public function getLayoutAdminSetInfoView()
 	{

Spacing +48 added lines, -48 removed lines

@@ -18,9 +18,9 @@ 
 
 		$template_path = $oModule->getTemplatePath();
 
-		if(!is_dir($template_path))
+		if (!is_dir($template_path))
 		{
-			if($oModule->module_info->module == $oModule->module)
+			if ($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
 			}
@@ -29,17 +29,17 @@ 
 				$skin = $oModule->module_config->skin;
 			}
 
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
 			{
-				if($skin && is_string($skin))
+				if ($skin && is_string($skin))
 				{
 					$theme_skin = explode('|@|', $skin);
 					$template_path = $oModule->getTemplatePath();
-					if(count($theme_skin) == 2)
+					if (count($theme_skin) == 2)
 					{
 						$theme_path = sprintf('./themes/%s', $theme_skin[0]);
 						// FIXME $theme_path $theme_path $theme_path ??
-						if(substr($theme_path, 0, strlen($theme_path)) != $theme_path)
+						if (substr($theme_path, 0, strlen($theme_path)) != $theme_path)
 						{
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
@@ -65,16 +65,16 @@ 
 		$oSecurity->encodeHTML('is_keyword');
 
 		// add .x div for adminitration pages
-		if(Context::getResponseMethod() == 'HTML')
+		if (Context::getResponseMethod() == 'HTML')
 		{
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
 			{
-				$output = '<div class="x">' . $output . '</div>';
+				$output = '<div class="x">'.$output.'</div>';
 			}
 
-			if(Context::get('layout') != 'none')
+			if (Context::get('layout') != 'none')
 			{
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$start = getMicroTime();
 				}
@@ -92,11 +92,11 @@ 
 				$layout_srl = $layout_info->layout_srl;
 
 				// compile if connected to the layout
-				if($layout_srl > 0)
+				if ($layout_srl > 0)
 				{
 
 					// handle separately if the layout is faceoff
-					if($layout_info && $layout_info->type == 'faceoff')
+					if ($layout_info && $layout_info->type == 'faceoff')
 					{
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
@@ -105,16 +105,16 @@ 
 					// search if the changes CSS exists in the admin layout edit window
 					$edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
 
-					if(FileHandler::exists($edited_layout_css))
+					if (FileHandler::exists($edited_layout_css))
 					{
 						Context::loadFile(array($edited_layout_css, 'all', '', 100));
 					}
 				}
-				if(!$layout_path)
+				if (!$layout_path)
 				{
 					$layout_path = './common/tpl';
 				}
-				if(!$layout_file)
+				if (!$layout_file)
 				{
 					$layout_file = 'default_layout';
 				}
@@ -122,7 +122,7 @@ 
 
 				// if popup_layout, remove admin bar.
 				$realLayoutPath = FileHandler::getRealPath($layout_path);
-				if(substr_compare($realLayoutPath, '/', -1) !== 0)
+				if (substr_compare($realLayoutPath, '/', -1) !== 0)
 				{
 					$realLayoutPath .= '/';
 				}
@@ -130,12 +130,12 @@ 
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
 				}
 
-				if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
+				if (stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
 				{
 					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
 				}
@@ -151,12 +151,12 @@ 
 	 */
 	function prepareToPrint(&$output)
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -174,20 +174,20 @@ 
 		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)-->/is', array($this, '_transMeta'), $output);
 
 		// handles a relative path generated by using the rewrite module
-		if(Context::isAllowRewrite())
+		if (Context::isAllowRewrite())
 		{
 			$url = parse_url(Context::getRequestUri());
 			$real_path = $url['path'];
 
 			$pattern = '/src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/s';
-			$output = preg_replace($pattern, 'src=$1' . $real_path . '$3/$4.$5$6', $output);
+			$output = preg_replace($pattern, 'src=$1'.$real_path.'$3/$4.$5$6', $output);
 
 			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
-			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
+			$output = preg_replace($pattern, 'href=$1'.$real_path.'$2', $output);
 
-			if(Context::get('vid'))
+			if (Context::get('vid'))
 			{
-				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
+				$pattern = '/\/'.Context::get('vid').'\?([^=]+)=/is';
 				$output = preg_replace($pattern, '/?$1=', $output);
 			}
 		}
@@ -195,18 +195,18 @@ 
 		// prevent the 2nd request due to url(none) of the background-image
 		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
 
-		if(is_array(Context::get('INPUT_ERROR')))
+		if (is_array(Context::get('INPUT_ERROR')))
 		{
 			$INPUT_ERROR = Context::get('INPUT_ERROR');
 			$keys = array_keys($INPUT_ERROR);
-			$keys = '(' . implode('|', $keys) . ')';
+			$keys = '('.implode('|', $keys).')';
 
-			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
-			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
-			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="'.$keys.'"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+			$output = preg_replace_callback('@<select[^>]*\sname="'.$keys.'".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
+			$output = preg_replace_callback('@<textarea[^>]*\sname="'.$keys.'".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__trans_content_elapsed__'] = getMicroTime() - $start;
 		}
@@ -224,7 +224,7 @@ 
 		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = TemplateHandler::getInstance();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
@@ -249,16 +249,16 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 
-		$str = $match[1] . $match[2] . ' name="' . $match[3] . '"' . $match[4];
+		$str = $match[1].$match[2].' name="'.$match[3].'"'.$match[4];
 
 		// get type
 		$type = 'text';
-		if(preg_match('/\stype="([a-z]+)"/i', $str, $m))
+		if (preg_match('/\stype="([a-z]+)"/i', $str, $m))
 		{
 			$type = strtolower($m[1]);
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'text':
 			case 'hidden':
@@ -276,7 +276,7 @@ 
 			case 'number':
 			case 'range':
 			case 'color':
-				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str) . ' value="' . htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '"';
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'"';
 				break;
 			case 'password':
 				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
@@ -284,14 +284,14 @@ 
 			case 'radio':
 			case 'checkbox':
 				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
-				if(@preg_match('@\s(?i:value)="' . $INPUT_ERROR[$match[3]] . '"@', $str))
+				if (@preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str))
 				{
 					$str .= ' checked="checked"';
 				}
 				break;
 		}
 
-		return $str . ' />';
+		return $str.' />';
 	}
 
 	/**
@@ -308,14 +308,14 @@ 
 		preg_match_all('@<option[^>]*\svalue="([^"]*)".+</option>@isU', $matches[0], $m);
 
 		$key = array_search($INPUT_ERROR[$matches[1]], $m[1]);
-		if($key === FALSE)
+		if ($key === FALSE)
 		{
 			return $matches[0];
 		}
 
 		$m[0][$key] = preg_replace('@(\svalue=".*?")@is', '$1 selected="selected"', $m[0][$key]);
 
-		return $mm[0] . implode('', $m[0]) . '</select>';
+		return $mm[0].implode('', $m[0]).'</select>';
 	}
 
 	/**
@@ -327,7 +327,7 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 		preg_match('@<textarea.*?>@is', $matches[0], $mm);
-		return $mm[0] . $INPUT_ERROR[$matches[1]] . '</textarea>';
+		return $mm[0].$INPUT_ERROR[$matches[1]].'</textarea>';
 	}
 
 	/**
@@ -338,7 +338,7 @@ 
 	 */
 	function _moveStyleToHeader($matches)
 	{
-		if(isset($matches[1]) && stristr($matches[1], 'scoped'))
+		if (isset($matches[1]) && stristr($matches[1], 'scoped'))
 		{
 			return $matches[0];
 		}
@@ -374,7 +374,7 @@ 
 	 */
 	function _transMeta($matches)
 	{
-		if($matches[1])
+		if ($matches[1])
 		{
 			return '';
 		}
@@ -391,7 +391,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -111000), true);
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -110000), true);
@@ -413,9 +413,9 @@ 
 		}
 
 		// for admin page, add admin css
-		if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
+		if (Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
 		{
-			if(__DEBUG__ || !__XE_VERSION_STABLE__)
+			if (__DEBUG__ || !__XE_VERSION_STABLE__)
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -447,7 +447,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', '', -110000), true);
 			$oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -100000), true);

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

@@ -21,8 +21,7 @@
 		if($absolute_url)
 		{
 			return getFullUrl('','vid',$vid, 'mid',$mid, 'act',$format);
-		}
-		else
+		} else
 		{
 			return getUrl('','vid',$vid, 'mid',$mid, 'act',$format);
 		}