summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/SessionController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-04-05 18:13:19 +0200
committerBjörn Geiger2011-04-05 18:13:19 +0200
commit9af50098ab0cd1412c8db21da090ef526b9da592 (patch)
tree09717998529795c7abc085b423667e942797f106 /application/modules/user/controllers/SessionController.php
parentSearch in Group, Person und Role (diff)
parentfilter table repariert (diff)
downloadpbs2-9af50098ab0cd1412c8db21da090ef526b9da592.tar.gz
pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.tar.xz
pbs2-9af50098ab0cd1412c8db21da090ef526b9da592.zip
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/SessionController.php')
-rw-r--r--application/modules/user/controllers/SessionController.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index d149f22..3768af9 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -18,6 +18,7 @@ class User_SessionController extends Zend_Controller_Action
} else {
$this->_helper->redirector('login', 'auth');
}
+
$this->page = $this->_request->getParam('page');
}
@@ -53,14 +54,15 @@ class User_SessionController extends Zend_Controller_Action
$personMapper->find($personID,$p);
$session->setMembershipID("[".$session->getMembershipID()."] ".$p->getFirstname()." ".$p->getName());
- }
+ }
+ $session->setTime(date(Zend_Registry::get('dateformat'),$session->getTime()));
$mySessions[] =$session;
}
}
// Sort after date/id
usort($mySessions, function($func_a, $func_b) {
if($func_a->getID() == $func_b->getID()) return 0;
- return ($func_a->getID() < $func_b->getID()) ? -1 : 1;
+ return ($func_a->getID() < $func_b->getID()) ? 1 : -1;
});
// Search