xpressengine / xe-core

modules/page/page.admin.view.php

Braces +23 added lines, -21 removed lines

@@ -28,8 +28,7 @@ 
 			{
 				Context::set('module_srl','');
 				$this->act = 'list';
-			}
-			else
+			} else
 			{
 				ModuleModel::syncModuleToSite($module_info);
 				$this->module_info = $module_info;
@@ -62,7 +61,9 @@ 
 		$search_target_list = array('s_mid','s_browser_title');
 		$search_target = Context::get('search_target');
 		$search_keyword = Context::get('search_keyword');
-		if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
+		if(in_array($search_target,$search_target_list) && $search_keyword) {
+			$args->{$search_target} = $search_keyword;
+		}
 
 		$output = executeQuery('page.getPageList', $args);
 		$oModuleModel = getModel('module');
@@ -101,7 +102,9 @@ 
 		$module_srl = Context::get('module_srl');
 		$module_info = Context::get('module_info');
 		// If you do not value module_srl just showing the index page
-		if(!$module_srl) return $this->dispPageAdminContent();
+		if(!$module_srl) {
+			return $this->dispPageAdminContent();
+		}
 		// If the layout is destined to add layout information haejum (layout_title, layout)
 		if($module_info->layout_srl)
 		{
@@ -183,8 +186,7 @@ 
 				$oPageMobile->module_info->mskin = $oModuleModel->getModuleDefaultSkin('page', 'M');
 			}
 			$page_content = $oPageMobile->{$method}();
-		}
-		else
+		} else
 		{
 			return new Object(-1, sprintf('%s method is not exists', $method));
 		}
@@ -202,8 +204,7 @@ 
 		if ($this->module_info->page_type == 'WIDGET')
 		{
 			$this->_setWidgetTypeContentModify(true);
-		}
-		else if ($this->module_info->page_type == 'ARTICLE')
+		} else if ($this->module_info->page_type == 'ARTICLE')
 		{
 			$this->_setArticleTypeContentModify(true);
 		}
@@ -220,8 +221,7 @@ 
 		if ($this->module_info->page_type == 'WIDGET')
 		{
 			$this->_setWidgetTypeContentModify();
-		}
-		else if ($this->module_info->page_type == 'ARTICLE')
+		} else if ($this->module_info->page_type == 'ARTICLE')
 		{
 			$this->_setArticleTypeContentModify();
 		}
@@ -233,13 +233,16 @@ 
 		if($isMobile)
 		{
 			$content = Context::get('mcontent');
-			if(!$content) $content = $this->module_info->mcontent;
+			if(!$content) {
+				$content = $this->module_info->mcontent;
+			}
 			$templateFile = 'page_mobile_content_modify';
-		}
-		else
+		} else
 		{
 			$content = Context::get('content');
-			if(!$content) $content = $this->module_info->content;
+			if(!$content) {
+				$content = $this->module_info->content;
+			}
 			$templateFile = 'page_content_modify';
 		}
 
@@ -271,8 +274,7 @@ 
 		{
 			Context::set('isMobile', 'Y');
 			$target = 'mdocument_srl';
-		}
-		else
+		} else
 		{
 			Context::set('isMobile', 'N');
 			$target = 'document_srl';
@@ -283,14 +285,12 @@ 
 			$document_srl = $this->module_info->{$target};
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
-		} 
-		else if(Context::get('document_srl'))
+		} else if(Context::get('document_srl'))
 		{
 			$document_srl = Context::get('document_srl');
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
-		}
-		else
+		} else
 		{
 			$oDocument->add('module_srl', $this->module_info->module_srl);
 		}
@@ -307,7 +307,9 @@ 
 	function dispPageAdminDelete()
 	{
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl) return $this->dispContent();
+		if(!$module_srl) {
+			return $this->dispContent();
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'mid');

Spacing +26 added lines, -26 removed lines

@@ -21,19 +21,19 @@ 
 		// Create module model object
 		$oModuleModel = getModel('module');
 		// module_srl two come over to save the module, putting the information in advance
-		if($module_srl)
+		if ($module_srl)
 		{
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-			if(!$module_info)
+			if (!$module_info)
 			{
-				Context::set('module_srl','');
+				Context::set('module_srl', '');
 				$this->act = 'list';
 			}
 			else
 			{
 				ModuleModel::syncModuleToSite($module_info);
 				$this->module_info = $module_info;
-				Context::set('module_info',$module_info);
+				Context::set('module_info', $module_info);
 			}
 		}
 		// Get a list of module categories
@@ -59,10 +59,10 @@ 
 		$args->page_count = 10;
 		$args->s_module_category_srl = Context::get('module_category_srl');
 
-		$search_target_list = array('s_mid','s_browser_title');
+		$search_target_list = array('s_mid', 's_browser_title');
 		$search_target = Context::get('search_target');
 		$search_keyword = Context::get('search_keyword');
-		if(in_array($search_target,$search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
+		if (in_array($search_target, $search_target_list) && $search_keyword) $args->{$search_target} = $search_keyword;
 
 		$output = executeQuery('page.getPageList', $args);
 		$oModuleModel = getModel('module');
@@ -101,9 +101,9 @@ 
 		$module_srl = Context::get('module_srl');
 		$module_info = Context::get('module_info');
 		// If you do not value module_srl just showing the index page
-		if(!$module_srl) return $this->dispPageAdminContent();
+		if (!$module_srl) return $this->dispPageAdminContent();
 		// If the layout is destined to add layout information haejum (layout_title, layout)
-		if($module_info->layout_srl)
+		if ($module_info->layout_srl)
 		{
 			$oLayoutModel = getModel('layout');
 			$layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
@@ -115,15 +115,15 @@ 
 		$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);
 		// Set a template file
 
-		if($this->module_info->page_type == 'ARTICLE')
+		if ($this->module_info->page_type == 'ARTICLE')
 		{
 			$oModuleModel = getModel('module');
 			$skin_list = $oModuleModel->getSkins($this->module_path);
-			Context::set('skin_list',$skin_list);
+			Context::set('skin_list', $skin_list);
 
 			$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
 			Context::set('mskin_list', $mskin_list);
@@ -161,23 +161,23 @@ 
 
 	function dispPageAdminMobileContent()
 	{
-		if($this->module_info->page_type == 'OUTSIDE')
+		if ($this->module_info->page_type == 'OUTSIDE')
 		{
 			return $this->stop(-1, 'msg_invalid_request');
 		}
 
-		if($this->module_srl)
+		if ($this->module_srl)
 		{
-			Context::set('module_srl',$this->module_srl);
+			Context::set('module_srl', $this->module_srl);
 		}
 
 		$oPageMobile = &getMobile('page');
 		$oPageMobile->module_info = $this->module_info;
 		$page_type_name = strtolower($this->module_info->page_type);
-		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if(method_exists($oPageMobile, $method))
+		$method = '_get'.ucfirst($page_type_name).'Content';
+		if (method_exists($oPageMobile, $method))
 		{
-			if($method == '_getArticleContent' && $this->module_info->is_mskin_fix == 'N')
+			if ($method == '_getArticleContent' && $this->module_info->is_mskin_fix == 'N')
 			{
 				$oModuleModel = getModel('module');
 				$oPageMobile->module_info->mskin = $oModuleModel->getModuleDefaultSkin('page', 'M');
@@ -230,16 +230,16 @@ 
 	function _setWidgetTypeContentModify($isMobile = false)
 	{
 		// Setting contents
-		if($isMobile)
+		if ($isMobile)
 		{
 			$content = Context::get('mcontent');
-			if(!$content) $content = $this->module_info->mcontent;
+			if (!$content) $content = $this->module_info->mcontent;
 			$templateFile = 'page_mobile_content_modify';
 		}
 		else
 		{
 			$content = Context::get('content');
-			if(!$content) $content = $this->module_info->content;
+			if (!$content) $content = $this->module_info->content;
 			$templateFile = 'page_content_modify';
 		}
 
@@ -256,7 +256,7 @@ 
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('widget_list..title','module_info.mid');
+		$security->encodeHTML('widget_list..title', 'module_info.mid');
 
 		// Set a template file
 		$this->setTemplateFile($templateFile);
@@ -267,7 +267,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument(0, true);
 
-		if($isMobile)
+		if ($isMobile)
 		{
 			Context::set('isMobile', 'Y');
 			$target = 'mdocument_srl';
@@ -278,13 +278,13 @@ 
 			$target = 'document_srl';
 		}
 
-		if($this->module_info->{$target})
+		if ($this->module_info->{$target})
 		{
 			$document_srl = $this->module_info->{$target};
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
 		} 
-		else if(Context::get('document_srl'))
+		else if (Context::get('document_srl'))
 		{
 			$document_srl = Context::get('document_srl');
 			$oDocument->setDocument($document_srl);
@@ -307,12 +307,12 @@ 
 	function dispPageAdminDelete()
 	{
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl) return $this->dispContent();
+		if (!$module_srl) return $this->dispContent();
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'mid');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		Context::set('module_info',$module_info);
+		Context::set('module_info', $module_info);
 		// Set a template file
 		$this->setTemplateFile('page_delete');
 

modules/page/page.api.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 		$oWidgetController->triggerWidgetCompile($page_content);
 		Context::setResponseMethod($requestMethod);
 
-		$oModule->add('page_content',$page_content);
+		$oModule->add('page_content', $page_content);
 	}
 }
 /* End of file page.api.php */

modules/page/page.controller.php

Braces +20 added lines, -10 removed lines

@@ -37,7 +37,9 @@ 
 		for($i=0;$i<count($link_buff[0]);$i++)
 		{
 			$tmp_str = trim($link_buff[0][$i]);
-			if(!$tmp_str) continue;
+			if(!$tmp_str) {
+				continue;
+			}
 			$header_script .=  $tmp_str."\n";
 		}
 
@@ -45,7 +47,9 @@ 
 		for($i=0;$i<count($script_buff[0]);$i++)
 		{
 			$tmp_str = trim($script_buff[0][$i]);
-			if(!$tmp_str) continue;
+			if(!$tmp_str) {
+				continue;
+			}
 			$header_script .=  $tmp_str."\n";
 		}
 
@@ -75,17 +79,23 @@ 
 		$host = sprintf("%s://%s%s",$url_info['scheme'],$url_info['host'],$url_info['port']?':'.$url_info['port']:'');
 		$this->host = $host.'/';
 		$path = $url_info['path'];
-		if(substr($path,-1)=='/') $path = substr($path,-1);
+		if(substr($path,-1)=='/') {
+			$path = substr($path,-1);
+		}
 		$t = explode('/',$path);
 		$_t = array();
 		for($i=0,$c=count($t)-1;$i<$c;$i++)
 		{
 			$v = trim($t[$i]);
-			if(!$v) continue;
+			if(!$v) {
+				continue;
+			}
 			$_t[] = $v;
 		}
 		$path = $host.'/'.implode('/',$_t);
-		if(substr($path,-1)!='/') $path .= '/';
+		if(substr($path,-1)!='/') {
+			$path .= '/';
+		}
 		$this->path = $path;
 		$content = preg_replace_callback('/(src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
 
@@ -95,16 +105,16 @@ 
 	function _replacePath($matches)
 	{
 		$val = trim($matches[3]);
-		if(preg_match('/^(http|https|ftp|telnet|mms|mailto)/i',$val)) return $matches[0];
+		if(preg_match('/^(http|https|ftp|telnet|mms|mailto)/i',$val)) {
+			return $matches[0];
+		}
 		if(substr($val,0,2)=='./')
 		{
 			$path = $this->path.substr($val,2);
-		}
-		elseif(substr($val,0,1)=='/')
+		} elseif(substr($val,0,1)=='/')
 		{
 			$path = $this->host.substr($val,1);
-		}
-		else
+		} else
 		{
 			$path = $this->path.$val;
 		}

Spacing +21 added lines, -21 removed lines

@@ -29,24 +29,24 @@ 
 	function getHeadScript($content)
 	{
 		// remove the title tag
-		$content = preg_replace('!<title([^>]*)>(.*?)<\/title>!is','', $content);
+		$content = preg_replace('!<title([^>]*)>(.*?)<\/title>!is', '', $content);
 		// Remove meta tags
-		$content = preg_replace('!<(\/){0,1}meta([^>]*)>!is','', $content);
+		$content = preg_replace('!<(\/){0,1}meta([^>]*)>!is', '', $content);
 		// Extract information such as <link, <style, <script and so on
 		preg_match_all('!<link([^>]*)>!is', $content, $link_buff);
-		for($i=0;$i<count($link_buff[0]);$i++)
+		for ($i = 0; $i < count($link_buff[0]); $i++)
 		{
 			$tmp_str = trim($link_buff[0][$i]);
-			if(!$tmp_str) continue;
-			$header_script .=  $tmp_str."\n";
+			if (!$tmp_str) continue;
+			$header_script .= $tmp_str."\n";
 		}
 
 		preg_match_all('!<(style|script)(.*?)<\/(style|script)>!is', $content, $script_buff);
-		for($i=0;$i<count($script_buff[0]);$i++)
+		for ($i = 0; $i < count($script_buff[0]); $i++)
 		{
 			$tmp_str = trim($script_buff[0][$i]);
-			if(!$tmp_str) continue;
-			$header_script .=  $tmp_str."\n";
+			if (!$tmp_str) continue;
+			$header_script .= $tmp_str."\n";
 		}
 
 		return $header_script;
@@ -72,22 +72,22 @@ 
 	function replaceSrc($content, $path)
 	{
 		$url_info = parse_url($path);
-		$host = sprintf("%s://%s%s",$url_info['scheme'],$url_info['host'],$url_info['port']?':'.$url_info['port']:'');
+		$host = sprintf("%s://%s%s", $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':'.$url_info['port'] : '');
 		$this->host = $host.'/';
 		$path = $url_info['path'];
-		if(substr($path,-1)=='/') $path = substr($path,-1);
-		$t = explode('/',$path);
+		if (substr($path, -1) == '/') $path = substr($path, -1);
+		$t = explode('/', $path);
 		$_t = array();
-		for($i=0,$c=count($t)-1;$i<$c;$i++)
+		for ($i = 0, $c = count($t) - 1; $i < $c; $i++)
 		{
 			$v = trim($t[$i]);
-			if(!$v) continue;
+			if (!$v) continue;
 			$_t[] = $v;
 		}
-		$path = $host.'/'.implode('/',$_t);
-		if(substr($path,-1)!='/') $path .= '/';
+		$path = $host.'/'.implode('/', $_t);
+		if (substr($path, -1) != '/') $path .= '/';
 		$this->path = $path;
-		$content = preg_replace_callback('/(src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
+		$content = preg_replace_callback('/(src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is', array($this, '_replacePath'), $content);
 
 		return $content;
 	}
@@ -95,14 +95,14 @@ 
 	function _replacePath($matches)
 	{
 		$val = trim($matches[3]);
-		if(preg_match('/^(http|https|ftp|telnet|mms|mailto)/i',$val)) return $matches[0];
-		if(substr($val,0,2)=='./')
+		if (preg_match('/^(http|https|ftp|telnet|mms|mailto)/i', $val)) return $matches[0];
+		if (substr($val, 0, 2) == './')
 		{
-			$path = $this->path.substr($val,2);
+			$path = $this->path.substr($val, 2);
 		}
-		elseif(substr($val,0,1)=='/')
+		elseif (substr($val, 0, 1) == '/')
 		{
-			$path = $this->host.substr($val,1);
+			$path = $this->host.substr($val, 1);
 		}
 		else
 		{

modules/page/page.mobile.php

Braces +18 added lines, -15 removed lines

@@ -30,12 +30,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 Object(-1, sprintf('%s method is not exists', $method));
+		if (method_exists($this, $method)) {
+			$page_content = $this->{$method}();
+		} else {
+			return new Object(-1, sprintf('%s method is not exists', $method));
+		}
 
 		Context::set('module_info', $this->module_info);
 		Context::set('page_content', $page_content);
@@ -55,8 +60,7 @@ 
 				if(!file_exists($cache_file) || filesize($cache_file) < 1)
 				{
 					$mtime = 0;
-				}
-				else
+				} else
 				{
 					$mtime = filemtime($cache_file);
 				}
@@ -65,15 +69,13 @@ 
 				{
 					$page_content = FileHandler::readFile($cache_file); 
 					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
-				} 
-				else 
+				} else 
 				{
 					$oWidgetController = getController('widget');
 					$page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
 					FileHandler::writeFile($cache_file, $page_content);
 				}
-			} 
-			else 
+			} else 
 			{
 				if(file_exists($cache_file))
 				{
@@ -81,8 +83,7 @@ 
 				}
 				$page_content = $this->module_info->mcontent;
 			}
-		}
-		else
+		} else
 		{
 			$page_content = $this->module_info->content;
 		}
@@ -114,8 +115,7 @@ 
 		if($this->module_info->mskin)
 		{
 			$templatePath = (sprintf($this->module_path.'m.skins/%s', $this->module_info->mskin));
-		}
-		else
+		} else
 		{
 			$templatePath = ($this->module_path.'m.skins/default');
 		}
@@ -130,8 +130,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;

Spacing +16 added lines, -16 removed lines

@@ -9,18 +9,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.m.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("./files/cache/opage/%d.%s.m.cache.php", $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->mpath;
 					break;
 				}
@@ -30,10 +30,10 @@ 
 	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';
+		$method = '_get'.ucfirst($page_type_name).'Content';
 		if (method_exists($this, $method)) $page_content = $this->{$method}();
 		else return new Object(-1, sprintf('%s method is not exists', $method));
 
@@ -46,13 +46,13 @@ 
 	function _getWidgetContent()
 	{
 		// Arrange a widget ryeolro
-		if($this->module_info->mcontent)
+		if ($this->module_info->mcontent)
 		{
 			$cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
-			$interval = (int)($this->module_info->page_caching_interval);
-			if($interval>0)
+			$interval = (int) ($this->module_info->page_caching_interval);
+			if ($interval > 0)
 			{
-				if(!file_exists($cache_file) || filesize($cache_file) < 1)
+				if (!file_exists($cache_file) || filesize($cache_file) < 1)
 				{
 					$mtime = 0;
 				}
@@ -61,7 +61,7 @@ 
 					$mtime = filemtime($cache_file);
 				}
 
-				if($mtime + $interval*60 > $_SERVER['REQUEST_TIME']) 
+				if ($mtime + $interval * 60 > $_SERVER['REQUEST_TIME']) 
 				{
 					$page_content = FileHandler::readFile($cache_file); 
 					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
@@ -75,7 +75,7 @@ 
 			} 
 			else 
 			{
-				if(file_exists($cache_file))
+				if (file_exists($cache_file))
 				{
 					FileHandler::removeFile($cache_file);
 				}
@@ -97,13 +97,13 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument(0, true);
 
-		if($this->module_info->mdocument_srl)
+		if ($this->module_info->mdocument_srl)
 		{
 			$document_srl = $this->module_info->mdocument_srl;
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
 		}
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			$document_srl = $this->module_info->document_srl;
 			$oDocument->setDocument($document_srl);
@@ -111,7 +111,7 @@ 
 		}
 		Context::set('oDocument', $oDocument);
 
-		if($this->module_info->mskin)
+		if ($this->module_info->mskin)
 		{
 			$templatePath = (sprintf($this->module_path.'m.skins/%s', $this->module_info->mskin));
 		}
@@ -128,9 +128,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);
 		}
 

modules/page/page.wap.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	function procWAP(&$oMobile)
 	{
 		// Check permissions
-		if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		if (!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
 		// The contents of the widget chuchulham
 		$oWidgetController = getController('widget');
 		$content = $oWidgetController->transWidgetCode($this->module_info->content);

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 	function procWAP(&$oMobile)
 	{
 		// Check permissions
-		if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		if(!$this->grant->access) {
+			return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		}
 		// The contents of the widget chuchulham
 		$oWidgetController = getController('widget');
 		$content = $oWidgetController->transWidgetCode($this->module_info->content);

modules/point/point.class.php

Spacing +35 added lines, -35 removed lines

@@ -24,9 +24,9 @@ 
 		$config->able_module = 'N';
 		$config->max_level = 30;
 		// Per-level score
-		for($i=1;$i<=30;$i++)
+		for ($i = 1; $i <= 30; $i++)
 		{
-			$config->level_step[$i] = pow($i,2)*90;
+			$config->level_step[$i] = pow($i, 2) * 90;
 		}
 		// Points for registration
 		$config->signup_point = 10;
@@ -84,29 +84,29 @@ 
 
 		$config = $oModuleModel->getModuleConfig('point');
 		// check if module is abled
-		if($config->able_module != 'N')
+		if ($config->able_module != 'N')
 		{
 			// Add a trigger for registration/insert document/insert comment/upload a file/download
-			if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
+			if (!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
+			if (!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
+			if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
 			// Add a trigger for voting up and down 2008.05.13 haneul
-			if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
 			// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true;
 		}
 
 		return false;
@@ -121,40 +121,40 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// Add a trigger for registration/insert document/insert comment/upload a file/download
-		if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
+		if (!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
 			$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
 			$oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
 			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
 			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
-		if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
+		if (!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
 			$oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
-		if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
+		if (!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
 			$oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
-		if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
+		if (!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
 			$oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
-		if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
+		if (!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
 			$oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
+		if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
 			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
+		if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
 			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
-		if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
+		if (!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
 			$oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
 			$oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
-		if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
+		if (!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
 			$oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
 		// Add a trigger for voting up and down 2008.05.13 haneul
-		if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
+		if (!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
 			$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
 		// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
 			$oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'))
 		{
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after');
 		}

Braces +93 added lines, -46 removed lines

@@ -87,26 +87,58 @@ 
 		if($config->able_module != 'N')
 		{
 			// Add a trigger for registration/insert document/insert comment/upload a file/download
-			if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
+			if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) {
+				return true;
+			}
 			// Add a trigger for voting up and down 2008.05.13 haneul
-			if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) {
+				return true;
+			}
 			// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 		}
 
 		return false;
@@ -121,38 +153,53 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// Add a trigger for registration/insert document/insert comment/upload a file/download
-		if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
-			$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
-			$oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
-			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
-			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
-		if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
-			$oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
-		if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
-			$oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
-		if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
-			$oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
-		if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
-			$oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
-			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
-			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
-		if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
-			$oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
-			$oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
-		if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
-			$oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
+		if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) {
+					$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
+		}
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) {
+					$oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
+		}
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) {
+					$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
+		}
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) {
+					$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
+		}
+		if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) {
+					$oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
+		}
+		if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) {
+					$oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
+		}
+		if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) {
+					$oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
+		}
+		if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) {
+					$oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
+		}
+		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) {
+					$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
+		}
+		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) {
+					$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
+		}
+		if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) {
+					$oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
+		}
+		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) {
+					$oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
+		}
+		if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) {
+					$oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
+		}
 		// Add a trigger for voting up and down 2008.05.13 haneul
-		if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
-			$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+		if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) {
+					$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+		}
 		// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
-			$oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) {
+					$oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
+		}
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'))
 		{

modules/point/point.view.php

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 		{
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 		// Get the configuration information
 		$oModuleModel = getModel('module');

Spacing +4 added lines, -4 removed lines

@@ -26,20 +26,20 @@
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if (!$current_module_srl) return new Object();
 		}
 		// Get the configuration information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 
-		if($current_module_srl)
+		if ($current_module_srl)
 		{
 			$module_config = $oModuleModel->getModulePartConfig('point', $current_module_srl);
-			if(!$module_config)
+			if (!$module_config)
 			{
 				$module_config['insert_document'] = $config->insert_document;
 				$module_config['insert_comment'] = $config->insert_comment;

modules/poll/poll.admin.model.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 	function getPollList($args)
 	{
 		$output = executeQueryArray('poll.getPollList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		//if($output->data && !is_array($output->data)) $output->data = array($output->data);
 		return $output;
@@ -32,7 +32,7 @@ 
 	function getPollListWithMember($args)
 	{
 		$output = executeQueryArray('poll.getPollListWithMember', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -50,14 +50,14 @@ 
 
 		$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
-		if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
+		if (!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
 
-		if($oComment && $oComment->isExists())
+		if ($oComment && $oComment->isExists())
 		{
 			$this->add('document_srl', $oComment->get('document_srl'));
 			$this->add('comment_srl', $oComment->get('comment_srl'));
 		}
-		elseif($oDocument->isExists())
+		elseif ($oDocument->isExists())
 		{
 			$this->add('document_srl', $oDocument->get('document_srl'));
 		}

Braces +12 added lines, -6 removed lines

@@ -20,7 +20,9 @@ 
 	function getPollList($args)
 	{
 		$output = executeQueryArray('poll.getPollList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		//if($output->data && !is_array($output->data)) $output->data = array($output->data);
 		return $output;
@@ -32,7 +34,9 @@ 
 	function getPollListWithMember($args)
 	{
 		$output = executeQueryArray('poll.getPollListWithMember', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -50,18 +54,20 @@ 
 
 		$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
-		if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
+		if(!$oDocument->isExists()) {
+			$oComment = $oCommentModel->getComment($upload_target_srl);
+		}
 
 		if($oComment && $oComment->isExists())
 		{
 			$this->add('document_srl', $oComment->get('document_srl'));
 			$this->add('comment_srl', $oComment->get('comment_srl'));
-		}
-		elseif($oDocument->isExists())
+		} elseif($oDocument->isExists())
 		{
 			$this->add('document_srl', $oDocument->get('document_srl'));
+		} else {
+			return new Object(-1, 'msg_not_founded');
 		}
-		else return new Object(-1, 'msg_not_founded');
 	}
 }
 /* End of file poll.admin.model.php */

modules/poll/poll.admin.view.php

Braces +18 added lines, -7 removed lines

@@ -29,7 +29,9 @@ 
 			switch($search_target)
 			{
 				case 'title' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title= $search_keyword;
 					break;
 				case 'regdate' :
@@ -62,17 +64,22 @@ 
 
 			$oDocumentModel = getModel('document');
 			$targetDocumentOutput = $oDocumentModel->getDocuments($uploadTargetSrlList);
-			if(!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
+			if(!is_array($targetDocumentOutput)) {
+				$targetDocumentOutput = array();
+			}
 
 			$oCommentModel = getModel('comment');
 			$columnList = array('comment_srl', 'document_srl');
 			$targetCommentOutput = $oCommentModel->getComments($uploadTargetSrlList, $columnList);
-			if(!is_array($targetCommentOutput)) $targetCommentOutput = array();
+			if(!is_array($targetCommentOutput)) {
+				$targetCommentOutput = array();
+			}
 
 			foreach($output->data as $value)
 			{
-				if(array_key_exists($value->upload_target_srl, $targetDocumentOutput))
-					$value->document_srl = $value->upload_target_srl;
+				if(array_key_exists($value->upload_target_srl, $targetDocumentOutput)) {
+									$value->document_srl = $value->upload_target_srl;
+				}
 
 				if(array_key_exists($value->upload_target_srl, $targetCommentOutput))
 				{
@@ -110,7 +117,9 @@ 
 		$skin_list = $oModuleModel->getSkins($this->module_path);
 		Context::set('skin_list', $skin_list);
 
-		if(!$skin_list[$config->skin]) $config->skin = "default";
+		if(!$skin_list[$config->skin]) {
+			$config->skin = "default";
+		}
 		// Set the skin colorset once the configurations is completed
 		Context::set('colorset_list', $skin_list[$config->skin]->colorset);
 
@@ -137,7 +146,9 @@ 
 		$args->poll_index_srl = Context::get('poll_index_srl');
 
 		$output = executeQuery('poll.getPoll', $args);
-		if(!$output->data) return $this->stop('msg_poll_not_exists');
+		if(!$output->data) {
+			return $this->stop('msg_poll_not_exists');
+		}
 
 		$poll = new stdClass();
 		$poll->stop_date = $output->data->stop_date;

Spacing +18 added lines, -18 removed lines

@@ -24,19 +24,19 @@ 
 		$search_keyword = trim(Context::get('search_keyword'));
 
 		$args = new stdClass();
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-					$args->s_title= $search_keyword;
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
+					$args->s_title = $search_keyword;
 					break;
 				case 'regdate' :
 					$args->s_regdate = $search_keyword;
 					break;
 				case 'ipaddress' :
-					$args->s_ipaddress= $search_keyword;
+					$args->s_ipaddress = $search_keyword;
 					break;
 			}
 		}
@@ -52,29 +52,29 @@ 
 		$output = $oPollAdminModel->getPollListWithMember($args);
 
 		// check poll type. document or comment
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
 			$uploadTargetSrlList = array();
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
 				$uploadTargetSrlList[] = $value->upload_target_srl;
 			}
 
 			$oDocumentModel = getModel('document');
 			$targetDocumentOutput = $oDocumentModel->getDocuments($uploadTargetSrlList);
-			if(!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
+			if (!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
 
 			$oCommentModel = getModel('comment');
 			$columnList = array('comment_srl', 'document_srl');
 			$targetCommentOutput = $oCommentModel->getComments($uploadTargetSrlList, $columnList);
-			if(!is_array($targetCommentOutput)) $targetCommentOutput = array();
+			if (!is_array($targetCommentOutput)) $targetCommentOutput = array();
 
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
-				if(array_key_exists($value->upload_target_srl, $targetDocumentOutput))
+				if (array_key_exists($value->upload_target_srl, $targetDocumentOutput))
 					$value->document_srl = $value->upload_target_srl;
 
-				if(array_key_exists($value->upload_target_srl, $targetCommentOutput))
+				if (array_key_exists($value->upload_target_srl, $targetCommentOutput))
 				{
 					$value->comment_srl = $value->upload_target_srl;
 					$value->document_srl = $targetCommentOutput[$value->comment_srl]->document_srl;
@@ -110,14 +110,14 @@ 
 		$skin_list = $oModuleModel->getSkins($this->module_path);
 		Context::set('skin_list', $skin_list);
 
-		if(!$skin_list[$config->skin]) $config->skin = "default";
+		if (!$skin_list[$config->skin]) $config->skin = "default";
 		// Set the skin colorset once the configurations is completed
 		Context::set('colorset_list', $skin_list[$config->skin]->colorset);
 
 		$security = new Security();
 		$security->encodeHTML('config..');
 		$security->encodeHTML('skin_list..title');
-		$security->encodeHTML('colorset_list..name','colorset_list..title');
+		$security->encodeHTML('colorset_list..name', 'colorset_list..title');
 
 		// Set a template
 		$this->setTemplatePath($this->module_path.'tpl');
@@ -137,14 +137,14 @@ 
 		$args->poll_index_srl = Context::get('poll_index_srl');
 
 		$output = executeQuery('poll.getPoll', $args);
-		if(!$output->data) return $this->stop('msg_poll_not_exists');
+		if (!$output->data) return $this->stop('msg_poll_not_exists');
 
 		$poll = new stdClass();
 		$poll->stop_date = $output->data->stop_date;
 		$poll->poll_count = $output->data->poll_count;
 
 		$output = executeQuery('poll.getPollTitle', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return $this->stop('msg_poll_not_exists');
 		}
@@ -155,14 +155,14 @@ 
 		$tmp->poll_count = $output->data->poll_count;
 
 		$output = executeQuery('poll.getPollItem', $args);
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
 			$tmp->item[] = $val;
 		}
 
 		$poll->poll_srl = $poll_srl;
 
-		Context::set('poll',$poll);
+		Context::set('poll', $poll);
 		// Configure the skin and the colorset for the default configuration
 		$oModuleModel = getModel('module');
 		$poll_config = $oModuleModel->getModuleConfig('poll');