summaryrefslogtreecommitdiffstats
path: root/application/controllers/ResourceController.php
diff options
context:
space:
mode:
authorSimon2011-04-21 17:13:59 +0200
committerSimon2011-04-21 17:13:59 +0200
commit851c7a2f0975f809c4ee603c902548180f55d0f1 (patch)
tree3b4f38af347660780910616260321e02d6880754 /application/controllers/ResourceController.php
parentKleine Änderungen (diff)
parentcleanup (diff)
downloadpbs2-851c7a2f0975f809c4ee603c902548180f55d0f1.tar.gz
pbs2-851c7a2f0975f809c4ee603c902548180f55d0f1.tar.xz
pbs2-851c7a2f0975f809c4ee603c902548180f55d0f1.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers/ResourceController.php')
-rw-r--r--application/controllers/ResourceController.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 3547818..4958f68 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -233,11 +233,10 @@ class ResourceController extends Zend_Controller_Action
$params = $this->_request->getParams();
$source = $_SERVER['REMOTE_ADDR'];
- if($params['title'] == ''){
- header('HTTP/1.0 400 Title must be set');
+ if($params['title'] == '' || $_FILES['preboot']['name'] == ''){
+ header('HTTP/1.0 400 Title and Preboot must be set');
die();
}
-
if($_FILES['preboot']['size'] == 0 && $_FILES['preboot']['name'] != ''){
header('HTTP/1.0 400 File must be larger than 0 bytes');
@@ -292,7 +291,7 @@ class ResourceController extends Zend_Controller_Action
$params = $this->_request->getParams();
$source = $_SERVER['REMOTE_ADDR'];
- if($params['title'] == ''){
+ if($params['title'] == '' || $_FILES['preboot']['name'] == ''){
header('HTTP/1.0 400 Title must be set');
die();
}