Merge branch 'master' of disposed.de:scattport

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');
 	}
 
 	/**

application/controllers/admin/programs.php

@@ -1,19 +1,42 @@
 <?php
+/*
+ * Copyright (c) 2011 Eike Foken <kontakt@eikefoken.de>
+ *
+ * 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 <kontakt@eikefoken.de>
  */
-class Programs extends CI_Controller {
+class Programs extends Admin_Controller {
 
 	/**
 	 * Calls the parent constructor.
 	 */
 	public function __construct() {
 		parent::__construct();
-		$this->load->library('form_validation');
 		$this->load->model('program');
 		$this->load->model('parameter');
+		$this->load->library('form_validation');
 	}
 
 	/**
@@ -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);
 	}
+}
 
-}
+/* End of file programs.php */
+/* Location: ./application/controllers/admin/programs.php */

application/controllers/admin/servers.php

@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Copyright (c) 2011 Karsten Heiken <karsten@disposed.de>
  *
@@ -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 <karsten@disposed.de>
  */
-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);
 	}
 
-}
+}
+
+/* End of file servers.php */
+/* Location: ./application/controllers/admin/servers.php */

application/controllers/admin/users.php

@@ -1,20 +1,41 @@
 <?php
+/*
+ * Copyright (c) 2011 Eike Foken <kontakt@eikefoken.de>
+ *
+ * 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 <kontakt@eikefoken.de>
- *
  */
-class Users extends CI_Controller {
+class Users extends Admin_Controller {
 
 	/**
 	 * Constructor.
 	 */
 	public function __construct() {
 		parent::__construct();
-		$this->load->library('form_validation');
 		$this->load->model('user');
+		$this->load->library('form_validation');
 	}
 
 	/**
@@ -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 */