summaryrefslogtreecommitdiffstats
path: root/application/controllers/ResourceController.php
diff options
context:
space:
mode:
authormichael pereira2011-04-14 11:09:05 +0200
committermichael pereira2011-04-14 11:09:05 +0200
commitafe05e297c7a815c0fefdcd58f5388f1d4d81de5 (patch)
tree630189e9e6c6b8a902417893c08fee0d07cd7311 /application/controllers/ResourceController.php
parentdebug msg aus fbgui raus (diff)
downloadpbs2-afe05e297c7a815c0fefdcd58f5388f1d4d81de5.tar.gz
pbs2-afe05e297c7a815c0fefdcd58f5388f1d4d81de5.tar.xz
pbs2-afe05e297c7a815c0fefdcd58f5388f1d4d81de5.zip
Es werden keine Sessions mehr angelegt wenn ein Admin die Bootmenuentries testen will
Diffstat (limited to 'application/controllers/ResourceController.php')
-rw-r--r--application/controllers/ResourceController.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index ee748da..de08859 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -14,9 +14,8 @@ class ResourceController extends Zend_Controller_Action
$session = new Application_Model_Session();
$sm = new Application_Model_SessionMapper();
- $bootmenuentryID = $this->_request->getParam('bootmenuentryID');
//TODO Error Messages if something failed
- if(!isset($bootmenuentryID)){
+ if($this->_request->getParam('alpha') != 0){
$alphasessionID = $this->_request->getParam('alpha');
$result = $sm->findBy(array('alphasessionID' => $alphasessionID),true);
# print_a($result);
@@ -24,8 +23,9 @@ class ResourceController extends Zend_Controller_Action
$this->thisSession->setID($result[0]['sessionID']);
}
else{
- $this->page = $this->_request->getParam('page');
$bootmenuentryID = $this->_request->getParam('bootmenuentryID');
+
+ $this->page = $this->_request->getParam('page');
if(!is_numeric($bootmenuentryID))
$this->_redirect('/user/bootmenu/index/page/'.$this->page.'/json/error');
@@ -33,16 +33,16 @@ class ResourceController extends Zend_Controller_Action
$bootmenuentryMapper = new Application_Model_BootMenuEntriesMapper();
$bootosMapper = new Application_Model_BootOsMapper();
$bootmenuentryMapper->find($bootmenuentryID, $bootmenuentry);
-
- $n = new Pbs_Session();
-
+
$session->setBootosID($bootmenuentry->getBootosID())
->setBootmenuentryID($bootmenuentry->getID())
->setTime(time())
->setMembershipID($bootosMapper->find($bootmenuentry->getBootmenuID())->getMembershipID())
- ->setIp($_SERVER['REMOTE_ADDR']);
+ ->setIp($_SERVER['REMOTE_ADDR'])
+ ->setAlphasessionID('0');
+
+ $this->thisSession = $session;
- $this->thisSession = $n->createSession($session);
}
}
@@ -208,7 +208,7 @@ class ResourceController extends Zend_Controller_Action
private function generateURL($action, $varname, $varvalue, $filename){
- $path = '/resource/'. $action .'/' . $varname .'/' . $varvalue .'/file/' . $filename ;
+ $path = '/resource/'. $action .'/' . $varname .'/' . $varvalue .'/bootmenuentryID/'.$this->thisSession->getBootmenuentryID().'/file/' . $filename ;
$path = "http://" . $_SERVER['SERVER_NAME'] . $path;
return $path;
}