xpressengine / xe-core

modules/file/file.model.php

Braces +82 added lines, -31 removed lines

@@ -29,7 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		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;
+		}
 
 		if($upload_target_srl)
 		{
@@ -68,26 +70,32 @@ 
 			}
 
 			$tmp_files = $this->getFiles($upload_target_srl);
-			if(!$tmp_files) $tmp_files = array();
+			if(!$tmp_files) {
+				$tmp_files = array();
+			}
 
 			foreach($tmp_files as $file_info)
 			{
-				if(!$file_info->file_srl) continue;
+				if(!$file_info->file_srl) {
+					continue;
+				}
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
-				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				if($file_info->direct_download=='N') {
+					$obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				} else {
+					$obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				}
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$files[] = $obj;
 				$attached_size += $file_info->file_size;
 			}
-		}
-		else
+		} else
 		{
 			$upload_target_srl = 0;
 			$attached_size = 0;
@@ -155,8 +163,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if($module_srl) {
+			$file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
+		}
+		if(!$file_config) {
+			$file_config = $file_module_config;
+		}
 
 		$config = new stdClass();
 
@@ -171,25 +183,53 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = $file_module_config->allowed_filesize;
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = $file_module_config->allow_outlink;
+		}
+		if(!$config->allow_outlink_site) {
+			$config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		}
+		if(!$config->allow_outlink_format) {
+			$config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = $file_module_config->download_grant;
+		}
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = '2';
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = '3';
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = '*.*';
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = 'Y';
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = array();
+		}
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
 		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		if($unit == 'g') {
+			$size *= 1024;
+		}
+		if($unit == 'k') {
+			$size /= 1024;
+		}
 
 		if($config->allowed_filesize > $size) 
 		{	
@@ -215,7 +255,9 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// old version compatibility
 		if(count($output->data) == 1)
@@ -224,8 +266,7 @@ 
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 
 			return $file;
-		}
-		else
+		} else
 		{
 			$fileList = array();
 
@@ -255,13 +296,19 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if($ckValid) {
+			$args->isvalid = 'Y';
+		}
 		$output = executeQueryArray('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if($file_list && !is_array($file_list)) {
+			$file_list = array($file_list);
+		}
 
 		foreach ($file_list as &$file)
 		{
@@ -346,7 +393,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if(!$file_info) {
+			return null;
+		}
 
 		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
@@ -359,7 +408,9 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if($oDocument->isExists()) {
+			$document_grant = $oDocument->isGranted();
+		}
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

Doc Comments +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	 * It is used when a file list of the upload_target_srl is requested for creating/updating a document.
 	 * Attempt to replace with sever-side session if upload_target_srl is not yet determined
 	 *
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function getFileList()
 	{
@@ -146,7 +146,7 @@ 
 	 * Get file configurations
 	 *
 	 * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration.
-	 * @return object Returns configuration.
+	 * @return stdClass Returns configuration.
 	 */
 	function getFileConfig($module_srl = null)
 	{
@@ -276,7 +276,7 @@ 
 	/**
 	 * Return configurations of the attachement (it automatically checks if an administrator is)
 	 *
-	 * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
+	 * @return stdClass Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
 	 */
 	function getUploadConfig()
 	{
@@ -330,7 +330,7 @@ 
 	 * Return file configuration of the module
 	 *
 	 * @param int $module_srl The sequence of module to get configuration
-	 * @return object
+	 * @return stdClass
 	 */
 	function getFileModuleConfig($module_srl)
 	{

Spacing +55 added lines, -55 removed lines

@@ -29,9 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		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;
 
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$oCommentModel = getModel('comment');
@@ -40,10 +40,10 @@ 
 			$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
 			// comment 권한 확인
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				$oComment = $oCommentModel->getComment($upload_target_srl);
-				if($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
+				if ($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
 				{
 					return new BaseObject(-1, 'msg_not_permitted');
 				}
@@ -52,34 +52,34 @@ 
 			}
 
 			// document 권한 확인
-			if($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
+			if ($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
 			// 모듈 권한 확인
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl')), $logged_info);
-				if(!$grant->access)
+				if (!$grant->access)
 				{
 					return new BaseObject(-1, 'msg_not_permitted');
 				}
 			}
 
 			$tmp_files = $this->getFiles($upload_target_srl);
-			if(!$tmp_files) $tmp_files = array();
+			if (!$tmp_files) $tmp_files = array();
 
-			foreach($tmp_files as $file_info)
+			foreach ($tmp_files as $file_info)
 			{
-				if(!$file_info->file_srl) continue;
+				if (!$file_info->file_srl) continue;
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				if ($file_info->direct_download == 'N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
@@ -99,17 +99,17 @@ 
 		//$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
 
 		$file_config = $this->getUploadConfig();
-		$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+		$left_size = $file_config->allowed_attach_size * 1024 * 1024 - $attached_size;
 		// Settings of required information
 		$attached_size = FileHandler::filesize($attached_size);
-		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size*1024*1024);
-		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize*1024*1024);
+		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024);
+		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024);
 		$allowed_filetypes = $file_config->allowed_filetypes;
-		$this->add("files",$files);
-		$this->add("editor_sequence",$editor_sequence);
-		$this->add("upload_target_srl",$upload_target_srl);
-		$this->add("upload_status",$upload_status);
-		$this->add("left_size",$left_size);
+		$this->add("files", $files);
+		$this->add("editor_sequence", $editor_sequence);
+		$this->add("upload_target_srl", $upload_target_srl);
+		$this->add("upload_status", $upload_status);
+		$this->add("left_size", $left_size);
 		$this->add('attached_size', $attached_size);
 		$this->add('allowed_attach_size', $allowed_attach_size);
 		$this->add('allowed_filesize', $allowed_filesize);
@@ -127,7 +127,7 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.getFilesCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @param string $sid
 	 * @return string Returns a url
 	 */
-	function getDownloadUrl($file_srl, $sid, $module_srl="")
+	function getDownloadUrl($file_srl, $sid, $module_srl = "")
 	{
 		return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s&module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl);
 	}
@@ -155,12 +155,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if ($module_srl) $file_config = $oModuleModel->getModulePartConfig('file', $module_srl);
+		if (!$file_config) $file_config = $file_module_config;
 
 		$config = new stdClass();
 
-		if($file_config)
+		if ($file_config)
 		{
 			$config->allowed_filesize = $file_config->allowed_filesize;
 			$config->allowed_attach_size = $file_config->allowed_attach_size;
@@ -171,31 +171,31 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if (!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		if (!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+		if (!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		if (!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		if (!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if (!$config->allowed_filesize) $config->allowed_filesize = '2';
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+		if (!$config->allow_outlink) $config->allow_outlink = 'Y';
+		if (!$config->download_grant) $config->download_grant = array();
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
-		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		$size = (float) $size;
+		if ($unit == 'g') $size *= 1024;
+		if ($unit == 'k') $size /= 1024;
 
-		if($config->allowed_filesize > $size) 
+		if ($config->allowed_filesize > $size) 
 		{	
 			$config->allowed_filesize = $size;
 		}
-		if($config->allowed_attach_size > $size) 
+		if ($config->allowed_attach_size > $size) 
 		{
 			$config->allowed_attach_size = $size;
 		}
@@ -215,10 +215,10 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// old version compatibility
-		if(count($output->data) == 1)
+		if (count($output->data) == 1)
 		{
 			$file = $output->data[0];
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -229,9 +229,9 @@ 
 		{
 			$fileList = array();
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $key=>$value)
+				foreach ($output->data as $key=>$value)
 				{
 					$file = $value;
 					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -255,13 +255,13 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if ($ckValid) $args->isvalid = 'Y';
 		$output = executeQueryArray('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if ($file_list && !is_array($file_list)) $file_list = array($file_list);
 
 		foreach ($file_list as &$file)
 		{
@@ -284,14 +284,14 @@ 
 
 		$module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$module_srl = $current_module_info->module_srl;
 		}
 		$file_config = $this->getFileConfig($module_srl);
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 			$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
@@ -317,9 +317,9 @@ 
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
 			Context::getLang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
-			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+			FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024),
 			Context::getLang('allowed_filesize'),
-			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+			FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024),
 			Context::getLang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
@@ -346,9 +346,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if (!$file_info) return null;
 
-		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
+		if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
 			$file_grant->is_deletable = true;
 			return $file_grant;
@@ -359,7 +359,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if ($oDocument->isExists()) $document_grant = $oDocument->isGranted();
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

modules/board/board.controller.php

Braces +47 added lines, -24 removed lines

@@ -36,26 +36,39 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if($obj->is_notice!='Y'||!$this->grant->manager) {
+			$obj->is_notice = 'N';
+		}
 		$obj->commentStatus = $obj->comment_status;
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 		if($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
-		}
-		else
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'Y';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'Y';
+			}
+		} else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'N';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'N';
+			}
 		}
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 
 		// unset document style if the user is not the document manager
 		if(!$this->grant->manager)
@@ -96,8 +109,7 @@ 
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -169,7 +181,9 @@ 
 				for($i=0;$i<count($target_mail);$i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if(!$email_address) {
+						continue;
+					}
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -263,7 +277,9 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if(!$this->module_info->use_status) {
+			$this->module_info->use_status = 'PUBLIC';
+		}
 		if(!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
@@ -272,8 +288,7 @@ 
 		if(in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
-		}
-		else
+		} else
 		{
 			unset($obj->is_secret);
 			$this->module_info->secret = 'N';
@@ -283,13 +298,20 @@ 
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 		if($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
-		}
-		else
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'Y';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'Y';
+			}
+		} else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'N';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'N';
+			}
 		}
 
 		// check if the doument is existed
@@ -309,8 +331,7 @@ 
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -416,7 +437,9 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if(!$oTrackbackController) {
+			return;
+		}
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
 		if(!$output->toBool())

Spacing +74 added lines, -74 removed lines

@@ -23,11 +23,11 @@ 
 	function procBoardInsertDocument()
 	{
 		// check grant
-		if($this->module_info->module != "board")
+		if ($this->module_info->module != "board")
 		{
 			return new BaseObject(-1, "msg_invalid_request");
 		}
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -36,29 +36,29 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if ($obj->is_notice != 'Y' || !$this->grant->manager) $obj->is_notice = 'N';
 		$obj->commentStatus = $obj->comment_status;
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
-		if($module_config->mobile_use_editor === 'Y')
+		if ($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'Y';
+			if (!isset($obj->use_html)) $obj->use_html = 'Y';
 		}
 		else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'N';
+			if (!isset($obj->use_html)) $obj->use_html = 'N';
 		}
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 
 		// unset document style if the user is not the document manager
-		if(!$this->grant->manager)
+		if (!$this->grant->manager)
 		{
 			unset($obj->title_color);
 			unset($obj->title_bold);
@@ -75,24 +75,24 @@ 
 
 		// update the document if it is existed
 		$is_update = false;
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$is_update = true;
 		}
 
 		// if use anonymous is true
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			if($is_update===false)
+			if ($is_update === false)
 			{
-				$obj->member_srl = -1*$logged_info->member_srl;
+				$obj->member_srl = -1 * $logged_info->member_srl;
 			}
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-			if($is_update===false)
+			if ($is_update === false)
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
@@ -102,10 +102,10 @@ 
 			$bAnonymous = false;
 		}
 
-		if($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
+		if ($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
 		{
 			$use_status = explode('|@|', $this->module_info->use_status);
-			if(!is_array($use_status) || !in_array('SECRET', $use_status))
+			if (!is_array($use_status) || !in_array('SECRET', $use_status))
 			{
 				unset($obj->is_secret);
 				$obj->status = 'PUBLIC';
@@ -113,24 +113,24 @@ 
 		}
 
 		// update the document if it is existed
-		if($is_update)
+		if ($is_update)
 		{
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
-				return new BaseObject(-1,'msg_not_permitted');
+				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
-			if($this->module_info->use_anonymous == 'Y') {
+			if ($this->module_info->use_anonymous == 'Y') {
 				$obj->member_srl = abs($oDocument->get('member_srl')) * -1;
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
 
-			if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+			if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 			{
-				return new BaseObject(-1,'msg_protect_content');
+				return new BaseObject(-1, 'msg_protect_content');
 			}
 
-			if(!$this->grant->manager)
+			if (!$this->grant->manager)
 			{
 				// notice & document style same as before if not manager
 				$obj->is_notice = $oDocument->get('is_notice');
@@ -139,7 +139,7 @@ 
 			}
 			
 			// modify list_order if document status is temp
-			if($oDocument->get('status') == 'TEMP')
+			if ($oDocument->get('status') == 'TEMP')
 			{
 				$obj->last_update = $obj->regdate = date('YmdHis');
 				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
@@ -155,21 +155,21 @@ 
 			$obj->document_srl = $output->get('document_srl');
 
 			// send an email to admin user
-			if($output->toBool() && $this->module_info->admin_mail)
+			if ($output->toBool() && $this->module_info->admin_mail)
 			{
 				$oModuleModel = getModel('module');
 				$member_config = $oModuleModel->getModuleConfig('member');
 				
 				$oMail = new Mail();
 				$oMail->setTitle($obj->title);
-				$oMail->setContent( sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('','document_srl',$obj->document_srl), getFullUrl('','document_srl',$obj->document_srl), $obj->content));
+				$oMail->setContent(sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('', 'document_srl', $obj->document_srl), getFullUrl('', 'document_srl', $obj->document_srl), $obj->content));
 				$oMail->setSender($obj->user_name ? $obj->user_name : 'anonymous', $obj->email_address ? $obj->email_address : $member_config->webmaster_email);
 
-				$target_mail = explode(',',$this->module_info->admin_mail);
-				for($i=0;$i<count($target_mail);$i++)
+				$target_mail = explode(',', $this->module_info->admin_mail);
+				for ($i = 0; $i < count($target_mail); $i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if (!$email_address) continue;
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -177,7 +177,7 @@ 
 		}
 
 		// if there is an error
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -187,7 +187,7 @@ 
 		$this->add('document_srl', $output->get('document_srl'));
 
 		// alert a message
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage($msg_code);
 		}
@@ -202,7 +202,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if the document is not existed
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return $this->doError('msg_invalid_document');
 		}
@@ -210,7 +210,7 @@ 
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		// check protect content
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new BaseObject(-1, 'msg_protect_content');
 		}
@@ -220,7 +220,7 @@ 
 
 		// delete the document
 		$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -229,7 +229,7 @@ 
 		$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '', 'page', Context::get('page'), 'document_srl', ''));
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -253,7 +253,7 @@ 
 	function procBoardInsertComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -263,13 +263,13 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
-		if(!is_array($this->module_info->use_status))
+		if (!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if (!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
 		}
 
-		if(in_array('SECRET', $this->module_info->use_status))
+		if (in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
 		}
@@ -281,31 +281,31 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
-		if($module_config->mobile_use_editor === 'Y')
+		if ($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'Y';
+			if (!isset($obj->use_html)) $obj->use_html = 'Y';
 		}
 		else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'N';
+			if (!isset($obj->use_html)) $obj->use_html = 'N';
 		}
 
 		// check if the doument is existed
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			return new BaseObject(-1,'msg_not_founded');
+			return new BaseObject(-1, 'msg_not_founded');
 		}
 
 		// For anonymous use, remove writer's information and notifying information
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			$obj->member_srl = -1*$logged_info->member_srl;
+			$obj->member_srl = -1 * $logged_info->member_srl;
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
@@ -323,7 +323,7 @@ 
 
 		// check the comment is existed
 		// if the comment is not existed, then generate a new sequence
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		} else {
@@ -331,14 +331,14 @@ 
 		}
 
 		// if comment_srl is not existed, then insert the comment
-		if($comment->comment_srl != $obj->comment_srl)
+		if ($comment->comment_srl != $obj->comment_srl)
 		{
 
 			// parent_srl is existed
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_comment = $oCommentModel->getComment($obj->parent_srl);
-				if(!$parent_comment->comment_srl)
+				if (!$parent_comment->comment_srl)
 				{
 					return new BaseObject(-1, 'msg_invalid_request');
 				}
@@ -352,9 +352,9 @@ 
 		// update the comment if it is not existed
 		} else {
 			// check the grant
-			if(!$comment->isGranted())
+			if (!$comment->isGranted())
 			{
-				return new BaseObject(-1,'msg_not_permitted');
+				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
 			$obj->parent_srl = $comment->parent_srl;
@@ -362,12 +362,12 @@ 
 			$comment_srl = $obj->comment_srl;
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_registed');
 		}
@@ -383,7 +383,7 @@ 
 	{
 		// get the comment_srl
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return $this->doError('msg_invalid_request');
 		}
@@ -392,7 +392,7 @@ 
 		$oCommentController = getController('comment');
 
 		$output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -400,7 +400,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -416,10 +416,10 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if (!$oTrackbackController) return;
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -427,7 +427,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -446,18 +446,18 @@ 
 		$oMemberModel = getModel('member');
 
 		// if the comment exists
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			// get the comment information
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
-			if(!$oComment->isExists())
+			if (!$oComment->isExists())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			// compare the comment password and the user input password
-			if(!$oMemberModel->isValidPassword($oComment->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oComment->get('password'), $password))
 			{
 				return new BaseObject(-1, 'msg_invalid_password');
 			}
@@ -467,13 +467,13 @@ 
 			 // get the document information
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
 
 			// compare the document password and the user input password
-			if(!$oMemberModel->isValidPassword($oDocument->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oDocument->get('password'), $password))
 			{
 				return new BaseObject(-1, 'msg_invalid_password');
 			}
@@ -490,7 +490,7 @@ 
 		$member_srl = Context::get('target_srl');
 		$mid = Context::get('cur_mid');
 
-		if(!$member_srl || !$mid)
+		if (!$member_srl || !$mid)
 		{
 			return new BaseObject();
 		}
@@ -502,13 +502,13 @@ 
 		$columnList = array('module');
 		$cur_module_info = $oModuleModel->getModuleInfoByMid($mid, 0, $columnList);
 
-		if($cur_module_info->module != 'board')
+		if ($cur_module_info->module != 'board')
 		{
 			return new BaseObject();
 		}
 
 		// get the member information
-		if($member_srl == $logged_info->member_srl)
+		if ($member_srl == $logged_info->member_srl)
 		{
 			$member_info = $logged_info;
 		} else {
@@ -516,13 +516,13 @@ 
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		}
 
-		if(!$member_info->user_id)
+		if (!$member_info->user_id)
 		{
 			return new BaseObject();
 		}
 
 		//search
-		$url = getUrl('','mid',$mid,'search_target','nick_name','search_keyword',$member_info->nick_name);
+		$url = getUrl('', 'mid', $mid, 'search_target', 'nick_name', 'search_keyword', $member_info->nick_name);
 		$oMemberController = getController('member');
 		$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '');
 

modules/widget/widget.class.php

Spacing +4 added lines, -4 removed lines

@@ -30,10 +30,10 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -49,10 +49,10 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
+			if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
 			{
 				$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
 			}

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// widget compile display.after trigger for further (04/14/2009)
-			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+			if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

modules/message/message.class.php

Spacing +6 added lines, -6 removed lines

@@ -23,17 +23,17 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if (is_dir($template_path)) return true;
 				}
 			}
 
@@ -51,17 +51,17 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if(is_dir($template_path)) {
+						return true;
+					}
 				}
 			}
 

modules/comment/comment.class.php

Spacing +29 added lines, -29 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once(_XE_PATH_ . 'modules/comment/comment.item.php');
+require_once(_XE_PATH_.'modules/comment/comment.item.php');
 
 /**
  * comment
@@ -36,7 +36,7 @@ 
 		// 2008. 02. 22 add comment setting when a new module added
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -54,63 +54,63 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				return TRUE;
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				return TRUE;
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				return TRUE;
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				return TRUE;
 			}
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				return TRUE;
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				return TRUE;
 			}
@@ -131,46 +131,46 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 			{
 				$oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
 			}
 			// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 			{
 				$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
 			}
 			// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-			if(!$oDB->isColumnExists("comments", "voted_count"))
+			if (!$oDB->isColumnExists("comments", "voted_count"))
 			{
 				$oDB->addColumn("comments", "voted_count", "number", "11");
 				$oDB->addIndex("comments", "idx_voted_count", array("voted_count"));
 			}
 
-			if(!$oDB->isColumnExists("comments", "notify_message"))
+			if (!$oDB->isColumnExists("comments", "notify_message"))
 			{
 				$oDB->addColumn("comments", "notify_message", "char", "1");
 			}
 			// 2008. 02. 22 add comment setting when a new module added
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 			{
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 			}
 			// 2008. 05. 14 add a column for blamed count
-			if(!$oDB->isColumnExists("comments", "blamed_count"))
+			if (!$oDB->isColumnExists("comments", "blamed_count"))
 			{
 				$oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, TRUE);
 				$oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
 			}
-			if(!$oDB->isColumnExists("comment_voted_log", "point"))
+			if (!$oDB->isColumnExists("comment_voted_log", "point"))
 			{
 				$oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, TRUE);
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+			if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_module_list_order", array("module_srl", "list_order"), TRUE
@@ -178,11 +178,11 @@ 
 			}
 
 			//2012. 02. 24 add comment published status column and index
-			if(!$oDB->isColumnExists("comments", "status"))
+			if (!$oDB->isColumnExists("comments", "status"))
 			{
 				$oDB->addColumn("comments", "status", "number", 1, 1, TRUE);
 			}
-			if(!$oDB->isIndexExists("comments", "idx_status"))
+			if (!$oDB->isIndexExists("comments", "idx_status"))
 			{
 				$oDB->addIndex(
 						"comments", "idx_status", array("status", "comment_srl", "module_srl", "document_srl"), TRUE
@@ -190,12 +190,12 @@ 
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isIndexExists("comments", "idx_parent_srl"))
+			if (!$oDB->isIndexExists("comments", "idx_parent_srl"))
 			{
 				$oDB->addIndex('comments', 'idx_parent_srl', array('parent_srl'));
 			}
@@ -212,7 +212,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}

modules/member/member.admin.view.php

Spacing +72 added lines, -72 removed lines

@@ -43,16 +43,16 @@ 
 
 		// if member_srl exists, set memberInfo
 		$member_srl = Context::get('member_srl');
-		if($member_srl) 
+		if ($member_srl) 
 		{
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-			if(!$this->memberInfo)
+			if (!$this->memberInfo)
 			{
-				Context::set('member_srl','');
+				Context::set('member_srl', '');
 			}
 			else
 			{
-				Context::set('member_info',$this->memberInfo);
+				Context::set('member_info', $this->memberInfo);
 			}
 		}
 
@@ -79,30 +79,30 @@ 
 
 		$filter = Context::get('filter_type');
 		global $lang;
-		switch($filter)
+		switch ($filter)
 		{
-			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member);break;
-			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member);break;
-			default : Context::set('filter_type_title', $lang->cmd_show_all_member);break;
+			case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member); break;
+			case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member); break;
+			default : Context::set('filter_type_title', $lang->cmd_show_all_member); break;
 		}
 		// retrieve list of groups for each member
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $member)
+			foreach ($output->data as $key => $member)
 			{
-				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
+				$output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl, 0);
 			}
 		}
 		$config = $this->memberConfig;
 		$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');
 		$usedIdentifiers = array();	
 
-		if(is_array($config->signupForm))
+		if (is_array($config->signupForm))
 		{
-			foreach($config->signupForm as $signupItem)
+			foreach ($config->signupForm as $signupItem)
 			{
-				if(!count($memberIdentifiers)) break;
-				if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
+				if (!count($memberIdentifiers)) break;
+				if (in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
 				{
 					unset($memberIdentifiers[$signupItem->name]);
 					$usedIdentifiers[$signupItem->name] = $lang->{$signupItem->name};
@@ -140,14 +140,14 @@ 
 	{
 		$config = $this->memberConfig;
 
-		if($config->redirect_url)
+		if ($config->redirect_url)
 		{
 			$mid = str_ireplace(Context::getDefaultUrl(), '', $config->redirect_url);
 
 			$siteModuleInfo = Context::get('site_module_info');
 
 			$oModuleModel = getModel('module');
-			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int)$siteModuleInfo->site_srl);
+			$moduleInfo = $oModuleModel->getModuleInfoByMid($mid, (int) $siteModuleInfo->site_srl);
 
 			$config->redirect_url = $moduleInfo->module_srl;
 			Context::set('config', $config);
@@ -173,9 +173,9 @@ 
 		Context::set('editor', $editor);
 
 		$signupForm = $config->signupForm;
-		foreach($signupForm as $val)
+		foreach ($signupForm as $val)
 		{
-			if($val->name == 'user_id')
+			if ($val->name == 'user_id')
 			{
 				$userIdInfo = $val;
 				break;
@@ -183,7 +183,7 @@ 
 		}
 
 		$oSecurity = new Security();
-		if($userIdInfo->isUse)
+		if ($userIdInfo->isUse)
 		{
 			// get denied ID list
 			Context::set('useUserID', 1);
@@ -274,16 +274,16 @@ 
 		Context::set('editor', $editor);
 
 		$signupForm = $config->signupForm;
-		foreach($signupForm as $val)
+		foreach ($signupForm as $val)
 		{
-			if($val->name == 'user_id')
+			if ($val->name == 'user_id')
 			{
 				$userIdInfo = $val;
 				break;
 			}
 		}
 
-		if($userIdInfo->isUse)
+		if ($userIdInfo->isUse)
 		{
 			// get denied ID list
 			Context::set('useUserID', 1);
@@ -344,14 +344,14 @@ 
 		$oMemberModel = getModel('member');
 
 		$memberInfo = Context::get('member_info');
-		if(isset($memberInfo))
+		if (isset($memberInfo))
 		{
 			$memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);
 		}
 		Context::set('member_info', $memberInfo);
 
 		// get an editor for the signature
-		if($memberInfo->member_srl)
+		if ($memberInfo->member_srl)
 		{
 			$oEditorModel = getModel('editor');
 			$option = new stdClass();
@@ -405,7 +405,7 @@ 
 		}
 
 		$member_config = $this->memberConfig;
-		if(!$this->memberConfig)
+		if (!$this->memberConfig)
 		{
 			$member_config = $this->memberConfig = $oMemberModel->getMemberConfig();
 		}
@@ -416,25 +416,25 @@ 
 		$formTags = array();
 		global $lang;
 
-		foreach($member_config->signupForm as $no=>$formInfo)
+		foreach ($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)continue;
+			if (!$formInfo->isUse)continue;
 
 			// 회원 본인이 아닌 경우 입력 폼 제거
-			if($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
+			if ($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
 			{
 				unset($member_config->signupForm[$no]);
 				continue;
 			}
 
-			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+			if ($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
 
 			$formTag = new stdClass();
 			$inputTag = '';
 			$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
-			if($isAdmin)
+			if ($isAdmin)
 			{
-				if($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				if ($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
 			}
 			else
 			{
@@ -442,28 +442,28 @@ 
 			}
 			$formTag->name = $formInfo->name;
 
-			if($formInfo->isDefaultForm)
+			if ($formInfo->isDefaultForm)
 			{
-				if($formInfo->imageType)
+				if ($formInfo->imageType)
 				{
 					$formTag->type = 'image';
-					if($formInfo->name == 'profile_image')
+					if ($formInfo->name == 'profile_image')
 					{
 						$target = $memberInfo['profile_image'];
 						$functionName = 'doDeleteProfileImage';
 					}
-					else if($formInfo->name == 'image_name')
+					else if ($formInfo->name == 'image_name')
 					{
 						$target = $memberInfo['image_name'];
 						$functionName = 'doDeleteImageName';
 					}
-					else if($formInfo->name == 'image_mark')
+					else if ($formInfo->name == 'image_mark')
 					{
 						$target = $memberInfo['image_mark'];
 						$functionName = 'doDeleteImageMark';
 					}
 
-					if($target->src)
+					if ($target->src)
 					{
 						$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="true" /><span id="%s"><img src="%s" alt="%s" /> <button type="button" onclick="%s(%d);return false;">%s</button></span>',
 							$formInfo->name,
@@ -486,7 +486,7 @@ 
 						$lang->{$formInfo->name.'_max_height'},
 						$member_config->{$formInfo->name.'_max_height'});
 					}//end imageType
-					else if($formInfo->name == 'birthday')
+					else if ($formInfo->name == 'birthday')
 					{
 						$formTag->type = 'date';
 						$inputTag = sprintf('<input type="hidden" name="birthday" id="date_birthday" value="%s" /><input type="text" placeholder="YYYY-MM-DD" name="birthday_ui" class="inputDate" id="birthday" value="%s" readonly="readonly" /> <input type="button" value="%s" class="btn dateRemover" />',
@@ -494,16 +494,16 @@ 
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
 					}
-					else if($formInfo->name == 'find_account_question')
+					else if ($formInfo->name == 'find_account_question')
 					{
 						$disabled = (!!$memberInfo['member_srl']) ? 'disabled="disabled"' : '';
 
 						$formTag->type = 'select';
 						$inputTag = '<select name="find_account_question" id="find_account_question" style="display:block;margin:0 0 8px 0" %s>%s</select>';
 						$optionTag = array();
-						foreach($lang->find_account_question_items as $key=>$val)
+						foreach ($lang->find_account_question_items as $key=>$val)
 						{
-							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
+							if ($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
 							else $selected = '';
 							$optionTag[] = sprintf('<option value="%s" %s >%s</option>',
 								$key,
@@ -511,24 +511,24 @@ 
 								$val);
 						}
 						$inputTag = sprintf($inputTag, $disabled, implode('', $optionTag));
-						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="" ' . $disabled . ' />';
+						$inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="" '.$disabled.' />';
 
-						if($disabled) {
-							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> ' . Context::getLang('cmd_modify') . '</label>';
+						if ($disabled) {
+							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> '.Context::getLang('cmd_modify').'</label>';
 							$inputTag .= '<script>(function($) {$(function() {$(\'[name=modify_find_account_answer]\').change(function() {var $this = $(this); if($this.prop(\'checked\')) {$(\'[name=find_account_question],[name=find_account_answer]\').attr(\'disabled\', false); } else {$(\'[name=find_account_question]\').attr(\'disabled\', true); $(\'[name=find_account_answer]\').attr(\'disabled\', true).val(\'\'); } }); }); })(jQuery);</script>';
 						}
 					}
-					else if($formInfo->name == 'email_address')
+					else if ($formInfo->name == 'email_address')
 					{
 						$formTag->type = 'email';
 						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
 					}
-					else if($formInfo->name == 'homepage')
+					else if ($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="homepage" id="homepage" value="'.$memberInfo['homepage'].'" />';
 					}
-					else if($formInfo->name == 'blog')
+					else if ($formInfo->name == 'blog')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="blog" id="blog" value="'.$memberInfo['blog'].'" />';
@@ -549,92 +549,92 @@ 
 					$extentionReplace = array();
 
 					$formTag->type = $extendForm->column_type;
-					if($extendForm->column_type == 'text')
+					if ($extendForm->column_type == 'text')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'homepage')
+					else if ($extendForm->column_type == 'homepage')
 					{
 						$template = '<input type="url" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'email_address')
+					else if ($extendForm->column_type == 'email_address')
 					{
 						$template = '<input type="email" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'tel')
+					else if ($extendForm->column_type == 'tel')
 					{
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
 						$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
 					}
-					else if($extendForm->column_type == 'textarea')
+					else if ($extendForm->column_type == 'textarea')
 					{
 						$template = '<textarea name="%column_name%" id="%column_name%" rows="4" cols="42">%value%</textarea>';
 					}
-					else if($extendForm->column_type == 'checkbox')
+					else if ($extendForm->column_type == 'checkbox')
 					{
 						$template = '';
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
 							$template = '<div style="padding-top:5px">%s</div>';
 							$__i = 0;
 							$optionTag = array();
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
 								$checked = '';
-								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								if (is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
 								$optionTag[] = '<label for="%column_name%'.$__i.'"><input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 								$__i++;
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
 					}
-					else if($extendForm->column_type == 'radio')
+					else if ($extendForm->column_type == 'radio')
 					{
 						$template = '';
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
 							$template = '<div style="padding-top:5px">%s</div>';
 							$optionTag = array();
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
-								if($extendForm->value == $v)$checked = 'checked="checked"';
+								if ($extendForm->value == $v)$checked = 'checked="checked"';
 								else $checked = '';
 								$optionTag[] = '<label><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
 					}
-					else if($extendForm->column_type == 'select')
+					else if ($extendForm->column_type == 'select')
 					{
 						$template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
 						$optionTag = array();
 						$optionTag[] = sprintf('<option value="">%s</option>', $lang->cmd_select);
-						if($extendForm->default_value)
+						if ($extendForm->default_value)
 						{
-							foreach($extendForm->default_value as $v)
+							foreach ($extendForm->default_value as $v)
 							{
-								if($v == $extendForm->value) $selected = 'selected="selected"';
+								if ($v == $extendForm->value) $selected = 'selected="selected"';
 								else $selected = '';
 								$optionTag[] = sprintf('<option value="%s" %s >%s</option>', $v, $selected, $v);
 							}
 						}
 						$template = sprintf($template, implode('', $optionTag));
 					}
-					else if($extendForm->column_type == 'kr_zip')
+					else if ($extendForm->column_type == 'kr_zip')
 					{
 						$krzipModel = getModel('krzip');
-						if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
+						if ($krzipModel && method_exists($krzipModel, 'getKrzipCodeSearchHtml'))
 						{
 							$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
 						}
 					}
-					else if($extendForm->column_type == 'jp_zip')
+					else if ($extendForm->column_type == 'jp_zip')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
 					}
-					else if($extendForm->column_type == 'date')
+					else if ($extendForm->column_type == 'date')
 					{
 						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), 'cmd_delete' => $lang->cmd_delete);
 						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" placeholder="YYYY-MM-DD" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="btn dateRemover" />';
@@ -643,7 +643,7 @@ 
 					$replace = array_merge($extentionReplace, $replace);
 					$inputTag = preg_replace_callback('@%(\w+)%@', function($n) use($replace) { return $replace[$n[1]]; }, $template);
 
-					if($extendForm->description)
+					if ($extendForm->description)
 						$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
 				}
 				$formTag->inputTag = $inputTag;
@@ -674,12 +674,12 @@ 
 	function dispMemberAdminInsertJoinForm() {
 		// Get the value of join_form
 		$member_join_form_srl = Context::get('member_join_form_srl');
-		if($member_join_form_srl)
+		if ($member_join_form_srl)
 		{
 			$oMemberModel = getModel('member');
 			$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
 
-			if(!$join_form) Context::set('member_join_form_srl','',true);
+			if (!$join_form) Context::set('member_join_form_srl', '', true);
 			else
 			{
 				Context::set('join_form', $join_form);

Braces +62 added lines, -57 removed lines

@@ -49,8 +49,7 @@ 
 			if(!$this->memberInfo)
 			{
 				Context::set('member_srl','');
-			}
-			else
+			} else
 			{
 				Context::set('member_info',$this->memberInfo);
 			}
@@ -101,7 +100,9 @@ 
 		{
 			foreach($config->signupForm as $signupItem)
 			{
-				if(!count($memberIdentifiers)) break;
+				if(!count($memberIdentifiers)) {
+					break;
+				}
 				if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse))
 				{
 					unset($memberIdentifiers[$signupItem->name]);
@@ -316,7 +317,9 @@ 
 		$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);
 		Context::set('extend_form_list', $extendForm);
 		$memberInfo = get_object_vars(Context::get('member_info'));
-		if (!is_array($memberInfo['group_list'])) $memberInfo['group_list'] = array();
+		if (!is_array($memberInfo['group_list'])) {
+			$memberInfo['group_list'] = array();
+		}
 		Context::set('memberInfo', $memberInfo);
 
 		$disableColumns = array('password', 'find_account_question', 'find_account_answer');
@@ -418,7 +421,9 @@ 
 
 		foreach($member_config->signupForm as $no=>$formInfo)
 		{
-			if(!$formInfo->isUse)continue;
+			if(!$formInfo->isUse) {
+				continue;
+			}
 
 			// 회원 본인이 아닌 경우 입력 폼 제거
 			if($formInfo->name == 'find_account_question' && $memberInfo['member_srl'] !== $logged_info->member_srl)
@@ -427,18 +432,23 @@ 
 				continue;
 			}
 
-			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+			if($formInfo->name == $member_config->identifier || $formInfo->name == 'password') {
+				continue;
+			}
 
 			$formTag = new stdClass();
 			$inputTag = '';
 			$formTag->title = ($formInfo->isDefaultForm) ? $lang->{$formInfo->name} : $formInfo->title;
 			if($isAdmin)
 			{
-				if($formInfo->mustRequired) $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
-			}
-			else
+				if($formInfo->mustRequired) {
+					$formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				}
+			} else
 			{
-				if ($formInfo->required && $formInfo->name != 'password') $formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				if ($formInfo->required && $formInfo->name != 'password') {
+					$formTag->title = '<em style="color:red">*</em> '.$formTag->title;
+				}
 			}
 			$formTag->name = $formInfo->name;
 
@@ -451,13 +461,11 @@ 
 					{
 						$target = $memberInfo['profile_image'];
 						$functionName = 'doDeleteProfileImage';
-					}
-					else if($formInfo->name == 'image_name')
+					} else if($formInfo->name == 'image_name')
 					{
 						$target = $memberInfo['image_name'];
 						$functionName = 'doDeleteImageName';
-					}
-					else if($formInfo->name == 'image_mark')
+					} else if($formInfo->name == 'image_mark')
 					{
 						$target = $memberInfo['image_mark'];
 						$functionName = 'doDeleteImageMark';
@@ -473,8 +481,7 @@ 
 							$functionName,
 							$memberInfo['member_srl'],
 							$lang->cmd_delete);
-					}
-					else
+					} else
 					{
 						$inputTag = sprintf('<input type="hidden" name="__%s_exist" value="false" />', $formInfo->name);
 					}
@@ -493,8 +500,7 @@ 
 							$memberInfo['birthday'],
 							zdate($memberInfo['birthday'], 'Y-m-d', false),
 							$lang->cmd_delete);
-					}
-					else if($formInfo->name == 'find_account_question')
+					} else if($formInfo->name == 'find_account_question')
 					{
 						$disabled = (!!$memberInfo['member_srl']) ? 'disabled="disabled"' : '';
 
@@ -503,8 +509,11 @@ 
 						$optionTag = array();
 						foreach($lang->find_account_question_items as $key=>$val)
 						{
-							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
-							else $selected = '';
+							if($key == $memberInfo['find_account_question']) {
+								$selected = 'selected="selected"';
+							} else {
+								$selected = '';
+							}
 							$optionTag[] = sprintf('<option value="%s" %s >%s</option>',
 								$key,
 								$selected,
@@ -517,23 +526,19 @@ 
 							$inputTag .= ' <label><input type="checkbox" name="modify_find_account_answer" value="Y" /> ' . Context::getLang('cmd_modify') . '</label>';
 							$inputTag .= '<script>(function($) {$(function() {$(\'[name=modify_find_account_answer]\').change(function() {var $this = $(this); if($this.prop(\'checked\')) {$(\'[name=find_account_question],[name=find_account_answer]\').attr(\'disabled\', false); } else {$(\'[name=find_account_question]\').attr(\'disabled\', true); $(\'[name=find_account_answer]\').attr(\'disabled\', true).val(\'\'); } }); }); })(jQuery);</script>';
 						}
-					}
-					else if($formInfo->name == 'email_address')
+					} else if($formInfo->name == 'email_address')
 					{
 						$formTag->type = 'email';
 						$inputTag = '<input type="email" name="email_address" id="email_address" value="'.$memberInfo['email_address'].'" />';
-					}
-					else if($formInfo->name == 'homepage')
+					} else if($formInfo->name == 'homepage')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="homepage" id="homepage" value="'.$memberInfo['homepage'].'" />';
-					}
-					else if($formInfo->name == 'blog')
+					} else if($formInfo->name == 'blog')
 					{
 						$formTag->type = 'url';
 						$inputTag = '<input type="url" name="blog" id="blog" value="'.$memberInfo['blog'].'" />';
-					}
-					else
+					} else
 					{
 						$formTag->type = 'text';
 						$inputTag = sprintf('<input type="text" name="%s" id="%s" value="%s" />',
@@ -552,27 +557,22 @@ 
 					if($extendForm->column_type == 'text')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'homepage')
+					} else if($extendForm->column_type == 'homepage')
 					{
 						$template = '<input type="url" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'email_address')
+					} else if($extendForm->column_type == 'email_address')
 					{
 						$template = '<input type="email" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'tel')
+					} else if($extendForm->column_type == 'tel')
 					{
 						$extentionReplace = array('tel_0' => $extendForm->value[0],
 							'tel_1' => $extendForm->value[1],
 							'tel_2' => $extendForm->value[2]);
 						$template = '<input type="tel" name="%column_name%[]" id="%column_name%" value="%tel_0%" size="4" maxlength="4" style="width:30px" title="First Number" /> - <input type="tel" name="%column_name%[]" value="%tel_1%" size="4" maxlength="4" style="width:35px" title="Second Number" /> - <input type="tel" name="%column_name%[]" value="%tel_2%" size="4" maxlength="4" style="width:35px" title="Third Number" />';
-					}
-					else if($extendForm->column_type == 'textarea')
+					} else if($extendForm->column_type == 'textarea')
 					{
 						$template = '<textarea name="%column_name%" id="%column_name%" rows="4" cols="42">%value%</textarea>';
-					}
-					else if($extendForm->column_type == 'checkbox')
+					} else if($extendForm->column_type == 'checkbox')
 					{
 						$template = '';
 						if($extendForm->default_value)
@@ -583,14 +583,15 @@ 
 							foreach($extendForm->default_value as $v)
 							{
 								$checked = '';
-								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								if(is_array($extendForm->value) && in_array($v, $extendForm->value)) {
+									$checked = 'checked="checked"';
+								}
 								$optionTag[] = '<label for="%column_name%'.$__i.'"><input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 								$__i++;
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
-					}
-					else if($extendForm->column_type == 'radio')
+					} else if($extendForm->column_type == 'radio')
 					{
 						$template = '';
 						if($extendForm->default_value)
@@ -599,14 +600,16 @@ 
 							$optionTag = array();
 							foreach($extendForm->default_value as $v)
 							{
-								if($extendForm->value == $v)$checked = 'checked="checked"';
-								else $checked = '';
+								if($extendForm->value == $v) {
+									$checked = 'checked="checked"';
+								} else {
+									$checked = '';
+								}
 								$optionTag[] = '<label><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' /> '.$v.'</label>';
 							}
 							$template = sprintf($template, implode('', $optionTag));
 						}
-					}
-					else if($extendForm->column_type == 'select')
+					} else if($extendForm->column_type == 'select')
 					{
 						$template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
 						$optionTag = array();
@@ -615,26 +618,26 @@ 
 						{
 							foreach($extendForm->default_value as $v)
 							{
-								if($v == $extendForm->value) $selected = 'selected="selected"';
-								else $selected = '';
+								if($v == $extendForm->value) {
+									$selected = 'selected="selected"';
+								} else {
+									$selected = '';
+								}
 								$optionTag[] = sprintf('<option value="%s" %s >%s</option>', $v, $selected, $v);
 							}
 						}
 						$template = sprintf($template, implode('', $optionTag));
-					}
-					else if($extendForm->column_type == 'kr_zip')
+					} else if($extendForm->column_type == 'kr_zip')
 					{
 						$krzipModel = getModel('krzip');
 						if($krzipModel && method_exists($krzipModel , 'getKrzipCodeSearchHtml' ))
 						{
 							$template = $krzipModel->getKrzipCodeSearchHtml($extendForm->column_name, $extendForm->value);
 						}
-					}
-					else if($extendForm->column_type == 'jp_zip')
+					} else if($extendForm->column_type == 'jp_zip')
 					{
 						$template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
-					}
-					else if($extendForm->column_type == 'date')
+					} else if($extendForm->column_type == 'date')
 					{
 						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), 'cmd_delete' => $lang->cmd_delete);
 						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" placeholder="YYYY-MM-DD" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="btn dateRemover" />';
@@ -643,8 +646,9 @@ 
 					$replace = array_merge($extentionReplace, $replace);
 					$inputTag = preg_replace_callback('@%(\w+)%@', function($n) use($replace) { return $replace[$n[1]]; }, $template);
 
-					if($extendForm->description)
-						$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
+					if($extendForm->description) {
+											$inputTag .= '<p class="help-block">'.$extendForm->description.'</p>';
+					}
 				}
 				$formTag->inputTag = $inputTag;
 				$formTags[] = $formTag;
@@ -679,8 +683,9 @@ 
 			$oMemberModel = getModel('member');
 			$join_form = $oMemberModel->getJoinForm($member_join_form_srl);
 
-			if(!$join_form) Context::set('member_join_form_srl','',true);
-			else
+			if(!$join_form) {
+				Context::set('member_join_form_srl','',true);
+			} else
 			{
 				Context::set('join_form', $join_form);
 				$security = new Security();

Doc Comments +1 added lines, -1 removed lines

@@ -386,7 +386,7 @@
 	/**
 	 * Get tags by the member info type 
 	 *
-	 * @param object $memberInfo
+	 * @param string $memberInfo
 	 * @param boolean $isAdmin (true : admin, false : not admin)
 	 *
 	 * @return array

modules/communication/communication.class.php

Spacing +11 added lines, -11 removed lines

@@ -29,17 +29,17 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						return TRUE;
 					}
@@ -49,7 +49,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			return TRUE;
 		}
@@ -66,21 +66,21 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
-			if(!is_object($config))
+			if (!is_object($config))
 			{
 				$config = new stdClass();
 			}
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');
@@ -92,7 +92,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			FileHandler::makeDir('./files/member_extra_info/new_message_flags');
 		}

modules/counter/counter.class.php

Spacing +6 added lines, -6 removed lines

@@ -38,14 +38,14 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isColumnExists('counter_log', 'site_srl'))
+			if (!$oDB->isColumnExists('counter_log', 'site_srl'))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
+			if (!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
 			{
 				return TRUE;
 			}
@@ -69,14 +69,14 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isColumnExists('counter_log', 'site_srl'))
+			if (!$oDB->isColumnExists('counter_log', 'site_srl'))
 			{
 				$oDB->addColumn('counter_log', 'site_srl', 'number', 11, 0, TRUE);
 			}
 
-			if(!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
+			if (!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
 			{
 				$oDB->addIndex('counter_log', 'idx_site_counter_log', array('site_srl', 'ipaddress'), FALSE);
 			}

modules/page/page.class.php

Braces +9 added lines, -3 removed lines

@@ -29,10 +29,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			$output = executeQuery('page.pageTypeOpageCheck');
-			if($output->toBool() && $output->data) return true;
+			if($output->toBool() && $output->data) {
+				return true;
+			}
 
 			$output = executeQuery('page.pageTypeNullCheck');
-			if($output->toBool() && $output->data) return true;
+			if($output->toBool() && $output->data) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -63,7 +67,9 @@ 
 					$in_out = executeQuery('page.insertPageType', $args);
 				}
 				$output = executeQuery('page.updateAllOpage');
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 
 			// old page module instance update

Spacing +14 added lines, -14 removed lines

@@ -26,13 +26,13 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$output = executeQuery('page.pageTypeOpageCheck');
-			if($output->toBool() && $output->data) return true;
+			if ($output->toBool() && $output->data) return true;
 
 			$output = executeQuery('page.pageTypeNullCheck');
-			if($output->toBool() && $output->data) return true;
+			if ($output->toBool() && $output->data) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -48,44 +48,44 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$args = new stdClass;
 			// opage module instance update
 			$output = executeQueryArray('page.pageTypeOpageCheck');
-			if($output->toBool() && count($output->data) > 0)
+			if ($output->toBool() && count($output->data) > 0)
 			{
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					$args->module_srl = $val->module_srl;
 					$args->name = 'page_type';
-					$args->value= 'OUTSIDE';
+					$args->value = 'OUTSIDE';
 					$in_out = executeQuery('page.insertPageType', $args);
 				}
 				$output = executeQuery('page.updateAllOpage');
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 
 			// old page module instance update
 			$output = executeQueryArray('page.pageTypeNullCheck');
 			$skin_update_srls = array();
-			if($output->toBool() && $output->data)
+			if ($output->toBool() && $output->data)
 			{
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					$args->module_srl = $val->module_srl;
 					$args->name = 'page_type';
-					$args->value= 'WIDGET';
+					$args->value = 'WIDGET';
 					$in_out = executeQuery('page.insertPageType', $args);
 
 					$skin_update_srls[] = $val->module_srl;
 				}
 			}
 
-			if(count($skin_update_srls)>0)
+			if (count($skin_update_srls) > 0)
 			{
 				$skin_args = new stdClass;
-				$skin_args->module_srls = implode(',',$skin_update_srls);
+				$skin_args->module_srls = implode(',', $skin_update_srls);
 				$skin_args->is_skin_fix = "Y";
 				$ouput = executeQuery('page.updateSkinFix', $skin_args);
 			}
@@ -93,7 +93,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 
 	/**