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,17 @@
<?php
/**
* @class adminAdminController
* @author NHN (developers@xpressengine.com)
* @brief admin controller class of admin module
**/
/**
* adminloggingController class
* controller class of adminlogging module
*
* @author NHN (developers@xpressengine.com)
* @package /modules/adminlogging
* @version 0.1
*/
class adminloggingController extends adminlogging {
/**
* @brief initialization
* @return none
**/
/**
* Initialization
* @return void
*/
function init() {
// forbit access if the user is not an administrator
$oMemberModel = &getModel('member');
@ -17,6 +19,10 @@
if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
}
/**
* Insert log
* @return void
*/
function insertLog($module, $act)
{
if(!$module || !$act) return;