X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Fconfig.php.dist;h=8e9cf20f196d77f68c28e5a418d9d03240672952;hb=8d68ecdd7b1c45cb2a5cf592b8d504d7e4614911;hp=cc3d0cd7bbe9d1e05f0e0d91dccf7adf9ba25acc;hpb=5acb933e804db8f3ff7c71e66ef99ea95520547e;p=timetracker.git

diff --git a/WEB-INF/config.php.dist b/WEB-INF/config.php.dist
index cc3d0cd7..8e9cf20f 100644
--- a/WEB-INF/config.php.dist
+++ b/WEB-INF/config.php.dist
@@ -70,33 +70,6 @@ define('APP_NAME', '');
 // define('OLD_PASSWORDS', true);
 
 
-// Holidays. At this time holiday days are defined in the localization files (one file per language).
-// The SHOW_HOLIDAYS option defines whether holidays are highlighted with holiday color.
-//
-define('SHOW_HOLIDAYS', true);
-
-
-// COST_ON_REPORTS - defines the availability of the Cost field on the Reports page.
-//
-define('COST_ON_REPORTS', true);
-
-
-// READONLY_START_FINISH - defines whether the start and finish fields on time entry pages are read-only.
-// This applies to regular users only. Manager and co-managers can edit these values.
-//
-// define('READONLY_START_FINISH', false);
-
-
-// FUTURE_ENTRIES - defines whether users can create entries for future dates. Defaults to true.
-//
-// define('FUTURE_ENTRIES', false);
-
-
-// ALLOW_OVERLAP - defines whether overlapping time entries are allowed. Defaults to false.
-//
-// define('ALLOW_OVERLAP', true);
-
-
 // WEEKEND_START_DAY
 //
 // This option defines which days are highlighted with weekend color.
@@ -110,6 +83,15 @@ define('WEEKEND_START_DAY', 6);
 // Lifetime in seconds for tt_PHPSESSID cookie. Time to live is extended by this value
 // with each visit to the site so that users don't have to re-login. 
 // define('PHPSESSID_TTL', 86400);
+//
+// Note: see also PHP_SESSION_PATH below as you may have to use it together with
+// PHPSESSID_TTL to avoid premature session expirations.
+
+
+// PHP_SESSION_PATH
+// Local file system path for PHP sessions. Use it to isolate session deletions
+// (garbage collection interference) by other PHP scripts potentially running on the system.
+// define('PHP_SESSION_PATH', '/tmp/timetracker'); // Directory must exist and be writable.
 
 
 // Forum and help links from the main menu.
@@ -196,7 +178,7 @@ define('AUTH_MODULE', 'db');
 // Configuration example for OpenLDAP server:
 // define('AUTH_MODULE', 'ldap');
 // $GLOBALS['AUTH_MODULE_PARAMS'] = array(
-//  'server' => '127.0.0.1',                    // OpenLDAP server address or name.
+//  'server' => '127.0.0.1',                    // OpenLDAP server address or name. For secure LDAP use ldaps://hostname:port here.
 //  'type' => 'openldap',                       // Type of server. openldap type should also work with Sun Directory Server when member_of is empty.
                                                 // It may work with other (non Windows AD) LDAP servers. For Windows AD use the 'ad' type.
 //  'base_dn' => 'ou=People,dc=example,dc=com', // Base distinguished name in LDAP catalog.
@@ -207,17 +189,26 @@ define('AUTH_MODULE', 'db');
 // Configuration example for Windows domains with Active Directory:
 // define('AUTH_MODULE', 'ldap');
 // $GLOBALS['AUTH_MODULE_PARAMS'] = array(
-//  'server' => '127.0.0.1',            // Domain controller IP address or name.
+//  'server' => '127.0.0.1',            // Domain controller IP address or name. For secure LDAP use ldaps://hostname:port here.
 //  'type' => 'ad',                     // Type of server.
 //  'base_dn' => 'DC=example,DC=com',   // Base distinguished name in LDAP catalog.
 //  'default_domain' => 'example.com',  // Default domain.
 //  'member_of' => array());            // List of groups, membership in which is required for user to be authenticated.
+                                        // Leave it empty if membership is not necessary. Otherwise list CN parts only.
+                                        // For example:
+                                        // array('Ldap Testers') means that the user must be a member Ldap Testers group.
+                                        // array('Ldap Testers', 'Ldap Users') means the user must be a member of both Ldap Testers and Ldap Users groups.
 
 // 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
 
-// note input height in time.php
-define('NOTE_INPUT_HEIGHT', '40');
+// 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.
+
+// Height in pixels for the note input field in time.php. Defaults to 40.
+// define('NOTE_INPUT_HEIGHT', 100);
+
+// define('MANAGER_ONLY_TEAM_SETTINGS', true); // Note: temporary define, to be removed after introduction of role edits.
+                                               // Currently checked for "defined" only in profile_edit.tpl, meaning that false
+                                               // value here means the same thing.
\ No newline at end of file