diff --git a/application/controllers/ApprovalbodyadminController.php b/application/controllers/ApprovalbodyadminController.php
index fe566791d1a53c654881efc295d2e72ce0c0552a..8f8b895103291bf420585e7fb89929c421a4b56a 100644
--- a/application/controllers/ApprovalbodyadminController.php
+++ b/application/controllers/ApprovalbodyadminController.php
@@ -14,8 +14,8 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
public function editBodyAction()
{
- $in = $this->_getAllParams();
- $approvalBodyId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $approvalBodyId = Zend_Filter::getInt($in->getParam(0));
$out = new Nmc_View();
$out->page = 'approval_body_admin';
@@ -28,8 +28,8 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
public function editRoleAction()
{
- $in = $this->_getAllParams();
- $roleId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $roleId = Zend_Filter::getInt($in->getParam(0));
$out = new Nmc_View();
$out->page = 'approval_body_admin';
@@ -43,8 +43,8 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
public function addRoleAction()
{
- $in = $this->_getAllParams();
- $approvalBodyId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $approvalBodyId = Zend_Filter::getInt($in->getParam(0));
$parentApprovalBody = ApprovalBodies::getInstance()->find($approvalBodyId);
$out = new Nmc_View();
@@ -60,16 +60,16 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
public function editBodyPostAction()
{
- $in = $this->_getAllParams();
- $bodyId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $bodyId = Zend_Filter::getInt($in->getParam(0));
$body = ApprovalBodies::getInstance()->find($bodyId);
if(!$body) {
$body = ApprovalBodies::getInstance()->fetchNew();
}
- $body->name = $in['name'];
- $body->description = $in['description'];
+ $body->name = $in->getPost('name');
+ $body->description = $in->getPost('description');
$body->save();
$out = new Nmc_View();
@@ -79,8 +79,8 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
public function editRolePostAction()
{
- $in = $this->_getAllParams();
- $roleId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $roleId = Zend_Filter::getInt($in->getParam(0));
if($roleId < 0) {
$role = ApprovalBodyRoles::getInstance()->fetchNew();
$role->approvalBody = abs($roleId);
@@ -88,8 +88,8 @@ class ApprovalBodyAdminController extends Nmc_Controller_Action
$role = ApprovalBodyRoles::getInstance()->find($roleId);
}
- $role->name = $in['name'];
- $role->group = $in['group'];
+ $role->name = $in->getPost('name');
+ $role->group = $in->getPost('group');
$role->save();
$out = new Nmc_View();
diff --git a/application/controllers/ConflictController.php b/application/controllers/ConflictController.php
index 53135fd9a173c3103980828ec4de70c6b25185c8..75a1ca1992306db6e15c0736b3524c0095741057 100644
--- a/application/controllers/ConflictController.php
+++ b/application/controllers/ConflictController.php
@@ -62,10 +62,10 @@ EOF;
public function removeAction()
{
- $in = $this->_getAllParams();
+ $in = $this->getRequest();
$ids = array();
- for($i = 0; Zend_Filter::isInt($in['URI_PARAMS'][$i]); $i++) {
- $ids[] = $in['URI_PARAMS'][$i];
+ for($i = 0; Zend_Filter::isInt($in->getParam($i)); $i++) {
+ $ids[] = $in->getParam($i);
}
foreach($ids as $id) {
$id = Zend_Filter::getInt($id);
diff --git a/application/controllers/CourseadminController.php b/application/controllers/CourseadminController.php
index 59b802e5ad8e23e405e4d61cfdb27aeb5c9f5118..84e44f6f9fa941f61957b8d59bc300da6cadf1a5 100644
--- a/application/controllers/CourseadminController.php
+++ b/application/controllers/CourseadminController.php
@@ -18,16 +18,14 @@ class CourseAdminController extends Nmc_Controller_Action
public function indexAction()
{
- $in = new Zend_Filter_Input($this->_getAllParams());
- $uriParams = $this->_getAllParams();
- $uriParams = $uriParams['URI_PARAMS'];
+ $in = $this->getRequest();
$out = new Nmc_View_Unl();
- if(Zend_Filter::isInt($uriParams[0])) {
- $course = CourseGenerations::getInstance()->find($uriParams[0]);
+ if(Zend_Filter::isInt($in->getParam(0))) {
+ $course = CourseGenerations::getInstance()->find($in->getParam(0));
$crosslisting = $course->crosslistings[0];
} else {
- $crosslisting = CourseCrosslistings::fetchBySubjectNumberLetter($uriParams[0], $uriParams[1], $uriParams[2]);
+ $crosslisting = CourseCrosslistings::fetchBySubjectNumberLetter($in->getParam(0), $in->getParam(1), $in->getParam(2));
}
if(!$crosslisting) {
$course = CourseGenerations::getInstance()->fetchNew();
@@ -85,13 +83,12 @@ class CourseAdminController extends Nmc_Controller_Action
$out->assign('course', $course);
$out->assign('parentGeneration', $course->getParentGeneration());
$out->assign('childGenerations', $course->getChildGenerations());
- $out->assign('uriParams', $uriParams);
+ $out->assign('uriParams', $in->getParams());
echo $out->render('unl_index.xhtml');
}
public function updateCourseAction() {
- $uriParams = $this->_getAllParams();
- $uriParams = $uriParams['URI_PARAMS'];
+ $in = $this->getRequest();
$course = CourseGenerations::getInstance()->find($_POST['courseId']);
if(!$course) {
@@ -179,8 +176,8 @@ class CourseAdminController extends Nmc_Controller_Action
public function deleteCourseAction()
{
- $in = $this->_getAllParams();
- $courseId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $courseId = Zend_Filter::getInt($in->getParam(0));
if($courseId > 0) {
$course = CourseGenerations::getInstance()->find($courseId);
diff --git a/application/controllers/TestformController.php b/application/controllers/TestformController.php
index eb79bf1c798c7c58f73f8709ee4181f1334b0aef..66b7281e44dc687bec227097a93c2ff9382320f5 100644
--- a/application/controllers/TestformController.php
+++ b/application/controllers/TestformController.php
@@ -39,8 +39,8 @@ class TestFormController extends Nmc_Controller_Action
public function viewAction()
{
- $in = $this->_getAllParams();
- $id = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $id = Zend_Filter::getInt($in->getParam(0));
$table = new TestAddressBook();
$record = $table->find($id);
@@ -59,8 +59,8 @@ class TestFormController extends Nmc_Controller_Action
public function editAction()
{
- $in = $this->_getAllParams();
- $id = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $id = Zend_Filter::getInt($in->getParam(0));
$table = new TestAddressBook();
$record = $table->find($id);
@@ -72,8 +72,8 @@ class TestFormController extends Nmc_Controller_Action
public function saveAction()
{
- $in = new Zend_Filter_Input($this->_getAllParams());
- $id = $in->getInt('id');
+ $in = $this->getRequest();
+ $id = Zend_Filter::getInt($in->getPost('id'));
$table = new TestAddressBook();
if($id < 0) {
@@ -82,11 +82,11 @@ class TestFormController extends Nmc_Controller_Action
$record = $table->find($id);
}
- $record->firstName = $in->getAlnum('firstName');
- $record->lastName = $in->getAlnum('lastName');
- $record->phone = $in->getAlnum('phone');
- $record->address = $in->getAlnum('address');
- $record->zip = $in->getAlnum('zip');
+ $record->firstName = Zend_Filter::getAlnum($in->getPost('firstName'));
+ $record->lastName = Zend_Filter::getAlnum($in->getPost('lastName'));
+ $record->phone = Zend_Filter::getAlnum($in->getPost('phone'));
+ $record->address = Zend_Filter::getAlnum($in->getPost('address'));
+ $record->zip = Zend_Filter::getAlnum($in->getPost('zip'));
$record->save();
if($id < 0) {
diff --git a/application/controllers/UseradminController.php b/application/controllers/UseradminController.php
index 9fd40e7005647f1a8bfe8ccde94003d18d455488..a258ecfbcc51683da3ff9c691b0bad222d6acb33 100644
--- a/application/controllers/UseradminController.php
+++ b/application/controllers/UseradminController.php
@@ -16,8 +16,8 @@ class UserAdminController extends Nmc_Controller_Action
public function editUserAction()
{
- $in = $this->_getAllParams();
- $userId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $userId = Zend_Filter::getInt($in->getParam(0));
if($in['Submit'] == 'Submit') {
return $this->editUserActionPost();
@@ -40,23 +40,23 @@ class UserAdminController extends Nmc_Controller_Action
protected function editUserActionPost()
{
- $in = $this->_getAllParams();
- $userId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $userId = Zend_Filter::getInt($in->getParam(0));
if(!$userId) {
$user = People::getInstance()->fetchNew();
} else {
$user = People::getInstance()->find($userId);
}
- if($in['delete'] == '1') {
+ if($in->getPost('delete') == '1') {
$user->delete();
} else {
- $user->firstName = Zend_Filter::getAlnum($in['firstName']);
- $user->lastName = Zend_Filter::getAlnum($in['lastName']);
+ $user->firstName = Zend_Filter::getAlnum($in->getPost('firstName'));
+ $user->lastName = Zend_Filter::getAlnum($in->getPost('lastName'));
$user->save();
}
- $selectedGroups = Groups::getInstance()->findAll($in['groups']);
+ $selectedGroups = Groups::getInstance()->findAll($in->getPost('groups'));
$currentGroups = $user->getGroups(false);
$removedGroups = $currentGroups->getRowsNotInCommonWith($selectedGroups);
@@ -79,10 +79,10 @@ class UserAdminController extends Nmc_Controller_Action
public function editGroupAction()
{
- $in = $this->_getAllParams();
- $groupId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $groupId = Zend_Filter::getInt($in->getParam(0));
- if($in['Submit'] == 'Submit') {
+ if($in->getPost('Submit') == 'Submit') {
return $this->editGroupActionPost();
}
@@ -105,8 +105,8 @@ class UserAdminController extends Nmc_Controller_Action
protected function editGroupActionPost()
{
- $in = $this->_getAllParams();
- $groupId = Zend_Filter::getInt($in['URI_PARAMS'][0]);
+ $in = $this->getRequest();
+ $groupId = Zend_Filter::getInt($in->getParam(0));
if(!$groupId) {
$group = Groups::getInstance()->fetchNew();
$group->type = 1;
@@ -114,15 +114,15 @@ class UserAdminController extends Nmc_Controller_Action
$group = Groups::getInstance()->find($groupId);
}
- if($in['delete'] == '1') {
+ if($in->getPost('delete') == '1') {
$group->delete();
} else {
- $group->name = $in['name'];
- $group->description = $in['description'];
+ $group->name = $in->getPost('name');
+ $group->description = $in->getPost('description');
$group->save();
}
- $selectedGroups = Groups::getInstance()->findAll($in['groups']);
+ $selectedGroups = Groups::getInstance()->findAll($in->getPost('groups'));
$currentGroups = $group->getGroups(false);
$removedGroups = $currentGroups->getRowsNotInCommonWith($selectedGroups);
@@ -137,7 +137,7 @@ class UserAdminController extends Nmc_Controller_Action
$group->addGroup($newGroup);
}
- $selectedUsers = People::getInstance()->findByUserId($in['users']);
+ $selectedUsers = People::getInstance()->findByUserId($in->getPost('users'));
$currentUsers = $group->getUsers(false);
$removedUsers = $currentUsers->getRowsNotInCommonWith($selectedUsers);
diff --git a/document_root/index.php b/document_root/index.php
index 6611e6702346a43ff64d2164dd41bce5dec20ee8..e28237aefcdcc0a7dec6ec4ef8a6b877ab44da1b 100644
--- a/document_root/index.php
+++ b/document_root/index.php
@@ -28,7 +28,7 @@ $router->addRoute('compat_params', $default_route);
$controller = Zend_Controller_Front::getInstance();
$controller->setRouter($router);
$controller->setControllerDirectory(APPLICATION_PATH . '/controllers');
-$controller->registerPlugin(new Nmc_Controller_Plugin_Http());
+//$controller->registerPlugin(new Nmc_Controller_Plugin_Http());
$controller->dispatch();
?>