diff options
Diffstat (limited to 'application/modules/dev/controllers')
15 files changed, 81 insertions, 76 deletions
diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php index 097417b..32783c9 100644 --- a/application/modules/dev/controllers/AuthController.php +++ b/application/modules/dev/controllers/AuthController.php @@ -1,6 +1,6 @@ <?php -class AuthController extends Zend_Controller_Action +class dev_AuthController extends Zend_Controller_Action { protected $personmapper; private $db = null; @@ -22,9 +22,9 @@ class AuthController extends Zend_Controller_Action print_a('Already logged in.'); } else { if (!isset($_POST["login"])){ - $loginForm = new Application_Form_AuthLogin(); + $loginForm = new dev_Form_AuthLogin(); } else { - $loginForm = new Application_Form_AuthLogin($_POST); + $loginForm = new dev_Form_AuthLogin($_POST); if ($loginForm->isValid($_POST)) { @@ -72,9 +72,9 @@ class AuthController extends Zend_Controller_Action print_a('Already logged in.'); } else { if (!isset($_POST["register"])){ - $registerForm = new Application_Form_AuthRegister(); + $registerForm = new dev_Form_AuthRegister(); } else { - $registerForm = new Application_Form_AuthRegister($_POST); + $registerForm = new dev_Form_AuthRegister($_POST); if ($registerForm->isValid($_POST)) { @@ -116,9 +116,9 @@ class AuthController extends Zend_Controller_Action public function recoverpasswordAction() { if (!isset($_POST["recoverPassword"])){ - $recoverPasswordForm = new Application_Form_AuthRecoverPassword(); + $recoverPasswordForm = new dev_Form_AuthRecoverPassword(); } else { - $recoverPasswordForm = new Application_Form_AuthRecoverPassword($_POST); + $recoverPasswordForm = new dev_Form_AuthRecoverPassword($_POST); # Wiederherstellung funktioniert noch nicht!!! /*if ($recoverPasswordForm->isValid($_POST)) { $recoverPasswordForm->getView()->url(); @@ -166,4 +166,4 @@ class AuthController extends Zend_Controller_Action $this->_helper->redirector('login', 'auth'); } } -}
\ No newline at end of file +} diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php index 078c962..770271d 100644 --- a/application/modules/dev/controllers/BootisoController.php +++ b/application/modules/dev/controllers/BootisoController.php @@ -1,6 +1,6 @@ <?php -class BootisoController extends Zend_Controller_Action +class dev_BootisoController extends Zend_Controller_Action { public function init() @@ -29,10 +29,10 @@ class BootisoController extends Zend_Controller_Action $groupmapper = new Application_Model_GroupMapper(); if (!isset($_POST["createbootiso"])){ - $createbootisoForm = new Application_Form_BootisoCreate(array('grouplist' => $groupmapper->fetchAll())); + $createbootisoForm = new dev_Form_BootisoCreate(array('grouplist' => $groupmapper->fetchAll())); } else { - $createbootisoForm = new Application_Form_BootisoCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST); + $createbootisoForm = new dev_Form_BootisoCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST); if ($createbootisoForm->isValid($_POST)) { @@ -70,11 +70,11 @@ class BootisoController extends Zend_Controller_Action $bootisomapper = new Application_Model_BootIsoMapper(); $bootisomapper->find($bootisoID, $bootiso); - $editbootisoForm = new Application_Form_BootisoEdit(array('grouplist' => $groupmapper->fetchAll())); + $editbootisoForm = new dev_Form_BootisoEdit(array('grouplist' => $groupmapper->fetchAll())); $editbootisoForm->populate($bootiso->toArray()); } }else{ - $editbootisoForm = new Application_Form_BootisoEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST); + $editbootisoForm = new dev_Form_BootisoEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST); if ($editbootisoForm->isValid($_POST)) { diff --git a/application/modules/dev/controllers/BootmenuController.php b/application/modules/dev/controllers/BootmenuController.php index 641b547..f47b78c 100644 --- a/application/modules/dev/controllers/BootmenuController.php +++ b/application/modules/dev/controllers/BootmenuController.php @@ -1,6 +1,6 @@ <?php -class BootmenuController extends Zend_Controller_Action +class dev_BootmenuController extends Zend_Controller_Action { public function init() @@ -95,14 +95,14 @@ class BootmenuController extends Zend_Controller_Action $configmapper = new Application_Model_ConfigMapper(); if (!isset($_POST["addbootmenuentry"])){ - $addbootmenuentryForm = new Application_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll())); + $addbootmenuentryForm = new dev_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll())); $addbootmenuentryForm->populate(array('order' => $this->_request->getParam('maxorder'))); unset($_POST['kcl']); unset($_POST['configID']); $addbootmenuentryForm->populate($_POST); } else { - $addbootmenuentryForm = new Application_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST); + $addbootmenuentryForm = new dev_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST); if ($addbootmenuentryForm->isValid($_POST)) { @@ -136,10 +136,10 @@ class BootmenuController extends Zend_Controller_Action $groupmapper = new Application_Model_GroupMapper(); if (!isset($_POST["createbootmenu"])){ - $createbootmenuForm = new Application_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll())); + $createbootmenuForm = new dev_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll())); } else { - $createbootmenuForm = new Application_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST); + $createbootmenuForm = new dev_Form_BootmenuCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST); if ($createbootmenuForm->isValid($_POST)) { @@ -177,11 +177,11 @@ class BootmenuController extends Zend_Controller_Action $bootmenumapper = new Application_Model_BootMenuMapper(); $bootmenumapper->find($bootmenuID, $bootmenu); - $editbootmenuForm = new Application_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll())); + $editbootmenuForm = new dev_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll())); $editbootmenuForm->populate($bootmenu->toArray()); } }else{ - $editbootmenuForm = new Application_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST); + $editbootmenuForm = new dev_Form_BootmenuEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST); if ($editbootmenuForm->isValid($_POST)) { @@ -226,7 +226,7 @@ class BootmenuController extends Zend_Controller_Action $bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry); - $editbootmenuentryForm = new Application_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll())); + $editbootmenuentryForm = new dev_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll())); if(!isset($_POST['kcl'])){ $editbootmenuentryForm->populate($bootmenuentry->toArray()); } @@ -237,7 +237,7 @@ class BootmenuController extends Zend_Controller_Action } } }else{ - $editbootmenuentryForm = new Application_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST); + $editbootmenuentryForm = new dev_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST); if ($editbootmenuentryForm->isValid($_POST)) { diff --git a/application/modules/dev/controllers/BootosController.php b/application/modules/dev/controllers/BootosController.php index 3a7ab90..00c2297 100644 --- a/application/modules/dev/controllers/BootosController.php +++ b/application/modules/dev/controllers/BootosController.php @@ -1,6 +1,6 @@ <?php -class BootosController extends Zend_Controller_Action +class dev_BootosController extends Zend_Controller_Action { public function init() @@ -36,10 +36,14 @@ class BootosController extends Zend_Controller_Action $configmapper = new Application_Model_ConfigMapper(); if (!isset($_POST["createbootos"])){ - $createbootosForm = new Application_Form_BootosCreate(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll())); + try{ + $createbootosForm = new dev_Form_BootosCreate(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll())); + }catch(Zend_Exception $e){ + print_a($e); + } } else { - $createbootosForm = new Application_Form_BootosCreate(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()),$_POST); + $createbootosForm = new dev_Form_BootosCreate(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()),$_POST); if ($createbootosForm->isValid($_POST)) { @@ -88,11 +92,11 @@ class BootosController extends Zend_Controller_Action $bootosmapper = new Application_Model_BootOsMapper(); $bootos = $bootosmapper->find($bootosID); - $editbootosForm = new Application_Form_BootosEdit(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll())); + $editbootosForm = new dev_Form_BootosEdit(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll())); $editbootosForm->populate($bootos->toArray()); } }else{ - $editbootosForm = new Application_Form_BootosEdit(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()),$_POST); + $editbootosForm = new dev_Form_BootosEdit(array('grouplist' => $groupmapper->fetchAll() ,'configlist'=>$configmapper->fetchAll()),$_POST); if ($editbootosForm->isValid($_POST)) { diff --git a/application/modules/dev/controllers/ClientController.php b/application/modules/dev/controllers/ClientController.php index affa780..b6bcb7e 100644 --- a/application/modules/dev/controllers/ClientController.php +++ b/application/modules/dev/controllers/ClientController.php @@ -1,6 +1,6 @@ <?php -class ClientController extends Zend_Controller_Action +class dev_ClientController extends Zend_Controller_Action { public function init() @@ -20,11 +20,11 @@ class ClientController extends Zend_Controller_Action $hh = $this->_request->getParam('hh'); if (!isset($_POST["add"])){ - $addclient = new Application_Form_Client(array('buttontext' => 'Create Client')); + $addclient = new dev_Form_Client(array('buttontext' => 'Create Client')); $this->view->addclient = $addclient; } else{ - $addfilterform = new Application_Form_Client(array('buttontext' => 'Create Client'),$_POST); + $addfilterform = new dev_Form_Client(array('buttontext' => 'Create Client'),$_POST); if ($addfilterform->isValid($_POST) || ($mac != '' && $hh != '') ) { $client = new Application_Model_Client(); $mac = ($mac!='')?$mac:$_POST['macadress']; @@ -61,12 +61,12 @@ class ClientController extends Zend_Controller_Action $mapper = new Application_Model_ClientMapper(); $mapper->find($clientID,$data); - $editclient = new Application_Form_Client(array('buttontext' => 'Edit Client')); + $editclient = new dev_Form_Client(array('buttontext' => 'Edit Client')); $editclient->populate($data->toArray()); $this->view->editclient = $editclient; } else{ - $editclient = new Application_Form_Client(array('buttontext' => 'Edit Client'),$_POST); + $editclient = new dev_Form_Client(array('buttontext' => 'Edit Client'),$_POST); if ($editclient->isValid($_POST) || ($mac != '' && $hh != '') ) { $client = new Application_Model_Client($_POST); $client->setID($this->_request->getParam('clientID')); diff --git a/application/modules/dev/controllers/ConfigController.php b/application/modules/dev/controllers/ConfigController.php index 3eff0cc..5528b28 100644 --- a/application/modules/dev/controllers/ConfigController.php +++ b/application/modules/dev/controllers/ConfigController.php @@ -1,6 +1,6 @@ <?php -class ConfigController extends Zend_Controller_Action +class dev_ConfigController extends Zend_Controller_Action { public function init() @@ -29,10 +29,10 @@ class ConfigController extends Zend_Controller_Action { $groupmapper = new Application_Model_GroupMapper(); if (!isset($_POST["createconfig"])){ - $createconfigForm = new Application_Form_ConfigCreate(array('grouplist' => $groupmapper->fetchAll())); + $createconfigForm = new dev_Form_ConfigCreate(array('grouplist' => $groupmapper->fetchAll())); } else { - $createconfigForm = new Application_Form_ConfigCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST); + $createconfigForm = new dev_Form_ConfigCreate(array('grouplist' => $groupmapper->fetchAll()),$_POST); if ($createconfigForm->isValid($_POST)) { @@ -71,11 +71,11 @@ class ConfigController extends Zend_Controller_Action $configmapper = new Application_Model_ConfigMapper(); $config = $configmapper->find($configID); - $editconfigForm = new Application_Form_ConfigEdit(array('grouplist' => $groupmapper->fetchAll())); + $editconfigForm = new dev_Form_ConfigEdit(array('grouplist' => $groupmapper->fetchAll())); $editconfigForm->populate($config->toArray()); } }else{ - $editconfigForm = new Application_Form_ConfigEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST); + $editconfigForm = new dev_Form_ConfigEdit(array('grouplist' => $groupmapper->fetchAll()),$_POST); if ($editconfigForm->isValid($_POST)) { diff --git a/application/modules/dev/controllers/ErrorController.php b/application/modules/dev/controllers/ErrorController.php index 5bb2749..189614b 100644 --- a/application/modules/dev/controllers/ErrorController.php +++ b/application/modules/dev/controllers/ErrorController.php @@ -1,6 +1,6 @@ <?php -class ErrorController extends Zend_Controller_Action +class dev_ErrorController extends Zend_Controller_Action { public function errorAction() @@ -15,6 +15,7 @@ class ErrorController extends Zend_Controller_Action // 404 error -- controller or action not found $this->getResponse()->setHttpResponseCode(404); $this->view->message = 'Page not found'; + print_a($errors); break; default: // application error diff --git a/application/modules/dev/controllers/FilterController.php b/application/modules/dev/controllers/FilterController.php index da52c34..e6978ab 100644 --- a/application/modules/dev/controllers/FilterController.php +++ b/application/modules/dev/controllers/FilterController.php @@ -1,6 +1,6 @@ <?php -class FilterController extends Zend_Controller_Action +class dev_FilterController extends Zend_Controller_Action { private $_filtermapper = null; @@ -34,10 +34,10 @@ class FilterController extends Zend_Controller_Action //TODO get bootmenu by group $bootmenus = $bmmapper->fetchAll(); if (!isset($_POST["add"])){ - $addfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus)); + $addfilterform = new dev_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus)); $this->view->addfilterform = $addfilterform; }else { - $addfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus),$_POST); + $addfilterform = new dev_Form_FilterAdd(array('buttontext' => 'Create Filter','bootmenus'=>$bootmenus),$_POST); if ($addfilterform->isValid($_POST)) { try{ $newfilter = new Application_Model_Filter($_POST); @@ -88,7 +88,7 @@ class FilterController extends Zend_Controller_Action $filtermapper->find($filterID,$filter); $filter2 = $filter->toArray(); - $editfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus)); + $editfilterform = new dev_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus)); $editfilterform->populate($filter2); $this->view->editfilterform = $editfilterform; @@ -96,7 +96,7 @@ class FilterController extends Zend_Controller_Action try{ $filterID = $this->_request->getParam('filterID'); - $editfilterform = new Application_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus),$_POST); + $editfilterform = new dev_Form_FilterAdd(array('buttontext' => 'Edit Filter','bootmenus'=>$bootmenus),$_POST); //TODO: ACL integrieren $_POST['groupID'] = 1; $_POST['membershipID'] = 1; @@ -122,7 +122,7 @@ class FilterController extends Zend_Controller_Action // TODO: ACL implementieren ob er editieren darf if (!isset($_POST["add"])){ try{ - $editfilterform = new Application_Form_FilterEntriesAdd( + $editfilterform = new dev_Form_FilterEntriesAdd( array( 'buttontext' => 'Add Filterentry', 'filterID' => $this->_request->getParam('filterID'), 'data' => $_POST @@ -133,7 +133,7 @@ class FilterController extends Zend_Controller_Action echo "Error message 2: " . $e->getMessage() . "\n"; } } else{ - $editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Add Filterentry'),$_POST); + $editfilterform = new dev_Form_FilterEntriesAdd(array('buttontext' => 'Add Filterentry'),$_POST); if ($editfilterform->isValid($_POST)) { $newfilterenty = new Application_Model_FilterEntries(); $newfilterenty->setFilterID($_POST['filterID']); @@ -176,7 +176,7 @@ class FilterController extends Zend_Controller_Action } $data = $filterentry->toArray(); print_a($data); - $editfilterform = new Application_Form_FilterEntriesAdd( + $editfilterform = new dev_Form_FilterEntriesAdd( array('buttontext' => 'Edit Filterentry', 'data' => $data)); @@ -189,7 +189,7 @@ class FilterController extends Zend_Controller_Action } else{ try{ $filterentriesID = $this->_request->getParam('filterentriesID'); - $editfilterform = new Application_Form_FilterEntriesAdd(array('buttontext' => 'Edit Filterentry'),$_POST); + $editfilterform = new dev_Form_FilterEntriesAdd(array('buttontext' => 'Edit Filterentry'),$_POST); if ($editfilterform->isValid($_POST)) { if($_POST['filterID'] == '') unset($_POST['filterID']); @@ -649,7 +649,7 @@ class FilterController extends Zend_Controller_Action $cm = new Application_Model_ClientMapper(); $clients = $cm->fetchAll(); - $filterevaluate = new Application_Form_FilterEvaluate( + $filterevaluate = new dev_Form_FilterEvaluate( array( 'pools' => $pools, 'bootisos' => $bootisos, 'memberships' => $memberships, diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php index fbc7943..45c28d4 100644 --- a/application/modules/dev/controllers/GroupController.php +++ b/application/modules/dev/controllers/GroupController.php @@ -1,6 +1,6 @@ <?php -class GroupController extends Zend_Controller_Action +class dev_GroupController extends Zend_Controller_Action { protected $groupMapper; protected $groupGroupsMapper; @@ -33,9 +33,9 @@ class GroupController extends Zend_Controller_Action public function addAction() { if (!isset($_POST["add"])){ - $addForm = new Application_Form_GroupAdd(array('grouplist' => $this->groupList)); + $addForm = new dev_Form_GroupAdd(array('grouplist' => $this->groupList)); } else { - $addForm = new Application_Form_GroupAdd(array('grouplist' => $this->groupList),$_POST); + $addForm = new dev_Form_GroupAdd(array('grouplist' => $this->groupList),$_POST); if ($addForm->isValid($_POST)) { $group = new Application_Model_Group($_POST); @@ -72,7 +72,7 @@ class GroupController extends Zend_Controller_Action public function editAction() { if(!isset($_POST['groupID'])) { - $addForm = new Application_Form_GroupAdd(array('grouplist' => $this->groupList)); + $addForm = new dev_Form_GroupAdd(array('grouplist' => $this->groupList)); $this->view->addForm = $addForm; return; } @@ -80,9 +80,9 @@ class GroupController extends Zend_Controller_Action $group = $this->groupMapper->find($_POST['groupID']); $_POST['title'] = $group->getTitle(); $_POST['description'] = $group->getDescription(); - $editForm = new Application_Form_GroupEdit(); + $editForm = new dev_Form_GroupEdit(); } else { - $editForm = new Application_Form_GroupEdit($_POST); + $editForm = new dev_Form_GroupEdit($_POST); if ($editForm->isValid($_POST)) { $group = new Application_Model_Group($_POST); try { @@ -140,9 +140,9 @@ class GroupController extends Zend_Controller_Action public function linkAction() { if (!isset($_POST["link"])){ - $linkForm = new Application_Form_GroupLink(array('grouplist' => $this->groupList)); + $linkForm = new dev_Form_GroupLink(array('grouplist' => $this->groupList)); } else { - $linkForm = new Application_Form_GroupLink(array('grouplist' => $this->groupList),$_POST); + $linkForm = new dev_Form_GroupLink(array('grouplist' => $this->groupList),$_POST); if ($linkForm->isValid($_POST)) { $groupgroups = new Application_Model_GroupGroups(); diff --git a/application/modules/dev/controllers/IndexController.php b/application/modules/dev/controllers/IndexController.php index df2f91c..4c9385c 100644 --- a/application/modules/dev/controllers/IndexController.php +++ b/application/modules/dev/controllers/IndexController.php @@ -1,6 +1,6 @@ <?php -class IndexController extends Zend_Controller_Action +class dev_IndexController extends Zend_Controller_Action { public function init() diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php index 0b6db2e..3cb1756 100644 --- a/application/modules/dev/controllers/PersonController.php +++ b/application/modules/dev/controllers/PersonController.php @@ -1,6 +1,6 @@ <?php -class PersonController extends Zend_Controller_Action +class dev_PersonController extends Zend_Controller_Action { protected $person; protected $personmapper; @@ -49,9 +49,9 @@ class PersonController extends Zend_Controller_Action { $this->view->person = $this->person; if (!isset($_POST["save"])){ - $editForm = new Application_Form_PersonEdit(); + $editForm = new dev_Form_PersonEdit(); } else { - $editForm = new Application_Form_PersonEdit($_POST); + $editForm = new dev_Form_PersonEdit($_POST); if ($editForm->isValid($_POST)) { if(isset($_POST['newpassword'])) { $date = new DateTime(); @@ -94,9 +94,9 @@ class PersonController extends Zend_Controller_Action if(count($allgroups) <= 0) { echo "No Groups to choose."; } - $requestForm = new Application_Form_GroupRequest(array('grouplist' => $allgroups)); + $requestForm = new dev_Form_GroupRequest(array('grouplist' => $allgroups)); } else { - $requestForm = new Application_Form_GroupRequest(array('grouplist' => $allgroups), $_POST); + $requestForm = new dev_Form_GroupRequest(array('grouplist' => $allgroups), $_POST); if ($requestForm->isValid($_POST)) { $groupRequestMapper = new Application_Model_GroupRequestMapper(); $groupRequest = new Application_Model_GroupRequest(); diff --git a/application/modules/dev/controllers/PoolController.php b/application/modules/dev/controllers/PoolController.php index f27ee45..cf6395d 100644 --- a/application/modules/dev/controllers/PoolController.php +++ b/application/modules/dev/controllers/PoolController.php @@ -1,6 +1,6 @@ <?php -class PoolController extends Zend_Controller_Action +class dev_PoolController extends Zend_Controller_Action { public function init() @@ -33,10 +33,10 @@ class PoolController extends Zend_Controller_Action public function createpoolAction() { if (!isset($_POST["add"])){ - $addfilterform = new Application_Form_Pool(array('buttontext' => 'Create Pool')); + $addfilterform = new dev_Form_Pool(array('buttontext' => 'Create Pool')); $this->view->addpool = $addfilterform; }else { - $addpoolform = new Application_Form_Pool(array('buttontext' => 'Create Pool'),$_POST); + $addpoolform = new dev_Form_Pool(array('buttontext' => 'Create Pool'),$_POST); if ($addpoolform->isValid($_POST)) { try{ $pool = new Application_Model_Pool($_POST); @@ -75,12 +75,12 @@ class PoolController extends Zend_Controller_Action $poolmapper->find($poolID,$pool); $poolArray = $pool->toArray(); - $editpool = new Application_Form_Pool(array('buttontext' => 'Edit Pool')); + $editpool = new dev_Form_Pool(array('buttontext' => 'Edit Pool')); $editpool->populate($poolArray); $this->view->editpoolform = $editpool; }else { - $editpoolform = new Application_Form_Pool(array('buttontext' => 'Edit Pool'),$_POST); + $editpoolform = new dev_Form_Pool(array('buttontext' => 'Edit Pool'),$_POST); if ($editpoolform->isValid($_POST)) { try{ $pool = new Application_Model_Pool($_POST); @@ -113,10 +113,10 @@ class PoolController extends Zend_Controller_Action } $freeclients = $this->arrayDiff($clientsArray,$assignedclientsArray); - $poolclient = new Application_Form_PoolClient(array('buttontext' => 'Link Client','clients'=> $freeclients)); + $poolclient = new dev_Form_PoolClient(array('buttontext' => 'Link Client','clients'=> $freeclients)); $this->view->poolclient = $poolclient; }else { - $poolclient = new Application_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST); + $poolclient = new dev_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST); try{ $pool = new Application_Model_PoolEntries($_POST); $pool->setPoolID($this->_request->getParam('poolID')); diff --git a/application/modules/dev/controllers/ResourceController.php b/application/modules/dev/controllers/ResourceController.php index aef8649..c292228 100644 --- a/application/modules/dev/controllers/ResourceController.php +++ b/application/modules/dev/controllers/ResourceController.php @@ -1,6 +1,6 @@ <?php -class ResourceController extends Zend_Controller_Action +class dev_ResourceController extends Zend_Controller_Action { diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php index 7a6c304..195accc 100644 --- a/application/modules/dev/controllers/RoleController.php +++ b/application/modules/dev/controllers/RoleController.php @@ -1,6 +1,6 @@ <?php -class RoleController extends Zend_Controller_Action +class dev_RoleController extends Zend_Controller_Action { public function init() diff --git a/application/modules/dev/controllers/SessionController.php b/application/modules/dev/controllers/SessionController.php index ddb6fac..e7092bc 100644 --- a/application/modules/dev/controllers/SessionController.php +++ b/application/modules/dev/controllers/SessionController.php @@ -1,6 +1,6 @@ <?php -class SessionController extends Zend_Controller_Action +class dev_SessionController extends Zend_Controller_Action { public function init() @@ -40,11 +40,11 @@ class SessionController extends Zend_Controller_Action if (!isset($_POST["add"])){ - $createsession = new Application_Form_Session(array('buttontext' => 'Create Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships)); + $createsession = new dev_Form_Session(array('buttontext' => 'Create Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships)); $this->view->createsession = $createsession; }else { // TODO extend with normal function not only with post - $createsession = new Application_Form_Session(array('buttontext' => 'Create Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos),$_POST); + $createsession = new dev_Form_Session(array('buttontext' => 'Create Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos),$_POST); #print_a($_POST); if ($createsession->isValid($_POST)) { try{ @@ -115,7 +115,7 @@ class SessionController extends Zend_Controller_Action $session2 = $session->toArray(); #print_a($session2); - $editsession = new Application_Form_Session(array('buttontext' => 'Edit Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships)); + $editsession = new dev_Form_Session(array('buttontext' => 'Edit Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships)); $editsession->populate($session2); $this->view->editsession = $editsession; }catch (Zend_Exception $e) { @@ -126,7 +126,7 @@ class SessionController extends Zend_Controller_Action try{ $sessionID = $this->_request->getParam('sessionID'); - $editsession = new Application_Form_Session(array('buttontext' => 'Edit Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships),$_POST); + $editsession = new dev_Form_Session(array('buttontext' => 'Edit Session','bootmenuentries'=>$bootmenuentries,'clients'=>$clients,'bootos'=>$bootos,'bootisos'=>$bootisos,'memberships'=>$memberships),$_POST); if ($editsession->isValid($_POST)) { $session = new Application_Model_Session($_POST); |