Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-08-29 11:05:14 -04:00
commit 8b5f94fa9f
10 changed files with 87 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
airtime_mvc/application/models/Preference.php
View file

@ -587,10 +587,14 @@ class Application_Model_Preference
}
}
public static function SetRemindMeDate()
public static function SetRemindMeDate($p_never = false)
{
$weekAfter = mktime(0, 0, 0, gmdate("m"), gmdate("d")+7, gmdate("Y"));
self::setValue("remindme", $weekAfter);
if ($p_never) {
self::setValue("remindme", -1);
} else {
$weekAfter = mktime(0, 0, 0, gmdate("m"), gmdate("d")+7, gmdate("Y"));
self::setValue("remindme", $weekAfter);
}
}
public static function GetRemindMeDate()
@ -1105,9 +1109,13 @@ class Application_Model_Preference
{
$today = mktime(0, 0, 0, gmdate("m"), gmdate("d"), gmdate("Y"));
$remindDate = Application_Model_Preference::GetRemindMeDate();
if ($remindDate == NULL || $today >= $remindDate) {
return true;
$retVal = false;
if ($remindDate == NULL || ($remindDate != -1 && $today >= $remindDate)) {
$retVal = true;
}
return $retVal;
}
public static function getCurrentLibraryTableSetting()