xpressengine / xe-core

modules/trash/trash.admin.controller.php

Spacing +31 added lines, -31 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	function insertTrash($obj)
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -27,8 +27,8 @@ 
 		$oTrashVO = new TrashVO();
 		$oTrashVO = &$obj;
 
-		if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
-		if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		if (!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
+		if (!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
 		$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
 		$oTrashVO->setRemoverSrl($logged_info->member_srl);
 		$oTrashVO->setRegdate(date('YmdHis'));
@@ -49,17 +49,17 @@ 
 		$tmpTrashSrls = Context::get('cart');
 
 		$trashSrls = array();
-		if($isAll != 'true')
+		if ($isAll != 'true')
 		{
-			if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
+			if (is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
 			else $trashSrls = explode('|@|', $tmpTrashSrls);
 		}
 
 		//module relation data delete...
 		$output = $this->_relationDataDelete($isAll, $trashSrls);
-		if(!$output->toBool()) return new BaseObject(-1, $output->message);
+		if (!$output->toBool()) return new BaseObject(-1, $output->message);
 
-		if(!$this->_emptyTrash($trashSrls)) return new BaseObject(-1, $lang->fail_empty);
+		if (!$this->_emptyTrash($trashSrls)) return new BaseObject(-1, $lang->fail_empty);
 
 		$this->setMessage('success_deleted', 'info');
 
@@ -76,17 +76,17 @@ 
 	function _relationDataDelete($isAll, &$trashSrls)
 	{
 		$oTrashModel = getModel('trash');
-		if($isAll == 'true')
+		if ($isAll == 'true')
 		{
 			$output = $oTrashModel->getTrashAllList(array());
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return new BaseObject(-1, $output->message);
 			}
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $value)
+				foreach ($output->data as $value)
 				{
 					$trashSrls[] = $value->getTrashSrl();
 				}
@@ -97,29 +97,29 @@ 
 			$args = new stdClass();
 			$args->trashSrl = $trashSrls;
 			$output = $oTrashModel->getTrashList($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return new BaseObject(-1, $output->message);
 			}
 		}
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $oTrashVO)
+			foreach ($output->data as $oTrashVO)
 			{
 				//class file check
 				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if (!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if (!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
 
 				$oAdminController = getAdminController($oTrashVO->getOriginModule());
-				if(!method_exists($oAdminController, 'emptyTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if (!method_exists($oAdminController, 'emptyTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
 
 				$output2 = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
-				if(!$output2->toBool()) return new BaseObject(-1, $output2->message);
+				if (!$output2->toBool()) return new BaseObject(-1, $output2->message);
 			}
 		}
 		return new BaseObject(0, $lang->success_deleted);
@@ -134,33 +134,33 @@ 
 		global $lang;
 		$trashSrlList = Context::get('cart');
 
-		if(is_array($trashSrlList))
+		if (is_array($trashSrlList))
 		{
 			// begin transaction
 			$oDB = &DB::getInstance();
 			$oDB->begin();
 			// eache restore method call in each classfile
-			foreach($trashSrlList as $value)
+			foreach ($trashSrlList as $value)
 			{
 				$oTrashModel = getModel('trash');
 				$output = $oTrashModel->getTrash($value);
-				if(!$output->toBool()) return new BaseObject(-1, $output->message);
+				if (!$output->toBool()) return new BaseObject(-1, $output->message);
 
 				//class file check
 				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if (!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if (!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
 
 				$oAdminController = getAdminController($output->data->getOriginModule());
-				if(!method_exists($oAdminController, 'restoreTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if (!method_exists($oAdminController, 'restoreTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
 
 				$originObject = unserialize($output->data->getSerializedObject());
 				$output = $oAdminController->restoreTrash($originObject);
 
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return new BaseObject(-1, $output->message);
@@ -168,7 +168,7 @@ 
 			}
 
 			// restore object delete in trash box
-			if(!$this->_emptyTrash($trashSrlList)) {
+			if (!$this->_emptyTrash($trashSrlList)) {
 				$oDB->rollback();
 				return new BaseObject(-1, $lang->fail_empty);
 			}
@@ -187,11 +187,11 @@ 
 	 */
 	function procTrashAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$trashSrls = Context::get('trash_srls');
-		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+		if ($trashSrls) $trashSrlList = explode(',', $trashSrls);
 
-		if(count($trashSrlList) > 0)
+		if (count($trashSrlList) > 0)
 		{
 			$oTrashModel = getModel('trash');
 			$args = new stdClass();
@@ -218,11 +218,11 @@ 
 	 */
 	function _emptyTrash($trashSrls)
 	{
-		if(!is_array($trashSrls)) return false;
+		if (!is_array($trashSrls)) return false;
 		$args = new stdClass();
 		$args->trashSrls = $trashSrls;
 		$output = executeQuery('trash.deleteTrash', $args);
-		if(!$output->toBool()) return false;
+		if (!$output->toBool()) return false;
 
 		return true;
 	}

Braces +55 added lines, -22 removed lines

@@ -27,8 +27,12 @@ 
 		$oTrashVO = new TrashVO();
 		$oTrashVO = &$obj;
 
-		if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
-		if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		if(!$oTrashVO->getTrashSrl()) {
+			$oTrashVO->setTrashSrl(getNextSequence());
+		}
+		if(!is_string($oTrashVO->getSerializedObject())) {
+			$oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		}
 		$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
 		$oTrashVO->setRemoverSrl($logged_info->member_srl);
 		$oTrashVO->setRegdate(date('YmdHis'));
@@ -51,15 +55,22 @@ 
 		$trashSrls = array();
 		if($isAll != 'true')
 		{
-			if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
-			else $trashSrls = explode('|@|', $tmpTrashSrls);
+			if(is_array($tmpTrashSrls)) {
+				$trashSrls = $tmpTrashSrls;
+			} else {
+				$trashSrls = explode('|@|', $tmpTrashSrls);
+			}
 		}
 
 		//module relation data delete...
 		$output = $this->_relationDataDelete($isAll, $trashSrls);
-		if(!$output->toBool()) return new BaseObject(-1, $output->message);
+		if(!$output->toBool()) {
+			return new BaseObject(-1, $output->message);
+		}
 
-		if(!$this->_emptyTrash($trashSrls)) return new BaseObject(-1, $lang->fail_empty);
+		if(!$this->_emptyTrash($trashSrls)) {
+			return new BaseObject(-1, $lang->fail_empty);
+		}
 
 		$this->setMessage('success_deleted', 'info');
 
@@ -91,8 +102,7 @@ 
 					$trashSrls[] = $value->getTrashSrl();
 				}
 			}
-		}
-		else
+		} else
 		{
 			$args = new stdClass();
 			$args->trashSrl = $trashSrls;
@@ -109,17 +119,25 @@ 
 			{
 				//class file check
 				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if(!is_dir(FileHandler::getRealPath($classPath))) {
+					return new BaseObject(-1, 'not exist restore module directory');
+				}
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if(!file_exists($classFile)) {
+					return new BaseObject(-1, 'not exist restore module class file');
+				}
 
 				$oAdminController = getAdminController($oTrashVO->getOriginModule());
-				if(!method_exists($oAdminController, 'emptyTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if(!method_exists($oAdminController, 'emptyTrash')) {
+					return new BaseObject(-1, 'not exist restore method in module class file');
+				}
 
 				$output2 = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
-				if(!$output2->toBool()) return new BaseObject(-1, $output2->message);
+				if(!$output2->toBool()) {
+					return new BaseObject(-1, $output2->message);
+				}
 			}
 		}
 		return new BaseObject(0, $lang->success_deleted);
@@ -144,18 +162,26 @@ 
 			{
 				$oTrashModel = getModel('trash');
 				$output = $oTrashModel->getTrash($value);
-				if(!$output->toBool()) return new BaseObject(-1, $output->message);
+				if(!$output->toBool()) {
+					return new BaseObject(-1, $output->message);
+				}
 
 				//class file check
 				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if(!is_dir(FileHandler::getRealPath($classPath))) {
+					return new BaseObject(-1, 'not exist restore module directory');
+				}
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if(!file_exists($classFile)) {
+					return new BaseObject(-1, 'not exist restore module class file');
+				}
 
 				$oAdminController = getAdminController($output->data->getOriginModule());
-				if(!method_exists($oAdminController, 'restoreTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if(!method_exists($oAdminController, 'restoreTrash')) {
+					return new BaseObject(-1, 'not exist restore method in module class file');
+				}
 
 				$originObject = unserialize($output->data->getSerializedObject());
 				$output = $oAdminController->restoreTrash($originObject);
@@ -187,9 +213,13 @@ 
 	 */
 	function procTrashAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$trashSrls = Context::get('trash_srls');
-		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+		if($trashSrls) {
+			$trashSrlList = explode(',', $trashSrls);
+		}
 
 		if(count($trashSrlList) > 0)
 		{
@@ -198,8 +228,7 @@ 
 			$args->trashSrl = $trashSrlList;
 			$output = $oTrashModel->getTrashList($args);
 			$trashList = $output->data;
-		}
-		else
+		} else
 		{
 			global $lang;
 			$trashList = array();
@@ -218,11 +247,15 @@ 
 	 */
 	function _emptyTrash($trashSrls)
 	{
-		if(!is_array($trashSrls)) return false;
+		if(!is_array($trashSrls)) {
+			return false;
+		}
 		$args = new stdClass();
 		$args->trashSrls = $trashSrls;
 		$output = executeQuery('trash.deleteTrash', $args);
-		if(!$output->toBool()) return false;
+		if(!$output->toBool()) {
+			return false;
+		}
 
 		return true;
 	}

modules/trash/trash.admin.view.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
-		$template_path = sprintf("%stpl/",$this->module_path);
+		$template_path = sprintf("%stpl/", $this->module_path);
 		$this->setTemplatePath($template_path);
 	}
 
@@ -51,20 +51,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $oTrashVO)
+		foreach ($output->data as $oTrashVO)
 		{
 			$mod_srls[] = $oTrashVO->unserializedObject['module_srl'];
 		}
 		$mod_srls = array_unique($mod_srls);
 		// Module List
 		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
+		if ($mod_srls_count)
 		{
 			$columnList = array('module_srl', 'mid', 'browser_title');
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
+			if ($module_output && is_array($module_output))
 			{
-				foreach($module_output as $module)
+				foreach ($module_output as $module)
 				{
 					$module_list[$module->module_srl] = $module;
 				}
@@ -86,13 +86,13 @@ 
 
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrash($trash_srl);
-		if(!$output->data->getTrashSrl()) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$output->data->getTrashSrl()) return new BaseObject(-1, 'msg_invalid_request');
 
 		$originObject = unserialize($output->data->getSerializedObject());
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
-		Context::set('oTrashVO',$output->data);
-		Context::set('oOrigin',$originObject);
+		Context::set('oTrashVO', $output->data);
+		Context::set('oOrigin', $originObject);
 
 		$oMemberModel = &getModel('member');
 		$remover_info = $oMemberModel->getMemberInfoByMemberSrl($output->data->getRemoverSrl());
@@ -102,11 +102,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($originObject->module_srl);
 		Context::set('module_info', $module_info);
 
-		if($originObject) {
+		if ($originObject) {
 			$args_extra->module_srl = $originObject->module_srl;
 			$args_extra->document_srl = $originObject->document_srl;
 			$output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra);				
-			Context::set('oOriginExtraVars',$output_extra->data);
+			Context::set('oOriginExtraVars', $output_extra->data);
 		}
 		$this->setTemplateFile('trash_view');
 	}

Braces +6 added lines, -2 removed lines

@@ -86,10 +86,14 @@
 
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrash($trash_srl);
-		if(!$output->data->getTrashSrl()) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$output->data->getTrashSrl()) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$originObject = unserialize($output->data->getSerializedObject());
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if(is_array($originObject)) {
+			$originObject = (object)$originObject;
+		}
 
 		Context::set('oTrashVO',$output->data);
 		Context::set('oOrigin',$originObject);

modules/trash/trash.class.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		//$oDB = &DB::getInstance();
 		//$oModuleModel = getModel('module');
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 }
 /* End of file trash.class.php */