projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed no longer used team address in export and import.
[timetracker.git]
/
initialize.php
diff --git
a/initialize.php
b/initialize.php
index
5f8a760
..
c1a8437
100644
(file)
--- a/
initialize.php
+++ b/
initialize.php
@@
-74,7
+74,6
@@
$smarty = new Smarty;
$smarty->use_sub_dirs = false;
$smarty->template_dir = TEMPLATE_DIR;
$smarty->compile_dir = TEMPLATE_DIR.'_c';
$smarty->use_sub_dirs = false;
$smarty->template_dir = TEMPLATE_DIR;
$smarty->compile_dir = TEMPLATE_DIR.'_c';
-$GLOBALS['SMARTY'] = &$smarty;
// Note: these 3 settings below used to be in .htaccess file. Moved them here to eliminate "error 500" problems
// with some shared hostings that do not have AllowOverride Options or AllowOverride All in their apache configurations.
// Note: these 3 settings below used to be in .htaccess file. Moved them here to eliminate "error 500" problems
// with some shared hostings that do not have AllowOverride Options or AllowOverride All in their apache configurations.
@@
-84,6
+83,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'])) {
@@
-120,9
+125,9
@@
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
of types for uncompleted time entrie
s.
-define('
ENTRIES_NONE', 0); // Do not show uncompleted time entries anywhere
.
-define('
ENTRIES_USERS_PAGE', 1); // Show uncompleted time entries on the users page
.
+// Definitions
for uncompleted time entry indicator
s.
+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.
// 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.
@@
-191,9
+196,6
@@
if (!$lang) {
// Load i18n file.
$i18n->load($lang);
// Load i18n file.
$i18n->load($lang);
-$GLOBALS['I18N'] = &$i18n;
-
-$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);