xpressengine / xe-core

modules/widget/widget.controller.php

Spacing +131 added lines, -131 removed lines

@@ -34,13 +34,13 @@ 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($path, $skin);
 
-		for($i=0;$i<count($skin_info->colorset);$i++)
+		for ($i = 0; $i < count($skin_info->colorset); $i++)
 		{
 			$colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if (count($colorset_list)) $colorsets = implode("\n", $colorset_list);
 		$this->add('colorset_list', $colorsets);
 	}
 
@@ -50,12 +50,12 @@ 
 	function procWidgetGenerateCode()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if (!$widget) return new Object(-1, 'msg_invalid_request');
+		if (!Context::get('skin')) return new Object(-1, Context::getLang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
-		$widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ',$attribute));
+		$widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ', $attribute));
 		// Code output
 		$this->add('widget_code', $widget_code);
 	}
@@ -66,9 +66,9 @@ 
 	function procWidgetGenerateCodeInPage()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
+		if (!$widget) return new Object(-1, 'msg_invalid_request');
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if (!in_array($widget, array('widgetBox', 'widgetContent')) && !Context::get('skin')) return new Object(-1, Context::getLang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -107,26 +107,26 @@ 
 		$err = 0;
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($module_srl);
-		if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+		if (!$layout_info || $layout_info->type != 'faceoff') $err++;
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+		if (!$page_info->module_srl || $page_info->module != 'page') $err++;
 
-		if($err > 1) return new Object(-1,'msg_invalid_request');
+		if ($err > 1) return new Object(-1, 'msg_invalid_request');
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
-			return new Object(-1,'msg_not_permitted');
+			return new Object(-1, 'msg_not_permitted');
 		}
 		$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
-		if(!$module_grant->manager)
+		if (!$module_grant->manager)
 		{
-			return new Object(-1,'msg_not_permitted');
+			return new Object(-1, 'msg_not_permitted');
 		}
 
 		// Enter post
@@ -139,7 +139,7 @@ 
 		$obj->document_srl = $document_srl;
 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 		}
@@ -150,7 +150,7 @@ 
 		}
 
 		// Stop when an error occurs
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Return results
 		$this->add('document_srl', $obj->document_srl);
@@ -169,29 +169,29 @@ 
 		$oDocumentAdminController = getAdminController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if (!$oDocument->isExists()) return new Object(-1, 'msg_invalid_request');
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if (!$page_info->module_srl || $page_info->module != 'page') return new Object(-1, 'msg_invalid_request');
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
-			return new Object(-1,'msg_not_permitted');
+			return new Object(-1, 'msg_not_permitted');
 		}
 		$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
-		if(!$module_grant->manager)
+		if (!$module_grant->manager)
 		{
-			return new Object(-1,'msg_not_permitted');
+			return new Object(-1, 'msg_not_permitted');
 		}
 
-		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-		if(!$output->toBool()) return $output;
+		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'), 0);
+		if (!$output->toBool()) return $output;
 
 		// Return results
 		$copied_srls = $output->get('copied_srls');
@@ -210,28 +210,28 @@ 
 		$oDocumentController = getController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object();
+		if (!$oDocument->isExists()) return new Object();
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if (!$page_info->module_srl || $page_info->module != 'page') return new Object(-1, 'msg_invalid_request');
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
 		$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
-		if(!$module_grant->manager)
+		if (!$module_grant->manager)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
 
 		$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	function triggerWidgetCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if (Context::getResponseMethod() != 'HTML') return new Object();
 		$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
 		return new Object();
 	}
@@ -264,9 +264,9 @@ 
 		// Check whether to include information about editing
 		$this->javascript_mode = $javascript_mode;
 		// Widget code box change
-		$content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this,'transWidgetBox'), $content);
+		$content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this, 'transWidgetBox'), $content);
 		// Widget code information byeogyeong
-		$content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content);
+		$content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this, 'transWidget'), $content);
 
 		return $content;
 	}
@@ -281,11 +281,11 @@ 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse(trim($buff));
 
-		if($xml_doc->img) $vars = $xml_doc->img->attrs;
+		if ($xml_doc->img) $vars = $xml_doc->img->attrs;
 		else $vars = $xml_doc->attrs;
 
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if (!$widget) return $matches[0];
 		unset($vars->widget);
 
 		return $this->execute($widget, $vars, $this->javascript_mode);
@@ -296,13 +296,13 @@ 
 	 */
 	function transWidgetBox($matches)
 	{
-		$buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
+		$buff = preg_replace('/<div><div>(.*)$/i', '</div>', $matches[0]);
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse($buff);
 
 		$vars = $xml_doc->div->attrs;
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if (!$widget) return $matches[0];
 		unset($vars->widget);
 
 		$vars->widgetbox_content = $matches[3];
@@ -323,28 +323,28 @@ 
 		$oXmlParser = new XmlParser();
 
 		$cnt = count($matches[1]);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
 			$buff = $matches[0][$i];
 			$xml_doc = $oXmlParser->parse(trim($buff));
 
 			$args = $xml_doc->img->attrs;
-			if(!$args) continue;
+			if (!$args) continue;
 			// If you are not caching path
 			$widget = $args->widget;
 			$sequence = $args->widget_sequence;
 			$cache = $args->widget_cache;
-			if(!$sequence || !$cache) continue;
+			if (!$sequence || !$cache) continue;
 
-			if(count($args))
+			if (count($args))
 			{
-				foreach($args as $k => $v) $args->{$k} = urldecode($v);
+				foreach ($args as $k => $v) $args->{$k} = urldecode($v);
 			}
 			// If the cache file for each language widget regeneration
-			foreach($lang_list as $lang_type => $val)
+			foreach ($lang_list as $lang_type => $val)
 			{
 				$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-				if(!file_exists($cache_file)) continue;
+				if (!file_exists($cache_file)) continue;
 				$this->getCache($widget, $args, $lang_type, true);
 			}
 		}
@@ -356,7 +356,7 @@ 
 	function getCache($widget, $args, $lang_type = null, $ignore_cache = false)
 	{
 		// If the specified language specifies the current language
-		if(!$lang_type) $lang_type = Context::getLangType();
+		if (!$lang_type) $lang_type = Context::getLangType();
 		// widget, the cache number and cache values are set
 		$widget_sequence = $args->widget_sequence;
 		$widget_cache = $args->widget_cache;
@@ -364,10 +364,10 @@ 
 		/**
 		 * Even if the cache number and value of the cache and return it to extract data
 		 */
-		if(!$ignore_cache && (!$widget_cache || !$widget_sequence))
+		if (!$ignore_cache && (!$widget_cache || !$widget_sequence))
 		{
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+			if (!$oWidget || !method_exists($oWidget, 'proc')) return;
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -376,15 +376,15 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('template');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$key = 'widget_cache:' . $widget_sequence;
+			$key = 'widget_cache:'.$widget_sequence;
 
 			$cache_body = $oCacheHandler->get($key);
 			$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
 		}
 
-		if($cache_body)
+		if ($cache_body)
 		{
 			return $cache_body;
 		}
@@ -397,11 +397,11 @@ 
 			// Wanted cache file
 			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
 			// If the file exists in the cache, the file validation
-			if(!$ignore_cache && file_exists($cache_file))
+			if (!$ignore_cache && file_exists($cache_file))
 			{
 				$filemtime = filemtime($cache_file);
 				// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
-				if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
+				if ($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
 				{
 					$cache_body = FileHandler::readFile($cache_file);
 					$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
@@ -410,18 +410,18 @@ 
 				}
 			}
 			// cache update and cache renewal of the file mtime
-			if(!$oCacheHandler->isSupport())
+			if (!$oCacheHandler->isSupport())
 			{
 			touch($cache_file);
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+			if (!$oWidget || !method_exists($oWidget, 'proc')) return;
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($widget_content);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
 			}
@@ -443,16 +443,16 @@ 
 	function execute($widget, $args, $javascript_mode = false, $escaped = true)
 	{
 		// Save for debug run-time widget
-		if(__DEBUG__==3) $start = getMicroTime();
+		if (__DEBUG__ == 3) $start = getMicroTime();
 		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
-		if(count($object_vars))
+		if (count($object_vars))
 		{
-			foreach($object_vars as $key => $val)
+			foreach ($object_vars as $key => $val)
 			{
-				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-				if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+				if (in_array($key, array('widgetbox_content', 'body', 'class', 'style', 'widget_sequence', 'widget', 'widget_padding_left', 'widget_padding_top', 'widget_padding_bottom', 'widget_padding_right', 'widgetstyle', 'document_srl'))) continue;
+				if ($escaped) $args->{$key} = utf8RawUrlDecode($val);
 			}
 		}
 
@@ -461,14 +461,14 @@ 
 		 * Widgets widgetContent/widgetBox Wanted If you are not content
 		 */
 		$widget_content = '';
-		if($widget != 'widgetContent' && $widget != 'widgetBox')
+		if ($widget != 'widgetContent' && $widget != 'widgetBox')
 		{
-			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+			if (!is_dir(sprintf(_XE_PATH_.'widgets/%s/', $widget))) return;
 			// Hold the contents of the widget parameter
 			$widget_content = $this->getCache($widget, $args);
 		}
 
-		if($widget == 'widgetBox')
+		if ($widget == 'widgetBox')
 		{
 			$widgetbox_content = $args->widgetbox_content;
 		}
@@ -477,7 +477,7 @@ 
 		 * Wanted specified by the administrator of the widget style
 		 */
 		// Sometimes the wrong code, background-image: url (none) can be heard but none in this case, the request for the url so unconditionally Removed
-		$style = preg_replace('/url\((.+)(\/?)none\)/is','', $args->style);
+		$style = preg_replace('/url\((.+)(\/?)none\)/is', '', $args->style);
 		// Find a style statement that based on the internal margin dropping pre-change
 		$widget_padding_left = $args->widget_padding_left;
 		$widget_padding_right = $args->widget_padding_right;
@@ -493,18 +493,18 @@ 
 		$widget_content_body = '';
 		$widget_content_footer = '';
 		// If general call is given on page styles should return immediately dreamin '
-		if(!$javascript_mode)
+		if (!$javascript_mode)
 		{
-			if($args->id) $args->id = ' id="'.$args->id.'" ';
-			switch($widget)
+			if ($args->id) $args->id = ' id="'.$args->id.'" ';
+			switch ($widget)
 			{
 				// If a direct orthogonal addition information
 				case 'widgetContent' :
-					if($args->document_srl)
+					if ($args->document_srl)
 					{
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
-						$body = $oDocument->getContent(false,false,false, false);
+						$body = $oDocument->getContent(false, false, false, false);
 					}
 					else
 					{
@@ -514,21 +514,21 @@ 
 					$oEditorController = getController('editor');
 					$body = $oEditorController->transComponent($body);
 
-					$widget_content_header = sprintf('<div class="xe_content xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s"><div style="%s">', $args->id, $style,  $inner_style);
+					$widget_content_header = sprintf('<div class="xe_content xe-widget-wrapper '.$args->css_class.'" %sstyle="%s"><div style="%s">', $args->id, $style, $inner_style);
 					$widget_content_body = $body;
 					$widget_content_footer = '</div></div>';
 
 					break;
 					// If the widget box; it could
 				case 'widgetBox' :
-					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s;"><div style="%s"><div>', $args->id, $style,  $inner_style);
+					$widget_content_header = sprintf('<div class="xe-widget-wrapper '.$args->css_class.'" %sstyle="%s;"><div style="%s"><div>', $args->id, $style, $inner_style);
 					$widget_content_body = $widgetbox_content;
 
 					break;
 					// If the General wijetil
 				default :
-					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s">',$args->id,$style);
-					$widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style,$widget_content);
+					$widget_content_header = sprintf('<div class="xe-widget-wrapper '.$args->css_class.'" %sstyle="%s">', $args->id, $style);
+					$widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style, $widget_content);
 					$widget_content_footer = '</div>';
 					break;
 			}
@@ -536,15 +536,15 @@ 
 		}
 		else
 		{
-			switch($widget)
+			switch ($widget)
 			{
 				// If a direct orthogonal addition information
 				case 'widgetContent' :
-					if($args->document_srl)
+					if ($args->document_srl)
 					{
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
-						$body = $oDocument->getContent(false,false,false);
+						$body = $oDocument->getContent(false, false, false);
 					}
 					else
 					{
@@ -552,12 +552,12 @@ 
 					}
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						foreach($args as $key => $val)
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget', 'widgetstyle', 'document_srl'))) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -565,44 +565,44 @@ 
 					$oWidgetController = getController('widget');
 
 					$widget_content_header = sprintf(
-						'<div class="xe_content widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
+						'<div class="xe_content widgetOutput '.$args->css_class.'" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
 						'<div class="widgetResize"></div>'.
 						'<div class="widgetResizeLeft"></div>'.
 						'<div class="widgetBorder">'.
-						'<div style="%s">',$args->widgetstyle,
+						'<div style="%s">', $args->widgetstyle,
 						$style,
 						$args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
 						$args->document_srl,
-						implode(' ',$attribute),
+						implode(' ', $attribute),
 						$inner_style);
 
 					$widget_content_body = $body;
 					$widget_content_footer = sprintf('</div>'.
 						'</div>'.
 						'<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
-						'</div>',base64_encode($body));
+						'</div>', base64_encode($body));
 
 					break;
 					// If the widget box; it could
 				case 'widgetBox' :
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						foreach($args as $key => $val)
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget', 'widgetstyle', 'document_srl'))) continue;
+							if (!is_numeric($val) && (!is_string($val) || strlen($val) == 0)) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
 					$widget_content_header = sprintf(
-						'<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
+						'<div class="widgetOutput '.$args->css_class.'" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
 						'<div class="widgetBoxResize"></div>'.
 						'<div class="widgetBoxResizeLeft"></div>'.
-						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style);
+						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">', $args->widgetstyle, $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, implode(' ', $attribute), $inner_style);
 
 					$widget_content_body = $widgetbox_content;
 
@@ -611,26 +611,26 @@ 
 				default :
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
-						foreach($args as $key => $val)
+						$allowed_key = array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget');
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, $allowed_key)) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, $allowed_key)) continue;
+							if (!is_numeric($val) && (!is_string($val) || strlen($val) == 0)) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
-					$widget_content_header = sprintf('<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
+					$widget_content_header = sprintf('<div class="widgetOutput '.$args->css_class.'" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
 						'<div class="widgetResize"></div>'.
 						'<div class="widgetResizeLeft"></div>'.
-						'<div class="widgetBorder">',$args->widgetstyle,$style,
+						'<div class="widgetBorder">', $args->widgetstyle, $style,
 						$widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,
-						$widget, implode(' ',$attribute));
+						$widget, implode(' ', $attribute));
 
-					$widget_content_body = sprintf('<div style="%s">%s</div>',$inner_style, $widget_content);
+					$widget_content_body = sprintf('<div style="%s">%s</div>', $inner_style, $widget_content);
 
 					$widget_content_footer = '</div></div>';
 
@@ -638,11 +638,11 @@ 
 			}
 		}
 		// Compile the widget style.
-		if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		if ($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle, $widget, $widget_content_body, $args, $javascript_mode);
 
-		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
+		$output = $widget_content_header.$widget_content_body.$widget_content_footer;
 		// Debug widget creation time information added to the results
-		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		if (__DEBUG__ == 3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
 
 		$after = microtime(true);
 
@@ -663,32 +663,32 @@ 
 	 */
 	function getWidgetObject($widget)
 	{
-		if(!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
+		if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
 		{
 			return Context::getLang('msg_invalid_request');
 		}
 
-		if(!$GLOBALS['_xe_loaded_widgets_'][$widget])
+		if (!$GLOBALS['_xe_loaded_widgets_'][$widget])
 		{
 			// Finding the location of a widget
 			$oWidgetModel = getModel('widget');
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if (!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
 			// Widget classes include
 			require_once($class_file);
 
 			// Creating Objects
-			if(!class_exists($widget, false))
+			if (!class_exists($widget, false))
 			{
 				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if (!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if (!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
 
 			$oWidget->widget_path = $path;
 
@@ -697,29 +697,29 @@ 
 		return $GLOBALS['_xe_loaded_widgets_'][$widget];
 	}
 
-	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
+	function compileWidgetStyle($widgetStyle, $widget, $widget_content_body, $args, $javascript_mode)
 	{
-		if(!$widgetStyle) return $widget_content_body;
+		if (!$widgetStyle) return $widget_content_body;
 
 		$oWidgetModel = getModel('widget');
 		// Bring extra_var widget style tie
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-		if(!$widgetstyle_info) return $widget_content_body;
+		if (!$widgetstyle_info) return $widget_content_body;
 
 		$widgetstyle_extra_var = new stdClass();
 		$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
-		if(count($widgetstyle_extra_var_key['extra_var']))
+		if (count($widgetstyle_extra_var_key['extra_var']))
 		{
-			foreach($widgetstyle_extra_var_key['extra_var'] as $key => $val)
+			foreach ($widgetstyle_extra_var_key['extra_var'] as $key => $val)
 			{
-				$widgetstyle_extra_var->{$key} =  $args->{$key};
+				$widgetstyle_extra_var->{$key} = $args->{$key};
 			}
 		}
 		Context::set('widgetstyle_extra_var', $widgetstyle_extra_var);
 		// #18994272 오타를 수정했으나 하위 호환성을 위해 남겨둠 - deprecated
 		Context::set('widgetstyle_extar_var', $widgetstyle_extra_var);
 
-		if($javascript_mode && $widget=='widgetBox')
+		if ($javascript_mode && $widget == 'widgetBox')
 		{
 			Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
 		}
@@ -743,7 +743,7 @@ 
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo($widget);
 
-		if(!$vars)
+		if (!$vars)
 		{
 			$vars = new stdClass();
 		}
@@ -754,31 +754,31 @@ 
 
 		$vars->skin = trim($request_vars->skin);
 		$vars->colorset = trim($request_vars->colorset);
-		$vars->widget_sequence = (int)($request_vars->widget_sequence);
-		$vars->widget_cache = (int)($request_vars->widget_cache);
+		$vars->widget_sequence = (int) ($request_vars->widget_sequence);
+		$vars->widget_cache = (int) ($request_vars->widget_cache);
 		$vars->style = trim($request_vars->style);
 		$vars->widget_padding_left = trim($request_vars->widget_padding_left);
 		$vars->widget_padding_right = trim($request_vars->widget_padding_right);
 		$vars->widget_padding_top = trim($request_vars->widget_padding_top);
 		$vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
-		$vars->document_srl= trim($request_vars->document_srl);
+		$vars->document_srl = trim($request_vars->document_srl);
 
-		if(count($widget_info->extra_var))
+		if (count($widget_info->extra_var))
 		{
-			foreach($widget_info->extra_var as $key=>$val)
+			foreach ($widget_info->extra_var as $key=>$val)
 			{
 				$vars->{$key} = trim($request_vars->{$key});
 			}
 		}
 		// If the widget style
-		if($request_vars->widgetstyle)
+		if ($request_vars->widgetstyle)
 		{
 			$widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
-			if(count($widgetStyle_info->extra_var))
+			if (count($widgetStyle_info->extra_var))
 			{
-				foreach($widgetStyle_info->extra_var as $key=>$val)
+				foreach ($widgetStyle_info->extra_var as $key=>$val)
 				{
-					if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox' || $val->type == 'textarea')
+					if ($val->type == 'color' || $val->type == 'text' || $val->type == 'select' || $val->type == 'filebox' || $val->type == 'textarea')
 					{
 						$vars->{$key} = trim($request_vars->{$key});
 					}
@@ -786,23 +786,23 @@ 
 			}
 		}
 
-		if($vars->widget_sequence)
+		if ($vars->widget_sequence)
 		{
 			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $vars->widget_sequence, Context::getLangType());
 			FileHandler::removeFile($cache_file);
 		}
 
-		if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+		if ($vars->widget_cache > 0) $vars->widget_sequence = getNextSequence();
 
 		$attribute = array();
-		foreach($vars as $key => $val)
+		foreach ($vars as $key => $val)
 		{
-			if(!$val)
+			if (!$val)
 			{
 				unset($vars->{$key});
 				continue;
 			}
-			if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+			if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 			$vars->{$key} = Context::convertEncodingStr($val);
 			$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}

Braces +153 added lines, -63 removed lines

@@ -40,7 +40,9 @@ 
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if(count($colorset_list)) {
+			$colorsets = implode("\n", $colorset_list);
+		}
 		$this->add('colorset_list', $colorsets);
 	}
 
@@ -50,8 +52,12 @@ 
 	function procWidgetGenerateCode()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!$widget) {
+			return new Object(-1,'msg_invalid_request');
+		}
+		if(!Context::get('skin')) {
+			return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		}
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
@@ -66,9 +72,13 @@ 
 	function procWidgetGenerateCodeInPage()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
+		if(!$widget) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) {
+			return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		}
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -107,15 +117,21 @@ 
 		$err = 0;
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($module_srl);
-		if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+		if(!$layout_info || $layout_info->type != 'faceoff') {
+			$err++;
+		}
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			$err++;
+		}
 
-		if($err > 1) return new Object(-1,'msg_invalid_request');
+		if($err > 1) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
@@ -142,15 +158,16 @@ 
 		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
-		}
-		else
+		} else
 		{
 			$output = $oDocumentController->insertDocument($obj);
 			$obj->document_srl = $output->get('document_srl');
 		}
 
 		// Stop when an error occurs
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Return results
 		$this->add('document_srl', $obj->document_srl);
@@ -169,14 +186,18 @@ 
 		$oDocumentAdminController = getAdminController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if(!$oDocument->isExists()) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
@@ -191,7 +212,9 @@ 
 		}
 
 		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Return results
 		$copied_srls = $output->get('copied_srls');
@@ -210,13 +233,17 @@ 
 		$oDocumentController = getController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
@@ -231,7 +258,9 @@ 
 		}
 
 		$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	/**
@@ -248,7 +277,9 @@ 
 	 */
 	function triggerWidgetCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if(Context::getResponseMethod()!='HTML') {
+			return new Object();
+		}
 		$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
 		return new Object();
 	}
@@ -281,11 +312,16 @@ 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse(trim($buff));
 
-		if($xml_doc->img) $vars = $xml_doc->img->attrs;
-		else $vars = $xml_doc->attrs;
+		if($xml_doc->img) {
+			$vars = $xml_doc->img->attrs;
+		} else {
+			$vars = $xml_doc->attrs;
+		}
 
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if(!$widget) {
+			return $matches[0];
+		}
 		unset($vars->widget);
 
 		return $this->execute($widget, $vars, $this->javascript_mode);
@@ -302,7 +338,9 @@ 
 
 		$vars = $xml_doc->div->attrs;
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if(!$widget) {
+			return $matches[0];
+		}
 		unset($vars->widget);
 
 		$vars->widgetbox_content = $matches[3];
@@ -329,22 +367,30 @@ 
 			$xml_doc = $oXmlParser->parse(trim($buff));
 
 			$args = $xml_doc->img->attrs;
-			if(!$args) continue;
+			if(!$args) {
+				continue;
+			}
 			// If you are not caching path
 			$widget = $args->widget;
 			$sequence = $args->widget_sequence;
 			$cache = $args->widget_cache;
-			if(!$sequence || !$cache) continue;
+			if(!$sequence || !$cache) {
+				continue;
+			}
 
 			if(count($args))
 			{
-				foreach($args as $k => $v) $args->{$k} = urldecode($v);
+				foreach($args as $k => $v) {
+					$args->{$k} = urldecode($v);
+				}
 			}
 			// If the cache file for each language widget regeneration
 			foreach($lang_list as $lang_type => $val)
 			{
 				$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-				if(!file_exists($cache_file)) continue;
+				if(!file_exists($cache_file)) {
+					continue;
+				}
 				$this->getCache($widget, $args, $lang_type, true);
 			}
 		}
@@ -356,7 +402,9 @@ 
 	function getCache($widget, $args, $lang_type = null, $ignore_cache = false)
 	{
 		// If the specified language specifies the current language
-		if(!$lang_type) $lang_type = Context::getLangType();
+		if(!$lang_type) {
+			$lang_type = Context::getLangType();
+		}
 		// widget, the cache number and cache values are set
 		$widget_sequence = $args->widget_sequence;
 		$widget_cache = $args->widget_cache;
@@ -367,7 +415,9 @@ 
 		if(!$ignore_cache && (!$widget_cache || !$widget_sequence))
 		{
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+			if(!$oWidget || !method_exists($oWidget, 'proc')) {
+				return;
+			}
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -387,8 +437,7 @@ 
 		if($cache_body)
 		{
 			return $cache_body;
-		}
-		else
+		} else
 		{
 			/**
 			 * Cache number and cache values are set so that the cache file should call
@@ -416,7 +465,9 @@ 
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+			if(!$oWidget || !method_exists($oWidget,'proc')) {
+				return;
+			}
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -424,8 +475,7 @@ 
 			if($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
-			}
-			else
+			} else
 			{
 				FileHandler::writeFile($cache_file, $widget_content);
 			}
@@ -443,7 +493,9 @@ 
 	function execute($widget, $args, $javascript_mode = false, $escaped = true)
 	{
 		// Save for debug run-time widget
-		if(__DEBUG__==3) $start = getMicroTime();
+		if(__DEBUG__==3) {
+			$start = getMicroTime();
+		}
 		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
@@ -451,8 +503,12 @@ 
 		{
 			foreach($object_vars as $key => $val)
 			{
-				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-				if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) {
+					continue;
+				}
+				if($escaped) {
+					$args->{$key} = utf8RawUrlDecode($val);
+				}
 			}
 		}
 
@@ -463,7 +519,9 @@ 
 		$widget_content = '';
 		if($widget != 'widgetContent' && $widget != 'widgetBox')
 		{
-			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) {
+				return;
+			}
 			// Hold the contents of the widget parameter
 			$widget_content = $this->getCache($widget, $args);
 		}
@@ -495,7 +553,9 @@ 
 		// If general call is given on page styles should return immediately dreamin '
 		if(!$javascript_mode)
 		{
-			if($args->id) $args->id = ' id="'.$args->id.'" ';
+			if($args->id) {
+				$args->id = ' id="'.$args->id.'" ';
+			}
 			switch($widget)
 			{
 				// If a direct orthogonal addition information
@@ -505,8 +565,7 @@ 
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
 						$body = $oDocument->getContent(false,false,false, false);
-					}
-					else
+					} else
 					{
 						$body = base64_decode($args->body);
 					}
@@ -533,8 +592,7 @@ 
 					break;
 			}
 			// Edit page is called when a widget if you add the code for handling
-		}
-		else
+		} else
 		{
 			switch($widget)
 			{
@@ -545,8 +603,7 @@ 
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
 						$body = $oDocument->getContent(false,false,false);
-					}
-					else
+					} else
 					{
 						$body = base64_decode($args->body);
 					}
@@ -556,8 +613,12 @@ 
 					{
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -591,9 +652,15 @@ 
 					{
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) {
+								continue;
+							}
+							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -616,9 +683,15 @@ 
 						$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, $allowed_key)) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, $allowed_key)) {
+								continue;
+							}
+							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -638,11 +711,15 @@ 
 			}
 		}
 		// Compile the widget style.
-		if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		if($args->widgetstyle) {
+			$widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		}
 
 		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
 		// Debug widget creation time information added to the results
-		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		if(__DEBUG__==3) {
+			$GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		}
 
 		$after = microtime(true);
 
@@ -675,7 +752,9 @@ 
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if(!file_exists($class_file)) {
+				return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			}
 			// Widget classes include
 			require_once($class_file);
 
@@ -686,9 +765,13 @@ 
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if(!is_object($oWidget)) {
+				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			}
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if(!method_exists($oWidget, 'proc')) {
+				return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			}
 
 			$oWidget->widget_path = $path;
 
@@ -699,12 +782,16 @@ 
 
 	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
 	{
-		if(!$widgetStyle) return $widget_content_body;
+		if(!$widgetStyle) {
+			return $widget_content_body;
+		}
 
 		$oWidgetModel = getModel('widget');
 		// Bring extra_var widget style tie
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-		if(!$widgetstyle_info) return $widget_content_body;
+		if(!$widgetstyle_info) {
+			return $widget_content_body;
+		}
 
 		$widgetstyle_extra_var = new stdClass();
 		$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
@@ -722,8 +809,7 @@ 
 		if($javascript_mode && $widget=='widgetBox')
 		{
 			Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
-		}
-		else
+		} else
 		{
 			Context::set('widget_content', $widget_content_body);
 		}
@@ -792,7 +878,9 @@ 
 			FileHandler::removeFile($cache_file);
 		}
 
-		if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+		if($vars->widget_cache>0) {
+			$vars->widget_sequence = getNextSequence();
+		}
 
 		$attribute = array();
 		foreach($vars as $key => $val)
@@ -802,7 +890,9 @@ 
 				unset($vars->{$key});
 				continue;
 			}
-			if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+			if(strpos($val,'|@|') > 0) {
+				$val = str_replace('|@|', ',', $val);
+			}
 			$vars->{$key} = Context::convertEncodingStr($val);
 			$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}

modules/point/point.model.php

Spacing +36 added lines, -36 removed lines

@@ -24,28 +24,28 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if($this->pointList[$member_srl]) return true;
+		if ($this->pointList[$member_srl]) return true;
 
 		// Get from file cache
-		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
+		$path = sprintf(_XE_PATH_.'files/member_extra_info/point/%s', getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
-		if(file_exists($cache_filename))
+		if (file_exists($cache_filename))
 		{
-			if(!$this->pointList[$member_srl])
+			if (!$this->pointList[$member_srl])
 				$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
 			return true;
 		}
 
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$output = executeQuery('point.getPoint', $args);
-		if($output->data->member_srl == $member_srl)
+		if ($output->data->member_srl == $member_srl)
 		{
-			if(!$this->pointList[$member_srl])
+			if (!$this->pointList[$member_srl])
 			{
-				$this->pointList[$member_srl] = (int)$output->data->point;
+				$this->pointList[$member_srl] = (int) $output->data->point;
 				FileHandler::makeDir($path);
-				FileHandler::writeFile($cache_filename, (int)$output->data->point);
+				FileHandler::writeFile($cache_filename, (int) $output->data->point);
 			}
 			return true;
 		}
@@ -60,25 +60,25 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+		if (!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
 
 		// Get from file cache
-		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
+		$path = sprintf(_XE_PATH_.'files/member_extra_info/point/%s', getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 
-		if(!$from_db && file_exists($cache_filename))
+		if (!$from_db && file_exists($cache_filename))
 			return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
 
 		// Get from the DB
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$output = executeQuery('point.getPoint', $args);
 
-		if(isset($output->data->member_srl))
+		if (isset($output->data->member_srl))
 		{
-			$point = (int)$output->data->point;
+			$point = (int) $output->data->point;
 			$this->pointList[$member_srl] = $point;
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if (!is_dir($path)) FileHandler::makeDir($path);
 			FileHandler::writeFile($cache_filename, $point);
 			return $point;
 		}
@@ -91,8 +91,8 @@ 
 	function getLevel($point, $level_step)
 	{
 		$level_count = count($level_step);
-		for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
-		$level --;
+		for ($level = 0; $level <= $level_count; $level++) if ($point < $level_step[$level]) break;
+		$level--;
 		return $level;
 	}
 
@@ -103,20 +103,20 @@ 
 	{
 		$member_srls = Context::get('member_srls');
 		$member_srls = array_unique(explode(',', $member_srls));
-		if(!count($member_srls))
+		if (!count($member_srls))
 		{
 			return;
 		}
 
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
 			return;
 		}
 
-		if(!getModel('module')->isSiteAdmin($logged_info))
+		if (!getModel('module')->isSiteAdmin($logged_info))
 		{
-			if(in_array($logged_info->member_srl, $member_srls))
+			if (in_array($logged_info->member_srl, $member_srls))
 			{
 				$member_srls = array($logged_info->member_srl);
 			}
@@ -130,7 +130,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 
 		$info = array();
-		foreach($member_srls as $v)
+		foreach ($member_srls as $v)
 		{
 			$obj = new stdClass;
 			$obj->point = $this->getPoint($v);
@@ -139,7 +139,7 @@ 
 			$info[] = $obj;
 		}
 
-		$this->add('point_info',$info);
+		$this->add('point_info', $info);
 	}
 
 
@@ -149,37 +149,37 @@ 
 	function getMemberList($args = null, $columnList = array())
 	{
 		// Arrange the search options
-		$args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-		$args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+		$args->is_admin = Context::get('is_admin') == 'Y' ? 'Y' : '';
+		$args->is_denied = Context::get('is_denied') == 'Y' ? 'Y' : '';
 		$args->selected_group_srl = Context::get('selected_group_srl');
 
 		$search_target = trim(Context::get('search_target'));
 		$search_keyword = trim(Context::get('search_keyword'));
 
 		// if search keyword is emtpy, show all list
-		if(!$search_keyword)
+		if (!$search_keyword)
 		{
 			unset($args->is_admin, $args->is_denied, $args->selected_group_srl, $search_target);
 		}
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_nick_name = $search_keyword;
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -194,7 +194,7 @@ 
 			}
 		}
 		// If there is a selected_group_srl, change the "query id" (for table join)
-		if($args->selected_group_srl)
+		if ($args->selected_group_srl)
 		{
 			$query_id = 'point.getMemberListWithinGroup';
 		}
@@ -205,12 +205,12 @@ 
 
 		$output = executeQuery($query_id, $args, $columnList);
 
-		if($output->total_count)
+		if ($output->total_count)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
 
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$output->data[$key]->level = $this->getLevel($val->point, $config->level_step);
 			}

Braces +32 added lines, -16 removed lines

@@ -24,15 +24,18 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if($this->pointList[$member_srl]) return true;
+		if($this->pointList[$member_srl]) {
+			return true;
+		}
 
 		// Get from file cache
 		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 		if(file_exists($cache_filename))
 		{
-			if(!$this->pointList[$member_srl])
-				$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+			if(!$this->pointList[$member_srl]) {
+							$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+			}
 			return true;
 		}
 
@@ -60,14 +63,17 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+		if(!$from_db && $this->pointList[$member_srl]) {
+			return $this->pointList[$member_srl];
+		}
 
 		// Get from file cache
 		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 
-		if(!$from_db && file_exists($cache_filename))
-			return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+		if(!$from_db && file_exists($cache_filename)) {
+					return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+		}
 
 		// Get from the DB
 		$args =new stdClass();
@@ -78,7 +84,9 @@ 
 		{
 			$point = (int)$output->data->point;
 			$this->pointList[$member_srl] = $point;
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 			FileHandler::writeFile($cache_filename, $point);
 			return $point;
 		}
@@ -91,7 +99,9 @@ 
 	function getLevel($point, $level_step)
 	{
 		$level_count = count($level_step);
-		for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
+		for($level=0;$level<=$level_count;$level++) {
+			if($point < $level_step[$level]) break;
+		}
 		$level --;
 		return $level;
 	}
@@ -119,8 +129,7 @@ 
 			if(in_array($logged_info->member_srl, $member_srls))
 			{
 				$member_srls = array($logged_info->member_srl);
-			}
-			else
+			} else
 			{
 				return;
 			}
@@ -167,19 +176,27 @@ 
 			switch($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_nick_name = $search_keyword;
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -197,8 +214,7 @@ 
 		if($args->selected_group_srl)
 		{
 			$query_id = 'point.getMemberListWithinGroup';
-		}
-		else
+		} else
 		{
 			$query_id = 'point.getMemberList';
 		}

modules/editor/editor.controller.php

Spacing +76 added lines, -76 removed lines

@@ -47,28 +47,28 @@ 
 	{
 		$component = Context::get('component');
 		$method = Context::get('method');
-		if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component);
-		if(!$oComponent->toBool()) return $oComponent;
+		if (!$oComponent->toBool()) return $oComponent;
 
-		if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+		if (!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
 		//$output = call_user_method($method, $oComponent);
 		//$output = call_user_func(array($oComponent, $method));
-		if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-		else return new Object(-1,sprintf('%s method is not exists', $method));
+		if (method_exists($oComponent, $method)) $output = $oComponent->{$method}();
+		else return new Object(-1, sprintf('%s method is not exists', $method));
 
-		if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
+		if ((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
 
 		$this->setError($oComponent->getError());
 		$this->setMessage($oComponent->getMessage());
 
 		$vars = $oComponent->getVariables();
-		if(count($vars))
+		if (count($vars))
 		{
-			foreach($vars as $key => $val)
+			foreach ($vars as $key => $val)
 			{
 				$this->add($key, $val);
 			}
@@ -86,18 +86,18 @@ 
 		$module_srl = array();
 		$oModuleModel = getModel('module');
 
-		foreach($target_module_srl as $srl)
+		foreach ($target_module_srl as $srl)
 		{
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($srl);
-			if(!$module_info->module_srl)
+			if (!$module_info->module_srl)
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			$module_grant = $oModuleModel->getGrant($module_info, $logged_info);
-			if(!$module_grant->manager)
+			if (!$module_grant->manager)
 			{
 				return new Object(-1, 'msg_not_permitted');
 			}
@@ -111,32 +111,32 @@ 
 		$editor_config->content_style = Context::get('content_style');
 		$editor_config->comment_content_style = Context::get('comment_content_style');
 		$editor_config->content_font = Context::get('content_font');
-		if($editor_config->content_font)
+		if ($editor_config->content_font)
 		{
 			$font_list = array();
-			$fonts = explode(',',$editor_config->content_font);
-			for($i=0,$c=count($fonts);$i<$c;$i++)
+			$fonts = explode(',', $editor_config->content_font);
+			for ($i = 0, $c = count($fonts); $i < $c; $i++)
 			{
-				$font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-				if(!$font) continue;
+				$font = trim(str_replace(array('"', '\''), '', $fonts[$i]));
+				if (!$font) continue;
 				$font_list[] = $font;
 			}
-			if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+			if (count($font_list)) $editor_config->content_font = '"'.implode('","', $font_list).'"';
 		}
 		$editor_config->content_font_size = Context::get('content_font_size');
 		$editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
 		$editor_config->sel_comment_editor_colorset = Context::get('sel_comment_editor_colorset');
 
-		$grants = array('enable_html_grant','enable_comment_html_grant','upload_file_grant','comment_upload_file_grant','enable_default_component_grant','enable_comment_default_component_grant','enable_component_grant','enable_comment_component_grant');
+		$grants = array('enable_html_grant', 'enable_comment_html_grant', 'upload_file_grant', 'comment_upload_file_grant', 'enable_default_component_grant', 'enable_comment_default_component_grant', 'enable_component_grant', 'enable_comment_component_grant');
 
-		foreach($grants as $key)
+		foreach ($grants as $key)
 		{
 			$grant = Context::get($key);
-			if(!$grant)
+			if (!$grant)
 			{
 				$editor_config->{$key} = array();
 			}
-			else if(is_array($grant))
+			else if (is_array($grant))
 			{
 				$editor_config->{$key} = $grant;
 			}
@@ -146,13 +146,13 @@ 
 			}
 		}
 
-		$editor_config->editor_height = (int)Context::get('editor_height');
-		$editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
+		$editor_config->editor_height = (int) Context::get('editor_height');
+		$editor_config->comment_editor_height = (int) Context::get('comment_editor_height');
 		$editor_config->enable_autosave = Context::get('enable_autosave');
-		if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+		if ($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
 
 		$oModuleController = getController('module');
-		foreach($module_srl as $srl)
+		foreach ($module_srl as $srl)
 		{
 			$oModuleController->insertModulePartConfig('editor', $srl, $editor_config);
 		}
@@ -169,31 +169,31 @@ 
 	 */
 	function triggerEditorComponentCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if (Context::getResponseMethod() != 'HTML') return new Object();
 
 		$module_info = Context::get('module_info');
 		$module_srl = $module_info->module_srl;
-		if($module_srl)
+		if ($module_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$editor_config = $oEditorModel->getEditorConfig($module_srl);
 			$content_style = $editor_config->content_style;
-			if($content_style)
+			if ($content_style)
 			{
-				$path = _XE_PATH_ . 'modules/editor/styles/'.$content_style.'/';
-				if(is_dir($path) && file_exists($path . 'style.ini'))
+				$path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
+				if (is_dir($path) && file_exists($path.'style.ini'))
 				{
 					$ini = file($path.'style.ini');
-					for($i = 0, $c = count($ini); $i < $c; $i++)
+					for ($i = 0, $c = count($ini); $i < $c; $i++)
 					{
 						$file = trim($ini[$i]);
-						if(!$file) continue;
+						if (!$file) continue;
 
-						if(substr_compare($file, '.css', -4) === 0)
+						if (substr_compare($file, '.css', -4) === 0)
 						{
 							Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
-						elseif(substr_compare($file, '.js', -3) === 0)
+						elseif (substr_compare($file, '.js', -3) === 0)
 						{
 							Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
 						}
@@ -202,12 +202,12 @@ 
 			}
 			$content_font = $editor_config->content_font;
 			$content_font_size = $editor_config->content_font_size;
-			if($content_font || $content_font_size)
+			if ($content_font || $content_font_size)
 			{
 				$buff = array();
 				$buff[] = '<style> .xe_content { ';
-				if($content_font) $buff[] = 'font-family:'.$content_font.';';
-				if($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
+				if ($content_font) $buff[] = 'font-family:'.$content_font.';';
+				if ($content_font_size) $buff[] = 'font-size:'.$content_font_size.';';
 				$buff[] = ' }</style>';
 				Context::addHtmlHeader(implode('', $buff));
 			}
@@ -222,7 +222,7 @@ 
 	 */
 	function transComponent($content)
 	{
-		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this,'transEditorComponent'), $content);
+		$content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this, 'transEditorComponent'), $content);
 		return $content;
 	}
 
@@ -237,19 +237,19 @@ 
 
 		$xml_obj = new stdClass;
 		$xml_obj->attrs = new stdClass;
-		for($i=0,$c=count($m[0]);$i<$c;$i++)
+		for ($i = 0, $c = count($m[0]); $i < $c; $i++)
 		{
-			if(!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
+			if (!isset($xml_obj->attrs)) $xml_obj->attrs = new stdClass;
 			$xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
 		}
 		$xml_obj->body = $match[4];
 
-		if(!$xml_obj->attrs->editor_component) return $match[0];
+		if (!$xml_obj->attrs->editor_component) return $match[0];
 
 		// Get converted codes by using component::transHTML()
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-		if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+		if (!is_object($oComponent) || !method_exists($oComponent, 'transHTML')) return $match[0];
 
 		return $oComponent->transHTML($xml_obj);
 	}
@@ -259,8 +259,8 @@ 
 	 */
 	function doSaveDoc($args)
 	{
-		if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-		if(Context::get('is_logged'))
+		if (!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -271,11 +271,11 @@ 
 		}
 
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$args->module_srl = Context::get('module_srl');
 		}
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
@@ -321,7 +321,7 @@ 
 	function deleteSavedDoc($mode = false)
 	{
 		$args = new stdClass();
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -332,7 +332,7 @@ 
 		}
 		$args->module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$args->module_srl = $current_module_info->module_srl;
@@ -340,13 +340,13 @@ 
 		// Check if the auto-saved document already exists
 		$output = executeQuery('editor.getSavedDocument', $args);
 		$saved_doc = $output->data;
-		if(!$saved_doc) return;
+		if (!$saved_doc) return;
 
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if(!$oSaved->isExists())
+		if (!$oSaved->isExists())
 		{
-			if($mode)
+			if ($mode)
 			{
 				$output = executeQuery('editor.getSavedDocument', $args);
 				$output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $saved_doc);
@@ -374,9 +374,9 @@ 
 		$oEditorModel = getModel('editor');
 		$args = new stdClass;
 
-		if($filter_enabled) $args->enabled = "Y";
+		if ($filter_enabled) $args->enabled = "Y";
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponentList', $args);
@@ -389,10 +389,10 @@ 
 
 		// Get information about log-in status and its group
 		$is_logged = Context::get('is_logged');
-		if($is_logged)
+		if ($is_logged)
 		{
 			$logged_info = Context::get('logged_info');
-			if($logged_info->group_list && is_array($logged_info->group_list))
+			if ($logged_info->group_list && is_array($logged_info->group_list))
 			{
 				$group_list = array_keys($logged_info->group_list);
 			}
@@ -400,30 +400,30 @@ 
 		}
 
 		// Get xml information for looping DB list
-		if(!is_array($db_list)) $db_list = array($db_list);
+		if (!is_array($db_list)) $db_list = array($db_list);
 		$component_list = new stdClass();
-		foreach($db_list as $component)
+		foreach ($db_list as $component)
 		{
-			if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component->component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 
 			$component_name = $component->component_name;
-			if(!$component_name) continue;
+			if (!$component_name) continue;
 
-			if(!in_array($component_name, $downloaded_list)) continue;
+			if (!in_array($component_name, $downloaded_list)) continue;
 
 			unset($xml_info);
 			$xml_info = $oEditorModel->getComponentXmlInfo($component_name);
 			$xml_info->enabled = $component->enabled;
 
-			if($component->extra_vars)
+			if ($component->extra_vars)
 			{
 				$extra_vars = unserialize($component->extra_vars);
-				if($extra_vars->target_group)
+				if ($extra_vars->target_group)
 				{
 					$xml_info->target_group = $extra_vars->target_group;
 				}
 
-				if($extra_vars->mid_list && count($extra_vars->mid_list))
+				if ($extra_vars->mid_list && count($extra_vars->mid_list))
 				{
 					$xml_info->mid_list = $extra_vars->mid_list;
 				}
@@ -450,9 +450,9 @@ 
 				if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
 				}*/
 				// Check the configuration of the editor component
-				if($xml_info->extra_vars)
+				if ($xml_info->extra_vars)
 				{
-					foreach($xml_info->extra_vars as $key => $val)
+					foreach ($xml_info->extra_vars as $key => $val)
 					{
 						$xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
 					}
@@ -463,25 +463,25 @@ 
 			// Get buttons, icons, images
 			$icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
 			$component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-			if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-			if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+			if (file_exists($icon_file)) $component_list->{$component_name}->icon = true;
+			if (file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
 		}
 
 		// Return if it checks enabled only
-		if($filter_enabled)
+		if ($filter_enabled)
 		{
 			$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+			$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"', '\\"', serialize($component_list)));
 			FileHandler::writeFile($cache_file, $buff);
 			return $component_list;
 		}
 
 		// Get xml_info of downloaded list
-		foreach($downloaded_list as $component_name)
+		foreach ($downloaded_list as $component_name)
 		{
-			if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+			if (in_array($component_name, array('colorpicker_text', 'colorpicker_bg'))) continue;
 			// Pass if configured
-			if($component_list->{$component_name}) continue;
+			if ($component_list->{$component_name}) continue;
 			// Insert data into the DB
 			$oEditorController = getAdminController('editor');
 			$oEditorController->insertComponent($component_name, false, $site_srl);
@@ -494,7 +494,7 @@ 
 		}
 
 		$cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+		$buff = sprintf('<?php if(!defined("__XE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"', '\\"', serialize($component_list)));
 		FileHandler::writeFile($cache_file, $buff);
 
 		return $component_list;
@@ -516,9 +516,9 @@ 
 		$editorConfig = $oModuleModel->getModulePartConfig('editor', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('editor', $moduleSrl, $editorConfig);
 			}

Braces +92 added lines, -40 removed lines

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