diff options
55 files changed, 446 insertions, 120 deletions
@@ -5,3 +5,4 @@ library/ .buildpath .settings/ application/configs/application.ini +resources/ diff --git a/.zfproject.xml b/.zfproject.xml index e0bd2af..fea5232 100644 --- a/.zfproject.xml +++ b/.zfproject.xml @@ -212,7 +212,71 @@ <modelFile modelName="GroupRequest"/> <modelFile modelName="Group"/> </modelsDirectory> - <modulesDirectory enabled="false"/> + <modulesDirectory> + <moduleDirectory moduleName="user"> + <apisDirectory enabled="false"/> + <configsDirectory enabled="false"/> + <controllersDirectory> + <controllerFile controllerName="Index"> + <actionMethod actionName="index"/> + </controllerFile> + </controllersDirectory> + <formsDirectory> + <formFile formName="Login"/> + </formsDirectory> + <layoutsDirectory enabled="false"/> + <modelsDirectory> + <dbTableDirectory enabled="false"/> + </modelsDirectory> + <viewsDirectory> + <viewScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Index"> + <viewScriptFile forActionName="index"/> + </viewControllerScriptsDirectory> + </viewScriptsDirectory> + <viewHelpersDirectory/> + <viewFiltersDirectory/> + </viewsDirectory> + </moduleDirectory> + <moduleDirectory moduleName="fbgui"> + <apisDirectory enabled="false"/> + <configsDirectory enabled="false"/> + <controllersDirectory> + <controllerFile controllerName="Index"> + <actionMethod actionName="index"/> + </controllerFile> + </controllersDirectory> + <formsDirectory enabled="false"/> + <layoutsDirectory enabled="false"/> + <modelsDirectory> + <dbTableDirectory enabled="false"/> + </modelsDirectory> + <viewsDirectory> + <viewScriptsDirectory> + <viewControllerScriptsDirectory forControllerName="Index"> + <viewScriptFile forActionName="index"/> + </viewControllerScriptsDirectory> + </viewScriptsDirectory> + <viewHelpersDirectory/> + <viewFiltersDirectory/> + </viewsDirectory> + </moduleDirectory> + <moduleDirectory moduleName="dev"> + <apisDirectory enabled="false"/> + <configsDirectory enabled="false"/> + <controllersDirectory/> + <formsDirectory enabled="false"/> + <layoutsDirectory enabled="false"/> + <modelsDirectory> + <dbTableDirectory enabled="false"/> + </modelsDirectory> + <viewsDirectory> + <viewScriptsDirectory/> + <viewHelpersDirectory/> + <viewFiltersDirectory/> + </viewsDirectory> + </moduleDirectory> + </modulesDirectory> <viewsDirectory> <viewScriptsDirectory> <viewControllerScriptsDirectory forControllerName="Index"> @@ -472,6 +536,8 @@ <testApplicationControllerFile filesystemName="GroupControllerTest.php"/> <testApplicationControllerFile filesystemName="RoleControllerTest.php"/> <testApplicationControllerFile filesystemName="ResourceControllerTest.php"/> + <testApplicationControllerFile filesystemName="IndexControllerTest.php"/> + <testApplicationControllerFile filesystemName="IndexControllerTest.php"/> </testApplicationControllerDirectory> </testApplicationDirectory> <testLibraryDirectory> diff --git a/application/Bootstrap.php b/application/Bootstrap.php index f06c85b..f9ee092 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -2,7 +2,23 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap { - + protected function _initAutoloader() + { + $moduleLoader = new Zend_Application_Module_Autoloader + ( + array + ( + 'namespace' => '', + 'basePath' => APPLICATION_PATH, + 'resourceTypes' => array( + 'form' => array( + 'path' => 'forms/', + 'namespace' => 'Form', + ) + ) + ) + ); + } protected function _initAuth(){ $auth = Zend_Auth::getInstance(); $auth->setStorage(new Zend_Auth_Storage_Session('auth')); @@ -26,4 +42,4 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap ->setSeparator(' :: '); } } -include 'Functions.php';
\ No newline at end of file +include 'Functions.php'; diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist index b19bac8..9bc14f6 100644 --- a/application/configs/application.ini.dist +++ b/application/configs/application.ini.dist @@ -16,6 +16,7 @@ resources.db.isDefaultTableAdapter = true resources.view[] = "" resources.layout.layoutPath = APPLICATION_PATH "/layouts" resources.layout.layout = "main" +resources.modules = "" [staging : production] diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php new file mode 100644 index 0000000..01ee79b --- /dev/null +++ b/application/controllers/ErrorController.php @@ -0,0 +1,52 @@ +<?php + +class ErrorController extends Zend_Controller_Action +{ + + public function errorAction() + { + $errors = $this->_getParam('error_handler'); + + switch ($errors->type) { + case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE: + case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER: + case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_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 + $this->getResponse()->setHttpResponseCode(500); + $this->view->message = 'Application error'; + break; + } + + // Log exception, if logger available + if ($log = $this->getLog()) { + $log->crit($this->view->message, $errors->exception); + } + + // conditionally display exceptions + if ($this->getInvokeArg('displayExceptions') == true) { + $this->view->exception = $errors->exception; + } + + $this->view->request = $errors->request; + } + + public function getLog() + { + $bootstrap = $this->getInvokeArg('bootstrap'); + if (!$bootstrap->hasPluginResource('Log')) { + return false; + } + $log = $bootstrap->getResource('Log'); + return $log; + } + + +} + diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php new file mode 100644 index 0000000..df2f91c --- /dev/null +++ b/application/controllers/IndexController.php @@ -0,0 +1,22 @@ +<?php + +class IndexController extends Zend_Controller_Action +{ + + public function init() + { + /* Initialize action controller here */ + } + + public function indexAction() + { + // action body + } + + +} + + + + + diff --git a/application/layouts/main.phtml b/application/layouts/main.phtml index 74b5c36..6efbb4d 100644 --- a/application/layouts/main.phtml +++ b/application/layouts/main.phtml @@ -25,24 +25,24 @@ echo $this->headScript()."\n"; <ul> <li>Controller: <ul> - <li><a href='/person'>Person</a></li> - <li><a href='/group'>Group</a></li> - <li><a href='/role'>Role</a></li> - <li><a href='/bootiso'>BootIso</a></li> - <li><a href='/bootmenu'>BootMenu</a></li> - <li><a href='/config'>Config</a></li> - <li><a href='/bootos'>BootOs</a></li> - <li><a href='/client'>Client</a></li> - <li><a href='/filter'>Filter</a></li> - <li><a href='/pool'>Pool</a></li> - <li><a href='/session'>Session</a></li> + <li><a href='/dev/person'>Person</a></li> + <li><a href='/dev/group'>Group</a></li> + <li><a href='/dev/role'>Role</a></li> + <li><a href='/dev/bootiso'>BootIso</a></li> + <li><a href='/dev/bootmenu'>BootMenu</a></li> + <li><a href='/dev/config'>Config</a></li> + <li><a href='/dev/bootos'>BootOs</a></li> + <li><a href='/dev/client'>Client</a></li> + <li><a href='/dev/filter'>Filter</a></li> + <li><a href='/dev/pool'>Pool</a></li> + <li><a href='/dev/session'>Session</a></li> <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> - <li><a href='/auth/login'>Login</a></li> - <li><a href='/auth/register'>Register</a></li> + <li><a href='/dev/auth/login'>Login</a></li> + <li><a href='/dev/auth/register'>Register</a></li> <?php } else {?> - <li><a href='/auth/delete'>Account Löschen</a></li> - <li><a href='/auth/logout'>Logout</a></li> + <li><a href='/dev/auth/delete'>Account Löschen</a></li> + <li><a href='/dev/auth/logout'>Logout</a></li> <?php } ?> diff --git a/application/modules/dev/Bootstrap.php b/application/modules/dev/Bootstrap.php new file mode 100644 index 0000000..7fc413c --- /dev/null +++ b/application/modules/dev/Bootstrap.php @@ -0,0 +1,5 @@ +<?php +class dev_Bootstrap extends Zend_Application_Module_Bootstrap +{ + +} 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); diff --git a/application/modules/dev/forms/AuthDelete.php b/application/modules/dev/forms/AuthDelete.php index 4e9c92d..3429ae0 100644 --- a/application/modules/dev/forms/AuthDelete.php +++ b/application/modules/dev/forms/AuthDelete.php @@ -1,6 +1,6 @@ <?php -class Application_Form_AuthDelete extends Zend_Form +class dev_Form_AuthDelete extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/AuthLogin.php b/application/modules/dev/forms/AuthLogin.php index adffa29..e996b1d 100644 --- a/application/modules/dev/forms/AuthLogin.php +++ b/application/modules/dev/forms/AuthLogin.php @@ -1,6 +1,6 @@ <?php -class Application_Form_AuthLogin extends Zend_Form +class dev_Form_AuthLogin extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/AuthRecoverPassword.php b/application/modules/dev/forms/AuthRecoverPassword.php index fc9478b..a1de7ea 100644 --- a/application/modules/dev/forms/AuthRecoverPassword.php +++ b/application/modules/dev/forms/AuthRecoverPassword.php @@ -1,6 +1,6 @@ <?php -class Application_Form_AuthRecoverPassword extends Zend_Form +class dev_Form_AuthRecoverPassword extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/AuthRegister.php b/application/modules/dev/forms/AuthRegister.php index ae6e766..ceb1050 100644 --- a/application/modules/dev/forms/AuthRegister.php +++ b/application/modules/dev/forms/AuthRegister.php @@ -1,6 +1,6 @@ <?php -class Application_Form_AuthRegister extends Zend_Form +class dev_Form_AuthRegister extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/BootisoCreate.php b/application/modules/dev/forms/BootisoCreate.php index 6efb0c2..1615f6e 100644 --- a/application/modules/dev/forms/BootisoCreate.php +++ b/application/modules/dev/forms/BootisoCreate.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootisoCreate extends Zend_Form +class dev_Form_BootisoCreate extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/BootisoEdit.php b/application/modules/dev/forms/BootisoEdit.php index 17c87d6..b1e2fd2 100644 --- a/application/modules/dev/forms/BootisoEdit.php +++ b/application/modules/dev/forms/BootisoEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootisoEdit extends Zend_Form +class dev_Form_BootisoEdit extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/BootmenuCreate.php b/application/modules/dev/forms/BootmenuCreate.php index a6b4272..988423d 100644 --- a/application/modules/dev/forms/BootmenuCreate.php +++ b/application/modules/dev/forms/BootmenuCreate.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootmenuCreate extends Zend_Form +class dev_Form_BootmenuCreate extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/BootmenuEdit.php b/application/modules/dev/forms/BootmenuEdit.php index 0b33643..2e1e8fc 100644 --- a/application/modules/dev/forms/BootmenuEdit.php +++ b/application/modules/dev/forms/BootmenuEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootmenuEdit extends Zend_Form +class dev_Form_BootmenuEdit extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/BootmenuEntriesAdd.php b/application/modules/dev/forms/BootmenuEntriesAdd.php index 6981619..2e1b677 100644 --- a/application/modules/dev/forms/BootmenuEntriesAdd.php +++ b/application/modules/dev/forms/BootmenuEntriesAdd.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootmenuEntriesAdd extends Zend_Form +class dev_Form_BootmenuEntriesAdd extends Zend_Form { private $bootoslist; private $configlist; diff --git a/application/modules/dev/forms/BootmenuEntriesEdit.php b/application/modules/dev/forms/BootmenuEntriesEdit.php index 6dc1aab..57aa053 100644 --- a/application/modules/dev/forms/BootmenuEntriesEdit.php +++ b/application/modules/dev/forms/BootmenuEntriesEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootmenuEntriesEdit extends Zend_Form +class dev_Form_BootmenuEntriesEdit extends Zend_Form { private $bootoslist; diff --git a/application/modules/dev/forms/BootosCreate.php b/application/modules/dev/forms/BootosCreate.php index 0377197..4399a62 100644 --- a/application/modules/dev/forms/BootosCreate.php +++ b/application/modules/dev/forms/BootosCreate.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootosCreate extends Zend_Form +class dev_Form_BootosCreate extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/BootosEdit.php b/application/modules/dev/forms/BootosEdit.php index 641429d..4a0ee3b 100644 --- a/application/modules/dev/forms/BootosEdit.php +++ b/application/modules/dev/forms/BootosEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_BootosEdit extends Zend_Form +class dev_Form_BootosEdit extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/Client.php b/application/modules/dev/forms/Client.php index 83df97e..f09f720 100644 --- a/application/modules/dev/forms/Client.php +++ b/application/modules/dev/forms/Client.php @@ -1,6 +1,6 @@ <?php -class Application_Form_Client extends Zend_Form +class dev_Form_Client extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/ConfigCreate.php b/application/modules/dev/forms/ConfigCreate.php index 3aa142c..cf0289f 100644 --- a/application/modules/dev/forms/ConfigCreate.php +++ b/application/modules/dev/forms/ConfigCreate.php @@ -1,6 +1,6 @@ <?php -class Application_Form_ConfigCreate extends Zend_Form +class dev_Form_ConfigCreate extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/ConfigEdit.php b/application/modules/dev/forms/ConfigEdit.php index 53219d9..c0d8e4f 100644 --- a/application/modules/dev/forms/ConfigEdit.php +++ b/application/modules/dev/forms/ConfigEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_ConfigEdit extends Zend_Form +class dev_Form_ConfigEdit extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/FilterAdd.php b/application/modules/dev/forms/FilterAdd.php index b720089..0249798 100644 --- a/application/modules/dev/forms/FilterAdd.php +++ b/application/modules/dev/forms/FilterAdd.php @@ -1,6 +1,6 @@ <?php -class Application_Form_FilterAdd extends Zend_Form +class dev_Form_FilterAdd extends Zend_Form { private $bootmenus; diff --git a/application/modules/dev/forms/FilterEntriesAdd.php b/application/modules/dev/forms/FilterEntriesAdd.php index 9f9c642..758ffbd 100644 --- a/application/modules/dev/forms/FilterEntriesAdd.php +++ b/application/modules/dev/forms/FilterEntriesAdd.php @@ -1,6 +1,6 @@ <?php -class Application_Form_FilterEntriesAdd extends Zend_Form +class dev_Form_FilterEntriesAdd extends Zend_Form { private $filterID = 0; diff --git a/application/modules/dev/forms/FilterEvaluate.php b/application/modules/dev/forms/FilterEvaluate.php index b7c2b51..9922f2b 100644 --- a/application/modules/dev/forms/FilterEvaluate.php +++ b/application/modules/dev/forms/FilterEvaluate.php @@ -1,6 +1,6 @@ <?php -class Application_Form_FilterEvaluate extends Zend_Form +class dev_Form_FilterEvaluate extends Zend_Form { private $pools; private $bootisos; diff --git a/application/modules/dev/forms/GroupAdd.php b/application/modules/dev/forms/GroupAdd.php index 7df3af5..f7636e7 100644 --- a/application/modules/dev/forms/GroupAdd.php +++ b/application/modules/dev/forms/GroupAdd.php @@ -1,6 +1,6 @@ <?php -class Application_Form_GroupAdd extends Zend_Form +class dev_Form_GroupAdd extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/GroupEdit.php b/application/modules/dev/forms/GroupEdit.php index ef38d83..fb1ed03 100644 --- a/application/modules/dev/forms/GroupEdit.php +++ b/application/modules/dev/forms/GroupEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_GroupEdit extends Zend_Form +class dev_Form_GroupEdit extends Zend_Form { diff --git a/application/modules/dev/forms/GroupLink.php b/application/modules/dev/forms/GroupLink.php index 231c4a7..05782c7 100644 --- a/application/modules/dev/forms/GroupLink.php +++ b/application/modules/dev/forms/GroupLink.php @@ -1,6 +1,6 @@ <?php -class Application_Form_GroupLink extends Zend_Form +class dev_Form_GroupLink extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/GroupRequest.php b/application/modules/dev/forms/GroupRequest.php index ec717de..efaafaf 100644 --- a/application/modules/dev/forms/GroupRequest.php +++ b/application/modules/dev/forms/GroupRequest.php @@ -1,6 +1,6 @@ <?php -class Application_Form_GroupRequest extends Zend_Form +class dev_Form_GroupRequest extends Zend_Form { private $grouplist; diff --git a/application/modules/dev/forms/PersonEdit.php b/application/modules/dev/forms/PersonEdit.php index 664daac..3baf4a6 100644 --- a/application/modules/dev/forms/PersonEdit.php +++ b/application/modules/dev/forms/PersonEdit.php @@ -1,6 +1,6 @@ <?php -class Application_Form_PersonEdit extends Zend_Form +class dev_Form_PersonEdit extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/Pool.php b/application/modules/dev/forms/Pool.php index be30444..61a66b1 100644 --- a/application/modules/dev/forms/Pool.php +++ b/application/modules/dev/forms/Pool.php @@ -1,6 +1,6 @@ <?php -class Application_Form_Pool extends Zend_Form +class dev_Form_Pool extends Zend_Form { public function init() diff --git a/application/modules/dev/forms/PoolClient.php b/application/modules/dev/forms/PoolClient.php index 0c4ef6a..884f7e7 100644 --- a/application/modules/dev/forms/PoolClient.php +++ b/application/modules/dev/forms/PoolClient.php @@ -1,6 +1,6 @@ <?php -class Application_Form_PoolClient extends Zend_Form +class dev_Form_PoolClient extends Zend_Form { private $clients; diff --git a/application/modules/dev/forms/Session.php b/application/modules/dev/forms/Session.php index 8603f75..cc0f38a 100644 --- a/application/modules/dev/forms/Session.php +++ b/application/modules/dev/forms/Session.php @@ -1,6 +1,6 @@ <?php -class Application_Form_Session extends Zend_Form +class dev_Form_Session extends Zend_Form { private $clients; diff --git a/application/modules/fbgui/controllers/IndexController.php b/application/modules/fbgui/controllers/IndexController.php new file mode 100644 index 0000000..c1621dc --- /dev/null +++ b/application/modules/fbgui/controllers/IndexController.php @@ -0,0 +1,18 @@ +<?php + +class Fbgui_IndexController extends Zend_Controller_Action +{ + + public function init() + { + /* Initialize action controller here */ + } + + public function indexAction() + { + // action body + } + + +} + diff --git a/application/modules/fbgui/views/scripts/index/index.phtml b/application/modules/fbgui/views/scripts/index/index.phtml new file mode 100644 index 0000000..4b38f0a --- /dev/null +++ b/application/modules/fbgui/views/scripts/index/index.phtml @@ -0,0 +1,43 @@ +<style> + a:link, + a:visited + { + color: #0398CA; + } + + span#zf-name + { + color: #91BE3F; + } + + div#welcome + { + color: #FFFFFF; + background-image: url(http://framework.zend.com/images/bkg_header.jpg); + width: 600px; + height: 400px; + border: 2px solid #444444; + overflow: hidden; + text-align: center; + } + + div#more-information + { + background-image: url(http://framework.zend.com/images/bkg_body-bottom.gif); + height: 100%; + } +</style> +<div id="welcome"> + <h1>Welcome to the <span id="zf-name">Zend Framework!</span></h1> + + <h3>This is your project's main page</h3> + + <div id="more-information"> + <p><img src="http://framework.zend.com/images/PoweredBy_ZF_4LightBG.png" /></p> + <p> + Helpful Links: <br /> + <a href="http://framework.zend.com/">Zend Framework Website</a> | + <a href="http://framework.zend.com/manual/en/">Zend Framework Manual</a> + </p> + </div> +</div>
\ No newline at end of file diff --git a/application/modules/user/controllers/IndexController.php b/application/modules/user/controllers/IndexController.php new file mode 100644 index 0000000..934b9ba --- /dev/null +++ b/application/modules/user/controllers/IndexController.php @@ -0,0 +1,18 @@ +<?php + +class User_IndexController extends Zend_Controller_Action +{ + + public function init() + { + /* Initialize action controller here */ + } + + public function indexAction() + { + $this->view->loginform = new user_Form_Login(); + } + + +} + diff --git a/application/modules/user/forms/Login.php b/application/modules/user/forms/Login.php new file mode 100644 index 0000000..58c5cc9 --- /dev/null +++ b/application/modules/user/forms/Login.php @@ -0,0 +1,13 @@ +<?php + +class user_Form_Login extends Zend_Form +{ + + public function init() + { + /* Form Elements & Other Definitions Here ... */ + } + + +} + diff --git a/application/modules/user/views/scripts/index/index.phtml b/application/modules/user/views/scripts/index/index.phtml new file mode 100644 index 0000000..fe78dba --- /dev/null +++ b/application/modules/user/views/scripts/index/index.phtml @@ -0,0 +1,46 @@ +<?php +echo $this->loginform; +?> +<style> + a:link, + a:visited + { + color: #0398CA; + } + + span#zf-name + { + color: #91BE3F; + } + + div#welcome + { + color: #FFFFFF; + background-image: url(http://framework.zend.com/images/bkg_header.jpg); + width: 600px; + height: 400px; + border: 2px solid #444444; + overflow: hidden; + text-align: center; + } + + div#more-information + { + background-image: url(http://framework.zend.com/images/bkg_body-bottom.gif); + height: 100%; + } +</style> +<div id="welcome"> + <h1>Welcome to the <span id="zf-name">Zend Framework!</span></h1> + + <h3>This is your project's main page</h3> + + <div id="more-information"> + <p><img src="http://framework.zend.com/images/PoweredBy_ZF_4LightBG.png" /></p> + <p> + Helpful Links: <br /> + <a href="http://framework.zend.com/">Zend Framework Website</a> | + <a href="http://framework.zend.com/manual/en/">Zend Framework Manual</a> + </p> + </div> +</div> diff --git a/tests/application/controllers/IndexControllerTest.php b/tests/application/controllers/IndexControllerTest.php new file mode 100644 index 0000000..1b4f230 --- /dev/null +++ b/tests/application/controllers/IndexControllerTest.php @@ -0,0 +1,20 @@ +<?php + +require_once 'PHPUnit/Framework/TestCase.php'; + +class IndexControllerTest extends PHPUnit_Framework_TestCase +{ + + public function setUp() + { + /* Setup Routine */ + } + + public function tearDown() + { + /* Tear Down Routine */ + } + + +} + |