Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #251 from virtualtam/linkdb/date-format

Browse source 
LinkDB::filterDay(): check input date format
This commit is contained in:
VirtualTam 2015-07-09 01:00:40 +02:00
commit 7f1dfd1c12
5 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
application/LinkDB.php
View file

@ -375,7 +375,10 @@ public function filterTags($tags, $casesensitive=false)
*/
public function filterDay($day)
{
// TODO: check input format
if (! checkDateFormat('Ymd', $day)) {
throw new Exception('Invalid date format');
}
$filtered = array();
foreach ($this->links as $l) {
if (startsWith($l['linkdate'], $day)) {

15
application/Utils.php
View file

@ -69,4 +69,19 @@ function sanitizeLink(&$link)
$link['description'] = escape($link['description']);
$link['tags'] = escape($link['tags']);
}
/**
* Checks if a string represents a valid date
*
* @param string a string-formatted date
* @param format the expected DateTime format of the string
* @return whether the string is a valid date
* @see http://php.net/manual/en/class.datetime.php
* @see http://php.net/manual/en/datetime.createfromformat.php
*/
function checkDateFormat($format, $string)
{
$date = DateTime::createFromFormat($format, $string);
return $date && $date->format($string) == $string;
}
?>

8
index.php
View file

@ -957,7 +957,13 @@ function showDaily()
if ($i<count($days)-1) $nextday=$days[$i+1];
}
$linksToDisplay=$LINKSDB->filterDay($day);
try {
$linksToDisplay = $LINKSDB->filterDay($day);
} catch (Exception $exc) {
error_log($exc);
$linksToDisplay = [];
}
// We pre-format some fields for proper output.
foreach($linksToDisplay as $key=>$link)
{

23
tests/LinkDBTest.php
View file

@ -396,19 +396,22 @@ public function testFilterUnknownDay()
/**
* Use an invalid date format
* @expectedException Exception
* @expectedExceptionMessageRegExp /Invalid date format/
*/
public function testFilterInvalidDay()
public function testFilterInvalidDayWithChars()
{
$this->assertEquals(
0,
sizeof(self::$privateLinkDB->filterDay('Rainy day, dream away'))
);
self::$privateLinkDB->filterDay('Rainy day, dream away');
}
// TODO: check input format
$this->assertEquals(
6,
sizeof(self::$privateLinkDB->filterDay('20'))
);
/**
* Use an invalid date format
* @expectedException Exception
* @expectedExceptionMessageRegExp /Invalid date format/
*/
public function testFilterInvalidDayDigits()
{
self::$privateLinkDB->filterDay('20');
}
/**

19
tests/UtilsTest.php
View file

@ -74,5 +74,24 @@ public function testEndsWithSpecialChars()
$this->assertTrue(endsWith('å!ùµ', 'ùµ', false));
$this->assertTrue(endsWith('µ$åù', 'åù', true));
}
/**
* Check valid date strings, according to a DateTime format
*/
public function testCheckValidDateFormat()
{
$this->assertTrue(checkDateFormat('Ymd', '20150627'));
$this->assertTrue(checkDateFormat('Y-m-d', '2015-06-27'));
}
/**
* Check erroneous date strings, according to a DateTime format
*/
public function testCheckInvalidDateFormat()
{
$this->assertFalse(checkDateFormat('Ymd', '2015'));
$this->assertFalse(checkDateFormat('Y-m-d', '2015-06'));
$this->assertFalse(checkDateFormat('Ymd', 'DeLorean'));
}
}
?>