projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified alternate backgroud color for the table. (#41)
[timetracker.git]
/
initialize.php
diff --git
a/initialize.php
b/initialize.php
index
c6226fc
..
c9a4245
100644
(file)
--- a/
initialize.php
+++ b/
initialize.php
@@
-67,7
+67,7
@@
check_extension('mbstring');
// If auth params are not defined (in config.php) - initialize with an empty array.
if (!isset($GLOBALS['AUTH_MODULE_PARAMS']) || !is_array($GLOBALS['AUTH_MODULE_PARAMS']))
$GLOBALS['AUTH_MODULE_PARAMS'] = array();
// If auth params are not defined (in config.php) - initialize with an empty array.
if (!isset($GLOBALS['AUTH_MODULE_PARAMS']) || !is_array($GLOBALS['AUTH_MODULE_PARAMS']))
$GLOBALS['AUTH_MODULE_PARAMS'] = array();
-
+
// Smarty initialization.
import('smarty.Smarty');
$smarty = new Smarty;
// Smarty initialization.
import('smarty.Smarty');
$smarty = new Smarty;
@@
-84,6
+84,12
@@
session_cache_expire(1);
$phpsessid_ttl = defined('PHPSESSID_TTL') ? PHPSESSID_TTL : 60*60*24;
// Set lifetime for garbage collection.
ini_set('session.gc_maxlifetime', $phpsessid_ttl);
$phpsessid_ttl = defined('PHPSESSID_TTL') ? PHPSESSID_TTL : 60*60*24;
// Set lifetime for garbage collection.
ini_set('session.gc_maxlifetime', $phpsessid_ttl);
+// Set PHP session path, if defined to avoid garbage collection interference from other scripts.
+if (defined('PHP_SESSION_PATH')) {
+ ini_set('session.save_path', PHP_SESSION_PATH);
+ ini_set('session.gc_probability', 1);
+}
+
// Set session cookie lifetime.
session_set_cookie_params($phpsessid_ttl);
if (isset($_COOKIE['tt_PHPSESSID'])) {
// Set session cookie lifetime.
session_set_cookie_params($phpsessid_ttl);
if (isset($_COOKIE['tt_PHPSESSID'])) {
@@
-93,7
+99,7
@@
if (isset($_COOKIE['tt_PHPSESSID'])) {
}
// Start or resume PHP session.
}
// Start or resume PHP session.
-session_name('tt_PHPSESSID'); // "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.
+session_name('tt_PHPSESSID'); // "tt_" prefix is to avoid sharing session with other PHP apps that do not name session.
@session_start();
// Authorization.
@session_start();
// Authorization.
@@
-120,6
+126,10
@@
define('TYPE_ALL', 0); // Time record can be specified with either duration or s
define('TYPE_START_FINISH', 1); // Time record has start and finish times.
define('TYPE_DURATION', 2); // Time record has only duration, no start and finish times.
define('TYPE_START_FINISH', 1); // Time record has start and finish times.
define('TYPE_DURATION', 2); // Time record has only duration, no start and finish times.
+// Definitions for uncompleted time entry indicators.
+define('UNCOMPLETED_INDICATORS_NONE', 0); // Do not show indicators.
+define('UNCOMPLETED_INDICATORS', 1); // Show indicators.
+
// User access rights - bits that collectively define an access mask to the system (a role).
// We'll have some bits here (1,2, etc...) reserved for future use.
define('right_data_entry', 4); // Right to enter work hours and expenses.
// User access rights - bits that collectively define an access mask to the system (a role).
// We'll have some bits here (1,2, etc...) reserved for future use.
define('right_data_entry', 4); // Right to enter work hours and expenses.
@@
-152,8
+162,8
@@
import('html.HttpRequest');
$request = new ttHttpRequest();
import('form.ActionErrors');
$request = new ttHttpRequest();
import('form.ActionErrors');
-$err
ors = new ActionErrors();
-$m
essages = new ActionErrors();
+$err
= new ActionErrors(); // Error messages for user.
+$m
sg = new ActionErrors(); // Notification messages (not errrors) for user.
// Create an instance of ttUser class. This gets us most of user details.
import('ttUser');
// Create an instance of ttUser class. This gets us most of user details.
import('ttUser');
@@
-173,11
+183,11
@@
$lang = $user->lang;
if (!$lang) {
if (defined('LANG_DEFAULT'))
$lang = LANG_DEFAULT;
if (!$lang) {
if (defined('LANG_DEFAULT'))
$lang = LANG_DEFAULT;
-
+
// If we still do not have the language get it from the browser.
if (!$lang) {
$lang = $i18n->getBrowserLanguage();
// If we still do not have the language get it from the browser.
if (!$lang) {
$lang = $i18n->getBrowserLanguage();
-
+
// Finally - English is the default.
if (!$lang) {
$lang = 'en';
// Finally - English is the default.
if (!$lang) {
$lang = 'en';
@@
-193,11
+203,11
@@
$GLOBALS['USER'] = &$user;
// Assign things for smarty to use in template files.
$smarty->assign('i18n', $i18n->keys);
// Assign things for smarty to use in template files.
$smarty->assign('i18n', $i18n->keys);
-$smarty->assign('errors', $errors);
-$smarty->assign('messages', $messages);
+$smarty->assign('err', $err);
+$smarty->assign('msg', $msg);
+
+// TODO: move this code out of here to the files that use it.
-// TODO: move this code out of here to the files that use it.
-
// We use js/strftime.js to print dates in JavaScript (in DateField controls).
// One of our date formats (%d.%m.%Y %a) prints a localized short weekday name (%a).
// The init_js_date_locale function iniitializes Date.ext.locales array in js/strftime.js for our language
// We use js/strftime.js to print dates in JavaScript (in DateField controls).
// One of our date formats (%d.%m.%Y %a) prints a localized short weekday name (%a).
// The init_js_date_locale function iniitializes Date.ext.locales array in js/strftime.js for our language