nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
ninadsp
2010-07-12 22:47:17 +05:30
parent 35c922e704 638fe75a8b
commit f06bb69bb8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation.html
View File

@@ -396,7 +396,7 @@ rm -rf config # remove not needed directory
In cookie mode, the password is stored, encrypted with the blowfish In cookie mode, the password is stored, encrypted with the blowfish
algorithm, in a temporary cookie.</li> algorithm, in a temporary cookie.</li>
<li id="pmausr">Note: starting with phpMyAdmin 2.6.1, this section is only applicable if <li id="pmausr">Note: this section is only applicable if
your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br /> your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie' For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
@@ -715,7 +715,7 @@ since this link provides funding for phpMyAdmin.
<dd>This special account is used for 2 distinct purposes: to make possible <dd>This special account is used for 2 distinct purposes: to make possible
all relational features (see all relational features (see
<a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>) <a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>)
and, for a MySQL server previous to 4.1.2 or running with and, for a MySQL server running with
<tt>--skip-show-database</tt>, to enable a multi-user installation <tt>--skip-show-database</tt>, to enable a multi-user installation
(<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
authentication mode).<br /><br /> authentication mode).<br /><br />
@@ -1361,8 +1361,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<dd>Define how long is login cookie valid. Please note that php <dd>Define how long is login cookie valid. Please note that php
configuration option <a href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a> configuration option <a href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a>
might limit session validity and if session is lost, login cookie is might limit session validity and if session is lost, login cookie is
also invalidated. So it is good idea to set <code>session.gc_maxlifetime</code> also invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code>
at least as high is $cfg['LoginCookieValidity'] is set.</dd> not lower than the value of $cfg['LoginCookieValidity'].</dd>
<dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt> <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt>
<dd>Define how long is login cookie should be stored in browser. Default 0 <dd>Define how long is login cookie should be stored in browser. Default 0

5
libraries/config.default.php
View File

@@ -587,11 +587,12 @@ $cfg['Confirm'] = true;
$cfg['LoginCookieRecall'] = true; $cfg['LoginCookieRecall'] = true;
/** /**
* validity of cookie login (in seconds; 1800 seconds is 30 minutes) * validity of cookie login (in seconds; 1440 matches php.ini's
* session.gc_maxlifetime)
* *
* @global integer $cfg['LoginCookieValidity'] * @global integer $cfg['LoginCookieValidity']
*/ */
$cfg['LoginCookieValidity'] = 1800; $cfg['LoginCookieValidity'] = 1440;
/** /**
* how long login cookie should be stored (in seconds) * how long login cookie should be stored (in seconds)