xpressengine / xe-core

modules/file/file.view.php

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

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

modules/file/file.controller.php

Spacing +168 added lines, -168 removed lines

@@ -29,30 +29,30 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if (!is_uploaded_file($file_info['tmp_name'])) exit();
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if (!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if (!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
-		$this->add('file_srl',$output->get('file_srl'));
-		$this->add('file_size',$output->get('file_size'));
-		$this->add('direct_download',$output->get('direct_download'));
-		$this->add('source_filename',$output->get('source_filename'));
-		$this->add('download_url',$output->get('uploaded_filename'));
-		$this->add('upload_target_srl',$output->get('upload_target_srl'));
-		if($output->error != '0') $this->stop($output->message);
+		$this->add('file_srl', $output->get('file_srl'));
+		$this->add('file_size', $output->get('file_size'));
+		$this->add('direct_download', $output->get('direct_download'));
+		$this->add('source_filename', $output->get('source_filename'));
+		$this->add('download_url', $output->get('uploaded_filename'));
+		$this->add('upload_target_srl', $output->get('upload_target_srl'));
+		if ($output->error != '0') $this->stop($output->message);
 	}
 
 	/**
@@ -67,24 +67,24 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if (!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if (!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
 
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
-		if($file_srl)
+		if ($file_srl)
 		{
 			$oFileModel = getModel('file');
 			$logged_info = Context::get('logged_info');
 			$file_info = $oFileModel->getFile($file_srl);
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
-			if($file_info->file_srl == $file_srl && $file_grant->is_deletable)
+			if ($file_info->file_srl == $file_srl && $file_grant->is_deletable)
 			{
 				$this->deleteFile($file_srl);
 			}
@@ -92,12 +92,12 @@ 
 
 		$file_info = Context::get('Filedata');
 		// An error appears if not a normally uploaded file
-		if(is_uploaded_file($file_info['tmp_name'])) {
+		if (is_uploaded_file($file_info['tmp_name'])) {
 			$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
-			Context::set('uploaded_fileinfo',$output);
+			Context::set('uploaded_fileinfo', $output);
 		}
 
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('iframe');
@@ -114,24 +114,24 @@ 
 		$width = Context::get('width');
 		$height = Context::get('height');
 
-		if(!$file_srl || !$width)
+		if (!$file_srl || !$width)
 		{
-			return new BaseObject(-1,'msg_invalid_request');
+			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$oFileModel = getModel('file');
 		$fileInfo = $oFileModel->getFile($file_srl);
-		if(!$fileInfo || $fileInfo->direct_download != 'Y')
+		if (!$fileInfo || $fileInfo->direct_download != 'Y')
 		{
-			return new BaseObject(-1,'msg_invalid_request');
+			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$source_src = $fileInfo->uploaded_filename;
-		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
+		$output_src = $source_src.'.resized'.strrchr($source_src, '.');
 
-		if(!$height) $height = $width-1;
+		if (!$height) $height = $width - 1;
 
-		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
+		if (FileHandler::createImageFile($source_src, $output_src, $width, $height, '', 'ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
@@ -139,10 +139,10 @@ 
 		}
 		else
 		{
-			return new BaseObject(-1,'msg_invalid_request');
+			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		$this->add('resized_info',$output);
+		$this->add('resized_info', $output);
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new BaseObject(-1, 'msg_not_permitted');
+		if (isset($this->grant->access) && $this->grant->access !== true) return new BaseObject(-1, 'msg_not_permitted');
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -189,26 +189,26 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if ($file_obj->file_srl != $file_srl || $file_obj->sid != $sid) return $this->stop('msg_file_not_found');
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if ($logged_info->is_admin != 'Y' && $file_obj->isvalid != 'Y') return $this->stop('msg_not_permitted_download');
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
 		// Not allow the file outlink
-		if($file_module_config->allow_outlink == 'N')
+		if ($file_module_config->allow_outlink == 'N')
 		{
 			// Handles extension to allow outlink
-			if($file_module_config->allow_outlink_format)
+			if ($file_module_config->allow_outlink_format)
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if (!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
 
-				foreach($allow_outlink_format_array as $val)
+				foreach ($allow_outlink_format_array as $val)
 				{
 					$val = trim($val);
-					if(preg_match("/\.{$val}$/i", $filename))
+					if (preg_match("/\.{$val}$/i", $filename))
 					{
 						$file_module_config->allow_outlink = 'Y';
 						break;
@@ -216,21 +216,21 @@ 
 				}
 			}
 			// Sites that outlink is allowed
-			if($file_module_config->allow_outlink != 'Y')
+			if ($file_module_config->allow_outlink != 'Y')
 			{
 				$referer = parse_url($_SERVER["HTTP_REFERER"]);
-				if($referer['host'] != $_SERVER['HTTP_HOST'])
+				if ($referer['host'] != $_SERVER['HTTP_HOST'])
 				{
-					if($file_module_config->allow_outlink_site)
+					if ($file_module_config->allow_outlink_site)
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if (!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
 
-						foreach($allow_outlink_site_array as $val)
+						foreach ($allow_outlink_site_array as $val)
 						{
 							$site = parse_url(trim($val));
-							if($site['host'] == $referer['host'])
+							if ($site['host'] == $referer['host'])
 							{
 								$file_module_config->allow_outlink = 'Y';
 								break;
@@ -240,49 +240,49 @@ 
 				}
 				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if ($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
-		if(is_array($file_module_config->download_grant))
+		if (is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach ($file_module_config->download_grant AS $value)
+				if ($value) $downloadGrantCount++;
 		}
 
-		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
+		if (is_array($file_module_config->download_grant) && $downloadGrantCount > 0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if (!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				$oModuleModel =& getModel('module');
+				$oModuleModel = & getModel('module');
 				$columnList = array('module_srl', 'site_srl');
 				$module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl, $columnList);
 
-				if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+				if (!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
 				{
-					$oMemberModel =& getModel('member');
+					$oMemberModel = & getModel('member');
 					$member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
 
 					$is_permitted = false;
-					for($i=0;$i<count($file_module_config->download_grant);$i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($member_groups[$group_srl])
+						if ($member_groups[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if (!$is_permitted) return $this->stop('msg_not_permitted_download');
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if (!$output->toBool()) return $this->stop(($output->message) ? $output->message : 'msg_not_permitted_download');
 
 
 		// 다운로드 후 (가상)
@@ -295,7 +295,7 @@ 
 
 		$random = new Password();
 		$file_key = $_SESSION['__XE_FILE_KEY__'][$file_srl] = $random->createSecureSalt(32, 'hex');
-		header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput','file_srl',$file_srl,'file_key',$file_key));
+		header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput', 'file_srl', $file_srl, 'file_key', $file_key));
 		Context::close();
 		exit();
 
@@ -306,18 +306,18 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if (strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
+		if ($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
 		else $session_key = '__XE_FILE_KEY__';
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if (!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
 
-		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
+		if (!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
 			unset($_SESSION[$session_key][$file_srl]);
 			return $this->stop('msg_invalid_request');
@@ -326,34 +326,34 @@ 
 		$file_size = $file_obj->file_size;
 		$filename = $file_obj->source_filename;
 		
-		if(preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
+		if (preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
 		{
-			if($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
+			if ($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
 			{
-				$filename_param = 'filename="' . $filename . '"';
+				$filename_param = 'filename="'.$filename.'"';
 			}
 			else
 			{
-				$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
+				$filename_param = "filename*=UTF-8''".rawurlencode($filename).'; filename="'.rawurlencode($filename).'"';
 			}
 		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		elseif (preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
-			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
+			$filename_param = "filename*=UTF-8''".rawurlencode($filename).'; filename="'.rawurlencode($filename).'"';
 		}
-		elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 		{
 			$filename = rawurlencode($filename);
-			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
+			$filename_param = 'filename="'.preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1).'"';
 		}
 		else
 		{
-			$filename_param = 'filename="' . $filename . '"';
+			$filename_param = 'filename="'.$filename.'"';
 		}
 
-		if($is_android)
+		if ($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if ($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -361,21 +361,21 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if (!$fp) return $this->stop('msg_file_not_found');
 
 		header("Cache-Control: ");
 		header("Pragma: ");
 		header("Content-Type: application/octet-stream");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 
-		header("Content-Length: " .(string)($file_size));
-		header('Content-Disposition: attachment; ' . $filename_param);
+		header("Content-Length: ".(string) ($file_size));
+		header('Content-Disposition: attachment; '.$filename_param);
 		header("Content-Transfer-Encoding: binary\n");
 
 		// if file size is lager than 10MB, use fread function (#18675748)
-		if($file_size > 1024 * 1024)
+		if ($file_size > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while (!feof($fp)) echo fread($fp, 1024);
 			fclose($fp);
 		}
 		else
@@ -397,36 +397,36 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if ($file_srls) $file_srl = $file_srls;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
 		$logged_info = Context::get('logged_info');
 		$oFileModel = getModel('file');
 
-		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		$srls = explode(',', $file_srl);
+		if (!count($srls)) return;
 
-		for($i=0;$i<count($srls);$i++)
+		for ($i = 0; $i < count($srls); $i++)
 		{
-			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			$srl = (int) $srls[$i];
+			if (!$srl) continue;
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if (!$output->toBool()) continue;
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if (!$file_info) continue;
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if (!$file_grant->is_deletable) continue;
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if ($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
 		}
 	}
 
@@ -437,32 +437,32 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oModuleModel = getModel('module');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !== 'Y' && !$oModuleModel->isSiteAdmin($logged_info))
+		if ($logged_info->is_admin !== 'Y' && !$oModuleModel->isSiteAdmin($logged_info))
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if ($fileSrls) $fileSrlList = explode(',', $fileSrls);
 
 		global $lang;
-		if(count($fileSrlList) > 0)
+		if (count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if (!is_array($fileList)) $fileList = array($fileList);
 
-			if(is_array($fileList))
+			if (is_array($fileList))
 			{
-				foreach($fileList AS $key=>$value)
+				foreach ($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
+					if ($value->isvalid == 'Y') $value->validName = $lang->is_valid;
 					else $value->validName = $lang->is_stand_by;
 				}
 			}
@@ -484,7 +484,7 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if (!$document_srl) return new BaseObject();
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -501,10 +501,10 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if (!$document_srl) return new BaseObject();
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new BaseObject();
 	}
@@ -518,7 +518,7 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if (!$document_srl) return new BaseObject();
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -533,7 +533,7 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if (!$comment_srl) return new BaseObject();
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -551,10 +551,10 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new BaseObject();
+		if (!$comment_srl || !$uploaded_count) return new BaseObject();
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new BaseObject();
 	}
@@ -568,9 +568,9 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if (!$comment_srl) return new BaseObject();
 
-		if($obj->isMoveToTrash) return new BaseObject();
+		if ($obj->isMoveToTrash) return new BaseObject();
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -585,7 +585,7 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -598,9 +598,9 @@ 
 	 * @param int $upload_target_srl
 	 * @return void
 	 */
-	function setUploadInfo($editor_sequence, $upload_target_srl=0)
+	function setUploadInfo($editor_sequence, $upload_target_srl = 0)
 	{
-		if(!isset($_SESSION['upload_info'][$editor_sequence]))
+		if (!isset($_SESSION['upload_info'][$editor_sequence]))
 		{
 			$_SESSION['upload_info'][$editor_sequence] = new stdClass();
 		}
@@ -660,36 +660,36 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// A workaround for Firefox upload bug
-		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
+		if (preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
 		{
 			$file_info['name'] = base64_decode(strtr($match[1], ':', '/'));
 		}
 
-		if(!$manual_insert)
+		if (!$manual_insert)
 		{
 			// Get the file configurations
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
 				$oFileModel = getModel('file');
 				$config = $oFileModel->getFileConfig($module_srl);
 
 				// check file type
-				if(isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
+				if (isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
 				{
 					$filetypes = explode(';', $config->allowed_filetypes);
 					$ext = array();
-					foreach($filetypes as $item) {
+					foreach ($filetypes as $item) {
 						$item = explode('.', $item);
 						$ext[] = strtolower($item[1]);
 					}
 					$uploaded_ext = explode('.', $file_info['name']);
 					$uploaded_ext = strtolower(array_pop($uploaded_ext));
 
-					if(!in_array($uploaded_ext, $ext))
+					if (!in_array($uploaded_ext, $ext))
 					{
 						return $this->stop('msg_not_allowed_filetype');
 					}
@@ -698,63 +698,63 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new BaseObject(-1, 'msg_exceeds_limit_size');
+				if ($allowed_filesize < filesize($file_info['tmp_name'])) return new BaseObject(-1, 'msg_exceeds_limit_size');
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
-				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new BaseObject(-1, 'msg_exceeds_limit_size');
+				$attached_size = (int) $output->data->attached_size + filesize($file_info['tmp_name']);
+				if ($attached_size > $allowed_attach_size) return new BaseObject(-1, 'msg_exceeds_limit_size');
 			}
 		}
 
 		// https://github.com/xpressengine/xe-core/issues/1713
-		$file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']);
+		$file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_info['name']);
 		$file_info['name'] = removeHackTag($file_info['name']);
-		$file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
+		$file_info['name'] = str_replace(array('<', '>'), array('%3C', '%3E'), $file_info['name']);
 
 		// Get random number generator
 		$random = new Password();
 
 		// Set upload path by checking if the attachement is an image or other kinds of file
-		if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name']))
+		if (preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name']))
 		{
-			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 
 			// special character to '_'
 			// change to random file name. because window php bug. window php is not recognize unicode character file name - by cherryfilter
-			$ext = substr(strrchr($file_info['name'],'.'),1);
+			$ext = substr(strrchr($file_info['name'], '.'), 1);
 			//$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
 			$_filename = $random->createSecureSalt(32, 'hex').'.'.$ext;
 			$filename  = $path.$_filename;
 			$idx = 1;
-			while(file_exists($filename))
+			while (file_exists($filename))
 			{
-				$filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1',$_filename);
+				$filename = $path.preg_replace('/\.([a-z0-9]+)$/i', '_'.$idx.'.$1', $_filename);
 				$idx++;
 			}
 			$direct_download = 'Y';
 		}
 		else
 		{
-			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 			$filename = $path.$random->createSecureSalt(32, 'hex');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new BaseObject(-1,'msg_not_permitted_create');
+		if (!FileHandler::makeDir($path)) return new BaseObject(-1, 'msg_not_permitted_create');
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new BaseObject(-1,'msg_file_upload_error');
+		if (!checkUploadedFile($file_info['tmp_name']))  return new BaseObject(-1, 'msg_file_upload_error');
 
 		// Get random number generator
 		$random = new Password();
 		
 		// Move the file
-		if($manual_insert)
+		if ($manual_insert)
 		{
 			@copy($file_info['tmp_name'], $filename);
-			if(!file_exists($filename))
+			if (!file_exists($filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
@@ -762,10 +762,10 @@ 
 		}
 		else
 		{
-			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
+			if (!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new BaseObject(-1,'msg_file_upload_error');
+				if (!@move_uploaded_file($file_info['tmp_name'], $filename))  return new BaseObject(-1, 'msg_file_upload_error');
 			}
 		}
 		// Get member information
@@ -786,10 +786,10 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -832,18 +832,18 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if (!$file_srl) return;
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if (!count($srls)) return;
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
 
-		foreach($srls as $srl)
+		foreach ($srls as $srl)
 		{
-			$srl = (int)$srl;
-			if(!$srl) 
+			$srl = (int) $srl;
+			if (!$srl) 
 			{
 				continue;
 			}
@@ -852,14 +852,14 @@ 
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
 
-			if(!$output->toBool() || !$output->data) 
+			if (!$output->toBool() || !$output->data) 
 			{
 				continue;
 			}
 
 			$file_info = $output->data;
 
-			if($file_info->upload_target_srl)
+			if ($file_info->upload_target_srl)
 			{
 				$documentSrlList[] = $file_info->upload_target_srl;
 			}
@@ -870,15 +870,15 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if (!$trigger_output->toBool()) return $trigger_output;
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -902,28 +902,28 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new BaseObject();
+		if (!is_array($file_list) || !count($file_list)) return new BaseObject();
 
 		// Delete the file
 		$path = array();
 		$file_count = count($file_list);
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$this->deleteFile($file_list[$i]->file_srl);
 
 			$uploaded_filename = $file_list[$i]->uploaded_filename;
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if (!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
 		}
 
 		// Remove from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		
 		// Remove a file directory of the document
-		for($i=0, $c=count($path); $i<$c; $i++)
+		for ($i = 0, $c = count($path); $i < $c; $i++)
 		{
 			FileHandler::removeBlankDir($path[$i]);
 		}
@@ -941,23 +941,23 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if ($source_srl == $target_srl) return;
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if (!$file_list) return;
 
 		$file_count = count($file_list);
  
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			unset($file_info);
 			$file_info = $file_list[$i];
 			$old_file = $file_info->uploaded_filename;
 			// Determine the file path by checking if the file is an image or other kinds
-			if(preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_info->source_filename))
+			if (preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_info->source_filename))
 			{
-				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
+				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl, $target_srl);
 				$new_file = $path.$file_info->source_filename;
 			}
 			else
@@ -967,7 +967,7 @@ 
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if ($old_file == $new_file) continue;
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -987,18 +987,18 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$vars->editor_sequence) return new BaseObject(-1, 'msg_invalid_request');
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new BaseObject(-1, 'msg_not_founded');
+		if (!$file_info) return new BaseObject(-1, 'msg_not_founded');
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new BaseObject(-1, 'msg_not_permitted');
 
-		$args =  new stdClass();
+		$args = new stdClass();
 		$args->file_srl = $vars->file_srl;
 		$args->upload_target_srl = $upload_target_srl;
 
@@ -1007,18 +1007,18 @@ 
 		
 		$args->cover_image = 'N';
 		$output = executeQuery('file.updateClearCoverImage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 				$oDB->rollback();
 				return $output;
 		}
 
-		if($file_info->cover_image != 'Y')
+		if ($file_info->cover_image != 'Y')
 		{
 
 			$args->cover_image = 'Y';
 			$output = executeQuery('file.updateCoverImage', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1028,7 +1028,7 @@ 
 
 		$oDB->commit();
 
-		$this->add('is_cover',$args->cover_image);
+		$this->add('is_cover', $args->cover_image);
 
 		// 썸네일 삭제
 		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($upload_target_srl, 3));
@@ -1054,9 +1054,9 @@ 
 		$fileConfig = $oModuleModel->getModulePartConfig('file', $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('file', $moduleSrl, $fileConfig);
 			}

Braces +229 added lines, -95 removed lines

@@ -29,20 +29,30 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if(!is_uploaded_file($file_info['tmp_name'])) {
+			exit();
+		}
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
@@ -52,7 +62,9 @@ 
 		$this->add('source_filename',$output->get('source_filename'));
 		$this->add('download_url',$output->get('uploaded_filename'));
 		$this->add('upload_target_srl',$output->get('upload_target_srl'));
-		if($output->error != '0') $this->stop($output->message);
+		if($output->error != '0') {
+			$this->stop($output->message);
+		}
 	}
 
 	/**
@@ -67,14 +79,22 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
@@ -129,15 +149,16 @@ 
 		$source_src = $fileInfo->uploaded_filename;
 		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
 
-		if(!$height) $height = $width-1;
+		if(!$height) {
+			$height = $width-1;
+		}
 
 		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
 			$output->src = $output_src;
-		}
-		else
+		} else
 		{
 			return new BaseObject(-1,'msg_invalid_request');
 		}
@@ -180,7 +201,9 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new BaseObject(-1, 'msg_not_permitted');
+		if(isset($this->grant->access) && $this->grant->access !== true) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -189,9 +212,13 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) {
+			return $this->stop('msg_file_not_found');
+		}
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') {
+			return $this->stop('msg_not_permitted_download');
+		}
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
@@ -203,7 +230,9 @@ 
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if(!is_array($allow_outlink_format_array)) {
+					$allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				}
 
 				foreach($allow_outlink_format_array as $val)
 				{
@@ -225,7 +254,9 @@ 
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if(!is_array($allow_outlink_site_array)) {
+							$allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						}
 
 						foreach($allow_outlink_site_array as $val)
 						{
@@ -237,23 +268,29 @@ 
 							}
 						}
 					}
+				} else {
+					$file_module_config->allow_outlink = 'Y';
 				}
-				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if($file_module_config->allow_outlink != 'Y') {
+				return $this->stop('msg_not_allowed_outlink');
+			}
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
 		if(is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach($file_module_config->download_grant AS $value) {
+							if($value) $downloadGrantCount++;
+			}
 		}
 
 		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if(!Context::get('is_logged')) {
+				return $this->stop('msg_not_permitted_download');
+			}
 			$logged_info = Context::get('logged_info');
 			if($logged_info->is_admin != 'Y')
 			{
@@ -276,13 +313,17 @@ 
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if(!$is_permitted) {
+						return $this->stop('msg_not_permitted_download');
+					}
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if(!$output->toBool()) {
+			return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		}
 
 
 		// 다운로드 후 (가상)
@@ -306,16 +347,23 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) {
+			$is_android = true;
+		}
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
-		else $session_key = '__XE_FILE_KEY__';
+		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) {
+			$session_key = '__XE_FILE_KEY_AND__';
+		} else {
+			$session_key = '__XE_FILE_KEY__';
+		}
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if(!file_exists($uploaded_filename)) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
@@ -331,29 +379,27 @@ 
 			if($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
 			{
 				$filename_param = 'filename="' . $filename . '"';
-			}
-			else
+			} else
 			{
 				$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
 			}
-		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		} elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
 			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
-		}
-		elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+		} elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 		{
 			$filename = rawurlencode($filename);
 			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
-		}
-		else
+		} else
 		{
 			$filename_param = 'filename="' . $filename . '"';
 		}
 
 		if($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) {
+				$_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			}
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -361,7 +407,9 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if(!$fp) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		header("Cache-Control: ");
 		header("Pragma: ");
@@ -375,10 +423,11 @@ 
 		// if file size is lager than 10MB, use fread function (#18675748)
 		if($file_size > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while(!feof($fp)) {
+				echo fread($fp, 1024);
+			}
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			fpassthru($fp);
 		}
@@ -397,9 +446,13 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if($file_srls) {
+			$file_srl = $file_srls;
+		}
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
@@ -407,26 +460,38 @@ 
 		$oFileModel = getModel('file');
 
 		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		for($i=0;$i<count($srls);$i++)
 		{
 			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if(!$file_info) {
+				continue;
+			}
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if(!$file_grant->is_deletable) {
+				continue;
+			}
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if($upload_target_srl && $file_srl) {
+				$output = $this->deleteFile($file_srl);
+			}
 		}
 	}
 
@@ -437,7 +502,9 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$oModuleModel = getModel('module');
 
@@ -448,26 +515,32 @@ 
 		}
 
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if($fileSrls) {
+			$fileSrlList = explode(',', $fileSrls);
+		}
 
 		global $lang;
 		if(count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if(!is_array($fileList)) {
+				$fileList = array($fileList);
+			}
 
 			if(is_array($fileList))
 			{
 				foreach($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
-					else $value->validName = $lang->is_stand_by;
+					if($value->isvalid=='Y') {
+						$value->validName = $lang->is_valid;
+					} else {
+						$value->validName = $lang->is_stand_by;
+					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$fileList = array();
 			$this->setMessage($lang->no_files);
@@ -484,7 +557,9 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -501,10 +576,14 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -518,7 +597,9 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -533,7 +614,9 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if(!$comment_srl) {
+			return new BaseObject();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -551,10 +634,14 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new BaseObject();
+		if(!$comment_srl || !$uploaded_count) {
+			return new BaseObject();
+		}
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -568,9 +655,13 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if(!$comment_srl) {
+			return new BaseObject();
+		}
 
-		if($obj->isMoveToTrash) return new BaseObject();
+		if($obj->isMoveToTrash) {
+			return new BaseObject();
+		}
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -585,7 +676,9 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -660,7 +753,9 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// A workaround for Firefox upload bug
 		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
@@ -698,13 +793,17 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new BaseObject(-1, 'msg_exceeds_limit_size');
+				if($allowed_filesize < filesize($file_info['tmp_name'])) {
+					return new BaseObject(-1, 'msg_exceeds_limit_size');
+				}
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
 				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new BaseObject(-1, 'msg_exceeds_limit_size');
+				if($attached_size > $allowed_attach_size) {
+					return new BaseObject(-1, 'msg_exceeds_limit_size');
+				}
 			}
 		}
 
@@ -734,18 +833,21 @@ 
 				$idx++;
 			}
 			$direct_download = 'Y';
-		}
-		else
+		} else
 		{
 			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
 			$filename = $path.$random->createSecureSalt(32, 'hex');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new BaseObject(-1,'msg_not_permitted_create');
+		if(!FileHandler::makeDir($path)) {
+			return new BaseObject(-1,'msg_not_permitted_create');
+		}
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new BaseObject(-1,'msg_file_upload_error');
+		if(!checkUploadedFile($file_info['tmp_name'])) {
+			return new BaseObject(-1,'msg_file_upload_error');
+		}
 
 		// Get random number generator
 		$random = new Password();
@@ -759,13 +861,14 @@ 
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
 			}
-		}
-		else
+		} else
 		{
 			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new BaseObject(-1,'msg_file_upload_error');
+				if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
+					return new BaseObject(-1,'msg_file_upload_error');
+				}
 			}
 		}
 		// Get member information
@@ -786,10 +889,14 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -832,10 +939,14 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if(!$file_srl) {
+			return;
+		}
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
@@ -870,15 +981,21 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if(!$trigger_output->toBool()) {
+				return $trigger_output;
+			}
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -902,7 +1019,9 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new BaseObject();
+		if(!is_array($file_list)||!count($file_list)) {
+			return new BaseObject();
+		}
 
 		// Delete the file
 		$path = array();
@@ -913,14 +1032,18 @@ 
 
 			$uploaded_filename = $file_list[$i]->uploaded_filename;
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if(!in_array($path_info['dirname'], $path)) {
+				$path[] = $path_info['dirname'];
+			}
 		}
 
 		// Remove from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		
 		// Remove a file directory of the document
 		for($i=0, $c=count($path); $i<$c; $i++)
@@ -941,11 +1064,15 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if($source_srl == $target_srl) {
+			return;
+		}
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if(!$file_list) {
+			return;
+		}
 
 		$file_count = count($file_list);
  
@@ -959,15 +1086,16 @@ 
 			{
 				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
 				$new_file = $path.$file_info->source_filename;
-			}
-			else
+			} else
 			{
 				$path = sprintf("./files/attach/binaries/%s/%s/", $target_module_srl, $target_srl);
 				$random = new Password();
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if($old_file == $new_file) {
+				continue;
+			}
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -987,16 +1115,22 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$vars->editor_sequence) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new BaseObject(-1, 'msg_not_founded');
+		if(!$file_info) {
+			return new BaseObject(-1, 'msg_not_founded');
+		}
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$args =  new stdClass();
 		$args->file_srl = $vars->file_srl;

modules/tag/tag.controller.php

Spacing +14 added lines, -14 removed lines

@@ -19,20 +19,20 @@ 
 	 */
 	function triggerArrangeTag(&$obj)
 	{
-		if(!$obj->tags) return new BaseObject();
+		if (!$obj->tags) return new BaseObject();
 		// tags by variable
 		$tag_list = explode(',', $obj->tags);
 		$tag_count = count($tag_list);
 		$tag_list = array_unique($tag_list);
-		if(!count($tag_list)) return new BaseObject();
+		if (!count($tag_list)) return new BaseObject();
 
-		foreach($tag_list as $tag)
+		foreach ($tag_list as $tag)
 		{
-			if(!trim($tag)) continue;
+			if (!trim($tag)) continue;
 			$arranged_tag_list[] = trim($tag); 
 		}
-		if(!count($arranged_tag_list)) $obj->tags = null;
-		else $obj->tags = implode(',',$arranged_tag_list);
+		if (!count($arranged_tag_list)) $obj->tags = null;
+		else $obj->tags = implode(',', $arranged_tag_list);
 		return new BaseObject();
 	}
 
@@ -45,24 +45,24 @@ 
 		$module_srl = $obj->module_srl;
 		$document_srl = $obj->document_srl;
 		$tags = $obj->tags;
-		if(!$document_srl) return new BaseObject();
+		if (!$document_srl) return new BaseObject();
 		// Remove all tags that article
 		$output = $this->triggerDeleteTag($obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Re-enter the tag
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
 
-		$tag_list = explode(',',$tags);
+		$tag_list = explode(',', $tags);
 		$tag_count = count($tag_list);
-		for($i=0;$i<$tag_count;$i++)
+		for ($i = 0; $i < $tag_count; $i++)
 		{
 			unset($args->tag);
 			$args->tag = trim($tag_list[$i]);
-			if(!$args->tag) continue;
+			if (!$args->tag) continue;
 			$output = executeQuery('tag.insertTag', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		return new BaseObject();
@@ -75,7 +75,7 @@ 
 	function triggerDeleteTag(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if (!$document_srl) return new BaseObject();
 
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
@@ -88,7 +88,7 @@ 
 	function triggerDeleteModuleTags(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if (!$module_srl) return new BaseObject();
 
 		$oTagController = getAdminController('tag');
 		return $oTagController->deleteModuleTags($module_srl);

Braces +32 added lines, -11 removed lines

@@ -19,20 +19,29 @@ 
 	 */
 	function triggerArrangeTag(&$obj)
 	{
-		if(!$obj->tags) return new BaseObject();
+		if(!$obj->tags) {
+			return new BaseObject();
+		}
 		// tags by variable
 		$tag_list = explode(',', $obj->tags);
 		$tag_count = count($tag_list);
 		$tag_list = array_unique($tag_list);
-		if(!count($tag_list)) return new BaseObject();
+		if(!count($tag_list)) {
+			return new BaseObject();
+		}
 
 		foreach($tag_list as $tag)
 		{
-			if(!trim($tag)) continue;
+			if(!trim($tag)) {
+				continue;
+			}
 			$arranged_tag_list[] = trim($tag); 
 		}
-		if(!count($arranged_tag_list)) $obj->tags = null;
-		else $obj->tags = implode(',',$arranged_tag_list);
+		if(!count($arranged_tag_list)) {
+			$obj->tags = null;
+		} else {
+			$obj->tags = implode(',',$arranged_tag_list);
+		}
 		return new BaseObject();
 	}
 
@@ -45,10 +54,14 @@ 
 		$module_srl = $obj->module_srl;
 		$document_srl = $obj->document_srl;
 		$tags = $obj->tags;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 		// Remove all tags that article
 		$output = $this->triggerDeleteTag($obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Re-enter the tag
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
@@ -60,9 +73,13 @@ 
 		{
 			unset($args->tag);
 			$args->tag = trim($tag_list[$i]);
-			if(!$args->tag) continue;
+			if(!$args->tag) {
+				continue;
+			}
 			$output = executeQuery('tag.insertTag', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		return new BaseObject();
@@ -75,7 +92,9 @@ 
 	function triggerDeleteTag(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
@@ -88,7 +107,9 @@ 
 	function triggerDeleteModuleTags(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		$oTagController = getAdminController('tag');
 		return $oTagController->deleteModuleTags($module_srl);

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.model.php

Spacing +140 added lines, -140 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getEditorConfig($module_srl = null)
 	{
-		if(!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl)
+		if (!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl)
 		{
 			// Get trackback settings of the selected module
 			$oModuleModel = getModel('module');
@@ -34,55 +34,55 @@ 
 		$oModuleModel = getModel('module');
 		$editor_default_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!is_object($editor_config)) $editor_config = new stdClass();
+		if (!is_object($editor_config)) $editor_config = new stdClass();
 
-		if($editor_config->enable_autosave != 'N') $editor_config->enable_autosave = 'Y';
-		if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
-		if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
-		if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
-		if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
-		if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
-		if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
-		if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
-		if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
+		if ($editor_config->enable_autosave != 'N') $editor_config->enable_autosave = 'Y';
+		if (!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
+		if (!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
+		if (!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
+		if (!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
+		if (!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
+		if (!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
+		if (!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
+		if (!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant = array();
 
-		if(!$editor_config->editor_height)
+		if (!$editor_config->editor_height)
 		{
 			$editor_config->editor_height = ($editor_default_config->editor_height) ? $editor_default_config->editor_height : 500;
 		}
-		if(!$editor_config->comment_editor_height)
+		if (!$editor_config->comment_editor_height)
 		{
 			$editor_config->comment_editor_height = ($editor_default_config->comment_editor_height) ? $editor_default_config->comment_editor_height : 120;
 		}
-		if(!$editor_config->editor_skin)
+		if (!$editor_config->editor_skin)
 		{
 			$editor_config->editor_skin = ($editor_default_config->editor_skin) ? $editor_default_config->editor_skin : 'ckeditor';
 		}
-		if(!$editor_config->comment_editor_skin)
+		if (!$editor_config->comment_editor_skin)
 		{
 			$editor_config->comment_editor_skin = ($editor_default_config->comment_editor_skin) ? $editor_default_config->comment_editor_skin : 'ckeditor';
 		}
-		if(!$editor_config->content_style)
+		if (!$editor_config->content_style)
 		{
 			$editor_config->content_style = ($editor_default_config->content_style) ? $editor_default_config->content_style : 'ckeditor_light';
 		}
-		if(!$editor_config->content_font && $editor_default_config->content_font)
+		if (!$editor_config->content_font && $editor_default_config->content_font)
 		{
 			$editor_config->content_font = $editor_default_config->content_font;
 		}
-		if(!$editor_config->content_font_size && $editor_default_config->content_font_size)
+		if (!$editor_config->content_font_size && $editor_default_config->content_font_size)
 		{
 			$editor_config->content_font_size = $editor_default_config->content_font_size;
 		}
-		if(!$editor_config->sel_editor_colorset && $editor_default_config->sel_editor_colorset)
+		if (!$editor_config->sel_editor_colorset && $editor_default_config->sel_editor_colorset)
 		{
 			$editor_config->sel_editor_colorset = $editor_default_config->sel_editor_colorset;
 		}
-		if(!$editor_config->sel_comment_editor_colorset && $editor_default_config->sel_comment_editor_colorset)
+		if (!$editor_config->sel_comment_editor_colorset && $editor_default_config->sel_comment_editor_colorset)
 		{
 			$editor_config->sel_comment_editor_colorset = $editor_default_config->sel_comment_editor_colorset;
 		}
-		if(!$editor_config->comment_content_style && $editor_default_config->comment_content_style)
+		if (!$editor_config->comment_content_style && $editor_default_config->comment_content_style)
 		{
 			$editor_config->comment_content_style = $editor_default_config->comment_content_style;
 		}
@@ -92,25 +92,25 @@ 
 
 	function loadDrComponents()
 	{
-		$drComponentPath = _XE_PATH_ . 'modules/editor/skins/dreditor/drcomponents/';
+		$drComponentPath = _XE_PATH_.'modules/editor/skins/dreditor/drcomponents/';
 		$drComponentList = FileHandler::readDir($drComponentPath);
 
 		$oTemplate = &TemplateHandler::getInstance();
 
 		$drComponentInfo = array();
-		if($drComponentList)
+		if ($drComponentList)
 		{
-			foreach($drComponentList as $i => $drComponent)
+			foreach ($drComponentList as $i => $drComponent)
 			{
 				unset($obj);
 				$obj = $this->getDrComponentXmlInfo($drComponent);
-				Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent));
-				$path = sprintf('%s%s/tpl/',$drComponentPath,$drComponent);
-				$obj->html = $oTemplate->compile($path,$drComponent);
+				Context::loadLang(sprintf('%s%s/lang/', $drComponentPath, $drComponent));
+				$path = sprintf('%s%s/tpl/', $drComponentPath, $drComponent);
+				$obj->html = $oTemplate->compile($path, $drComponent);
 				$drComponentInfo[$drComponent] = $obj;
 			}
 		}
-		Context::set('drComponentList',$drComponentInfo);
+		Context::set('drComponentList', $drComponentInfo);
 	}
 
 	function getDrComponentXmlInfo($drComponentName)
@@ -122,7 +122,7 @@ 
 		$xml_file = sprintf('%sinfo.xml', $component_path);
 		$cache_file = sprintf('./files/cache/editor/dr_%s.%s.php', $drComponentName, $lang_type);
 		// Return information after including it after cached xml file exists
-		if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
+		if (file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 			return $xml_info;
@@ -151,10 +151,10 @@ 
 		$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
 
 		// Author information
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+		if (!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
 		else $author_list = $xml_doc->component->author;
 
-		for($i=0; $i < count($author_list); $i++)
+		for ($i = 0; $i < count($author_list); $i++)
 		{
 			$buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
 			$buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
@@ -163,10 +163,10 @@ 
 
 		// List extra variables (text type only in the editor component)
 		$extra_vars = $xml_doc->component->extra_vars->var;
-		if($extra_vars)
+		if ($extra_vars)
 		{
-			if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-			foreach($extra_vars as $key => $val)
+			if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
+			foreach ($extra_vars as $key => $val)
 			{
 				unset($obj);
 				$key = $val->attrs->name;
@@ -198,47 +198,47 @@ 
 		 * Editor's default options
 		 */
 		// Option setting to allow file upload
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$option->editor_sequence = $upload_target_srl;
 		}
-		if(!$option->allow_fileupload) $allow_fileupload = false;
+		if (!$option->allow_fileupload) $allow_fileupload = false;
 		else $allow_fileupload = true;
 		// content_style setting
-		if(!$option->content_style) $option->content_style = 'ckeditor_light';
+		if (!$option->content_style) $option->content_style = 'ckeditor_light';
 		Context::set('content_style', $option->content_style);
-		Context::set('content_style_path', getScriptPath() . ltrim($this->module_path, './') . 'styles/' . $option->content_style);
+		Context::set('content_style_path', getScriptPath().ltrim($this->module_path, './').'styles/'.$option->content_style);
 		// Default font setting
 		Context::set('content_font', addslashes($option->content_font));
 		Context::set('content_font_size', $option->content_font_size);
 
 		// Option setting to allow auto-save
-		if(!$option->enable_autosave) $enable_autosave = false;
-		elseif(Context::get($option->primary_key_name)) $enable_autosave = false;
+		if (!$option->enable_autosave) $enable_autosave = false;
+		elseif (Context::get($option->primary_key_name)) $enable_autosave = false;
 		else $enable_autosave = true;
 		// Option setting to allow the default editor component
-		if(!$option->enable_default_component) $enable_default_component = false;
+		if (!$option->enable_default_component) $enable_default_component = false;
 		else $enable_default_component = true;
 		// Option setting to allow other extended components
-		if(!$option->enable_component) $enable_component = false;
+		if (!$option->enable_component) $enable_component = false;
 		else $enable_component = true;
 		// Setting for html-mode
-		if($option->disable_html) $html_mode = false;
+		if ($option->disable_html) $html_mode = false;
 		else $html_mode = true;
 		// Set Height
-		if(!$option->height) $editor_height = 300;
+		if (!$option->height) $editor_height = 300;
 		else $editor_height = $option->height;
 		// Skin Setting
 		$skin = $option->skin;
-		if(!$skin) $skin = 'ckeditor';
+		if (!$skin) $skin = 'ckeditor';
 
 		$colorset = $option->colorset;
-		if(!$colorset) $colorset = 'moono';
+		if (!$colorset) $colorset = 'moono';
 		Context::set('colorset', $colorset);
 		Context::set('skin', $skin);
 		Context::set('module_type', $option->module_type);
 
-		if($skin=='dreditor')
+		if ($skin == 'dreditor')
 		{
 			$this->loadDrComponents();
 		}
@@ -246,7 +246,7 @@ 
 		/**
 		 * Check the automatic backup feature (do not use if the post is edited)
 		 */
-		if($enable_autosave)
+		if ($enable_autosave)
 		{
 			// Extract auto-saved data
 			$saved_doc = $this->getSavedDoc($upload_target_srl);
@@ -258,26 +258,26 @@ 
 		/**
 		 * Extract editor's unique number (in order to display multiple editors on a single page)
 		 */
-		if($option->editor_sequence) $editor_sequence = $option->editor_sequence;
+		if ($option->editor_sequence) $editor_sequence = $option->editor_sequence;
 		else
 		{
-			if(!$_SESSION['_editor_sequence_']) $_SESSION['_editor_sequence_'] = 1;
-			$editor_sequence = $_SESSION['_editor_sequence_'] ++;
+			if (!$_SESSION['_editor_sequence_']) $_SESSION['_editor_sequence_'] = 1;
+			$editor_sequence = $_SESSION['_editor_sequence_']++;
 		}
 
 		/**
 		 * Upload setting by using configuration of the file module internally
 		 */
 		$files_count = 0;
-		if($allow_fileupload)
+		if ($allow_fileupload)
 		{
 			$oFileModel = getModel('file');
 			// Get upload configuration to set on SWFUploader
 			$file_config = $oFileModel->getUploadConfig();
-			$file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
-			$file_config->allowed_filesize = $file_config->allowed_filesize*1024*1024;
+			$file_config->allowed_attach_size = $file_config->allowed_attach_size * 1024 * 1024;
+			$file_config->allowed_filesize = $file_config->allowed_filesize * 1024 * 1024;
 
-			Context::set('file_config',$file_config);
+			Context::set('file_config', $file_config);
 			// Configure upload status such as file size
 			$upload_status = $oFileModel->getUploadStatus();
 			Context::set('upload_status', $upload_status);
@@ -285,9 +285,9 @@ 
 			$oFileController = getController('file');
 			$oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
 			// Check if the file already exists
-			if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
+			if ($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
 		}
-		Context::set('files_count', (int)$files_count);
+		Context::set('files_count', (int) $files_count);
 
 		Context::set('allow_fileupload', $allow_fileupload);
 		// Set editor_sequence value
@@ -304,10 +304,10 @@ 
 		 * Check editor component
 		 */
 		$site_module_info = Context::get('site_module_info');
-		$site_srl = (int)$site_module_info->site_srl;
-		if($enable_component)
+		$site_srl = (int) $site_module_info->site_srl;
+		if ($enable_component)
 		{
-			if(!Context::get('component_list'))
+			if (!Context::get('component_list'))
 			{
 				$component_list = $this->getComponentList(true, $site_srl);
 				Context::set('component_list', $component_list);
@@ -334,7 +334,7 @@ 
 		$tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
 		$tpl_file = 'editor.html';
 
-		if(!file_exists($tpl_path.$tpl_file))
+		if (!file_exists($tpl_path.$tpl_file))
 		{
 			$skin = 'ckeditor';
 			$tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
@@ -364,7 +364,7 @@ 
 		$config->module_type = $type;
 
 		// Configurations listed according to a type
-		if($type == 'document')
+		if ($type == 'document')
 		{
 			$config->editor_skin = $editor_config->editor_skin;
 			$config->content_style = $editor_config->content_style;
@@ -393,7 +393,7 @@ 
 			$config->enable_autosave = 'N';
 		}
 		// Check a group_list of the currently logged-in user for permission check
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$group_list = $logged_info->group_list;
@@ -412,12 +412,12 @@ 
 		$option->colorset = $config->sel_editor_colorset;
 		// Permission check for file upload
 		$option->allow_fileupload = false;
-		if($logged_info->is_admin=='Y') $option->allow_fileupload = true;
-		elseif(count($config->upload_file_grant))
+		if ($logged_info->is_admin == 'Y') $option->allow_fileupload = true;
+		elseif (count($config->upload_file_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->upload_file_grant))
+				if (in_array($group_srl, $config->upload_file_grant))
 				{
 					$option->allow_fileupload = true;
 					break;
@@ -427,12 +427,12 @@ 
 		else $option->allow_fileupload = true;
 		// Permission check for using default components
 		$option->enable_default_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_default_component = true;
-		elseif(count($config->enable_default_component_grant))
+		if ($logged_info->is_admin == 'Y') $option->enable_default_component = true;
+		elseif (count($config->enable_default_component_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->enable_default_component_grant))
+				if (in_array($group_srl, $config->enable_default_component_grant))
 				{
 					$option->enable_default_component = true;
 					break;
@@ -442,12 +442,12 @@ 
 		else $option->enable_default_component = true;
 		// Permisshion check for using extended components
 		$option->enable_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_component = true;
-		elseif(count($config->enable_component_grant))
+		if ($logged_info->is_admin == 'Y') $option->enable_component = true;
+		elseif (count($config->enable_component_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->enable_component_grant))
+				if (in_array($group_srl, $config->enable_component_grant))
 				{
 					$option->enable_component = true;
 					break;
@@ -457,12 +457,12 @@ 
 		else $option->enable_component = true;
 		// HTML editing privileges
 		$enable_html = false;
-		if($logged_info->is_admin=='Y') $enable_html = true;
-		elseif(count($config->enable_html_grant))
+		if ($logged_info->is_admin == 'Y') $enable_html = true;
+		elseif (count($config->enable_html_grant))
 		{
-			foreach($group_list as $group_srl => $group_info)
+			foreach ($group_list as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $config->enable_html_grant))
+				if (in_array($group_srl, $config->enable_html_grant))
 				{
 					$enable_html = true;
 					break;
@@ -471,12 +471,12 @@ 
 		}
 		else $enable_html = true;
 
-		if($enable_html) $option->disable_html = false;
+		if ($enable_html) $option->disable_html = false;
 		else $option->disable_html = true;
 		// Set Height
 		$option->height = $config->editor_height;
 		// Set an option for Auto-save
-		$option->enable_autosave = $config->enable_autosave=='Y'?true:false;
+		$option->enable_autosave = $config->enable_autosave == 'Y' ?true:false;
 		// Other settings
 		$option->primary_key_name = $primary_key_name;
 		$option->content_key_name = $content_key_name;
@@ -491,7 +491,7 @@ 
 	{
 		$auto_save_args = new stdClass();
 		// Find a document by using member_srl for logged-in user and ipaddress for non-logged user
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$auto_save_args->member_srl = $logged_info->member_srl;
@@ -502,7 +502,7 @@ 
 		}
 		$auto_save_args->module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$auto_save_args->module_srl)
+		if (!$auto_save_args->module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$auto_save_args->module_srl = $current_module_info->module_srl;
@@ -511,20 +511,20 @@ 
 		$output = executeQuery('editor.getSavedDocument', $auto_save_args);
 		$saved_doc = $output->data;
 		// Return null if no result is auto-saved
-		if(!$saved_doc) return;
+		if (!$saved_doc) return;
 		// Check if the auto-saved document already exists
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if($oSaved->isExists()) return;
+		if ($oSaved->isExists()) return;
 		// Move all the files if the auto-saved data contains document_srl and file
 		// Then set document_srl to editor_sequence
-		if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
+		if ($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
 		{
 			$saved_doc->module_srl = $auto_save_args->module_srl;
 			$oFileController = getController('file');
 			$oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
 		}
-		else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
+		else if ($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
 		// Change auto-saved data
 		$oEditorController = getController('editor');
 		$oEditorController->deleteSavedDoc(false);
@@ -540,18 +540,18 @@ 
 	 */
 	function getComponentObject($component, $editor_sequence = 0, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) return;
+		if (!preg_match('/^[a-zA-Z0-9_-]+$/', $component) || !preg_match('/^[0-9]+$/', $editor_sequence.$site_srl)) return;
 
-		if(!$this->loaded_component_list[$component][$editor_sequence])
+		if (!$this->loaded_component_list[$component][$editor_sequence])
 		{
 			// Create an object of the component and execute
 			$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
 			$class_file = sprintf('%s%s.class.php', $class_path, $component);
-			if(!file_exists($class_file)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if (!file_exists($class_file)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Create an object after loading the class file
 			require_once($class_file);
 			$oComponent = new $component($editor_sequence, $class_path);
-			if(!$oComponent) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if (!$oComponent) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
@@ -572,14 +572,14 @@ 
 	/**
 	 * @brief Return the cache file name of editor component list
 	 */
-	function getCacheFile($filter_enabled= true, $site_srl = 0)
+	function getCacheFile($filter_enabled = true, $site_srl = 0)
 	{
 		$lang = Context::getLangType();
 		$cache_path = _XE_PATH_.'files/cache/editor/cache/';
 		FileHandler::makeDir($cache_path);
-		$cache_file = $cache_path.'component_list.' . $lang .'.';
-		if($filter_enabled) $cache_file .= 'filter.';
-		if($site_srl) $cache_file .= $site_srl.'.';
+		$cache_file = $cache_path.'component_list.'.$lang.'.';
+		if ($filter_enabled) $cache_file .= 'filter.';
+		if ($site_srl) $cache_file .= $site_srl.'.';
 		$cache_file .= 'php';
 		return $cache_file;
 	}
@@ -587,19 +587,19 @@ 
 	/**
 	 * @brief Return a component list (DB Information included)
 	 */
-	function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false)
+	function getComponentList($filter_enabled = true, $site_srl = 0, $from_db = false)
 	{
 		$cache_file = $this->getCacheFile(false, $site_srl);
-		if($from_db || !file_exists($cache_file))
+		if ($from_db || !file_exists($cache_file))
 		{
 			$oEditorController = getController('editor');
 			$oEditorController->makeCache(false, $site_srl);
 		}
 
-		if(!file_exists($cache_file)) return;
+		if (!file_exists($cache_file)) return;
 		include($cache_file);
 		$logged_info = Context::get('logged_info');
-		if($logged_info && is_array($logged_info->group_list))
+		if ($logged_info && is_array($logged_info->group_list))
 		{
 			$group_list = array_keys($logged_info->group_list);
 		}
@@ -608,45 +608,45 @@ 
 			$group_list = array();
 		}
 
-		if(count($component_list))
+		if (count($component_list))
 		{
-			foreach($component_list as $key => $val)
+			foreach ($component_list as $key => $val)
 			{
-				if(!trim($key)) continue;
-				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
+				if (!trim($key)) continue;
+				if (!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
 				{
 					FileHandler::removeFile($cache_file);
 					return $this->getComponentList($filter_enabled, $site_srl);
 				}
-				if(!$filter_enabled) continue;
-				if($val->enabled == "N")
+				if (!$filter_enabled) continue;
+				if ($val->enabled == "N")
 				{
 					unset($component_list->{$key});
 					continue;
 				}
-				if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
-				if($val->target_group)
+				if ($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
+				if ($val->target_group)
 				{
-					if(!$logged_info)
+					if (!$logged_info)
 					{
 						$val->enabled = "N";
 					}
 					else
 					{
 						$is_granted = false;
-						foreach($group_list as $group_srl)
+						foreach ($group_list as $group_srl)
 						{
-							if(in_array($group_srl, $val->target_group)) $is_granted = true;
+							if (in_array($group_srl, $val->target_group)) $is_granted = true;
 						}
-						if(!$is_granted) $val->enabled = "N";
+						if (!$is_granted) $val->enabled = "N";
 					}
 				}
-				if($val->enabled != "N" && $val->mid_list)
+				if ($val->enabled != "N" && $val->mid_list)
 				{
 					$mid = Context::get('mid');
-					if(!in_array($mid, $val->mid_list)) $val->enabled = "N";
+					if (!in_array($mid, $val->mid_list)) $val->enabled = "N";
 				}
-				if($val->enabled == "N")
+				if ($val->enabled == "N")
 				{
 					unset($component_list->{$key});
 					continue;
@@ -664,7 +664,7 @@ 
 		$args = new stdClass();
 		$args->component_name = $component_name;
 
-		if($site_srl)
+		if ($site_srl)
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponent', $args);
@@ -675,7 +675,7 @@ 
 		}
 		$component = $output->data;
 
-		if(!$output->data) return false;
+		if (!$output->data) return false;
 
 		$component_name = $component->component_name;
 
@@ -687,25 +687,25 @@ 
 
 		$xml_info->mid_list = array();
 
-		if($component->extra_vars)
+		if ($component->extra_vars)
 		{
 			$extra_vars = unserialize($component->extra_vars);
 
-			if($extra_vars->target_group)
+			if ($extra_vars->target_group)
 			{
 				$xml_info->target_group = $extra_vars->target_group;
 				unset($extra_vars->target_group);
 			}
 
-			if($extra_vars->mid_list)
+			if ($extra_vars->mid_list)
 			{
 				$xml_info->mid_list = $extra_vars->mid_list;
 				unset($extra_vars->mid_list);
 			}
 
-			if($xml_info->extra_vars)
+			if ($xml_info->extra_vars)
 			{
-				foreach($xml_info->extra_vars as $key => $val)
+				foreach ($xml_info->extra_vars as $key => $val)
 				{
 					$xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
 				}
@@ -729,7 +729,7 @@ 
 		$cache_file = sprintf('./files/cache/editor/%s.%s.php', $component, $lang_type);
 
 		// Include and return xml file information if cached file exists
-		if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
+		if (file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 
@@ -746,7 +746,7 @@ 
 		$component_info->component_name = $component;
 		$component_info->title = $xml_doc->component->title->body;
 
-		if($xml_doc->component->version)
+		if ($xml_doc->component->version)
 		{
 			$component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
 			$component_info->version = $xml_doc->component->version->body;
@@ -772,10 +772,10 @@ 
 
 		// Author information
 		$author_list = array();
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+		if (!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
 		else $author_list = $xml_doc->component->author;
 
-		for($i = 0; $i < count($author_list); $i++)
+		for ($i = 0; $i < count($author_list); $i++)
 		{
 			$author = new stdClass;
 			$author->name = $author_list[$i]->name->body;
@@ -786,39 +786,39 @@ 
 
 		// List extra variables (text type only for editor component)
 		$extra_vars = $xml_doc->component->extra_vars;
-		if($extra_vars)
+		if ($extra_vars)
 		{
 			$extra_var_groups = $extra_vars->group;
-			if(!$extra_var_groups)
+			if (!$extra_var_groups)
 			{
 				$extra_var_groups = $extra_vars;
 			}
-			if(!is_array($extra_var_groups))
+			if (!is_array($extra_var_groups))
 			{
 				$extra_var_groups = array($extra_var_groups);
 			}
 
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if(!is_array($group->var))
+				if (!is_array($group->var))
 				{
 					$extra_vars = array($group->var);
 				}
 
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(!$val)
+					if (!$val)
 					{
 						continue;
 					}
 
 					$obj = new stdClass();
-					if(!$val->attrs)
+					if (!$val->attrs)
 					{
 						$val->attrs = new stdClass();
 					}
-					if(!$val->attrs->type)
+					if (!$val->attrs->type)
 					{
 						$val->attrs->type = 'text';
 					}
@@ -828,26 +828,26 @@ 
 					$obj->title = $val->title->body;
 					$obj->type = $val->attrs->type;
 					$obj->description = $val->description->body;
-					if($obj->name)
+					if ($obj->name)
 					{
 						$obj->value = $extra_vals->{$obj->name};
 					}
-					if(strpos($obj->value, '|@|') != FALSE)
+					if (strpos($obj->value, '|@|') != FALSE)
 					{
 						$obj->value = explode('|@|', $obj->value);
 					}
-					if($obj->type == 'mid_list' && !is_array($obj->value))
+					if ($obj->type == 'mid_list' && !is_array($obj->value))
 					{
 						$obj->value = array($obj->value);
 					}
 
 					// 'Select'type obtained from the option list.
-					if($val->options && !is_array($val->options))
+					if ($val->options && !is_array($val->options))
 					{
 						$val->options = array($val->options);
 					}
 
-					for($i = 0, $c = count($val->options); $i < $c; $i++)
+					for ($i = 0, $c = count($val->options); $i < $c; $i++)
 					{
 						$obj->options[$i] = new stdClass();
 						$obj->options[$i]->title = $val->options[$i]->title->body;
@@ -861,7 +861,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined(\'__XE__\')) exit();';
-		$buff[] = '$xml_info = ' . var_export($component_info, TRUE) . ';';
+		$buff[] = '$xml_info = '.var_export($component_info, TRUE).';';
 		$buff = str_replace('stdClass::__set_state', '(object)', implode(PHP_EOL, $buff));
 
 		FileHandler::writeFile($cache_file, $buff, 'w');

Braces +173 added lines, -80 removed lines

@@ -34,17 +34,37 @@ 
 		$oModuleModel = getModel('module');
 		$editor_default_config = $oModuleModel->getModuleConfig('editor');
 
-		if(!is_object($editor_config)) $editor_config = new stdClass();
-
-		if($editor_config->enable_autosave != 'N') $editor_config->enable_autosave = 'Y';
-		if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
-		if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
-		if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
-		if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
-		if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
-		if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
-		if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
-		if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
+		if(!is_object($editor_config)) {
+			$editor_config = new stdClass();
+		}
+
+		if($editor_config->enable_autosave != 'N') {
+			$editor_config->enable_autosave = 'Y';
+		}
+		if(!is_array($editor_config->enable_html_grant)) {
+			$editor_config->enable_html_grant = array();
+		}
+		if(!is_array($editor_config->enable_comment_html_grant)) {
+			$editor_config->enable_comment_html_grant = array();
+		}
+		if(!is_array($editor_config->upload_file_grant)) {
+			$editor_config->upload_file_grant = array();
+		}
+		if(!is_array($editor_config->comment_upload_file_grant)) {
+			$editor_config->comment_upload_file_grant = array();
+		}
+		if(!is_array($editor_config->enable_default_component_grant)) {
+			$editor_config->enable_default_component_grant = array();
+		}
+		if(!is_array($editor_config->enable_comment_default_component_grant)) {
+			$editor_config->enable_comment_default_component_grant = array();
+		}
+		if(!is_array($editor_config->enable_component_grant)) {
+			$editor_config->enable_component_grant = array();
+		}
+		if(!is_array($editor_config->enable_comment_component_grant)) {
+			$editor_config->enable_comment_component_grant= array();
+		}
 
 		if(!$editor_config->editor_height)
 		{
@@ -151,8 +171,11 @@ 
 		$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
 
 		// Author information
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
-		else $author_list = $xml_doc->component->author;
+		if(!is_array($xml_doc->component->author)) {
+			$author_list[] = $xml_doc->component->author;
+		} else {
+			$author_list = $xml_doc->component->author;
+		}
 
 		for($i=0; $i < count($author_list); $i++)
 		{
@@ -165,7 +188,9 @@ 
 		$extra_vars = $xml_doc->component->extra_vars->var;
 		if($extra_vars)
 		{
-			if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+			if(!is_array($extra_vars)) {
+				$extra_vars = array($extra_vars);
+			}
 			foreach($extra_vars as $key => $val)
 			{
 				unset($obj);
@@ -202,10 +227,15 @@ 
 		{
 			$option->editor_sequence = $upload_target_srl;
 		}
-		if(!$option->allow_fileupload) $allow_fileupload = false;
-		else $allow_fileupload = true;
+		if(!$option->allow_fileupload) {
+			$allow_fileupload = false;
+		} else {
+			$allow_fileupload = true;
+		}
 		// content_style setting
-		if(!$option->content_style) $option->content_style = 'ckeditor_light';
+		if(!$option->content_style) {
+			$option->content_style = 'ckeditor_light';
+		}
 		Context::set('content_style', $option->content_style);
 		Context::set('content_style_path', getScriptPath() . ltrim($this->module_path, './') . 'styles/' . $option->content_style);
 		// Default font setting
@@ -213,27 +243,47 @@ 
 		Context::set('content_font_size', $option->content_font_size);
 
 		// Option setting to allow auto-save
-		if(!$option->enable_autosave) $enable_autosave = false;
-		elseif(Context::get($option->primary_key_name)) $enable_autosave = false;
-		else $enable_autosave = true;
+		if(!$option->enable_autosave) {
+			$enable_autosave = false;
+		} elseif(Context::get($option->primary_key_name)) {
+			$enable_autosave = false;
+		} else {
+			$enable_autosave = true;
+		}
 		// Option setting to allow the default editor component
-		if(!$option->enable_default_component) $enable_default_component = false;
-		else $enable_default_component = true;
+		if(!$option->enable_default_component) {
+			$enable_default_component = false;
+		} else {
+			$enable_default_component = true;
+		}
 		// Option setting to allow other extended components
-		if(!$option->enable_component) $enable_component = false;
-		else $enable_component = true;
+		if(!$option->enable_component) {
+			$enable_component = false;
+		} else {
+			$enable_component = true;
+		}
 		// Setting for html-mode
-		if($option->disable_html) $html_mode = false;
-		else $html_mode = true;
+		if($option->disable_html) {
+			$html_mode = false;
+		} else {
+			$html_mode = true;
+		}
 		// Set Height
-		if(!$option->height) $editor_height = 300;
-		else $editor_height = $option->height;
+		if(!$option->height) {
+			$editor_height = 300;
+		} else {
+			$editor_height = $option->height;
+		}
 		// Skin Setting
 		$skin = $option->skin;
-		if(!$skin) $skin = 'ckeditor';
+		if(!$skin) {
+			$skin = 'ckeditor';
+		}
 
 		$colorset = $option->colorset;
-		if(!$colorset) $colorset = 'moono';
+		if(!$colorset) {
+			$colorset = 'moono';
+		}
 		Context::set('colorset', $colorset);
 		Context::set('skin', $skin);
 		Context::set('module_type', $option->module_type);
@@ -258,10 +308,13 @@ 
 		/**
 		 * Extract editor's unique number (in order to display multiple editors on a single page)
 		 */
-		if($option->editor_sequence) $editor_sequence = $option->editor_sequence;
-		else
+		if($option->editor_sequence) {
+			$editor_sequence = $option->editor_sequence;
+		} else
 		{
-			if(!$_SESSION['_editor_sequence_']) $_SESSION['_editor_sequence_'] = 1;
+			if(!$_SESSION['_editor_sequence_']) {
+				$_SESSION['_editor_sequence_'] = 1;
+			}
 			$editor_sequence = $_SESSION['_editor_sequence_'] ++;
 		}
 
@@ -285,7 +338,9 @@ 
 			$oFileController = getController('file');
 			$oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
 			// Check if the file already exists
-			if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
+			if($upload_target_srl) {
+				$files_count = $oFileModel->getFilesCount($upload_target_srl);
+			}
 		}
 		Context::set('files_count', (int)$files_count);
 
@@ -377,8 +432,7 @@ 
 			$config->enable_html_grant = $editor_config->enable_html_grant;
 			$config->editor_height = $editor_config->editor_height;
 			$config->enable_autosave = $editor_config->enable_autosave;
-		}
-		else
+		} else
 		{
 			$config->editor_skin = $editor_config->comment_editor_skin;
 			$config->content_style = $editor_config->comment_content_style;
@@ -397,8 +451,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$group_list = $logged_info->group_list;
-		}
-		else
+		} else
 		{
 			$group_list = array();
 		}
@@ -412,8 +465,9 @@ 
 		$option->colorset = $config->sel_editor_colorset;
 		// Permission check for file upload
 		$option->allow_fileupload = false;
-		if($logged_info->is_admin=='Y') $option->allow_fileupload = true;
-		elseif(count($config->upload_file_grant))
+		if($logged_info->is_admin=='Y') {
+			$option->allow_fileupload = true;
+		} elseif(count($config->upload_file_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -423,12 +477,14 @@ 
 					break;
 				}
 			}
+		} else {
+			$option->allow_fileupload = true;
 		}
-		else $option->allow_fileupload = true;
 		// Permission check for using default components
 		$option->enable_default_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_default_component = true;
-		elseif(count($config->enable_default_component_grant))
+		if($logged_info->is_admin=='Y') {
+			$option->enable_default_component = true;
+		} elseif(count($config->enable_default_component_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -438,12 +494,14 @@ 
 					break;
 				}
 			}
+		} else {
+			$option->enable_default_component = true;
 		}
-		else $option->enable_default_component = true;
 		// Permisshion check for using extended components
 		$option->enable_component = false;
-		if($logged_info->is_admin=='Y') $option->enable_component = true;
-		elseif(count($config->enable_component_grant))
+		if($logged_info->is_admin=='Y') {
+			$option->enable_component = true;
+		} elseif(count($config->enable_component_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -453,12 +511,14 @@ 
 					break;
 				}
 			}
+		} else {
+			$option->enable_component = true;
 		}
-		else $option->enable_component = true;
 		// HTML editing privileges
 		$enable_html = false;
-		if($logged_info->is_admin=='Y') $enable_html = true;
-		elseif(count($config->enable_html_grant))
+		if($logged_info->is_admin=='Y') {
+			$enable_html = true;
+		} elseif(count($config->enable_html_grant))
 		{
 			foreach($group_list as $group_srl => $group_info)
 			{
@@ -468,11 +528,15 @@ 
 					break;
 				}
 			}
+		} else {
+			$enable_html = true;
 		}
-		else $enable_html = true;
 
-		if($enable_html) $option->disable_html = false;
-		else $option->disable_html = true;
+		if($enable_html) {
+			$option->disable_html = false;
+		} else {
+			$option->disable_html = true;
+		}
 		// Set Height
 		$option->height = $config->editor_height;
 		// Set an option for Auto-save
@@ -495,8 +559,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$auto_save_args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -511,11 +574,15 @@ 
 		$output = executeQuery('editor.getSavedDocument', $auto_save_args);
 		$saved_doc = $output->data;
 		// Return null if no result is auto-saved
-		if(!$saved_doc) return;
+		if(!$saved_doc) {
+			return;
+		}
 		// Check if the auto-saved document already exists
 		$oDocumentModel = getModel('document');
 		$oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-		if($oSaved->isExists()) return;
+		if($oSaved->isExists()) {
+			return;
+		}
 		// Move all the files if the auto-saved data contains document_srl and file
 		// Then set document_srl to editor_sequence
 		if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl'))
@@ -523,8 +590,9 @@ 
 			$saved_doc->module_srl = $auto_save_args->module_srl;
 			$oFileController = getController('file');
 			$oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
+		} else if($upload_target_srl) {
+			$saved_doc->document_srl = $upload_target_srl;
 		}
-		else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
 		// Change auto-saved data
 		$oEditorController = getController('editor');
 		$oEditorController->deleteSavedDoc(false);
@@ -540,18 +608,24 @@ 
 	 */
 	function getComponentObject($component, $editor_sequence = 0, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) return;
+		if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) {
+			return;
+		}
 
 		if(!$this->loaded_component_list[$component][$editor_sequence])
 		{
 			// Create an object of the component and execute
 			$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
 			$class_file = sprintf('%s%s.class.php', $class_path, $component);
-			if(!file_exists($class_file)) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!file_exists($class_file)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			}
 			// Create an object after loading the class file
 			require_once($class_file);
 			$oComponent = new $component($editor_sequence, $class_path);
-			if(!$oComponent) return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			if(!$oComponent) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+			}
 			// Add configuration information
 			$component_info = $this->getComponent($component, $site_srl);
 			$oComponent->setInfo($component_info);
@@ -578,8 +652,12 @@ 
 		$cache_path = _XE_PATH_.'files/cache/editor/cache/';
 		FileHandler::makeDir($cache_path);
 		$cache_file = $cache_path.'component_list.' . $lang .'.';
-		if($filter_enabled) $cache_file .= 'filter.';
-		if($site_srl) $cache_file .= $site_srl.'.';
+		if($filter_enabled) {
+			$cache_file .= 'filter.';
+		}
+		if($site_srl) {
+			$cache_file .= $site_srl.'.';
+		}
 		$cache_file .= 'php';
 		return $cache_file;
 	}
@@ -596,14 +674,15 @@ 
 			$oEditorController->makeCache(false, $site_srl);
 		}
 
-		if(!file_exists($cache_file)) return;
+		if(!file_exists($cache_file)) {
+			return;
+		}
 		include($cache_file);
 		$logged_info = Context::get('logged_info');
 		if($logged_info && is_array($logged_info->group_list))
 		{
 			$group_list = array_keys($logged_info->group_list);
-		}
-		else
+		} else
 		{
 			$group_list = array();
 		}
@@ -612,39 +691,50 @@ 
 		{
 			foreach($component_list as $key => $val)
 			{
-				if(!trim($key)) continue;
+				if(!trim($key)) {
+					continue;
+				}
 				if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key))
 				{
 					FileHandler::removeFile($cache_file);
 					return $this->getComponentList($filter_enabled, $site_srl);
 				}
-				if(!$filter_enabled) continue;
+				if(!$filter_enabled) {
+					continue;
+				}
 				if($val->enabled == "N")
 				{
 					unset($component_list->{$key});
 					continue;
 				}
-				if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
+				if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") {
+					continue;
+				}
 				if($val->target_group)
 				{
 					if(!$logged_info)
 					{
 						$val->enabled = "N";
-					}
-					else
+					} else
 					{
 						$is_granted = false;
 						foreach($group_list as $group_srl)
 						{
-							if(in_array($group_srl, $val->target_group)) $is_granted = true;
+							if(in_array($group_srl, $val->target_group)) {
+								$is_granted = true;
+							}
+						}
+						if(!$is_granted) {
+							$val->enabled = "N";
 						}
-						if(!$is_granted) $val->enabled = "N";
 					}
 				}
 				if($val->enabled != "N" && $val->mid_list)
 				{
 					$mid = Context::get('mid');
-					if(!in_array($mid, $val->mid_list)) $val->enabled = "N";
+					if(!in_array($mid, $val->mid_list)) {
+						$val->enabled = "N";
+					}
 				}
 				if($val->enabled == "N")
 				{
@@ -668,14 +758,15 @@ 
 		{
 			$args->site_srl = $site_srl;
 			$output = executeQuery('editor.getSiteComponent', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('editor.getComponent', $args);
 		}
 		$component = $output->data;
 
-		if(!$output->data) return false;
+		if(!$output->data) {
+			return false;
+		}
 
 		$component_name = $component->component_name;
 
@@ -754,8 +845,7 @@ 
 			$component_info->homepage = $xml_doc->component->link->body;
 			$component_info->license = $xml_doc->component->license->body;
 			$component_info->license_link = $xml_doc->component->license->attrs->link;
-		}
-		else
+		} else
 		{
 			sscanf($xml_doc->component->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -772,8 +862,11 @@ 
 
 		// Author information
 		$author_list = array();
-		if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
-		else $author_list = $xml_doc->component->author;
+		if(!is_array($xml_doc->component->author)) {
+			$author_list[] = $xml_doc->component->author;
+		} else {
+			$author_list = $xml_doc->component->author;
+		}
 
 		for($i = 0; $i < count($author_list); $i++)
 		{

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);