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

fixed PHP notice

This commit is contained in:
Roland Gruber 2018-11-11 20:20:20 +01:00
parent b7396de612
commit 74e8fb830d
2 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lam/lib/account.inc
View File

@ -1501,19 +1501,19 @@ function unformatShortFormatToSeconds($text) {
return $text;
}
$matches = array();
if (preg_match('/^([0-9]+d)?([0-9]+h)?([0-9]+m)?([0-9]+s)?$/', $text, $matches)) {
if (preg_match('/^(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?$/', $text, $matches)) {
$newValue = 0;
if (!empty($matches[1])) {
$newValue += $matches[1] * 86400;
}
if (!empty($matches[2])) {
$newValue += $matches[2] * 3600;
}
if (!empty($matches[3])) {
$newValue += $matches[3] * 60;
$newValue += $matches[2] * 86400;
}
if (!empty($matches[4])) {
$newValue += $matches[4];
$newValue += $matches[4] * 3600;
}
if (!empty($matches[6])) {
$newValue += $matches[6] * 60;
}
if (!empty($matches[8])) {
$newValue += $matches[8];
}
return $newValue;
}

61
lam/tests/lib/accountTest.php Normal file
View File

@ -0,0 +1,61 @@
<?php
/*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2018 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
include_once 'lam/lib/account.inc';
/**
* LAMConfig test case.
*
* @author Roland Gruber
*/
class AccountTest extends PHPUnit_Framework_TestCase {
/**
* Tests unformatShortFormatToSeconds() without characters.
*/
function testUnformatShortFormatToSeconds_plainNumber() {
$this->assertEquals(15, unformatShortFormatToSeconds('15'));
}
/**
* Tests unformatShortFormatToSeconds() with characters.
*/
function testUnformatShortFormatToSeconds_conversion() {
$this->assertEquals(15, unformatShortFormatToSeconds('15'));
$this->assertEquals(12, unformatShortFormatToSeconds('12s'));
$this->assertEquals(180, unformatShortFormatToSeconds('3m'));
$this->assertEquals(7200, unformatShortFormatToSeconds('2h'));
$this->assertEquals(86400, unformatShortFormatToSeconds('1d'));
$this->assertEquals(135, unformatShortFormatToSeconds('2m15s'));
$this->assertEquals(7215, unformatShortFormatToSeconds('2h15s'));
$this->assertEquals(172815, unformatShortFormatToSeconds('2d15s'));
$this->assertEquals(173700, unformatShortFormatToSeconds('2d15m'));
}
/**
* Tests unformatShortFormatToSeconds() with invalid values.
*/
function testUnformatShortFormatToSeconds_invalidNumber() {
$this->assertEquals('abc', unformatShortFormatToSeconds('abc'));
$this->assertEquals('', unformatShortFormatToSeconds(''));
}
}