summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorBjörn Geiger2011-11-15 15:05:03 +0100
committerBjörn Geiger2011-11-15 15:05:03 +0100
commit145695a16c62abbd99df4aed80a60e54d09d369b (patch)
tree4e45dbca8f0e7d2fa5bd6932da1fe9372a008b5f /application/controllers
parentMerge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl (diff)
downloadpoolctrl-145695a16c62abbd99df4aed80a60e54d09d369b.tar.gz
poolctrl-145695a16c62abbd99df4aed80a60e54d09d369b.tar.xz
poolctrl-145695a16c62abbd99df4aed80a60e54d09d369b.zip
Code Cleaning und verschiedene kleine Korrekturen
Diffstat (limited to 'application/controllers')
-rwxr-xr-xapplication/controllers/AuthController.php12
-rwxr-xr-xapplication/controllers/EventController.php345
-rwxr-xr-xapplication/controllers/PersonController.php8
3 files changed, 51 insertions, 314 deletions
diff --git a/application/controllers/AuthController.php b/application/controllers/AuthController.php
index b3f6bbf..bac4855 100755
--- a/application/controllers/AuthController.php
+++ b/application/controllers/AuthController.php
@@ -46,20 +46,22 @@ class AuthController extends Zend_Controller_Action
$loginForm = new Application_Form_Login($_POST);
if ($loginForm->isValid($_POST)) {
$membershipSession = new Zend_Session_Namespace('memberships');
- if($this->pbs2Api->login($loginForm->getValue('email'), $loginForm->getValue('password'), $membershipSession)) {
+ $error = "";
+ $personID = "";
+ $apikey = "";
+ if($this->pbs2Api->login($loginForm->getValue('email'), $loginForm->getValue('password'), $membershipSession, $error, $personID, $apikey)) {
+ $membershipNamespace = $membershipSession->getIterator();
$personSession = new Zend_Session_Namespace('persons');
- $this->pbs2Api->getPerson($personSession);
+ $this->pbs2Api->getPerson($personSession, $apikey);
$userSession = new Zend_Session_Namespace('userIDs');
- $userSession->personID = sprintf("%s", $login->personid);
+ $userSession->personID = sprintf("%s", $personID);
$authSession = new Zend_Session_Namespace('auth');
$authSession->storage = $loginForm->getValue('email');
$this->_helper->redirector('selectmembership', 'person');
- return;
} else {
- $error = sprintf("%s", $login->error);
if($error == "wrong email or password") {
$poolctrlNotifier = new Poolctrl_Notifier();
$this->view->notification = $poolctrlNotifier->notify('Wrong Email or Password', 'error');
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 6ce76ba..29ffe71 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -10,6 +10,7 @@
* General information about OpenSLX can be found at http://openslx.org/
*/
+
class EventController extends Zend_Controller_Action
{
protected $eventMapper;
@@ -626,39 +627,14 @@ class EventController extends Zend_Controller_Action
$this->view->past = true;
}
-
- $enewstart = date('Y-m-d H:i:s', strtotime($e['start']) + $diff);
- $summertimeStart = intval(date('I', strtotime($e['start'])));
- if($summertimeStart) {
- if(!date('I', strtotime($enewstart))) {
- $enewstart = date('Y-m-d H:i:s', strtotime($enewstart) + 60 * 60);
- $summertimeStart = 0;
- }
- } else {
- if(date('I', strtotime($enewstart))) {
- $enewstart = date('Y-m-d H:i:s', strtotime($enewstart) - 60 * 60);
- $summertimeStart = 1;
- }
- }
+ $enewstart = date('Y-m-d H:i:s', $this->checkTimeChange(strtotime($e['start']), strtotime($e['start']) + $diff));
if(!isset($e['end'])) {
$e['end'] = date('Y-m-d H:i:s', strtotime($e['start']) + 300);
$e['endSet'] = true;
} else {
$e['endSet'] = false;
}
- $enewend = date('Y-m-d H:i:s', strtotime($e['end']) + $diff);
- $summertimeEnd = intval(date('I', strtotime($e['start'])));
- if($summertimeEnd) {
- if(!date('I', strtotime($enewend))) {
- $enewend = date('Y-m-d H:i:s', strtotime($enewend) + 60 * 60);
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', strtotime($enewend))) {
- $enewend = date('Y-m-d H:i:s', strtotime($enewend) - 60 * 60);
- $summertimeEnd = 1;
- }
- }
+ $enewend = date('Y-m-d H:i:s', $this->checkTimeChange(strtotime($e['end']), strtotime($e['end']) + $diff));
$cfv = true;
$event = new Application_Model_Event($e);
$event->setID($e['eventID']);
@@ -813,20 +789,7 @@ class EventController extends Zend_Controller_Action
$event = new Application_Model_Event($e);
$event->setID($e['eventID']);
$enewstart = date('Y-m-d H:i:s', strtotime($e['start']));
- $enewend = date('Y-m-d H:i:s', strtotime($e['end']) + $diffDelta);
- $summertimeEnd = intval(date('I', strtotime($e['start'])));
- if($summertimeEnd) {
- if(!date('I', strtotime($enewend))) {
- $enewend = date('Y-m-d H:i:s', strtotime($enewend) + 60 * 60);
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', strtotime($enewend))) {
- $enewend = date('Y-m-d H:i:s', strotitime($enewend) - 60 * 60);
- $summertimeEnd = 1;
- }
- }
-
+ $enewend = date('Y-m-d H:i:s', $this->checkTimeChange(strtotime($e['end']), strtotime($e['end']) + $diffDelta));
$cfv = true;
// overlap events
@@ -950,44 +913,20 @@ class EventController extends Zend_Controller_Action
$count = 1;
foreach($events as $event) {
if($event->getRunning() == 0 && $event->getRepeat() == 1) {
- $summertimeStart = intval(date('I', strtotime($event->getStart())));
//1min = 60sec, 1d = 86400sec
$oldStartTime = date('H:i', strtotime($event->getStart()));
$oldStartDate = date('d.m.Y', strtotime($event->getStart()));
- $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400);
+ $evstartTime = $this->checkTimeChange(strtotime($event->getStart()), strtotime($event->getStart()) + intval($evmindelta*60) + intval($evdaydelta*86400));
$newStartTime = date('H:i', $evstartTime);
$newStartDate = date('d.m.Y', $evstartTime);
- if($summertimeStart) {
- if(!date('I', $evstartTime)) {
- $evstartTime = $evstartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $evstartTime)) {
- $evstartTime = $evstartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$eventStart = date('Y-m-d H:i:s', $evstartTime);
$event->setStart($eventStart);
if($event->getEnd()) {
- $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
$oldEndTime = date('H:i', strtotime($event->getEnd()));
$oldEndDate = date('d.m.Y', strtotime($event->getEnd()));
- $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400);
+ $evendTime = $this->checkTimeChange(strtotime($event->getEnd()), strtotime($event->getEnd()) + intval($evmindelta*60) + intval($evdaydelta*86400));
$newEndTime = date('H:i', $evendTime);
$newEndDate = date('d.m.Y', $evendTime);
- if($summertimeEnd) {
- if(!date('I', $evendTime)) {
- $evendTime = $evendTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $evendTime)) {
- $evendTime = $evendTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$eventEnd = date('Y-m-d H:i:s', $evendTime);
$event->setEnd($eventEnd);
}
@@ -1098,44 +1037,20 @@ class EventController extends Zend_Controller_Action
$count = 1;
foreach($events as $event) {
if($event->getRunning() == 0 && $event->getRepeat() == 1) {
- $summertimeStart = intval(date('I', strtotime($event->getStart())));
//1min = 60sec, 1d = 86400sec
$oldStartTime = date('H:i', strtotime($event->getStart()));
$oldStartDate = date('d.m.Y', strtotime($event->getStart()));
- $evstartTime = intval(strtotime($event->getStart())) + intval($evmindelta*60) + intval($evdaydelta*86400);
+ $evstartTime = $this->checkTimeChange(strtotime($event->getStart()), strtotime($event->getStart()) + intval($evmindelta*60) + intval($evdaydelta*86400));
$newStartTime = date('H:i', $evstartTime);
$newStartDate = date('d.m.Y', $evstartTime);
- if($summertimeStart) {
- if(!date('I', $evstartTime)) {
- $evstartTime = $evstartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $evstartTime)) {
- $evstartTime = $evstartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$eventStart = date('Y-m-d H:i:s', $evstartTime);
$event->setStart($eventStart);
if($event->getEnd()) {
- $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
$oldEndTime = date('H:i', strtotime($event->getEnd()));
$oldEndDate = date('d.m.Y', strtotime($event->getEnd()));
- $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60) + intval($evdaydelta*86400);
+ $evendTime = $this->checkTimeChange(strtotime($event->getEnd()), strtotime($event->getEnd()) + intval($evmindelta*60) + intval($evdaydelta*86400));
$newEndTime = date('H:i', $evendTime);
$newEndDate = date('d.m.Y', $evendTime);
- if($summertimeEnd) {
- if(!date('I', $evendTime)) {
- $evendTime = $evendTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $evendTime)) {
- $evendTime = $evendTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$eventEnd = date('Y-m-d H:i:s', $evendTime);
$event->setEnd($eventEnd);
}
@@ -1260,19 +1175,7 @@ class EventController extends Zend_Controller_Action
$count = 1;
foreach($events as $event) {
if($event->getRunning() == 0 && $event->getRepeat() == 1) {
- $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
- $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60);
- if($summertimeEnd) {
- if(!date('I', $evendTime)) {
- $evendTime = $evendTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $evendTime)) {
- $evendTime = $evendTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
+ $evendTime = $this->checkTimeChange(strtotime($event->getEnd()), strtotime($event->getEnd()) + intval($evmindelta*60));
$eventEnd = date('Y-m-d H:i:s', $evendTime);
$event->setPbs_poolID($poolID);
if($count == 1) {
@@ -1370,19 +1273,7 @@ class EventController extends Zend_Controller_Action
$count = 1;
foreach($events as $event) {
if($event->getRunning() == 0) {
- $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
- $evendTime = intval(strtotime($event->getEnd())) + intval($evmindelta*60);
- if($summertimeEnd) {
- if(!date('I', $evendTime)) {
- $evendTime = $evendTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $evendTime)) {
- $evendTime = $evendTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
+ $evendTime = $this->checkTimeChange(strtotime($event->getEnd()), strtotime($event->getEnd()) + intval($evmindelta*60));
$eventEnd = date('Y-m-d H:i:s', $evendTime);
$event->setPbs_poolID($poolID);
if($count == 1) {
@@ -1995,10 +1886,6 @@ class EventController extends Zend_Controller_Action
$repeatendMapper = new Application_Model_RepeatendMapper();
$repeatend = new Application_Model_Repeatend();
$repeatendMapper->find($event->getRepeatend(), $repeatend);
- $summertimeStart = intval(date('I', strtotime($event->getStart())));
- if($event->getEnd()) {
- $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
- }
$newEvent = clone $event;
$startDate = date('d.m.Y', strtotime($event->getStart()));
if($event->getEnd()) {
@@ -2014,40 +1901,18 @@ class EventController extends Zend_Controller_Action
$filterentriesID3 = $this->pbs2Api->addFilterentry($event->getPbs_filterID(), 11, strtotime($startDate), strtotime($endDate));
}
$onedaytime = 24 * 60 * 60;
- $newStartTime = strtotime($newEvent->getStart()) + $onedaytime;
+ $newStartTime = $this->checkTimeChange(strtotime($newEvent->getStart()), strtotime($newEvent->getStart()) + $onedaytime);
if($newEvent->getEnd()) {
- $newEndTime = strtotime($newEvent->getEnd()) + $onedaytime;
+ $newEndTime = $this->checkTimeChange(strtotime($newEvent->getEnd()), strtotime($newEvent->getEnd()) + $onedaytime);
}
if($repeatend->getTitle() == 'After') {
$repeatings = intval($newEvent->getRepeatings());
for($i = 0; $i < $repeatings; $i++) {
- if($summertimeStart) {
- if(!date('I', $newStartTime)) {
- $newStartTime = $newStartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $newStartTime)) {
- $newStartTime = $newStartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$newEvent->setStart(date('Y-m-d H:i', $newStartTime));
- $newStartTime = $newStartTime + $onedaytime;
+ $newStartTime = $this->checkTimeChange($newStartTime, $newStartTime + $onedaytime);
if(isset($newEndTime)) {
- if($summertimeEnd) {
- if(!date('I', $newEndTime)) {
- $newEndTime = $newEndTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $newEndTime)) {
- $newEndTime = $newEndTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$newEvent->setEnd(date('Y-m-d H:i', $newEndTime));
- $newEndTime = $newEndTime + $onedaytime;
+ $newEndTime = $this->checkTimeChange($newEndTime, $newEndTime + $onedaytime);
}
$events[$i + 1] = $newEvent;
if($newEvent->getCategory() != $shutdownCategory->getID()) {
@@ -2065,33 +1930,11 @@ class EventController extends Zend_Controller_Action
$repeatendtime = strtotime($newEvent->getRepeatdate());
$i = 1;
while($newStartTime <= $repeatendtime) {
- if($summertimeStart) {
- if(!date('I', $newStartTime)) {
- $newStartTime = $newStartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $newStartTime)) {
- $newStartTime = $newStartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$newEvent->setStart(date('Y-m-d H:i', $newStartTime));
- $newStartTime = $newStartTime + $onedaytime;
+ $newStartTime = $this->checkTimeChange($newStartTime, $newStartTime + $onedaytime);
if(isset($newEndTime)) {
- if($summertimeEnd) {
- if(!date('I', $newEndTime)) {
- $newEndTime = $newEndTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $newEndTime)) {
- $newEndTime = $newEndTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$newEvent->setEnd(date('Y-m-d H:i', $newEndTime));
- $newEndTime = $newEndTime + $onedaytime;
+ $newEndTime = $this->checkTimeChange($newEndTime, $newEndTime + $onedaytime);
}
$events[$i] = $newEvent;
if($newEvent->getCategory() != $shutdownCategory->getID()) {
@@ -2116,40 +1959,18 @@ class EventController extends Zend_Controller_Action
$filterentriesID3 = $this->pbs2Api->addFilterentry($newEvent->getPbs_filterID(), 10, $weekday, $weekday);
}
$oneweektime = 7 * 24 * 60 * 60;
- $newStartTime = strtotime($newEvent->getStart()) + $oneweektime;
+ $newStartTime = $this->checkTimeChange(strtotime($newEvent->getStart()), strtotime($newEvent->getStart()) + $oneweektime);
if($newEvent->getEnd()) {
- $newEndTime = strtotime($newEvent->getEnd()) + $oneweektime;
+ $newEndTime = $this->checkTimeChange(strtotime($newEvent->getStart()), strtotime($newEvent->getEnd()) + $oneweektime);
}
if($repeatend->getTitle() == 'After') {
$repeatings = intval($newEvent->getRepeatings());
for($i = 0; $i < $repeatings; $i++) {
- if($summertimeStart) {
- if(!date('I', $newStartTime)) {
- $newStartTime = $newStartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $newStartTime)) {
- $newStartTime = $newStartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$newEvent->setStart(date('Y-m-d H:i', $newStartTime));
- $newStartTime = $newStartTime + $oneweektime;
+ $newStartTime = $this->checkTimeChange($newStartTime, $newStartTime + $oneweektime);
if(isset($newEndTime)) {
- if($summertimeEnd) {
- if(!date('I', $newEndTime)) {
- $newEndTime = $newEndTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $newEndTime)) {
- $newEndTime = $newEndTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$newEvent->setEnd(date('Y-m-d H:i', $newEndTime));
- $newEndTime = $newEndTime + $oneweektime;
+ $newEndTime = $this->checkTimeChange($newEndTime, $newEndTime + $oneweektime);
}
$events[$i + 1] = $newEvent;
$newEvent = clone $newEvent;
@@ -2158,33 +1979,11 @@ class EventController extends Zend_Controller_Action
$repeatendtime = strtotime($newEvent->getRepeatdate());
$i = 1;
while($newStartTime <= $repeatendtime) {
- if($summertimeStart) {
- if(!date('I', $newStartTime)) {
- $newStartTime = $newStartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $newStartTime)) {
- $newStartTime = $newStartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$newEvent->setStart(date('Y-m-d H:i', $newStartTime));
- $newStartTime = $newStartTime + $oneweektime;
+ $newStartTime = $this->checkTimeChange($newStartTime, $newStartTime + $oneweektime);
if(isset($newEndTime)) {
- if($summertimeEnd) {
- if(!date('I', $newEndTime)) {
- $newEndTime = $newEndTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $newEndTime)) {
- $newEndTime = $newEndTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$newEvent->setEnd(date('Y-m-d H:i', $newEndTime));
- $newEndTime = $newEndTime + $oneweektime;
+ $newEndTime = $this->checkTimeChange($newEndTime, $newEndTime + $oneweektime);
}
$events[$i] = $newEvent;
$newEvent = clone $newEvent;
@@ -2199,40 +1998,18 @@ class EventController extends Zend_Controller_Action
$filterentriesID3 = $this->pbs2Api->addFilterentry($event->getPbs_filterID(), 11, strtotime($startDate), strtotime($endDate));
}
$twoweekstime = 14 * 24 * 60 * 60;
- $newStartTime = strtotime($newEvent->getStart()) + $twoweekstime;
+ $newStartTime = $this->checkTimeChange(strtotime($newEvent->getStart()), strtotime($newEvent->getStart()) + $twoweekstime);
if($newEvent->getEnd()) {
- $newEndTime = strtotime($newEvent->getEnd()) + $twoweekstime;
+ $newEndTime = $this->checkTimeChange(strtotime($newEvent->getEnd()), strtotime($newEvent->getEnd()) + $twoweekstime);
}
if($repeatend->getTitle() == 'After') {
$repeatings = intval($newEvent->getRepeatings());
for($i = 0; $i < $repeatings; $i++) {
- if($summertimeStart) {
- if(!date('I', $newStartTime)) {
- $newStartTime = $newStartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $newStartTime)) {
- $newStartTime = $newStartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$newEvent->setStart(date('Y-m-d H:i', $newStartTime));
- $newStartTime = $newStartTime + $twoweekstime;
+ $newStartTime = $this->checkTimeChange($newStartTime, $newStartTime + $twoweekstime);
if(isset($newEndTime)) {
- if($summertimeEnd) {
- if(!date('I', $newEndTime)) {
- $newEndTime = $newEndTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $newEndTime)) {
- $newEndTime = $newEndTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$newEvent->setEnd(date('Y-m-d H:i', $newEndTime));
- $newEndTime = $newEndTime + $twoweekstime;
+ $newEndTime = $this->checkTimeChange($newEndTime, $newEndTime + $twoweekstime);
}
$events[$i + 1] = $newEvent;
if($newEvent->getCategory() != $shutdownCategory->getID()) {
@@ -2250,33 +2027,11 @@ class EventController extends Zend_Controller_Action
$repeatendtime = strtotime($newEvent->getRepeatdate());
$i = 1;
while($newStartTime <= $repeatendtime) {
- if($summertimeStart) {
- if(!date('I', $newStartTime)) {
- $newStartTime = $newStartTime + 60 * 60;
- $summertimeStart = 0;
- }
- } else {
- if(date('I', $newStartTime)) {
- $newStartTime = $newStartTime - 60 * 60;
- $summertimeStart = 1;
- }
- }
$newEvent->setStart(date('Y-m-d H:i', $newStartTime));
- $newStartTime = $newStartTime + $twoweekstime;
+ $newStartTime = $this->checkTimeChange($newStartTime, $newStartTime + $twoweekstime);
if(isset($newEndTime)) {
- if($summertimeEnd) {
- if(!date('I', $newEndTime)) {
- $newEndTime = $newEndTime + 60 * 60;
- $summertimeEnd = 0;
- }
- } else {
- if(date('I', $newEndTime)) {
- $newEndTime = $newEndTime - 60 * 60;
- $summertimeEnd = 1;
- }
- }
$newEvent->setEnd(date('Y-m-d H:i', $newEndTime));
- $newEndTime = $newEndTime + $twoweekstime;
+ $newEndTime = $this->checkTimeChange($newEndTime, $newEndTime + $twoweekstime);
}
$events[$i] = $newEvent;
if($newEvent->getCategory() != $shutdownCategory->getID()) {
@@ -2506,39 +2261,11 @@ class EventController extends Zend_Controller_Action
if($event->getRunning() == 0 && $event->getRepeat() == 1) {
$event->setOptions($diff);
if(isset($diffStart)) {
- $summertimeStart = intval(date('I', strtotime($event->getStart())));
- $newSummertimeStart = intval(date('I', strtotime($event->getStart()) + $diffStart));
- if($summertimeStart) {
- if(!$newSummertimeStart) {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart + 3600);
- } else {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart);
- }
- } else {
- if($newSummertimeStart) {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart - 3600);
- } else {
- $newStart = date('Y-m-d H:i:s', strtotime($event->getStart()) + $diffStart);
- }
- }
+ $newStart = date('Y-m-d H:i:s', $this->checkTimeChange(strtotime($event->getStart()), strtotime($event->getStart()) + $diffStart));
$event->setStart($newStart);
}
if(isset($diffEnd)) {
- $summertimeEnd = intval(date('I', strtotime($event->getEnd())));
- $newSummertimeEnd = intval(date('I', strtotime($event->getEnd()) + $diffEnd));
- if($summertimeEnd) {
- if(!$newSummertimeEnd) {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd + 3600);
- } else {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd);
- }
- } else {
- if($newSummertimeEnd) {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd - 3600);
- } else {
- $newEnd = date('Y-m-d H:i:s', strtotime($event->getEnd()) + $diffEnd);
- }
- }
+ $newEnd = date('Y-m-d H:i:s', $this->checkTimeChange(strtotime($event->getEnd()), strtotime($event->getEnd()) + $diffEnd));
$event->setEnd($newEnd);
}
}
@@ -2662,4 +2389,16 @@ class EventController extends Zend_Controller_Action
}
return $overlapping;
}
+
+ private function checkTimeChange($oldTime, $newTime) {
+ if(date('I', $oldTime)) {
+ if(!date('I', $newTime)) {
+ return $newTime + 3600;
+ }
+ } else {
+ if(date('I', $newTime)) {
+ return $newTime - 3600;
+ }
+ }
+ }
}
diff --git a/application/controllers/PersonController.php b/application/controllers/PersonController.php
index 72ef196..79bb92d 100755
--- a/application/controllers/PersonController.php
+++ b/application/controllers/PersonController.php
@@ -83,17 +83,13 @@ class PersonController extends Zend_Controller_Action
if($useGroupnamespace) {
$group = $groups[$groupID];
} else {
- $this->pbs2Api->getGroup($groupSession, $groupID);
+ $group = $this->pbs2Api->getGroup($groupSession, $groupID, $membership->getApikey());
}
$roleID = $membership->getRoleID();
if($useRolenamespace) {
$role = $roles[$roleID];
} else {
- $roleApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getrole'] . $membership->getApikey(), 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
- $roleXMLString = $roleApiResult['http-body'];
- if(strlen($roleXMLString) > 0) {
- $this->pbs2Api->getRole($roleSession, $roleID);
- }
+ $role = $this->pbs2Api->getRole($roleSession, $roleID, $membership->getApikey());
}
$apikeys[$group->getID()] = $membership->getApikey();
$this->groups[$group->getID()] = array (