xpressengine / xe-core

modules/rss/rss.controller.php

Spacing +10 added lines, -10 removed lines

@@ -28,29 +28,29 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$site_module_info = Context::get('site_module_info');
 
-		if(is_array($current_module_srl))
+		if (is_array($current_module_srl))
 		{
 			unset($current_module_srl);
 		}
-		if(!$current_module_srl) {
+		if (!$current_module_srl) {
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
 		}
 
-		if(!$current_module_srl) return new BaseObject();
+		if (!$current_module_srl) return new BaseObject();
 		// Imported rss settings of the selected module
 		$oRssModel = getModel('rss');
 		$rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
 
-		if($rss_config->open_rss != 'N')
+		if ($rss_config->open_rss != 'N')
 		{
 			Context::set('rss_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'rss'));
 			Context::set('atom_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'atom'));
 		}
 
-		if(Context::isInstalled() && $site_module_info->mid == Context::get('mid') && $total_config->use_total_feed != 'N')
+		if (Context::isInstalled() && $site_module_info->mid == Context::get('mid') && $total_config->use_total_feed != 'N')
 		{
-			if(Context::isAllowRewrite() && !Context::get('vid'))
+			if (Context::isAllowRewrite() && !Context::get('vid'))
 			{
 				$request_uri = Context::getRequestUri();
 				Context::set('general_rss_url', $request_uri.'rss');
@@ -58,8 +58,8 @@ 
 			}
 			else
 			{
-				Context::set('general_rss_url', getUrl('','module','rss','act','rss'));
-				Context::set('general_atom_url', getUrl('','module','rss','act','atom'));
+				Context::set('general_rss_url', getUrl('', 'module', 'rss', 'act', 'rss'));
+				Context::set('general_atom_url', getUrl('', 'module', 'rss', 'act', 'atom'));
 			}
 		}
 
@@ -72,9 +72,9 @@ 
 		$rssConfig = $oModuleModel->getModulePartConfig('rss', $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('rss', $moduleSrl, $rssConfig);
 			}

Braces +4 added lines, -3 removed lines

@@ -37,7 +37,9 @@ 
 			$current_module_srl = $current_module_info->module_srl;
 		}
 
-		if(!$current_module_srl) return new BaseObject();
+		if(!$current_module_srl) {
+			return new BaseObject();
+		}
 		// Imported rss settings of the selected module
 		$oRssModel = getModel('rss');
 		$rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
@@ -55,8 +57,7 @@ 
 				$request_uri = Context::getRequestUri();
 				Context::set('general_rss_url', $request_uri.'rss');
 				Context::set('general_atom_url', $request_uri.'atom');
-			}
-			else
+			} else
 			{
 				Context::set('general_rss_url', getUrl('','module','rss','act','rss'));
 				Context::set('general_atom_url', getUrl('','module','rss','act','atom'));

modules/rss/rss.view.php

Spacing +39 added lines, -39 removed lines

@@ -30,24 +30,24 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// Get the content and information for the current requested module if the method is not called from another module
-		if(!$document_list)
+		if (!$document_list)
 		{
 			$site_module_info = Context::get('site_module_info');
 			$site_srl = $site_module_info->site_srl;
 			$mid = Context::getRequestVars()->mid; // The target module id, if absent, then all
-			$start_date = (int)Context::get('start_date');
-			$end_date = (int)Context::get('end_date');
+			$start_date = (int) Context::get('start_date');
+			$end_date = (int) Context::get('end_date');
 
 			$module_srls = array();
 			$rss_config = array();
 			$total_config = '';
 			$total_config = $oModuleModel->getModuleConfig('rss');
 			// If one is specified, extract only for this mid
-			if($mid)
+			if ($mid)
 			{
 				$module_srl = $this->module_info->module_srl;
 				$config = $oModuleModel->getModulePartConfig('rss', $module_srl);
-				if($config->open_rss && $config->open_rss != 'N')
+				if ($config->open_rss && $config->open_rss != 'N')
 				{
 					$module_srls[] = $module_srl; 
 					$open_rss_config[$module_srl] = $config->open_rss;
@@ -56,14 +56,14 @@ 
 			}
 			else
 			{
-				if($total_config->use_total_feed != 'N')
+				if ($total_config->use_total_feed != 'N')
 				{
 					$rss_config = $oModuleModel->getModulePartConfigs('rss', $site_srl);
-					if($rss_config)
+					if ($rss_config)
 					{
-						foreach($rss_config as $module_srl => $config)
+						foreach ($rss_config as $module_srl => $config)
 						{
-							if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N')
+							if ($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N')
 							{
 								$module_srls[] = $module_srl;
 								$open_rss_config[$module_srl] = $config->open_rss;
@@ -73,39 +73,39 @@ 
 				}
 			}
 
-			if(!count($module_srls) && !$add_description) return $this->dispError();
+			if (!count($module_srls) && !$add_description) return $this->dispError();
 
 			$info = new stdClass;
 			$args = new stdClass;
 
-			if($module_srls)
+			if ($module_srls)
 			{
-				$args->module_srl = implode(',',$module_srls);
+				$args->module_srl = implode(',', $module_srls);
 				//$module_list = $oModuleModel->getMidList($args);	//perhaps module_list varialbles not use
 
 				$args->search_target = 'is_secret';
 				$args->search_keyword = 'N';
-				$args->page = (int)Context::get('page');
+				$args->page = (int) Context::get('page');
 				$args->list_count = 15;
-				if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
-				if(!$args->page || $args->page < 1) $args->page = 1;
-				if($start_date || $start_date != 0) $args->start_date = $start_date;
-				if($end_date || $end_date != 0) $args->end_date = $end_date;
-				if($start_date == 0) unset($start_date);
-				if($end_date == 0) unset($end_date);
+				if ($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
+				if (!$args->page || $args->page < 1) $args->page = 1;
+				if ($start_date || $start_date != 0) $args->start_date = $start_date;
+				if ($end_date || $end_date != 0) $args->end_date = $end_date;
+				if ($start_date == 0) unset($start_date);
+				if ($end_date == 0) unset($end_date);
 
 				$args->sort_index = 'list_order'; 
 				$args->order_type = 'asc';
 				$output = $oDocumentModel->getDocumentList($args);
 				$document_list = $output->data;
 				// Extract the feed title and information with Context::getBrowserTitle
-				if($mid)
+				if ($mid)
 				{
 					$info->title = Context::getBrowserTitle();
 					$oModuleController->replaceDefinedLangCode($info->title);
 
-					$info->title = str_replace('\'', '&apos;',$info->title);
-					if($config->feed_description)
+					$info->title = str_replace('\'', '&apos;', $info->title);
+					if ($config->feed_description)
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
@@ -113,9 +113,9 @@ 
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
-					$info->link = getUrl('','mid',$mid);
+					$info->link = getUrl('', 'mid', $mid);
 					$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($feed_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-					if(!$info->feed_copyright)
+					if (!$info->feed_copyright)
 					{
 						$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
@@ -123,10 +123,10 @@ 
 			}
 		}
 
-		if(!$info->title)
+		if (!$info->title)
 		{
-			if($rss_title) $info->title = $rss_title;
-			else if($total_config->feed_title) $info->title = $total_config->feed_title;
+			if ($rss_title) $info->title = $rss_title;
+			else if ($total_config->feed_title) $info->title = $total_config->feed_title;
 			else
 			{
 				$site_module_info = Context::get('site_module_info');
@@ -139,15 +139,15 @@ 
 			$info->link = Context::getRequestUri();
 			$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}
-		if($add_description) $info->description .= "\r\n".$add_description;
+		if ($add_description) $info->description .= "\r\n".$add_description;
 
-		if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-		switch(Context::get('format'))
+		if ($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		switch (Context::get('format'))
 		{
 			case 'atom':
 				$info->date = date('Y-m-d\TH:i:sP');
-				if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
-				else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+				if ($mid) { $info->id = getUrl('', 'mid', $mid, 'act', 'atom', 'page', Context::get('page'), 'start_date', Context::get('start_date'), 'end_date', Context::get('end_date')); }
+				else { $info->id = getUrl('', 'module', 'rss', 'act', 'atom', 'page', Context::get('page'), 'start_date', Context::get('start_date'), 'end_date', Context::get('end_date')); }
 				break;
 			case 'rss1.0':
 				$info->date = date('Y-m-d\TH:i:sP');
@@ -157,22 +157,22 @@ 
 				break;
 		}
 
-		if($_SERVER['HTTPS']=='on') $proctcl = 'https://';
+		if ($_SERVER['HTTPS'] == 'on') $proctcl = 'https://';
 		else $proctcl = 'http://';
 
 		$temp_link = explode('/', $info->link);
-		if($temp_link[0]=='' && $info->link)
+		if ($temp_link[0] == '' && $info->link)
 		{
 			$info->link = $proctcl.$_SERVER['HTTP_HOST'].$info->link;
 		}
 
 		$temp_id = explode('/', $info->id);
-		if($temp_id[0]=='' && $info->id)
+		if ($temp_id[0] == '' && $info->id)
 		{
 			$info->id = $proctcl.$_SERVER['HTTP_HOST'].$info->id;
 		}
 
-		$info->language = str_replace('jp','ja',Context::getLangType());
+		$info->language = str_replace('jp', 'ja', Context::getLangType());
 		// Set the variables used in the RSS output
 		Context::set('info', $info);
 		Context::set('feed_config', $config);
@@ -228,7 +228,7 @@ 
 	function dispError()
 	{
 		// Prepare the output message
-		$this->rss(null, null, Context::getLang('msg_rss_is_disabled') );
+		$this->rss(null, null, Context::getLang('msg_rss_is_disabled'));
 	}
 
 	/**
@@ -243,12 +243,12 @@ 
 		$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)
 		{
 			// Get information of the selected module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if (!$current_module_srl) return new BaseObject();
 		}
 		// Get teh RSS configurations for the selected module
 		$oRssModel = getModel('rss');

Braces +43 added lines, -21 removed lines

@@ -53,8 +53,7 @@ 
 					$open_rss_config[$module_srl] = $config->open_rss;
 				}
 				// If mid is not selected, then get all
-			}
-			else
+			} else
 			{
 				if($total_config->use_total_feed != 'N')
 				{
@@ -73,7 +72,9 @@ 
 				}
 			}
 
-			if(!count($module_srls) && !$add_description) return $this->dispError();
+			if(!count($module_srls) && !$add_description) {
+				return $this->dispError();
+			}
 
 			$info = new stdClass;
 			$args = new stdClass;
@@ -87,12 +88,24 @@ 
 				$args->search_keyword = 'N';
 				$args->page = (int)Context::get('page');
 				$args->list_count = 15;
-				if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
-				if(!$args->page || $args->page < 1) $args->page = 1;
-				if($start_date || $start_date != 0) $args->start_date = $start_date;
-				if($end_date || $end_date != 0) $args->end_date = $end_date;
-				if($start_date == 0) unset($start_date);
-				if($end_date == 0) unset($end_date);
+				if($total_config->feed_document_count) {
+					$args->list_count = $total_config->feed_document_count;
+				}
+				if(!$args->page || $args->page < 1) {
+					$args->page = 1;
+				}
+				if($start_date || $start_date != 0) {
+					$args->start_date = $start_date;
+				}
+				if($end_date || $end_date != 0) {
+					$args->end_date = $end_date;
+				}
+				if($start_date == 0) {
+					unset($start_date);
+				}
+				if($end_date == 0) {
+					unset($end_date);
+				}
 
 				$args->sort_index = 'list_order'; 
 				$args->order_type = 'asc';
@@ -108,8 +121,7 @@ 
 					if($config->feed_description)
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-					}
-					else
+					} else
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
@@ -125,9 +137,11 @@ 
 
 		if(!$info->title)
 		{
-			if($rss_title) $info->title = $rss_title;
-			else if($total_config->feed_title) $info->title = $total_config->feed_title;
-			else
+			if($rss_title) {
+				$info->title = $rss_title;
+			} else if($total_config->feed_title) {
+				$info->title = $total_config->feed_title;
+			} else
 			{
 				$site_module_info = Context::get('site_module_info');
 				$info->title = $site_module_info->browser_title;
@@ -139,15 +153,18 @@ 
 			$info->link = Context::getRequestUri();
 			$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}
-		if($add_description) $info->description .= "\r\n".$add_description;
+		if($add_description) {
+			$info->description .= "\r\n".$add_description;
+		}
 
-		if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		if($total_config->image) {
+			$info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		}
 		switch(Context::get('format'))
 		{
 			case 'atom':
 				$info->date = date('Y-m-d\TH:i:sP');
-				if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
-				else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+				if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); } else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
 				break;
 			case 'rss1.0':
 				$info->date = date('Y-m-d\TH:i:sP');
@@ -157,8 +174,11 @@ 
 				break;
 		}
 
-		if($_SERVER['HTTPS']=='on') $proctcl = 'https://';
-		else $proctcl = 'http://';
+		if($_SERVER['HTTPS']=='on') {
+			$proctcl = 'https://';
+		} else {
+			$proctcl = 'http://';
+		}
 
 		$temp_link = explode('/', $info->link);
 		if($temp_link[0]=='' && $info->link)
@@ -248,7 +268,9 @@ 
 			// Get information of the selected module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if(!$current_module_srl) {
+				return new BaseObject();
+			}
 		}
 		// Get teh RSS configurations for the selected module
 		$oRssModel = getModel('rss');

modules/editor/editor.view.php

Spacing +12 added lines, -12 removed lines

@@ -27,11 +27,11 @@ 
 		$component = Context::get('component');
 
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 		// Get compoenet object
 		$oEditorModel = getModel('editor');
 		$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
-		if(!$oComponent->toBool())
+		if (!$oComponent->toBool())
 		{
 			Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			$this->setTemplatePath($this->module_path.'tpl');
@@ -58,12 +58,12 @@ 
 		$component_name = Context::get('component_name');
 
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		$oEditorModel = getModel('editor');
 		$component = $oEditorModel->getComponent($component_name, $site_srl);
 
-		if(!$component->component_name) {
+		if (!$component->component_name) {
 			$this->stop('msg_invalid_request');
 			return;
 		}
@@ -83,12 +83,12 @@ 
 		$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)
 		{
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if (!$current_module_srl) return new BaseObject();
 		}
 		// Get editors settings
 		$oEditorModel = getModel('editor');
@@ -101,17 +101,17 @@ 
 		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
 		Context::set('editor_skin_list', $editor_skin_list);
 
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->editor_skin);
 		Context::set('editor_colorset_list', $skin_info->colorset);
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->comment_editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->comment_editor_skin);
 		Context::set('editor_comment_colorset_list', $skin_info->colorset);
 
 		$contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
 		$content_style_list = array();
-		for($i=0,$c=count($contents);$i<$c;$i++)
+		for ($i = 0, $c = count($contents); $i < $c; $i++)
 		{
 			$style = $contents[$i];
-			$info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
+			$info = $oModuleModel->loadSkinInfo($this->module_path, $style, 'styles');
 			$content_style_list[$style] = new stdClass();
 			$content_style_list[$style]->title = $info->title;
 		}			
@@ -148,7 +148,7 @@ 
 	{
 		$skin = Context::get('skin');
 		$oModuleModel = getModel('module');
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
 		$colorset = $skin_info->colorset;
 		Context::set('colorset', $colorset);
 	}
@@ -160,7 +160,7 @@ 
 
 		$mode = Context::get('mode');
 
-		if($mode != 'main')
+		if ($mode != 'main')
 		{
 			$option_com = new stdClass();
 			$option_com->allow_fileupload = false;

Braces +5 added lines, -5 removed lines

@@ -36,8 +36,7 @@ 
 			Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			$this->setTemplatePath($this->module_path.'tpl');
 			$this->setTemplateFile('component_not_founded');
-		}
-		else
+		} else
 		{
 			// Get the result after executing a method to display popup url of the component
 			$popup_content = $oComponent->getPopupContent();
@@ -88,7 +87,9 @@ 
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if(!$current_module_srl) {
+				return new BaseObject();
+			}
 		}
 		// Get editors settings
 		$oEditorModel = getModel('editor');
@@ -178,8 +179,7 @@ 
 			$option_com->content_style = $config->comment_content_style;
 			$option_com->colorset = $config->sel_comment_editor_colorset;
 			$editor = $oEditorModel->getEditor(0, $option_com);
-		}
-		else
+		} else
 		{
 			$option = new stdClass();
 			$option->allow_fileupload = false;

modules/editor/components/emoticon/emoticon.class.php

Spacing +16 added lines, -16 removed lines

@@ -19,7 +19,7 @@ 
 	{
 		$this->editor_sequence = $editor_sequence;
 		$this->component_path = $component_path;
-		$this->emoticon_path = sprintf('%s%s/images',preg_replace('/^\.\//i','',$this->component_path),'tpl','images');
+		$this->emoticon_path = sprintf('%s%s/images', preg_replace('/^\.\//i', '', $this->component_path), 'tpl', 'images');
 	}
 
 	/**
@@ -28,11 +28,11 @@ 
 	function getEmoticonList()
 	{
 		$emoticon = Context::get('emoticon');
-		if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new BaseObject(-1,'msg_invalid_request');
+		if (!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) return new BaseObject(-1, 'msg_invalid_request');
 
 		$list = $this->getEmoticons($emoticon);
 
-		$this->add('emoticons', implode("\n",$list));
+		$this->add('emoticons', implode("\n", $list));
 	}
 
 	/**
@@ -44,13 +44,13 @@ 
 		$output = array();
 
 		$oDir = dir($emoticon_path);
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if(substr($file,0,1)=='.') continue;
-			if(preg_match('/\.(jpg|jpeg|gif|png)$/i',$file)) $output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path,'',$file));
+			if (substr($file, 0, 1) == '.') continue;
+			if (preg_match('/\.(jpg|jpeg|gif|png)$/i', $file)) $output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path, '', $file));
 		}
 		$oDir->close();
-		if(count($output)) asort($output);
+		if (count($output)) asort($output);
 		return $output;
 	}
 
@@ -62,11 +62,11 @@ 
 		// Bringing a list of emoticons directory
 		$emoticon_dirs = FileHandler::readDir($this->emoticon_path);
 		$emoticon_list = array();
-		if($emoticon_dirs)
+		if ($emoticon_dirs)
 		{
-			foreach($emoticon_dirs as $emoticon)
+			foreach ($emoticon_dirs as $emoticon)
 			{
-				if(preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) $emoticon_list[] = $emoticon;
+				if (preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) $emoticon_list[] = $emoticon;
 			}
 		}
 		Context::set('emoticon_list', $emoticon_list);
@@ -89,24 +89,24 @@ 
 		$src = $xml_obj->attrs->src;
 		$alt = $xml_obj->attrs->alt;
 
-		if(!$alt)
+		if (!$alt)
 		{
-			$tmp_arr = explode('/',$src);
+			$tmp_arr = explode('/', $src);
 			$alt = array_pop($tmp_arr);
 		}
 
-		$src = str_replace(array('&','"'), array('&','&qout;'), $src);
-		if(!$alt) $alt = $src;
+		$src = str_replace(array('&', '"'), array('&', '&qout;'), $src);
+		if (!$alt) $alt = $src;
 
 		$attr_output = array();
 		$attr_output = array("src=\"".$src."\"");
 
-		if($alt)
+		if ($alt)
 		{
 			$attr_output[] = "alt=\"".$alt."\"";
 		}
 
-		$code = sprintf("<img %s style=\"border:0px\" />", implode(" ",$attr_output));
+		$code = sprintf("<img %s style=\"border:0px\" />", implode(" ", $attr_output));
 
 		return $code;
 	}

Braces +18 added lines, -6 removed lines

@@ -28,7 +28,9 @@ 
 	function getEmoticonList()
 	{
 		$emoticon = Context::get('emoticon');
-		if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new BaseObject(-1,'msg_invalid_request');
+		if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$list = $this->getEmoticons($emoticon);
 
@@ -46,11 +48,17 @@ 
 		$oDir = dir($emoticon_path);
 		while($file = $oDir->read())
 		{
-			if(substr($file,0,1)=='.') continue;
-			if(preg_match('/\.(jpg|jpeg|gif|png)$/i',$file)) $output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path,'',$file));
+			if(substr($file,0,1)=='.') {
+				continue;
+			}
+			if(preg_match('/\.(jpg|jpeg|gif|png)$/i',$file)) {
+				$output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path,'',$file));
+			}
 		}
 		$oDir->close();
-		if(count($output)) asort($output);
+		if(count($output)) {
+			asort($output);
+		}
 		return $output;
 	}
 
@@ -66,7 +74,9 @@ 
 		{
 			foreach($emoticon_dirs as $emoticon)
 			{
-				if(preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) $emoticon_list[] = $emoticon;
+				if(preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) {
+					$emoticon_list[] = $emoticon;
+				}
 			}
 		}
 		Context::set('emoticon_list', $emoticon_list);
@@ -96,7 +106,9 @@ 
 		}
 
 		$src = str_replace(array('&','"'), array('&','&qout;'), $src);
-		if(!$alt) $alt = $src;
+		if(!$alt) {
+			$alt = $src;
+		}
 
 		$attr_output = array();
 		$attr_output = array("src=\"".$src."\"");

modules/editor/editor.admin.controller.php

Spacing +28 added lines, -28 removed lines

@@ -23,26 +23,26 @@ 
 		$enables = Context::get('enables');
 		$component_names = Context::get('component_names');
 
-		if(!is_array($component_names)) $component_names = array();
-		if(!is_array($enables)) $enables = array();
+		if (!is_array($component_names)) $component_names = array();
+		if (!is_array($enables)) $enables = array();
 
 		$unables = array_diff($component_names, $enables);
 		$componentList = array();
 
-		foreach($enables as $component_name)
+		foreach ($enables as $component_name)
 		{
 			$componentList[$component_name] = 'Y';
 		}
-		foreach($unables as $component_name)
+		foreach ($unables as $component_name)
 		{
 			$componentList[$component_name] = 'N';
 		}
 
-		$output = $this->editorListOrder($component_names,$site_module_info->site_srl);
-		if(!$output->toBool()) return new BaseObject();
+		$output = $this->editorListOrder($component_names, $site_module_info->site_srl);
+		if (!$output->toBool()) return new BaseObject();
 
-		$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
-		if(!$output->toBool()) return new BaseObject();
+		$output = $this->editorCheckUse($componentList, $site_module_info->site_srl);
+		if (!$output->toBool()) return new BaseObject();
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($site_module_info->site_srl);
@@ -57,11 +57,11 @@ 
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 
-		foreach($componentList as $componentName => $value)
+		foreach ($componentList as $componentName => $value)
 		{
 			$args->component_name = $componentName;
 			$args->enabled = $value;
-			if($site_srl == 0)
+			if ($site_srl == 0)
 			{
 				$output = executeQuery('editor.updateComponent', $args);
 			}
@@ -70,7 +70,7 @@ 
 				$output = executeQuery('editor.updateSiteComponent', $args);
 			}
 		}
-		if(!$output->toBool()) return new BaseObject();
+		if (!$output->toBool()) return new BaseObject();
 
 		unset($componentList);
 		return $output;
@@ -84,13 +84,13 @@ 
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$list_order_num = '30';
-		if(is_array($component_names))
+		if (is_array($component_names))
 		{
-			foreach($component_names as $name)
+			foreach ($component_names as $name)
 			{
 				$args->list_order = $list_order_num;
 				$args->component_name = $name;
-				if($site_srl == 0)
+				if ($site_srl == 0)
 				{
 					$output = executeQuery('editor.updateComponent', $args);
 				}
@@ -99,7 +99,7 @@ 
 					$output = executeQuery('editor.updateSiteComponent', $args);
 				}
 
-				if(!$output->toBool()) return new BaseObject();
+				if (!$output->toBool()) return new BaseObject();
 				$list_order_num++;
 			}
 		}
@@ -124,11 +124,11 @@ 
 		$args = new stdClass;
 		$args->component_name = $component_name;
 		$args->extra_vars = serialize($extra_vars);
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 
-		if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
+		if (!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
 		else $output = executeQuery('editor.updateSiteComponent', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($args->site_srl);
@@ -146,10 +146,10 @@ 
 		$configVars = Context::getRequestVars();
 		
 		$config = new stdClass;
-		if($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
+		if ($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
 		else $config->font_defined = 'Y';
 
-		if($config->font_defined == 'Y')
+		if ($config->font_defined == 'Y')
 			$config->content_font = $configVars->content_font_defined;
 		else
 			$config->content_font = $configVars->content_font;
@@ -160,11 +160,11 @@ 
 		$config->comment_editor_height = $configVars->comment_editor_height;
 		$config->content_style = $configVars->content_style;
 
-		$config->content_font_size= $configVars->content_font_size.'px';
-		$config->sel_editor_colorset= $configVars->sel_editor_colorset;
-		$config->sel_comment_editor_colorset= $configVars->sel_comment_editor_colorset;
+		$config->content_font_size = $configVars->content_font_size.'px';
+		$config->sel_editor_colorset = $configVars->sel_editor_colorset;
+		$config->sel_comment_editor_colorset = $configVars->sel_comment_editor_colorset;
 
-		$oModuleController->insertModuleConfig('editor',$config);
+		$oModuleController->insertModuleConfig('editor', $config);
 		$this->setRedirectUrl(Context::get('error_return_url'));
 	}
 
@@ -173,7 +173,7 @@ 
 	 */
 	function insertComponent($component_name, $enabled = false, $site_srl = 0)
 	{
-		if($enabled) $enabled = 'Y';
+		if ($enabled) $enabled = 'Y';
 		else $enabled = 'N';
 
 		$args = new stdClass;
@@ -181,12 +181,12 @@ 
 		$args->enabled = $enabled;
 		$args->site_srl = $site_srl;
 		// Check if the component exists
-		if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
+		if (!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
 		else $output = executeQuery('editor.isSiteComponentInserted', $args);
-		if($output->data->count) return new BaseObject(-1, 'msg_component_is_not_founded');
+		if ($output->data->count) return new BaseObject(-1, 'msg_component_is_not_founded');
 		// Inert a component
 		$args->list_order = getNextSequence();
-		if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
+		if (!$site_srl) $output = executeQuery('editor.insertComponent', $args);
 		else $output = executeQuery('editor.insertSiteComponent', $args);
 
 		$oEditorController = getController('editor');

Braces +56 added lines, -26 removed lines

@@ -23,8 +23,12 @@ 
 		$enables = Context::get('enables');
 		$component_names = Context::get('component_names');
 
-		if(!is_array($component_names)) $component_names = array();
-		if(!is_array($enables)) $enables = array();
+		if(!is_array($component_names)) {
+			$component_names = array();
+		}
+		if(!is_array($enables)) {
+			$enables = array();
+		}
 
 		$unables = array_diff($component_names, $enables);
 		$componentList = array();
@@ -39,10 +43,14 @@ 
 		}
 
 		$output = $this->editorListOrder($component_names,$site_module_info->site_srl);
-		if(!$output->toBool()) return new BaseObject();
+		if(!$output->toBool()) {
+			return new BaseObject();
+		}
 
 		$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);
-		if(!$output->toBool()) return new BaseObject();
+		if(!$output->toBool()) {
+			return new BaseObject();
+		}
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($site_module_info->site_srl);
@@ -64,13 +72,14 @@ 
 			if($site_srl == 0)
 			{
 				$output = executeQuery('editor.updateComponent', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('editor.updateSiteComponent', $args);
 			}
 		}
-		if(!$output->toBool()) return new BaseObject();
+		if(!$output->toBool()) {
+			return new BaseObject();
+		}
 
 		unset($componentList);
 		return $output;
@@ -93,13 +102,14 @@ 
 				if($site_srl == 0)
 				{
 					$output = executeQuery('editor.updateComponent', $args);
-				}
-				else
+				} else
 				{
 					$output = executeQuery('editor.updateSiteComponent', $args);
 				}
 
-				if(!$output->toBool()) return new BaseObject();
+				if(!$output->toBool()) {
+					return new BaseObject();
+				}
 				$list_order_num++;
 			}
 		}
@@ -126,9 +136,14 @@ 
 		$args->extra_vars = serialize($extra_vars);
 		$args->site_srl = (int)$site_module_info->site_srl;
 
-		if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
-		else $output = executeQuery('editor.updateSiteComponent', $args);
-		if(!$output->toBool()) return $output;
+		if(!$args->site_srl) {
+			$output = executeQuery('editor.updateComponent', $args);
+		} else {
+			$output = executeQuery('editor.updateSiteComponent', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($args->site_srl);
@@ -146,13 +161,17 @@ 
 		$configVars = Context::getRequestVars();
 		
 		$config = new stdClass;
-		if($configVars->font_defined != 'Y') $config->font_defined = $configVars->font_defined = 'N';
-		else $config->font_defined = 'Y';
+		if($configVars->font_defined != 'Y') {
+			$config->font_defined = $configVars->font_defined = 'N';
+		} else {
+			$config->font_defined = 'Y';
+		}
 
-		if($config->font_defined == 'Y')
-			$config->content_font = $configVars->content_font_defined;
-		else
-			$config->content_font = $configVars->content_font;
+		if($config->font_defined == 'Y') {
+					$config->content_font = $configVars->content_font_defined;
+		} else {
+					$config->content_font = $configVars->content_font;
+		}
 
 		$config->editor_skin = $configVars->editor_skin;
 		$config->editor_height = $configVars->editor_height;
@@ -173,21 +192,32 @@ 
 	 */
 	function insertComponent($component_name, $enabled = false, $site_srl = 0)
 	{
-		if($enabled) $enabled = 'Y';
-		else $enabled = 'N';
+		if($enabled) {
+			$enabled = 'Y';
+		} else {
+			$enabled = 'N';
+		}
 
 		$args = new stdClass;
 		$args->component_name = $component_name;
 		$args->enabled = $enabled;
 		$args->site_srl = $site_srl;
 		// Check if the component exists
-		if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
-		else $output = executeQuery('editor.isSiteComponentInserted', $args);
-		if($output->data->count) return new BaseObject(-1, 'msg_component_is_not_founded');
+		if(!$site_srl) {
+			$output = executeQuery('editor.isComponentInserted', $args);
+		} else {
+			$output = executeQuery('editor.isSiteComponentInserted', $args);
+		}
+		if($output->data->count) {
+			return new BaseObject(-1, 'msg_component_is_not_founded');
+		}
 		// Inert a component
 		$args->list_order = getNextSequence();
-		if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
-		else $output = executeQuery('editor.insertSiteComponent', $args);
+		if(!$site_srl) {
+			$output = executeQuery('editor.insertComponent', $args);
+		} else {
+			$output = executeQuery('editor.insertSiteComponent', $args);
+		}
 
 		$oEditorController = getController('editor');
 		$oEditorController->removeCache($site_srl);

modules/poll/poll.controller.php

Spacing +59 added lines, -59 removed lines

@@ -20,9 +20,9 @@ 
 	function procPollInsert()
 	{
 		$stop_date = Context::get('stop_date');
-		if($stop_date < date('Ymd'))
+		if ($stop_date < date('Ymd'))
 		{
-			$stop_date = date('YmdHis', $_SERVER['REQUEST_TIME']+60*60*24*365);
+			$stop_date = date('YmdHis', $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365);
 		}
 
 		$logged_info = Context::get('logged_info');
@@ -34,9 +34,9 @@ 
 		unset($vars->error_return_url);
 		unset($vars->stop_date);
 
-		foreach($vars as $key => $val)
+		foreach ($vars as $key => $val)
 		{
-			if(stripos($key, 'tidx'))
+			if (stripos($key, 'tidx'))
 			{
 				continue;
 			}
@@ -44,32 +44,32 @@ 
 			$tmp_arr = explode('_', $key);
 
 			$poll_index = $tmp_arr[1];
-			if(!$poll_index)
+			if (!$poll_index)
 			{
 				continue;
 			}
 
-			if(!trim($val))
+			if (!trim($val))
 			{
 				continue;
 			}
 
-			if($tmp_args[$poll_index] == NULL)
+			if ($tmp_args[$poll_index] == NULL)
 			{
 				$tmp_args[$poll_index] = new stdClass;
 			}
 
-			if(!is_array($tmp_args[$poll_index]->item))
+			if (!is_array($tmp_args[$poll_index]->item))
 			{
 				$tmp_args[$poll_index]->item = array();
 			}
 
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
 				$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 
-			switch($tmp_arr[0])
+			switch ($tmp_arr[0])
 			{
 				case 'title':
 					$tmp_args[$poll_index]->title = $val;
@@ -83,26 +83,26 @@ 
 			}
 		}
 
-		foreach($tmp_args as $key => $val)
+		foreach ($tmp_args as $key => $val)
 		{
-			if(!$val->checkcount)
+			if (!$val->checkcount)
 			{
 				$val->checkcount = 1;
 			}
 
-			if($val->title && count($val->item))
+			if ($val->title && count($val->item))
 			{
 				$args->poll[] = $val;
 			}
 		}
 
-		if(!count($args->poll)) return new BaseObject(-1, 'cmd_null_item');
+		if (!count($args->poll)) return new BaseObject(-1, 'cmd_null_item');
 
 		$args->stop_date = $stop_date;
 
 		// Configure the variables
 		$poll_srl = getNextSequence();
-		$member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
+		$member_srl = $logged_info->member_srl ? $logged_info->member_srl : 0;
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -111,18 +111,18 @@ 
 		$poll_args = new stdClass;
 		$poll_args->poll_srl = $poll_srl;
 		$poll_args->member_srl = $member_srl;
-		$poll_args->list_order = $poll_srl*-1;
+		$poll_args->list_order = $poll_srl * -1;
 		$poll_args->stop_date = $args->stop_date;
 		$poll_args->poll_count = 0;
 		$output = executeQuery('poll.insertPoll', $poll_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// Individual poll registration
-		foreach($args->poll as $key => $val)
+		foreach ($args->poll as $key => $val)
 		{
 			$title_args = new stdClass;
 			$title_args->poll_srl = $poll_srl;
@@ -134,14 +134,14 @@ 
 			$title_args->member_srl = $member_srl;
 			$title_args->upload_target_srl = $upload_target_srl;
 			$output = executeQuery('poll.insertPollTitle', $title_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			// Add the individual survey items
-			foreach($val->item as $k => $v)
+			foreach ($val->item as $k => $v)
 			{
 				$item_args = new stdClass;
 				$item_args->poll_srl = $poll_srl;
@@ -150,7 +150,7 @@ 
 				$item_args->poll_count = 0;
 				$item_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('poll.insertPollItem', $item_args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -171,19 +171,19 @@ 
 	{
 		$poll_srl = Context::get('poll_srl');
 		$poll_srl_indexes = Context::get('poll_srl_indexes');
-		$tmp_item_srls = explode(',',$poll_srl_indexes);
-		for($i=0;$i<count($tmp_item_srls);$i++)
+		$tmp_item_srls = explode(',', $poll_srl_indexes);
+		for ($i = 0; $i < count($tmp_item_srls); $i++)
 		{
-			$srl = (int)trim($tmp_item_srls[$i]);
-			if(!$srl) continue;
+			$srl = (int) trim($tmp_item_srls[$i]);
+			if (!$srl) continue;
 			$item_srls[] = $srl;
 		}
 
 		// If there is no response item, display an error
-		if(!count($item_srls)) return new BaseObject(-1, 'msg_check_poll_item');
+		if (!count($item_srls)) return new BaseObject(-1, 'msg_check_poll_item');
 		// Make sure is the poll has already been taken
 		$oPollModel = getModel('poll');
-		if($oPollModel->isPolled($poll_srl)) return new BaseObject(-1, 'msg_already_poll');
+		if ($oPollModel->isPolled($poll_srl)) return new BaseObject(-1, 'msg_already_poll');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -193,15 +193,15 @@ 
 		// Update all poll responses related to the post
 		$output = executeQuery('poll.updatePoll', $args);
 		$output = executeQuery('poll.updatePollTitle', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Record each polls selected items
-		$args->poll_item_srl = implode(',',$item_srls);
+		$args->poll_item_srl = implode(',', $item_srls);
 		$output = executeQuery('poll.updatePollItems', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -211,12 +211,12 @@ 
 		$log_args->poll_srl = $poll_srl;
 
 		$logged_info = Context::get('logged_info');
-		$member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
+		$member_srl = $logged_info->member_srl ? $logged_info->member_srl : 0;
 
 		$log_args->member_srl = $member_srl;
 		$log_args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		$output = executeQuery('poll.insertPollLog', $log_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -225,12 +225,12 @@ 
 		$oDB->commit();
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if (!$skin || !is_dir(_XE_PATH_.'modules/poll/skins/'.$skin)) $skin = 'default';
 		// Get tpl
 		$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
 
 		$this->add('poll_srl', $poll_srl);
-		$this->add('tpl',$tpl);
+		$this->add('tpl', $tpl);
 		$this->setMessage('success_poll');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
@@ -245,13 +245,13 @@ 
 		$poll_srl = Context::get('poll_srl');
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if (!$skin || !is_dir(_XE_PATH_.'modules/poll/skins/'.$skin)) $skin = 'default';
 
 		$oPollModel = getModel('poll');
 		$tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
 
 		$this->add('poll_srl', $poll_srl);
-		$this->add('tpl',$tpl);
+		$this->add('tpl', $tpl);
 	}
 
 	/**
@@ -259,12 +259,12 @@ 
 	 */
 	function procPollGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$pollSrls = Context::get('poll_srls');
-		if($pollSrls) $pollSrlList = explode(',', $pollSrls);
+		if ($pollSrls) $pollSrlList = explode(',', $pollSrls);
 
 		global $lang;
-		if(count($pollSrlList) > 0)
+		if (count($pollSrlList) > 0)
 		{
 			$oPollAdminModel = getAdminModel('poll');
 			$args = new stdClass;
@@ -272,11 +272,11 @@ 
 			$output = $oPollAdminModel->getPollListWithMember($args);
 			$pollList = $output->data;
 
-			if(is_array($pollList))
+			if (is_array($pollList))
 			{
-				foreach($pollList AS $key=>$value)
+				foreach ($pollList AS $key=>$value)
 				{
-					if($value->checkcount == 1) $value->checkName = $lang->single_check;
+					if ($value->checkcount == 1) $value->checkName = $lang->single_check;
 					else $value->checkName = $lang->multi_check;
 				}
 			}
@@ -332,29 +332,29 @@ 
 	function triggerDeleteDocumentPoll(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if (!$document_srl) return new BaseObject();
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $document_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new BaseObject();
+		if (!$poll_srl) return new BaseObject();
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new BaseObject();
 	}
@@ -365,29 +365,29 @@ 
 	function triggerDeleteCommentPoll(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if (!$comment_srl) return new BaseObject();
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $comment_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new BaseObject();
+		if (!$poll_srl) return new BaseObject();
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new BaseObject();
 	}
@@ -397,8 +397,8 @@ 
 	 */
 	function syncPoll($upload_target_srl, $content)
 	{
-		$match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is',$content, $matches);
-		for($i=0;$i<$match_cnt;$i++)
+		$match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is', $content, $matches);
+		for ($i = 0; $i < $match_cnt; $i++)
 		{
 			$poll_srl = $matches[3][$i];
 
@@ -407,7 +407,7 @@ 
 			$output = executeQuery('poll.getPoll', $args);
 			$poll = $output->data;
 
-			if($poll->upload_target_srl) continue;
+			if ($poll->upload_target_srl) continue;
 
 			$args->upload_target_srl = $upload_target_srl;
 			$output = executeQuery('poll.updatePollTarget', $args);

Braces +75 added lines, -27 removed lines

@@ -96,7 +96,9 @@ 
 			}
 		}
 
-		if(!count($args->poll)) return new BaseObject(-1, 'cmd_null_item');
+		if(!count($args->poll)) {
+			return new BaseObject(-1, 'cmd_null_item');
+		}
 
 		$args->stop_date = $stop_date;
 
@@ -175,15 +177,21 @@ 
 		for($i=0;$i<count($tmp_item_srls);$i++)
 		{
 			$srl = (int)trim($tmp_item_srls[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$item_srls[] = $srl;
 		}
 
 		// If there is no response item, display an error
-		if(!count($item_srls)) return new BaseObject(-1, 'msg_check_poll_item');
+		if(!count($item_srls)) {
+			return new BaseObject(-1, 'msg_check_poll_item');
+		}
 		// Make sure is the poll has already been taken
 		$oPollModel = getModel('poll');
-		if($oPollModel->isPolled($poll_srl)) return new BaseObject(-1, 'msg_already_poll');
+		if($oPollModel->isPolled($poll_srl)) {
+			return new BaseObject(-1, 'msg_already_poll');
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -225,7 +233,9 @@ 
 		$oDB->commit();
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) {
+			$skin = 'default';
+		}
 		// Get tpl
 		$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
 
@@ -245,7 +255,9 @@ 
 		$poll_srl = Context::get('poll_srl');
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) {
+			$skin = 'default';
+		}
 
 		$oPollModel = getModel('poll');
 		$tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
@@ -259,9 +271,13 @@ 
 	 */
 	function procPollGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$pollSrls = Context::get('poll_srls');
-		if($pollSrls) $pollSrlList = explode(',', $pollSrls);
+		if($pollSrls) {
+			$pollSrlList = explode(',', $pollSrls);
+		}
 
 		global $lang;
 		if(count($pollSrlList) > 0)
@@ -276,12 +292,14 @@ 
 			{
 				foreach($pollList AS $key=>$value)
 				{
-					if($value->checkcount == 1) $value->checkName = $lang->single_check;
-					else $value->checkName = $lang->multi_check;
+					if($value->checkcount == 1) {
+						$value->checkName = $lang->single_check;
+					} else {
+						$value->checkName = $lang->multi_check;
+					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$pollList = array();
 			$this->setMessage($lang->no_documents);
@@ -332,29 +350,43 @@ 
 	function triggerDeleteDocumentPoll(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $document_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new BaseObject();
+		if(!$poll_srl) {
+			return new BaseObject();
+		}
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -365,29 +397,43 @@ 
 	function triggerDeleteCommentPoll(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if(!$comment_srl) {
+			return new BaseObject();
+		}
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $comment_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new BaseObject();
+		if(!$poll_srl) {
+			return new BaseObject();
+		}
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -407,7 +453,9 @@ 
 			$output = executeQuery('poll.getPoll', $args);
 			$poll = $output->data;
 
-			if($poll->upload_target_srl) continue;
+			if($poll->upload_target_srl) {
+				continue;
+			}
 
 			$args->upload_target_srl = $upload_target_srl;
 			$output = executeQuery('poll.updatePollTarget', $args);

modules/point/point.view.php

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 BaseObject();
+			if (!$current_module_srl) return new BaseObject();
 		}
 		// 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;

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 BaseObject();
+			if(!$current_module_srl) {
+				return new BaseObject();
+			}
 		}
 		// Get the configuration information
 		$oModuleModel = getModel('module');

modules/point/point.admin.controller.php

Spacing +83 added lines, -83 removed lines

@@ -26,10 +26,10 @@ 
 		$args = Context::getRequestVars();
 
 		//if module IO config is off
-		if($args->able_module == 'Y')
+		if ($args->able_module == 'Y')
 		{
 			// Re-install triggers, if it was disabled.
-			if($config->able_module == 'N')
+			if ($config->able_module == 'N')
 			{
 				$this->moduleUpdate();
 			}
@@ -39,28 +39,28 @@ 
 
 			// Check the point name
 			$config->point_name = $args->point_name;
-			if(!$config->point_name) $config->point_name = 'point';
+			if (!$config->point_name) $config->point_name = 'point';
 			// Specify the default points
-			$config->signup_point = (int)$args->signup_point;
-			$config->login_point = (int)$args->login_point;
-			$config->insert_document = (int)$args->insert_document;
-			$config->read_document = (int)$args->read_document;
-			$config->insert_comment = (int)$args->insert_comment;
-			$config->upload_file = (int)$args->upload_file;
-			$config->download_file = (int)$args->download_file;
-			$config->voted = (int)$args->voted;
-			$config->blamed = (int)$args->blamed;
+			$config->signup_point = (int) $args->signup_point;
+			$config->login_point = (int) $args->login_point;
+			$config->insert_document = (int) $args->insert_document;
+			$config->read_document = (int) $args->read_document;
+			$config->insert_comment = (int) $args->insert_comment;
+			$config->upload_file = (int) $args->upload_file;
+			$config->download_file = (int) $args->download_file;
+			$config->voted = (int) $args->voted;
+			$config->blamed = (int) $args->blamed;
 			// The highest level
 			$config->max_level = $args->max_level;
-			if($config->max_level>1000) $config->max_level = 1000;
-			if($config->max_level<1) $config->max_level = 1;
+			if ($config->max_level > 1000) $config->max_level = 1000;
+			if ($config->max_level < 1) $config->max_level = 1;
 			// Set the level icon
 			$config->level_icon = $args->level_icon;
 			// Check if downloads are not allowed
-			if($args->disable_download == 'Y') $config->disable_download = 'Y';
+			if ($args->disable_download == 'Y') $config->disable_download = 'Y';
 			else $config->disable_download = 'N';
 			// Check if reading a document is not allowed
-			if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
+			if ($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
 			else $config->disable_read_document = 'N';
 
 			$oMemberModel = getModel('member');
@@ -68,23 +68,23 @@ 
 			$config->point_group = array();
 
 			// Per-level group configurations
-			foreach($group_list as $group)
+			foreach ($group_list as $group)
 			{
 				// Admin group should not be connected to point.
-				if($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
+				if ($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
 
 				$group_srl = $group->group_srl;
 
-				if(isset($args->{'point_group_'.$group_srl}))
+				if (isset($args->{'point_group_'.$group_srl}))
 				{
 					//if group level is higher than max level, change to max level
-					if($args->{'point_group_'.$group_srl} > $args->max_level)
+					if ($args->{'point_group_'.$group_srl} > $args->max_level)
 					{
 						$args->{'point_group_'.$group_srl} = $args->max_level;
 					}
 
 					//if group level is lower than 1, change to 1
-					if($args->{'point_group_'.$group_srl} < 1)
+					if ($args->{'point_group_'.$group_srl} < 1)
 					{
 						$args->{'point_group_'.$group_srl} = 1;
 					}
@@ -95,10 +95,10 @@ 
 			$config->group_reset = $args->group_reset;
 			// Per-level point configurations
 			unset($config->level_step);
-			for($i=1;$i<=$config->max_level;$i++)
+			for ($i = 1; $i <= $config->max_level; $i++)
 			{
 				$key = "level_step_".$i;
-				$config->level_step[$i] = (int)$args->{$key};
+				$config->level_step[$i] = (int) $args->{$key};
 			}
 			// A function to calculate per-level points
 			$config->expression = $args->expression;
@@ -130,11 +130,11 @@ 
 		$args = Context::getRequestVars();
 
 		$configTypeList = array('insert_document', 'insert_comment', 'upload_file', 'download_file', 'read_document', 'voted', 'blamed');
-		foreach($configTypeList AS $config)
+		foreach ($configTypeList AS $config)
 		{
-			if(is_array($args->{$config}))
+			if (is_array($args->{$config}))
 			{
-				foreach($args->{$config} AS $key=>$value)
+				foreach ($args->{$config} AS $key=>$value)
 				{
 					$module_config[$key][$config] = $value;
 				}
@@ -142,16 +142,16 @@ 
 		}
 
 		$oModuleController = getController('module');
-		if(count($module_config))
+		if (count($module_config))
 		{
-			foreach($module_config as $module_srl => $config)
+			foreach ($module_config as $module_srl => $config)
 			{
-				$oModuleController->insertModulePartConfig('point',$module_srl,$config);
+				$oModuleController->insertModulePartConfig('point', $module_srl, $config);
 			}
 		}
 
 		$this->setMessage('success_updated');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminModuleConfig');
 			header('location:'.$returnUrl);
@@ -165,24 +165,24 @@ 
 	function procPointAdminInsertPointModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 		// Save configurations
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if (!$srl) continue;
 			unset($config);
-			$config['insert_document'] = (int)Context::get('insert_document');
-			$config['insert_comment'] = (int)Context::get('insert_comment');
-			$config['upload_file'] = (int)Context::get('upload_file');
-			$config['download_file'] = (int)Context::get('download_file');
-			$config['read_document'] = (int)Context::get('read_document');
-			$config['voted'] = (int)Context::get('voted');
-			$config['blamed'] = (int)Context::get('blamed');
+			$config['insert_document'] = (int) Context::get('insert_document');
+			$config['insert_comment'] = (int) Context::get('insert_comment');
+			$config['upload_file'] = (int) Context::get('upload_file');
+			$config['download_file'] = (int) Context::get('download_file');
+			$config['read_document'] = (int) Context::get('read_document');
+			$config['voted'] = (int) Context::get('voted');
+			$config['blamed'] = (int) Context::get('blamed');
 			$oModuleController->insertModulePartConfig('point', $srl, $config);
 		}
 
@@ -204,7 +204,7 @@ 
 		preg_match('/^(\+|-)?([1-9][0-9]*)$/', $point, $m);
 
 		$action = '';
-		switch($m[1])
+		switch ($m[1])
 		{
 			case '+':
 				$action = 'add';
@@ -219,7 +219,7 @@ 
 		$point = $m[2];
 
 		$oPointController = getController('point');
-		$output = $oPointController->setPoint($member_srl, (int)$point, $action);
+		$output = $oPointController->setPoint($member_srl, (int) $point, $action);
 
 		$this->setError(-1);
 		$this->setMessage('success_updated', 'info');
@@ -244,29 +244,29 @@ 
 
 		// Get member infomation
 		$output = executeQueryArray('point.getMemberCount');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$member[$val->member_srl] = 0;
 			}
 		}
 
 		// Get post information
 		$output = executeQueryArray('point.getDocumentPoint');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
+				if ($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
 				else $insert_point = $config->insert_document;
 
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -275,16 +275,16 @@ 
 		$output = null;
 		// Get comments information
 		$output = executeQueryArray('point.getCommentPoint');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
+				if ($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
 				else $insert_point = $config->insert_comment;
 
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -292,16 +292,16 @@ 
 		$output = null;
 		// Get the attached files' information
 		$output = executeQueryArray('point.getFilePoint');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
+				if ($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
 				else $insert_point = $config->upload_file;
 
-				if(!$val->member_srl) continue;
+				if (!$val->member_srl) continue;
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -309,13 +309,13 @@ 
 		$output = null;
 		// Set all members' points to 0
 		$output = executeQuery("point.initMemberPoint");
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save the file temporarily
 		
 		$str = '';
-		foreach($member as $key => $val)
+		foreach ($member as $key => $val)
 		{
-			$val += (int)$config->signup_point;
+			$val += (int) $config->signup_point;
 			$str .= $key.','.$val."\r\n";
 		}
 
@@ -323,7 +323,7 @@ 
 
 		$this->add('total', count($member));
 		$this->add('position', 0);
-		$this->setMessage( sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')) );
+		$this->setMessage(sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')));
 	}
 
 	/**
@@ -331,35 +331,35 @@ 
 	 */
 	function procPointAdminApplyPoint()
 	{
-		$position = (int)Context::get('position');
-		$total = (int)Context::get('total');
+		$position = (int) Context::get('position');
+		$total = (int) Context::get('total');
 
-		if(!file_exists('./files/cache/pointRecal.txt')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!file_exists('./files/cache/pointRecal.txt')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$idx = 0;
-		$f = fopen("./files/cache/pointRecal.txt","r");
-		while(!feof($f))
+		$f = fopen("./files/cache/pointRecal.txt", "r");
+		while (!feof($f))
 		{
 			$str = trim(fgets($f, 1024));
-			$idx ++;
-			if($idx > $position)
+			$idx++;
+			if ($idx > $position)
 			{
-				list($member_srl, $point) = explode(',',$str);
+				list($member_srl, $point) = explode(',', $str);
 
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
 				$args->point = $point;
-				$output = executeQuery('point.insertPoint',$args);
-				if($idx%5000==0) break;
+				$output = executeQuery('point.insertPoint', $args);
+				if ($idx % 5000 == 0) break;
 			}
 		}
 
-		if(feof($f))
+		if (feof($f))
 		{
 			FileHandler::removeFile('./files/cache/pointRecal.txt');
 			$idx = $total;
 
-			FileHandler::rename('./files/member_extra_info/point','./files/member_extra_info/point.old');
+			FileHandler::rename('./files/member_extra_info/point', './files/member_extra_info/point.old');
 
 			FileHandler::removeDir('./files/member_extra_info/point.old');
 		}
@@ -377,16 +377,16 @@ 
 	function procPointAdminReset()
 	{
 		$module_srl = Context::get('module_srls');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 		// Save configurations
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if (!$srl) continue;
 			$args = new stdClass();
 			$args->module = 'point';
 			$args->module_srl = $srl;
@@ -394,7 +394,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

Braces +93 added lines, -35 removed lines

@@ -39,7 +39,9 @@ 
 
 			// Check the point name
 			$config->point_name = $args->point_name;
-			if(!$config->point_name) $config->point_name = 'point';
+			if(!$config->point_name) {
+				$config->point_name = 'point';
+			}
 			// Specify the default points
 			$config->signup_point = (int)$args->signup_point;
 			$config->login_point = (int)$args->login_point;
@@ -52,16 +54,26 @@ 
 			$config->blamed = (int)$args->blamed;
 			// The highest level
 			$config->max_level = $args->max_level;
-			if($config->max_level>1000) $config->max_level = 1000;
-			if($config->max_level<1) $config->max_level = 1;
+			if($config->max_level>1000) {
+				$config->max_level = 1000;
+			}
+			if($config->max_level<1) {
+				$config->max_level = 1;
+			}
 			// Set the level icon
 			$config->level_icon = $args->level_icon;
 			// Check if downloads are not allowed
-			if($args->disable_download == 'Y') $config->disable_download = 'Y';
-			else $config->disable_download = 'N';
+			if($args->disable_download == 'Y') {
+				$config->disable_download = 'Y';
+			} else {
+				$config->disable_download = 'N';
+			}
 			// Check if reading a document is not allowed
-			if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
-			else $config->disable_read_document = 'N';
+			if($args->disable_read_document == 'Y') {
+				$config->disable_read_document = 'Y';
+			} else {
+				$config->disable_read_document = 'N';
+			}
 
 			$oMemberModel = getModel('member');
 			$group_list = $oMemberModel->getGroups();
@@ -71,7 +83,9 @@ 
 			foreach($group_list as $group)
 			{
 				// Admin group should not be connected to point.
-				if($group->is_admin == 'Y' || $group->is_default == 'Y') continue;
+				if($group->is_admin == 'Y' || $group->is_default == 'Y') {
+					continue;
+				}
 
 				$group_srl = $group->group_srl;
 
@@ -102,8 +116,7 @@ 
 			}
 			// A function to calculate per-level points
 			$config->expression = $args->expression;
-		}
-		else
+		} else
 		{
 			//module IO config is OFF, Other settings will not be modified.
 			$config->able_module = 'N';
@@ -165,16 +178,23 @@ 
 	function procPointAdminInsertPointModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 		// Save configurations
 		$oModuleController = getController('module');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			unset($config);
 			$config['insert_document'] = (int)Context::get('insert_document');
 			$config['insert_comment'] = (int)Context::get('insert_comment');
@@ -244,29 +264,40 @@ 
 
 		// Get member infomation
 		$output = executeQueryArray('point.getMemberCount');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$member[$val->member_srl] = 0;
 			}
 		}
 
 		// Get post information
 		$output = executeQueryArray('point.getDocumentPoint');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
-				else $insert_point = $config->insert_document;
+				if($module_config[$val->module_srl]['insert_document']) {
+					$insert_point = $module_config[$val->module_srl]['insert_document'];
+				} else {
+					$insert_point = $config->insert_document;
+				}
 
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -275,16 +306,23 @@ 
 		$output = null;
 		// Get comments information
 		$output = executeQueryArray('point.getCommentPoint');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
-				else $insert_point = $config->insert_comment;
+				if($module_config[$val->module_srl]['insert_comment']) {
+					$insert_point = $module_config[$val->module_srl]['insert_comment'];
+				} else {
+					$insert_point = $config->insert_comment;
+				}
 
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -292,16 +330,23 @@ 
 		$output = null;
 		// Get the attached files' information
 		$output = executeQueryArray('point.getFilePoint');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		if($output->data)
 		{
 			foreach($output->data as $key => $val)
 			{
-				if($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
-				else $insert_point = $config->upload_file;
+				if($module_config[$val->module_srl]['upload_file']) {
+					$insert_point = $module_config[$val->module_srl]['upload_file'];
+				} else {
+					$insert_point = $config->upload_file;
+				}
 
-				if(!$val->member_srl) continue;
+				if(!$val->member_srl) {
+					continue;
+				}
 				$point = $insert_point * $val->count;
 				$member[$val->member_srl] += $point;
 			}
@@ -309,7 +354,9 @@ 
 		$output = null;
 		// Set all members' points to 0
 		$output = executeQuery("point.initMemberPoint");
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save the file temporarily
 		
 		$str = '';
@@ -334,7 +381,9 @@ 
 		$position = (int)Context::get('position');
 		$total = (int)Context::get('total');
 
-		if(!file_exists('./files/cache/pointRecal.txt')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!file_exists('./files/cache/pointRecal.txt')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$idx = 0;
 		$f = fopen("./files/cache/pointRecal.txt","r");
@@ -350,7 +399,9 @@ 
 				$args->member_srl = $member_srl;
 				$args->point = $point;
 				$output = executeQuery('point.insertPoint',$args);
-				if($idx%5000==0) break;
+				if($idx%5000==0) {
+					break;
+				}
 			}
 		}
 
@@ -377,16 +428,23 @@ 
 	function procPointAdminReset()
 	{
 		$module_srl = Context::get('module_srls');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		// In case of batch configuration of several modules
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 		// Save configurations
 		$oModuleController = getController('module');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$args = new stdClass();
 			$args->module = 'point';
 			$args->module_srl = $srl;

modules/board/board.class.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
 
 class board extends ModuleObject
 {
-	var $search_option = array('title_content','title','content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
+	var $search_option = array('title_content', 'title', 'content', 'comment', 'user_name', 'nick_name', 'user_id', 'tag'); ///< 검색 옵션
 
 	var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title', 'nick_name', 'user_name', 'user_id'); // 정렬 옵션
 
@@ -25,14 +25,14 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
-		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
 		}
-		if(!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
 		{
 			Context::addSSLAction('dispTempSavedList');
 		}
@@ -54,7 +54,7 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = executeQuery('module.getSite', $args);
-		if(!$output->data->index_module_srl)
+		if (!$output->data->index_module_srl)
 		{
 			$args->mid = 'board';
 			$args->module = 'board';
@@ -63,7 +63,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -87,13 +87,13 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 get the member menu trigger
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+			if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -109,16 +109,16 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17  check the member menu trigger, if it is not existed then insert
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
+			if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
 			{
 				$oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 			}
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
+			if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
 			{
 				$oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after');
 			}
@@ -131,12 +131,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');
 
-		foreach($output->data as $board)
+		foreach ($output->data as $board)
 		{
 			$oModuleController->deleteModule($board->module_srl);
 		}

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
@@ -90,10 +92,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 get the member menu trigger
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) {
+				return true;
+			}
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -131,7 +137,9 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');