From e9973f35a33f0ad72ff2fbd74250283d0e23e375 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Fri, 25 Feb 2011 00:25:29 +0000 Subject: added list of actions carried out by administrators --- .../Application/Controllers/HistoryController.php | 25 +++++- .../Application/Controllers/LastController.php | 91 ++++++++++++++++++---- .../Controllers/ModeratorsController.php | 68 ---------------- h-source/Application/Controllers/MyController.php | 2 +- 4 files changed, 99 insertions(+), 87 deletions(-) delete mode 100644 h-source/Application/Controllers/ModeratorsController.php (limited to 'h-source/Application/Controllers') diff --git a/h-source/Application/Controllers/HistoryController.php b/h-source/Application/Controllers/HistoryController.php index ac1ab1a..e44ce79 100644 --- a/h-source/Application/Controllers/HistoryController.php +++ b/h-source/Application/Controllers/HistoryController.php @@ -23,6 +23,29 @@ if (!defined('EG')) die('Direct access not allowed!'); class HistoryController extends BaseController { + public static $typeTable = array( + 'message' => 'message', + 'talk' => 'talk', + 'user' => 'user', + 'issue' => 'issue', + 'wiki_talk' => 'wiki talk', + 'page' => 'wiki page', + 'page_del' => 'wiki page', + ); + + public static $actionTable = array( + 'hide' => 'hide', + 'show' => 'show', + 'block' => 'block', + 'unblock' => 'unblock', + 'open' => 'open', + 'close' => 'close', + 'pageblock' => 'block', + 'pageunblock' => 'unblock', + 'pagehide' => 'hide', + 'pageshow' => 'show', + ); + protected $strings = array( 'hide' => array( @@ -157,7 +180,7 @@ class HistoryController extends BaseController 'id_name' => 'id_user', 'field_name' => 'blocked', 'actions' => array('block','unblock'), - 'group' => 'moderator', + 'group' => 'admin', ), diff --git a/h-source/Application/Controllers/LastController.php b/h-source/Application/Controllers/LastController.php index 6fe66a2..2050ea7 100644 --- a/h-source/Application/Controllers/LastController.php +++ b/h-source/Application/Controllers/LastController.php @@ -34,32 +34,89 @@ class LastController extends BaseController $this->setArgKeys(array('page:forceNat'=>1)); } - - public function modifications($lang = 'en') + + protected function last($lang = 'en',$action = 'modifications') { - $this->shift(1); - - $whereClauseArray = array( - 'gr' => 'registered', - 'type' => 'hardware', - ); - - $this->helper('Pages','last/modifications/'.$this->lang,'page'); - + switch ($action) + { + case 'modifications': + $data['title'] = 'last modifications - '.Website::$generalName; + + $whereClauseArray = array( + 'gr' => 'registered', + 'type' => 'hardware', + ); + + $viewFile = 'modifications'; + + break; + case 'modactions': + $data['title'] = 'last moderations - '.Website::$generalName; + $data['viewTitle'] = 'List of actions carried out by moderators'; + $data['user_status'] = 'MODERATOR'; + + $whereClauseArray = array( + 'gr' => 'moderator', + ); + + $viewFile = 'modactions'; + + break; + case 'adminactions': + $data['title'] = 'last admin actions - '.Website::$generalName; + $data['viewTitle'] = 'List of actions carried out by administrators'; + $data['user_status'] = 'ADMINISTRATOR'; + + $whereClauseArray = array( + 'gr' => 'admin', + ); + + $viewFile = 'modactions'; + + break; + } + + $this->helper('Pages','last/'.$this->action.'/'.$this->lang,'page'); + $this->m['HistoryModel']->clear()->select()->where($whereClauseArray)->orderBy('id_history desc'); - + $recordNumber = $this->m['HistoryModel']->rowNumber(); $page = $this->viewArgs['page']; - + $this->m['HistoryModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,30); - + $data['table'] = $this->m['HistoryModel']->send(); - + $data['pageList'] = $this->h['Pages']->render($page-5,11); - + $this->append($data); - $this->load('modifications'); + $this->load($viewFile); $this->right(); } + public function modifications($lang = 'en') + { + $this->shift(1); + + $this->last($lang = 'en','modifications'); + } + + public function modactions($lang = 'en') + { + $this->shift(1); + + $this->s['registered']->check('moderator'); + + $this->last($lang = 'en','modactions'); + } + + public function adminactions($lang = 'en') + { + $this->shift(1); + + $this->s['registered']->check('admin'); + + $this->last($lang = 'en','adminactions'); + } + } \ No newline at end of file diff --git a/h-source/Application/Controllers/ModeratorsController.php b/h-source/Application/Controllers/ModeratorsController.php deleted file mode 100644 index 2f4123f..0000000 --- a/h-source/Application/Controllers/ModeratorsController.php +++ /dev/null @@ -1,68 +0,0 @@ -. - -if (!defined('EG')) die('Direct access not allowed!'); - -class ModeratorsController extends BaseController -{ - - public function __construct($model, $controller, $queryString) - { - parent::__construct($model, $controller, $queryString); - - $this->model('HistoryModel'); - - $this->modelName = 'HistoryModel'; - - $data['title'] = 'moderators page - '.Website::$generalName; - $this->append($data); - - $this->setArgKeys(array('page:forceNat'=>1)); - } - - public function actions($lang = 'en') - { - $this->shift(1); - - $this->s['registered']->check('moderator'); - - $whereClauseArray = array( - 'gr' => 'moderator', - ); - - $this->helper('Pages','moderators/actions/'.$this->lang,'page'); - - $this->m['HistoryModel']->clear()->select()->where($whereClauseArray)->orderBy('id_history desc'); - - $recordNumber = $this->m['HistoryModel']->rowNumber(); - $page = $this->viewArgs['page']; - - $this->m['HistoryModel']->limit = $this->h['Pages']->getLimit($page,$recordNumber,30); - - $data['table'] = $this->m['HistoryModel']->send(); - - $data['pageList'] = $this->h['Pages']->render($page-4,8); - - $this->append($data); - $this->load('index'); - $this->right(); - } - -} \ No newline at end of file diff --git a/h-source/Application/Controllers/MyController.php b/h-source/Application/Controllers/MyController.php index d1e346c..69b8da7 100644 --- a/h-source/Application/Controllers/MyController.php +++ b/h-source/Application/Controllers/MyController.php @@ -50,7 +50,7 @@ class MyController extends BaseController $clean['id_user'] = (int)$this->s['registered']->status['id_user']; $data['username'] = $this->m['UsersModel']->getUser($clean['id_user']); - $data['isBlocked'] = $this->m['UsersModel']->isBlocked($clean['id_user']); + $data['userBlocked'] = $this->m['UsersModel']->isBlocked($clean['id_user']); $this->append($data); $this->load('panel'); -- cgit v1.2.3