xpressengine / xe-core

modules/editor/editor.controller.php

Doc Comments +1 added lines

@@ -238,6 +238,7 @@
 
 	/**
 	 * @brief AutoSave
+	 * @param stdClass $args
 	 */
 	function doSaveDoc($args)
 	{

Spacing +82 added lines, -82 removed lines

@@ -47,28 +47,28 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if (!$oComponent->toBool()) return $oComponent;
 
-		if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		if (method_exists($oComponent, $method)) $output = $oComponent->{$method}();
+		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
+		if ((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
 
 		$vars = $oComponent->getVariables();
-		if(count($vars))
+		if (count($vars))
 		{
-			foreach($vars as $key => $val)
+			foreach ($vars as $key => $val)
 			{
 				$this->add($key, $val);
 			}
@@ -86,18 +86,18 @@ 
 		$module_srl = array();
 		$oModuleModel = getModel('module');
 
-		foreach($target_module_srl as $srl)
+		foreach ($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
-			if(!$module_info->module_srl)
+			if (!$module_info->module_srl)
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
-			if(!$module_grant->manager)
+			if (!$module_grant->manager)
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
@@ -111,32 +111,32 @@ 
 		$editor_config->content_style = Context::get('content_style');
 		$editor_config->comment_content_style = Context::get('comment_content_style');
 		$editor_config->content_font = Context::get('content_font');
-		if($editor_config->content_font)
+		if ($editor_config->content_font)
 		{
 			$font_list = array();
-			$fonts = explode(',',$editor_config->content_font);
-			for($i=0,$c=count($fonts);$i<$c;$i++)
+			$fonts = explode(',', $editor_config->content_font);
+			for ($i = 0, $c = count($fonts); $i < $c; $i++)
 			{
-				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				$font = trim(str_replace(array('"', '\''), '', $fonts[$i]));
+				if (!$font) continue;
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if (count($font_list)) $editor_config->content_font = '"'.implode('","', $font_list).'"';
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
 		$editor_config->sel_comment_editor_colorset = Context::get('sel_comment_editor_colorset');
 
-		$grants = array('enable_html_grant','enable_comment_html_grant','upload_file_grant','comment_upload_file_grant','enable_default_component_grant','enable_comment_default_component_grant','enable_component_grant','enable_comment_component_grant');
+		$grants = array('enable_html_grant', 'enable_comment_html_grant', 'upload_file_grant', 'comment_upload_file_grant', 'enable_default_component_grant', 'enable_comment_default_component_grant', 'enable_component_grant', 'enable_comment_component_grant');
 
-		foreach($grants as $key)
+		foreach ($grants as $key)
 		{
 			$grant = Context::get($key);
-			if(!$grant)
+			if (!$grant)
 			{
 				$editor_config->{$key} = array();
 			}
-			else if(is_array($grant))
+			else if (is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
 			}
@@ -146,13 +146,13 @@ 
 			}
 		}
 
-		$editor_config->editor_height = (int)Context::get('editor_height');
-		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
+		$editor_config->editor_height = (int) Context::get('editor_height');
+		$editor_config->comment_editor_height = (int) Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if ($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
 
 		$oModuleController = getController('module');
-		foreach($module_srl as $srl)
+		foreach ($module_srl as $srl)
 		{
 			$oModuleController->insertModulePartConfig('editor', $srl, $editor_config);
 		}
@@ -169,31 +169,31 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if (Context::getResponseMethod() != 'HTML') return new BaseObject();
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
-		if($module_srl)
+		if ($module_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$editor_config = $oEditorModel->getEditorConfig($module_srl);
 			$content_style = $editor_config->content_style;
-			if($content_style)
+			if ($content_style)
 			{
-				$path = _XE_PATH_ . 'modules/editor/styles/'.$content_style.'/';
-				if(is_dir($path) && file_exists($path . 'style.ini'))
+				$path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
+				if (is_dir($path) && file_exists($path.'style.ini'))
 				{
 					$ini = file($path.'style.ini');
-					for($i = 0, $c = count($ini); $i < $c; $i++)
+					for ($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if (!$file) continue;
 
-						if(substr_compare($file, '.css', -4) === 0)
+						if (substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						elseif (substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -202,12 +202,12 @@ 
 			}
 			$content_font = $editor_config->content_font;
 			$content_font_size = $editor_config->content_font_size;
-			if($content_font || $content_font_size)
+			if ($content_font || $content_font_size)
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if ($content_font) $buff[] = 'font-family:'.$content_font.';';
+				if ($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -222,7 +222,7 @@ 
 	 */
 	function transComponent($content)
 	{
-		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this,'transEditorComponent'), $content);
+		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this, 'transEditorComponent'), $content);
 		return $content;
 	}
 
@@ -237,19 +237,19 @@ 
 
 		$xml_obj = new stdClass;
 		$xml_obj->attrs = new stdClass;
-		for($i=0,$c=count($m[0]);$i<$c;$i++)
+		for ($i = 0, $c = count($m[0]); $i < $c; $i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if (!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if (!$xml_obj->attrs->editor_component) return $match[0];
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if (!is_object($oComponent) || !method_exists($oComponent, 'transHTML')) return $match[0];
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,26 +259,26 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl) $args->module_srl = Context::get('module_srl');
-		if(!$args->module_srl)
+		if (!$args->module_srl) $args->module_srl = Context::get('module_srl');
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
 		}
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
 		}
 		else
 		{
-			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
-			if(!$args->certify_key) $args->certify_key = Password::createSecureSalt(40);
-			setcookie('autosave_certify_key_' . $args->module_srl, $args->certify_key, $_SERVER['REQUEST_TIME'] + 3600, '', '', false, true);
+			$args->certify_key = $_COOKIE['autosave_certify_key_'.$args->module_srl];
+			if (!$args->certify_key) $args->certify_key = Password::createSecureSalt(40);
+			setcookie('autosave_certify_key_'.$args->module_srl, $args->certify_key, $_SERVER['REQUEST_TIME'] + 3600, '', '', false, true);
 		}
 
 		return executeQuery('editor.insertSavedDoc', $args);
@@ -324,22 +324,22 @@ 
 		$args->module_srl = Context::get('module_srl');
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
 		}
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
 		}
 		else
 		{
-			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
+			$args->certify_key = $_COOKIE['autosave_certify_key_'.$args->module_srl];
 			// @see https://github.com/xpressengine/xe-core/issues/2208
 			// 변경 이전에 작성된 게시물 호환성 유지
-			if(!$args->certify_key) {
+			if (!$args->certify_key) {
 				unset($args->certify_key);
 				$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 			}
@@ -347,13 +347,13 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if (!$saved_doc) return;
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if(!$oSaved->isExists())
+		if (!$oSaved->isExists())
 		{
-			if($mode)
+			if ($mode)
 			{
 				$output = executeQuery('editor.getSavedDocument', $args);
 				$output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $saved_doc);
@@ -382,9 +382,9 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if ($filter_enabled) $args->enabled = "Y";
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
@@ -397,10 +397,10 @@ 
 
 		// Get information about log-in status and its group
 		$is_logged = Context::get('is_logged');
-		if($is_logged)
+		if ($is_logged)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->group_list && is_array($logged_info->group_list))
+			if ($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
 			}
@@ -408,30 +408,30 @@ 
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if (!is_array($db_list)) $db_list = array($db_list);
 		$component_list = new stdClass();
-		foreach($db_list as $component)
+		foreach ($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component->component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if (!$component_name) continue;
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if (!in_array($component_name, $downloaded_list)) continue;
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
 			$xml_info->enabled = $component->enabled;
 
-			if($component->extra_vars)
+			if ($component->extra_vars)
 			{
 				$extra_vars = unserialize($component->extra_vars);
-				if($extra_vars->target_group)
+				if ($extra_vars->target_group)
 				{
 					$xml_info->target_group = $extra_vars->target_group;
 				}
 
-				if($extra_vars->mid_list && count($extra_vars->mid_list))
+				if ($extra_vars->mid_list && count($extra_vars->mid_list))
 				{
 					$xml_info->mid_list = $extra_vars->mid_list;
 				}
@@ -458,9 +458,9 @@ 
 				if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
 				}*/
 				// Check the configuration of the editor component
-				if($xml_info->extra_vars)
+				if ($xml_info->extra_vars)
 				{
-					foreach($xml_info->extra_vars as $key => $val)
+					foreach ($xml_info->extra_vars as $key => $val)
 					{
 						$xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
 					}
@@ -471,19 +471,19 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if (file_exists($icon_file)) $component_list->{$component_name}->icon = true;
+			if (file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
 		}
 
 		// Return if it checks enabled only
-		if(!$filter_enabled) {
+		if (!$filter_enabled) {
 			// Get xml_info of downloaded list
-			foreach($downloaded_list as $component_name)
+			foreach ($downloaded_list as $component_name)
 			{
-				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$component_name)) continue;
-				if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+				if (!is_dir(_XE_PATH_.'modules/editor/components/'.$component_name)) continue;
+				if (in_array($component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 				// Pass if configured
-				if($component_list->{$component_name}) continue;
+				if ($component_list->{$component_name}) continue;
 				// Insert data into the DB
 				$oEditorController = getAdminController('editor');
 				$oEditorController->insertComponent($component_name, false, $site_srl);
@@ -497,7 +497,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport()) {
+		if ($oCacheHandler->isSupport()) {
 			$cache_key = $oEditorModel->getComponentListCacheKey($filter_enabled, $site_srl);
 			$oCacheHandler->put($cache_key, $component_list);
 		}
@@ -515,7 +515,7 @@ 
 		FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport()) {
+		if ($oCacheHandler->isSupport()) {
 			$cache_key = $oEditorModel->getComponentListCacheKey(true, $site_srl);
 			$oCacheHandler->delete($cache_key);
 			$cache_key = $oEditorModel->getComponentListCacheKey(false, $site_srl);
@@ -529,9 +529,9 @@ 
 		$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('editor', $moduleSrl, $editorConfig);
 			}

Braces +101 added lines, -43 removed lines

@@ -47,20 +47,31 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!$component) {
+			return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		}
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if(!$oComponent->toBool()) {
+			return $oComponent;
+		}
 
-		if(!method_exists($oComponent, $method)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if(!method_exists($oComponent, $method)) {
+			return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		}
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		if(method_exists($oComponent, $method)) {
+			$output = $oComponent->{$method}();
+		} else {
+			return new BaseObject(-1,sprintf('%s method is not exists', $method));
+		}
 
-		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) return $output;
+		if((is_a($output, 'BaseObject') || is_subclass_of($output, 'BaseObject')) && !$output->toBool()) {
+			return $output;
+		}
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
@@ -88,7 +99,9 @@ 
 
 		foreach($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
 			if(!$module_info->module_srl)
@@ -118,10 +131,14 @@ 
 			for($i=0,$c=count($fonts);$i<$c;$i++)
 			{
 				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				if(!$font) {
+					continue;
+				}
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if(count($font_list)) {
+				$editor_config->content_font = '"'.implode('","',$font_list).'"';
+			}
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
@@ -135,12 +152,10 @@ 
 			if(!$grant)
 			{
 				$editor_config->{$key} = array();
-			}
-			else if(is_array($grant))
+			} else if(is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
-			}
-			else
+			} else
 			{
 				$editor_config->{$key} = explode('|@|', $grant);
 			}
@@ -149,7 +164,9 @@ 
 		$editor_config->editor_height = (int)Context::get('editor_height');
 		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if($editor_config->enable_autosave != 'Y') {
+			$editor_config->enable_autosave = 'N';
+		}
 
 		$oModuleController = getController('module');
 		foreach($module_srl as $srl)
@@ -169,7 +186,9 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if(Context::getResponseMethod()!='HTML') {
+			return new BaseObject();
+		}
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
@@ -187,13 +206,14 @@ 
 					for($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if(!$file) {
+							continue;
+						}
 
 						if(substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
-						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						} elseif(substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -206,8 +226,12 @@ 
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if($content_font) {
+					$buff[] = 'font-family:'.$content_font.';';
+				}
+				if($content_font_size) {
+					$buff[] = 'font-size:'.$content_font_size.';';
+				}
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -239,17 +263,23 @@ 
 		$xml_obj->attrs = new stdClass;
 		for($i=0,$c=count($m[0]);$i<$c;$i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if(!isset($xml_obj->attrs)) {
+				$xml_obj->attrs = new stdClass;
+			}
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if(!$xml_obj->attrs->editor_component) {
+			return $match[0];
+		}
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) {
+			return $match[0];
+		}
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,10 +289,14 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$args->document_srl) {
+			$args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl) $args->module_srl = Context::get('module_srl');
+		if(!$args->module_srl) {
+			$args->module_srl = Context::get('module_srl');
+		}
 		if(!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
@@ -273,11 +307,12 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
-			if(!$args->certify_key) $args->certify_key = Password::createSecureSalt(40);
+			if(!$args->certify_key) {
+				$args->certify_key = Password::createSecureSalt(40);
+			}
 			setcookie('autosave_certify_key_' . $args->module_srl, $args->certify_key, $_SERVER['REQUEST_TIME'] + 3600, '', '', false, true);
 		}
 
@@ -333,8 +368,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->certify_key = $_COOKIE['autosave_certify_key_' . $args->module_srl];
 			// @see https://github.com/xpressengine/xe-core/issues/2208
@@ -347,7 +381,9 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if(!$saved_doc) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
@@ -382,14 +418,17 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if($filter_enabled) {
+			$args->enabled = "Y";
+		}
 
 		if($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
+		} else {
+			$output = executeQuery('editor.getComponentList', $args);
 		}
-		else $output = executeQuery('editor.getComponentList', $args);
 		$db_list = $output->data;
 
 		// Get a list of files
@@ -403,21 +442,30 @@ 
 			if($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
+			} else {
+				$group_list = array();
 			}
-			else $group_list = array();
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if(!is_array($db_list)) {
+			$db_list = array($db_list);
+		}
 		$component_list = new stdClass();
 		foreach($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) {
+				continue;
+			}
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if(!$component_name) {
+				continue;
+			}
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if(!in_array($component_name, $downloaded_list)) {
+				continue;
+			}
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
@@ -471,8 +519,12 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if(file_exists($icon_file)) {
+				$component_list->{$component_name}->icon = true;
+			}
+			if(file_exists($component_icon_file)) {
+				$component_list->{$component_name}->component_icon = true;
+			}
 		}
 
 		// Return if it checks enabled only
@@ -480,10 +532,16 @@ 
 			// Get xml_info of downloaded list
 			foreach($downloaded_list as $component_name)
 			{
-				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$component_name)) continue;
-				if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$component_name)) {
+					continue;
+				}
+				if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) {
+					continue;
+				}
 				// Pass if configured
-				if($component_list->{$component_name}) continue;
+				if($component_list->{$component_name}) {
+					continue;
+				}
 				// Insert data into the DB
 				$oEditorController = getAdminController('editor');
 				$oEditorController->insertComponent($component_name, false, $site_srl);

modules/file/file.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 	 * Make search parameters from object(private)
 	 *
 	 * @param object $obj Original searach options
-	 * @param object $args Result searach options
+	 * @param stdClass $args Result searach options
 	 * @return void
 	 */
 	function _makeSearchParam(&$obj, &$args)

Spacing +22 added lines, -22 removed lines

@@ -68,28 +68,28 @@ 
 		$this->_makeSearchParam($obj, $args);
 
 		// Set valid/invalid state
-		if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-		elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+		if ($obj->isvalid == 'Y') $args->isvalid = 'Y';
+		elseif ($obj->isvalid == 'N') $args->isvalid = 'N';
 		// Set multimedia/common file
-		if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-		elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+		if ($obj->direct_download == 'Y') $args->direct_download = 'Y';
+		elseif ($obj->direct_download == 'N') $args->direct_download = 'N';
 		// Set variables
 		$args->sort_index = $obj->sort_index;
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		$args->s_module_srl = $obj->module_srl;
 		$args->exclude_module_srl = $obj->exclude_module_srl;
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $args, $columnList);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 
 		$oFileModel = getModel('file');
 
-		foreach($output->data as $key => $file)
+		foreach ($output->data as $key => $file)
 		{
-			if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
+			if ($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
 			else $file->isCarted = false;
 
 			$file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -132,10 +132,10 @@ 
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if ($date) $args->regDate = date('Ymd', strtotime($date));
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if (!$output->toBool()) return 0;
 
 		return $output->data->count;
 	}
@@ -150,31 +150,31 @@ 
 	function _makeSearchParam(&$obj, &$args)
 	{
 		// Search options
-		$search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
-		$search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
+		$search_target = $obj->search_target ? $obj->search_target : trim(Context::get('search_target'));
+		$search_keyword = $obj->search_keyword ? $obj->search_keyword : trim(Context::get('search_keyword'));
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :
-					$args->s_filesize_more = (int)$search_keyword;
+					$args->s_filesize_more = (int) $search_keyword;
 					break;
 				case 'filesize_mega_more' :
-					$args->s_filesize_more = (int)$search_keyword * 1024 * 1024;
+					$args->s_filesize_more = (int) $search_keyword * 1024 * 1024;
 					break;
 				case 'filesize_less' :
-					$args->s_filesize_less = (int)$search_keyword;
+					$args->s_filesize_less = (int) $search_keyword;
 					break;
 				case 'filesize_mega_less' :
-					$args->s_filesize_less = (int)$search_keyword * 1024 * 1024;
+					$args->s_filesize_less = (int) $search_keyword * 1024 * 1024;
 					break;
 				case 'download_count' :
-					$args->s_download_count = (int)$search_keyword;
+					$args->s_download_count = (int) $search_keyword;
 					break;
 				case 'regdate' :
 					$args->s_regdate = $search_keyword;

Braces +27 added lines, -10 removed lines

@@ -68,11 +68,17 @@ 
 		$this->_makeSearchParam($obj, $args);
 
 		// Set valid/invalid state
-		if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-		elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+		if($obj->isvalid == 'Y') {
+			$args->isvalid = 'Y';
+		} elseif($obj->isvalid == 'N') {
+			$args->isvalid = 'N';
+		}
 		// Set multimedia/common file
-		if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-		elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+		if($obj->direct_download == 'Y') {
+			$args->direct_download = 'Y';
+		} elseif($obj->direct_download == 'N') {
+			$args->direct_download= 'N';
+		}
 		// Set variables
 		$args->sort_index = $obj->sort_index;
 		$args->page = $obj->page?$obj->page:1;
@@ -83,14 +89,19 @@ 
 		// Execute the file.getFileList query
 		$output = executeQuery('file.getFileList', $args, $columnList);
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 
 		$oFileModel = getModel('file');
 
 		foreach($output->data as $key => $file)
 		{
-			if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
-			else $file->isCarted = false;
+			if($_SESSION['file_management'][$file->file_srl]) {
+				$file->isCarted = true;
+			} else {
+				$file->isCarted = false;
+			}
 
 			$file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 			$output->data[$key] = $file;
@@ -132,10 +143,14 @@ 
 	 */
 	function getFilesCountByDate($date = '')
 	{
-		if($date) $args->regDate = date('Ymd', strtotime($date));
+		if($date) {
+			$args->regDate = date('Ymd', strtotime($date));
+		}
 
 		$output = executeQuery('file.getFilesCount', $args);
-		if(!$output->toBool()) return 0;
+		if(!$output->toBool()) {
+			return 0;
+		}
 
 		return $output->data->count;
 	}
@@ -158,7 +173,9 @@ 
 			switch($search_target)
 			{
 				case 'filename' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_filename = $search_keyword;
 					break;
 				case 'filesize_more' :

modules/importer/extract.class.php

Doc Comments +6 added lines

@@ -216,6 +216,7 @@ 
 
 	/**
 	 * Merge item
+	 * @param string $filename
 	 * @return void
 	 */
 	function mergeItems($filename)
@@ -310,6 +311,11 @@ 
 		return $this->key;
 	}
 
+	/**
+	 * @param string $str
+	 *
+	 * @return string
+	 */
 	function _addTagCRTail($str) {
 		$str = preg_replace('/<\/([^>]*)></i', "</$1>\r\n<", $str);
 		return $str;

Spacing +39 added lines, -39 removed lines

@@ -99,7 +99,7 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if ($endTag) $this->endTag = $endTag;
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +108,7 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if (!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
 
 		return $this->openFile();
 	}
@@ -120,55 +120,55 @@ 
 	function openFile()
 	{
 		FileHandler::removeFile($this->cache_index_file);
-		$this->index_fd = fopen($this->cache_index_file,"a");
+		$this->index_fd = fopen($this->cache_index_file, "a");
 		// If local file
-		if(strncasecmp('http://', $this->filename, 7) !== 0)
+		if (strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
-			$this->fd = fopen($this->filename,"r");
+			if (!file_exists($this->filename)) return new BaseObject(-1, 'msg_no_xml_file');
+			$this->fd = fopen($this->filename, "r");
 			// If remote file
 		}
 		else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if (!$url_info['port']) $url_info['port'] = 80;
+			if (!$url_info['path']) $url_info['path'] = '/';
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
+			if (!$this->fd) return new BaseObject(-1, 'msg_no_xml_file');
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
-			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
+			if (preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path) && function_exists('iconv'))
 			{
-				$path_list = explode('/',$path);
+				$path_list = explode('/', $path);
 				$cnt = count($path_list);
-				$filename = $path_list[$cnt-1];
-				$filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
-				$path_list[$cnt-1] = $filename;
-				$path = implode('/',$path_list);
+				$filename = $path_list[$cnt - 1];
+				$filename = urlencode(iconv("UTF-8", "EUC-KR", $filename));
+				$path_list[$cnt - 1] = $filename;
+				$path = implode('/', $path_list);
 				$url_info['path'] = $path;
 			}
 
 			$header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
 			@fwrite($this->fd, $header);
 			$buff = '';
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if (!trim($str)) break;
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
+			if (preg_match('/404 Not Found/i', $buff)) return new BaseObject(-1, 'msg_no_xml_file');
 		}
 
-		if($this->startTag)
+		if ($this->startTag)
 		{
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$str = fgets($this->fd, 1024);
 				$pos = strpos($str, $this->startTag);
-				if($pos !== false)
+				if ($pos !== false)
 				{
-					$this->buff = substr($this->buff, $pos+strlen($this->startTag));
+					$this->buff = substr($this->buff, $pos + strlen($this->startTag));
 					$this->isStarted = true;
 					$this->isFinished = false;
 					break;
@@ -208,7 +208,7 @@ 
 	{
 		FileHandler::removeDir($this->cache_path.$this->key);
 		$this->index = 0;
-		while(!$this->isFinished())
+		while (!$this->isFinished())
 		{
 			$this->getItem();
 		}
@@ -224,14 +224,14 @@ 
 
 		$filename = sprintf('%s/%s', $this->cache_path, $filename);
 
-		$index_fd = fopen($this->cache_index_file,"r");
-		$fd = fopen($filename,'w');
+		$index_fd = fopen($this->cache_index_file, "r");
+		$fd = fopen($filename, 'w');
 
 		fwrite($fd, '<items>');
-		while(!feof($index_fd))
+		while (!feof($index_fd))
 		{
-			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			$target_file = trim(fgets($index_fd, 1024));
+			if (!file_exists($target_file)) continue;
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,21 +247,21 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if ($this->isFinished()) return;
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$startPos = strpos($this->buff, $this->itemStartTag);
-			if($startPos !== false)
+			if ($startPos !== false)
 			{
 				$this->buff = substr($this->buff, $startPos);
-				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
+				$this->buff = preg_replace("/\>/", ">\r\n", $this->buff, 1);
 				break;
 			}
-			elseif($this->endTag)
+			elseif ($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
-				if($endPos !== false)
+				if ($endPos !== false)
 				{
 					$this->closeFile();
 					return;
@@ -271,21 +271,21 @@ 
 		}
 
 		$startPos = strpos($this->buff, $this->itemStartTag);
-		if($startPos === false)
+		if ($startPos === false)
 		{
 			$this->closeFile();
 			return;
 		}
 
-		$filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
+		$filename = sprintf('%s/%s.xml', $this->cache_path, $this->index++);
 		fwrite($this->index_fd, $filename."\r\n");
 
-		$fd = fopen($filename,'w');
+		$fd = fopen($filename, 'w');
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$endPos = strpos($this->buff, $this->itemEndTag);
-			if($endPos !== false)
+			if ($endPos !== false)
 			{
 				$endPos += strlen($this->itemEndTag);
 				$buff = substr($this->buff, 0, $endPos);

Braces +33 added lines, -16 removed lines

@@ -99,7 +99,9 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if($endTag) {
+			$this->endTag = $endTag;
+		}
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +110,9 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if(!is_dir($this->cache_path)) {
+			FileHandler::makeDir($this->cache_path);
+		}
 
 		return $this->openFile();
 	}
@@ -124,18 +128,25 @@ 
 		// If local file
 		if(strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new BaseObject(-1,'msg_no_xml_file');
+			if(!file_exists($this->filename)) {
+				return new BaseObject(-1,'msg_no_xml_file');
+			}
 			$this->fd = fopen($this->filename,"r");
 			// If remote file
-		}
-		else
+		} else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if(!$url_info['port']) {
+				$url_info['port'] = 80;
+			}
+			if(!$url_info['path']) {
+				$url_info['path'] = '/';
+			}
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new BaseObject(-1,'msg_no_xml_file');
+			if(!$this->fd) {
+				return new BaseObject(-1,'msg_no_xml_file');
+			}
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
 			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
@@ -155,9 +166,13 @@ 
 			while(!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if(!trim($str)) {
+					break;
+				}
+			}
+			if(preg_match('/404 Not Found/i',$buff)) {
+				return new BaseObject(-1,'msg_no_xml_file');
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new BaseObject(-1,'msg_no_xml_file');
 		}
 
 		if($this->startTag)
@@ -174,8 +189,7 @@ 
 					break;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->isStarted = true;
 			$this->isFinished = false;
@@ -231,7 +245,9 @@ 
 		while(!feof($index_fd))
 		{
 			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,7 +263,9 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if($this->isFinished()) {
+			return;
+		}
 
 		while(!feof($this->fd))
 		{
@@ -257,8 +275,7 @@ 
 				$this->buff = substr($this->buff, $startPos);
 				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
 				break;
-			}
-			elseif($this->endTag)
+			} elseif($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
 				if($endPos !== false)

modules/importer/ttimport.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -450,7 +450,7 @@
 	 * @param int $upload_target_srl
 	 * @param array $files
 	 * @param string $buff
-	 * @return bool
+	 * @return null|boolean
 	 */
 	function importAttaches($fp, $module_srl, $upload_target_srl, &$files, $buff)
 	{

Braces +153 added lines, -71 removed lines

@@ -40,7 +40,9 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 		// First handle categorty information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
 		if(file_exists($category_file))
@@ -58,15 +60,21 @@ 
 				foreach($categories as $k => $v)
 				{
 					$category = $v->name;
-					if(!$category || $category_titles[$category]) continue;
+					if(!$category || $category_titles[$category]) {
+						continue;
+					}
 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl; 
-					if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
+					if($v->parent) {
+						$obj->parent_srl = $match_sequence[$v->parent];
+					}
 					$output = $oDocumentController->insertCategory($obj);
 
-					if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					if($output->toBool()) {
+						$match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					}
 				}
 				$oDocumentController->makeCategoryFile($module_srl);
 			}
@@ -74,28 +82,40 @@ 
 		}
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 		// Get administrator information
 		$oMemberModel = getModel('member');
 		$member_info = $oMemberModel->getMemberInfoByUserID($user_id);
 		$author_xml_id = 0;
 
-		if(!$cur) $cur = 0;
+		if(!$cur) {
+			$cur = 0;
+		}
 		// Open an index file
 		$f = fopen($index_file,"r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for($i=0;$i<$cur;$i++) {
+			fgets($f, 1024);
+		}
 		// Read each line until the codition meets
 		for($idx=$cur;$idx<$cur+$unit_count;$idx++)
 		{
-			if(feof($f)) break;
+			if(feof($f)) {
+				break;
+			}
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			// Start importing data
 			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			if(!$fp) {
+				continue;
+			}
 
 			$obj = null;
 			$obj->module_srl = $module_srl;
@@ -116,14 +136,17 @@ 
 					$started = true;
 					continue;
 					// Import the attachment
-				}
-				else if(substr($str,0,12) == '<attachment ')
+				} else if(substr($str,0,12) == '<attachment ')
 				{
-					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
+					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) {
+						$obj->uploaded_count++;
+					}
 					continue;
 				}
 
-				if($started) $buff .= $str;
+				if($started) {
+					$buff .= $str;
+				}
 			}
 
 			$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
@@ -134,7 +157,9 @@ 
 			{
 				$tmp_arr = explode('/',$xmlDoc->post->category->body);
 				$category = trim($tmp_arr[count($tmp_arr)-1]);
-				if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+				if($category_titles[$category]) {
+					$obj->category_srl = $category_titles[$category];
+				}
 			}
 
 			$obj->is_notice = 'N';
@@ -148,15 +173,21 @@ 
 			//$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
 			$obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
 			$obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if(!$obj->last_update) {
+				$obj->last_update = $obj->regdate;
+			}
 
 			$tag = null;
 			$tmp_tags = null;
 			$tag = $xmlDoc->post->tag;
 			if($tag)
 			{
-				if(!is_array($tag)) $tag = array($tag);
-				foreach($tag as $key => $val) $tmp_tags[] = $val->body;
+				if(!is_array($tag)) {
+					$tag = array($tag);
+				}
+				foreach($tag as $key => $val) {
+					$tmp_tags[] = $val->body;
+				}
 				$obj->tags = implode(',',$tmp_tags);
 			}
 
@@ -192,7 +223,9 @@ 
 			if($xmlDoc->post->trackback)
 			{
 				$trackbacks = $xmlDoc->post->trackback;
-				if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
+				if(!is_array($trackbacks)) {
+					$trackbacks = array($trackbacks);
+				}
 				if(count($trackbacks))
 				{
 					foreach($trackbacks as $key => $val)
@@ -209,7 +242,9 @@ 
 						$tobj->ipaddress = $val->ip->body;
 						$tobj->list_order = -1*$tobj->trackback_srl;
 						$output = executeQuery('trackback.insertTrackback', $tobj);
-						if($output->toBool()) $obj->trackback_count++;
+						if($output->toBool()) {
+							$obj->trackback_count++;
+						}
 					}
 				}
 			}
@@ -218,21 +253,29 @@ 
 			if($xmlDoc->post->comment)
 			{
 				$comment = $xmlDoc->post->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if(!is_array($comment)) {
+					$comment = array($comment);
+				}
 				foreach($comment as $key => $val)
 				{
 					$parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
-					if($parent_srl === false) continue;
+					if($parent_srl === false) {
+						continue;
+					}
 
 					$obj->comment_count++;
 					if($val->comment)
 					{
 						$child_comment = $val->comment;
-						if(!is_array($child_comment)) $child_comment = array($child_comment);
+						if(!is_array($child_comment)) {
+							$child_comment = array($child_comment);
+						}
 						foreach($child_comment as $k => $v)
 						{
 							$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
-							if($result !== false) $obj->comment_count++;
+							if($result !== false) {
+								$obj->comment_count++;
+							}
 						}
 					}
 				}
@@ -270,7 +313,9 @@ 
 						$args->document_srl = $obj->document_srl;
 						$args->tag = trim($tag_list[$i]);
 						$args->regdate = $obj->regdate;
-						if(!$args->tag) continue;
+						if(!$args->tag) {
+							continue;
+						}
 						$output = executeQuery('tag.insertTag', $args);
 					}
 				}
@@ -282,7 +327,9 @@ 
 
 		fclose($f);
 
-		if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		}
 		// Guestbook information
 		$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
 		if(file_exists($guestbook_file))
@@ -293,7 +340,9 @@ 
 			if($guestbook_module_srl && $xmlDoc->guestbook->comment)
 			{
 				$comment = $xmlDoc->guestbook->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if(!is_array($comment)) {
+					$comment = array($comment);
+				}
 
 				if($module_name =='textyle')
 				{
@@ -304,7 +353,9 @@ 
 						if($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
+							if(!is_array($child_comment)) {
+								$child_comment = array($child_comment);
+							}
 							foreach($child_comment as $k => $v)
 							{
 								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
@@ -313,8 +364,7 @@ 
 
 						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
 					}
-				}
-				else
+				} else
 				{
 					foreach($comment as $key => $val)
 					{
@@ -328,13 +378,17 @@ 
 
 						// Extract a title form the bocy
 						$obj->title = cut_str(strip_tags($obj->content),20,'...');
-						if ($obj->title == '') $obj->title = 'Untitled';
+						if ($obj->title == '') {
+							$obj->title = 'Untitled';
+						}
 
 						$obj->commentStatus = 'ALLOW';
 						$obj->allow_trackback = 'N';
 						$obj->regdate = date("YmdHis",$val->written->body);
 						$obj->last_update = date("YmdHis", $val->written->body);
-						if(!$obj->last_update) $obj->last_update = $obj->regdate;
+						if(!$obj->last_update) {
+							$obj->last_update = $obj->regdate;
+						}
 						$obj->tags = '';
 						$obj->readed_count = 0;
 						$obj->voted_count = 0;
@@ -347,8 +401,7 @@ 
 							$obj->member_srl = $member_info->member_srl;
 							$obj->email_address = $member_info->email_address;
 							$obj->homepage = $member_info->homepage;
-						}
-						else
+						} else
 						{
 							$obj->password = $val->password->body;
 							$obj->nick_name = $val->commenter->name->body;
@@ -364,11 +417,15 @@ 
 						if($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
+							if(!is_array($child_comment)) {
+								$child_comment = array($child_comment);
+							}
 							foreach($child_comment as $k => $v)
 							{
 								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
-								if($result !== false) $obj->comment_count++;
+								if($result !== false) {
+									$obj->comment_count++;
+								}
 							}
 						}
 
@@ -399,8 +456,7 @@ 
 		if($textyle_guestbook_srl>0)
 		{
 			$tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
-		}
-		else
+		} else
 		{
 			$tobj->textyle_guestbook_srl = getNextSequence();
 		}
@@ -416,8 +472,7 @@ 
 			$tobj->member_srl = $member_info->member_srl;
 			$tobj->homepage = $member_info->homepage;
 			$tobj->email_address = $member_info->email_address;
-		}
-		else
+		} else
 		{
 			$tobj->password = $val->password->body;
 			$tobj->nick_name = $val->commenter->name->body;
@@ -431,15 +486,16 @@ 
 		{
 			$tobj->parent_srl = $parent_srl;
 			$tobj->list_order = $tobj->parent_srl * -1;
-		}
-		else
+		} else
 		{
 			$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
 		}
 
 		$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
 
-		if($output->toBool()) return $tobj->textyle_guestbook_srl;
+		if($output->toBool()) {
+			return $tobj->textyle_guestbook_srl;
+		}
 		return false;
 	}
 
@@ -465,7 +521,9 @@ 
 		{
 			$str = fgets($fp, 1024);
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attachment>') break;
+			if(trim($str) == '</attachment>') {
+				break;
+			}
 			// If it starts with <file>, handle the attachement in the xml file
 			if(substr($str, 0, 9)=='<content>')
 			{
@@ -475,7 +533,9 @@ 
 
 			$buff .= $str;
 		}
-		if(!file_exists($file_obj->file)) return false;
+		if(!file_exists($file_obj->file)) {
+			return false;
+		}
 
 		$buff .= '</attachment>';
 
@@ -490,15 +550,16 @@ 
 			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
 			$filename = $path.$file_obj->source_filename;
 			$file_obj->direct_download = 'Y';
-		}
-		else
+		} else
 		{
 			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
 			$filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
 			$file_obj->direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return;
+		if(!FileHandler::makeDir($path)) {
+			return;
+		}
 
 		FileHandler::rename($file_obj->file, $filename);
 		// Insert to the DB
@@ -515,8 +576,11 @@ 
 		{
 			$uploaded_count++;
 			$tmp_obj = null;
-			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
-			else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			if($file_obj->direct_download == 'Y') {
+				$files[$name]->url = $file_obj->uploaded_filename;
+			} else {
+				$files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			}
 			$files[$name]->direct_download = $file_obj->direct_download;
 			$files[$name]->source_filename = $file_obj->source_filename;
 			return true;
@@ -532,9 +596,13 @@ 
 	function getTmpFilename()
 	{
 		$path = "./files/cache/importer";
-		if(!is_dir($path)) FileHandler::makeDir($path);
+		if(!is_dir($path)) {
+			FileHandler::makeDir($path);
+		}
 		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if(file_exists($filename)) {
+			$filename .= rand(111,999);
+		}
 		return $filename;
 	}
 
@@ -553,7 +621,9 @@ 
 		{
 			$str = trim(fgets($fp, 1024));
 			$buff .= $str;
-			if(substr($str, -10) == '</content>') break;
+			if(substr($str, -10) == '</content>') {
+				break;
+			}
 		}
 
 		$buff = substr($buff, 0, -10);
@@ -572,7 +642,9 @@ 
 	function _replaceTTAttach($matches)
 	{
 		$name = $matches[2];
-		if(!$name) return $matches[0];
+		if(!$name) {
+			return $matches[0];
+		}
 
 		$obj = $this->files[$name];
 		// If multimedia file is,
@@ -583,14 +655,12 @@ 
 			{
 				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
 				// If other multimedia file but image is, 
-			}
-			else
+			} else
 			{
 				return sprintf('<img src="./common/img/blank.gif" editor_component="multimedia_link" multimedia_src="%s" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />', $obj->url);
 			}
 			// If binary file is
-		}
-		else
+		} else
 		{
 			return sprintf('<a href="%s">%s</a>', $obj->url, $obj->source_filename);
 		}
@@ -603,7 +673,9 @@ 
 	function _replaceTTMovie($matches)
 	{
 		$key = $matches[1];
-		if(!$key) return $matches[0];
+		if(!$key) {
+			return $matches[0];
+		}
 
 		return 
 			'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
@@ -645,8 +717,7 @@ 
 			$tobj->member_srl = $member_info->member_srl;
 			$tobj->homepage = $member_info->homepage;
 			$tobj->email_address = $member_info->email_address;
-		}
-		else
+		} else
 		{
 			$tobj->password = $val->password->body;
 			$tobj->nick_name = $val->commenter->name->body;
@@ -670,24 +741,28 @@ 
 			$list_args->head = $list_args->arrange = $tobj->comment_srl;
 			$list_args->depth = 0;
 			// Get parent_srl if parent comment exists
-		}
-		else
+		} else
 		{
 			// Get parent_srl
 			$parent_args->comment_srl = $tobj->parent_srl;
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 			// Return if parent comment doesn't exist
-			if(!$parent_output->toBool() || !$parent_output->data) return false;
+			if(!$parent_output->toBool() || !$parent_output->data) {
+				return false;
+			}
 			$parent = $parent_output->data;
 
 			$list_args->head = $parent->head;
 			$list_args->depth = $parent->depth+1;
-			if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
-			else
+			if($list_args->depth<2) {
+				$list_args->arrange = $tobj->comment_srl;
+			} else
 			{
 				$list_args->arrange = $parent->arrange;
 				$output = executeQuery('comment.updateCommentListArrange', $list_args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 
@@ -695,7 +770,9 @@ 
 		if($output->toBool())
 		{
 			$output = executeQuery('comment.insertComment', $tobj);
-			if($output->toBool()) return $tobj->comment_srl;
+			if($output->toBool()) {
+				return $tobj->comment_srl;
+			}
 		}
 		return false;
 	}
@@ -710,9 +787,14 @@ 
 	 */
 	function arrangeCategory($obj, &$category, &$idx, $parent = 0)
 	{
-		if(!$obj->category) return;
-		if(!is_array($obj->category)) $c = array($obj->category);
-		else $c = $obj->category;
+		if(!$obj->category) {
+			return;
+		}
+		if(!is_array($obj->category)) {
+			$c = array($obj->category);
+		} else {
+			$c = $obj->category;
+		}
 		foreach($c as $val)
 		{
 			$idx++;

Spacing +134 added lines, -134 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $module_name
 	 * @return int
 	 */
-	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null)
+	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name = null)
 	{
 		// Pre-create the objects needed
 		$this->oXmlParser = new XmlParser();
@@ -40,33 +40,33 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if (count($category_list)) foreach ($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 		// First handle categorty information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
-		if(file_exists($category_file))
+		if (file_exists($category_file))
 		{
 			// Create the xmlParser object
 			$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
 			// List category information
-			if($xmlDoc->categories->category)
+			if ($xmlDoc->categories->category)
 			{
 				$categories = array();
 				$idx = 0;
 				$this->arrangeCategory($xmlDoc->categories, $categories, $idx, 0);
 
 				$match_sequence = array();
-				foreach($categories as $k => $v)
+				foreach ($categories as $k => $v)
 				{
 					$category = $v->name;
-					if(!$category || $category_titles[$category]) continue;
+					if (!$category || $category_titles[$category]) continue;
 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl; 
-					if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
+					if ($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
 					$output = $oDocumentController->insertCategory($obj);
 
-					if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					if ($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
 				}
 				$oDocumentController->makeCategoryFile($module_srl);
 			}
@@ -74,28 +74,28 @@ 
 		}
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if (count($category_list)) foreach ($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 		// Get administrator information
 		$oMemberModel = getModel('member');
 		$member_info = $oMemberModel->getMemberInfoByUserID($user_id);
 		$author_xml_id = 0;
 
-		if(!$cur) $cur = 0;
+		if (!$cur) $cur = 0;
 		// Open an index file
-		$f = fopen($index_file,"r");
+		$f = fopen($index_file, "r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for ($i = 0; $i < $cur; $i++) fgets($f, 1024);
 		// Read each line until the codition meets
-		for($idx=$cur;$idx<$cur+$unit_count;$idx++)
+		for ($idx = $cur; $idx < $cur + $unit_count; $idx++)
 		{
-			if(feof($f)) break;
+			if (feof($f)) break;
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 
-			if(!file_exists($target_file)) continue;
+			if (!file_exists($target_file)) continue;
 			// Start importing data
-			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			$fp = fopen($target_file, "r");
+			if (!$fp) continue;
 
 			$obj = null;
 			$obj->module_srl = $module_srl;
@@ -107,57 +107,57 @@ 
 			$started = false;
 			$buff = null;
 			// Start importing from the body data
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$str = fgets($fp, 1024);
 				// Prepare an item
-				if(substr($str,0,5) == '<post')
+				if (substr($str, 0, 5) == '<post')
 				{
 					$started = true;
 					continue;
 					// Import the attachment
 				}
-				else if(substr($str,0,12) == '<attachment ')
+				else if (substr($str, 0, 12) == '<attachment ')
 				{
-					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
+					if ($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
 					continue;
 				}
 
-				if($started) $buff .= $str;
+				if ($started) $buff .= $str;
 			}
 
 			$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
 
 			$author_xml_id = $xmlDoc->post->author->body;
 
-			if($xmlDoc->post->category->body)
+			if ($xmlDoc->post->category->body)
 			{
-				$tmp_arr = explode('/',$xmlDoc->post->category->body);
-				$category = trim($tmp_arr[count($tmp_arr)-1]);
-				if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+				$tmp_arr = explode('/', $xmlDoc->post->category->body);
+				$category = trim($tmp_arr[count($tmp_arr) - 1]);
+				if ($category_titles[$category]) $obj->category_srl = $category_titles[$category];
 			}
 
 			$obj->is_notice = 'N';
-			$obj->status = in_array($xmlDoc->post->visibility->body, array('public','syndicated'))?$oDocumentModel->getConfigStatus('public'):$oDocumentModel->getConfigStatus('secret');
+			$obj->status = in_array($xmlDoc->post->visibility->body, array('public', 'syndicated')) ? $oDocumentModel->getConfigStatus('public') : $oDocumentModel->getConfigStatus('secret');
 			$obj->title = $xmlDoc->post->title->body;
 			$obj->content = $xmlDoc->post->content->body;
 			$obj->password = md5($xmlDoc->post->password->body);
-			$obj->commentStatus = $xmlDoc->post->acceptcomment->body=='1'?'ALLOW':'DENY';
-			$obj->allow_trackback = $xmlDoc->post->accepttrackback->body=='1'?'Y':'N';
+			$obj->commentStatus = $xmlDoc->post->acceptcomment->body == '1' ? 'ALLOW' : 'DENY';
+			$obj->allow_trackback = $xmlDoc->post->accepttrackback->body == '1' ? 'Y' : 'N';
 			//$obj->allow_comment = $xmlDoc->post->acceptComment->body=='1'?'Y':'N';
 			//$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
-			$obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
+			$obj->regdate = date("YmdHis", $xmlDoc->post->published->body);
 			$obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if (!$obj->last_update) $obj->last_update = $obj->regdate;
 
 			$tag = null;
 			$tmp_tags = null;
 			$tag = $xmlDoc->post->tag;
-			if($tag)
+			if ($tag)
 			{
-				if(!is_array($tag)) $tag = array($tag);
-				foreach($tag as $key => $val) $tmp_tags[] = $val->body;
-				$obj->tags = implode(',',$tmp_tags);
+				if (!is_array($tag)) $tag = array($tag);
+				foreach ($tag as $key => $val) $tmp_tags[] = $val->body;
+				$obj->tags = implode(',', $tmp_tags);
 			}
 
 			$obj->readed_count = 0;
@@ -169,33 +169,33 @@ 
 			$obj->email_address = $member_info->email_address;
 			$obj->homepage = $member_info->homepage;
 			$obj->ipaddress = $_REMOTE['SERVER_ADDR'];
-			$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+			$obj->list_order = $obj->update_order = $obj->document_srl * -1;
 			$obj->notify_message = 'N';
 			// Change content information (attachment)
-			$obj->content = str_replace('[##_ATTACH_PATH_##]/','',$obj->content);
-			if(count($files))
+			$obj->content = str_replace('[##_ATTACH_PATH_##]/', '', $obj->content);
+			if (count($files))
 			{
-				foreach($files as $key => $val) {
-					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val->url.'"',$obj->content);
+				foreach ($files as $key => $val) {
+					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i', '$1="'.$val->url.'"', $obj->content);
 				}
 			}
 
 			$obj->content = preg_replace_callback('!\[##_Movie\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTMovie'), $obj->content);
 
-			if(count($files))
+			if (count($files))
 			{
 				$this->files = $files;
 				$obj->content = preg_replace_callback('!\[##_([a-z0-9]+)\|([^\|]*)\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTAttach'), $obj->content);
 			}
 			// Trackback inserted
 			$obj->trackback_count = 0;
-			if($xmlDoc->post->trackback)
+			if ($xmlDoc->post->trackback)
 			{
 				$trackbacks = $xmlDoc->post->trackback;
-				if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
-				if(count($trackbacks))
+				if (!is_array($trackbacks)) $trackbacks = array($trackbacks);
+				if (count($trackbacks))
 				{
-					foreach($trackbacks as $key => $val)
+					foreach ($trackbacks as $key => $val)
 					{
 						$tobj = null;
 						$tobj->trackback_srl = getNextSequence();
@@ -205,40 +205,40 @@ 
 						$tobj->title = $val->title->body;
 						$tobj->blog_name = $val->site->body;
 						$tobj->excerpt = $val->excerpt->body;
-						$tobj->regdate = date("YmdHis",$val->received->body);
+						$tobj->regdate = date("YmdHis", $val->received->body);
 						$tobj->ipaddress = $val->ip->body;
-						$tobj->list_order = -1*$tobj->trackback_srl;
+						$tobj->list_order = -1 * $tobj->trackback_srl;
 						$output = executeQuery('trackback.insertTrackback', $tobj);
-						if($output->toBool()) $obj->trackback_count++;
+						if ($output->toBool()) $obj->trackback_count++;
 					}
 				}
 			}
 			// Comment
 			$obj->comment_count = 0;
-			if($xmlDoc->post->comment)
+			if ($xmlDoc->post->comment)
 			{
 				$comment = $xmlDoc->post->comment;
-				if(!is_array($comment)) $comment = array($comment);
-				foreach($comment as $key => $val)
+				if (!is_array($comment)) $comment = array($comment);
+				foreach ($comment as $key => $val)
 				{
 					$parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
-					if($parent_srl === false) continue;
+					if ($parent_srl === false) continue;
 
 					$obj->comment_count++;
-					if($val->comment)
+					if ($val->comment)
 					{
 						$child_comment = $val->comment;
-						if(!is_array($child_comment)) $child_comment = array($child_comment);
-						foreach($child_comment as $k => $v)
+						if (!is_array($child_comment)) $child_comment = array($child_comment);
+						foreach ($child_comment as $k => $v)
 						{
 							$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
-							if($result !== false) $obj->comment_count++;
+							if ($result !== false) $obj->comment_count++;
 						}
 					}
 				}
 			}
 
-			if($module_name == 'textyle')
+			if ($module_name == 'textyle')
 			{
 				$args->document_srl = $obj->document_srl;
 				$args->module_srl = $obj->module_srl;
@@ -247,7 +247,7 @@ 
 				// Visibility value of published state
 				$status_published = array('public', 'syndicated');
 				// Save state if not published
-				if(!in_array($xmlDoc->post->visibility->body, $status_published))
+				if (!in_array($xmlDoc->post->visibility->body, $status_published))
 				{
 					$obj->module_srl = $member_info->member_srl; 
 				}
@@ -255,14 +255,14 @@ 
 			// Document
 			$output = executeQuery('document.insertDocument', $obj);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				// Tags
-				if($obj->tags)
+				if ($obj->tags)
 				{
-					$tag_list = explode(',',$obj->tags);
+					$tag_list = explode(',', $obj->tags);
 					$tag_count = count($tag_list);
-					for($i=0;$i<$tag_count;$i++)
+					for ($i = 0; $i < $tag_count; $i++)
 					{
 						$args = new stdClass;
 						$args->tag_srl = getNextSequence();
@@ -270,7 +270,7 @@ 
 						$args->document_srl = $obj->document_srl;
 						$args->tag = trim($tag_list[$i]);
 						$args->regdate = $obj->regdate;
-						if(!$args->tag) continue;
+						if (!$args->tag) continue;
 						$output = executeQuery('tag.insertTag', $args);
 					}
 				}
@@ -282,63 +282,63 @@ 
 
 		fclose($f);
 
-		if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		if (count($category_list)) foreach ($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
 		// Guestbook information
 		$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
-		if(file_exists($guestbook_file))
+		if (file_exists($guestbook_file))
 		{
 			// Create the xmlParser object
 			$xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
 			// Handle guest book information
-			if($guestbook_module_srl && $xmlDoc->guestbook->comment)
+			if ($guestbook_module_srl && $xmlDoc->guestbook->comment)
 			{
 				$comment = $xmlDoc->guestbook->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if (!is_array($comment)) $comment = array($comment);
 
-				if($module_name =='textyle')
+				if ($module_name == 'textyle')
 				{
-					foreach($comment as $key => $val)
+					foreach ($comment as $key => $val)
 					{
-						$textyle_guestbook_srl  = getNextSequence();
+						$textyle_guestbook_srl = getNextSequence();
 
-						if($val->comment)
+						if ($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
-							foreach($child_comment as $k => $v)
+							if (!is_array($child_comment)) $child_comment = array($child_comment);
+							foreach ($child_comment as $k => $v)
 							{
-								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
+								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info, 0, $textyle_guestbook_srl, $author_xml_id);
 							}
 						}
 
-						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
+						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl, 0, $author_xml_id);
 					}
 				}
 				else
 				{
-					foreach($comment as $key => $val)
+					foreach ($comment as $key => $val)
 					{
 						$obj = null;
 						$obj->module_srl = $guestbook_module_srl;
 						$obj->document_srl = getNextSequence();
 						$obj->uploaded_count = 0;
 						$obj->is_notice = 'N';
-						$obj->status = $val->secret->body=='1'?$oDocumentModel->getConfigStatus('secret'):$oDocumentModel->getConfigStatus('public');
+						$obj->status = $val->secret->body == '1' ? $oDocumentModel->getConfigStatus('secret') : $oDocumentModel->getConfigStatus('public');
 						$obj->content = nl2br($val->content->body);
 
 						// Extract a title form the bocy
-						$obj->title = cut_str(strip_tags($obj->content),20,'...');
+						$obj->title = cut_str(strip_tags($obj->content), 20, '...');
 						if ($obj->title == '') $obj->title = 'Untitled';
 
 						$obj->commentStatus = 'ALLOW';
 						$obj->allow_trackback = 'N';
-						$obj->regdate = date("YmdHis",$val->written->body);
+						$obj->regdate = date("YmdHis", $val->written->body);
 						$obj->last_update = date("YmdHis", $val->written->body);
-						if(!$obj->last_update) $obj->last_update = $obj->regdate;
+						if (!$obj->last_update) $obj->last_update = $obj->regdate;
 						$obj->tags = '';
 						$obj->readed_count = 0;
 						$obj->voted_count = 0;
-						if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+						if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 						{
 							$obj->password = '';
 							$obj->nick_name = $member_info->nick_name;
@@ -356,19 +356,19 @@ 
 							$homepage = $val->commenter->homepage->body;
 						}
 						$obj->ipaddress = $val->commenter->ip->body;
-						$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+						$obj->list_order = $obj->update_order = $obj->document_srl * -1;
 						$obj->notify_message = 'N';
 						$obj->trackback_count = 0;
 
 						$obj->comment_count = 0;
-						if($val->comment)
+						if ($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
-							foreach($child_comment as $k => $v)
+							if (!is_array($child_comment)) $child_comment = array($child_comment);
+							foreach ($child_comment as $k => $v)
 							{
-								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
-								if($result !== false) $obj->comment_count++;
+								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
+								if ($result !== false) $obj->comment_count++;
 							}
 						}
 
@@ -380,7 +380,7 @@ 
 			FileHandler::removeFile($guestbook_file);
 		}
 
-		return $idx-1;
+		return $idx - 1;
 	}
 
 	/**
@@ -393,10 +393,10 @@ 
 	 * @param int $author_xml_id
 	 * @return int|bool
 	 */
-	function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl,$parent_srl = 0, $author_xml_id=null)
+	function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl, $parent_srl = 0, $author_xml_id = null)
 	{
 		$tobj = null;
-		if($textyle_guestbook_srl>0)
+		if ($textyle_guestbook_srl > 0)
 		{
 			$tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
 		}
@@ -405,9 +405,9 @@ 
 			$tobj->textyle_guestbook_srl = getNextSequence();
 		}
 		$tobj->module_srl = $module_srl;
-		$tobj->is_secret = $val->secret->body=='1'?1:-1;
+		$tobj->is_secret = $val->secret->body == '1' ? 1 : -1;
 		$tobj->content = nl2br($val->content->body);
-		if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+		if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 		{
 			$tobj->password = '';
 			$tobj->nick_name = $member_info->nick_name;
@@ -424,22 +424,22 @@ 
 			$tobj->homepage = $val->commenter->homepage->body;
 			$tobj->member_srl = 0;
 		}
-		$tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+		$tobj->last_update = $tobj->regdate = date("YmdHis", $val->written->body);
 		$tobj->ipaddress = $val->commenter->ip->body;
 
-		if($parent_srl>0)
+		if ($parent_srl > 0)
 		{
 			$tobj->parent_srl = $parent_srl;
 			$tobj->list_order = $tobj->parent_srl * -1;
 		}
 		else
 		{
-			$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
+			$tobj->list_order = $tobj->textyle_guestbook_srl * -1;
 		}
 
 		$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
 
-		if($output->toBool()) return $tobj->textyle_guestbook_srl;
+		if ($output->toBool()) return $tobj->textyle_guestbook_srl;
 		return false;
 	}
 
@@ -456,18 +456,18 @@ 
 	{
 		$uploaded_count = 0;
 
-		$file_obj  = null;
+		$file_obj = null;
 		$file_obj->file_srl = getNextSequence();
 		$file_obj->upload_target_srl = $upload_target_srl;
 		$file_obj->module_srl = $module_srl;
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = fgets($fp, 1024);
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attachment>') break;
+			if (trim($str) == '</attachment>') break;
 			// If it starts with <file>, handle the attachement in the xml file
-			if(substr($str, 0, 9)=='<content>')
+			if (substr($str, 0, 9) == '<content>')
 			{
 				$file_obj->file = $this->saveTemporaryFile($fp, $str);
 				continue;
@@ -475,7 +475,7 @@ 
 
 			$buff .= $str;
 		}
-		if(!file_exists($file_obj->file)) return false;
+		if (!file_exists($file_obj->file)) return false;
 
 		$buff .= '</attachment>';
 
@@ -485,20 +485,20 @@ 
 		$file_obj->download_count = $xmlDoc->attachment->downloads->body;
 		$name = $xmlDoc->attachment->name->body;
 		// Set upload path by checking if the attachement is an image or other kind of file
-		if(preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_obj->source_filename))
+		if (preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_obj->source_filename))
 		{
-			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 			$filename = $path.$file_obj->source_filename;
 			$file_obj->direct_download = 'Y';
 		}
 		else
 		{
-			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
-			$filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
+			$filename = $path.md5(crypt(rand(1000000, 900000), rand(0, 100)));
 			$file_obj->direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return;
+		if (!FileHandler::makeDir($path)) return;
 
 		FileHandler::rename($file_obj->file, $filename);
 		// Insert to the DB
@@ -507,16 +507,16 @@ 
 		$file_obj->file_size = filesize($filename);
 		$file_obj->comment = NULL;
 		$file_obj->member_srl = 0;
-		$file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
+		$file_obj->sid = md5(rand(rand(1111111, 4444444), rand(4444445, 9999999)));
 		$file_obj->isvalid = 'Y';
 		$output = executeQuery('file.insertFile', $file_obj);
 
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$uploaded_count++;
 			$tmp_obj = null;
-			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
-			else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			if ($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
+			else $files[$name]->url = getUrl('', 'module', 'file', 'act', 'procFileDownload', 'file_srl', $file_obj->file_srl, 'sid', $file_obj->sid);
 			$files[$name]->direct_download = $file_obj->direct_download;
 			$files[$name]->source_filename = $file_obj->source_filename;
 			return true;
@@ -532,9 +532,9 @@ 
 	function getTmpFilename()
 	{
 		$path = "./files/cache/importer";
-		if(!is_dir($path)) FileHandler::makeDir($path);
-		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if (!is_dir($path)) FileHandler::makeDir($path);
+		$filename = sprintf("%s/%d", $path, rand(11111111, 99999999));
+		if (file_exists($filename)) $filename .= rand(111, 999);
 		return $filename;
 	}
 
@@ -549,11 +549,11 @@ 
 		$temp_filename = $this->getTmpFilename();
 		$buff = substr($buff, 9);
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
 			$buff .= $str;
-			if(substr($str, -10) == '</content>') break;
+			if (substr($str, -10) == '</content>') break;
 		}
 
 		$buff = substr($buff, 0, -10);
@@ -572,16 +572,16 @@ 
 	function _replaceTTAttach($matches)
 	{
 		$name = $matches[2];
-		if(!$name) return $matches[0];
+		if (!$name) return $matches[0];
 
 		$obj = $this->files[$name];
 		// If multimedia file is,
-		if($obj->direct_download == 'Y')
+		if ($obj->direct_download == 'Y')
 		{
 			// If image file is
-			if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
+			if (preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
 			{
-				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
+				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"', '\\"', $matches[4]));
 				// If other multimedia file but image is, 
 			}
 			else
@@ -603,7 +603,7 @@ 
 	function _replaceTTMovie($matches)
 	{
 		$key = $matches[1];
-		if(!$key) return $matches[0];
+		if (!$key) return $matches[0];
 
 		return 
 			'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
@@ -631,12 +631,12 @@ 
 		$tobj->comment_srl = getNextSequence();
 		$tobj->module_srl = $module_srl;
 		$tobj->document_srl = $document_srl;
-		$tobj->is_secret = $val->secret->body=='1'?'Y':'N';
+		$tobj->is_secret = $val->secret->body == '1' ? 'Y' : 'N';
 		$tobj->notify_message = 'N';
 		$tobj->content = nl2br($val->content->body);
 		$tobj->voted_count = 0;
 		$tobj->status = 1;
-		if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+		if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 		{
 			$tobj->password = '';
 			$tobj->nick_name = $member_info->nick_name;
@@ -653,9 +653,9 @@ 
 			$tobj->homepage = $val->commenter->homepage->body;
 			$tobj->member_srl = 0;
 		}
-		$tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+		$tobj->last_update = $tobj->regdate = date("YmdHis", $val->written->body);
 		$tobj->ipaddress = $val->commenter->ip->body;
-		$tobj->list_order = $tobj->comment_srl*-1;
+		$tobj->list_order = $tobj->comment_srl * -1;
 		$tobj->sequence = $sequence;
 		$tobj->parent_srl = $parent_srl;
 		// Comment list first
@@ -665,7 +665,7 @@ 
 		$list_args->module_srl = $tobj->module_srl;
 		$list_args->regdate = $tobj->regdate;
 		// Set data directly if parent comment doesn't exist
-		if(!$tobj->parent_srl)
+		if (!$tobj->parent_srl)
 		{
 			$list_args->head = $list_args->arrange = $tobj->comment_srl;
 			$list_args->depth = 0;
@@ -677,25 +677,25 @@ 
 			$parent_args->comment_srl = $tobj->parent_srl;
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 			// Return if parent comment doesn't exist
-			if(!$parent_output->toBool() || !$parent_output->data) return false;
+			if (!$parent_output->toBool() || !$parent_output->data) return false;
 			$parent = $parent_output->data;
 
 			$list_args->head = $parent->head;
-			$list_args->depth = $parent->depth+1;
-			if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
+			$list_args->depth = $parent->depth + 1;
+			if ($list_args->depth < 2) $list_args->arrange = $tobj->comment_srl;
 			else
 			{
 				$list_args->arrange = $parent->arrange;
 				$output = executeQuery('comment.updateCommentListArrange', $list_args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 
 		$output = executeQuery('comment.insertCommentList', $list_args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output = executeQuery('comment.insertComment', $tobj);
-			if($output->toBool()) return $tobj->comment_srl;
+			if ($output->toBool()) return $tobj->comment_srl;
 		}
 		return false;
 	}
@@ -710,10 +710,10 @@ 
 	 */
 	function arrangeCategory($obj, &$category, &$idx, $parent = 0)
 	{
-		if(!$obj->category) return;
-		if(!is_array($obj->category)) $c = array($obj->category);
+		if (!$obj->category) return;
+		if (!is_array($obj->category)) $c = array($obj->category);
 		else $c = $obj->category;
-		foreach($c as $val)
+		foreach ($c as $val)
 		{
 			$idx++;
 			$priority = $val->priority->body;

modules/install/install.controller.php

Doc Comments +2 added lines

@@ -545,6 +545,7 @@ 
 
 	/**
 	 * @brief Install an each module
+	 * @param string $module_path
 	 */
 	function installModule($module, $module_path)
 	{
@@ -614,6 +615,7 @@ 
 	/**
 	 * @brief Create etc config file
 	 * Create the config file when all settings are completed
+	 * @param stdClass $config_info
 	 */
 	function makeEtcConfigFile($config_info)
 	{

Indentation +1 added lines, -1 removed lines

@@ -413,7 +413,7 @@
 	 * make a file to files/config and check url approach by ".htaccess" rules
 	 *
 	 * @return bool
-	*/
+	 */
 	function checkRewriteUsable() {
 		$checkString = "isApproached";
 		$checkFilePath = 'files/config/tmpRewriteCheck.txt';

Spacing +118 added lines, -118 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// Error occurs if already installed
-		if($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
+		if ($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
 		{
 			$this->stop('msg_already_installed');
 		}
@@ -86,7 +86,7 @@ 
 	function _procDBSetting()
 	{
 		// Get DB-related variables
-		$con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+		$con_string = Context::gets('db_type', 'db_port', 'db_hostname', 'db_userid', 'db_password', 'db_database', 'db_table_prefix');
 
 		$db_info = new stdClass();
 		$db_info->master_db = get_object_vars($con_string);
@@ -101,13 +101,13 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$output->toBool()) return $output;
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
 			header('location:'.$returnUrl);
@@ -121,13 +121,13 @@ 
 	function procConfigSetting()
 	{
 		// Get variables
-		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		$config_info = Context::gets('use_rewrite', 'time_zone');
+		if ($config_info->use_rewrite != 'Y') $config_info->use_rewrite = 'N';
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
 			header('location:'.$returnUrl);
@@ -141,13 +141,13 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
 		$vars = Context::getRequestVars();
 
-		if(!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
+		if (!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
 		{
 			Context::loadLang('modules/member/lang');
 			$message = Context::getLang('about_password_strength');
@@ -160,15 +160,15 @@ 
 		Context::set('logged_info', $logged_info);
 
 		// check install config
-		if(Context::get('install_config'))
+		if (Context::get('install_config'))
 		{
 			$db_info = $this->_makeDbInfoByInstallConfig();
 		}
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if (FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
+			if (FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
@@ -176,30 +176,30 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
 		try {
 			$oDB->begin();
 			$this->installDownloadedModule();
 			$oDB->commit();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$oDB->rollback();
 			return new BaseObject(-1, $e->getMessage());
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
 		// load script
-		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
-		if(count($scripts)>0)
+		$scripts = FileHandler::readDir(_XE_PATH_.'modules/install/script', '/(\.php)$/');
+		if (count($scripts) > 0)
 		{
 			sort($scripts);
-			foreach($scripts as $script)
+			foreach ($scripts as $script)
 			{
 				$script_path = FileHandler::getRealPath('./modules/install/script/');
-				$output = include($script_path . $script);
+				$output = include($script_path.$script);
 			}
 		}
 
@@ -212,7 +212,7 @@ 
 
 		unset($_SESSION['use_rewrite']);
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
 			header('location:'.$returnUrl);
@@ -242,7 +242,7 @@ 
 		$db_info->use_rewrite = Context::get('use_rewrite');
 		$db_info->time_zone = Context::get('time_zone');
 
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
@@ -252,8 +252,8 @@ 
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if ($http_port) $db_info->http_port = $http_port;
+		if ($https_port) $db_info->https_port = $https_port;
 
 		return $db_info;
 	}
@@ -263,57 +263,57 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
-		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		$ftp_info = Context::gets('ftp_host', 'ftp_user', 'ftp_password', 'ftp_port', 'ftp_root_path');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+		if (!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val));
+			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'", "\\'", $val));
 		}
 
 		// If safe_mode
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
+			if (!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
-			if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
+			if (!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
 			$oFtp->ftp_quit();
@@ -324,31 +324,31 @@ 
 
 	function procInstallCheckFtp()
 	{
-		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		$ftp_info = Context::gets('ftp_user', 'ftp_password', 'ftp_port', 'sftp');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->sftp) $ftp_info->sftp = 'N';
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			$connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-			if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 		}
 		else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if (!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 			$oFtp->ftp_quit();
 		}
@@ -365,36 +365,36 @@ 
 		$checklist = array();
 		// 0. check your version of php (5.2.4 or higher)
 		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
 		{
 			$checklist['php_version'] = false;
 		}
 
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
 		{
 			Context::set('phpversion_warning', true);
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+		if (is_writable('./') || is_writable('./files')) $checklist['permission'] = true;
 		else $checklist['permission'] = false;
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+		if (function_exists('xml_parser_create')) $checklist['xml'] = true;
 		else $checklist['xml'] = false;
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
+		if (ini_get('session.auto_start') != 1) $checklist['session'] = true;
 		else $checklist['session'] = false;
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
+		if (function_exists('iconv')) $checklist['iconv'] = true;
 		else $checklist['iconv'] = false;
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+		if (function_exists('imagecreatefromgif')) $checklist['gd'] = true;
 		else $checklist['gd'] = false;
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
+		if (DB::getEnableList()) $checklist['db'] = true;
 		else $checklist['db'] = false;
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+		if (!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
 		else $install_enable = true;
 
 		// Save the checked result to the Context
@@ -414,7 +414,7 @@ 
 
 		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
 
-		if($license_agreement)
+		if ($license_agreement)
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
@@ -425,7 +425,7 @@ 
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
 		}
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
@@ -448,25 +448,25 @@ 
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
 		$str_port = '';
-		if($port)
+		if ($port)
 		{
-			$str_port = ':' . $port;
+			$str_port = ':'.$port;
 		}
 
 		$tmpPath = $_SERVER['DOCUMENT_ROOT'];
 
 		//if DIRECTORY_SEPARATOR is not /(IIS)
-		if(DIRECTORY_SEPARATOR !== '/')
+		if (DIRECTORY_SEPARATOR !== '/')
 		{
 			//change to slash for compare
 			$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
 		}
 
-		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
+		$query = "/JUST/CHECK/REWRITE/".$checkFilePath;
 		$currentPath = str_replace($tmpPath, "", _XE_PATH_);
-		if($currentPath != "")
+		if ($currentPath != "")
 		{
-			$query = $currentPath . $query;
+			$query = $currentPath.$query;
 		}
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
@@ -491,7 +491,7 @@ 
 			'./files/cache/template_compiled',
 		);
 
-		foreach($directory_list as $dir)
+		foreach ($directory_list as $dir)
 		{
 			FileHandler::makeDir($dir);
 		}
@@ -507,57 +507,57 @@ 
 		$oModuleModel = getModel('module');
 		// Create a table ny finding schemas/*.xml file in each module
 		$module_list = FileHandler::readDir('./modules/', NULL, false, true);
-		foreach($module_list as $module_path)
+		foreach ($module_list as $module_path)
 		{
 			// Get module name
-			$tmp_arr = explode('/',$module_path);
-			$module = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('/', $module_path);
+			$module = $tmp_arr[count($tmp_arr) - 1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if (!$xml_info) continue;
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
-		$this->installModule('module','./modules/module');
+		$this->installModule('module', './modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 		// Determine the order of module installation depending on category
-		$install_step = array('system','content','member');
+		$install_step = array('system', 'content', 'member');
 		// Install all the remaining modules
-		foreach($install_step as $category)
+		foreach ($install_step as $category)
 		{
-			if(count($modules[$category]))
+			if (count($modules[$category]))
 			{
-				foreach($modules[$category] as $module)
+				foreach ($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if ($module == 'module') continue;
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
-					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+					if (is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 					}
 				}
 				unset($modules[$category]);
 			}
 		}
 		// Install all the remaining modules
-		if(count($modules))
+		if (count($modules))
 		{
-			foreach($modules as $category => $module_list)
+			foreach ($modules as $category => $module_list)
 			{
-				if(count($module_list))
+				if (count($module_list))
 				{
-					foreach($module_list as $module)
+					foreach ($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if ($module == 'module') continue;
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
-						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+						if ($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 						}
 					}
 				}
@@ -579,31 +579,31 @@ 
 		$schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
 
 		$file_cnt = count($schema_files);
-		for($i=0;$i<$file_cnt;$i++)
+		for ($i = 0; $i < $file_cnt; $i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if (!$file || substr($file, -4) != '.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
+			if ($output === false)
 				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if (method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
 		return new BaseObject();
 	}
 
 	function _getDBConfigFileContents($db_info)
 	{
-		if(substr($db_info->master_db['db_table_prefix'], -1) != '_')
+		if (substr($db_info->master_db['db_table_prefix'], -1) != '_')
 		{
 			$db_info->master_db['db_table_prefix'] .= '_';
 		}
 
-		foreach($db_info->slave_db as &$slave)
+		foreach ($db_info->slave_db as &$slave)
 		{
-			if(substr($slave['db_table_prefix'], -1) != '_')
+			if (substr($slave['db_table_prefix'], -1) != '_')
 			{
 				$slave['db_table_prefix'] .= '_';
 			}
@@ -611,7 +611,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$db_info = (object)' . var_export(get_object_vars($db_info), TRUE) . ';';
+		$buff[] = '$db_info = (object)'.var_export(get_object_vars($db_info), TRUE).';';
 
 		return implode(PHP_EOL, $buff);
 	}
@@ -625,13 +625,13 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if (!$db_info) return;
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if (@file_exists($db_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -644,14 +644,14 @@ 
 		$etc_tmp_config_file = $this->etc_tmp_config_file;
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n";
-		foreach($config_info as $key => $val)
+		foreach ($config_info as $key => $val)
 		{
-			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if (@file_exists($etc_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -666,13 +666,13 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if (!$db_info) return;
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
 			FileHandler::writeFile($config_file, $buff);
 
-			if(@file_exists($config_file))
+			if (@file_exists($config_file))
 			{
 				FileHandler::removeFile($this->db_tmp_config_file);
 				FileHandler::removeFile($this->etc_tmp_config_file);
@@ -687,7 +687,7 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if (!is_array($auto_config)) return false;
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -695,22 +695,22 @@ 
 		$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
 		$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-		foreach($auto_config as $k => $v)
+		foreach ($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if (!in_array($k, array('host', 'port', 'path'))) $body .= sprintf($fstr, $k, $v, $k);
 		}
 		$body .= "</params>\r\n</methodCall>";
 
-		$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+		$header = sprintf($fheader, $auto_config['path'], $auto_config['host'], strlen($body), $body);
 		$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
 
-		if($fp)
+		if ($fp)
 		{
 			fputs($fp, $header);
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$line = trim(fgets($fp, 4096));
-				if(strncmp('<error>', $line, 7) === 0)
+				if (strncmp('<error>', $line, 7) === 0)
 				{
 					fclose($fp);
 					return false;

Braces +149 added lines, -58 removed lines

@@ -101,11 +101,17 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeDBConfigFile()) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -122,10 +128,14 @@ 
 	{
 		// Get variables
 		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		if($config_info->use_rewrite!='Y') {
+			$config_info->use_rewrite = 'N';
+		}
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeEtcConfigFile($config_info)) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -141,7 +151,9 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new BaseObject(-1, 'msg_already_installed');
+		}
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
@@ -167,8 +179,12 @@ 
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if(FileHandler::exists($this->db_tmp_config_file)) {
+				include $this->db_tmp_config_file;
+			}
+			if(FileHandler::exists($this->etc_tmp_config_file)) {
+				include $this->etc_tmp_config_file;
+			}
 		}
 
 		// Set DB type and information
@@ -176,7 +192,9 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Install all the modules
 		try {
@@ -189,7 +207,9 @@ 
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeConfigFile()) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		// load script
 		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
@@ -246,14 +266,17 @@ 
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
-		}
-		else
+		} else
 		{
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if($http_port) {
+			$db_info->http_port = $http_port;
+		}
+		if($https_port) {
+			$db_info->https_port = $https_port;
+		}
 
 		return $db_info;
 	}
@@ -263,12 +286,20 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new BaseObject(-1, 'msg_already_installed');
+		}
 		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->ftp_host) {
+			$ftp_info->ftp_host = '127.0.0.1';
+		}
+		if(!$ftp_info->ftp_root_path) {
+			$ftp_info->ftp_root_path = '/';
+		}
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
@@ -280,11 +311,15 @@ 
 		// If safe_mode
 		if(ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+				return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			}
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -326,10 +361,16 @@ 
 	{
 		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->sftp) {
+			$ftp_info->sftp = 'N';
+		}
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+			return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		}
 
 		if($ftp_info->sftp == 'Y')
 		{
@@ -338,12 +379,13 @@ 
 			{
 				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
 			}
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -376,26 +418,47 @@ 
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
-		else $checklist['permission'] = false;
+		if(is_writable('./')||is_writable('./files')) {
+			$checklist['permission'] = true;
+		} else {
+			$checklist['permission'] = false;
+		}
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
-		else $checklist['xml'] = false;
+		if(function_exists('xml_parser_create')) {
+			$checklist['xml'] = true;
+		} else {
+			$checklist['xml'] = false;
+		}
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
-		else $checklist['session'] = false;
+		if(ini_get('session.auto_start')!=1) {
+			$checklist['session'] = true;
+		} else {
+			$checklist['session'] = false;
+		}
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
-		else $checklist['iconv'] = false;
+		if(function_exists('iconv')) {
+			$checklist['iconv'] = true;
+		} else {
+			$checklist['iconv'] = false;
+		}
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
-		else $checklist['gd'] = false;
+		if(function_exists('imagecreatefromgif')) {
+			$checklist['gd'] = true;
+		} else {
+			$checklist['gd'] = false;
+		}
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
-		else $checklist['db'] = false;
+		if(DB::getEnableList()) {
+			$checklist['db'] = true;
+		} else {
+			$checklist['db'] = false;
+		}
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
-		else $install_enable = true;
+		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) {
+			$install_enable = false;
+		} else {
+			$install_enable = true;
+		}
 
 		// Save the checked result to the Context
 		Context::set('checklist', $checklist);
@@ -418,8 +481,7 @@ 
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
-		}
-		else
+		} else
 		{
 			FileHandler::removeFile($this->flagLicenseAgreement);
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
@@ -514,13 +576,17 @@ 
 			$module = $tmp_arr[count($tmp_arr)-1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if(!$xml_info) {
+				continue;
+			}
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
 		$this->installModule('module','./modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if($oModule->checkUpdate()) {
+			$oModule->moduleUpdate();
+		}
 		// Determine the order of module installation depending on category
 		$install_step = array('system','content','member');
 		// Install all the remaining modules
@@ -530,13 +596,17 @@ 
 			{
 				foreach($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if($module == 'module') {
+						continue;
+					}
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
 					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if($oModule->checkUpdate()) {
+							$oModule->moduleUpdate();
+						}
 					}
 				}
 				unset($modules[$category]);
@@ -551,13 +621,17 @@ 
 				{
 					foreach($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if($module == 'module') {
+							continue;
+						}
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
 						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if($oModule->checkUpdate()) {
+								$oModule->moduleUpdate();
+							}
 						}
 					}
 				}
@@ -582,15 +656,20 @@ 
 		for($i=0;$i<$file_cnt;$i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if(!$file || substr($file,-4)!='.xml') {
+				continue;
+			}
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
-				throw new Exception('msg_create_table_failed');
+			if($output === false) {
+							throw new Exception('msg_create_table_failed');
+			}
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if(method_exists($oModule, 'moduleInstall')) {
+			$oModule->moduleInstall();
+		}
 		return new BaseObject();
 	}
 
@@ -625,13 +704,17 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if(!$db_info) {
+			return;
+		}
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if(@file_exists($db_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -651,7 +734,9 @@ 
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if(@file_exists($etc_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -666,7 +751,9 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if(!$db_info) {
+				return;
+			}
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
@@ -687,7 +774,9 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if(!is_array($auto_config)) {
+			return false;
+		}
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -697,7 +786,9 @@ 
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
 		foreach($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if(!in_array($k,array('host','port','path'))) {
+				$body .= sprintf($fstr,$k,$v,$k);
+			}
 		}
 		$body .= "</params>\r\n</methodCall>";
 

modules/layout/layout.admin.model.php

Doc Comments +1 added lines, -1 removed lines

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

Braces +10 added lines, -5 removed lines

@@ -115,14 +115,17 @@ 
 		{
 			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
 			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
-		}
-		else
+		} else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if(!file_exists($layout_file)) {
+				$layout_file = $layout_info->path . 'layout.html';
+			}
+			if(!file_exists($layout_css_file)) {
+				$layout_css_file = $layout_info->path . 'layout.css';
+			}
 		}
 
 		if(file_exists($layout_css_file))
@@ -182,7 +185,9 @@ 
 	{
 		$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl);
-		if(FileHandler::exists($designInfoFile)) include($designInfoFile);
+		if(FileHandler::exists($designInfoFile)) {
+			include($designInfoFile);
+		}
 
 		if(!$designInfo || !$designInfo->{$target})
 		{

Spacing +21 added lines, -21 removed lines

@@ -30,27 +30,27 @@ 
 		preg_match_all('/<!--#JSPLUGIN:(.*)-->/', $html, $m);
 		$pluginList = $m[1];
 
-		foreach($pluginList as $plugin)
+		foreach ($pluginList as $plugin)
 		{
 			$info = Context::getJavascriptPluginInfo($plugin);
-			if(!$info)
+			if (!$info)
 			{
 				continue;
 			}
 
-			foreach($info->jsList as $js)
+			foreach ($info->jsList as $js)
 			{
 				$script .= sprintf('<script src="%s"></script>', $js);
 			}
-			foreach($info->cssList as $css)
+			foreach ($info->cssList as $css)
 			{
 				$csss .= sprintf('<link rel="stylesheet" href="%s" />', $css);
 			}
 		}
 
-		$this->add('html', $csss . $script . $html);
+		$this->add('html', $csss.$script.$html);
 
-		if($isReturn)
+		if ($isReturn)
 		{
 			return $this->get('html');
 		}
@@ -65,7 +65,7 @@ 
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 
 		// Error appears if there is no layout information is registered
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -82,14 +82,14 @@ 
 		$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..');
 
 		$layout_info->description = nl2br(trim($layout_info->description));
-		if(!is_object($layout_info->extra_var))
+		if (!is_object($layout_info->extra_var))
 		{
 			$layout_info->extra_var = new StdClass();
 		}
 
-		foreach($layout_info->extra_var as $var_name => $val)
+		foreach ($layout_info->extra_var as $var_name => $val)
 		{
-			if(isset($layout_info->{$var_name}->description))
+			if (isset($layout_info->{$var_name}->description))
 			{
 				$layout_info->{$var_name}->description = nl2br(trim($val->description));
 			}
@@ -105,27 +105,27 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 		// Error appears if there is no layout information is registered
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return $this->dispLayoutAdminInstalledList();
 		}
 
 		// Get Layout Code
-		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
+		if ($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
-			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
+			$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+			$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
 		}
 		else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if (!file_exists($layout_file)) $layout_file = $layout_info->path.'layout.html';
+			if (!file_exists($layout_css_file)) $layout_css_file = $layout_info->path.'layout.css';
 		}
 
-		if(file_exists($layout_css_file))
+		if (file_exists($layout_css_file))
 		{
 			$layout_code_css = FileHandler::readFile($layout_css_file);
 			Context::set('layout_code_css', $layout_code_css);
@@ -181,10 +181,10 @@ 
 	public function getSiteDefaultLayout($viewType = 'P', $siteSrl = 0)
 	{
 		$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
-		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl);
-		if(FileHandler::exists($designInfoFile)) include($designInfoFile);
+		$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $siteSrl);
+		if (FileHandler::exists($designInfoFile)) include($designInfoFile);
 
-		if(!$designInfo || !$designInfo->{$target})
+		if (!$designInfo || !$designInfo->{$target})
 		{
 			return 0;
 		}
@@ -192,7 +192,7 @@ 
 		$oModel = getModel('layout');
 		$layout_info = $oModel->getLayout($designInfo->{$target});
 
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return 0;
 		}

modules/layout/layout.model.php

Doc Comments +4 added lines, -5 removed lines

@@ -435,7 +435,7 @@ 
 	 * It uses caching to reduce time for xml parsing ..
 	 * @param string $layout
 	 * @param object $info
-	 * @param string $layoutType (P : PC, M : Mobile)
+	 * @param string $layout_type (P : PC, M : Mobile)
 	 * @return object info of layout
 	 */
 	function getLayoutInfo($layout, $info = null, $layout_type = "P")
@@ -737,7 +737,7 @@ 
 	/**
 	 * Return a list of images which are uploaded on the layout setting page
 	 * @param int $layout_srl
-	 * @return array image list in layout
+	 * @return string[] image list in layout
 	 */
 	function getUserLayoutImageList($layout_srl)
 	{
@@ -892,7 +892,6 @@ 
 
 	/**
 	 * layout cache
-	 * @param int $layout_srl
 	 * @param string $lang_type
 	 * @return string
 	 */
@@ -972,7 +971,7 @@ 
 	/**
 	 * Temp file list for User Layout
 	 * @param int $layout_srl
-	 * @return array temp files info
+	 * @return string[] temp files info
 	 */
 	function getUserLayoutTempFileList($layout_srl)
 	{
@@ -986,7 +985,7 @@ 
 	/**
 	 * Saved file list for User Layout
 	 * @param int $layout_srl
-	 * @return array files info
+	 * @return string[] files info
 	 */
 	function getUserLayoutFileList($layout_srl)
 	{

Braces +115 added lines, -61 removed lines

@@ -92,16 +92,14 @@ 
 			if(count($token) == 2)
 			{
 				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]);
-			}
-			else
+			} else
 			{
 				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout);
 			}
 			if(is_readable($thumbnailPath))
 			{
 				$val->thumbnail = $thumbnailPath;
-			}
-			else
+			} else
 			{
 				$val->thumbnail = sprintf('./modules/layout/tpl/img/noThumbnail.png');
 			}
@@ -140,8 +138,7 @@ 
 				if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
 				{
 					$instanceList[] = $iInfo->layout;
-				}
-				else
+				} else
 				{
 					unset($output->data[$no]);
 				}
@@ -176,8 +173,7 @@ 
 				$oLayoutAdminController->insertLayout($insertArgs);
 				$isCreateInstance = TRUE;
 			}
-		}
-		else
+		} else
 		{
 			// Get downloaded name list have no instance
 			$noInstanceList = array_diff($downloadedList, $instanceList);
@@ -230,8 +226,7 @@ 
 		{
 			$pathPrefix = _XE_PATH_ . 'layouts/';
 			$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s';
-		}
-		else
+		} else
 		{
 			$pathPrefix = _XE_PATH_ . 'm.layouts/';
 			$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s';
@@ -241,8 +236,7 @@ 
 		{
 			list($themeName, $layoutName) = explode('|@|', $layout);
 			$path = sprintf($themePathFormat, $themeName, $layoutName);
-		}
-		else
+		} else
 		{
 			$path = $pathPrefix . $layout;
 		}
@@ -262,7 +256,9 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		// Return xml file informaton after listing up the layout and extra_vars
 		$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
@@ -295,20 +291,19 @@ 
 		if(count($layout_parse) > 1)
 		{
 			$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
-		}
-		else if($layout_name == 'faceoff')
+		} else if($layout_name == 'faceoff')
 		{
 			$class_path = './modules/layout/faceoff/';
-		}
-		else if($layout_type == "M")
+		} else if($layout_type == "M")
 		{
 			$class_path = sprintf("./m.layouts/%s/", $layout_name);
-		}
-		else
+		} else
 		{
 			$class_path = sprintf('./layouts/%s/', $layout_name);
 		}
-		if(is_dir($class_path)) return $class_path;
+		if(is_dir($class_path)) {
+			return $class_path;
+		}
 		return "";
 	}
 
@@ -321,12 +316,16 @@ 
 	 */
 	function getDownloadedLayoutList($layout_type = "P", $withAutoinstallInfo = false)
 	{
-		if ($withAutoinstallInfo) $oAutoinstallModel = getModel('autoinstall');
+		if ($withAutoinstallInfo) {
+			$oAutoinstallModel = getModel('autoinstall');
+		}
 
 		// Get a list of downloaded layout and installed layout
 		$searched_list = $this->_getInstalledLayoutDirectories($layout_type);
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 
 		// natcasesort($searched_list);
 		// Return information for looping searched list of layouts
@@ -414,17 +413,20 @@ 
 		{
 			$directory = './m.layouts';
 			$globalValueKey = 'MOBILE_LAYOUT_DIRECTOIES';
-		}
-		else
+		} else
 		{
 			$directory = './layouts';
 			$globalValueKey = 'PC_LAYOUT_DIRECTORIES';
 		}
 
-		if($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
+		if($GLOBALS[$globalValueKey]) {
+			return $GLOBALS[$globalValueKey];
+		}
 
 		$searchedList = FileHandler::readDir($directory);
-		if (!$searchedList) $searchedList = array();
+		if (!$searchedList) {
+			$searchedList = array();
+		}
 		$GLOBALS[$globalValueKey] = $searchedList;
 
 		return $searchedList;
@@ -456,11 +458,17 @@ 
 		}
 
 		// Get a path of the requested module. Return if not exists.
-		if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
-		if(!is_dir($layout_path)) return;
+		if(!$layout_path) {
+			$layout_path = $this->getLayoutPath($layout, $layout_type);
+		}
+		if(!is_dir($layout_path)) {
+			return;
+		}
 
 		// Read the xml file for module skin information
-		if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
+		if(!$xml_file) {
+			$xml_file = sprintf("%sconf/info.xml", $layout_path);
+		}
 		if(!file_exists($xml_file))
 		{
 			$layout_info = new stdClass;
@@ -479,8 +487,7 @@ 
 		if(!$layout_srl)
 		{
 			$cache_file = $this->getLayoutCache($layout, Context::getLangType(), $layout_type);
-		}
-		else
+		} else
 		{
 			$cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
 		}
@@ -511,10 +518,15 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 
-		if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-		elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
+		if($tmp_xml_obj->layout) {
+			$xml_obj = $tmp_xml_obj->layout;
+		} elseif($tmp_xml_obj->skin) {
+			$xml_obj = $tmp_xml_obj->skin;
+		}
 
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		$buff = array();
 		$buff[] = '$layout_info = new stdClass;';
@@ -540,8 +552,11 @@ 
 			$buff[] = sprintf('$layout_info->layout_type = "%s";', $layout_type);
 
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			$buff[] = '$layout_info->author = array();';
 			for($i=0, $c=count($author_list); $i<$c; $i++)
@@ -554,8 +569,12 @@ 
 
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if(!$extra_var_groups) {
+				$extra_var_groups = $xml_obj->extra_vars;
+			}
+			if(!is_array($extra_var_groups)) {
+				$extra_var_groups = array($extra_var_groups);
+			}
 
 			$buff[] = '$layout_info->extra_var = new stdClass;';
 			$extra_var_count = 0;
@@ -564,7 +583,9 @@ 
 				$extra_vars = $group->var;
 				if($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if(!is_array($extra_vars)) {
+						$extra_vars = array($extra_vars);
+					}
 
 					$count = count($extra_vars);
 					$extra_var_count += $count;
@@ -583,8 +604,12 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
 
 						$options = $var->options;
-						if(!$options) continue;
-						if(!is_array($options)) $options = array($options);
+						if(!$options) {
+							continue;
+						}
+						if(!is_array($options)) {
+							$options = array($options);
+						}
 
 						$buff[] = sprintf('$layout_info->extra_var->%s->options = array();', $var->attrs->name);
 						$options_count = count($options);
@@ -616,7 +641,9 @@ 
 			if($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if(!is_array($menus)) {
+					$menus = array($menus);
+				}
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = "%s";', $menu_count);
@@ -624,7 +651,9 @@ 
 				for($i=0;$i<$menu_count;$i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					if($menus[$i]->attrs->default == "true") {
+						$buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					}
 					$buff[] = sprintf('$layout_info->menu->%s = new stdClass;', $name);
 					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
 					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
@@ -635,8 +664,7 @@ 
 					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
 				}
 			}
-		}
-		else
+		} else
 		{
 			// Layout title, version and other information
 			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -655,14 +683,20 @@ 
 			$buff[] = sprintf('$layout_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if(!$extra_var_groups) {
+				$extra_var_groups = $xml_obj->extra_vars;
+			}
+			if(!is_array($extra_var_groups)) {
+				$extra_var_groups = array($extra_var_groups);
+			}
 			foreach($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
 				if($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if(!is_array($extra_vars)) {
+						$extra_vars = array($extra_vars);
+					}
 
 					$extra_var_count = count($extra_vars);
 
@@ -680,9 +714,13 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
 
 						$options = $var->options;
-						if(!$options) continue;
+						if(!$options) {
+							continue;
+						}
 
-						if(!is_array($options)) $options = array($options);
+						if(!is_array($options)) {
+							$options = array($options);
+						}
 						$options_count = count($options);
 						for($j=0;$j<$options_count;$j++)
 						{
@@ -695,14 +733,18 @@ 
 			if($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if(!is_array($menus)) {
+					$menus = array($menus);
+				}
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = "%s";', $menu_count);
 				for($i=0;$i<$menu_count;$i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					if($menus[$i]->attrs->default == "true") {
+						$buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					}
 					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";',$name, $name);
 					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
 					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->maxdepth->body);
@@ -724,7 +766,9 @@ 
 		}
 
 		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); ' . join(PHP_EOL, $buff));
-		if(FileHandler::exists($cache_file)) include($cache_file);
+		if(FileHandler::exists($cache_file)) {
+			include($cache_file);
+		}
 
 		if(!$layout_info->title)
 		{
@@ -798,7 +842,9 @@ 
 	 */
 	function getUserLayoutFaceOffCss($layout_srl)
 	{
-		if($this->useUserLayoutTemp == 'temp') return;
+		if($this->useUserLayoutTemp == 'temp') {
+			return;
+		}
 		return $this->_getUserLayoutFaceOffCss($layout_srl);
 	}
 
@@ -833,7 +879,9 @@ 
 		if($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempHtml($layout_srl);
-			if(FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src,$temp);
+			if(FileHandler::exists($temp) === FALSE) {
+				FileHandler::copyFile($src,$temp);
+			}
 			return $temp;
 		}
 
@@ -861,7 +909,9 @@ 
 		if($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempIni($layout_srl);
-			if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+			if(!file_exists(FileHandler::getRealPath($temp))) {
+				FileHandler::copyFile($src,$temp);
+			}
 			return $temp;
 		}
 
@@ -901,8 +951,7 @@ 
 		if($layout_type=='P')
 		{
 			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
-		}
-		else
+		} else
 		{
 			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
 		}
@@ -1020,11 +1069,16 @@ 
 		Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
 		// CSS generated in the layout manager
 		$faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
-		if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+		if($faceoff_layout_css) {
+			Context::addCSSFile($faceoff_layout_css);
+		}
 		// CSS output for the widget
 		Context::loadFile($this->module_path.'/tpl/css/widget.css', true);
-		if($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
-		else Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
+		if($layout_info->extra_var->colorset->value == 'black') {
+			Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
+		} else {
+			Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
+		}
 		// Different page displayed upon user's permission
 		$logged_info = Context::get('logged_info');
 		// Display edit button for faceoff layout

Spacing +150 added lines, -150 removed lines

@@ -31,21 +31,21 @@ 
 	 * @param array $columnList
 	 * @return array layout lists in site
 	 */
-	function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array())
+	function getLayoutList($site_srl = 0, $layout_type = "P", $columnList = array())
 	{
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$args->layout_type = $layout_type;
 		$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
-		foreach($output->data as $no => &$val)
+		foreach ($output->data as $no => &$val)
 		{
-			if(!$this->isExistsLayoutFile($val->layout, $layout_type))
+			if (!$this->isExistsLayoutFile($val->layout, $layout_type))
 			{
 				unset($output->data[$no]);
 			}
@@ -53,7 +53,7 @@ 
 
 		$oLayoutAdminModel = getAdminModel('layout');
 		$siteDefaultLayoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($layout_type, $site_srl);
-		if($siteDefaultLayoutSrl)
+		if ($siteDefaultLayoutSrl)
 		{
 			$siteDefaultLayoutInfo = $this->getlayout($siteDefaultLayoutSrl);
 			$newLayout = sprintf('%s, %s', $siteDefaultLayoutInfo->title, $siteDefaultLayoutInfo->layout);
@@ -80,24 +80,24 @@ 
 		$layoutList = $this->getLayoutInstanceList($siteSrl, $layoutType);
 		$thumbs = array();
 
-		foreach($layoutList as $key => $val)
+		foreach ($layoutList as $key => $val)
 		{
-			if($thumbs[$val->layouts])
+			if ($thumbs[$val->layouts])
 			{
 				$val->thumbnail = $thumbs[$val->layouts];
 				continue;
 			}
 
 			$token = explode('|@|', $val->layout);
-			if(count($token) == 2)
+			if (count($token) == 2)
 			{
-				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]);
+				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png', $token[0], $token[1]);
 			}
 			else
 			{
-				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout);
+				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png', $val->layout);
 			}
-			if(is_readable($thumbnailPath))
+			if (is_readable($thumbnailPath))
 			{
 				$val->thumbnail = $thumbnailPath;
 			}
@@ -123,7 +123,7 @@ 
 		if (!$siteSrl)
 		{
 			$siteModuleInfo = Context::get('site_module_info');
-			$siteSrl = (int)$siteModuleInfo->site_srl;
+			$siteSrl = (int) $siteModuleInfo->site_srl;
 		}
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
@@ -133,11 +133,11 @@ 
 
 		// Create instance name list
 		$instanceList = array();
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $no => $iInfo)
+			foreach ($output->data as $no => $iInfo)
 			{
-				if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
+				if ($this->isExistsLayoutFile($iInfo->layout, $layoutType))
 				{
 					$instanceList[] = $iInfo->layout;
 				}
@@ -152,18 +152,18 @@ 
 		$downloadedList = array();
 		$titleList = array();
 		$_downloadedList = $this->getDownloadedLayoutList($layoutType);
-		if(is_array($_downloadedList))
+		if (is_array($_downloadedList))
 		{
-			foreach($_downloadedList as $dLayoutInfo)
+			foreach ($_downloadedList as $dLayoutInfo)
 			{
 				$downloadedList[$dLayoutInfo->layout] = $dLayoutInfo->layout;
 				$titleList[$dLayoutInfo->layout] = $dLayoutInfo->title;
 			}
 		}
 
-		if($layout)
+		if ($layout)
 		{
-			if(count($instanceList) < 1 && $downloadedList[$layout])
+			if (count($instanceList) < 1 && $downloadedList[$layout])
 			{
 				$insertArgs = new stdClass();
 				$insertArgs->site_srl = $siteSrl;
@@ -181,7 +181,7 @@ 
 		{
 			// Get downloaded name list have no instance
 			$noInstanceList = array_diff($downloadedList, $instanceList);
-			foreach($noInstanceList as $layoutName)
+			foreach ($noInstanceList as $layoutName)
 			{
 				$insertArgs = new stdClass();
 				$insertArgs->site_srl = $siteSrl;
@@ -197,15 +197,15 @@ 
 		}
 
 		// If create layout instance, reload instance list
-		if($isCreateInstance)
+		if ($isCreateInstance)
 		{
 			$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $no => $iInfo)
+				foreach ($output->data as $no => $iInfo)
 				{
-					if(!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
+					if (!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
 					{
 						unset($output->data[$no]);
 					}
@@ -226,28 +226,28 @@ 
 	function isExistsLayoutFile($layout, $layoutType)
 	{
 		//TODO If remove a support themes, remove this codes also.
-		if($layoutType == 'P')
+		if ($layoutType == 'P')
 		{
-			$pathPrefix = _XE_PATH_ . 'layouts/';
-			$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s';
+			$pathPrefix = _XE_PATH_.'layouts/';
+			$themePathFormat = _XE_PATH_.'themes/%s/layouts/%s';
 		}
 		else
 		{
-			$pathPrefix = _XE_PATH_ . 'm.layouts/';
-			$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s';
+			$pathPrefix = _XE_PATH_.'m.layouts/';
+			$themePathFormat = _XE_PATH_.'themes/%s/m.layouts/%s';
 		}
 
-		if(strpos($layout, '|@|') !== FALSE)
+		if (strpos($layout, '|@|') !== FALSE)
 		{
 			list($themeName, $layoutName) = explode('|@|', $layout);
 			$path = sprintf($themePathFormat, $themeName, $layoutName);
 		}
 		else
 		{
-			$path = $pathPrefix . $layout;
+			$path = $pathPrefix.$layout;
 		}
 
-		return is_readable($path . '/layout.html');
+		return is_readable($path.'/layout.html');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		// Return xml file informaton after listing up the layout and extra_vars
 		$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
@@ -275,7 +275,7 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args, $columnList);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
@@ -292,15 +292,15 @@ 
 	function getLayoutPath($layout_name = "", $layout_type = "P")
 	{
 		$layout_parse = explode('|@|', $layout_name);
-		if(count($layout_parse) > 1)
+		if (count($layout_parse) > 1)
 		{
 			$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
 		}
-		else if($layout_name == 'faceoff')
+		else if ($layout_name == 'faceoff')
 		{
 			$class_path = './modules/layout/faceoff/';
 		}
-		else if($layout_type == "M")
+		else if ($layout_type == "M")
 		{
 			$class_path = sprintf("./m.layouts/%s/", $layout_name);
 		}
@@ -308,7 +308,7 @@ 
 		{
 			$class_path = sprintf('./layouts/%s/', $layout_name);
 		}
-		if(is_dir($class_path)) return $class_path;
+		if (is_dir($class_path)) return $class_path;
 		return "";
 	}
 
@@ -326,24 +326,24 @@ 
 		// Get a list of downloaded layout and installed layout
 		$searched_list = $this->_getInstalledLayoutDirectories($layout_type);
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 
 		// natcasesort($searched_list);
 		// Return information for looping searched list of layouts
 		$list = array();
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Name of the layout
 			$layout = $searched_list[$i];
 			// Get information of the layout
 			$layout_info = $this->getLayoutInfo($layout, null, $layout_type);
 
-			if(!$layout_info)
+			if (!$layout_info)
 			{
 				continue;
 			}
 
-			if($withAutoinstallInfo)
+			if ($withAutoinstallInfo)
 			{
 				// get easyinstall remove url
 				$packageSrl = $oAutoinstallModel->getPackageSrlByPath($layout_info->path);
@@ -354,7 +354,7 @@ 
 				$layout_info->need_update = $package[$packageSrl]->need_update;
 
 				// get easyinstall update url
-				if($layout_info->need_update)
+				if ($layout_info->need_update)
 				{
 					$layout_info->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 				}
@@ -371,12 +371,12 @@ 
 	 */
 	function sortLayoutByTitle($a, $b)
 	{
-		if(!$a->title)
+		if (!$a->title)
 		{
 			$a->title = $a->layout;
 		}
 
-		if(!$b->title)
+		if (!$b->title)
 		{
 			$b->title = $b->layout;
 		}
@@ -384,7 +384,7 @@ 
 		$aTitle = strtolower($a->title);
 		$bTitle = strtolower($b->title);
 
-		if($aTitle == $bTitle)
+		if ($aTitle == $bTitle)
 		{
 			return 0;
 		}
@@ -410,7 +410,7 @@ 
 	 */
 	function _getInstalledLayoutDirectories($layoutType = 'P')
 	{
-		if($layoutType == 'M')
+		if ($layoutType == 'M')
 		{
 			$directory = './m.layouts';
 			$globalValueKey = 'MOBILE_LAYOUT_DIRECTOIES';
@@ -421,7 +421,7 @@ 
 			$globalValueKey = 'PC_LAYOUT_DIRECTORIES';
 		}
 
-		if($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
+		if ($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
 
 		$searchedList = FileHandler::readDir($directory);
 		if (!$searchedList) $searchedList = array();
@@ -440,7 +440,7 @@ 
 	 */
 	function getLayoutInfo($layout, $info = null, $layout_type = "P")
 	{
-		if($info)
+		if ($info)
 		{
 			$layout_title = $info->title;
 			$layout = $info->layout;
@@ -448,35 +448,35 @@ 
 			$site_srl = $info->site_srl;
 			$vars = unserialize($info->extra_vars);
 
-			if($info->module_srl)
+			if ($info->module_srl)
 			{
-				$layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/','',$info->layout_path);
+				$layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/', '', $info->layout_path);
 				$xml_file = sprintf('%sskin.xml', $layout_path);
 			}
 		}
 
 		// Get a path of the requested module. Return if not exists.
-		if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
-		if(!is_dir($layout_path)) return;
+		if (!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
+		if (!is_dir($layout_path)) return;
 
 		// Read the xml file for module skin information
-		if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
-		if(!file_exists($xml_file))
+		if (!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
+		if (!file_exists($xml_file))
 		{
 			$layout_info = new stdClass;
 			$layout_info->title = $layout;
 			$layout_info->layout = $layout;
 			$layout_info->path = $layout_path;
 			$layout_info->layout_title = $layout_title;
-			if(!$layout_info->layout_type)
+			if (!$layout_info->layout_type)
 			{
-				$layout_info->layout_type =  $layout_type;
+				$layout_info->layout_type = $layout_type;
 			}
 			return $layout_info;
 		}
 
 		// Include the cache file if it is valid and then return $layout_info variable
-		if(!$layout_srl)
+		if (!$layout_srl)
 		{
 			$cache_file = $this->getLayoutCache($layout, Context::getLangType(), $layout_type);
 		}
@@ -485,22 +485,22 @@ 
 			$cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
 		}
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 
-			if($layout_info->extra_var && $vars)
+			if ($layout_info->extra_var && $vars)
 			{
-				foreach($vars as $key => $value)
+				foreach ($vars as $key => $value)
 				{
-					if(!$layout_info->extra_var->{$key} && !$layout_info->{$key})
+					if (!$layout_info->extra_var->{$key} && !$layout_info->{$key})
 					{
 						$layout_info->{$key} = $value;
 					}
 				}
 			}
 
-			if(!$layout_info->title)
+			if (!$layout_info->title)
 			{
 				$layout_info->title = $layout;
 			}
@@ -511,16 +511,16 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 
-		if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-		elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
+		if ($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
+		elseif ($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
 
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = array();
 		$buff[] = '$layout_info = new stdClass;';
 		$buff[] = sprintf('$layout_info->site_srl = "%s";', $site_srl);
 
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// Layout title, version and other information
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -540,11 +540,11 @@ 
 			$buff[] = sprintf('$layout_info->layout_type = "%s";', $layout_type);
 
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
 			$buff[] = '$layout_info->author = array();';
-			for($i=0, $c=count($author_list); $i<$c; $i++)
+			for ($i = 0, $c = count($author_list); $i < $c; $i++)
 			{
 				$buff[] = sprintf('$layout_info->author[%d] = new stdClass;', $i);
 				$buff[] = sprintf('$layout_info->author[%d]->name = "%s";', $i, $author_list[$i]->name->body);
@@ -554,22 +554,22 @@ 
 
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
 			$buff[] = '$layout_info->extra_var = new stdClass;';
 			$extra_var_count = 0;
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
 					$count = count($extra_vars);
 					$extra_var_count += $count;
 					
-					for($i=0;$i<$count;$i++)
+					for ($i = 0; $i < $count; $i++)
 					{
 						unset($var, $options);
 						$var = $extra_vars[$i];
@@ -580,26 +580,26 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
 						$buff[] = sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
 						$buff[] = sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"', '\"', $var->description->body));
 
 						$options = $var->options;
-						if(!$options) continue;
-						if(!is_array($options)) $options = array($options);
+						if (!$options) continue;
+						if (!is_array($options)) $options = array($options);
 
 						$buff[] = sprintf('$layout_info->extra_var->%s->options = array();', $var->attrs->name);
 						$options_count = count($options);
 						$thumbnail_exist = false;
-						for($j=0; $j < $options_count; $j++)
+						for ($j = 0; $j < $options_count; $j++)
 						{
 							$buff[] = sprintf('$layout_info->extra_var->%s->options["%s"] = new stdClass;', $var->attrs->name, $options[$j]->attrs->value);
 							$thumbnail = $options[$j]->attrs->src;
-							if($thumbnail)
+							if ($thumbnail)
 							{
 								$thumbnail = $layout_path.$thumbnail;
-								if(file_exists($thumbnail))
+								if (file_exists($thumbnail))
 								{
 									$buff[] = sprintf('$layout_info->extra_var->%s->options["%s"]->thumbnail = "%s";', $var->attrs->name, $options[$j]->attrs->value, $thumbnail);
-									if(!$thumbnail_exist)
+									if (!$thumbnail_exist)
 									{
 										$buff[] = sprintf('$layout_info->extra_var->%s->thumbnail_exist = true;', $var->attrs->name);
 										$thumbnail_exist = true;
@@ -613,26 +613,26 @@ 
 			}
 			$buff[] = sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
 			// Menu
-			if($xml_obj->menus->menu)
+			if ($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if (!is_array($menus)) $menus = array($menus);
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = "%s";', $menu_count);
 				$buff[] = '$layout_info->menu = new stdClass;';
-				for($i=0;$i<$menu_count;$i++)
+				for ($i = 0; $i < $menu_count; $i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					if ($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
 					$buff[] = sprintf('$layout_info->menu->%s = new stdClass;', $name);
-					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
-					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
-					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->attrs->maxdepth);
+					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";', $name, $menus[$i]->attrs->name);
+					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";', $name, $menus[$i]->title->body);
+					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";', $name, $menus[$i]->attrs->maxdepth);
 
 					$buff[] = sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";', $name, $name);
 				}
 			}
 		}
@@ -655,19 +655,19 @@ 
 			$buff[] = sprintf('$layout_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-			foreach($extra_var_groups as $group)
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
 					$extra_var_count = count($extra_vars);
 
 					$buff[] = sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
-					for($i=0;$i<$extra_var_count;$i++)
+					for ($i = 0; $i < $extra_var_count; $i++)
 					{
 						unset($var, $options);
 						$var = $extra_vars[$i];
@@ -677,14 +677,14 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
 						$buff[] = sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
 						$buff[] = sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"', '\"', $var->description->body));
 
 						$options = $var->options;
-						if(!$options) continue;
+						if (!$options) continue;
 
-						if(!is_array($options)) $options = array($options);
+						if (!is_array($options)) $options = array($options);
 						$options_count = count($options);
-						for($j=0;$j<$options_count;$j++)
+						for ($j = 0; $j < $options_count; $j++)
 						{
 							$buff[] = sprintf('$layout_info->extra_var->%s->options["%s"]->val = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body);
 						}
@@ -692,23 +692,23 @@ 
 				}
 			}
 			// Menu
-			if($xml_obj->menus->menu)
+			if ($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if (!is_array($menus)) $menus = array($menus);
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = "%s";', $menu_count);
-				for($i=0;$i<$menu_count;$i++)
+				for ($i = 0; $i < $menu_count; $i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
-					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
-					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->maxdepth->body);
+					if ($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";', $name, $menus[$i]->title->body);
+					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";', $name, $menus[$i]->maxdepth->body);
 					$buff[] = sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";', $name, $name);
 				}
 			}
 		}
@@ -718,15 +718,15 @@ 
 		$layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
 		$header_script = trim($layout_config->header_script);
 
-		if($header_script)
+		if ($header_script)
 		{
 			$buff[] = sprintf(' $layout_info->header_script = %s; ', var_export($header_script, true));
 		}
 
-		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); ' . join(PHP_EOL, $buff));
-		if(FileHandler::exists($cache_file)) include($cache_file);
+		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); '.join(PHP_EOL, $buff));
+		if (FileHandler::exists($cache_file)) include($cache_file);
 
-		if(!$layout_info->title)
+		if (!$layout_info->title)
 		{
 			$layout_info->title = $layout;
 		}
@@ -750,12 +750,12 @@ 
 	 * @param string $layout_name
 	 * @return array
 	 */
-	function getUserLayoutIniConfig($layout_srl, $layout_name=null)
+	function getUserLayoutIniConfig($layout_srl, $layout_name = null)
 	{
 		$file = $this->getUserLayoutIni($layout_srl);
-		if($layout_name && FileHandler::exists($file) === FALSE)
+		if ($layout_name && FileHandler::exists($file) === FALSE)
 		{
-			FileHandler::copyFile($this->getDefaultLayoutIni($layout_name),$this->getUserLayoutIni($layout_srl));
+			FileHandler::copyFile($this->getDefaultLayoutIni($layout_name), $this->getUserLayoutIni($layout_srl));
 		}
 
 		return FileHandler::readIniFile($file);
@@ -768,7 +768,7 @@ 
 	 */
 	function getUserLayoutPath($layout_srl)
 	{
-		return sprintf("./files/faceOff/%s", getNumberingPath($layout_srl,3));
+		return sprintf("./files/faceOff/%s", getNumberingPath($layout_srl, 3));
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	function getUserLayoutImagePath($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'images/';
+		return $this->getUserLayoutPath($layout_srl).'images/';
 	}
 
 	/**
@@ -788,7 +788,7 @@ 
 	 */
 	function getUserLayoutCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'layout.css';
+		return $this->getUserLayoutPath($layout_srl).'layout.css';
 	}
 
 	/**
@@ -798,7 +798,7 @@ 
 	 */
 	function getUserLayoutFaceOffCss($layout_srl)
 	{
-		if($this->useUserLayoutTemp == 'temp') return;
+		if ($this->useUserLayoutTemp == 'temp') return;
 		return $this->_getUserLayoutFaceOffCss($layout_srl);
 	}
 
@@ -809,7 +809,7 @@ 
 	 */
 	function _getUserLayoutFaceOffCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
+		return $this->getUserLayoutPath($layout_srl).'faceoff.css';
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 */
 	function getUserLayoutTempFaceOffCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
+		return $this->getUserLayoutPath($layout_srl).'tmp.faceoff.css';
 	}
 
 	/**
@@ -829,11 +829,11 @@ 
 	 */
 	function getUserLayoutHtml($layout_srl)
 	{
-		$src = $this->getUserLayoutPath($layout_srl). 'layout.html';
-		if($this->useUserLayoutTemp == 'temp')
+		$src = $this->getUserLayoutPath($layout_srl).'layout.html';
+		if ($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempHtml($layout_srl);
-			if(FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src,$temp);
+			if (FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src, $temp);
 			return $temp;
 		}
 
@@ -847,7 +847,7 @@ 
 	 */
 	function getUserLayoutTempHtml($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
+		return $this->getUserLayoutPath($layout_srl).'tmp.layout.html';
 	}
 
 	/**
@@ -857,11 +857,11 @@ 
 	 */
 	function getUserLayoutIni($layout_srl)
 	{
-		$src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
-		if($this->useUserLayoutTemp == 'temp')
+		$src = $this->getUserLayoutPath($layout_srl).'layout.ini';
+		if ($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempIni($layout_srl);
-			if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+			if (!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src, $temp);
 			return $temp;
 		}
 
@@ -875,7 +875,7 @@ 
 	 */
 	function getUserLayoutTempIni($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.layout.ini';
+		return $this->getUserLayoutPath($layout_srl).'tmp.layout.ini';
 	}
 
 	/**
@@ -885,9 +885,9 @@ 
 	 * @param string $lang_type
 	 * @return string
 	 */
-	function getUserLayoutCache($layout_srl,$lang_type)
+	function getUserLayoutCache($layout_srl, $lang_type)
 	{
-		return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
+		return $this->getUserLayoutPath($layout_srl)."{$lang_type}.cache.php";
 	}
 
 	/**
@@ -896,15 +896,15 @@ 
 	 * @param string $lang_type
 	 * @return string
 	 */
-	function getLayoutCache($layout_name,$lang_type,$layout_type='P')
+	function getLayoutCache($layout_name, $lang_type, $layout_type = 'P')
 	{
-		if($layout_type=='P')
+		if ($layout_type == 'P')
 		{
-			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name, $lang_type);
 		}
 		else
 		{
-			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name, $lang_type);
 		}
 	}
 
@@ -915,7 +915,7 @@ 
 	 */
 	function getDefaultLayoutIni($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
+		return $this->getDefaultLayoutPath($layout_name).'layout.ini';
 	}
 
 	/**
@@ -925,7 +925,7 @@ 
 	 */
 	function getDefaultLayoutHtml($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'layout.html';
+		return $this->getDefaultLayoutPath($layout_name).'layout.html';
 	}
 
 	/**
@@ -935,7 +935,7 @@ 
 	 */
 	function getDefaultLayoutCss($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
+		return $this->getDefaultLayoutPath($layout_name).'css/layout.css';
 	}
 
 	/**
@@ -964,7 +964,7 @@ 
 	 * @param string $flag (default 'temp')
 	 * @return void
 	 */
-	function setUseUserLayoutTemp($flag='temp')
+	function setUseUserLayoutTemp($flag = 'temp')
 	{
 		$this->useUserLayoutTemp = $flag;
 	}
@@ -998,11 +998,11 @@ 
 		);
 
 		$image_path = $this->getUserLayoutImagePath($layout_srl);
-		$image_list = FileHandler::readDir($image_path,'/(.*(?:jpg|jpeg|gif|bmp|png)$)/i');
+		$image_list = FileHandler::readDir($image_path, '/(.*(?:jpg|jpeg|gif|bmp|png)$)/i');
 
-		foreach($image_list as $image)
+		foreach ($image_list as $image)
 		{
-			$file_list[] = 'images/' . $image;
+			$file_list[] = 'images/'.$image;
 		}
 		return $file_list;
 	}
@@ -1020,20 +1020,20 @@ 
 		Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
 		// CSS generated in the layout manager
 		$faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
-		if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+		if ($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
 		// CSS output for the widget
 		Context::loadFile($this->module_path.'/tpl/css/widget.css', true);
-		if($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
+		if ($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
 		else Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
 		// Different page displayed upon user's permission
 		$logged_info = Context::get('logged_info');
 		// Display edit button for faceoff layout
-		if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
+		if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
-			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
+			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('', 'mid', Context::get('mid'), 'act', 'dispLayoutAdminLayoutModify', 'delete_tmp', 'Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
 		}
 		// Display menu when editing the faceOff page
-		if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
+		if (Context::get('act') == 'dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
 			$oTemplate = &TemplateHandler::getInstance();
 			Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));

modules/member/member.api.php

Doc Comments +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 	/**
 	 * Arrange Contents
 	 *
-	 * @param array $content_list
+	 * @param string $content_list
 	 *
 	 * @return array
 	 */
@@ -41,7 +41,7 @@ 
 	/**
 	 * Arrange Contents
 	 *
-	 * @param array $content_list
+	 * @param array $content
 	 *
 	 * @return array
 	 */

Spacing +6 added lines, -6 removed lines

@@ -17,8 +17,8 @@ 
 	function dispSavedDocumentList(&$oModule)
 	{
 		$document_list = $this->arrangeContentList(Context::get('document_list'));
-		$oModule->add('document_list',$document_list);
-		$oModule->add('page_navigation',Context::get('page_navigation'));
+		$oModule->add('document_list', $document_list);
+		$oModule->add('page_navigation', Context::get('page_navigation'));
 	}
 
 	/**
@@ -31,9 +31,9 @@ 
 	function arrangeContentList($content_list)
 	{
 		$output = array();
-		if(count($content_list))
+		if (count($content_list))
 		{
-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);
+			foreach ($content_list as $key => $val) $output[] = $this->arrangeContent($val);
 		}
 		return $output;
 	}
@@ -48,9 +48,9 @@ 
 	function arrangeContent($content)
 	{
 		$output = null;
-		if($content)
+		if ($content)
 		{
-			$output= $content->gets('document_srl','category_srl','nick_name','user_id','user_name','title','content','tags','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars','status');
+			$output = $content->gets('document_srl', 'category_srl', 'nick_name', 'user_id', 'user_name', 'title', 'content', 'tags', 'voted_count', 'blamed_count', 'comment_count', 'regdate', 'last_update', 'extra_vars', 'status');
 		}
 		return $output;
 	}

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 		$output = array();
 		if(count($content_list))
 		{
-			foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);
+			foreach($content_list as $key => $val) {
+				$output[] = $this->arrangeContent($val);
+			}
 		}
 		return $output;
 	}

modules/member/member.model.php

Doc Comments +1 added lines

@@ -297,6 +297,7 @@
 
 	/**
 	 * @brief Return member information with member_srl
+	 * @param string $member_srl
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{

Spacing +178 added lines, -178 removed lines

@@ -26,7 +26,7 @@ 
 	{
 		static $member_config;
 
-		if($member_config)
+		if ($member_config)
 		{
 			return $member_config;
 		}
@@ -35,47 +35,47 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
-		if(!$config->signupForm || !is_array($config->signupForm))
+		if (!$config->signupForm || !is_array($config->signupForm))
 		{
 			$oMemberAdminController = getAdminController('member');
 			$identifier = ($config->identifier) ? $config->identifier : 'email_address';
 			$config->signupForm = $oMemberAdminController->createSignupForm($identifier);
 		}
 		//for multi language
-		foreach($config->signupForm AS $key=>$value)
+		foreach ($config->signupForm AS $key=>$value)
 		{
 			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
+			if ($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
+			if ($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
 		}
 
 		// Get terms of user
 		$config->agreement = memberModel::_getAgreement();
 
-		if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
+		if (!$config->webmaster_name) $config->webmaster_name = 'webmaster';
 
-		if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-		if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-		if(!$config->image_name_max_filesize) $config->image_name_max_filesize = null;
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		if(!$config->image_mark_max_filesize) $config->image_mark_max_filesize = null;
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = 90;
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
-		if(!$config->profile_image_max_filesize) $config->profile_image_max_filesize = null;
+		if (!$config->image_name_max_width) $config->image_name_max_width = 90;
+		if (!$config->image_name_max_height) $config->image_name_max_height = 20;
+		if (!$config->image_name_max_filesize) $config->image_name_max_filesize = null;
+		if (!$config->image_mark_max_width) $config->image_mark_max_width = 20;
+		if (!$config->image_mark_max_height) $config->image_mark_max_height = 20;
+		if (!$config->image_mark_max_filesize) $config->image_mark_max_filesize = null;
+		if (!$config->profile_image_max_width) $config->profile_image_max_width = 90;
+		if (!$config->profile_image_max_height) $config->profile_image_max_height = 90;
+		if (!$config->profile_image_max_filesize) $config->profile_image_max_filesize = null;
 
-		if(!$config->skin) $config->skin = 'default';
-		if(!$config->colorset) $config->colorset = 'white';
-		if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
-		if(!$config->group_image_mark) $config->group_image_mark = "N";
+		if (!$config->skin) $config->skin = 'default';
+		if (!$config->colorset) $config->colorset = 'white';
+		if (!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
+		if (!$config->group_image_mark) $config->group_image_mark = "N";
 
-		if(!$config->identifier) $config->identifier = 'user_id';
+		if (!$config->identifier) $config->identifier = 'user_id';
 
-		if(!$config->max_error_count) $config->max_error_count = 10;
-		if(!$config->max_error_count_time) $config->max_error_count_time = 300;
+		if (!$config->max_error_count) $config->max_error_count = 10;
+		if (!$config->max_error_count_time) $config->max_error_count_time = 300;
 
-		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
-		if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
+		if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
+		if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
 
 		$member_config = $config;
 
@@ -84,24 +84,24 @@ 
 
 	function _getAgreement()
 	{
-		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
-		if(is_readable($agreement_file))
+		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
+		if (is_readable($agreement_file))
 		{
 			return FileHandler::readFile($agreement_file);
 		}
 
 		$db_info = Context::getDBInfo();
-		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt';
-		if(is_readable($agreement_file))
+		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.$db_info->lang_type.'.txt';
+		if (is_readable($agreement_file))
 		{
 			return FileHandler::readFile($agreement_file);
 		}
 
 		$lang_selected = Context::loadLangSelected();
-		foreach($lang_selected as $key => $val)
+		foreach ($lang_selected as $key => $val)
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $key . '.txt';
-			if(is_readable($agreement_file))
+			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.$key.'.txt';
+			if (is_readable($agreement_file))
 			{
 				return FileHandler::readFile($agreement_file);
 			}
@@ -121,12 +121,12 @@ 
 		$logged_info = Context::get('logged_info');
 		$act = Context::get('cur_act');
 		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+		if ($member_srl == $logged_info->member_srl) $member_info = $logged_info;
 		// When click other's nickname
 		else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
 
 		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
+		if (!$member_srl) return;
 		// List variables
 		$user_id = $member_info->user_id;
 		$user_name = $member_info->user_name;
@@ -135,18 +135,18 @@ 
 
 		$oMemberController = getController('member');
 		// Display member information (Don't display to non-logged user)
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
-			$url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
+			$url = getUrl('', 'mid', $mid, 'act', 'dispMemberInfo', 'member_srl', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_view_member_info', $icon_path, 'self');
 		}
 		// When click other's nickname
-		if($member_srl != $logged_info->member_srl && $logged_info->member_srl)
+		if ($member_srl != $logged_info->member_srl && $logged_info->member_srl)
 		{
 			// Get email config
-			foreach($this->module_config->signupForm as $field)
+			foreach ($this->module_config->signupForm as $field)
 			{
-				if($field->name == 'email_address')
+				if ($field->name == 'email_address')
 				{
 					$email_config = $field;
 					break;
@@ -154,36 +154,36 @@ 
 			}
 
 			// Send an email only if email address is public
-			if(($logged_info->is_admin == 'Y' || $email_config->isPublic == 'Y') && $member_info->email_address)
+			if (($logged_info->is_admin == 'Y' || $email_config->isPublic == 'Y') && $member_info->email_address)
 			{
 				$url = 'mailto:'.escape($member_info->email_address, false);
-				$oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path);
+				$oMemberController->addMemberPopupMenu($url, 'cmd_send_email', $icon_path);
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
+		if ($member_info->homepage)
 			$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank');
 		// View blog info
-		if($member_info->blog)
+		if ($member_info->blog)
 			$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			$url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_manage_member_info', $icon_path, 'MemberModifyInfo');
 
-			$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'member_srl', 'search_keyword', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_trace_document', $icon_path, 'TraceMemberDocument');
 
-			$url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'member_srl', 'search_keyword', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_trace_comment', $icon_path, 'TraceMemberComment');
 		}
 		// Change a language of pop-up menu
 		$menus = Context::get('member_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -195,16 +195,16 @@ 
 	 * @brief Check if logged-in
 	 */
 	function isLogged() {
-		if($_SESSION['is_logged'])
+		if ($_SESSION['is_logged'])
 		{
-			if(Mobile::isFromMobilePhone())
+			if (Mobile::isFromMobilePhone())
 			{
 				return true;
 			}
-			elseif(filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+			elseif (filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
 			{
 				// IPv6: require same /48
-				if(strncmp(inet_pton($_SESSION['ipaddress']), inet_pton($_SERVER['REMOTE_ADDR']), 6) == 0)
+				if (strncmp(inet_pton($_SESSION['ipaddress']), inet_pton($_SERVER['REMOTE_ADDR']), 6) == 0)
 				{
 					return true;
 				}
@@ -212,7 +212,7 @@ 
 			else
 			{
 				// IPv4: require same /24
-				if(ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
+				if (ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
 				{
 					return true;
 				}
@@ -229,23 +229,23 @@ 
 	function getLoggedInfo()
 	{
 		// Return session info if session info is requested and the user is logged-in
-		if($this->isLogged())
+		if ($this->isLogged())
 		{
 			$logged_info = Context::get('logged_info');
 			// Admin/Group list defined depending on site_module_info
 			$site_module_info = Context::get('site_module_info');
-			if($site_module_info->site_srl)
+			if ($site_module_info->site_srl)
 			{
 				$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
 				// Add is_site_admin bool variable into logged_info if site_administrator is
 				$oModuleModel = getModel('module');
-				if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
+				if ($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
 				else $logged_info->is_site_admin = false;
 			}
 			else
 			{
 				// Register a default group if the site doesn't have a member group
-				if(count($logged_info->group_list) === 0)
+				if (count($logged_info->group_list) === 0)
 				{
 					$default_group = $this->getDefaultGroup(0);
 					$oMemberController = getController('member');
@@ -268,13 +268,13 @@ 
 	 */
 	function getMemberInfoByUserID($user_id, $columnList = array())
 	{
-		if(!$user_id) return;
+		if (!$user_id) return;
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
 		$output = executeQuery('member.getMemberInfo', $args);
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if (!$output->toBool()) return $output;
+		if (!$output->data) return;
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 
@@ -286,12 +286,12 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if (!$email_address) return;
 
 		$args = new stdClass();
 		
-		$db_info = Context::getDBInfo ();
-		if($db_info->master_db['db_type'] == "cubrid")
+		$db_info = Context::getDBInfo();
+		if ($db_info->master_db['db_type'] == "cubrid")
 		{
 			$args->email_address = strtolower($email_address);
 			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
@@ -302,8 +302,8 @@ 
 			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		}
 		
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if (!$output->toBool()) return $output;
+		if (!$output->data) return;
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 		return $member_info;
@@ -314,36 +314,36 @@ 
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{
-		if(!$member_srl) return;
+		if (!$member_srl) return;
 
 		//columnList size zero... get full member info
-		if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
+		if (!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
 		{
 			$GLOBALS['__member_info__'][$member_srl] = false;
 
 			$oCacheHandler = CacheHandler::getInstance('object');
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$columnList = array();
-				$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
+				$object_key = 'member_info:'.getNumberingPath($member_srl).$member_srl;
 				$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 				$GLOBALS['__member_info__'][$member_srl] = $oCacheHandler->get($cache_key);
 			}
 
-			if($GLOBALS['__member_info__'][$member_srl] === false)
+			if ($GLOBALS['__member_info__'][$member_srl] === false)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
 				$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
-				if(!$output->data) 
+				if (!$output->data) 
 				{
-					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
+					if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
 					return;
 				}
 				$this->arrangeMemberInfo($output->data, $site_srl);
 
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
 			}
 		}
 
@@ -355,7 +355,7 @@ 
 	 */
 	function arrangeMemberInfo($info, $site_srl = 0)
 	{
-		if(!$GLOBALS['__member_info__'][$info->member_srl])
+		if (!$GLOBALS['__member_info__'][$info->member_srl])
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
@@ -364,25 +364,25 @@ 
 			$info->profile_image = $this->getProfileImage($info->member_srl);
 			$info->image_name = $this->getImageName($info->member_srl);
 			$info->image_mark = $this->getImageMark($info->member_srl);
-			if($config->group_image_mark=='Y')
+			if ($config->group_image_mark == 'Y')
 			{
-				$info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
+				$info->group_mark = $this->getGroupImageMark($info->member_srl, $site_srl);
 			}
 			$info->signature = $this->getSignature($info->member_srl);
 			$info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
 
 			$extra_vars = unserialize($info->extra_vars);
 			unset($info->extra_vars);
-			if($extra_vars)
+			if ($extra_vars)
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
-					if(!$info->{$key}) $info->{$key} = $val;
+					if (!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
+					if (!$info->{$key}) $info->{$key} = $val;
 				}
 			}
 
-			if(strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
+			if (strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
 			{
 				$info->find_account_answer = null;
 			}
@@ -394,13 +394,13 @@ 
 			$info->homepage = strip_tags($info->homepage);
 			$info->blog = strip_tags($info->blog);
 
-			if($extra_vars)
+			if ($extra_vars)
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(is_array($val))
+					if (is_array($val))
 					{
-						$oSecurity->encodeHTML($key . '.');
+						$oSecurity->encodeHTML($key.'.');
 					}
 					else
 					{
@@ -411,12 +411,12 @@ 
 
 			// Check format.
 			$oValidator = new Validator();
-			if(!$oValidator->applyRule('url', $info->homepage))
+			if (!$oValidator->applyRule('url', $info->homepage))
 			{
 				$info->homepage = '';
 			}
 
-			if(!$oValidator->applyRule('url', $info->blog))
+			if (!$oValidator->applyRule('url', $info->blog))
 			{
 				$info->blog = '';
 			}
@@ -465,7 +465,7 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		return $_SESSION['member_srl'];
 	}
 
@@ -474,7 +474,7 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -489,16 +489,16 @@ 
 		// cache controll
 		$group_list = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_'.$site_srl;
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$group_list = $oCacheHandler->get($cache_key);
 		}
 
-		if(!$member_groups[$member_srl][$site_srl] || $force_reload)
+		if (!$member_groups[$member_srl][$site_srl] || $force_reload)
 		{
-			if($group_list === false)
+			if ($group_list === false)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
@@ -506,11 +506,11 @@ 
 				$output = executeQueryArray('member.getMemberGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
 			}
-			if(!$group_list) return array();
+			if (!$group_list) return array();
 
-			foreach($group_list as $group)
+			foreach ($group_list as $group)
 			{
 				$result[$group->group_srl] = $group->title;
 			}
@@ -524,14 +524,14 @@ 
 	 */
 	function getMembersGroups($member_srls, $site_srl = 0)
 	{
-		$args->member_srls = implode(',',$member_srls);
+		$args->member_srls = implode(',', $member_srls);
 		$args->site_srl = $site_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQueryArray('member.getMembersGroups', $args);
-		if(!$output->data) return array();
+		if (!$output->data) return array();
 
 		$result = array();
-		foreach($output->data as $key=>$val)
+		foreach ($output->data as $key=>$val)
 		{
 			$result[$val->member_srl][] = $val->title;
 		}
@@ -545,21 +545,21 @@ 
 	{
 		$default_group = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$columnList = array();
-			$object_key = 'default_group_' . $site_srl;
+			$object_key = 'default_group_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$default_group = $oCacheHandler->get($cache_key);
 		}
 
-		if($default_group === false)
+		if ($default_group === false)
 		{
 			$args = new stdClass();
 			$args->site_srl = $site_srl;
 			$output = executeQuery('member.getDefaultGroup', $args, $columnList);
 			$default_group = $output->data;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $default_group);
 			}
@@ -593,25 +593,25 @@ 
 	 */
 	function getGroups($site_srl = 0)
 	{
-		if(!$GLOBALS['__group_info__'][$site_srl])
+		if (!$GLOBALS['__group_info__'][$site_srl])
 		{
 			$result = array();
 
-			if(!isset($site_srl))
+			if (!isset($site_srl))
 			{
 				$site_srl = 0;
 			}
 
 			$group_list = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$object_key = 'member_groups:site_'.$site_srl;
 				$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 				$group_list = $oCacheHandler->get($cache_key);
 			}
 
-			if($group_list === false)
+			if ($group_list === false)
 			{
 				$args = new stdClass();
 				$args->site_srl = $site_srl;
@@ -620,16 +620,16 @@ 
 				$output = executeQueryArray('member.getGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
 			}
 
-			if(!$group_list)
+			if (!$group_list)
 			{
 				return array();
 			}
 
 
-			foreach($group_list as $val)
+			foreach ($group_list as $val)
 			{
 				$result[$val->group_srl] = $val;
 			}
@@ -660,7 +660,7 @@ 
 		// Set to ignore if a super administrator.
 		$logged_info = Context::get('logged_info');
 
-		if(!$this->join_form_list)
+		if (!$this->join_form_list)
 		{
 			// Argument setting to sort list_order column
 			$args = new stdClass();
@@ -668,11 +668,11 @@ 
 			$output = executeQuery('member.getJoinFormList', $args);
 			// NULL if output data deosn't exist
 			$join_form_list = $output->data;
-			if(!$join_form_list) return NULL;
+			if (!$join_form_list) return NULL;
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
-			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+			if (!is_array($join_form_list)) $join_form_list = array($join_form_list);
 			$join_form_count = count($join_form_list);
-			for($i=0;$i<$join_form_count;$i++)
+			for ($i = 0; $i < $join_form_count; $i++)
 			{
 				$join_form_list[$i]->column_name = strtolower($join_form_list[$i]->column_name);
 
@@ -684,10 +684,10 @@ 
 				// Add language variable
 				$lang->extend_vars[$column_name] = $column_title;
 				// unserialize if the data type if checkbox, select and so on
-				if(in_array($column_type, array('checkbox','select','radio')))
+				if (in_array($column_type, array('checkbox', 'select', 'radio')))
 				{
 					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
+					if (!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
 				}
 				else
 				{
@@ -699,16 +699,16 @@ 
 			$this->join_form_list = $list;
 		}
 		// Get object style if the filter_response is true
-		if($filter_response && count($this->join_form_list))
+		if ($filter_response && count($this->join_form_list))
 		{
-			foreach($this->join_form_list as $key => $val)
+			foreach ($this->join_form_list as $key => $val)
 			{
-				if($val->is_active != 'Y') continue;
+				if ($val->is_active != 'Y') continue;
 				unset($obj);
 				$obj->type = $val->column_type;
 				$obj->name = $val->column_name;
 				$obj->lang = $val->column_title;
-				if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
+				if ($logged_info->is_admin != 'Y') $obj->required = $val->required == 'Y' ?true:false;
 				else $obj->required = false;
 				$filter_output[] = $obj;
 
@@ -735,15 +735,15 @@ 
 		$args->sort_index = "list_order";
 		$output = executeQueryArray('member.getJoinFormList', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return array();
 		}
 
 		$joinFormList = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
-			if($val->is_active != 'Y')
+			if ($val->is_active != 'Y')
 			{
 				continue;
 			}
@@ -760,20 +760,20 @@ 
 	function getCombineJoinForm($member_info)
 	{
 		$extend_form_list = $this->getJoinFormlist();
-		if(!$extend_form_list) return;
+		if (!$extend_form_list) return;
 		// Member info is open only to an administrator and him/herself when is_private is true.
 		$logged_info = Context::get('logged_info');
 
-		foreach($extend_form_list as $srl => $item)
+		foreach ($extend_form_list as $srl => $item)
 		{
 			$column_name = $item->column_name;
 			$value = $member_info->{$column_name};
 
 			// Change values depening on the type of extend form
-			switch($item->column_type)
+			switch ($item->column_type)
 			{
 				case 'checkbox' :
-					if($value && !is_array($value)) $value = array($value);
+					if ($value && !is_array($value)) $value = array($value);
 					break;
 				case 'text' :
 				case 'homepage' :
@@ -787,7 +787,7 @@ 
 
 			$extend_form_list[$srl]->value = $value;
 
-			if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
+			if ($member_info->{'open_'.$column_name} == 'Y') $extend_form_list[$srl]->is_opened = true;
 			else $extend_form_list[$srl]->is_opened = false;
 		}
 		return $extend_form_list;
@@ -801,12 +801,12 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
-		if(!$join_form) return NULL;
+		if (!$join_form) return NULL;
 
 		$column_type = $join_form->column_type;
 		$default_value = $join_form->default_value;
 
-		if(in_array($column_type, array('checkbox','select','radio')))
+		if (in_array($column_type, array('checkbox', 'select', 'radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
 		}
@@ -823,7 +823,7 @@ 
 	 */
 	function getDeniedIDList()
 	{
-		if(!$this->denied_id_list)
+		if (!$this->denied_id_list)
 		{
 			$args->sort_index = "list_order";
 			$args->page = Context::get('page');
@@ -839,14 +839,14 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 		return $output->data;
 	}
 
 	function getDeniedNickNames()
 	{
 		$output = executeQueryArray('member.getDeniedNickNames');
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return array();
 		}
@@ -862,7 +862,7 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$output = executeQuery('member.chkDeniedID', $args);
-		if($output->data->count) return true;
+		if ($output->data->count) return true;
 		return false;
 	}
 
@@ -874,8 +874,8 @@ 
 		$args = new stdClass();
 		$args->nick_name = $nickName;
 		$output = executeQuery('member.chkDeniedNickName', $args);
-		if($output->data->count) return true;
-		if(!$output->toBool())
+		if ($output->data->count) return true;
+		if (!$output->toBool())
 		{
 			return true;
 		}
@@ -886,20 +886,20 @@ 
 	 */
 	function getProfileImage($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
 		{
 			$GLOBALS['__member_info__']['profile_image'][$member_srl] = null;
-			$exts = array('gif','jpg','png');
-			for($i=0;$i<3;$i++)
+			$exts = array('gif', 'jpg', 'png');
+			for ($i = 0; $i < 3; $i++)
 			{
 				$image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $exts[$i]);
-				if(file_exists($image_name_file))
+				if (file_exists($image_name_file))
 				{
 					list($width, $height, $type, $attrs) = getimagesize($image_name_file);
 					$info = new stdClass();
 					$info->width = $width;
 					$info->height = $height;
-					$info->src = Context::getRequestUri().$image_name_file . '?' . date('YmdHis', filemtime($image_name_file));
+					$info->src = Context::getRequestUri().$image_name_file.'?'.date('YmdHis', filemtime($image_name_file));
 					$info->file = './'.$image_name_file;
 					$GLOBALS['__member_info__']['profile_image'][$member_srl] = $info;
 					break;
@@ -915,16 +915,16 @@ 
 	 */
 	function getImageName($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
 		{
 			$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($image_name_file))
+			if (file_exists($image_name_file))
 			{
 				list($width, $height, $type, $attrs) = getimagesize($image_name_file);
 				$info = new stdClass;
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = Context::getRequestUri().$image_name_file. '?' . date('YmdHis', filemtime($image_name_file));
+				$info->src = Context::getRequestUri().$image_name_file.'?'.date('YmdHis', filemtime($image_name_file));
 				$info->file = './'.$image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
 			}
@@ -938,15 +938,15 @@ 
 	 */
 	function getImageMark($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
 		{
 			$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($image_mark_file))
+			if (file_exists($image_mark_file))
 			{
 				list($width, $height, $type, $attrs) = getimagesize($image_mark_file);
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = Context::getRequestUri().$image_mark_file . '?' . date('YmdHis', filemtime($image_mark_file));
+				$info->src = Context::getRequestUri().$image_mark_file.'?'.date('YmdHis', filemtime($image_mark_file));
 				$info->file = './'.$image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
 			}
@@ -960,27 +960,27 @@ 
 	/**
 	 * @brief Get the image mark of the group
 	 */
-	function getGroupImageMark($member_srl,$site_srl=0)
+	function getGroupImageMark($member_srl, $site_srl = 0)
 	{
-		if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if($config->group_image_mark!='Y')
+			if ($config->group_image_mark != 'Y')
 			{
 				return null;
 			}
-			$member_group = $this->getMemberGroups($member_srl,$site_srl);
+			$member_group = $this->getMemberGroups($member_srl, $site_srl);
 			$groups_info = $this->getGroups($site_srl);
-			if(count($member_group) > 0 && is_array($member_group))
+			if (count($member_group) > 0 && is_array($member_group))
 			{
 				$memberGroups = array_keys($member_group);
 
-				foreach($groups_info as $group_srl=>$group_info)
+				foreach ($groups_info as $group_srl=>$group_info)
 				{
-					if(in_array($group_srl, $memberGroups))
+					if (in_array($group_srl, $memberGroups))
 					{
-						if($group_info->image_mark)
+						if ($group_info->image_mark)
 						{
 							$info = new stdClass();
 							$info->title = $group_info->title;
@@ -1004,10 +1004,10 @@ 
 	 */
 	function getSignature($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
 		{
 			$filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($filename))
+			if (file_exists($filename))
 			{
 				$buff = FileHandler::readFile($filename);
 				$signature = preg_replace('/<\?.*?\?>/', '', $buff);
@@ -1025,10 +1025,10 @@ 
 	 * @param int $member_srl Set this to member_srl when comparing a member's password (optional)
 	 * @return bool
 	 */
-	function isValidPassword($hashed_password, $password_text, $member_srl=null)
+	function isValidPassword($hashed_password, $password_text, $member_srl = null)
 	{
 		// False if no password in entered
-		if(!$password_text)
+		if (!$password_text)
 		{
 			return false;
 		}
@@ -1037,31 +1037,31 @@ 
 		$oPassword = new Password();
 		$current_algorithm = $oPassword->checkAlgorithm($hashed_password);
 		$match = $oPassword->checkPassword($password_text, $hashed_password, $current_algorithm);
-		if(!$match)
+		if (!$match)
 		{
 			return false;
 		}
 		
 		// Update the encryption method if necessary
 		$config = $this->getMemberConfig();
-		if($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
+		if ($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
 		{
 			$need_upgrade = false;
 			
-			if(!$need_upgrade)
+			if (!$need_upgrade)
 			{
 				$required_algorithm = $oPassword->getCurrentlySelectedAlgorithm();
-				if($required_algorithm !== $current_algorithm) $need_upgrade = true;
+				if ($required_algorithm !== $current_algorithm) $need_upgrade = true;
 			}
 			
-			if(!$need_upgrade)
+			if (!$need_upgrade)
 			{
 				$required_work_factor = $oPassword->getWorkFactor();
 				$current_work_factor = $oPassword->checkWorkFactor($hashed_password);
-				if($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
+				if ($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
 			}
 			
-			if($need_upgrade === true)
+			if ($need_upgrade === true)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
@@ -1089,27 +1089,27 @@ 
 	function checkPasswordStrength($password, $strength)
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if ($logged_info->is_admin == 'Y') return true;
 		
-		if($strength == NULL)
+		if ($strength == NULL)
 		{
 			$config = $this->getMemberConfig();
-			$strength = $config->password_strength?$config->password_strength:'normal';
+			$strength = $config->password_strength ? $config->password_strength : 'normal';
 		}
 		
 		$length = strlen($password);
 		
 		switch ($strength) {
 			case 'high':
-				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
+				if ($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
 				/* no break */
 				
 			case 'normal':
-				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
+				if ($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
 				break;
 				
 			case 'low':
-				if($length < 4) return false;
+				if ($length < 4) return false;
 				break; 
 		}
 		
@@ -1120,11 +1120,11 @@ 
 	{
 		$groupSrl = 0;
 		$output = $this->getGroups($site_srl);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
-				if($value->is_admin == 'Y')
+				if ($value->is_admin == 'Y')
 				{
 					$groupSrl = $value->group_srl;
 					break;

Braces +211 added lines, -86 removed lines

@@ -45,37 +45,79 @@ 
 		foreach($config->signupForm AS $key=>$value)
 		{
 			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
+			if($config->signupForm[$key]->isPublic != 'N') {
+				$config->signupForm[$key]->isPublic = 'Y';
+			}
+			if($value->name == 'find_account_question') {
+				$config->signupForm[$key]->isPublic = 'N';
+			}
 		}
 
 		// Get terms of user
 		$config->agreement = memberModel::_getAgreement();
 
-		if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
+		if(!$config->webmaster_name) {
+			$config->webmaster_name = 'webmaster';
+		}
 
-		if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-		if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-		if(!$config->image_name_max_filesize) $config->image_name_max_filesize = null;
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		if(!$config->image_mark_max_filesize) $config->image_mark_max_filesize = null;
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = 90;
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
-		if(!$config->profile_image_max_filesize) $config->profile_image_max_filesize = null;
+		if(!$config->image_name_max_width) {
+			$config->image_name_max_width = 90;
+		}
+		if(!$config->image_name_max_height) {
+			$config->image_name_max_height = 20;
+		}
+		if(!$config->image_name_max_filesize) {
+			$config->image_name_max_filesize = null;
+		}
+		if(!$config->image_mark_max_width) {
+			$config->image_mark_max_width = 20;
+		}
+		if(!$config->image_mark_max_height) {
+			$config->image_mark_max_height = 20;
+		}
+		if(!$config->image_mark_max_filesize) {
+			$config->image_mark_max_filesize = null;
+		}
+		if(!$config->profile_image_max_width) {
+			$config->profile_image_max_width = 90;
+		}
+		if(!$config->profile_image_max_height) {
+			$config->profile_image_max_height = 90;
+		}
+		if(!$config->profile_image_max_filesize) {
+			$config->profile_image_max_filesize = null;
+		}
 
-		if(!$config->skin) $config->skin = 'default';
-		if(!$config->colorset) $config->colorset = 'white';
-		if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
-		if(!$config->group_image_mark) $config->group_image_mark = "N";
+		if(!$config->skin) {
+			$config->skin = 'default';
+		}
+		if(!$config->colorset) {
+			$config->colorset = 'white';
+		}
+		if(!$config->editor_skin || $config->editor_skin == 'default') {
+			$config->editor_skin = 'ckeditor';
+		}
+		if(!$config->group_image_mark) {
+			$config->group_image_mark = "N";
+		}
 
-		if(!$config->identifier) $config->identifier = 'user_id';
+		if(!$config->identifier) {
+			$config->identifier = 'user_id';
+		}
 
-		if(!$config->max_error_count) $config->max_error_count = 10;
-		if(!$config->max_error_count_time) $config->max_error_count_time = 300;
+		if(!$config->max_error_count) {
+			$config->max_error_count = 10;
+		}
+		if(!$config->max_error_count_time) {
+			$config->max_error_count_time = 300;
+		}
 
-		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
-		if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
+		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') {
+			$config->signature_editor_skin = 'ckeditor';
+		}
+		if(!$config->sel_editor_colorset) {
+			$config->sel_editor_colorset = 'moono';
+		}
 
 		$member_config = $config;
 
@@ -121,12 +163,18 @@ 
 		$logged_info = Context::get('logged_info');
 		$act = Context::get('cur_act');
 		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+		if($member_srl == $logged_info->member_srl) {
+			$member_info = $logged_info;
+		}
 		// When click other's nickname
-		else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
+		else {
+			$member_info = $this->getMemberInfoByMemberSrl($member_srl);
+		}
 
 		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
+		if(!$member_srl) {
+			return;
+		}
 		// List variables
 		$user_id = $member_info->user_id;
 		$user_name = $member_info->user_name;
@@ -161,11 +209,13 @@ 
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
-			$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank');
+		if($member_info->homepage) {
+					$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank');
+		}
 		// View blog info
-		if($member_info->blog)
-			$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank');
+		if($member_info->blog) {
+					$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank');
+		}
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
@@ -200,16 +250,14 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				return true;
-			}
-			elseif(filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+			} elseif(filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
 			{
 				// IPv6: require same /48
 				if(strncmp(inet_pton($_SESSION['ipaddress']), inet_pton($_SERVER['REMOTE_ADDR']), 6) == 0)
 				{
 					return true;
 				}
-			}
-			else
+			} else
 			{
 				// IPv4: require same /24
 				if(ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
@@ -239,10 +287,12 @@ 
 				$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
 				// Add is_site_admin bool variable into logged_info if site_administrator is
 				$oModuleModel = getModel('module');
-				if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
-				else $logged_info->is_site_admin = false;
-			}
-			else
+				if($oModuleModel->isSiteAdmin($logged_info)) {
+					$logged_info->is_site_admin = true;
+				} else {
+					$logged_info->is_site_admin = false;
+				}
+			} else
 			{
 				// Register a default group if the site doesn't have a member group
 				if(count($logged_info->group_list) === 0)
@@ -268,13 +318,19 @@ 
 	 */
 	function getMemberInfoByUserID($user_id, $columnList = array())
 	{
-		if(!$user_id) return;
+		if(!$user_id) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
 		$output = executeQuery('member.getMemberInfo', $args);
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$output->data) {
+			return;
+		}
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 
@@ -286,7 +342,9 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if(!$email_address) {
+			return;
+		}
 
 		$args = new stdClass();
 		
@@ -295,15 +353,18 @@ 
 		{
 			$args->email_address = strtolower($email_address);
 			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
-		}
-		else
+		} else
 		{
 			$args->email_address = $email_address;
 			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		}
 		
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$output->data) {
+			return;
+		}
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 		return $member_info;
@@ -314,7 +375,9 @@ 
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{
-		if(!$member_srl) return;
+		if(!$member_srl) {
+			return;
+		}
 
 		//columnList size zero... get full member info
 		if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
@@ -337,13 +400,17 @@ 
 				$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
 				if(!$output->data) 
 				{
-					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
+					if($oCacheHandler->isSupport()) {
+						$oCacheHandler->put($cache_key, new stdClass);
+					}
 					return;
 				}
 				$this->arrangeMemberInfo($output->data, $site_srl);
 
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				}
 			}
 		}
 
@@ -377,8 +444,12 @@ 
 			{
 				foreach($extra_vars as $key => $val)
 				{
-					if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
-					if(!$info->{$key}) $info->{$key} = $val;
+					if(!is_array($val) && strpos($val, '|@|') !== FALSE) {
+						$val = explode('|@|', $val);
+					}
+					if(!$info->{$key}) {
+						$info->{$key} = $val;
+					}
 				}
 			}
 
@@ -401,8 +472,7 @@ 
 					if(is_array($val))
 					{
 						$oSecurity->encodeHTML($key . '.');
-					}
-					else
+					} else
 					{
 						$oSecurity->encodeHTML($key);
 					}
@@ -465,7 +535,9 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		return $_SESSION['member_srl'];
 	}
 
@@ -474,7 +546,9 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -506,9 +580,13 @@ 
 				$output = executeQueryArray('member.getMemberGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $group_list);
+				}
+			}
+			if(!$group_list) {
+				return array();
 			}
-			if(!$group_list) return array();
 
 			foreach($group_list as $group)
 			{
@@ -528,7 +606,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQueryArray('member.getMembersGroups', $args);
-		if(!$output->data) return array();
+		if(!$output->data) {
+			return array();
+		}
 
 		$result = array();
 		foreach($output->data as $key=>$val)
@@ -620,7 +700,9 @@ 
 				$output = executeQueryArray('member.getGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $group_list);
+				}
 			}
 
 			if(!$group_list)
@@ -668,9 +750,13 @@ 
 			$output = executeQuery('member.getJoinFormList', $args);
 			// NULL if output data deosn't exist
 			$join_form_list = $output->data;
-			if(!$join_form_list) return NULL;
+			if(!$join_form_list) {
+				return NULL;
+			}
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
-			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+			if(!is_array($join_form_list)) {
+				$join_form_list = array($join_form_list);
+			}
 			$join_form_count = count($join_form_list);
 			for($i=0;$i<$join_form_count;$i++)
 			{
@@ -687,9 +773,10 @@ 
 				if(in_array($column_type, array('checkbox','select','radio')))
 				{
 					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
-				}
-				else
+					if(!$join_form_list[$i]->default_value[0]) {
+						$join_form_list[$i]->default_value = '';
+					}
+				} else
 				{
 					$join_form_list[$i]->default_value = '';
 				}
@@ -703,13 +790,18 @@ 
 		{
 			foreach($this->join_form_list as $key => $val)
 			{
-				if($val->is_active != 'Y') continue;
+				if($val->is_active != 'Y') {
+					continue;
+				}
 				unset($obj);
 				$obj->type = $val->column_type;
 				$obj->name = $val->column_name;
 				$obj->lang = $val->column_title;
-				if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
-				else $obj->required = false;
+				if($logged_info->is_admin != 'Y') {
+					$obj->required = $val->required=='Y'?true:false;
+				} else {
+					$obj->required = false;
+				}
 				$filter_output[] = $obj;
 
 				unset($open_obj);
@@ -760,7 +852,9 @@ 
 	function getCombineJoinForm($member_info)
 	{
 		$extend_form_list = $this->getJoinFormlist();
-		if(!$extend_form_list) return;
+		if(!$extend_form_list) {
+			return;
+		}
 		// Member info is open only to an administrator and him/herself when is_private is true.
 		$logged_info = Context::get('logged_info');
 
@@ -773,7 +867,9 @@ 
 			switch($item->column_type)
 			{
 				case 'checkbox' :
-					if($value && !is_array($value)) $value = array($value);
+					if($value && !is_array($value)) {
+						$value = array($value);
+					}
 					break;
 				case 'text' :
 				case 'homepage' :
@@ -787,8 +883,11 @@ 
 
 			$extend_form_list[$srl]->value = $value;
 
-			if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
-			else $extend_form_list[$srl]->is_opened = false;
+			if($member_info->{'open_'.$column_name}=='Y') {
+				$extend_form_list[$srl]->is_opened = true;
+			} else {
+				$extend_form_list[$srl]->is_opened = false;
+			}
 		}
 		return $extend_form_list;
 	}
@@ -801,7 +900,9 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
-		if(!$join_form) return NULL;
+		if(!$join_form) {
+			return NULL;
+		}
 
 		$column_type = $join_form->column_type;
 		$default_value = $join_form->default_value;
@@ -809,8 +910,7 @@ 
 		if(in_array($column_type, array('checkbox','select','radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
-		}
-		else
+		} else
 		{
 			$join_form->default_value = '';
 		}
@@ -839,7 +939,9 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 		return $output->data;
 	}
 
@@ -862,7 +964,9 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$output = executeQuery('member.chkDeniedID', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		return false;
 	}
 
@@ -874,7 +978,9 @@ 
 		$args = new stdClass();
 		$args->nick_name = $nickName;
 		$output = executeQuery('member.chkDeniedNickName', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		if(!$output->toBool())
 		{
 			return true;
@@ -927,8 +1033,9 @@ 
 				$info->src = Context::getRequestUri().$image_name_file. '?' . date('YmdHis', filemtime($image_name_file));
 				$info->file = './'.$image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
+			} else {
+				$GLOBALS['__member_info__']['image_name'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
 		}
 		return $GLOBALS['__member_info__']['image_name'][$member_srl];
 	}
@@ -949,8 +1056,9 @@ 
 				$info->src = Context::getRequestUri().$image_mark_file . '?' . date('YmdHis', filemtime($image_mark_file));
 				$info->file = './'.$image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
+			} else {
+				$GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
 		}
 
 		return $GLOBALS['__member_info__']['image_mark'][$member_srl];
@@ -992,9 +1100,13 @@ 
 					}
 				}
 			}
-			if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			if (!$info) {
+				$GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			}
+		}
+		if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') {
+			return null;
 		}
-		if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
 
 		return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
 	}
@@ -1012,8 +1124,9 @@ 
 				$buff = FileHandler::readFile($filename);
 				$signature = preg_replace('/<\?.*?\?>/', '', $buff);
 				$GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
+			} else {
+				$GLOBALS['__member_info__']['signature'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['signature'][$member_srl] = null;
 		}
 		return $GLOBALS['__member_info__']['signature'][$member_srl];
 	}
@@ -1051,14 +1164,18 @@ 
 			if(!$need_upgrade)
 			{
 				$required_algorithm = $oPassword->getCurrentlySelectedAlgorithm();
-				if($required_algorithm !== $current_algorithm) $need_upgrade = true;
+				if($required_algorithm !== $current_algorithm) {
+					$need_upgrade = true;
+				}
 			}
 			
 			if(!$need_upgrade)
 			{
 				$required_work_factor = $oPassword->getWorkFactor();
 				$current_work_factor = $oPassword->checkWorkFactor($hashed_password);
-				if($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
+				if($current_work_factor !== false && $required_work_factor > $current_work_factor) {
+					$need_upgrade = true;
+				}
 			}
 			
 			if($need_upgrade === true)
@@ -1089,7 +1206,9 @@ 
 	function checkPasswordStrength($password, $strength)
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if($logged_info->is_admin == 'Y') {
+			return true;
+		}
 		
 		if($strength == NULL)
 		{
@@ -1101,15 +1220,21 @@ 
 		
 		switch ($strength) {
 			case 'high':
-				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
+				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) {
+					return false;
+				}
 				/* no break */
 				
 			case 'normal':
-				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
+				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) {
+					return false;
+				}
 				break;
 				
 			case 'low':
-				if($length < 4) return false;
+				if($length < 4) {
+					return false;
+				}
 				break; 
 		}