summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-26 11:16:17 +0200
committerSebastian Wagner2011-10-26 11:16:17 +0200
commitc16a9e9108d6fccf42bd22be58a7c051cc21afa8 (patch)
tree2de327118130f21f7d0888590f44923a277c404c /application/controllers
parentbugfix (diff)
downloadpoolctrl-c16a9e9108d6fccf42bd22be58a7c051cc21afa8.tar.gz
poolctrl-c16a9e9108d6fccf42bd22be58a7c051cc21afa8.tar.xz
poolctrl-c16a9e9108d6fccf42bd22be58a7c051cc21afa8.zip
drop/resize conflict free implemented
Diffstat (limited to 'application/controllers')
-rwxr-xr-xapplication/controllers/EventController.php36
1 files changed, 20 insertions, 16 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 9c75295..fd7ff9b 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1330,25 +1330,29 @@ class EventController extends Zend_Controller_Action
$this->_helper->viewRenderer->setNoRender();
$cfevents = $this->getRequest()->getParam('cfevents');
+ $cfeventsJSON = Zend_Json::decode($cfevents);
$evmindelta = $this->getRequest()->getParam('evmindelta');
$poolID = $this->getRequest()->getParam('poolID');
- $events = null;
-
- if($cfevents!=null) {
- foreach($cfevents as $e) {
- $event = new Application_Model_Event($e);
- $events[] = $event;
- }
- }
-
- if ($events!=null) {
-
- /*if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) {
- if (!$this->acl->checkRight('edo')) {
- $this->_redirect('/');
- }
- }*/
+ $events = null;
+
+ if($cfeventsJSON!=null) {
+ foreach($cfeventsJSON as $e) {
+ $event = new Application_Model_Event($e);
+ $event->setID($e['eventID']);
+ $events[] = $event;
+ }
+ }
+
+ if ($events!=null) {
+
+ if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) {
+ if (!$this->acl->checkRight('edo')) {
+ $this->_redirect('/');
+ }
+ }
+
+ // event resize to the past - check
try {
foreach($events as $event) {
if($event->getRunning() == 0) {