fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-25 06:09:55 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3 (~r10943)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

63
modules/trash/trash.admin.controller.php
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;

21
modules/trash/trash.admin.view.php
View file

@ -1,15 +1,17 @@
<?php
/**
* @class trashView
* trashAdminView class
* Admin view class of the trash module
*
* @author NHN (developers@xpressengine.com)
* @brief View class of the module trash
**/
* @package /modules/trash
* @version 0.1
*/
class trashAdminView extends trash {
/**
* @brief Initialization
**/
* Initialization
* @return void
*/
function init() {
// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
$template_path = sprintf("%stpl/",$this->module_path);
@ -17,8 +19,9 @@ class trashAdminView extends trash {
}
/**
* @brief trash list
**/
* Trash list
* @return void
*/
function dispTrashAdminList() {
$args->page = Context::get('page'); // /< Page
$args->list_count = 30; // /< the number of posts to display on a single page

24
modules/trash/trash.class.php
View file

@ -1,23 +1,28 @@
<?php
/**
* @class document
* trash class
* trash the module's high class
*
* @author NHN (developers@xpressengine.com)
* @brief document the module's high class
**/
* @package /modules/trash
* @version 0.1
*/
require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
class trash extends ModuleObject {
/**
* @brief Implement if additional tasks are necessary when installing
**/
* Implement if additional tasks are necessary when installing
* @return Object
*/
function moduleInstall() {
return new Object();
}
/**
* @brief a method to check if successfully installed
**/
* A method to check if successfully installed
* @return bool
*/
function checkUpdate() {
//$oDB = &DB::getInstance();
//$oModuleModel = &getModel('module');
@ -26,8 +31,9 @@ class trash extends ModuleObject {
}
/**
* @brief Execute update
**/
* Execute update
* @return Object
*/
function moduleUpdate() {
//$oDB = &DB::getInstance();
//$oModuleModel = &getModel('module');

9
modules/trash/trash.controller.php
View file

@ -1,9 +1,12 @@
<?php
/**
* @class documentController
* trashController
* trash the module's controller class
*
* @author NHN (developers@xpressengine.com)
* @brief document the module's controller class
**/
* @package /modules/trash
* @version 0.1
*/
class trashController extends trash
{
}

30
modules/trash/trash.model.php
View file

@ -1,10 +1,20 @@
<?php
/**
* trashModel class
* trash the module's model class
*
* @author NHN (developers@xpressengine.com)
* @package /modules/trash
* @version 0.1
*/
class trashModel extends trash
{
/**
* @brief get one trash object
**/
* Get one trash object
* @param int $trashSrl
* @pram array $columnList
* @return TrashVO
*/
function getTrash($trashSrl, $columnList = array())
{
$oTrashVO = new TrashVO();
@ -20,8 +30,11 @@ class trashModel extends trash
}
/**
* @brief get trash object list
**/
* Get TrashVO list
* @param object $args
* @param array $columnList
* @return object
*/
function getTrashList($args, $columnList = array())
{
$output = executeQueryArray('trash.getTrashList', $args, $columnList);
@ -39,8 +52,11 @@ class trashModel extends trash
}
/**
* @brief set trash object from std object
**/
* Set trash object from std object
* @param TrashVO $oTrashVO
* @param object $stdObject
* @return void
*/
function _setTrashObject(&$oTrashVO, $stdObject)
{
$oTrashVO->setTrashSrl($stdObject->trash_srl);

16
modules/trash/trash.view.php
View file

@ -1,15 +1,17 @@
<?php
/**
* @class trashView
* trashView class
* View class of the module trash
*
* @author NHN (developers@xpressengine.com)
* @brief View class of the module trash
**/
* @package /modules/trash
* @version 0.1
*/
class trashView extends trash {
/**
* @brief Initialization
**/
* Initialization
* @return void
*/
function init() {
}
}