xpressengine / xe-core

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

Spacing +3 added lines, -3 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,7 +81,7 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

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

 		}

Braces +2 added lines, -4 removed lines

@@ -85,8 +85,7 @@ 
 		if(strpos($name, '.') === FALSE)

 		{

 			$this->column_name = $name;

-		}

-		else

+		} else

 		{

 			list($prefix, $name) = explode('.', $name);

 			$this->column_name = $name;

@@ -159,8 +158,7 @@ 
 					, $this->argument_name

 					, $this->argument_name

 			);

-		}

-		else

+		} else

 		{

 			$arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"

 					, $this->argument_name

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/CubridTableWithHint.class.php

Spacing +2 added lines, -2 removed lines

@@ -52,10 +52,10 @@
 		$db_info = Context::getDBInfo();

 		$prefix = $db_info->master_db["db_table_prefix"];

 

-		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 !== 'IGNORE')

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

 			{

 				$result .= $this->alias . '.'

 						. '"' . $prefix . substr($index_hint->getIndexName(), 1)

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

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 		$part = $this->join_type . ' ' . $this->name;

 		$part .= $this->alias ? ' as ' . $this->alias : '';

 		$part .= ' on ';

-		foreach($this->conditions as $conditionGroup)

+		foreach ($this->conditions as $conditionGroup)

 		{

 			$part .= $conditionGroup->toString($with_value);

 		}

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

 	{

 		$args = array();

-		foreach($this->conditions as $conditionGroup)

+		foreach ($this->conditions as $conditionGroup)

 		{

 			$args = array_merge($args, $conditionGroup->getArguments());

 		}

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

Spacing +3 added lines, -3 removed lines

@@ -46,15 +46,15 @@
 

 		$index_hint_string = '';

 		$indexTypeList = array('USE' => 1, 'FORCE' => 1);

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

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

 		{

 			$index_hint_type = $index_hint->getIndexHintType();

-			if(isset($indexTypeList[$index_hint_type]))

+			if (isset($indexTypeList[$index_hint_type]))

 			{

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

 			}

 		}

-		if($index_hint_string != '')

+		if ($index_hint_string != '')

 		{

 			$result .= ' WITH(' . substr($index_hint_string, 0, -2) . ') ';

 		}

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

Spacing +7 added lines, -7 removed lines

@@ -47,31 +47,31 @@
 		$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() . ', ';

 			}

-			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() . ', ';

 			}

 		}

-		if($use_index_hint != '')

+		if ($use_index_hint != '')

 		{

 			$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) . ') ';

 		}

-		if($ignore_index_hint != '')

+		if ($ignore_index_hint != '')

 		{

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

 		}

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() . ', ';

 			}

classes/display/HTMLDisplayHandler.php

Spacing +35 added lines, -35 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>';
 			}
 
-			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,7 +174,7 @@ 
 		$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'];
@@ -185,7 +185,7 @@ 
 			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
 			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
 
-			if(Context::get('vid'))
+			if (Context::get('vid'))
 			{
 				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
 				$output = preg_replace($pattern, '/?$1=', $output);
@@ -195,7 +195,7 @@ 
 		// 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);
@@ -206,7 +206,7 @@ 
 			$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');
@@ -253,12 +253,12 @@ 
 
 		// 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':
@@ -284,7 +284,7 @@ 
 			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"';
 				}
@@ -308,7 +308,7 @@ 
 		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];
 		}
@@ -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);

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()
 	{

classes/display/VirtualXMLDisplayHandler.php

Spacing +7 added lines, -7 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,12 +50,12 @@ 
 		$html[] = '<script type="text/javascript">';
 		$html[] = '//<![CDATA[';
 
-		if($output->message)
+		if ($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) . '";';

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 			if($category->parent_srl)
 			{
 				$categoryList[$category->parent_srl]->children[] = & $categoryList[$key];
-			}
-			else
+			} else
 			{
 				$depth0[] = $key;
 			}
@@ -324,8 +323,7 @@ 
 		if(method_exists($oModule, "moduleUninstall"))
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

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");
 			}