WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use getTimeZone()

This commit is contained in:
Roland Gruber 2015-11-07 08:30:52 +00:00
parent da7e667100
commit 96ae5f85e2
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/lib/account.inc
View File

@ -1283,8 +1283,7 @@ function getCallingURL() {
* @return int offset * @return int offset
*/ */
function getTimeZoneOffsetHours() { function getTimeZoneOffsetHours() {
$timeZone = $_SESSION['config']->getTimeZone(); $dtz = getTimeZone();
$dtz = new DateTimeZone($timeZone);
return round($dtz->getOffset(new DateTime('UTC')) / 3600); return round($dtz->getOffset(new DateTime('UTC')) / 3600);
} }

6
lam/lib/modules/shadowAccount.inc
View File

@ -553,16 +553,16 @@ class shadowAccount extends baseModule implements passwordService {
* @return list of PDF entries (array(<PDF key> => <PDF lines>)) * @return list of PDF entries (array(<PDF key> => <PDF lines>))
*/ */
function get_pdfEntries($pdfKeys) { function get_pdfEntries($pdfKeys) {
$timeZone = new DateTimeZone($_SESSION['config']->getTimeZone()); $timeZone = getTimeZone();
$shadowLastChange = ''; $shadowLastChange = '';
if (!empty($this->attributes['shadowLastChange'][0])) { if (!empty($this->attributes['shadowLastChange'][0])) {
$time = new DateTime('@' . $this->attributes['shadowLastChange'][0]*24*3600, $timeZone); $time = new DateTime('@' . $this->attributes['shadowLastChange'][0]*24*3600, $timeZone);
$shadowLastChange = $time->format('d. m. Y'); $shadowLastChange = $time->format('d.m.Y');
} }
$shadowExpire = ''; $shadowExpire = '';
if (!empty($this->attributes['shadowExpire'][0])) { if (!empty($this->attributes['shadowExpire'][0])) {
$time = new DateTime('@' . $this->attributes['shadowExpire'][0]*24*3600); $time = new DateTime('@' . $this->attributes['shadowExpire'][0]*24*3600);
$shadowExpire = $time->format('d. m. Y'); $shadowExpire = $time->format('d.m.Y');
} }
$return = array(); $return = array();
$this->addPDFKeyValue($return, 'shadowLastChange', _('Last password change'), $shadowLastChange); $this->addPDFKeyValue($return, 'shadowLastChange', _('Last password change'), $shadowLastChange);

2
lam/lib/types/user.inc
View File

@ -647,7 +647,7 @@ class lamUserList extends lamList {
// expire dates // expire dates
elseif ($attribute == 'shadowexpire') { elseif ($attribute == 'shadowexpire') {
if (!empty($entry[$attribute][0])) { if (!empty($entry[$attribute][0])) {
$time = new DateTime('@' . $entry[$attribute][0] * 24 * 3600, new DateTimeZone($_SESSION['config']->getTimeZone())); $time = new DateTime('@' . $entry[$attribute][0] * 24 * 3600, getTimeZone());
echo $time->format('d.m.Y'); echo $time->format('d.m.Y');
} }
} }