xpressengine / xe-core

modules/editor/components/poll_maker/poll_maker.class.php

Braces +6 added lines, -2 removed lines

@@ -47,11 +47,15 @@
 	{
 		$poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
-		if(!$skin) $skin = 'default';
+		if(!$skin) {
+			$skin = 'default';
+		}
 
 		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
 		$width = $matches[2];
-		if(!$width) $width = 400;
+		if(!$width) {
+			$width = 400;
+		}
 		$style = sprintf('width:%dpx', $width);
 		// poll model object creation to come get it return html
 		$oPollModel = getModel('poll');

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 	{
 		// Wanted Skins survey
 		$oModuleModel = getModel('module');
-		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/');
+		$skin_list = $oModuleModel->getSkins(_XE_PATH_.'modules/poll/');
 		Context::set('skin_list', $skin_list);
 		// Pre-compiled source code to compile template return to
 		$tpl_path = $this->component_path.'tpl';
@@ -47,11 +47,11 @@ 
 	{
 		$poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
-		if(!$skin) $skin = 'default';
+		if (!$skin) $skin = 'default';
 
-		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+		preg_match('/width([^[:digit:]]+)([0-9]+)/i', $xml_obj->attrs->style, $matches);
 		$width = $matches[2];
-		if(!$width) $width = 400;
+		if (!$width) $width = 400;
 		$style = sprintf('width:%dpx', $width);
 		// poll model object creation to come get it return html
 		$oPollModel = getModel('poll');

modules/editor/editor.admin.view.php

Braces +34 added lines, -13 removed lines

@@ -35,12 +35,24 @@ 
 		}
 
 		//editor_config init
-		if(!$editor_config->editor_height) $editor_config->editor_height = 300;
-		if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
-		if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
-		if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
-		if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
-		if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
+		if(!$editor_config->editor_height) {
+			$editor_config->editor_height = 300;
+		}
+		if(!$editor_config->comment_editor_height) {
+			$editor_config->comment_editor_height = 100;
+		}
+		if(!$editor_config->editor_skin) {
+			$editor_config->editor_skin = 'ckeditor';
+		}
+		if(!$editor_config->comment_editor_skin) {
+			$editor_config->comment_editor_skin = 'ckeditor';
+		}
+		if(!$editor_config->sel_editor_colorset) {
+			$editor_config->sel_editor_colorset= 'moono';
+		}
+		if(!$editor_config->sel_comment_editor_colorset) {
+			$editor_config->sel_comment_editor_colorset= 'moono';
+		}
 
 		$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
 		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
@@ -65,14 +77,20 @@ 
 			$xml_info->path = './modules/editor/components/'.$xml_info->component_name;
 			$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);
 			$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
-			if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+			if($xml_info->package_srl) {
+				$targetpackages[$xml_info->package_srl] = 0;
+			}
 		}
 
-		if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		if(is_array($targetpackages)) {
+			$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		}
 
 		foreach($component_list as $component_name => $xml_info)
 		{
-			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			if($packages[$xml_info->package_srl]) {
+				$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			}
 		}
 		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");
 
@@ -162,13 +180,16 @@ 
 			// Get a list of module category
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(!is_array($mid_list)) $mid_list = array($mid_list);
+			if(!is_array($mid_list)) {
+				$mid_list = array($mid_list);
+			}
 			foreach($mid_list as $module_srl => $module)
 			{
-				if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+				if($module) {
+					$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$module_categories[0]->list = $mid_list;
 		}

Spacing +27 added lines, -27 removed lines

@@ -22,59 +22,59 @@ 
 	{
 		$component_count = 0;
 		$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 a type of component
 		$oEditorModel = getModel('editor');
 		$oModuleModel = getModel('module');
 		$editor_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!$editor_config)
+		if (!$editor_config)
 		{
 			$editor_config = new stdClass();
 		}
 
 		//editor_config init
-		if(!$editor_config->editor_height) $editor_config->editor_height = 300;
-		if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
-		if(!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
-		if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
-		if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'moono';
-		if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'moono';
+		if (!$editor_config->editor_height) $editor_config->editor_height = 300;
+		if (!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
+		if (!$editor_config->editor_skin) $editor_config->editor_skin = 'ckeditor';
+		if (!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'ckeditor';
+		if (!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset = 'moono';
+		if (!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset = 'moono';
 
 		$component_list = $oEditorModel->getComponentList(false, $site_srl, true);
 		$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
 
-		$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $editor_config->editor_skin);
 
 		$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;
 		}
 
 		// Get install info, update info, count
 		$oAutoinstallModel = getModel('autoinstall');
-		foreach($component_list as $component_name => $xml_info)
+		foreach ($component_list as $component_name => $xml_info)
 		{
 			$component_count++;
 			$xml_info->path = './modules/editor/components/'.$xml_info->component_name;
 			$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);
 			$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
-			if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+			if ($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
 		}
 
-		if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
+		if (is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));
 
-		foreach($component_list as $component_name => $xml_info)
+		foreach ($component_list as $component_name => $xml_info)
 		{
-			if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			if ($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
 		}
-		$editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"13");
+		$editor_config_default = array("editor_height" => "300", "comment_editor_height" => "100", "content_font_size"=>"13");
 
 		//editor preview
 		$config = $oEditorModel->getEditorConfig();
@@ -138,14 +138,14 @@ 
 	function dispEditorAdminSetupComponent()
 	{
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
+		$site_srl = (int) $site_module_info->site_srl;
 
 		$component_name = Context::get('component_name');
 		// Get information of the editor component
 		$oEditorModel = getModel('editor');
-		$component = $oEditorModel->getComponent($component_name,$site_srl);
+		$component = $oEditorModel->getComponent($component_name, $site_srl);
 
-		if(!$component->component_name) {
+		if (!$component->component_name) {
 			$this->stop('msg_invalid_request');
 			return;
 		}
@@ -158,20 +158,20 @@ 
 		// Get a mid list
 		$oModuleModel = getModel('module');
 
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$columnList = array('module_srl', 'mid', 'module_category_srl', 'browser_title');
 		$mid_list = $oModuleModel->getMidList($args, $columnList);
 		// Combination of module_category and module
-		if(!$args->site_srl)
+		if (!$args->site_srl)
 		{
 			// Get a list of module category
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(!is_array($mid_list)) $mid_list = array($mid_list);
-			foreach($mid_list as $module_srl => $module)
+			if (!is_array($mid_list)) $mid_list = array($mid_list);
+			foreach ($mid_list as $module_srl => $module)
 			{
-				if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+				if ($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
 			}
 		}
 		else
@@ -179,13 +179,13 @@ 
 			$module_categories[0]->list = $mid_list;
 		}
 
-		Context::set('mid_list',$module_categories);
+		Context::set('mid_list', $module_categories);
 
 		//Security
 		$security = new Security();
 		$security->encodeHTML('group_list..title');
 		$security->encodeHTML('component...', 'component_name');
-		$security->encodeHTML('mid_list..title','mid_list..list..browser_title');
+		$security->encodeHTML('mid_list..title', 'mid_list..list..browser_title');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('setup_component');

modules/editor/editor.view.php

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();
@@ -82,7 +81,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 Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 		// Get editors settings
 		$oEditorModel = getModel('editor');
@@ -172,8 +173,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;

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

modules/file/file.admin.view.php

Braces +12 added lines, -9 removed lines

@@ -64,16 +64,13 @@ 
 					if($document_list[$target_srl])
 					{
 						$file->upload_target_type = 'doc';
-					}
-					else if($comment_list[$target_srl])
+					} else if($comment_list[$target_srl])
 					{
 						$file->upload_target_type = 'com';
-					}
-					else if($module_list[$target_srl])
+					} else if($module_list[$target_srl])
 					{
 						$file->upload_target_type = 'mod';
-					}
-					else
+					} else
 					{
 						// document
 						$document = $oDocumentModel->getDocument($target_srl);
@@ -115,15 +112,21 @@ 
 					// Check if data is already obtained
 					for($i = 0; $i < $com_srls_count; ++$i)
 					{
-						if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+						if($comment_list[$com_srls[$i]]) {
+							delete($com_srls[$i]);
+						}
 					}
 					for($i = 0; $i < $doc_srls_count; ++$i)
 					{
-						if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+						if($document_list[$doc_srls[$i]]) {
+							delete($doc_srls[$i]);
+						}
 					}
 					for($i = 0; $i < $mod_srls_count; ++$i)
 					{
-						if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+						if($module_list[$mod_srls[$i]]) {
+							delete($mod_srls[$i]);
+						}
 					}
 				}
 

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
 				, 'source_filename', 'isvalid', 'file_size', 'download_count', 'files.regdate', 'ipaddress', 'member.member_srl', 'member.nick_name', 'uploaded_filename');
 		$output = $oFileAdminModel->getFileList($args, $columnList);
 		// Get the document for looping a list
-		if($output->data)
+		if ($output->data)
 		{
 			$oCommentModel = getModel('comment');
 			$oDocumentModel = getModel('document');
@@ -45,31 +45,31 @@ 
 			$file_list = array();
 			$document_list = array();
 			$comment_list = array();
-			$module_list= array();
+			$module_list = array();
 
 			$doc_srls = array();
 			$com_srls = array();
-			$mod_srls= array();
+			$mod_srls = array();
 
-			foreach($output->data as $file)
+			foreach ($output->data as $file)
 			{
 				$file_srl = $file->file_srl;
 				$target_srl = $file->upload_target_srl;
 				$file_update_args = new stdClass();
 				$file_update_args->file_srl = $file_srl;
 				// Find and update if upload_target_type doesn't exist
-				if(!$file->upload_target_type)
+				if (!$file->upload_target_type)
 				{
 					// Pass if upload_target_type is already found 
-					if($document_list[$target_srl])
+					if ($document_list[$target_srl])
 					{
 						$file->upload_target_type = 'doc';
 					}
-					else if($comment_list[$target_srl])
+					else if ($comment_list[$target_srl])
 					{
 						$file->upload_target_type = 'com';
 					}
-					else if($module_list[$target_srl])
+					else if ($module_list[$target_srl])
 					{
 						$file->upload_target_type = 'mod';
 					}
@@ -77,17 +77,17 @@ 
 					{
 						// document
 						$document = $oDocumentModel->getDocument($target_srl);
-						if($document->isExists())
+						if ($document->isExists())
 						{
 							$file->upload_target_type = 'doc';
 							$file_update_args->upload_target_type = $file->upload_target_type;
 							$document_list[$target_srl] = $document;
 						}
 						// comment
-						if(!$file->upload_target_type)
+						if (!$file->upload_target_type)
 						{
 							$comment = $oCommentModel->getComment($target_srl);
-							if($comment->isExists())
+							if ($comment->isExists())
 							{
 								$file->upload_target_type = 'com';
 								$file->target_document_srl = $comment->document_srl;
@@ -97,39 +97,39 @@ 
 							}
 						}
 						// module (for a page)
-						if(!$file->upload_target_type)
+						if (!$file->upload_target_type)
 						{
 							$module = $oModuleModel->getModulesInfo($target_srl);
-							if($module)
+							if ($module)
 							{
 								$file->upload_target_type = 'mod';
 								$file_update_args->upload_target_type = $file->upload_target_type;
 								$module_list[$module->comment_srl] = $module;
 							}
 						}
-						if($file_update_args->upload_target_type)
+						if ($file_update_args->upload_target_type)
 						{
 							executeQuery('file.updateFileTargetType', $file_update_args);
 						}
 					}
 					// Check if data is already obtained
-					for($i = 0; $i < $com_srls_count; ++$i)
+					for ($i = 0; $i < $com_srls_count; ++$i)
 					{
-						if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+						if ($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
 					}
-					for($i = 0; $i < $doc_srls_count; ++$i)
+					for ($i = 0; $i < $doc_srls_count; ++$i)
 					{
-						if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+						if ($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
 					}
-					for($i = 0; $i < $mod_srls_count; ++$i)
+					for ($i = 0; $i < $mod_srls_count; ++$i)
 					{
-						if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+						if ($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
 					}
 				}
 
-				if($file->upload_target_type)
+				if ($file->upload_target_type)
 				{
-					if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'}))
+					if (!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'}))
 					{
 						${$file->upload_target_type.'_srls'}[] = $target_srl;
 					}
@@ -144,10 +144,10 @@ 
 			$mod_srls = array_unique($mod_srls);
 			// Comment list
 			$com_srls_count = count($com_srls);
-			if($com_srls_count)
+			if ($com_srls_count)
 			{
 				$comment_output = $oCommentModel->getComments($com_srls);
-				foreach($comment_output as $comment)
+				foreach ($comment_output as $comment)
 				{
 					$comment_list[$comment->comment_srl] = $comment;
 					$doc_srls[] = $comment->document_srl;
@@ -155,12 +155,12 @@ 
 			}
 			// Document list
 			$doc_srls_count = count($doc_srls);
-			if($doc_srls_count)
+			if ($doc_srls_count)
 			{
 				$document_output = $oDocumentModel->getDocuments($doc_srls);
-				if(is_array($document_output))
+				if (is_array($document_output))
 				{
-					foreach($document_output as $document)
+					foreach ($document_output as $document)
 					{
 						$document_list[$document->document_srl] = $document;
 					}
@@ -168,22 +168,22 @@ 
 			}
 			// Module List
 			$mod_srls_count = count($mod_srls);
-			if($mod_srls_count)
+			if ($mod_srls_count)
 			{
 				$columnList = array('module_srl', 'mid', 'browser_title');
 				$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-				if($module_output && is_array($module_output))
+				if ($module_output && is_array($module_output))
 				{
-					foreach($module_output as $module)
+					foreach ($module_output as $module)
 					{
 						$module_list[$module->module_srl] = $module;
 					}
 				}
 			}
 
-			foreach($file_list as $srl => $file)
+			foreach ($file_list as $srl => $file)
 			{
-				if($file->upload_target_type == 'com')
+				if ($file->upload_target_type == 'com')
 				{
 					$file_list[$srl]->target_document_srl = $comment_list[$file->upload_target_srl]->document_srl;
 				}
@@ -216,7 +216,7 @@ 
 	{
 		$oFileModel = getModel('file');
 		$config = $oFileModel->getFileConfig();
-		Context::set('config',$config);
+		Context::set('config', $config);
 		$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSize = min($iniPostMaxSize, $iniUploadMaxSize);

modules/file/file.view.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,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 Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 		// Get file configurations of the module
 		$oFileModel = getModel('file');

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,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 Object();
+			if (!$current_module_srl) return new Object();
 		}
 		// Get file configurations of the module
 		$oFileModel = getModel('file');

modules/install/install.view.php

Braces +34 added lines, -13 removed lines

@@ -19,12 +19,16 @@ 
 		// Specify the template path
 		$this->setTemplatePath($this->module_path.'tpl');
 		// Error occurs if already installed
-		if(Context::isInstalled()) return $this->stop('msg_already_installed');
+		if(Context::isInstalled()) {
+			return $this->stop('msg_already_installed');
+		}
 		// Install a controller
 		$oInstallController = getController('install');
 		$this->install_enable = $oInstallController->checkInstallEnv();
 		// If the environment is installable, execute installController::makeDefaultDirectory()
-		if($this->install_enable) $oInstallController->makeDefaultDirectory();
+		if($this->install_enable) {
+			$oInstallController->makeDefaultDirectory();
+		}
 	}
 
 	/**
@@ -68,7 +72,9 @@ 
 				Context::set('install_config', true, true);
 				$oInstallController = getController('install');
 				$output = $oInstallController->procInstall();
-				if (!$output->toBool()) return $output;
+				if (!$output->toBool()) {
+					return $output;
+				}
 				header("location: ./");
 				Context::close();
 				exit;
@@ -101,7 +107,9 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) {
+			Context::set('use_nginx', 'Y');
+		}
 		
 		$this->setTemplateFile('check_env');
 	}
@@ -112,14 +120,15 @@ 
 	function dispInstallSelectDB()
 	{
 		// Display check_env if it is not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 		// Enter ftp information
 		if(ini_get('safe_mode') && !Context::isFTPRegisted())
 		{
 			Context::set('progressMenu', '3');
 			$this->setTemplateFile('ftp');
-		}
-		else
+		} else
 		{
 			$defaultDatabase = 'mysqli';
 			$disableList = DB::getDisableList();
@@ -147,9 +156,13 @@ 
 	function dispInstallDBForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 		// Return to the start-up screen if db_type is not specified
-		if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+		if(!Context::get('db_type')) {
+			return $this->dispInstallSelectDB();
+		}
 
 		// Output the file, disp_db_info_form.html
 		$tpl_filename = sprintf('form.%s', Context::get('db_type'));
@@ -163,9 +176,15 @@ 
 			// Error occured when using https protocol at "ModuleHandler::init() '
 			$parsedUrl = parse_url($error_return_url);
 			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+			if(isset($parsedUrl['path'])) {
+				$error_return_url .= $parsedUrl['path'];
+			}
+			if(isset($parsedUrl['query'])) {
+				$error_return_url .= '?' . $parsedUrl['query'];
+			}
+			if(isset($parsedUrl['fragment'])) {
+				$error_return_url .= '?' . $parsedUrl['fragment'];
+			}
 		}
 		Context::set('error_return_url', $error_return_url);
 
@@ -178,7 +197,9 @@ 
 	function dispInstallConfigForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 
 		include _XE_PATH_.'files/config/tmpDB.config.php';
 

Spacing +21 added lines, -21 removed lines

@@ -19,12 +19,12 @@ 
 		// Specify the template path
 		$this->setTemplatePath($this->module_path.'tpl');
 		// Error occurs if already installed
-		if(Context::isInstalled()) return $this->stop('msg_already_installed');
+		if (Context::isInstalled()) return $this->stop('msg_already_installed');
 		// Install a controller
 		$oInstallController = getController('install');
 		$this->install_enable = $oInstallController->checkInstallEnv();
 		// If the environment is installable, execute installController::makeDefaultDirectory()
-		if($this->install_enable) $oInstallController->makeDefaultDirectory();
+		if ($this->install_enable) $oInstallController->makeDefaultDirectory();
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 	function dispInstallIntroduce()
 	{
 		$install_config_file = FileHandler::getRealPath('./config/install.config.php');
-		if(file_exists($install_config_file))
+		if (file_exists($install_config_file))
 		{
 			/**
 			 * If './config/install.config.php' file created  and write array shown in the example below, XE installed using config file.
@@ -57,12 +57,12 @@ 
 			  );
 			 */
 			include $install_config_file;
-			if(is_array($install_config))
+			if (is_array($install_config))
 			{
-				foreach($install_config as $k => $v) 
+				foreach ($install_config as $k => $v) 
 				{
 					$v = ($k == 'db_table_prefix') ? $v.'_' : $v;
-					Context::set($k,$v,true);
+					Context::set($k, $v, true);
 				}
 				unset($GLOBALS['__DB__']);
 				Context::set('install_config', true, true);
@@ -101,7 +101,7 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if ($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
 		
 		$this->setTemplateFile('check_env');
 	}
@@ -112,9 +112,9 @@ 
 	function dispInstallSelectDB()
 	{
 		// Display check_env if it is not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 		// Enter ftp information
-		if(ini_get('safe_mode') && !Context::isFTPRegisted())
+		if (ini_get('safe_mode') && !Context::isFTPRegisted())
 		{
 			Context::set('progressMenu', '3');
 			$this->setTemplateFile('ftp');
@@ -123,11 +123,11 @@ 
 		{
 			$defaultDatabase = 'mysqli';
 			$disableList = DB::getDisableList();
-			if(is_array($disableList))
+			if (is_array($disableList))
 			{
-				foreach($disableList AS $key=>$value)
+				foreach ($disableList AS $key=>$value)
 				{
-					if($value->db_type == $defaultDatabase)
+					if ($value->db_type == $defaultDatabase)
 					{
 						$defaultDatabase = 'mysql';
 						break;
@@ -147,9 +147,9 @@ 
 	function dispInstallDBForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 		// Return to the start-up screen if db_type is not specified
-		if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+		if (!Context::get('db_type')) return $this->dispInstallSelectDB();
 
 		// Output the file, disp_db_info_form.html
 		$tpl_filename = sprintf('form.%s', Context::get('db_type'));
@@ -158,14 +158,14 @@ 
 		Context::set('title', $title);
 
 		$error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'));
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			// Error occured when using https protocol at "ModuleHandler::init() '
 			$parsedUrl = parse_url($error_return_url);
 			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+			if (isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
+			if (isset($parsedUrl['query'])) $error_return_url .= '?'.$parsedUrl['query'];
+			if (isset($parsedUrl['fragment'])) $error_return_url .= '?'.$parsedUrl['fragment'];
 		}
 		Context::set('error_return_url', $error_return_url);
 
@@ -178,7 +178,7 @@ 
 	function dispInstallConfigForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 
 		include _XE_PATH_.'files/config/tmpDB.config.php';
 
@@ -190,7 +190,7 @@ 
 
 	function useRewriteModule()
 	{
-		if(function_exists('apache_get_modules') && in_array('mod_rewrite',apache_get_modules()))
+		if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules()))
 		{
 			return true;
 		}
@@ -209,7 +209,7 @@ 
 	function dispInstallManagerForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable)
+		if (!$this->install_enable)
 		{
 			return $this->dispInstallCheckEnv();
 		}

modules/install/script/ko.install.php

Braces +31 added lines, -12 removed lines

@@ -140,8 +140,7 @@ 
 		{
 			Context::set('is_shortcut', $item['is_shortcut'], TRUE);
 			Context::set('shortcut_target', $item['shortcut_target'], TRUE);
-		}
-		else
+		} else
 		{
 			Context::set('is_shortcut', 'N', TRUE);
 			Context::set('shortcut_target', null, TRUE);
@@ -155,7 +154,9 @@ 
 		$menu_srl = $oMenuAdminController->get('menu_item_srl');
 		$item['menu_srl'] = $menu_srl;
 
-		if($item['list']) __makeMenu($item['list'], $menu_srl);
+		if($item['list']) {
+			__makeMenu($item['list'], $menu_srl);
+		}
 	}
 }
 
@@ -191,12 +192,16 @@ 
 
 $oLayoutAdminController = getAdminController('layout');
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // update Layout (PC)
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 //create mobile layout
 $mlayout_srl = $args->layout_srl = getNextSequence();
@@ -206,12 +211,16 @@ 
 $extra_vars->main_menu = $sitemap['GNB']['menu_srl'];
 
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // update mobile Layout
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 
 $siteDesignPath = _XE_PATH_.'files/site_design/';
@@ -274,14 +283,18 @@ 
 $obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang);
 
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 $document_srl = $output->get('document_srl');
 
 unset($obj->document_srl);
 $obj->title = 'Welcome mobile XE';
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // save PageWidget
 $oModuleController = getController('module'); /* @var $oModuleController moduleController */
@@ -290,7 +303,9 @@ 
 $module_info->content = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$document_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $module_info->mcontent = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$mdocument_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // insertFirstModule
 $site_args = new stdClass();
@@ -311,7 +326,9 @@ 
 	$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
 
 	$output = $oDocumentController->insertDocument($obj, true);
-	if(!$output->toBool()) return $output;
+	if(!$output->toBool()) {
+		return $output;
+	}
 
 	$xeicon_document_srl[$i] = $output->get('document_srl');
 }
@@ -321,7 +338,9 @@ 
 $module_info = $oModuleModel->getModuleInfoByModuleSrl($xeicon_module_srl);
 $module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[1].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[2].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[3].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[4].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 
 // create menu cache

Spacing +21 added lines, -21 removed lines

@@ -130,13 +130,13 @@ 
 function __makeMenu(&$list, $parent_srl)
 {
 	$oMenuAdminController = getAdminController('menu');
-	foreach($list as $idx => &$item)
+	foreach ($list as $idx => &$item)
 	{
 		Context::set('parent_srl', $parent_srl, TRUE);
 		Context::set('menu_name', $item['menu_name'], TRUE);
 		Context::set('module_type', $item['module_type'], TRUE);
 		Context::set('module_id', $item['module_id'], TRUE);
-		if($item['is_shortcut'] === 'Y')
+		if ($item['is_shortcut'] === 'Y')
 		{
 			Context::set('is_shortcut', $item['is_shortcut'], TRUE);
 			Context::set('shortcut_target', $item['shortcut_target'], TRUE);
@@ -148,23 +148,23 @@ 
 		}
 
 		$output = $oMenuAdminController->procMenuAdminInsertItem();
-		if($output instanceof Object && !$output->toBool())
+		if ($output instanceof Object && !$output->toBool())
 		{
 			return $output;
 		}
 		$menu_srl = $oMenuAdminController->get('menu_item_srl');
 		$item['menu_srl'] = $menu_srl;
 
-		if($item['list']) __makeMenu($item['list'], $menu_srl);
+		if ($item['list']) __makeMenu($item['list'], $menu_srl);
 	}
 }
 
 
 // 사이트맵 생성
-foreach($sitemap as $id => &$val)
+foreach ($sitemap as $id => &$val)
 {
 	$output = $oMenuAdminController->addMenu($val['title']);
-	if(!$output->toBool())
+	if (!$output->toBool())
 	{
 		return $output;
 	}
@@ -191,12 +191,12 @@ 
 
 $oLayoutAdminController = getAdminController('layout');
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // update Layout (PC)
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 //create mobile layout
 $mlayout_srl = $args->layout_srl = getNextSequence();
@@ -206,12 +206,12 @@ 
 $extra_vars->main_menu = $sitemap['GNB']['menu_srl'];
 
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // update mobile Layout
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 
 $siteDesignPath = _XE_PATH_.'files/site_design/';
@@ -224,7 +224,7 @@ 
 
 $moduleList = array('page', 'board', 'editor');
 $moutput = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-if($moutput->toBool())
+if ($moutput->toBool())
 {
 	$moduleList = array_unique($moduleList);
 }
@@ -234,10 +234,10 @@ 
 $designInfo->module = new stdClass();
 
 $oModuleModel = getModel('module'); /* @var $oModuleModel moduleModel */
-foreach($skinTypes as $key => $dir)
+foreach ($skinTypes as $key => $dir)
 {
 	$skinType = $key == 'skin' ? 'P' : 'M';
-	foreach($moduleList as $moduleName)
+	foreach ($moduleList as $moduleName)
 	{
 		$designInfo->module->{$moduleName} = new stdClass();
 		$designInfo->module->{$moduleName}->{$key} = $oModuleModel->getModuleDefaultSkin($moduleName, $skinType, 0, false);
@@ -271,17 +271,17 @@ 
 Context::set('version', __XE_VERSION__);
 $obj->title = 'Welcome XE';
 
-$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang);
+$obj->content = $oTemplateHandler->compile(_XE_PATH_.'modules/install/script/welcome_content', 'welcome_content_'.$lang);
 
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 $document_srl = $output->get('document_srl');
 
 unset($obj->document_srl);
 $obj->title = 'Welcome mobile XE';
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // save PageWidget
 $oModuleController = getController('module'); /* @var $oModuleController moduleController */
@@ -290,7 +290,7 @@ 
 $module_info->content = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$document_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $module_info->mcontent = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$mdocument_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // insertFirstModule
 $site_args = new stdClass();
@@ -304,14 +304,14 @@ 
 $xeicon_module_srl = $moduleInfo->module_srl;
 
 $xeicon_document_srl = array();
-for($i = 1; $i <=4; $i++)
+for ($i = 1; $i <= 4; $i++)
 {
 	unset($obj->document_srl);
 	$obj->title = "XEIcon ({$i})";
-	$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
+	$obj->content = $oTemplateHandler->compile(_XE_PATH_.'modules/install/script/xeicon_content', 'xeicon_content_ko_'.$i);
 
 	$output = $oDocumentController->insertDocument($obj, true);
-	if(!$output->toBool()) return $output;
+	if (!$output->toBool()) return $output;
 
 	$xeicon_document_srl[$i] = $output->get('document_srl');
 }
@@ -321,7 +321,7 @@ 
 $module_info = $oModuleModel->getModuleInfoByModuleSrl($xeicon_module_srl);
 $module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[1].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[2].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[3].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[4].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 
 // create menu cache

modules/integration_search/integration_search.admin.controller.php

Braces +9 added lines, -3 removed lines

@@ -31,7 +31,9 @@ 
 		$args->skin = Context::get('skin');
 		$args->target = Context::get('target');
 		$args->target_module_srl = Context::get('target_module_srl');
-		if(!$args->target_module_srl) $args->target_module_srl = '';
+		if(!$args->target_module_srl) {
+			$args->target_module_srl = '';
+		}
 		$args->skin_vars = $config->skin_vars;
 
 		$oModuleController = getController('module');
@@ -67,7 +69,9 @@ 
 		{
 			foreach($skin_info->extra_vars as $vars)
 			{
-				if($vars->type!='image') continue;
+				if($vars->type!='image') {
+					continue;
+				}
 
 				$image_obj = $obj->{$vars->name};
 				// Get a variable on a request to delete
@@ -99,7 +103,9 @@ 
 				// Upload the file to a path
 				$path = sprintf("./files/attach/images/%s/", $module_srl);
 				// Create a directory
-				if(!FileHandler::makeDir($path)) return false;
+				if(!FileHandler::makeDir($path)) {
+					return false;
+				}
 
 				$filename = $path.$image_obj['name'];
 				// Move the file

Spacing +12 added lines, -12 removed lines

@@ -31,11 +31,11 @@ 
 		$args->skin = Context::get('skin');
 		$args->target = Context::get('target');
 		$args->target_module_srl = Context::get('target_module_srl');
-		if(!$args->target_module_srl) $args->target_module_srl = '';
+		if (!$args->target_module_srl) $args->target_module_srl = '';
 		$args->skin_vars = $config->skin_vars;
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('integration_search',$args);
+		$output = $oModuleController->insertModuleConfig('integration_search', $args);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent');
 		return $this->setRedirectUrl($returnUrl, $output);
@@ -63,35 +63,35 @@ 
 		unset($obj->module_srl);
 		unset($obj->page);
 		// Separately handle if the extra_vars is an image type in the original skin_info
-		if($skin_info->extra_vars)
+		if ($skin_info->extra_vars)
 		{
-			foreach($skin_info->extra_vars as $vars)
+			foreach ($skin_info->extra_vars as $vars)
 			{
-				if($vars->type!='image') continue;
+				if ($vars->type != 'image') continue;
 
 				$image_obj = $obj->{$vars->name};
 				// Get a variable on a request to delete
 				$del_var = $obj->{"del_".$vars->name};
 				unset($obj->{"del_".$vars->name});
-				if($del_var == 'Y')
+				if ($del_var == 'Y')
 				{
 					FileHandler::removeFile($module_info->{$vars->name});
 					continue;
 				}
 				// Use the previous data if not uploaded
-				if(!$image_obj['tmp_name'])
+				if (!$image_obj['tmp_name'])
 				{
 					$obj->{$vars->name} = $module_info->{$vars->name};
 					continue;
 				}
 				// Ignore if the file is not successfully uploaded, and check uploaded file
-				if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
+				if (!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
 				{
 					unset($obj->{$vars->name});
 					continue;
 				}
 				// Ignore if the file is not an image
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
+				if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
 				{
 					unset($obj->{$vars->name});
 					continue;
@@ -99,11 +99,11 @@ 
 				// Upload the file to a path
 				$path = sprintf("./files/attach/images/%s/", $module_srl);
 				// Create a directory
-				if(!FileHandler::makeDir($path)) return false;
+				if (!FileHandler::makeDir($path)) return false;
 
 				$filename = $path.$image_obj['name'];
 				// Move the file
-				if(!move_uploaded_file($image_obj['tmp_name'], $filename))
+				if (!move_uploaded_file($image_obj['tmp_name'], $filename))
 				{
 					unset($obj->{$vars->name});
 					continue;
@@ -117,7 +117,7 @@ 
 		$args->skin_vars = serialize($obj);
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('integration_search',$args);
+		$output = $oModuleController->insertModuleConfig('integration_search', $args);
 
 		$this->setMessage('success_updated', 'info');
 

modules/integration_search/integration_search.admin.view.php

Braces +3 added lines, -1 removed lines

@@ -86,7 +86,9 @@
 				$name = $val->name;
 				$type = $val->type;
 				$value = $skin_vars->{$name};
-				if($type=="checkbox"&&!$value) $value = array();
+				if($type=="checkbox"&&!$value) {
+					$value = array();
+				}
 				$skin_info->extra_vars[$key]->value= $value;
 			}
 		}

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
 		$this->config = $oModuleModel->getModuleConfig('integration_search');
-		Context::set('config',$this->config);
+		Context::set('config', $this->config);
 
 		$this->setTemplatePath($this->module_path."/tpl/");
 	}
@@ -39,7 +39,7 @@ 
 		// Get a list of skins(themes)
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 		// Get a list of module categories
 		$module_categories = $oModuleModel->getModuleCategories();
 		// Generated mid Wanted list
@@ -63,7 +63,7 @@ 
 		$security->encodeHTML('skin_list..title');
 
 		// Sample Code
-		Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><input class="btn" type="submit" value="{$lang->cmd_search}" /></form>', ENT_COMPAT | ENT_HTML401, 'UTF-8', false) );
+		Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><input class="btn" type="submit" value="{$lang->cmd_search}" /></form>', ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 
 		$this->setTemplateFile("index");
 	}
@@ -79,15 +79,15 @@ 
 		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin);
 		$skin_vars = unserialize($this->config->skin_vars);
 		// value for skin_info extra_vars
-		if(count($skin_info->extra_vars))
+		if (count($skin_info->extra_vars))
 		{
-			foreach($skin_info->extra_vars as $key => $val)
+			foreach ($skin_info->extra_vars as $key => $val)
 			{
 				$name = $val->name;
 				$type = $val->type;
 				$value = $skin_vars->{$name};
-				if($type=="checkbox"&&!$value) $value = array();
-				$skin_info->extra_vars[$key]->value= $value;
+				if ($type == "checkbox" && !$value) $value = array();
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 		Context::set('skin_info', $skin_info);