From 9222c2678db35539bfd00178d3d42e3d7097d10e Mon Sep 17 00:00:00 2001 From: Eike Foken Date: Thu, 18 Aug 2011 15:57:43 +0200 Subject: [PATCH 1/2] Clean-up and use the new admin controller --- application/controllers/admin/programs.php | 31 +++++++++++++++++++--- application/controllers/admin/servers.php | 14 +++++----- application/controllers/admin/users.php | 30 +++++++++++++++++---- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/application/controllers/admin/programs.php b/application/controllers/admin/programs.php index f613959..fc19bfb 100644 --- a/application/controllers/admin/programs.php +++ b/application/controllers/admin/programs.php @@ -1,10 +1,33 @@ + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +require_once APPPATH . 'core/Admin_Controller.php'; /** + * Program management. * * @author Eike Foken */ -class Programs extends CI_Controller { +class Programs extends Admin_Controller { /** * Calls the parent constructor. @@ -32,7 +55,7 @@ class Programs extends CI_Controller { public function edit($id = '') { $program = $this->program->getByID($id); - if (!isset($program) || !is_array($program)){ + if (empty($id) || !isset($program['id'])){ show_404(); } @@ -48,5 +71,7 @@ class Programs extends CI_Controller { $this->load->view('admin/programs/edit', $data); } +} -} \ No newline at end of file +/* End of file programs.php */ +/* Location: ./application/controllers/admin/programs.php */ diff --git a/application/controllers/admin/servers.php b/application/controllers/admin/servers.php index 6379f84..8fd2ef7 100644 --- a/application/controllers/admin/servers.php +++ b/application/controllers/admin/servers.php @@ -1,5 +1,4 @@ * @@ -21,20 +20,20 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +require_once APPPATH . 'core/Admin_Controller.php'; /** * Server management. - * + * * @author Karsten Heiken */ -class Servers extends CI_Controller { +class Servers extends Admin_Controller { /** * Constructor. */ function __construct() { parent::__construct(); - $this->load->model('server'); } @@ -49,7 +48,7 @@ class Servers extends CI_Controller { /** * Retrieve details of a server. - * + * * @param type $server_id */ function detail($server_id) { @@ -58,4 +57,7 @@ class Servers extends CI_Controller { $this->load->view('admin/server/detail', $tpl); } -} \ No newline at end of file +} + +/* End of file servers.php */ +/* Location: ./application/controllers/admin/servers.php */ diff --git a/application/controllers/admin/users.php b/application/controllers/admin/users.php index 43e568e..174e49c 100644 --- a/application/controllers/admin/users.php +++ b/application/controllers/admin/users.php @@ -1,12 +1,33 @@ + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +require_once APPPATH . 'core/Admin_Controller.php'; /** - * Controller for users. + * User management. * * @author Eike Foken - * */ -class Users extends CI_Controller { +class Users extends Admin_Controller { /** * Constructor. @@ -94,8 +115,7 @@ class Users extends CI_Controller { redirect('admin/users', 303); } } - } /* End of file users.php */ -/* Location: ./application/constrollers/users.php */ +/* Location: ./application/constrollers/admin/users.php */ From 574fc9cd205799c88dbc0ad4da2487d255b8a8b3 Mon Sep 17 00:00:00 2001 From: Eike Foken Date: Thu, 18 Aug 2011 16:00:18 +0200 Subject: [PATCH 2/2] Forgot to include form_validation library --- application/controllers/admin/parameters.php | 1 + application/controllers/admin/programs.php | 2 +- application/controllers/admin/users.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/application/controllers/admin/parameters.php b/application/controllers/admin/parameters.php index ca4289f..affb569 100644 --- a/application/controllers/admin/parameters.php +++ b/application/controllers/admin/parameters.php @@ -35,6 +35,7 @@ class Parameters extends Admin_Controller { parent::__construct(); $this->load->model('parameter'); $this->load->model('program'); + $this->load->library('form_validation'); } /** diff --git a/application/controllers/admin/programs.php b/application/controllers/admin/programs.php index fc19bfb..87461ae 100644 --- a/application/controllers/admin/programs.php +++ b/application/controllers/admin/programs.php @@ -34,9 +34,9 @@ class Programs extends Admin_Controller { */ public function __construct() { parent::__construct(); - $this->load->library('form_validation'); $this->load->model('program'); $this->load->model('parameter'); + $this->load->library('form_validation'); } /** diff --git a/application/controllers/admin/users.php b/application/controllers/admin/users.php index 174e49c..6ed1de9 100644 --- a/application/controllers/admin/users.php +++ b/application/controllers/admin/users.php @@ -34,8 +34,8 @@ class Users extends Admin_Controller { */ public function __construct() { parent::__construct(); - $this->load->library('form_validation'); $this->load->model('user'); + $this->load->library('form_validation'); } /**