summaryrefslogtreecommitdiffstats
path: root/application/modules/dev/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules/dev/controllers')
-rw-r--r--application/modules/dev/controllers/AuthController.php4
-rw-r--r--application/modules/dev/controllers/BootisoController.php10
-rw-r--r--application/modules/dev/controllers/BootmenuController.php16
-rw-r--r--application/modules/dev/controllers/BootosController.php10
-rw-r--r--application/modules/dev/controllers/ClientController.php6
-rw-r--r--application/modules/dev/controllers/ConfigController.php10
-rw-r--r--application/modules/dev/controllers/FilterController.php17
-rw-r--r--application/modules/dev/controllers/GroupController.php2
-rw-r--r--application/modules/dev/controllers/PersonController.php4
-rw-r--r--application/modules/dev/controllers/PoolController.php10
-rw-r--r--application/modules/dev/controllers/RoleController.php2
-rw-r--r--application/modules/dev/controllers/SessionController.php6
12 files changed, 47 insertions, 50 deletions
diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php
index 32783c9..49640c0 100644
--- a/application/modules/dev/controllers/AuthController.php
+++ b/application/modules/dev/controllers/AuthController.php
@@ -54,7 +54,7 @@ class dev_AuthController extends Zend_Controller_Action
$date = new DateTime();
$person->setLogindate($date->getTimestamp());
$this->personmapper->save($person);
- $this->_redirect('/');
+ $this->_redirect('/dev/');
return;
} else {
echo "Wrong Email or Password.";
@@ -96,7 +96,7 @@ class dev_AuthController extends Zend_Controller_Action
return;
}
echo "Successfully registered. <br/>";
- echo "Continue to Login: <a href=\""."/auth/login"."\">Login</a>";
+ echo "Continue to Login: <a href=\""."/dev/auth/login"."\">Login</a>";
$this->_helper->redirector('login', 'auth');
return;
}
diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php
index 770271d..2b0e624 100644
--- a/application/modules/dev/controllers/BootisoController.php
+++ b/application/modules/dev/controllers/BootisoController.php
@@ -49,7 +49,7 @@ class dev_BootisoController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootiso');
+ $this->_redirect('/dev/bootiso');
}
}
@@ -64,7 +64,7 @@ class dev_BootisoController extends Zend_Controller_Action
if (!isset($_POST["editbootiso"])){
$bootisoID = $this->_request->getParam('bootisoID');
if (!isset($bootisoID) || !is_numeric($bootisoID)){
- $this->_redirect('/bootiso');
+ $this->_redirect('/dev/bootiso');
} else {
$bootiso = new Application_Model_BootIso();
$bootisomapper = new Application_Model_BootIsoMapper();
@@ -92,7 +92,7 @@ class dev_BootisoController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootiso');
+ $this->_redirect('/dev/bootiso');
}
}
@@ -104,14 +104,14 @@ class dev_BootisoController extends Zend_Controller_Action
{
$bootisoID = $this->_request->getParam('bootisoID');
if (!isset($bootisoID)){
- $this->_redirect('/bootiso');
+ $this->_redirect('/dev/bootiso');
} else {
$bootiso = new Application_Model_BootIso();
$bootiso->setID($bootisoID);
$bootisomapper = new Application_Model_BootIsoMapper();
$bootisomapper->delete($bootiso);
}
- $this->_redirect('/bootiso');
+ $this->_redirect('/dev/bootiso');
}
diff --git a/application/modules/dev/controllers/BootmenuController.php b/application/modules/dev/controllers/BootmenuController.php
index f47b78c..07924d4 100644
--- a/application/modules/dev/controllers/BootmenuController.php
+++ b/application/modules/dev/controllers/BootmenuController.php
@@ -123,7 +123,7 @@ class dev_BootmenuController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
}
}
@@ -156,7 +156,7 @@ class dev_BootmenuController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
}
}
@@ -201,7 +201,7 @@ class dev_BootmenuController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
}
}
@@ -221,7 +221,7 @@ class dev_BootmenuController extends Zend_Controller_Action
if (!isset($_POST["editbootmenuentry"])){
$bootmenuentryID = $this->_request->getParam('bootmenuentryID');
if (!isset($bootmenuentryID) || !is_numeric($bootmenuentryID)){
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
} else {
$bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry);
@@ -262,7 +262,7 @@ class dev_BootmenuController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
}
}
@@ -283,21 +283,21 @@ class dev_BootmenuController extends Zend_Controller_Action
$bootmenuentrymapper->delete($bootmenuentry);
$bootmenuentrymapper->orderremove($bootmenuentry);
}
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
}
public function deletebootmenuAction()
{
$bootmenuID = $this->_request->getParam('bootmenuID');
if (!isset($bootmenuID) || !is_numeric($bootmenuID)){
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
} else {
$bootmenu = new Application_Model_BootMenu();
$bootmenu->setID($bootmenuID);
$bootmenumapper = new Application_Model_BootMenuMapper();
$bootmenumapper->delete($bootmenu);
}
- $this->_redirect('/bootmenu');
+ $this->_redirect('/dev/bootmenu');
}
private function arrayDiff($a, $b){
diff --git a/application/modules/dev/controllers/BootosController.php b/application/modules/dev/controllers/BootosController.php
index 00c2297..36c1cf5 100644
--- a/application/modules/dev/controllers/BootosController.php
+++ b/application/modules/dev/controllers/BootosController.php
@@ -70,7 +70,7 @@ class dev_BootosController extends Zend_Controller_Action
}
- $this->_redirect('/bootos');
+ $this->_redirect('/dev/bootos');
}
}
@@ -86,7 +86,7 @@ class dev_BootosController extends Zend_Controller_Action
if (!isset($_POST["editbootos"])){
$bootosID = $this->_request->getParam('bootosID');
if (!isset($bootosID) || !is_numeric($bootosID)){
- $this->_redirect('/bootos');
+ $this->_redirect('/dev/bootos');
} else {
$bootos = new Application_Model_BootOs();
$bootosmapper = new Application_Model_BootOsMapper();
@@ -116,7 +116,7 @@ class dev_BootosController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/bootos');
+ $this->_redirect('/dev/bootos');
}
}
@@ -129,14 +129,14 @@ class dev_BootosController extends Zend_Controller_Action
{
$bootosID = $this->_request->getParam('bootosID');
if (!isset($bootosID)){
- $this->_redirect('/bootos');
+ $this->_redirect('/dev/bootos');
} else {
$bootos = new Application_Model_BootOs();
$bootos->setID($bootosID);
$bootosmapper = new Application_Model_BootOsMapper();
$bootosmapper->delete($bootos);
}
- $this->_redirect('/bootos');
+ $this->_redirect('/dev/bootos');
}
diff --git a/application/modules/dev/controllers/ClientController.php b/application/modules/dev/controllers/ClientController.php
index b6bcb7e..d73379c 100644
--- a/application/modules/dev/controllers/ClientController.php
+++ b/application/modules/dev/controllers/ClientController.php
@@ -34,7 +34,7 @@ class dev_ClientController extends Zend_Controller_Action
$clientmapper = new Application_Model_ClientMapper();
$clientmapper->save($client);
print_a('inserted');
- $this->_redirect('/client');
+ $this->_redirect('/dev/client');
}
$this->view->addclient = $addclient;
}
@@ -50,7 +50,7 @@ class dev_ClientController extends Zend_Controller_Action
$clientMapper = new Application_Model_ClientMapper();
$clientMapper->delete($removeClient);
}
- $this->_redirect('/client');
+ $this->_redirect('/dev/client');
}
public function editclientAction()
@@ -73,7 +73,7 @@ class dev_ClientController extends Zend_Controller_Action
$clientmapper = new Application_Model_ClientMapper();
$clientmapper->save($client);
print_a('updated');
- $this->_redirect('/client');
+ $this->_redirect('/dev/client');
}
$this->view->editclient = $editclient;
}
diff --git a/application/modules/dev/controllers/ConfigController.php b/application/modules/dev/controllers/ConfigController.php
index 5528b28..47b9eeb 100644
--- a/application/modules/dev/controllers/ConfigController.php
+++ b/application/modules/dev/controllers/ConfigController.php
@@ -50,7 +50,7 @@ class dev_ConfigController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/config');
+ $this->_redirect('/dev/config');
}
}
@@ -65,7 +65,7 @@ class dev_ConfigController extends Zend_Controller_Action
if (!isset($_POST["editconfig"])){
$configID = $this->_request->getParam('configID');
if (!isset($configID) || !is_numeric($configID)){
- $this->_redirect('/config');
+ $this->_redirect('/dev/config');
} else {
$config = new Application_Model_Config();
$configmapper = new Application_Model_ConfigMapper();
@@ -93,7 +93,7 @@ class dev_ConfigController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
}
- $this->_redirect('/config');
+ $this->_redirect('/dev/config');
}
}
@@ -105,14 +105,14 @@ class dev_ConfigController extends Zend_Controller_Action
{
$configID = $this->_request->getParam('configID');
if (!isset($configID)){
- $this->_redirect('/config');
+ $this->_redirect('/dev/config');
} else {
$config = new Application_Model_Config();
$config->setID($configID);
$configmapper = new Application_Model_ConfigMapper();
$configmapper->delete($config);
}
- $this->_redirect('/config');
+ $this->_redirect('/dev/config');
}
diff --git a/application/modules/dev/controllers/FilterController.php b/application/modules/dev/controllers/FilterController.php
index e6978ab..b346810 100644
--- a/application/modules/dev/controllers/FilterController.php
+++ b/application/modules/dev/controllers/FilterController.php
@@ -50,7 +50,7 @@ class dev_FilterController extends Zend_Controller_Action
$newfilter2 = new Application_Model_FilterMapper();
$newfilter2->save($newfilter);
- $this->_redirect('/filter');
+ $this->_redirect('/dev/filter');
return;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
@@ -70,7 +70,7 @@ class dev_FilterController extends Zend_Controller_Action
$filtermapper = new Application_Model_FilterMapper();
$filtermapper->delete($deletefilter);
}
- $this->_redirect('/filter');
+ $this->_redirect('/dev/filter');
}
public function editfilterAction()
@@ -108,7 +108,7 @@ class dev_FilterController extends Zend_Controller_Action
$newfilter2 = new Application_Model_FilterMapper();
$newfilter2->save($newfilterenty);
echo 'valid';
- $this->_redirect('/filter');
+ $this->_redirect('/dev/filter');
}
$this->view->editfilterform = $editfilterform;
}catch (Zend_Exception $e) {
@@ -151,7 +151,7 @@ class dev_FilterController extends Zend_Controller_Action
$newfilter2 = new Application_Model_FilterEntriesMapper();
$newfilter2->save($newfilterenty);
#print_a($newfilterenty);
- $this->_redirect('/filter');
+ $this->_redirect('/dev/filter');
}
$this->view->editfilterform = $editfilterform;
}
@@ -206,7 +206,7 @@ class dev_FilterController extends Zend_Controller_Action
$newfilter2 = new Application_Model_FilterEntriesMapper();
$newfilter2->save($newfilterenty);
#print_a($newfilterenty);
- $this->_redirect('/filter');
+ $this->_redirect('/dev/filter');
}
$this->view->editfilterform = $editfilterform;
@@ -224,16 +224,13 @@ class dev_FilterController extends Zend_Controller_Action
// TODO: ACL implementieren ob er den filter löschen darf
if(is_numeric($filterentriesID)){
$deletefilterentry = new Application_Model_FilterEntries();
- $deletefilterentry->setID($filterentriesID);
- echo "<pre style='border:1px solid black;background-color:#F5B800'>";
- print_r($deletefilterentry);
- echo "</pre>";
+ $deletefilterentry->setID($filterentriesID);
$filterentriesmapper = new Application_Model_FilterEntriesMapper();
$filterentriesmapper->delete($deletefilterentry);
echo "ok";
}
- $this->_redirect('/filter');
+ $this->_redirect('/dev/filter');
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php
index 45c28d4..0456665 100644
--- a/application/modules/dev/controllers/GroupController.php
+++ b/application/modules/dev/controllers/GroupController.php
@@ -21,7 +21,7 @@ class dev_GroupController extends Zend_Controller_Action
$this->rolemapper = new Application_Model_RoleMapper();
$this->groupList = $this->groupMapper->fetchAll();
} else {
- $this->_helper->redirector('login', 'auth');
+ $this->_helper->redirector('dev', 'login', 'auth');
}
}
diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php
index 3cb1756..74c58c7 100644
--- a/application/modules/dev/controllers/PersonController.php
+++ b/application/modules/dev/controllers/PersonController.php
@@ -30,13 +30,13 @@ class dev_PersonController extends Zend_Controller_Action
}
}
} else {
- $this->_helper->redirector('login', 'auth');
+ $this->_helper->redirector('dev','login', 'auth');
}
}
public function indexAction()
{
- $this->_helper->redirector('show', 'person');
+ $this->_helper->redirector('dev','show', 'person');
}
public function showAction()
diff --git a/application/modules/dev/controllers/PoolController.php b/application/modules/dev/controllers/PoolController.php
index cf6395d..375f709 100644
--- a/application/modules/dev/controllers/PoolController.php
+++ b/application/modules/dev/controllers/PoolController.php
@@ -42,7 +42,7 @@ class dev_PoolController extends Zend_Controller_Action
$pool = new Application_Model_Pool($_POST);
$poolmapper = new Application_Model_PoolMapper();
$poolmapper->save($pool);
- $this->_redirect('/pool');
+ $this->_redirect('/dev/pool');
return;
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
@@ -62,7 +62,7 @@ class dev_PoolController extends Zend_Controller_Action
$poolmapper = new Application_Model_PoolMapper();
$poolmapper->delete($deletepool);
}
- $this->_redirect('/pool');
+ $this->_redirect('/dev/pool');
}
public function editpoolAction()
@@ -87,7 +87,7 @@ class dev_PoolController extends Zend_Controller_Action
$pool->setID($this->_request->getParam('poolID'));
$poolmapper = new Application_Model_PoolMapper();
$poolmapper->save($pool);
- $this->_redirect('/pool');
+ $this->_redirect('/dev/pool');
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
@@ -125,7 +125,7 @@ class dev_PoolController extends Zend_Controller_Action
}
$poolmapper = new Application_Model_PoolEntriesMapper();
$poolmapper->save($pool);
- $this->_redirect('/pool');
+ $this->_redirect('/dev/pool');
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
@@ -158,7 +158,7 @@ class dev_PoolController extends Zend_Controller_Action
$deletepoolentriesmapper->delete($deletepoolentries);
echo "ok";
}
- $this->_redirect('/pool');
+ $this->_redirect('/dev/pool');
}
diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php
index 195accc..2f2de2d 100644
--- a/application/modules/dev/controllers/RoleController.php
+++ b/application/modules/dev/controllers/RoleController.php
@@ -8,7 +8,7 @@ class dev_RoleController extends Zend_Controller_Action
if (Zend_Auth::getInstance()->hasIdentity()) {
} else {
- $this->_helper->redirector('login', 'auth');
+ $this->_helper->redirector('dev', 'login', 'auth');
}
}
diff --git a/application/modules/dev/controllers/SessionController.php b/application/modules/dev/controllers/SessionController.php
index e7092bc..bb92da9 100644
--- a/application/modules/dev/controllers/SessionController.php
+++ b/application/modules/dev/controllers/SessionController.php
@@ -76,7 +76,7 @@ class dev_SessionController extends Zend_Controller_Action
$sessionmapper = new Application_Model_SessionMapper();
$sessionmapper->save($session);
- $this->_redirect('/session');
+ $this->_redirect('/dev/session');
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
@@ -155,7 +155,7 @@ class dev_SessionController extends Zend_Controller_Action
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
- $this->_redirect('/session');
+ $this->_redirect('/dev/session');
}
}
@@ -168,7 +168,7 @@ class dev_SessionController extends Zend_Controller_Action
$sessionmapper = new Application_Model_SessionMapper();
$sessionmapper->delete($deletesession);
}
- $this->_redirect('/session');
+ $this->_redirect('/dev/session');
}