summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-21 14:03:56 +0200
committermichael pereira2011-04-21 14:03:56 +0200
commit583ccfa017f2a57776d70cf1b80a7dbb1228124c (patch)
treec58419423f503e31ec06b547e6c2ec4fbe554109 /application/controllers
parentmerges (diff)
downloadpbs2-583ccfa017f2a57776d70cf1b80a7dbb1228124c.tar.gz
pbs2-583ccfa017f2a57776d70cf1b80a7dbb1228124c.tar.xz
pbs2-583ccfa017f2a57776d70cf1b80a7dbb1228124c.zip
updates raus
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ErrorController.php4
-rw-r--r--application/controllers/ResourceController.php10
2 files changed, 2 insertions, 12 deletions
diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index abf3ec1..a9a448d 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -26,13 +26,13 @@ class ErrorController extends Zend_Controller_Action
$this->getResponse()->setHttpResponseCode(404);
$this->view->message = 'Page not found';
$this->_redirect('/user/');
- # print_a($errors);
+ print_a($errors);
break;
default:
// application error
$this->getResponse()->setHttpResponseCode(500);
$this->view->message = 'Application error - Please contact the admin';
- # print_a($errors);
+ print_a($errors);
break;
}
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 88ec38e..5790dbd 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -34,8 +34,6 @@ class ResourceController extends Zend_Controller_Action
$membershipMapper = new Application_Model_MembershipMapper();
$this->membership = new Application_Model_Membership();
$this->rightrolesMapper = new Application_Model_RightRolesMapper();
-
- $rightroles = new Application_Model_RightRoles();
@list($this->membership) = $membershipMapper->findBy(array('apikey' => $apikey));
if($this->membership == null){
@@ -125,9 +123,6 @@ class ResourceController extends Zend_Controller_Action
$bootos->setOptions($params);
$bootos->setGroupID($groupID);
$bootos->setSource($source);
- $bootos->setPath_config($_FILES['config']['name']);
- $bootos->setPath_init($_FILES['init']['name']);
- $bootos->setPath_kernel($_FILES['kernel']['name']);
$bootos->setCreated(time());
$bootos->setPublic('-1');
$bootosID = $bootosMapper->save($bootos);
@@ -194,9 +189,6 @@ class ResourceController extends Zend_Controller_Action
$bootos->setID($bootosID);
$bootos->setGroupID($groupID);
$bootos->setSource($_SERVER['REMOTE_ADDR']);
- $bootos->setPath_config($_FILES['config']['name']);
- $bootos->setPath_init($_FILES['init']['name']);
- $bootos->setPath_kernel($_FILES['kernel']['name']);
$bootos->setCreated(time());
$bootos->setPublic('-1');
@@ -266,7 +258,6 @@ class ResourceController extends Zend_Controller_Action
$preboot->setOptions($params);
$preboot->setGroupID($groupID);
$preboot->setSource($source);
- $preboot->setPath_preboot($_FILES['preboot']['name']);
$preboot->setCreated(time());
$prebootID = $prebootMapper->save($preboot);
@@ -327,7 +318,6 @@ class ResourceController extends Zend_Controller_Action
$preboot->setOptions($params);
$preboot->setGroupID($groupID);
$preboot->setSource($source);
- $preboot->setPath_preboot($_FILES['preboot']['name']);
$preboot->setCreated(time());
$prebootMapper->save($preboot);