Merge branch 'master' into devel
This commit is contained in:
commit
a2bc4b9e36
7 changed files with 56 additions and 31 deletions
|
|
@ -1469,7 +1469,7 @@ function remove_divide_zero($p_formula)
|
|||
* @brief Create randomly a string
|
||||
* @param int $p_length length of the generate string
|
||||
*/
|
||||
function generate_random_string($car)
|
||||
function generate_random_string($p_length)
|
||||
{
|
||||
$string="";
|
||||
$chaine="abcdefghijklmnpqrstuvwxyABCDEFGHIJKLMNPQRSTUVWXY0123456789*/+-=";
|
||||
|
|
|
|||
|
|
@ -257,6 +257,8 @@ function display_file_config($p_array,$from_setup=1,$p_os=1)
|
|||
print ("// Uncomment and define if you want to Name of the sender of the email \r\n");
|
||||
print ("// if you activate the possibility to reinitialize password by email\r\n");
|
||||
print ("// define('ADMIN_WEB', 'www-data@localhost');\r\n");
|
||||
print ("// Define a random session key if you work with different version of NOALYSS\r\n");
|
||||
printf ("define ('SESSION_KEY','%s')",generate_random_string(10)) ;
|
||||
|
||||
}
|
||||
/*!\brief create the config file
|
||||
|
|
|
|||
|
|
@ -1170,7 +1170,7 @@ function check()
|
|||
{
|
||||
$text=new IText($key);
|
||||
$text->value=$value;
|
||||
$min_size=(strlen($value)<30)?30:strlen($value)+5;
|
||||
$min_size=(noalyss_strlen($value)<30)?30:strlen($value)+5;
|
||||
$text->size=$min_size;
|
||||
echo $text->input();
|
||||
}
|
||||
|
|
@ -1178,7 +1178,7 @@ function check()
|
|||
{
|
||||
$text=new INum($key);
|
||||
$text->value=$value;
|
||||
$min_size=(strlen($value)<10)?10:strlen($value)+1;
|
||||
$min_size=(noalyss_strlen($value)<10)?10:strlen($value)+1;
|
||||
$text->size=$min_size;
|
||||
echo $text->input();
|
||||
}
|
||||
|
|
@ -1187,7 +1187,7 @@ function check()
|
|||
$text=new INum($key);
|
||||
$text->prec=4;
|
||||
$text->value=$value;
|
||||
$min_size=(strlen($value)<10)?10:strlen($value)+1;
|
||||
$min_size=(noalyss_strlen($value)<10)?10:strlen($value)+1;
|
||||
$text->size=$min_size;
|
||||
echo $text->input();
|
||||
}
|
||||
|
|
@ -1196,7 +1196,7 @@ function check()
|
|||
$text=new INum($key);
|
||||
$text->prec=6;
|
||||
$text->value=$value;
|
||||
$min_size=(strlen($value)<10)?10:strlen($value)+1;
|
||||
$min_size=(noalyss_strlen($value)<10)?10:strlen($value)+1;
|
||||
$text->size=$min_size;
|
||||
echo $text->input();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue