merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -1,15 +1,19 @@
<?php
/**
* @class documentController
* trashAdminController class
* trash admin the module's controller class
*
* @author NHN (developers@xpressengine.com)
* @brief document the module's controller class
**/
* @package /modules/trash
* @version 0.1
*/
class trashAdminController extends trash
{
/**
* @brief object insert to trash
* @param $obj : TrashVO type object
**/
* object insert to trash
* @param TrashVO $obj
* @return Object
*/
function insertTrash($obj)
{
if(Context::get('is_logged'))
@ -32,9 +36,10 @@ class trashAdminController extends trash
}
/**
* @brief empty trash
* @param trashSrls : trash_srl in array
**/
* Empty trash
* @param array trashSrls
* @return Object
*/
function procTrashAdminEmptyTrash()
{
global $lang;
@ -51,17 +56,17 @@ class trashAdminController extends trash
if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty);
$this->setMessage('success_deleted', 'info');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
$this->setRedirectUrl($returnUrl);
return;
}
return new Object(0, $lang->success_empty);
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
return $this->setRedirectUrl($returnUrl, $output);
}
/**
* @brief empty trash - private method
**/
* Empty trash - private method
* @param string $isAll
* @param array trashSrls
* @return Object
*/
function _relationDataDelete($isAll, &$trashSrls)
{
if($isAll == 'true') $trashSrls = array();
@ -95,8 +100,9 @@ class trashAdminController extends trash
}
/**
* @brief restore content object
**/
* Restore content object
* @return void|Object
*/
function procTrashAdminRestore()
{
global $lang;
@ -143,13 +149,15 @@ class trashAdminController extends trash
}
$this->setMessage('success_restore', 'info');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
$this->setRedirectUrl($returnUrl);
return;
}
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
$this->setRedirectUrl($returnUrl);
}
/**
* Set trash list to Context
* @return void|Object
*/
function procTrashAdminGetList()
{
if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
@ -173,9 +181,10 @@ class trashAdminController extends trash
}
/**
* @brief empty trash
* @param trashSrls : trash_srl in array
**/
* empty trash
* @param array trashSrls
* @return bool
*/
function _emptyTrash($trashSrls)
{
if(!is_array($trashSrls)) return false;