rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

ChangeLog

@@ -29,6 +29,7 @@ phpMyAdmin - ChangeLog
 + rfe #719  More details in PDF relation view
 + rfe #1096 Cannot enter connection for federated engine table
 + rfe #954  Allow SALT in ENCRYPT function
++ rfe #1260 Setting LoginCookieValidity > session.gc_maxlifetime
 
 4.3.9.0 (not yet released)
 - bug #4728 Incorrect headings in routine editor

doc/config.rst

@@ -85,6 +85,16 @@ Basic settings
 
     You can set this parameter to ``true`` to stop this message from appearing.
 
+.. config:option:: $cfg['LoginCookieValidityDisableWarning']
+
+    :type: boolean
+    :default: false
+
+    A warning is displayed on the main page if the PHP parameter
+    session.gc_maxlifetime is lower than cookie validity configured in phpMyAdmin.
+
+    You can set this parameter to ``true`` to stop this message from appearing.
+
 .. config:option:: $cfg['ServerLibraryDifference_DisableWarning']
 
     :type: boolean

index.php

@@ -478,15 +478,17 @@ if (! @extension_loaded('mbstring')) {
     );
 }
 
-/**
- * Check whether session.gc_maxlifetime limits session validity.
- */
-$gc_time = (int)@ini_get('session.gc_maxlifetime');
-if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
-    trigger_error(
-        __('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'),
-        E_USER_WARNING
-    );
+if ($cfg['LoginCookieValidityDisableWarning'] == false) {
+    /**
+     * Check whether session.gc_maxlifetime limits session validity.
+     */
+    $gc_time = (int)@ini_get('session.gc_maxlifetime');
+    if ($gc_time < $GLOBALS['cfg']['LoginCookieValidity'] ) {
+        trigger_error(
+            __('Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than cookie validity configured in phpMyAdmin, because of this, your login might expire sooner than configured in phpMyAdmin.'),
+            E_USER_WARNING
+        );
+    }
 }
 
 /**

libraries/config.default.php

@@ -53,6 +53,14 @@ $cfg['PmaNoRelation_DisableWarning'] = false;
  */
 $cfg['SuhosinDisableWarning'] = false;
 
+/**
+ * Disable the default warning that is displayed if session.gc_maxlifetime
+ * is less than `LoginCookieValidity`
+ *
+ * @global boolean $cfg['LoginCookieValidityDisableWarning']
+ */
+$cfg['LoginCookieValidityDisableWarning'] = false;
+
 /**
  * Disable the default warning that is displayed if a difference between
  * the MySQL library and server is detected.

libraries/config/messages.inc.php

@@ -754,6 +754,8 @@ $strConfigSQLQuery_Refresh_name = __('Refresh');
 $strConfigSQLQuery_ShowAsPHP_name = __('Create PHP Code');
 $strConfigSuhosinDisableWarning_desc = __('A warning is displayed on the main page if Suhosin is detected.');
 $strConfigSuhosinDisableWarning_name = __('Suhosin warning');
+$strConfigLoginCookieValidityDisableWarning_desc = __('Disable the default warning that is displayed on the main page if session.gc_maxlifetime is less than `LoginCookieValidity`.');
+$strConfigLoginCookieValidityDisableWarning_name = __('Login cookie validity warning');
 $strConfigTextareaCols_desc = __('Textarea size (columns) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25).');
 $strConfigTextareaCols_name = __('Textarea columns');
 $strConfigTextareaRows_desc = __('Textarea size (rows) in edit mode, this value will be emphasized for SQL query textareas (*2) and for query window (*1.25).');

libraries/config/setup.forms.php

@@ -121,7 +121,8 @@ $forms['Features']['Page_titles'] = array(
 $forms['Features']['Warnings'] = array(
     'ServerLibraryDifference_DisableWarning',
     'PmaNoRelation_DisableWarning',
-    'SuhosinDisableWarning');
+    'SuhosinDisableWarning',
+    'LoginCookieValidityDisableWarning');
 $forms['Features']['Developer'] = array(
     'UserprefsDeveloperTab',
     'DBG/sql');

libraries/config/user_preferences.forms.php

@@ -54,6 +54,7 @@ $forms['Features']['Warnings'] = array(
     'ServerLibraryDifference_DisableWarning',
     'PmaNoRelation_DisableWarning',
     'SuhosinDisableWarning',
+    'LoginCookieValidityDisableWarning',
     'ReservedWordDisableWarning');
 // settings from this form are treated specially,
 // see prefs_forms.php and user_preferences.lib.php