Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Qual: Use call_user_func instead of $

Browse Source
This commit is contained in:
Laurent Destailleur
2011-08-28 16:22:09 +00:00
parent 9428b0f22e
commit 885d282489
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/lib/functions.lib.php
View File

@@ -346,19 +346,20 @@ function dol_escape_htmltag($stringtoescape,$keepb=0)
} }
/** /**
* \brief Write log message in a file or to syslog process * Write log message in a file or to syslog process
* Pour fichier: fichier defined by SYSLOG_FILE * Pour fichier: fichier defined by SYSLOG_FILE
* Pour syslog: facility defined by SYSLOG_FACILITY * Pour syslog: facility defined by SYSLOG_FACILITY
* Warning, les fonctions syslog sont buggues sous Windows et generent des * Warning, les fonctions syslog sont buggues sous Windows et generent des
* fautes de protection memoire. Pour resoudre, utiliser le loggage fichier, * fautes de protection memoire. Pour resoudre, utiliser le loggage fichier,
* au lieu du loggage syslog (configuration du module). * au lieu du loggage syslog (configuration du module).
* Si SYSLOG_FILE_NO_ERROR defini, on ne gere pas erreur ecriture log * Si SYSLOG_FILE_NO_ERROR defini, on ne gere pas erreur ecriture log
* \param message Line to log. Ne doit pas etre traduit si level = LOG_ERR * This function works only if syslog module is enabled.
* \param level Log level * This must must not use any call to other function calling dol_syslog (avoid infinite loop).
* \remarks This function works only if syslog module is enabled. * On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr
* \remarks This must must not use any call to other function calling dol_syslog (avoid infinite loop). * On Linux LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7
* \remarks On Windows LOG_ERR=4, LOG_WARNING=5, LOG_NOTICE=LOG_INFO=6, LOG_DEBUG=6 si define_syslog_variables ou PHP 5.3+, 7 si dolibarr *
* On Linux LOG_ERR=3, LOG_WARNING=4, LOG_INFO=6, LOG_DEBUG=7 * @param string message Line to log. Ne doit pas etre traduit si level = LOG_ERR
* @param int level Log level
*/ */
function dol_syslog($message, $level=LOG_INFO) function dol_syslog($message, $level=LOG_INFO)
{ {

4
htdocs/lib/security.lib.php
View File

@@ -58,7 +58,7 @@ function getLoginMethod()
$passwordtotest=$_POST["password"]; $passwordtotest=$_POST["password"];
$entitytotest=$_POST["entity"]; $entitytotest=$_POST["entity"];
$function='check_user_password_'.$mode; $function='check_user_password_'.$mode;
$login=$function($usertotest,$passwordtotest,$entitytotest); $login=call_user_func($function,$usertotest,$passwordtotest,$entitytotest);
if ($login) if ($login)
{ {
$conf->authmode=$mode; // This properties is defined only when logged $conf->authmode=$mode; // This properties is defined only when logged
@@ -206,7 +206,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')) elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
{ {
$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
} }
// Entity field // Entity field