diff --git a/app/Controller/BlacklistsController.php b/app/Controller/BlacklistsController.php
index efe12ab58..44a7dc973 100644
--- a/app/Controller/BlacklistsController.php
+++ b/app/Controller/BlacklistsController.php
@@ -10,6 +10,7 @@ App::uses('AppController', 'Controller');
class BlacklistsController extends AppController {
public $XXXcomponents = array('Security', 'RequestHandler');
+
public $components = array(
'Auth' => array(
'authorize' => array(
diff --git a/app/Controller/RegexpController.php b/app/Controller/RegexpController.php
index f3b3d9a24..f71720190 100755
--- a/app/Controller/RegexpController.php
+++ b/app/Controller/RegexpController.php
@@ -86,7 +86,6 @@ class RegexpController extends AppController {
$this->set('list', Sanitize::clean($this->paginate()));
}
-
/**
*
*/
diff --git a/app/Controller/RolesController.php b/app/Controller/RolesController.php
index e636033df..0f8f4a1a9 100755
--- a/app/Controller/RolesController.php
+++ b/app/Controller/RolesController.php
@@ -40,6 +40,8 @@ class RolesController extends AppController {
*
* @param string $id
* @return void
+ *
+ * @throws NotFoundException
*/
public function view($id = null) {
$this->Role->id = $id;
diff --git a/app/Controller/WhitelistsController.php b/app/Controller/WhitelistsController.php
index 98f679915..f271fbde8 100755
--- a/app/Controller/WhitelistsController.php
+++ b/app/Controller/WhitelistsController.php
@@ -84,13 +84,14 @@ class WhitelistsController extends AppController {
if($this->Auth->User['User']['org'] != 'ADMIN') $this->redirect(array('controller' => 'blaclists', 'action' => 'index', 'admin' => false));
$this->AdminCrud->adminDelete($id);
}
+
/**
* index method
*
* @return void
*/
-public function index() {
- $this->recursive = 0;
- $this->set('list', Sanitize::clean($this->paginate()));
+ public function index() {
+ $this->recursive = 0;
+ $this->set('list', Sanitize::clean($this->paginate()));
}
}
\ No newline at end of file
diff --git a/app/View/Elements/actions_menu.ctp b/app/View/Elements/actions_menu.ctp
index 61e4b5ab3..74214d82e 100755
--- a/app/View/Elements/actions_menu.ctp
+++ b/app/View/Elements/actions_menu.ctp
@@ -1,76 +1,76 @@
-
Html->link(__('New Event', true), array('controller' => 'events', 'action' => 'add')); ?>
- Html->link(__('List Events', true), array('controller' => 'events', 'action' => 'index')); ?>
- Html->link(__('List Attributes', true), array('controller' => 'attributes', 'action' => 'index')); ?>
- Html->link(__('Search Attributes', true), array('controller' => 'attributes', 'action' => 'search')); ?>
- Html->link(__('Export', true), array('controller' => 'events', 'action' => 'export')); ?>
-
-
-
- Html->link(__('News', true), array('controller' => 'users', 'action' => 'news')); ?>
- Html->link(__('My Profile', true), array('controller' => 'users', 'action' => 'view', 'me')); ?>
- Html->link(__('Members List', true), array('controller' => 'users', 'action' => 'memberslist')); ?>
- Html->link(__('User Guide', true), array('controller' => 'pages', 'action' => 'display', 'documentation')); ?>
- Html->link(__('Terms & Conditions', true), array('controller' => 'users', 'action' => 'terms')); ?>
- Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout')); ?>
-
-
-
-
- Html->link(__('List Servers'), array('controller' => 'servers', 'action' => 'index'));?>
-
-
-
-
-
-
- Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index', 'admin' => true)); ?>
- Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index', 'admin' => true)); ?>
- Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index', 'admin' => true)); ?>
-
- Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?>
- Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?>
- Html->link(__('New Role', true), array('controller' => 'roles', 'action' => 'add', 'admin' => true)); ?>
- Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index', 'admin' => true)); ?>
-
-
-
-
-
-
- Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?>
- Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?>
- Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?>
-
- Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?>
- Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?>
- Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index')); ?>
-
-
-
-
-
-
- Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?>
- Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?>
- Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?>
-
-
-
-
- Html->link(__('List Logs', true), array('controller' => 'logs', 'action' => 'index', 'admin' => true)); ?>
- Html->link(__('Search Logs', true), array('controller' => 'logs', 'action' => 'admin_search', 'admin' => true)); ?>
- Html->link(__('New Event', true), array('controller' => 'events', 'action' => 'add')); ?>
+ Html->link(__('List Events', true), array('controller' => 'events', 'action' => 'index')); ?>
+ Html->link(__('List Attributes', true), array('controller' => 'attributes', 'action' => 'index')); ?>
+ Html->link(__('Search Attributes', true), array('controller' => 'attributes', 'action' => 'search')); ?>
+ Html->link(__('Export', true), array('controller' => 'events', 'action' => 'export')); ?>
+
+
+
+ Html->link(__('News', true), array('controller' => 'users', 'action' => 'news')); ?>
+ Html->link(__('My Profile', true), array('controller' => 'users', 'action' => 'view', 'me')); ?>
+ Html->link(__('Members List', true), array('controller' => 'users', 'action' => 'memberslist')); ?>
+ Html->link(__('User Guide', true), array('controller' => 'pages', 'action' => 'display', 'documentation')); ?>
+ Html->link(__('Terms & Conditions', true), array('controller' => 'users', 'action' => 'terms')); ?>
+ Html->link(__('Log out', true), array('controller' => 'users', 'action' => 'logout')); ?>
+
+
+
+
+ Html->link(__('List Servers'), array('controller' => 'servers', 'action' => 'index'));?>
+
+
+
+
+
+
+ Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index', 'admin' => true)); ?>
+ Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index', 'admin' => true)); ?>
+ Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index', 'admin' => true)); ?>
+
+ Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?>
+ Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?>
+ Html->link(__('New Role', true), array('controller' => 'roles', 'action' => 'add', 'admin' => true)); ?>
+ Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index', 'admin' => true)); ?>
+
+
+
+
+
+
+ Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?>
+ Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?>
+ Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?>
+
+ Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add', 'admin' => true)); ?>
+ Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index', 'admin' => true)); ?>
+ Html->link(__('List Roles', true), array('controller' => 'roles', 'action' => 'index')); ?>
+
+
+
+
+
+
+ Html->link(__('Import Blacklist', true), array('controller' => 'blacklists', 'action' => 'index')); ?>
+ Html->link(__('Import Regexp', true), array('controller' => 'regexp', 'action' => 'index')); ?>
+ Html->link(__('Signature Whitelist', true), array('controller' => 'whitelists', 'action' => 'index')); ?>
+
+
+
+
+ Html->link(__('List Logs', true), array('controller' => 'logs', 'action' => 'index', 'admin' => true)); ?>
+ Html->link(__('Search Logs', true), array('controller' => 'logs', 'action' => 'admin_search', 'admin' => true)); ?>
+
-Form->create('Log');?>
-
-Form->end(__('Search', true));?>
-
-
-
- element('actions_menu'); ?>
-
-
-
+
+Form->create('Log');?>
+
+Form->end(__('Search', true));?>
+
+
+
+ element('actions_menu'); ?>
+
+
+
Js->writeBuffer();
\ No newline at end of file