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

rfe #2123386 Added option to disable mcrypt warning.

Browse Source
This commit is contained in:
Michal Čihař
2009-03-03 11:07:04 +00:00
parent c32bc4ed86
commit a09b9c2bb2
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -34,6 +34,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
applies to all accounts (even the anonymous user) applies to all accounts (even the anonymous user)
- patch #2652972 [relation] Missing code with hashing for relationship - patch #2652972 [relation] Missing code with hashing for relationship
editing, thanks to knittl - knittl editing, thanks to knittl - knittl
+ rfe #2123386 Added option to disable mcrypt warning.
3.1.4.0 (not yet released) 3.1.4.0 (not yet released)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

6
Documentation.html
View File

@@ -607,6 +607,12 @@ since this link provides funding for phpMyAdmin.
You can set this parameter to <tt>TRUE</tt> to stop this message You can set this parameter to <tt>TRUE</tt> to stop this message
from appearing.</dd> from appearing.</dd>
<dt id="cfg_McryptDisableWarning">$cfg['McryptDisableWarning'] boolean</dt>
<dd>Disable the default warning that is displayed if mcrypt is missing for
cookie authentication.
You can set this parameter to <tt>TRUE</tt> to stop this message
from appearing.</dd>
<dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] boolean</dt> <dt id="cfg_AllowThirdPartyFraming">$cfg['AllowThirdPartyFraming'] boolean</dt>
<dd>Setting this to <tt>true</tt> allows a page located on a different <dd>Setting this to <tt>true</tt> allows a page located on a different
domain to call phpMyAdmin inside a frame, and is a potential security domain to call phpMyAdmin inside a frame, and is a potential security

4
libraries/auth/cookie.auth.lib.php
View File

@@ -76,7 +76,9 @@ if (function_exists('mcrypt_encrypt')) {
} else { } else {
require_once './libraries/blowfish.php'; require_once './libraries/blowfish.php';
trigger_error(PMA_sanitize(sprintf($strCantLoad, 'mcrypt')), E_USER_WARNING); if (!$GLOBALS['cfg']['McryptDisableWarning']) {
trigger_error(PMA_sanitize(sprintf($strCantLoad, 'mcrypt')), E_USER_WARNING);
}
} }
/** /**

8
libraries/config.default.php
View File

@@ -54,6 +54,14 @@ $cfg['PmaNoRelation_DisableWarning'] = false;
*/ */
$cfg['SuhosinDisableWarning'] = false; $cfg['SuhosinDisableWarning'] = false;
/**
* Disable the default warning that is displayed if mcrypt is missing for
* cookie authentication.
*
* @global boolean $cfg['McryptDisableWarning']
*/
$cfg['McryptDisableWarning'] = false;
/** /**
* Allows phpMyAdmin to be included from a document located on * Allows phpMyAdmin to be included from a document located on
* another domain; setting this to true is a potential security hole * another domain; setting this to true is a potential security hole