From 21ca8cca94e969dd83e410c26920ec80822959d0 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Mon, 27 Sep 2010 08:49:29 -0500 Subject: added sess_expire_on_close to config file, corrected comment block for session config vars. Fixes #149 --- application/config/config.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index c5eae8f5b..3f2be480f 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -224,15 +224,22 @@ $config['encryption_key'] = ""; | Session Variables |-------------------------------------------------------------------------- | -| 'session_cookie_name' = the name you want for the cookie -| 'encrypt_sess_cookie' = TRUE/FALSE (boolean). Whether to encrypt the cookie -| 'session_expiration' = the number of SECONDS you want the session to last. -| by default sessions last 7200 seconds (two hours). Set to zero for no expiration. -| 'time_to_update' = how many seconds between CI refreshing Session Information +| 'sess_cookie_name' = the name you want for the cookie +| 'sess_expiration' = the number of SECONDS you want the session to last. +| by default sessions last 7200 seconds (two hours). Set to zero for no expiration. +| 'sess_expire_on_close' = Whether to cause the session to expire automatically +| when the browser window is closed +| 'sess_encrypt_cookie' = Whether to encrypt the cookie +| 'sess_use_database' = Whether to save the session data to a database +| 'sess_table_name' = The name of the session database table +| 'sess_match_ip' = Whether to match the user's IP address when reading the session data +| 'sess_match_useragent' = Whether to match the User Agent when reading the session data +| 'sess_time_to_update' = how many seconds between CI refreshing Session Information | */ $config['sess_cookie_name'] = 'ci_session'; $config['sess_expiration'] = 7200; +$config['sess_expire_on_close'] = FALSE; $config['sess_encrypt_cookie'] = FALSE; $config['sess_use_database'] = FALSE; $config['sess_table_name'] = 'ci_sessions'; -- cgit v1.2.3-24-g4f1b From dd6719738936be31cdaa1758ca86d5eb14dcab3d Mon Sep 17 00:00:00 2001 From: Barry Mieny Date: Mon, 4 Oct 2010 16:33:58 +0200 Subject: Cleanup of stray spaces and tabs --- application/config/autoload.php | 2 +- application/config/config.php | 12 +++--- application/config/constants.php | 12 +++--- application/config/foreign_chars.php | 74 ++++++++++++++++++------------------ application/config/routes.php | 2 +- application/config/smileys.php | 2 +- application/config/user_agents.php | 6 +-- 7 files changed, 55 insertions(+), 55 deletions(-) (limited to 'application/config') diff --git a/application/config/autoload.php b/application/config/autoload.php index 35ad6288f..5e9740844 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -77,7 +77,7 @@ $autoload['config'] = array(); | | $autoload['language'] = array('lang1', 'lang2'); | -| NOTE: Do not include the "_lang" part of your file. For example +| NOTE: Do not include the "_lang" part of your file. For example | "codeigniter_lang.php" would be referenced as array('codeigniter'); | */ diff --git a/application/config/config.php b/application/config/config.php index 3f2be480f..e318a2ab7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -149,16 +149,16 @@ $config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-'; | */ $config['enable_query_strings'] = FALSE; -$config['controller_trigger'] = 'c'; -$config['function_trigger'] = 'm'; -$config['directory_trigger'] = 'd'; // experimental not currently in use +$config['controller_trigger'] = 'c'; +$config['function_trigger'] = 'm'; +$config['directory_trigger'] = 'd'; // experimental not currently in use /* |-------------------------------------------------------------------------- | Error Logging Threshold |-------------------------------------------------------------------------- | -| If you have enabled error logging, you can set an error threshold to +| If you have enabled error logging, you can set an error threshold to | determine what gets logged. Threshold options are: | You can enable error logging by setting a threshold over zero. The | threshold determines what gets logged. Threshold options are: @@ -225,7 +225,7 @@ $config['encryption_key'] = ""; |-------------------------------------------------------------------------- | | 'sess_cookie_name' = the name you want for the cookie -| 'sess_expiration' = the number of SECONDS you want the session to last. +| 'sess_expiration' = the number of SECONDS you want the session to last. | by default sessions last 7200 seconds (two hours). Set to zero for no expiration. | 'sess_expire_on_close' = Whether to cause the session to expire automatically | when the browser window is closed @@ -245,7 +245,7 @@ $config['sess_use_database'] = FALSE; $config['sess_table_name'] = 'ci_sessions'; $config['sess_match_ip'] = FALSE; $config['sess_match_useragent'] = TRUE; -$config['sess_time_to_update'] = 300; +$config['sess_time_to_update'] = 300; /* |-------------------------------------------------------------------------- diff --git a/application/config/constants.php b/application/config/constants.php index 1551cbcab..4a879d360 100644 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -27,13 +27,13 @@ define('DIR_WRITE_MODE', 0777); | */ -define('FOPEN_READ', 'rb'); +define('FOPEN_READ', 'rb'); define('FOPEN_READ_WRITE', 'r+b'); -define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care -define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care -define('FOPEN_WRITE_CREATE', 'ab'); -define('FOPEN_READ_WRITE_CREATE', 'a+b'); -define('FOPEN_WRITE_CREATE_STRICT', 'xb'); +define('FOPEN_WRITE_CREATE_DESTRUCTIVE', 'wb'); // truncates existing file data, use with care +define('FOPEN_READ_WRITE_CREATE_DESTRUCTIVE', 'w+b'); // truncates existing file data, use with care +define('FOPEN_WRITE_CREATE', 'ab'); +define('FOPEN_READ_WRITE_CREATE', 'a+b'); +define('FOPEN_WRITE_CREATE_STRICT', 'xb'); define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b'); diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index 59a7d234a..e106ad800 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -8,56 +8,56 @@ | */ $foreign_characters = array('223' => "ss", // ß - '224' => "a", - '225' => "a", - '226' => "a", + '224' => "a", + '225' => "a", + '226' => "a", '229' => "a", - '227' => "ae", - '230' => "ae", + '227' => "ae", + '230' => "ae", '228' => "ae", '231' => "c", '232' => "e", // è '233' => "e", // é - '234' => "e", // ê + '234' => "e", // ê '235' => "e", // ë - '236' => "i", - '237' => "i", - '238' => "i", - '239' => "i", + '236' => "i", + '237' => "i", + '238' => "i", + '239' => "i", '241' => "n", - '242' => "o", - '243' => "o", - '244' => "o", + '242' => "o", + '243' => "o", + '244' => "o", '245' => "o", '246' => "oe", // ö - '249' => "u", - '250' => "u", - '251' => "u", + '249' => "u", + '250' => "u", + '251' => "u", '252' => "ue", // ü '255' => "y", - '257' => "aa", - '269' => "ch", - '275' => "ee", - '291' => "gj", - '299' => "ii", - '311' => "kj", - '316' => "lj", - '326' => "nj", - '353' => "sh", - '363' => "uu", + '257' => "aa", + '269' => "ch", + '275' => "ee", + '291' => "gj", + '299' => "ii", + '311' => "kj", + '316' => "lj", + '326' => "nj", + '353' => "sh", + '363' => "uu", '382' => "zh", - '256' => "aa", - '268' => "ch", - '274' => "ee", - '290' => "gj", - '298' => "ii", - '310' => "kj", - '315' => "lj", - '325' => "nj", - '352' => "sh", - '362' => "uu", + '256' => "aa", + '268' => "ch", + '274' => "ee", + '290' => "gj", + '298' => "ii", + '310' => "kj", + '315' => "lj", + '325' => "nj", + '352' => "sh", + '362' => "uu", '381' => "zh", - ); + ); /* End of file foreign_chars.php */ diff --git a/application/config/routes.php b/application/config/routes.php index 57af9850b..614462fd9 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -9,7 +9,7 @@ | and its corresponding controller class/method. The segments in a | URL normally follow this pattern: | -| example.com/class/method/id/ +| example.com/class/method/id/ | | In some instances, however, you may want to remap this relationship | so that a different class/function is called than the one diff --git a/application/config/smileys.php b/application/config/smileys.php index 31a60c656..25d28b2c4 100644 --- a/application/config/smileys.php +++ b/application/config/smileys.php @@ -7,7 +7,7 @@ | Individual images can be used to replace multiple simileys. For example: | :-) and :) use the same image replacement. | -| Please see user guide for more info: +| Please see user guide for more info: | http://codeigniter.com/user_guide/helpers/smiley_helper.html | */ diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 3be200942..985deed24 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -113,7 +113,7 @@ $mobiles = array( 'benq' => "BenQ", 'ipaq' => "HP iPaq", 'mot-' => "Motorola", - 'playstation portable' => "PlayStation Portable", + 'playstation portable' => "PlayStation Portable", 'hiptop' => "Danger Hiptop", 'nec-' => "NEC", 'panasonic' => "Panasonic", @@ -126,7 +126,7 @@ $mobiles = array( // Operating Systems 'symbian' => "Symbian", - 'SymbianOS' => "SymbianOS", + 'SymbianOS' => "SymbianOS", 'elaine' => "Palm", 'palm' => "Palm", 'series60' => "Symbian S60", @@ -151,7 +151,7 @@ $mobiles = array( // Fallback 'mobile' => "Generic Mobile", - 'wireless' => "Generic Mobile", + 'wireless' => "Generic Mobile", 'j2me' => "Generic Mobile", 'midp' => "Generic Mobile", 'cldc' => "Generic Mobile", -- cgit v1.2.3-24-g4f1b From 49ced91d1f5ab50068a66fdddff6be3f5c420565 Mon Sep 17 00:00:00 2001 From: Shane Pearson Date: Wed, 6 Oct 2010 17:31:40 -0500 Subject: Fixed CSRF comments to avoid confusion. --- application/config/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/config') diff --git a/application/config/config.php b/application/config/config.php index 3f2be480f..0b85ac5fc 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -274,9 +274,9 @@ $config['global_xss_filtering'] = FALSE; /* |-------------------------------------------------------------------------- -| Cross Site Forgery Request +| Cross Site Request Forgery |-------------------------------------------------------------------------- -| Enables a CSFR cookie token to be set. When set to TRUE, token will be +| Enables a CSRF cookie token to be set. When set to TRUE, token will be | checked on a submitted form. If you are accepting user data, it is strongly | recommended CSRF protection be enabled. */ -- cgit v1.2.3-24-g4f1b