From: Nik Okuntseff Date: Mon, 18 Jul 2016 18:54:49 +0000 (+0000) Subject: Refactoring - renamed some defines. X-Git-Tag: timetracker_1.19-1~1699 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=415220351a14a7994cbcfc4856eb4d7758701d96;p=timetracker.git Refactoring - renamed some defines. --- diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist index cc3d0cd7..b0fb342b 100644 --- a/WEB-INF/config.php.dist +++ b/WEB-INF/config.php.dist @@ -215,9 +215,10 @@ define('AUTH_MODULE', 'db'); // define('AUTH_DEBUG', false); // Note: enabling AUTH_DEBUG breaks redirects as debug output is printed before setting redirect header. Do not enable on production systems. -// team manager can set monthly quota for years between these values: -define('MONTHLY_QUOTA_YEARS_START', 2010); // if nothing is specified, it falls back to 2010 -define('MONTHLY_QUOTA_YEARS_END', 2031); // if nothing is specified it falls back to 2030 + +// Team managers can set monthly work hour quota for years between the following values. +// define('MONTHLY_QUOTA_YEAR_START', 2010); // If nothing is specified, it falls back to 2015. +// define('MONTHLY_QUOTA_YEAR_END', 2025); // if nothing is specified it falls back to 2030. // note input height in time.php define('NOTE_INPUT_HEIGHT', '40'); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 59054357..e8f35207 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.26.3503 | Copyright © Anuko | +  Anuko Time Tracker 1.9.26.3504 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/cf_monthly_quota.php b/cf_monthly_quota.php index 19b43bf6..9f0f7df9 100644 --- a/cf_monthly_quota.php +++ b/cf_monthly_quota.php @@ -12,19 +12,19 @@ if (!ttAccessCheck(right_manage_team)) { } // fallback values -$yearStart = 2010; +$yearStart = 2015; $yearEnd = 2030; -if (defined('MONTHLY_QUOTA_YEARS_START')){ - $yearStart = (int)MONTHLY_QUOTA_YEARS_START; +if (defined('MONTHLY_QUOTA_YEAR_START')){ + $yearStart = (int)MONTHLY_QUOTA_YEAR_START; } -if (defined('MONTHLY_QUOTA_YEARS_END')){ - $yearEnd = (int)MONTHLY_QUOTA_YEARS_END; +if (defined('MONTHLY_QUOTA_YEAR_END')){ + $yearEnd = (int)MONTHLY_QUOTA_YEAR_END; } // create values for dropdown $years = array(); -for ($i=$yearStart; $i < $yearEnd; $i++) { +for ($i=$yearStart; $i <= $yearEnd; $i++) { array_push($years, array('id'=>$i, 'name'=>$i)); }