xpressengine / xe-core

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 +151 added lines, -151 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"; ', str_replace(array('$','"'),array('\$','\\"'),$header_script));
+			$buff[] = sprintf(' $layout_info->header_script = "%s"; ', str_replace(array('$', '"'), array('\$', '\\"'), $header_script));
 		}
 
-		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())
 	{

Braces +202 added lines, -83 removed lines

@@ -45,32 +45,68 @@ 
 		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->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_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		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->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->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_mark_max_width) {
+			$config->image_mark_max_width = 20;
+		}
+		if(!$config->image_mark_max_height) {
+			$config->image_mark_max_height = 20;
+		}
+		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->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;
 
@@ -116,12 +152,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;
@@ -156,11 +198,13 @@ 
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
-			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
+		if($member_info->homepage) {
+					$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
+		}
 		// View blog info
-		if($member_info->blog)
-			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
+		if($member_info->blog) {
+					$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
+		}
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
@@ -195,16 +239,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)
@@ -234,10 +276,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)
@@ -263,13 +307,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);
 
@@ -281,7 +331,9 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if(!$email_address) {
+			return;
+		}
 
 		$args = new stdClass();
 		
@@ -290,15 +342,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;
@@ -309,7 +364,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)
@@ -332,13 +389,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]);
+				}
 			}
 		}
 
@@ -372,8 +433,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;
+					}
 				}
 			}
 
@@ -396,8 +461,7 @@ 
 					if(is_array($val))
 					{
 						$oSecurity->encodeHTML($key . '.');
-					}
-					else
+					} else
 					{
 						$oSecurity->encodeHTML($key);
 					}
@@ -460,7 +524,9 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		return $_SESSION['member_srl'];
 	}
 
@@ -469,7 +535,9 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -501,9 +569,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)
 			{
@@ -523,7 +595,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)
@@ -615,7 +689,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)
@@ -663,9 +739,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++)
 			{
@@ -682,9 +762,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 = '';
 				}
@@ -698,13 +779,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);
@@ -755,7 +841,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');
 
@@ -768,7 +856,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' :
@@ -782,8 +872,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;
 	}
@@ -796,7 +889,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;
@@ -804,8 +899,7 @@ 
 		if(in_array($column_type, array('checkbox','select','radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
-		}
-		else
+		} else
 		{
 			$join_form->default_value = '';
 		}
@@ -834,7 +928,9 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 		return $output->data;
 	}
 
@@ -857,7 +953,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;
 	}
 
@@ -869,7 +967,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;
@@ -922,8 +1022,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];
 	}
@@ -944,8 +1045,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];
@@ -987,9 +1089,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];
 	}
@@ -1007,8 +1113,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];
 	}
@@ -1046,14 +1153,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)
@@ -1084,7 +1195,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)
 		{
@@ -1096,15 +1209,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; 
 		}
 		

Spacing +175 added lines, -175 removed lines

@@ -26,7 +26,7 @@ 
 	{
 		static $member_config;
 
-		if($member_config)
+		if ($member_config)
 		{
 			return $member_config;
 		}
@@ -35,42 +35,42 @@ 
 		$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->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_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		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->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->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_mark_max_width) $config->image_mark_max_width = 20;
+		if (!$config->image_mark_max_height) $config->image_mark_max_height = 20;
+		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->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;
 
@@ -79,24 +79,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);
 			}
@@ -116,12 +116,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;
@@ -130,18 +130,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;
@@ -149,36 +149,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:'.htmlspecialchars($member_info->email_address, ENT_COMPAT | ENT_HTML401, 'UTF-8', 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(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
 		// View blog info
-		if($member_info->blog)
+		if ($member_info->blog)
 			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', 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);
 		}
@@ -190,16 +190,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;
 				}
@@ -207,7 +207,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;
 				}
@@ -224,23 +224,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');
@@ -263,13 +263,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);
 
@@ -281,12 +281,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);
@@ -297,8 +297,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;
@@ -309,36 +309,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]);
 			}
 		}
 
@@ -350,7 +350,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');
@@ -359,25 +359,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;
 			}
@@ -389,13 +389,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
 					{
@@ -406,12 +406,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 = '';
 			}
@@ -460,7 +460,7 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		return $_SESSION['member_srl'];
 	}
 
@@ -469,7 +469,7 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -484,16 +484,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;
@@ -501,11 +501,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;
 			}
@@ -519,14 +519,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;
 		}
@@ -540,21 +540,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);
 			}
@@ -588,25 +588,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;
@@ -615,16 +615,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;
 			}
@@ -655,7 +655,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();
@@ -663,11 +663,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);
 
@@ -679,10 +679,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
 				{
@@ -694,16 +694,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;
 
@@ -730,15 +730,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;
 			}
@@ -755,20 +755,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' :
@@ -782,7 +782,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;
@@ -796,12 +796,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);
 		}
@@ -818,7 +818,7 @@ 
 	 */
 	function getDeniedIDList()
 	{
-		if(!$this->denied_id_list)
+		if (!$this->denied_id_list)
 		{
 			$args->sort_index = "list_order";
 			$args->page = Context::get('page');
@@ -834,14 +834,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();
 		}
@@ -857,7 +857,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;
 	}
 
@@ -869,8 +869,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;
 		}
@@ -881,20 +881,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;
@@ -910,16 +910,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;
 			}
@@ -933,15 +933,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;
 			}
@@ -955,27 +955,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;
@@ -999,10 +999,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);
@@ -1020,10 +1020,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;
 		}
@@ -1032,31 +1032,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;
@@ -1084,27 +1084,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; 
 		}
 		
@@ -1115,11 +1115,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;

modules/menu/menu.mobile.php

Doc Comments +1 added lines

@@ -18,6 +18,7 @@
 
 	/**
 	 * Menu depth arrange
+	 * @param integer $depth
 	 * @return void
 	 */
 	function straightenMenu($menu_item, $depth)

Braces +9 added lines, -3 removed lines

@@ -22,14 +22,18 @@ 
 	 */
 	function straightenMenu($menu_item, $depth)
 	{
-		if(!$menu_item['link']) return;
+		if(!$menu_item['link']) {
+			return;
+		}
 		$obj = new stdClass;
 		$obj->href = $menu_item['href'];
 		$obj->depth = $depth;
 		$obj->text = $menu_item['text'];
 		$obj->open_window = $menu_item['open_window'];
 		$this->result[] = $obj;
-		if(!$menu_item['list']) return;
+		if(!$menu_item['list']) {
+			return;
+		}
 		foreach($menu_item['list'] as $item)
 		{
 			$this->straightenMenu($item, $depth+1);
@@ -58,7 +62,9 @@ 
 			$menu_info->php_file = './files/cache/menu/'.$homeMenuSrl.'.php';
 		}
 
-		if(file_exists($menu_info->php_file)) @include($menu_info->php_file);
+		if(file_exists($menu_info->php_file)) {
+			@include($menu_info->php_file);
+		}
 		if(is_array($menu->list))
 		{
 			foreach($menu->list as $menu_item)

Spacing +11 added lines, -11 removed lines

@@ -22,17 +22,17 @@ 
 	 */
 	function straightenMenu($menu_item, $depth)
 	{
-		if(!$menu_item['link']) return;
+		if (!$menu_item['link']) return;
 		$obj = new stdClass;
 		$obj->href = $menu_item['href'];
 		$obj->depth = $depth;
 		$obj->text = $menu_item['text'];
 		$obj->open_window = $menu_item['open_window'];
 		$this->result[] = $obj;
-		if(!$menu_item['list']) return;
-		foreach($menu_item['list'] as $item)
+		if (!$menu_item['list']) return;
+		foreach ($menu_item['list'] as $item)
 		{
-			$this->straightenMenu($item, $depth+1);
+			$this->straightenMenu($item, $depth + 1);
 		}
 	}
 
@@ -43,25 +43,25 @@ 
 	function dispMenuMenu()
 	{
 		$menu_srl = Context::get('menu_srl');
-		$oAdminModel =& getAdminModel('menu');
+		$oAdminModel = & getAdminModel('menu');
 		$menu_info = $oAdminModel->getMenu($menu_srl);
 
-		if(!$menu_srl)
+		if (!$menu_srl)
 		{
 			$oMenuAdminController = getAdminController('menu');
 			$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
 
-			if(file_exists($homeMenuCacheFile))
+			if (file_exists($homeMenuCacheFile))
 			{
 				@include($homeMenuCacheFile);
 			}
 			$menu_info->php_file = './files/cache/menu/'.$homeMenuSrl.'.php';
 		}
 
-		if(file_exists($menu_info->php_file)) @include($menu_info->php_file);
-		if(is_array($menu->list))
+		if (file_exists($menu_info->php_file)) @include($menu_info->php_file);
+		if (is_array($menu->list))
 		{
-			foreach($menu->list as $menu_item)
+			foreach ($menu->list as $menu_item)
 			{
 				$this->straightenMenu($menu_item, 0);
 			}
@@ -69,7 +69,7 @@ 
 
 		Context::set('menu', $this->result);	
 
-		$this->setTemplatePath(sprintf("%stpl/",$this->module_path));
+		$this->setTemplatePath(sprintf("%stpl/", $this->module_path));
 		$this->setTemplateFile('menu.html');
 	}
 }

modules/module/module.admin.controller.php

Doc Comments +6 added lines

@@ -260,6 +260,9 @@ 
 		return $module_srl;
 	}
 
+	/**
+	 * @param boolean $isProc
+	 */
 	private function _returnByProc($isProc, $msg='msg_invalid_request')
 	{
 		if(!$isProc)
@@ -938,6 +941,9 @@ 
 
 	}
 
+	/**
+	 * @param string $skinVars
+	 */
 	public function setDesignInfo($moduleSrl = 0, $mid = '', $skinType = 'P', $layoutSrl = 0, $isSkinFix = 'Y', $skinName = '', $skinVars = NULL)
 	{
 		if(!$moduleSrl && !$mid)

Spacing +154 added lines, -154 removed lines

@@ -22,7 +22,7 @@ 
 		$args = new stdClass();
 		$args->title = Context::get('title');
 		$output = executeQuery('module.insertModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage("success_registed");
 
@@ -36,7 +36,7 @@ 
 	function procModuleAdminUpdateCategory()
 	{
 		$output = $this->doUpdateModuleCategory();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_updated');
 
@@ -50,7 +50,7 @@ 
 	function procModuleAdminDeleteCategory()
 	{
 		$output = $this->doDeleteModuleCategory();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_deleted');
 
@@ -85,7 +85,7 @@ 
 	function procModuleAdminCopyModule($args = NULL)
 	{
 		$isProc = false;
-		if(!$args)
+		if (!$args)
 		{
 			$isProc = true;
 			// Get information of the target module to copy
@@ -97,24 +97,24 @@ 
 			$module_srl = $args->module_srl;
 		}
 
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return $this->_returnByProc($isProc);
 		}
 
 		// Get module name to create and browser title
 		$clones = array();
-		for($i=1;$i<=10;$i++)
+		for ($i = 1; $i <= 10; $i++)
 		{
 			$mid = trim($args->{"mid_".$i});
-			if(!$mid) continue;
-			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new BaseObject(-1, 'msg_limit_mid');
+			if (!$mid) continue;
+			if (!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new BaseObject(-1, 'msg_limit_mid');
 			$browser_title = $args->{"browser_title_".$i};
-			if(!$mid) continue;
-			if($mid && !$browser_title) $browser_title = $mid;
+			if (!$mid) continue;
+			if ($mid && !$browser_title) $browser_title = $mid;
 			$clones[$mid] = $browser_title;
 		}
-		if(count($clones) < 1)
+		if (count($clones) < 1)
 		{
 			return $this->_returnByProc($isProc);
 		}
@@ -129,9 +129,9 @@ 
 		$module_args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $module_args);
 		$grant = array();
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val) $grant[$val->name][] = $val->group_srl;
+			foreach ($output->data as $val) $grant[$val->name][] = $val->group_srl;
 		}
 
 		// get Extra Vars
@@ -139,9 +139,9 @@ 
 		$extra_args->module_srl = $module_srl;
 		$extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args);
 		$extra_vars = new stdClass();
-		if($extra_output->toBool() && is_array($extra_output->data))
+		if ($extra_output->toBool() && is_array($extra_output->data))
 		{
-			foreach($extra_output->data as $info)
+			foreach ($extra_output->data as $info)
 			{
 				$extra_vars->{$info->name} = $info->value;
 			}
@@ -150,17 +150,17 @@ 
 		$tmpModuleSkinVars = $oModuleModel->getModuleSkinVars($module_srl);
 		$tmpModuleMobileSkinVars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 
-		if($tmpModuleSkinVars)
+		if ($tmpModuleSkinVars)
 		{
-			foreach($tmpModuleSkinVars as $key=>$value)
+			foreach ($tmpModuleSkinVars as $key=>$value)
 			{
 				$moduleSkinVars->{$key} = $value->value;
 			}
 		}
 
-		if($tmpModuleMobileSkinVars)
+		if ($tmpModuleMobileSkinVars)
 		{
-			foreach($tmpModuleMobileSkinVars as $key=>$value)
+			foreach ($tmpModuleMobileSkinVars as $key=>$value)
 			{
 				$moduleMobileSkinVars->{$key} = $value->value;
 			}
@@ -174,7 +174,7 @@ 
 		$triggerObj->moduleSrlList = array();
 
 		$errorLog = array();
-		foreach($clones as $mid => $browser_title)
+		foreach ($clones as $mid => $browser_title)
 		{
 			$clone_args = new stdClass;
 			$clone_args = clone $module_info;
@@ -188,29 +188,29 @@ 
 			// Create a module
 			$output = $oModuleController->insertModule($clone_args);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
-				$errorLog[] = $mid . ' : '. $output->message;
+				$errorLog[] = $mid.' : '.$output->message;
 				continue;
 			}
 			$module_srl = $output->get('module_srl');
 
-			if($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
+			if ($module_info->module == 'page' && $extra_vars->page_type == 'ARTICLE')
 			{
 				// copy document
 				$oDocumentAdminController = getAdminController('document');
 				$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->document_srl), $module_srl, $module_info->category_srl);
 				$document_srls = $copyOutput->get('copied_srls');
-				if($document_srls && count($document_srls) > 0)
+				if ($document_srls && count($document_srls) > 0)
 				{
 					$extra_vars->document_srl = array_pop($document_srls);
 				}
 
-				if($extra_vars->mdocument_srl)
+				if ($extra_vars->mdocument_srl)
 				{
 					$copyOutput = $oDocumentAdminController->copyDocumentModule(array($extra_vars->mdocument_srl), $module_srl, $module_info->category_srl);
 					$copiedSrls = $copyOutput->get('copied_srls');
-					if($copiedSrls && count($copiedSrls) > 0)
+					if ($copiedSrls && count($copiedSrls) > 0)
 					{
 						$extra_vars->mdocument_srl = array_pop($copiedSrls);
 					}
@@ -218,11 +218,11 @@ 
 			}
 
 			// Grant module permissions
-			if(count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
-			if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			if (count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
+			if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
-			if($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
-			if($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			if ($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
+			if ($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
 
 			$triggerObj->moduleSrlList[] = $module_srl;
 		}
@@ -231,7 +231,7 @@ 
 
 		$oDB->commit();
 
-		if(count($errorLog) > 0)
+		if (count($errorLog) > 0)
 		{
 			$message = implode('\n', $errorLog);
 			$this->setMessage($message);
@@ -242,9 +242,9 @@ 
 			$this->setMessage('success_registed');
 		}
 
-		if($isProc)
+		if ($isProc)
 		{
-			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -260,9 +260,9 @@ 
 		return $module_srl;
 	}
 
-	private function _returnByProc($isProc, $msg='msg_invalid_request')
+	private function _returnByProc($isProc, $msg = 'msg_invalid_request')
 	{
-		if(!$isProc)
+		if (!$isProc)
 			return;
 		else
 		{
@@ -282,17 +282,17 @@ 
 		// Get information of the module
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$module_info) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_info) return new BaseObject(-1, 'msg_invalid_request');
 		// Register Admin ID
 		$oModuleController->deleteAdminId($module_srl);
 		$admin_member = Context::get('admin_member');
-		if($admin_member)
+		if ($admin_member)
 		{
-			$admin_members = explode(',',$admin_member);
-			foreach($admin_members as $admin_id)
+			$admin_members = explode(',', $admin_member);
+			foreach ($admin_members as $admin_id)
 			{
 				$admin_id = trim($admin_id);
-				if(!$admin_id) continue;
+				if (!$admin_id) continue;
 				$oModuleController->insertAdminId($module_srl, $admin_id);
 			}
 		}
@@ -307,13 +307,13 @@ 
 		$grant_list->manager->default = 'manager';
 
 		$grant = new stdClass();
-		foreach($grant_list as $grant_name => $grant_info)
+		foreach ($grant_list as $grant_name => $grant_info)
 		{
 			// Get the default value
 			$default = Context::get($grant_name.'_default');
 			// -1 = Log-in user only, -2 = site members only, -3 = manager only, 0 = all users
 			$grant->{$grant_name} = array();
-			if(strlen($default))
+			if (strlen($default))
 			{
 				$grant->{$grant_name}[] = $default;
 				continue;
@@ -322,10 +322,10 @@ 
 			else
 			{
 				$group_srls = Context::get($grant_name);
-				if($group_srls)
+				if ($group_srls)
 				{
-					if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-					elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+					if (strpos($group_srls, '|@|') !== false) $group_srls = explode('|@|', $group_srls);
+					elseif (strpos($group_srls, ',') !== false) $group_srls = explode(',', $group_srls);
 					else $group_srls = array($group_srls);
 					$grant->{$grant_name} = $group_srls;
 				}
@@ -338,18 +338,18 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('module.deleteModuleGrants', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Permissions stored in the DB
-		foreach($grant as $grant_name => $group_srls)
+		foreach ($grant as $grant_name => $group_srls)
 		{
-			foreach($group_srls as $val)
+			foreach ($group_srls as $val)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $grant_name;
 				$args->group_srl = $val;
 				$output = executeQuery('module.insertModuleGrant', $args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 		$this->setMessage('success_registed');
@@ -368,11 +368,11 @@ 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'skin', 'mskin', 'is_skin_fix', 'is_mskin_fix');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if($module_info->module_srl)
+		if ($module_info->module_srl)
 		{
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
-				if($module_info->is_mskin_fix == 'Y')
+				if ($module_info->is_mskin_fix == 'Y')
 				{
 					$skin = $module_info->mskin;
 				}
@@ -383,7 +383,7 @@ 
 			}
 			else
 			{
-				if($module_info->is_skin_fix == 'Y')
+				if ($module_info->is_skin_fix == 'Y')
 				{
 					$skin = $module_info->skin;
 				}
@@ -394,9 +394,9 @@ 
 			}
 
 			// Get skin information (to check extra_vars)
-			$module_path = _XE_PATH_ . 'modules/'.$module_info->module;
+			$module_path = _XE_PATH_.'modules/'.$module_info->module;
 
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 				$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -417,35 +417,35 @@ 
 			unset($obj->module);
 			unset($obj->_mode);
 			// Separately handle if a type of extra_vars is an image in the original skin_info
-			if($skin_info->extra_vars)
+			if ($skin_info->extra_vars)
 			{
-				foreach($skin_info->extra_vars as $vars)
+				foreach ($skin_info->extra_vars as $vars)
 				{
-					if($vars->type!='image') continue;
+					if ($vars->type != 'image') continue;
 
 					$image_obj = $obj->{$vars->name};
 					// Get a variable to delete
 					$del_var = $obj->{"del_".$vars->name};
 					unset($obj->{"del_".$vars->name});
-					if($del_var == 'Y')
+					if ($del_var == 'Y')
 					{
 						FileHandler::removeFile($skin_vars[$vars->name]->value);
 						continue;
 					}
 					// Use the previous data if not uploaded
-					if(!$image_obj['tmp_name'])
+					if (!$image_obj['tmp_name'])
 					{
 						$obj->{$vars->name} = $skin_vars[$vars->name]->value;
 						continue;
 					}
 					// Ignore if the file is not successfully uploaded
-					if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
+					if (!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
 					{
 						unset($obj->{$vars->name});
 						continue;
 					}
 					// Ignore if the file is not an image
-					if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
+					if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
 					{
 						unset($obj->{$vars->name});
 						continue;
@@ -453,11 +453,11 @@ 
 					// Upload the file to a path
 					$path = sprintf("./files/attach/images/%s/", $module_srl);
 					// Create a directory
-					if(!FileHandler::makeDir($path)) return false;
+					if (!FileHandler::makeDir($path)) return false;
 
 					$filename = $path.$image_obj['name'];
 					// Move the file
-					if(!move_uploaded_file($image_obj['tmp_name'], $filename))
+					if (!move_uploaded_file($image_obj['tmp_name'], $filename))
 					{
 						unset($obj->{$vars->name});
 						continue;
@@ -481,7 +481,7 @@ 
 			*/
 			$oModuleController = getController('module');
 
-			if($mode === 'M')
+			if ($mode === 'M')
 			{
 				$output = $oModuleController->insertModuleMobileSkinVars($module_srl, $obj);
 			}
@@ -489,7 +489,7 @@ 
 			{
 				$output = $oModuleController->insertModuleSkinVars($module_srl, $obj);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -506,29 +506,29 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		if(!$vars->module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if (!$vars->module_srls) return new BaseObject(-1, 'msg_invalid_request');
 
-		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request');
+		$module_srls = explode(',', $vars->module_srls);
+		if (count($module_srls) < 1) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$oModuleController= getController('module');
+		$oModuleController = getController('module');
 		$columnList = array('module_srl', 'module', 'menu_srl', 'site_srl', 'mid', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
-		$updateList = array('module_category_srl','layout_srl','skin','mlayout_srl','mskin','description','header_text','footer_text', 'use_mobile');
-		foreach($updateList as $key=>$val)
+		$updateList = array('module_category_srl', 'layout_srl', 'skin', 'mlayout_srl', 'mskin', 'description', 'header_text', 'footer_text', 'use_mobile');
+		foreach ($updateList as $key=>$val)
 		{
-			if(!strlen($vars->{$val}))
+			if (!strlen($vars->{$val}))
 			{
 				unset($updateList[$key]);
 				$columnList[] = $val;
 			}
 		}
 
-		foreach($module_srls as $module_srl)
+		foreach ($module_srls as $module_srl)
 		{
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 
-			foreach($updateList as $val)
+			foreach ($updateList as $val)
 			{
 				$module_info->{$val} = $vars->{$val};
 			}
@@ -536,9 +536,9 @@ 
 		}
 
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
 			}
@@ -561,10 +561,10 @@ 
 	function procModuleAdminModuleGrantSetup()
 	{
 		$module_srls = Context::get('module_srls');
-		if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srls) return new BaseObject(-1, 'msg_invalid_request');
 
-		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (count($modules) < 1) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -581,13 +581,13 @@ 
 
 		$grant = new stdClass;
 
-		foreach($grant_list as $grant_name => $grant_info)
+		foreach ($grant_list as $grant_name => $grant_info)
 		{
 			// Get the default value
 			$default = Context::get($grant_name.'_default');
 			// -1 = Sign only, 0 = all users
 			$grant->{$grant_name} = array();
-			if(strlen($default))
+			if (strlen($default))
 			{
 				$grant->{$grant_name}[] = $default;
 				continue;
@@ -596,12 +596,12 @@ 
 			else
 			{
 				$group_srls = Context::get($grant_name);
-				if($group_srls)
+				if ($group_srls)
 				{
-					if(!is_array($group_srls))
+					if (!is_array($group_srls))
 					{
-						if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-						elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+						if (strpos($group_srls, '|@|') !== false) $group_srls = explode('|@|', $group_srls);
+						elseif (strpos($group_srls, ',') !== false) $group_srls = explode(',', $group_srls);
 						else $group_srls = array($group_srls);
 					}
 					$grant->{$grant_name} = $group_srls;
@@ -612,30 +612,30 @@ 
 		}
 
 		// Stored in the DB
-		foreach($modules as $module_srl)
+		foreach ($modules as $module_srl)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.deleteModuleGrants', $args);
-			if(!$output->toBool()) continue;
+			if (!$output->toBool()) continue;
 			// Permissions stored in the DB
-			foreach($grant as $grant_name => $group_srls)
+			foreach ($grant as $grant_name => $group_srls)
 			{
-				foreach($group_srls as $val)
+				foreach ($group_srls as $val)
 				{
 					$args = new stdClass();
 					$args->module_srl = $module_srl;
 					$args->name = $grant_name;
 					$args->group_srl = $val;
 					$output = executeQuery('module.insertModuleGrant', $args);
-					if(!$output->toBool()) return $output;
+					if (!$output->toBool()) return $output;
 				}
 			}
 		}
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
 			}
@@ -662,38 +662,38 @@ 
 		$target = Context::get('target');
 		$module = Context::get('module');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
-		$args->name = str_replace(' ','_',Context::get('lang_code'));
-		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
+		$args->site_srl = (int) $site_module_info->site_srl;
+		$args->name = str_replace(' ', '_', Context::get('lang_code'));
+		$args->lang_name = str_replace(' ', '_', Context::get('lang_name'));
+		if (!empty($args->lang_name)) $args->name = $args->lang_name;
 
 		// if args->name is empty, random generate for user define language
-		if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		if (empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
 
-		if(!$args->name) return new BaseObject(-1,'msg_invalid_request');
+		if (!$args->name) return new BaseObject(-1, 'msg_invalid_request');
 		// Check whether a language code exists
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If exists, clear the old values for updating
-		if($output->data) $output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if ($output->data) $output = executeQuery('module.deleteLang', $args);
+		if (!$output->toBool()) return $output;
 		// Enter
 		$lang_supported = Context::get('lang_supported');
-		foreach($lang_supported as $key => $val)
+		foreach ($lang_supported as $key => $val)
 		{
 			$args->lang_code = $key;
 			$args->value = trim(Context::get($key));
 
 			// if request method is json, strip slashes
-			if(Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
+			if (Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.4.0", "<") && get_magic_quotes_gpc())
 			{
 				$args->value = stripslashes($args->value);
 			}
 
-			if($args->value)
+			if ($args->value)
 			{
 				$output = executeQuery('module.insertLang', $args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
@@ -713,14 +713,14 @@ 
 		// Get language code
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
-		$args->name = str_replace(' ','_',Context::get('name'));
-		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
-		if(!$args->name) return new BaseObject(-1,'msg_invalid_request');
+		$args->site_srl = (int) $site_module_info->site_srl;
+		$args->name = str_replace(' ', '_', Context::get('name'));
+		$args->lang_name = str_replace(' ', '_', Context::get('lang_name'));
+		if (!empty($args->lang_name)) $args->name = $args->lang_name;
+		if (!$args->name) return new BaseObject(-1, 'msg_invalid_request');
 
 		$output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$this->makeCacheDefinedLangCode($args->site_srl);
 
 		$this->setMessage("success_deleted", 'info');
@@ -731,7 +731,7 @@ 
 
 	function procModuleAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -744,12 +744,12 @@ 
 		$args = new stdClass;
 		$logged_info = Context::get('logged_info');
 		$site_module_info = Context::get('site_module_info');
-		if($site_keyword) $args->site_keyword = $site_keyword;
+		if ($site_keyword) $args->site_keyword = $site_keyword;
 
-		if(!$site_srl)
+		if (!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
-			else $args->site_srl = (int)$site_module_info->site_srl;
+			if ($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
+			else $args->site_srl = (int) $site_module_info->site_srl;
 		}
 		else $args->site_srl = $site_srl;
 
@@ -759,12 +759,12 @@ 
 		// Get a list of modules at the site
 		$output = executeQueryArray('module.getSiteModules', $args);
 		$mid_list = array();
-		if(count($output->data) > 0)
+		if (count($output->data) > 0)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$module = trim($val->module);
-				if(!$module) continue;
+				if (!$module) continue;
 
 				// replace user defined lang.
 				$oModuleController->replaceDefinedLangCode($val->browser_title);
@@ -775,7 +775,7 @@ 
 				$obj->browser_title = $val->browser_title;
 				$obj->mid = $val->mid;
 				$obj->module_category_srl = $val->module_category_srl;
-				if($val->module_category_srl > 0)
+				if ($val->module_category_srl > 0)
 				{
 					$moduleCategorySrl[] = $val->module_category_srl;
 				}
@@ -787,23 +787,23 @@ 
 		$moduleCategorySrl = array_unique($moduleCategorySrl);
 		$output = $oModuleModel->getModuleCategories($moduleCategorySrl);
 		$categoryNameList = array();
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output as $value)
+			foreach ($output as $value)
 			{
 				$categoryNameList[$value->module_category_srl] = $value->title;
 			}
 		}
 
 		$selected_module = Context::get('selected_module');
-		if(count($mid_list) > 0)
+		if (count($mid_list) > 0)
 		{
-			foreach($mid_list as $module => $val)
+			foreach ($mid_list as $module => $val)
 			{
-				if(!$selected_module) $selected_module = $module;
+				if (!$selected_module) $selected_module = $module;
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 
-				if(!$xml_info)
+				if (!$xml_info)
 				{
 					unset($mid_list[$module]);
 					continue;
@@ -812,14 +812,14 @@ 
 				$mid_list[$module]->title = $xml_info->title;
 
 				// change module category srl to title
-				if(is_array($val->list))
+				if (is_array($val->list))
 				{
-					foreach($val->list as $key=>$value)
+					foreach ($val->list as $key=>$value)
 					{
-						if($value->module_category_srl > 0)
+						if ($value->module_category_srl > 0)
 						{
 							$categorySrl = $mid_list[$module]->list[$key]->module_category_srl;
-							if(isset($categoryNameList[$categorySrl]))
+							if (isset($categoryNameList[$categorySrl]))
 							{
 								$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
 							}
@@ -847,20 +847,20 @@ 
 		$args = new stdClass();
 
 		// Get the language file of the current site
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$args->site_srl = (int)$site_module_info->site_srl;
+			$args->site_srl = (int) $site_module_info->site_srl;
 		}
 		else
 		{
 			$args->site_srl = $site_srl;
 		}
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
 		$langMap = array();
-		foreach($output->data as $lang)
+		foreach ($output->data as $lang)
 		{
 			$langMap[$lang->lang_code][$lang->name] = $lang->value;
 		}
@@ -869,29 +869,29 @@ 
 		$dbInfo = Context::getDBInfo();
 		$defaultLang = $dbInfo->lang_type;
 
-		if(!is_array($langMap[$defaultLang]))
+		if (!is_array($langMap[$defaultLang]))
 		{
 			$langMap[$defaultLang] = array();
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 
-		foreach($lang_supported as $langCode => $langName)
+		foreach ($lang_supported as $langCode => $langName)
 		{
-			if(!is_array($langMap[$langCode]))
+			if (!is_array($langMap[$langCode]))
 			{
 				$langMap[$langCode] = array();
 			}
 
 			$langMap[$langCode] += $langMap[$defaultLang];
-			foreach($lang_supported as $targetLangCode => $targetLangName)
+			foreach ($lang_supported as $targetLangCode => $targetLangName)
 			{
-				if($langCode == $targetLangCode || $langCode == $defaultLang)
+				if ($langCode == $targetLangCode || $langCode == $defaultLang)
 				{
 					continue;
 				}
 
-				if(!is_array($langMap[$targetLangCode]))
+				if (!is_array($langMap[$targetLangCode]))
 				{
 					$langMap[$targetLangCode] = array();
 				}
@@ -899,9 +899,9 @@ 
 				$langMap[$langCode] += $langMap[$targetLangCode];
 			}
 
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'user_defined_langs:' . $args->site_srl . ':' . $langCode;
+				$object_key = 'user_defined_langs:'.$args->site_srl.':'.$langCode;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$oCacheHandler->put($cache_key, $langMap[$langCode]);
 			}
@@ -922,7 +922,7 @@ 
 
 		$isSkinFix = Context::get('is_skin_fix');
 
-		if($isSkinFix)
+		if ($isSkinFix)
 		{
 			$isSkinFix = ($isSkinFix == 'N') ? 'N' : 'Y';
 		}
@@ -938,14 +938,14 @@ 
 
 	public function setDesignInfo($moduleSrl = 0, $mid = '', $skinType = 'P', $layoutSrl = 0, $isSkinFix = 'Y', $skinName = '', $skinVars = NULL)
 	{
-		if(!$moduleSrl && !$mid)
+		if (!$moduleSrl && !$mid)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 
-		if($mid)
+		if ($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
 		}
@@ -954,7 +954,7 @@ 
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}
 
-		if(!$moduleInfo)
+		if (!$moduleInfo)
 		{
 			return $this->stop(-1, 'msg_module_not_exists');
 		}
@@ -963,26 +963,26 @@ 
 		$layoutTargetValue = ($skinType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$skinFixTargetValue = ($skinType == 'M') ? 'is_mskin_fix' : 'is_skin_fix';
 
-		if(strlen($layoutSrl))
+		if (strlen($layoutSrl))
 		{
 			$moduleInfo->{$layoutTargetValue} = $layoutSrl;
 		}
 
-		if(strlen($isSkinFix))
+		if (strlen($isSkinFix))
 		{
 			$moduleInfo->{$skinFixTargetValue} = $isSkinFix;
 		}
 
-		if($isSkinFix == 'Y')
+		if ($isSkinFix == 'Y')
 		{
 			$moduleInfo->{$skinTargetValue} = $skinName;
 			$skinVars = json_decode($skinVars);
 
-			if(is_array($skinVars))
+			if (is_array($skinVars))
 			{
-				foreach($skinVars as $key => $val)
+				foreach ($skinVars as $key => $val)
 				{
-					if(empty($val))
+					if (empty($val))
 					{
 						continue;
 					}
@@ -1003,7 +1003,7 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$useMobile = Context::get('use_mobile');
 
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}

Braces +155 added lines, -79 removed lines

@@ -22,7 +22,9 @@ 
 		$args = new stdClass();
 		$args->title = Context::get('title');
 		$output = executeQuery('module.insertModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage("success_registed");
 
@@ -36,7 +38,9 @@ 
 	function procModuleAdminUpdateCategory()
 	{
 		$output = $this->doUpdateModuleCategory();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_updated');
 
@@ -50,7 +54,9 @@ 
 	function procModuleAdminDeleteCategory()
 	{
 		$output = $this->doDeleteModuleCategory();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_deleted');
 
@@ -91,8 +97,7 @@ 
 			// Get information of the target module to copy
 			$module_srl = Context::get('module_srl');
 			$args = Context::getRequestVars();
-		}
-		else
+		} else
 		{
 			$module_srl = $args->module_srl;
 		}
@@ -107,11 +112,19 @@ 
 		for($i=1;$i<=10;$i++)
 		{
 			$mid = trim($args->{"mid_".$i});
-			if(!$mid) continue;
-			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new BaseObject(-1, 'msg_limit_mid');
+			if(!$mid) {
+				continue;
+			}
+			if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) {
+				return new BaseObject(-1, 'msg_limit_mid');
+			}
 			$browser_title = $args->{"browser_title_".$i};
-			if(!$mid) continue;
-			if($mid && !$browser_title) $browser_title = $mid;
+			if(!$mid) {
+				continue;
+			}
+			if($mid && !$browser_title) {
+				$browser_title = $mid;
+			}
 			$clones[$mid] = $browser_title;
 		}
 		if(count($clones) < 1)
@@ -131,7 +144,9 @@ 
 		$grant = array();
 		if($output->data)
 		{
-			foreach($output->data as $val) $grant[$val->name][] = $val->group_srl;
+			foreach($output->data as $val) {
+				$grant[$val->name][] = $val->group_srl;
+			}
 		}
 
 		// get Extra Vars
@@ -218,11 +233,19 @@ 
 			}
 
 			// Grant module permissions
-			if(count($grant) > 0) $oModuleController->insertModuleGrants($module_srl, $grant);
-			if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			if(count($grant) > 0) {
+				$oModuleController->insertModuleGrants($module_srl, $grant);
+			}
+			if($extra_vars) {
+				$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+			}
 
-			if($moduleSkinVars) $oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
-			if($moduleMobileSkinVars) $oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			if($moduleSkinVars) {
+				$oModuleController->insertModuleSkinVars($module_srl, $moduleSkinVars);
+			}
+			if($moduleMobileSkinVars) {
+				$oModuleController->insertModuleMobileSkinVars($module_srl, $moduleMobileSkinVars);
+			}
 
 			$triggerObj->moduleSrlList[] = $module_srl;
 		}
@@ -235,8 +258,7 @@ 
 		{
 			$message = implode('\n', $errorLog);
 			$this->setMessage($message);
-		}
-		else
+		} else
 		{
 			$message = $lang->success_registed;
 			$this->setMessage('success_registed');
@@ -262,9 +284,9 @@ 
 
 	private function _returnByProc($isProc, $msg='msg_invalid_request')
 	{
-		if(!$isProc)
-			return;
-		else
+		if(!$isProc) {
+					return;
+		} else
 		{
 			return new BaseObject(-1, $msg);
 		}
@@ -282,7 +304,9 @@ 
 		// Get information of the module
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$module_info) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_info) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// Register Admin ID
 		$oModuleController->deleteAdminId($module_srl);
 		$admin_member = Context::get('admin_member');
@@ -292,7 +316,9 @@ 
 			foreach($admin_members as $admin_id)
 			{
 				$admin_id = trim($admin_id);
-				if(!$admin_id) continue;
+				if(!$admin_id) {
+					continue;
+				}
 				$oModuleController->insertAdminId($module_srl, $admin_id);
 			}
 		}
@@ -318,15 +344,18 @@ 
 				$grant->{$grant_name}[] = $default;
 				continue;
 				// users in a particular group
-			}
-			else
+			} else
 			{
 				$group_srls = Context::get($grant_name);
 				if($group_srls)
 				{
-					if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-					elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-					else $group_srls = array($group_srls);
+					if(strpos($group_srls,'|@|')!==false) {
+						$group_srls = explode('|@|',$group_srls);
+					} elseif(strpos($group_srls,',')!==false) {
+						$group_srls = explode(',',$group_srls);
+					} else {
+						$group_srls = array($group_srls);
+					}
 					$grant->{$grant_name} = $group_srls;
 				}
 				continue;
@@ -338,7 +367,9 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('module.deleteModuleGrants', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Permissions stored in the DB
 		foreach($grant as $grant_name => $group_srls)
 		{
@@ -349,7 +380,9 @@ 
 				$args->name = $grant_name;
 				$args->group_srl = $val;
 				$output = executeQuery('module.insertModuleGrant', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 		$this->setMessage('success_registed');
@@ -375,19 +408,16 @@ 
 				if($module_info->is_mskin_fix == 'Y')
 				{
 					$skin = $module_info->mskin;
-				}
-				else
+				} else
 				{
 					$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M');
 				}
-			}
-			else
+			} else
 			{
 				if($module_info->is_skin_fix == 'Y')
 				{
 					$skin = $module_info->skin;
-				}
-				else
+				} else
 				{
 					$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P');
 				}
@@ -400,8 +430,7 @@ 
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 				$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
-			}
-			else
+			} else
 			{
 				$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 				$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -421,7 +450,9 @@ 
 			{
 				foreach($skin_info->extra_vars as $vars)
 				{
-					if($vars->type!='image') continue;
+					if($vars->type!='image') {
+						continue;
+					}
 
 					$image_obj = $obj->{$vars->name};
 					// Get a variable to delete
@@ -453,7 +484,9 @@ 
 					// Upload the file to a path
 					$path = sprintf("./files/attach/images/%s/", $module_srl);
 					// Create a directory
-					if(!FileHandler::makeDir($path)) return false;
+					if(!FileHandler::makeDir($path)) {
+						return false;
+					}
 
 					$filename = $path.$image_obj['name'];
 					// Move the file
@@ -484,8 +517,7 @@ 
 			if($mode === 'M')
 			{
 				$output = $oModuleController->insertModuleMobileSkinVars($module_srl, $obj);
-			}
-			else
+			} else
 			{
 				$output = $oModuleController->insertModuleSkinVars($module_srl, $obj);
 			}
@@ -506,10 +538,14 @@ 
 	{
 		$vars = Context::getRequestVars();
 
-		if(!$vars->module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if(!$vars->module_srls) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$module_srls = explode(',',$vars->module_srls);
-		if(count($module_srls) < 1) return new BaseObject(-1,'msg_invalid_request');
+		if(count($module_srls) < 1) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$oModuleController= getController('module');
@@ -541,8 +577,7 @@ 
 			if(Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
-			}
-			else
+			} else
 			{
 				global $lang;
 				htmlHeader();
@@ -561,10 +596,14 @@ 
 	function procModuleAdminModuleGrantSetup()
 	{
 		$module_srls = Context::get('module_srls');
-		if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srls) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$modules = explode(',',$module_srls);
-		if(count($modules) < 1) return new BaseObject(-1,'msg_invalid_request');
+		if(count($modules) < 1) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -592,17 +631,20 @@ 
 				$grant->{$grant_name}[] = $default;
 				continue;
 				// Users in a particular group
-			}
-			else
+			} else
 			{
 				$group_srls = Context::get($grant_name);
 				if($group_srls)
 				{
 					if(!is_array($group_srls))
 					{
-						if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-						elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-						else $group_srls = array($group_srls);
+						if(strpos($group_srls,'|@|')!==false) {
+							$group_srls = explode('|@|',$group_srls);
+						} elseif(strpos($group_srls,',')!==false) {
+							$group_srls = explode(',',$group_srls);
+						} else {
+							$group_srls = array($group_srls);
+						}
 					}
 					$grant->{$grant_name} = $group_srls;
 				}
@@ -617,7 +659,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.deleteModuleGrants', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 			// Permissions stored in the DB
 			foreach($grant as $grant_name => $group_srls)
 			{
@@ -628,7 +672,9 @@ 
 					$args->name = $grant_name;
 					$args->group_srl = $val;
 					$output = executeQuery('module.insertModuleGrant', $args);
-					if(!$output->toBool()) return $output;
+					if(!$output->toBool()) {
+						return $output;
+					}
 				}
 			}
 		}
@@ -638,8 +684,7 @@ 
 			if(Context::get('success_return_url'))
 			{
 				$this->setRedirectUrl(Context::get('success_return_url'));
-			}
-			else
+			} else
 			{
 				global $lang;
 				htmlHeader();
@@ -665,18 +710,30 @@ 
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->name = str_replace(' ','_',Context::get('lang_code'));
 		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
 
 		// if args->name is empty, random generate for user define language
-		if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		if(empty($args->name)) {
+			$args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+		}
 
-		if(!$args->name) return new BaseObject(-1,'msg_invalid_request');
+		if(!$args->name) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// Check whether a language code exists
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If exists, clear the old values for updating
-		if($output->data) $output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if($output->data) {
+			$output = executeQuery('module.deleteLang', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Enter
 		$lang_supported = Context::get('lang_supported');
 		foreach($lang_supported as $key => $val)
@@ -693,7 +750,9 @@ 
 			if($args->value)
 			{
 				$output = executeQuery('module.insertLang', $args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
@@ -716,11 +775,17 @@ 
 		$args->site_srl = (int)$site_module_info->site_srl;
 		$args->name = str_replace(' ','_',Context::get('name'));
 		$args->lang_name = str_replace(' ','_',Context::get('lang_name'));
-		if(!empty($args->lang_name)) $args->name = $args->lang_name;
-		if(!$args->name) return new BaseObject(-1,'msg_invalid_request');
+		if(!empty($args->lang_name)) {
+			$args->name = $args->lang_name;
+		}
+		if(!$args->name) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$output = executeQuery('module.deleteLang', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$this->makeCacheDefinedLangCode($args->site_srl);
 
 		$this->setMessage("success_deleted", 'info');
@@ -731,7 +796,9 @@ 
 
 	function procModuleAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$oModuleController = getController('module');
 		$oModuleModel = getModel('module');
@@ -744,14 +811,20 @@ 
 		$args = new stdClass;
 		$logged_info = Context::get('logged_info');
 		$site_module_info = Context::get('site_module_info');
-		if($site_keyword) $args->site_keyword = $site_keyword;
+		if($site_keyword) {
+			$args->site_keyword = $site_keyword;
+		}
 
 		if(!$site_srl)
 		{
-			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) $args->site_srl = 0;
-			else $args->site_srl = (int)$site_module_info->site_srl;
+			if($logged_info->is_admin == 'Y' && !$site_keyword && !$vid) {
+				$args->site_srl = 0;
+			} else {
+				$args->site_srl = (int)$site_module_info->site_srl;
+			}
+		} else {
+			$args->site_srl = $site_srl;
 		}
-		else $args->site_srl = $site_srl;
 
 		$args->sort_index1 = 'sites.domain';
 
@@ -764,7 +837,9 @@ 
 			foreach($output->data as $val)
 			{
 				$module = trim($val->module);
-				if(!$module) continue;
+				if(!$module) {
+					continue;
+				}
 
 				// replace user defined lang.
 				$oModuleController->replaceDefinedLangCode($val->browser_title);
@@ -800,7 +875,9 @@ 
 		{
 			foreach($mid_list as $module => $val)
 			{
-				if(!$selected_module) $selected_module = $module;
+				if(!$selected_module) {
+					$selected_module = $module;
+				}
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 
 				if(!$xml_info)
@@ -823,8 +900,7 @@ 
 							{
 								$mid_list[$module]->list[$key]->module_category_srl = $categoryNameList[$categorySrl];
 							}
-						}
-						else
+						} else
 						{
 							$mid_list[$module]->list[$key]->module_category_srl = Context::getLang('none_category');
 						}
@@ -851,13 +927,14 @@ 
 		{
 			$site_module_info = Context::get('site_module_info');
 			$args->site_srl = (int)$site_module_info->site_srl;
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 		}
 		$output = executeQueryArray('module.getLang', $args);
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 
 		$langMap = array();
 		foreach($output->data as $lang)
@@ -948,8 +1025,7 @@ 
 		if($mid)
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid);
-		}
-		else
+		} else
 		{
 			$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($moduleSrl);
 		}

modules/module/module.admin.model.php

Doc Comments +6 added lines, -1 removed lines

@@ -56,6 +56,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $modulePath
+	 */
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
 		if($modulePath)
@@ -306,7 +309,7 @@ 
 	 * Skin setting page for the module
 	 *
 	 * @param $module_srl sequence of module
-	 * @param $mode P or M
+	 * @param string $mode P or M
 	 * @return string The HTML code
 	 */
 	function _getModuleSkinHTML($module_srl, $mode)
@@ -395,6 +398,7 @@ 
 	/**
 	 * @brief Get values for a particular language code
 	 * Return its corresponding value if lang_code is specified. Otherwise return $name.
+	 * @param string $name
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
@@ -513,6 +517,7 @@ 
 
 	/**
 	 * @brief Return current lang list
+	 * @param stdClass $args
 	 */
 	function getLangListByLangcode($args)
 	{

Spacing +84 added lines, -84 removed lines

@@ -26,16 +26,16 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new BaseObject();
+		if (!$output->toBool() || !$output->data) return new BaseObject();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$info_xml = $oModuleModel->getModuleInfoXml($val->module);
 			$oModuleController->replaceDefinedLangCode($val->browser_title);
-			$list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
+			$list[$val->module_srl] = array('module_srl'=>$val->module_srl, 'mid'=>$val->mid, 'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
 		}
-		$modules = explode(',',$args->module_srls);
-		for($i=0;$i<count($modules);$i++)
+		$modules = explode(',', $args->module_srls);
+		for ($i = 0; $i < count($modules); $i++)
 		{
 			$module_list[$modules[$i]] = $list[$modules[$i]];
 		}
@@ -49,7 +49,7 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -58,12 +58,12 @@ 
 
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
-		if($modulePath)
+		if ($modulePath)
 		{
 			// get the skins path
 			$oModuleModel = getModel('module');
 			$skin_list = $oModuleModel->getSkins($modulePath);
-			Context::set('skin_list',$skin_list);
+			Context::set('skin_list', $skin_list);
 
 			$mskin_list = $oModuleModel->getSkins($modulePath, "m.skins");
 			Context::set('mskin_list', $mskin_list);
@@ -74,7 +74,7 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$security = new Security();
@@ -83,21 +83,21 @@ 
 		$security->encodeHTML('skin_list..title');
 		$security->encodeHTML('mskin_list..title');
 
-		$grant_list =new stdClass();
+		$grant_list = new stdClass();
 		// Grant virtual permission for access and manager
-		if(!$grantList)
+		if (!$grantList)
 		{
-			$grantList =new stdClass();
+			$grantList = new stdClass();
 		}
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($grantList))
+		if (count($grantList))
 		{
-			foreach($grantList as $key => $val)
+			foreach ($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -119,7 +119,7 @@ 
 		$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
 		Context::set('setup_content', $content);
 
-		if(count($tabChoice) == 0)
+		if (count($tabChoice) == 0)
 		{
 			$tabChoice = array('tab1'=>1, 'tab2'=>1, 'tab3'=>1);
 		}
@@ -136,7 +136,7 @@ 
 	 */
 	function getModuleGrantHTML($module_srl, $source_grant_list)
 	{
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return;
 		}
@@ -154,12 +154,12 @@ 
 		$grant_list->access = new stdClass();
 		$grant_list->access->title = Context::getLang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if (count($source_grant_list))
 		{
-			foreach($source_grant_list as $key => $val)
+			foreach ($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -172,14 +172,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
+				if ($val->group_srl == 0) $default_grant[$val->name] = 'all';
+				else if ($val->group_srl == -1) $default_grant[$val->name] = 'member';
+				else if ($val->group_srl == -2) $default_grant[$val->name] = 'site';
+				else if ($val->group_srl == -3) $default_grant[$val->name] = 'manager';
 				else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
@@ -213,12 +213,12 @@ 
 	{
 		$targetModule = Context::get('target_module');
 		$moduleSrl = Context::get('module_srl');
-		if(!$targetModule || !$moduleSrl)
+		if (!$targetModule || !$moduleSrl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if($targetModule == '_SHORTCUT')
+		if ($targetModule == '_SHORTCUT')
 		{
 			return new BaseObject(0);
 		}
@@ -231,12 +231,12 @@ 
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($xmlInfo->grant))
+		if (count($xmlInfo->grant))
 		{
-			foreach($xmlInfo->grant as $key => $val)
+			foreach ($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grantList->{$key} = $val;
 			}
 		}
@@ -249,14 +249,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $moduleSrl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
+				if ($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
+				else if ($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
+				else if ($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
+				else if ($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
 				else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
@@ -265,15 +265,15 @@ 
 			}
 		}
 
-		if(is_object($grantList))
+		if (is_object($grantList))
 		{
-			foreach($grantList AS $key=>$value)
+			foreach ($grantList AS $key=>$value)
 			{
-				if(isset($defaultGrant->{$key}))
+				if (isset($defaultGrant->{$key}))
 				{
 					$grantList->{$key}->grant = $defaultGrant->{$key};
 				}
-				if(isset($selectedGroup->{$key}))
+				if (isset($selectedGroup->{$key}))
 				{
 					$grantList->{$key}->group_srls = $selectedGroup->{$key};
 				}
@@ -315,11 +315,11 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if (!$module_info) return;
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
-			if($module_info->is_skin_fix == 'N')
+			if ($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
 			}
@@ -330,7 +330,7 @@ 
 		}
 		else
 		{
-			if($module_info->is_mskin_fix == 'N')
+			if ($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
 			}
@@ -343,7 +343,7 @@ 
 		$module_path = './modules/'.$module_info->module;
 
 		// Get XML information of the skin and skin sinformation set in DB
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -354,25 +354,25 @@ 
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 		}
 
-		if(count($skin_info->extra_vars)) 
+		if (count($skin_info->extra_vars)) 
 		{
-			foreach($skin_info->extra_vars as $key => $val) 
+			foreach ($skin_info->extra_vars as $key => $val) 
 			{
 				$group = $val->group;
 				$name = $val->name;
 				$type = $val->type;
-				if($skin_vars[$name]) 
+				if ($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
 				}
 				else $value = '';
-				if($type=="checkbox")
+				if ($type == "checkbox")
 				{
-					$value = $value?unserialize($value):array();
+					$value = $value ?unserialize($value) : array();
 				}
 
 				$value = empty($value) ? $val->default : $value;
-				$skin_info->extra_vars[$key]->value= $value;
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 
@@ -398,7 +398,7 @@ 
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
-		if($isFullLanguage)
+		if ($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
 		}
@@ -407,15 +407,15 @@ 
 			$lang_supported = Context::get('lang_supported');
 		}
 
-		if(substr($name,0,12)=='$user_lang->')
+		if (substr($name, 0, 12) == '$user_lang->')
 		{
 			$args = new stdClass();
-			$args->site_srl = (int)$site_srl;
-			$args->name = substr($name,12);
+			$args->site_srl = (int) $site_srl;
+			$args->name = substr($name, 12);
 			$output = executeQueryArray('module.getLang', $args);
-			if($output->data)
+			if ($output->data)
 			{
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
 					$selected_lang[$val->lang_code] = $val->value;
 				}
@@ -424,24 +424,24 @@ 
 		else
 		{
 			$tmp = unserialize($name);
-			if($tmp)
+			if ($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
-				if(is_array($lang_supported))
+				if (!$rand_name) $rand_name = array_shift($tmp);
+				if (is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach ($lang_supported as $key => $val)
+						$selected_lang[$key] = $tmp[$key] ? $tmp[$key] : $rand_name;
 				}
 			}
 		}
 
 		$output = array();
-		if(is_array($lang_supported))
+		if (is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach ($lang_supported as $key => $val)
+				$output[$key] = $selected_lang[$key] ? $selected_lang[$key] : $name;
 		}
 		return $output;
 	}
@@ -452,7 +452,7 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new BaseObject(-1,'msg_invalid_request');
+		if (!$name) return new BaseObject(-1, 'msg_invalid_request');
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +465,7 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +473,7 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if ($output->toBool()) $langList = $output->data;
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,23 +485,23 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$langList = array();
 
 		// search value
 		$output = executeQueryArray('module.getLangNameByValue', $args);
-		if($output->toBool() && is_array($output->data))
+		if ($output->toBool() && is_array($output->data))
 		{
 			unset($args->value);
 
-			foreach($output->data as $data)
+			foreach ($output->data as $data)
 			{
 				$args->langName = $data->name;
 				$columnList = array('lang_code', 'name', 'value');
 				$outputByName = executeQueryArray('module.getLangListByName', $args, $columnList);
 
-				if($outputByName->toBool())
+				if ($outputByName->toBool())
 				{
 					$langList = array_merge($langList, $outputByName->data);
 				}
@@ -517,7 +517,7 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output;
 	}
@@ -528,7 +528,7 @@ 
 	function getModuleAdminMultilingualHtml()
 	{
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'multilingual_v17.html');
 
 		$this->add('html', $tpl);
 	}
@@ -540,7 +540,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->langCode = Context::get('lang_code');
 		$args->page = Context::get('page');
 		$args->sort_index = 'name';
@@ -550,7 +550,7 @@ 
 		$args->list_count = Context::get('list_count');
 		$args->page_count = 5;
 
-		if(!$args->langCode)
+		if (!$args->langCode)
 		{
 			$args->langCode = Context::get('lang_type');
 		}
@@ -567,7 +567,7 @@ 
 		$oSecurity->encodeHTML('lang_code_list..');
 
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17_list.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'multilingual_v17_list.html');
 
 		$this->add('html', $tpl);
 	}
@@ -577,9 +577,9 @@ 
 	 */
 	function getModuleAdminModuleSearcherHtml()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/admin/lang');
+		Context::loadLang(_XE_PATH_.'modules/admin/lang');
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'module_searcher_v17.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'module_searcher_v17.html');
 
 		$this->add('html', $tpl);
 	}
@@ -589,7 +589,7 @@ 
 	 */
 	function getModuleAdminModuleInfo()
 	{
-		if(Context::get('search_module_srl'))
+		if (Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
 		}

Braces +78 added lines, -44 removed lines

@@ -26,7 +26,9 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new BaseObject();
+		if(!$output->toBool() || !$output->data) {
+			return new BaseObject();
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -49,7 +51,9 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -96,8 +100,12 @@ 
 		{
 			foreach($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -158,8 +166,12 @@ 
 		{
 			foreach($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -176,11 +188,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$default_grant[$val->name] = 'all';
+				} else if($val->group_srl == -1) {
+					$default_grant[$val->name] = 'member';
+				} else if($val->group_srl == -2) {
+					$default_grant[$val->name] = 'site';
+				} else if($val->group_srl == -3) {
+					$default_grant[$val->name] = 'manager';
+				} else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
 					$default_grant[$val->name] = 'group';
@@ -235,8 +251,12 @@ 
 		{
 			foreach($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grantList->{$key} = $val;
 			}
 		}
@@ -253,11 +273,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$defaultGrant->{$val->name} = 'all';
+				} else if($val->group_srl == -1) {
+					$defaultGrant->{$val->name} = 'member';
+				} else if($val->group_srl == -2) {
+					$defaultGrant->{$val->name} = 'site';
+				} else if($val->group_srl == -3) {
+					$defaultGrant->{$val->name} = 'manager';
+				} else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
 					$defaultGrant->{$val->name} = 'group';
@@ -315,26 +339,25 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if(!$module_info) {
+			return;
+		}
 
 		if($mode === 'P')
 		{
 			if($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->skin;
 			}
-		}
-		else
+		} else
 		{
 			if($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->mskin;
 			}
@@ -347,8 +370,7 @@ 
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
-		}
-		else
+		} else
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -364,8 +386,9 @@ 
 				if($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
+				} else {
+					$value = '';
 				}
-				else $value = '';
 				if($type=="checkbox")
 				{
 					$value = $value?unserialize($value):array();
@@ -401,8 +424,7 @@ 
 		if($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
-		}
-		else
+		} else
 		{
 			$lang_supported = Context::get('lang_supported');
 		}
@@ -420,19 +442,21 @@ 
 					$selected_lang[$val->lang_code] = $val->value;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$tmp = unserialize($name);
 			if($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
+				if(!$rand_name) {
+					$rand_name = array_shift($tmp);
+				}
 				if(is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach($lang_supported as $key => $val) {
+											$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					}
 				}
 			}
 		}
@@ -440,8 +464,9 @@ 
 		$output = array();
 		if(is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach($lang_supported as $key => $val) {
+							$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			}
 		}
 		return $output;
 	}
@@ -452,7 +477,9 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new BaseObject(-1,'msg_invalid_request');
+		if(!$name) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +492,9 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +502,9 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if($output->toBool()) {
+			$langList = $output->data;
+		}
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,7 +516,9 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$langList = array();
 
@@ -517,7 +550,9 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output;
 	}
@@ -592,8 +627,7 @@ 
 		if(Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
-		}
-		else
+		} else
 		{
 			$module_srl = Context::get('module_srl');
 		}

modules/module/module.controller.php

Doc Comments +7 added lines

@@ -933,6 +933,7 @@ 
 
 	/**
 	 * @brief Insert skin vars to a module
+	 * @param string $mode
 	 */
 	function _insertModuleSkinVars($module_srl, $obj, $mode)
 	{
@@ -1006,6 +1007,7 @@ 
 
 	/**
 	 * @brief Remove skin vars of a module
+	 * @param string $mode
 	 */
 	function _deleteModuleSkinVars($module_srl, $mode)
 	{
@@ -1242,6 +1244,7 @@ 
 
 	/**
 	 * @brief Update a file into the file box
+	 * @param stdClass $vars
 	 */
 	function updateModuleFileBox($vars)
 	{
@@ -1283,6 +1286,7 @@ 
 
 	/**
 	 * @brief Add a file into the file box
+	 * @param stdClass $vars
 	 */
 	function insertModuleFileBox($vars)
 	{
@@ -1336,6 +1340,9 @@ 
 		if(!$output->toBool()) return $output;
 	}
 
+	/**
+	 * @param stdClass $vars
+	 */
 	function deleteModuleFileBox($vars)
 	{
 		// delete real file

Spacing +161 added lines, -161 removed lines

@@ -29,7 +29,7 @@ 
 		$output = executeQuery('module.insertActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -51,7 +51,7 @@ 
 		$output = executeQuery('module.deleteActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -75,12 +75,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.insertTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -104,12 +104,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.deleteTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -129,12 +129,12 @@ 
 		$args->module = $module;
 
 		$output = executeQuery('module.deleteModuleTriggers', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -148,11 +148,11 @@ 
 	 * @brief Add module extend
 	 *
 	 */
-	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function insertModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if ($kind != 'admin') $kind = '';
+		if (!in_array($type, array('model', 'controller', 'view', 'api', 'mobile'))) return false;
+		if (in_array($parent_module, array('module', 'addon', 'widget', 'layout'))) return false;
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +164,7 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if ($output->data->count > 0) return false;
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -174,7 +174,7 @@ 
 	 * @brief Delete module extend
 	 *
 	 */
-	function deleteModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function deleteModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -199,9 +199,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if (!$origin_config) $origin_config = new stdClass;
 
-		foreach($config as $key => $val)
+		foreach ($config as $key => $val)
 		{
 			$origin_config->{$key} = $val;
 		}
@@ -215,19 +215,19 @@ 
 	 */
 	function insertModuleConfig($module, $config, $site_srl = 0)
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->module = $module;
 		$args->config = serialize($config);
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -246,13 +246,13 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -265,10 +265,10 @@ 
 	 */
 	function insertSite($domain, $index_module_srl)
 	{
-		if(isSiteID($domain))
+		if (isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1,'msg_already_registed_vid');
+			if ($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1, 'msg_already_registed_vid');
 		}
 		else
 		{
@@ -284,10 +284,10 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new BaseObject(-1,'msg_already_registed_vid');
+		if ($output) return new BaseObject(-1, 'msg_already_registed_vid');
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -302,32 +302,32 @@ 
 		$columnList = array('sites.site_srl', 'sites.domain');
 		$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
 
-		if(!$args->domain && $site_info->site_srl == $args->site_srl)
+		if (!$args->domain && $site_info->site_srl == $args->site_srl)
 		{
 			$args->domain = $site_info->domain;
 		}
 
-		if($site_info->domain != $args->domain)
+		if ($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1,'msg_already_registed_vid');
+			if ($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1, 'msg_already_registed_domain');
+			if (isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1, 'msg_already_registed_vid');
 
-			if($args->domain && !isSiteID($args->domain))
+			if ($args->domain && !isSiteID($args->domain))
 			{
 				$args->domain = (strlen($args->domain) >= 1 && substr_compare($args->domain, '/', -1) === 0) ? substr($args->domain, 0, -1) : $args->domain;
 			}
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if ($args->site_srl == 0) $vid = '';
+		else $vid = $args->domain;
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -345,7 +345,7 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-1, 'msg_limit_mid');
+		if (!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-1, 'msg_limit_mid');
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -379,7 +379,7 @@ 
 	 */
 	function insertModule($args)
 	{
-		if(isset($args->isMenuCreate))
+		if (isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
 		}
@@ -389,11 +389,11 @@ 
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
+		if ($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,16 +404,16 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if (!$args->module_srl) $args->module_srl = getNextSequence();
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -423,13 +423,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -443,14 +443,14 @@ 
 
 		$args->browser_title = strip_tags($args->browser_title);
 
-		if($isMenuCreate === TRUE)
+		if ($isMenuCreate === TRUE)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $args->menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
 
 			// if menu is not created, create menu also. and does not supported that in virtual site.
-			if(!$menuOutput->data && !$args->site_srl)
+			if (!$menuOutput->data && !$args->site_srl)
 			{
 				$oMenuAdminModel = getAdminModel('menu');
 
@@ -468,7 +468,7 @@ 
 				$menuArgs->listorder = $args->menu_item_srl * -1;
 
 				$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);
-				if(!$menuItemOutput->toBool())
+				if (!$menuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $menuItemOutput;
@@ -481,7 +481,7 @@ 
 		// Insert a module
 		$args->menu_srl = $menuArgs->menu_srl;
 		$output = executeQuery('module.insertModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -493,12 +493,12 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 		return $output;
 	}
 
@@ -507,7 +507,7 @@ 
 	 */
 	function updateModule($args)
 	{
-		if(isset($args->isMenuCreate))
+		if (isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
 		}
@@ -517,7 +517,7 @@ 
 		}
 		
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -526,29 +526,29 @@ 
 		$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
 
-		if(!$args->site_srl || !$args->browser_title)
+		if (!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if (!$args->site_srl) $args->site_srl = (int) $module_info->site_srl;
+			if (!$args->browser_title) $args->browser_title = $module_info->browser_title;
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
 
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			$oDB->rollback();
 			return new BaseObject(-1, 'msg_module_name_exists');
 		}
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -558,13 +558,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -574,27 +574,27 @@ 
 			}
 		}
 		$output = executeQuery('module.updateModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($isMenuCreate === TRUE)
+		if ($isMenuCreate === TRUE)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->url = $module_info->mid;
 			$menuArgs->site_srl = $module_info->site_srl;
 			$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
-			if($menuOutput->data && count($menuOutput->data))
+			if ($menuOutput->data && count($menuOutput->data))
 			{
 				$oMenuAdminController = getAdminController('menu');
-				foreach($menuOutput->data as $itemInfo)
+				foreach ($menuOutput->data as $itemInfo)
 				{
 					$itemInfo->url = $args->mid;
 	
 					$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
-					if(!$updateMenuItemOutput->toBool())
+					if (!$updateMenuItemOutput->toBool())
 					{
 						$oDB->rollback();
 						return $updateMenuItemOutput;
@@ -604,7 +604,7 @@ 
 		}
 
 		// if mid changed, change mid of success_return_url to new mid
-		if($module_info->mid != $args->mid && Context::get('success_return_url'))
+		if ($module_info->mid != $args->mid && Context::get('success_return_url'))
 		{
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 		}
@@ -614,11 +614,11 @@ 
 
 		$oDB->commit();
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -637,7 +637,7 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if (!!$output->error) return false;
 
 		return true;
 	}
@@ -652,11 +652,11 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -671,7 +671,7 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -681,7 +681,7 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
+		if (!$site_srl) $args->site_srl = $site_module_info->site_srl;
 		else $args->site_srl = $site_srl;
 
 		unset($output);
@@ -690,9 +690,9 @@ 
 		$menuOutput = $oMenuAdminModel->getMenuList($args);
 
 		// get menu_srl by site_srl
-		if(is_array($menuOutput->data))
+		if (is_array($menuOutput->data))
 		{
-			foreach($menuOutput->data AS $key=>$value)
+			foreach ($menuOutput->data AS $key=>$value)
 			{
 				$args->menu_srl = $value->menu_srl;
 				break;
@@ -701,7 +701,7 @@ 
 
 		$output = executeQuery('menu.getMenuItemByUrl', $args);
 		// menu delete
-		if($output->data)
+		if ($output->data)
 		{
 			unset($args);
 			$args = new stdClass;
@@ -712,7 +712,7 @@ 
 			$oMenuAdminController = getAdminController('menu');
 			$output = $oMenuAdminController->deleteItem($args);
 
-			if($output->isSuccess)
+			if ($output->isSuccess)
 			{
 				return new BaseObject(0, 'success_deleted');
 			}
@@ -734,19 +734,19 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule');
+		if ($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule');
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -756,7 +756,7 @@ 
 		$args->module_srl = $module_srl;
 		// Delete module information from the DB
 		$output = executeQuery('module.deleteModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -770,10 +770,10 @@ 
 		// Remove the module manager
 		$this->deleteAdminId($module_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -785,7 +785,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -807,10 +807,10 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -826,7 +826,7 @@ 
 		$output = executeQuery('module.updateModuleMenu', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -839,15 +839,15 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('module.updateModuleLayout', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -866,37 +866,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new BaseObject();
-		foreach($arr_admins as $key => $user_id)
+		if (!is_array($arr_admins) || !count($arr_admins)) return new BaseObject();
+		foreach ($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if (!trim($user_id)) continue;
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new BaseObject();
+		if (!count($admins)) return new BaseObject();
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 		{
-			$args->email_address = '\''.implode('\',\'',$admins).'\'';
+			$args->email_address = '\''.implode('\',\'', $admins).'\'';
 		}
 		else
 		{
-			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
+			$args->user_ids = '\''.implode('\',\'', $admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			unset($args);
 			$args = new stdClass;
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		return new BaseObject();
 	}
@@ -909,12 +909,12 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
 		else
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
 
-		if(!$member_info->member_srl) return;
+		if (!$member_info->member_srl) return;
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -929,11 +929,11 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
-		if($admin_id)
+		if ($admin_id)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if ($member_info->member_srl) $args->member_srl = $member_info->member_srl;
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -970,18 +970,18 @@ 
 		$oDB->begin();
 
 		$output = $this->_deleteModuleSkinVars($module_srl, $mode);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new BaseObject();
+		if (!$obj || !count($obj)) return new BaseObject();
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
 			// #17927989 For an old board which used the old blog module
 			// it often saved menu item(stdClass) on the skin info column
@@ -992,9 +992,9 @@ 
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 
-			if($mode === 'P')
+			if ($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
 			}
@@ -1002,7 +1002,7 @@ 
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 				$oDB->rollback();
@@ -1041,7 +1041,7 @@ 
 		$args->module_srl = $module_srl;
 		$mode = $mode === 'P' ? 'P' : 'M';
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
@@ -1055,7 +1055,7 @@ 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->delete($cache_key);
 		}
@@ -1070,22 +1070,22 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if (is_object($val) || is_array($val)) continue;
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_extra_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1104,7 +1104,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_extra_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1120,19 +1120,19 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $name => $val)
+		foreach ($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if (!$val || !count($val)) continue;
 
-			foreach($val as $group_srl)
+			foreach ($val as $group_srl)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if (!$args->name || !$args->group_srl) continue;
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1153,9 +1153,9 @@ 
 	 */
 	function replaceDefinedLangCode(&$output, $isReplaceLangCode = true)
 	{
-		if($isReplaceLangCode)
+		if ($isReplaceLangCode)
 		{
-			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this, '_replaceLangCode'), $output);
 		}
 	}
 
@@ -1164,29 +1164,29 @@ 
 		static $lang = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($lang === false && $oCacheHandler->isSupport())
+		if ($lang === false && $oCacheHandler->isSupport())
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info)
+			if (!$site_module_info)
 			{
 				$oModuleModel = getModel('module');
 				$site_module_info = $oModuleModel->getDefaultMid();
 				Context::set('site_module_info', $site_module_info);
 			}
 
-			$object_key = 'user_defined_langs:' . $site_module_info->site_srl . ':' . Context::getLangType();
+			$object_key = 'user_defined_langs:'.$site_module_info->site_srl.':'.Context::getLangType();
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$lang = $oCacheHandler->get($cache_key);
 
-			if($lang === false) {
+			if ($lang === false) {
 				$oModuleAdminController = getAdminController('module');
 				$lang = $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
 			}
 		}
 
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if (!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
 
-		return str_replace('$user_lang->','',$matches[0]);
+		return str_replace('$user_lang->', '', $matches[0]);
 	}
 
 
@@ -1199,17 +1199,17 @@ 
 		if ($ajax) Context::setRequestMethod('JSON');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
 
-		$vars = Context::gets('addfile','filter');
+		$vars = Context::gets('addfile', 'filter');
 		$attributeNames = Context::get('attribute_name');
 		$attributeValues = Context::get('attribute_value');
-		if(is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
+		if (is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
 		{
 			$attributes = array();
-			foreach($attributeNames as $no => $name)
+			foreach ($attributeNames as $no => $name)
 			{
-				if(empty($name))
+				if (empty($name))
 				{
 					continue;
 				}
@@ -1221,16 +1221,16 @@ 
 		$vars->comment = $attributes;
 		$module_filebox_srl = Context::get('module_filebox_srl');
 
-		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$ext = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new BaseObject(-1, 'msg_error_occured');
+		if ($vars->filter) $filter = explode(',', $vars->filter);
+		else $filter = array('jpg', 'jpeg', 'gif', 'png');
+		if (!in_array($ext, $filter)) return new BaseObject(-1, 'msg_error_occured');
 
 		$vars->member_srl = $logged_info->member_srl;
 
 		// update
-		if($module_filebox_srl > 0)
+		if ($module_filebox_srl > 0)
 		{
 			$vars->module_filebox_srl = $module_filebox_srl;
 			$output = $this->updateModuleFileBox($vars);
@@ -1238,10 +1238,10 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
+			if (!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
+			if (!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
+			if ($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1255,7 +1255,7 @@ 
 		}
 		else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
+			if ($output) $this->add('save_filename', $output->get('save_filename'));
 			else $this->add('save_filename', '');
 		}
 	}
@@ -1267,7 +1267,7 @@ 
 	{
 		$args = new stdClass;
 		// have file
-		if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
+		if ($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
 		{
 			$oModuleModel = getModel('module');
 			$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
@@ -1276,18 +1276,18 @@ 
 			$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 			FileHandler::makeDir($path);
 
-			$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+			$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $ext);
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if (!checkUploadedFile($tmp)) return false;
 
-			if(!@move_uploaded_file($tmp, $save_filename))
+			if (!@move_uploaded_file($tmp, $save_filename))
 			{
 				return false;
 			}
 
-			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 			$args->filename = $save_filename;
 			$args->filesize = $vars->addfile['size'];
 		}
@@ -1313,14 +1313,14 @@ 
 		$oModuleModel = getModel('module');
 		$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 		FileHandler::makeDir($path);
-		$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+		$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $vars->ext);
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if (!checkUploadedFile($tmp)) return false;
 
 		// upload
-		if(!@move_uploaded_file($tmp, $save_filename))
+		if (!@move_uploaded_file($tmp, $save_filename))
 		{
 			return false;
 		}
@@ -1331,7 +1331,7 @@ 
 		$args->member_srl = $vars->member_srl;
 		$args->comment = $vars->comment;
 		$args->filename = $save_filename;
-		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$args->filesize = $vars->addfile['size'];
 
 		$output = executeQuery('module.insertModuleFileBox', $args);
@@ -1346,14 +1346,14 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1376,11 +1376,11 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if (!$timeout) $timeout = 60;
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if ($member_srl) $args->member_srl = $member_srl;
 		$output = executeQuery('module.insertLock', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('lock_name', $lock_name);
 			$output->add('deadline', $args->deadline);
@@ -1409,7 +1409,7 @@ 
 		$output = executeQuery('module.updateModuleInSites', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

Braces +221 added lines, -104 removed lines

@@ -150,9 +150,15 @@ 
 	 */
 	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if($kind != 'admin') {
+			$kind = '';
+		}
+		if(!in_array($type,array('model','controller','view','api','mobile'))) {
+			return false;
+		}
+		if(in_array($parent_module, array('module','addon','widget','layout'))) {
+			return false;
+		}
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +170,9 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if($output->data->count>0) {
+			return false;
+		}
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -199,7 +207,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if(!$origin_config) {
+			$origin_config = new stdClass;
+		}
 
 		foreach($config as $key => $val)
 		{
@@ -221,7 +231,9 @@ 
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
@@ -246,7 +258,9 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
@@ -268,9 +282,10 @@ 
 		if(isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new BaseObject(-1,'msg_already_registed_vid');
-		}
-		else
+			if($oModuleModel->isIDExists($domain, 0)) {
+				return new BaseObject(-1,'msg_already_registed_vid');
+			}
+		} else
 		{
 			$domain = strtolower($domain);
 		}
@@ -284,10 +299,14 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new BaseObject(-1,'msg_already_registed_vid');
+		if($output) {
+			return new BaseObject(-1,'msg_already_registed_vid');
+		}
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -310,8 +329,12 @@ 
 		if($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new BaseObject(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new BaseObject(-1,'msg_already_registed_vid');
+			if($info->site_srl && $info->site_srl != $args->site_srl) {
+				return new BaseObject(-1,'msg_already_registed_domain');
+			}
+			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) {
+				return new BaseObject(-1,'msg_already_registed_vid');
+			}
 
 			if($args->domain && !isSiteID($args->domain))
 			{
@@ -320,8 +343,11 @@ 
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if($args->site_srl == 0) {
+			$vid='';
+		} else {
+			$vid=$args->domain;
+		}
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
@@ -345,7 +371,9 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new BaseObject(-1, 'msg_limit_mid');
+		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) {
+			return new BaseObject(-1, 'msg_limit_mid');
+		}
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -382,18 +410,23 @@ 
 		if(isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
-		}
-		else
+		} else
 		{
 			$isMenuCreate = TRUE;
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new BaseObject(-1, 'msg_module_name_exists');
+		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) {
+			return new BaseObject(-1, 'msg_module_name_exists');
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,20 +437,20 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if(!$args->module_srl) {
+			$args->module_srl = getNextSequence();
+		}
 
 		// default value
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -426,14 +459,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -510,14 +541,15 @@ 
 		if(isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
-		}
-		else
+		} else
 		{
 			$isMenuCreate = TRUE;
 		}
 		
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -528,8 +560,12 @@ 
 
 		if(!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if(!$args->site_srl) {
+				$args->site_srl = (int)$module_info->site_srl;
+			}
+			if(!$args->browser_title) {
+				$args->browser_title = $module_info->browser_title;
+			}
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
@@ -545,14 +581,12 @@ 
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -561,14 +595,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -637,7 +669,9 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if(!!$output->error) {
+			return false;
+		}
 
 		return true;
 	}
@@ -652,7 +686,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
@@ -671,7 +707,9 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -681,8 +719,11 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
-		else $args->site_srl = $site_srl;
+		if(!$site_srl) {
+			$args->site_srl = $site_module_info->site_srl;
+		} else {
+			$args->site_srl = $site_srl;
+		}
 
 		unset($output);
 
@@ -715,8 +756,7 @@ 
 			if($output->isSuccess)
 			{
 				return new BaseObject(0, 'success_deleted');
-			}
-			else
+			} else
 			{
 				return new BaseObject($output->error, $output->message);
 			}
@@ -734,19 +774,25 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new BaseObject(-1, 'msg_cannot_delete_startmodule');
+		if($module_srl == $start_module->index_module_srl) {
+			return new BaseObject(-1, 'msg_cannot_delete_startmodule');
+		}
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -807,7 +853,9 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		if($oCacheHandler->isSupport())
@@ -839,7 +887,9 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
@@ -866,28 +916,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new BaseObject();
+		if(!is_array($arr_admins) || !count($arr_admins)) {
+			return new BaseObject();
+		}
 		foreach($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if(!trim($user_id)) {
+				continue;
+			}
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new BaseObject();
+		if(!count($admins)) {
+			return new BaseObject();
+		}
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 		if($member_config->identifier == 'email_address')
 		{
 			$args->email_address = '\''.implode('\',\'',$admins).'\'';
-		}
-		else
+		} else
 		{
 			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -896,7 +955,9 @@ 
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		return new BaseObject();
 	}
@@ -909,12 +970,15 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
-			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
-		else
-			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		if($member_config->identifier == 'email_address') {
+					$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
+		} else {
+					$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		}
 
-		if(!$member_info->member_srl) return;
+		if(!$member_info->member_srl) {
+			return;
+		}
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -933,7 +997,9 @@ 
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if($member_info->member_srl) {
+				$args->member_srl = $member_info->member_srl;
+			}
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -977,7 +1043,9 @@ 
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new BaseObject();
+		if(!$obj || !count($obj)) {
+			return new BaseObject();
+		}
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
@@ -987,18 +1055,23 @@ 
 			// it often saved menu item(stdClass) on the skin info column
 			// When updating the module on XE core 1.2.0 later versions, it occurs an error
 			// fixed the error
-			if (is_object($val)) continue;
-			if (is_array($val)) $val = serialize($val);
+			if (is_object($val)) {
+				continue;
+			}
+			if (is_array($val)) {
+				$val = serialize($val);
+			}
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 
 			if($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
@@ -1045,8 +1118,7 @@ 
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
-		}
-		else
+		} else
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleMobileSkinVars';
@@ -1070,17 +1142,23 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if(is_object($val) || is_array($val)) {
+				continue;
+			}
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
@@ -1120,11 +1198,15 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if(!$val || !count($val)) {
+				continue;
+			}
 
 			foreach($val as $group_srl)
 			{
@@ -1132,7 +1214,9 @@ 
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if(!$args->name || !$args->group_srl) {
+					continue;
+				}
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1184,7 +1268,9 @@ 
 			}
 		}
 
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if(!Context::get($matches[1]) && $lang[$matches[1]]) {
+			return $lang[$matches[1]];
+		}
 
 		return str_replace('$user_lang->','',$matches[0]);
 	}
@@ -1196,10 +1282,14 @@ 
 	function procModuleFileBoxAdd()
 	{
 		$ajax = Context::get('ajax');
-		if ($ajax) Context::setRequestMethod('JSON');
+		if ($ajax) {
+			Context::setRequestMethod('JSON');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$vars = Context::gets('addfile','filter');
 		$attributeNames = Context::get('attribute_name');
@@ -1223,9 +1313,14 @@ 
 
 		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new BaseObject(-1, 'msg_error_occured');
+		if($vars->filter) {
+			$filter = explode(',',$vars->filter);
+		} else {
+			$filter = array('jpg','jpeg','gif','png');
+		}
+		if(!in_array($ext,$filter)) {
+			return new BaseObject(-1, 'msg_error_occured');
+		}
 
 		$vars->member_srl = $logged_info->member_srl;
 
@@ -1238,10 +1333,16 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new BaseObject(-1, 'msg_error_occured');
+			if(!Context::isUploaded()) {
+				return new BaseObject(-1, 'msg_error_occured');
+			}
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new BaseObject(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new BaseObject(-1, 'msg_error_occured');
+			if(!is_uploaded_file($addfile['tmp_name'])) {
+				return new BaseObject(-1, 'msg_error_occured');
+			}
+			if($vars->addfile['error'] != 0) {
+				return new BaseObject(-1, 'msg_error_occured');
+			}
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1252,11 +1353,13 @@ 
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
 			$this->setRedirectUrl($returnUrl);
 			return;
-		}
-		else
+		} else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
-			else $this->add('save_filename', '');
+			if($output) {
+				$this->add('save_filename', $output->get('save_filename'));
+			} else {
+				$this->add('save_filename', '');
+			}
 		}
 	}
 
@@ -1280,7 +1383,9 @@ 
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if(!checkUploadedFile($tmp)) {
+				return false;
+			}
 
 			if(!@move_uploaded_file($tmp, $save_filename))
 			{
@@ -1317,7 +1422,9 @@ 
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if(!checkUploadedFile($tmp)) {
+			return false;
+		}
 
 		// upload
 		if(!@move_uploaded_file($tmp, $save_filename))
@@ -1346,14 +1453,20 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_filebox_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1376,9 +1489,13 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if(!$timeout) {
+			$timeout = 60;
+		}
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if($member_srl) {
+			$args->member_srl = $member_srl;
+		}
 		$output = executeQuery('module.insertLock', $args);
 		if($output->toBool())
 		{

modules/page/page.view.php

Doc Comments +4 added lines

@@ -129,6 +129,8 @@ 
 
 	/**
 	 * @brief Save the file and return if a file is requested by http
+	 * @param integer $caching_interval
+	 * @param string $cache_file
 	 */
 	function getHtmlPage($path, $caching_interval, $cache_file)
 	{
@@ -167,6 +169,8 @@ 
 
 	/**
 	 * @brief Create a cache file in order to include if it is an internal file
+	 * @param integer $caching_interval
+	 * @param string $cache_file
 	 */
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{

Spacing +32 added lines, -32 removed lines

@@ -22,18 +22,18 @@ 
 		// Get a template path (page in the administrative template tpl putting together)
 		$this->setTemplatePath($this->module_path.'tpl');
 
-		switch($this->module_info->page_type)
+		switch ($this->module_info->page_type)
 		{
 			case 'WIDGET' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					break;
 				}
 			case 'OUTSIDE' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/opage/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					$this->path = $this->module_info->path;
 					break;
 				}
@@ -46,11 +46,11 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if ($this->module_srl) Context::set('module_srl', $this->module_srl);
 
 		$page_type_name = strtolower($this->module_info->page_type);
-		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($this, $method)) $page_content = $this->{$method}();
+		$method = '_get'.ucfirst($page_type_name).'Content';
+		if (method_exists($this, $method)) $page_content = $this->{$method}();
 		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
 
 		Context::set('module_info', $this->module_info);
@@ -61,12 +61,12 @@ 
 
 	function _getWidgetContent()
 	{
-		if($this->interval>0)
+		if ($this->interval > 0)
 		{
-			if(!file_exists($this->cache_file)) $mtime = 0;
+			if (!file_exists($this->cache_file)) $mtime = 0;
 			else $mtime = filemtime($this->cache_file);
 
-			if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
+			if ($mtime + $this->interval * 60 > $_SERVER['REQUEST_TIME'])
 			{
 				$page_content = FileHandler::readFile($this->cache_file); 
 				$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
@@ -80,7 +80,7 @@ 
 		}
 		else
 		{
-			if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+			if (file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
 			$page_content = $this->module_info->content;
 		}
 		return $page_content;
@@ -93,7 +93,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument(0, true);
 
-		if($this->module_info->document_srl)
+		if ($this->module_info->document_srl)
 		{
 			$document_srl = $this->module_info->document_srl;
 			$oDocument->setDocument($document_srl);
@@ -118,9 +118,9 @@ 
 	function _getOutsideContent()
 	{
 		// check if it is http or internal file
-		if($this->path)
+		if ($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			if (preg_match("/^([a-z]+):\/\//i", $this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
 			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
 		}
 
@@ -133,7 +133,7 @@ 
 	function getHtmlPage($path, $caching_interval, $cache_file)
 	{
 		// Verify cache
-		if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > $_SERVER['REQUEST_TIME'])
+		if ($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval * 60 > $_SERVER['REQUEST_TIME'])
 		{
 			$content = FileHandler::readFile($cache_file);
 		}
@@ -154,13 +154,13 @@ 
 		$content = $buff->content;
 		// Extract a title
 		$title = $oPageController->getTitle($content);
-		if($title) Context::setBrowserTitle($title);
+		if ($title) Context::setBrowserTitle($title);
 		// Extract header script
 		$head_script = $oPageController->getHeadScript($content);
-		if($head_script) Context::addHtmlHeader($head_script);
+		if ($head_script) Context::addHtmlHeader($head_script);
 		// Extract content from the body
 		$body_script = $oPageController->getBodyScript($content);
-		if(!$body_script) $body_script = $content;
+		if (!$body_script) $body_script = $content;
 
 		return $content;
 	}
@@ -171,32 +171,32 @@ 
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{
 		// Cancel if the file doesn't exist
-		if(!file_exists(FileHandler::getRealPath($target_file))) return;
+		if (!file_exists(FileHandler::getRealPath($target_file))) return;
 
 		// Get a path and filename
-		$tmp_path = explode('/',$cache_file);
-		$filename = $tmp_path[count($tmp_path)-1];
-		$filepath = preg_replace('/'.$filename."$/i","",$cache_file);
+		$tmp_path = explode('/', $cache_file);
+		$filename = $tmp_path[count($tmp_path) - 1];
+		$filepath = preg_replace('/'.$filename."$/i", "", $cache_file);
 		$cache_file = FileHandler::getRealPath($cache_file);
 
 		$level = ob_get_level();
 		// Verify cache
-		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
+		if ($caching_interval < 1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval * 60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file) < filemtime($target_file))
 		{
-			if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+			if (file_exists($cache_file)) FileHandler::removeFile($cache_file);
 
 			// Read a target file and get content
 			ob_start();
 			include(FileHandler::getRealPath($target_file));
 			$content = ob_get_clean();
 			// Replace relative path to the absolute path 
-			$this->path = str_replace('\\', '/', realpath(dirname($target_file))) . '/';
-			$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
-			$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is',array($this,'_replacePath'),$content);
+			$this->path = str_replace('\\', '/', realpath(dirname($target_file))).'/';
+			$content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is', array($this, '_replacePath'), $content);
+			$content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is', array($this, '_replacePath'), $content);
 
 			FileHandler::writeFile($cache_file, $content);
 			// Include and then Return the result
-			if(!file_exists($cache_file)) return;
+			if (!file_exists($cache_file)) return;
 			// Attempt to compile
 			$oTemplate = &TemplateHandler::getInstance();
 			$script = $oTemplate->compileDirect($filepath, $filename);
@@ -223,20 +223,20 @@ 
 		$val = trim($matches[3]);
 		// Pass if the path is external or starts with /, #, { characters
 		// /=absolute path, #=hash in a page, {=Template syntax
-		if(strpos($val, '.') === FALSE || preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i',$val))
+		if (strpos($val, '.') === FALSE || preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i', $val))
 		{
 				return $matches[0];
 			// In case of  .. , get a path
 		}
-		else if(strncasecmp('..', $val, 2) === 0)
+		else if (strncasecmp('..', $val, 2) === 0)
 		{
 			$p = Context::pathToUrl($this->path);
-			return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+			return sprintf("%s%s%s%s", $matches[1], $matches[2], $p.$val, $matches[4]);
 		}
 
-		if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2);
+		if (strncasecmp('..', $val, 2) === 0) $val = substr($val, 2);
 		$p = Context::pathToUrl($this->path);
-		$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+		$path = sprintf("%s%s%s%s", $matches[1], $matches[2], $p.$val, $matches[4]);
 
 		return $path;
 	}

Braces +47 added lines, -25 removed lines

@@ -46,12 +46,17 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if($this->module_srl) {
+			Context::set('module_srl',$this->module_srl);
+		}
 
 		$page_type_name = strtolower($this->module_info->page_type);
 		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($this, $method)) $page_content = $this->{$method}();
-		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
+		if(method_exists($this, $method)) {
+			$page_content = $this->{$method}();
+		} else {
+			return new BaseObject(-1, sprintf('%s method is not exists', $method));
+		}
 
 		Context::set('module_info', $this->module_info);
 		Context::set('page_content', $page_content);
@@ -63,24 +68,27 @@ 
 	{
 		if($this->interval>0)
 		{
-			if(!file_exists($this->cache_file)) $mtime = 0;
-			else $mtime = filemtime($this->cache_file);
+			if(!file_exists($this->cache_file)) {
+				$mtime = 0;
+			} else {
+				$mtime = filemtime($this->cache_file);
+			}
 
 			if($mtime + $this->interval*60 > $_SERVER['REQUEST_TIME'])
 			{
 				$page_content = FileHandler::readFile($this->cache_file); 
 				$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
-			}
-			else
+			} else
 			{
 				$oWidgetController = getController('widget');
 				$page_content = $oWidgetController->transWidgetCode($this->module_info->content);
 				FileHandler::writeFile($this->cache_file, $page_content);
 			}
-		}
-		else
+		} else
 		{
-			if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+			if(file_exists($this->cache_file)) {
+				FileHandler::removeFile($this->cache_file);
+			}
 			$page_content = $this->module_info->content;
 		}
 		return $page_content;
@@ -104,8 +112,7 @@ 
 		if ($this->module_info->skin)
 		{
 			$templatePath = (sprintf($this->module_path.'skins/%s', $this->module_info->skin));
-		}
-		else
+		} else
 		{
 			$templatePath = ($this->module_path.'skins/default');
 		}
@@ -120,8 +127,11 @@ 
 		// check if it is http or internal file
 		if($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
-			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			if(preg_match("/^([a-z]+):\/\//i",$this->path)) {
+				$content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			} else {
+				$content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			}
 		}
 
 		return $content;
@@ -136,8 +146,7 @@ 
 		if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > $_SERVER['REQUEST_TIME'])
 		{
 			$content = FileHandler::readFile($cache_file);
-		}
-		else
+		} else
 		{
 			FileHandler::getRemoteFile($path, $cache_file);
 			$content = FileHandler::readFile($cache_file);
@@ -154,13 +163,19 @@ 
 		$content = $buff->content;
 		// Extract a title
 		$title = $oPageController->getTitle($content);
-		if($title) Context::setBrowserTitle($title);
+		if($title) {
+			Context::setBrowserTitle($title);
+		}
 		// Extract header script
 		$head_script = $oPageController->getHeadScript($content);
-		if($head_script) Context::addHtmlHeader($head_script);
+		if($head_script) {
+			Context::addHtmlHeader($head_script);
+		}
 		// Extract content from the body
 		$body_script = $oPageController->getBodyScript($content);
-		if(!$body_script) $body_script = $content;
+		if(!$body_script) {
+			$body_script = $content;
+		}
 
 		return $content;
 	}
@@ -171,7 +186,9 @@ 
 	function executeFile($target_file, $caching_interval, $cache_file)
 	{
 		// Cancel if the file doesn't exist
-		if(!file_exists(FileHandler::getRealPath($target_file))) return;
+		if(!file_exists(FileHandler::getRealPath($target_file))) {
+			return;
+		}
 
 		// Get a path and filename
 		$tmp_path = explode('/',$cache_file);
@@ -183,7 +200,9 @@ 
 		// Verify cache
 		if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= $_SERVER['REQUEST_TIME'] || filemtime($cache_file)<filemtime($target_file))
 		{
-			if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+			if(file_exists($cache_file)) {
+				FileHandler::removeFile($cache_file);
+			}
 
 			// Read a target file and get content
 			ob_start();
@@ -196,7 +215,9 @@ 
 
 			FileHandler::writeFile($cache_file, $content);
 			// Include and then Return the result
-			if(!file_exists($cache_file)) return;
+			if(!file_exists($cache_file)) {
+				return;
+			}
 			// Attempt to compile
 			$oTemplate = &TemplateHandler::getInstance();
 			$script = $oTemplate->compileDirect($filepath, $filename);
@@ -227,14 +248,15 @@ 
 		{
 				return $matches[0];
 			// In case of  .. , get a path
-		}
-		else if(strncasecmp('..', $val, 2) === 0)
+		} else if(strncasecmp('..', $val, 2) === 0)
 		{
 			$p = Context::pathToUrl($this->path);
 			return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
 		}
 
-		if(strncasecmp('..', $val, 2) === 0) $val = substr($val,2);
+		if(strncasecmp('..', $val, 2) === 0) {
+			$val = substr($val,2);
+		}
 		$p = Context::pathToUrl($this->path);
 		$path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
 

modules/point/point.controller.php

Doc Comments +1 added lines

@@ -478,6 +478,7 @@
 
 	/**
 	 * @brief Set points
+	 * @param string $mode
 	 */
 	function setPoint($member_srl, $point, $mode = null)
 	{

Spacing +103 added lines, -103 removed lines

@@ -31,7 +31,7 @@ 
 		$point = $config->signup_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point, 'signup');
+		$this->setPoint($member_srl, $cur_point, 'signup');
 
 		return new BaseObject();
 	}
@@ -42,9 +42,9 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new BaseObject();
+		if (!$member_srl) return new BaseObject();
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new BaseObject();
+		if (substr($obj->last_login, 0, 8) == date("Ymd")) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -55,7 +55,7 @@ 
 		$point = $config->login_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -66,30 +66,30 @@ 
 	function triggerInsertDocument(&$obj)
 	{
 		$oDocumentModel = getModel('document');
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if (!$module_srl || !$member_srl) return new BaseObject();
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new BaseObject();
+			if ($module_srl == $member_srl) return new BaseObject();
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -106,24 +106,24 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 
 		// if status is TEMP or PUBLIC... give not point, only status is empty
-		if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$oModuleModel = getModel('module');
 
 			// Get the point module information
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $obj->module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,42 +141,42 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
-		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
+		$module_config = $oModuleModel->getModulePartConfig('point', $oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if (strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new BaseObject();
+		if ($comment_point > 0) return new BaseObject();
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if ($output->data[$i]->member_srl < 1) continue;
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new BaseObject();
+		if ($member_srl) unset($member_srls[abs($member_srl)]);
+		if (!count($member_srls)) return new BaseObject();
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
 		$point = $module_config['download_file'];
-		foreach($member_srls as $member_srl => $cnt)
+		foreach ($member_srls as $member_srl => $cnt)
 		{
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 			$cur_point -= $cnt * $comment_point;
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -189,15 +189,15 @@ 
 	{
 		$oDocumentModel = getModel('document');
 
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if (!$module_srl || !$member_srl) return new BaseObject();
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new BaseObject();
+			if (!$logged_info->member_srl) return new BaseObject();
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,16 +207,16 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new BaseObject();
+			if ($point < 0) return new BaseObject();
 			$cur_point -= $point;
 			// Add points related to deleting an attachment
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new BaseObject();
@@ -229,12 +229,12 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new BaseObject();
+		if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == abs($member_srl)) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -244,10 +244,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -264,11 +264,11 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
-		if($oDocument->get('member_srl')==$member_srl) return new BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
+		if ($oDocument->get('member_srl') == $member_srl) return new BaseObject();
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -276,12 +276,12 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new BaseObject();
+		if ($point < 0) return new BaseObject();
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -301,11 +301,11 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new BaseObject();
+		if ($obj->isvalid != 'Y') return new BaseObject();
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -315,10 +315,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -331,10 +331,10 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -348,11 +348,11 @@ 
 		}
 
 		// If the user is not logged in and download requires points, deny access.
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && $point)
+			if ($config->disable_download == 'Y' && $point)
 			{
-				return new BaseObject(-1,'msg_not_permitted_download');
+				return new BaseObject(-1, 'msg_not_permitted_download');
 			}
 			else
 			{
@@ -367,7 +367,7 @@ 
 		// If the member does not have enough points, deny access.
 		if ($config->disable_download == 'Y' && $cur_point + $point < 0)
 		{
-			return new BaseObject(-1,'msg_cannot_download');
+			return new BaseObject(-1, 'msg_cannot_download');
 		}
 
 		// Otherwise, points will be adjusted after downloading (triggerDownloadFile).
@@ -381,13 +381,13 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new BaseObject();
+		if (!$logged_info->member_srl) return new BaseObject();
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if ($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -428,22 +428,22 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new BaseObject();
+		if ($target_member_srl == $member_srl) return new BaseObject();
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
 		// Pass if there are no requested points
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new BaseObject();
+			if ($output->data->count) return new BaseObject();
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 		}
 		else
@@ -454,7 +454,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 		// When the requested points are negative, compared it with the current point
 		$_SESSION['banned_document'][$obj->document_srl] = false;
-		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
+		if ($config->disable_read_document == 'Y' && $point < 0 && abs($point) > $cur_point)
 		{
 			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
@@ -462,14 +462,14 @@ 
 			return new BaseObject(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new BaseObject();
+		if (!$logged_info->member_srl) return new BaseObject();
 		// Pass, if there are no requested points
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -481,7 +481,7 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if (!$module_srl || !$member_srl) return new BaseObject();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -490,21 +490,21 @@ 
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
-		if( $obj->point > 0 )
+		if ($obj->point > 0)
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->voted;
 		}
 		else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
 		}
 
-		if(!$point) return new BaseObject();
+		if (!$point) return new BaseObject();
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new BaseObject();
 	}
@@ -516,7 +516,7 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if (!$mode || !in_array($mode, $mode_arr)) $mode = 'update';
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -533,7 +533,7 @@ 
 		$args->member_srl = $member_srl;
 		$args->point = $current_point;
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'add' :
 				$args->point += $point;
@@ -546,7 +546,7 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if ($args->point < 0) $args->point = 0;
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -557,7 +557,7 @@ 
 		$trigger_obj->current_level = $current_level;
 		$trigger_obj->set_point = $point;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -568,19 +568,19 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
+		if ($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
 		else executeQuery("point.insertPoint", $args);
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
 
 		// If existing level and a new one are different attempt to set a point group
-		if($level != $current_level)
+		if ($level != $current_level)
 		{
 			// Check if the level, for which the current points are prepared, is calculate and set the correct group
 			$point_group = $config->point_group;
 			// If the point group exists
-			if($point_group && is_array($point_group) && count($point_group) )
+			if ($point_group && is_array($point_group) && count($point_group))
 			{
 				// Get the default group
 				$default_group = $oMemberModel->getDefaultGroup();
@@ -590,29 +590,29 @@ 
 
 				asort($point_group);
 				// Reset group after initialization
-				if($config->group_reset != 'N')
+				if ($config->group_reset != 'N')
 				{
 					// If the new level is in the right group
-					if(in_array($level, $point_group))
+					if (in_array($level, $point_group))
 					{
 						// Delete all groups except the one which the current level belongs to
-						foreach($point_group as $group_srl => $target_level)
+						foreach ($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if ($target_level == $level) $new_group_list[] = $group_srl;
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
 					else
 					{
 						$i = $level;
-						while($i > 0)
+						while ($i > 0)
 						{
-							if(in_array($i, $point_group))
+							if (in_array($i, $point_group))
 							{
-								foreach($point_group as $group_srl => $target_level)
+								foreach ($point_group as $group_srl => $target_level)
 								{
-									if($target_level == $i)
+									if ($target_level == $i)
 									{
 										$new_group_list[] = $group_srl;
 									}
@@ -623,9 +623,9 @@ 
 						}
 					}
 					// Delete the group of a level which is higher than the current level
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if ($target_level > $level) $del_group_list[] = $group_srl;
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -633,16 +633,16 @@ 
 				else
 				{
 					// Check until the current level by rotating setting the configurations of the point groups
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if ($target_level <= $level) $new_group_list[] = $group_srl;
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if (!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
 				// Remove linkage group
-				if($del_group_list && count($del_group_list))
+				if ($del_group_list && count($del_group_list))
 				{
 					$del_group_args = new stdClass;
 					$del_group_args->member_srl = $member_srl;
@@ -650,7 +650,7 @@ 
 					$del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
 				}
 				// Grant a new group
-				foreach($new_group_list as $group_srl)
+				foreach ($new_group_list as $group_srl)
 				{
 					$new_group_args = new stdClass;
 					$new_group_args->member_srl = $member_srl;
@@ -665,7 +665,7 @@ 
 		$trigger_obj->del_group_list = $del_group_list;
 		$trigger_obj->new_level = $level;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -681,17 +681,17 @@ 
 		FileHandler::writeFile($cache_filename, $point);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_0';
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$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);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -705,9 +705,9 @@ 
 		$pointConfig = $oModuleModel->getModulePartConfig('point', $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('point', $moduleSrl, $pointConfig);
 			}

Braces +175 added lines, -67 removed lines

@@ -42,9 +42,13 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new BaseObject();
+		if(!$member_srl) {
+			return new BaseObject();
+		}
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new BaseObject();
+		if(substr($obj->last_login,0,8)==date("Ymd")) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -70,9 +74,13 @@ 
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if(!$module_srl || !$member_srl) {
+				return new BaseObject();
+			}
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new BaseObject();
+			if($module_srl == $member_srl) {
+				return new BaseObject();
+			}
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
@@ -82,12 +90,18 @@ 
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -118,12 +132,18 @@ 
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,33 +161,47 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if(strlen($comment_point) == 0 && !is_int($comment_point)) {
+			$comment_point = $config->insert_comment;
+		}
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new BaseObject();
+		if($comment_point>0) {
+			return new BaseObject();
+		}
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
 		for($i=0;$i<$cnt;$i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if($output->data[$i]->member_srl<1) {
+				continue;
+			}
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new BaseObject();
+		if($member_srl) {
+			unset($member_srls[abs($member_srl)]);
+		}
+		if(!count($member_srls)) {
+			return new BaseObject();
+		}
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
@@ -194,10 +228,14 @@ 
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new BaseObject();
+			if(!$module_srl || !$member_srl) {
+				return new BaseObject();
+			}
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new BaseObject();
+			if(!$logged_info->member_srl) {
+				return new BaseObject();
+			}
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,14 +245,22 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new BaseObject();
+			if($point < 0) {
+				return new BaseObject();
+			}
 			$cur_point -= $point;
 			// Add points related to deleting an attachment
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point -= $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -229,12 +275,16 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new BaseObject();
+		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -244,7 +294,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -264,11 +316,17 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
-		if($oDocument->get('member_srl')==$member_srl) return new BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
+		if($oDocument->get('member_srl')==$member_srl) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -276,9 +334,13 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new BaseObject();
+		if($point < 0) {
+			return new BaseObject();
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -301,11 +363,15 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new BaseObject();
+		if($obj->isvalid != 'Y') {
+			return new BaseObject();
+		}
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -315,7 +381,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->upload_file;
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -331,18 +399,21 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new BaseObject();
+		}
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -353,8 +424,7 @@ 
 			if($config->disable_download == 'Y' && $point)
 			{
 				return new BaseObject(-1,'msg_not_permitted_download');
-			}
-			else
+			} else
 			{
 				return new BaseObject();
 			}
@@ -381,13 +451,19 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new BaseObject();
+		if(!$logged_info->member_srl) {
+			return new BaseObject();
+		}
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		// Pass if it is your file
-		if($member_srl && abs($obj->member_srl) == $member_srl) return new BaseObject();
+		if($member_srl && abs($obj->member_srl) == $member_srl) {
+			return new BaseObject();
+		}
 
 		// Get the point module information
 		$oModuleModel = getModel('module');
@@ -396,8 +472,7 @@ 
 		if (isset($module_config['download_file']))
 		{
 			$point = intval($module_config['download_file']);
-		}
-		else
+		} else
 		{
 			$point = intval($config->download_file);
 		}
@@ -428,25 +503,32 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new BaseObject();
+		if($target_member_srl == $member_srl) {
+			return new BaseObject();
+		}
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->read_document;
+		}
 		// Pass if there are no requested points
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new BaseObject();
+			if($output->data->count) {
+				return new BaseObject();
+			}
 			$cur_point = $oPointModel->getPoint($member_srl, true);
-		}
-		else
+		} else
 		{
 			$cur_point = 0;
 		}
@@ -462,9 +544,13 @@ 
 			return new BaseObject(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new BaseObject();
+		if(!$logged_info->member_srl) {
+			return new BaseObject();
+		}
 		// Pass, if there are no requested points
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
@@ -481,7 +567,9 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new BaseObject();
+		if(!$module_srl || !$member_srl) {
+			return new BaseObject();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -493,15 +581,20 @@ 
 		if( $obj->point > 0 )
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
-		}
-		else
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->voted;
+			}
+		} else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->blamed;
+			}
 		}
 
-		if(!$point) return new BaseObject();
+		if(!$point) {
+			return new BaseObject();
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -516,7 +609,9 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if(!$mode || !in_array($mode,$mode_arr)) {
+			$mode = 'update';
+		}
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -546,7 +641,9 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if($args->point < 0) {
+			$args->point = 0;
+		}
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -568,8 +665,11 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-		else executeQuery("point.insertPoint", $args);
+		if($oPointModel->isExistsPoint($member_srl)) {
+			executeQuery("point.updatePoint", $args);
+		} else {
+			executeQuery("point.insertPoint", $args);
+		}
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
@@ -599,7 +699,9 @@ 
 						foreach($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if($target_level == $level) {
+								$new_group_list[] = $group_srl;
+							}
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
@@ -625,7 +727,9 @@ 
 					// Delete the group of a level which is higher than the current level
 					foreach($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if($target_level > $level) {
+							$del_group_list[] = $group_srl;
+						}
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -636,11 +740,15 @@ 
 					foreach($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if($target_level <= $level) {
+							$new_group_list[] = $group_srl;
+						}
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if(!$new_group_list[0]) {
+					$new_group_list[0] = $default_group->group_srl;
+				}
 				// Remove linkage group
 				if($del_group_list && count($del_group_list))
 				{