diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 5c74dfbc346..b634d98e6b7 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -77,14 +77,14 @@ else print ''.$langs->trans("TableName").''; print ''.$langs->trans("Type").''; print ''.$langs->trans("Format").''; - print ''.$langs->trans("NbOfRecord").''; - print 'Avg_row_length'; - print 'Data_length'; - print 'Max_Data_length'; - print 'Index_length'; - print 'Increment'; - print 'Last check'; - print 'Collation'; + print ''.$langs->trans("NbOfRecord").''; + print 'Avg_row_length'; + print 'Data_length'; + print 'Max_Data_length'; + print 'Index_length'; + print 'Increment'; + print 'Last check'; + print 'Collation'; print "\n"; $sql = "SHOW TABLE STATUS"; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index d3106341967..d0f6ffecefe 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -100,7 +100,7 @@ $chaine = preg_replace('/cellpadding="3" /i','cellpadding="1" cellspacing="1" ', $chaine = preg_replace('/class="h"/i','class="liste_titre"',$chaine); $chaine = preg_replace('//i','',$chaine); $chaine = preg_replace('/th>/i','td>',$chaine); -// Titres +// Titles $chaine = preg_replace('/]*)>/i','
',$chaine); $chaine = preg_replace('/

/i','
',$chaine); $chaine = preg_replace('/<\/h1>/i','

',$chaine); @@ -110,6 +110,8 @@ $chaine = preg_replace('//i','',$chaine); $chaine = preg_replace('//i','',$chaine); $chaine = preg_replace('/
Configuration<\/div>
/i','',$chaine); +// Add LF +$chaine = preg_replace('/(pcntl_[a-z]+),/','$1, ',$chaine); if (isset($title)) { diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 0d6c4a9a2b0..6edca914e77 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -411,13 +411,13 @@ if (! empty($force_install_message)) $force_install_databaserootlogin=preg_replace('/__SUPERUSERLOGIN__/','root',$force_install_databaserootlogin); $force_install_databaserootpass=preg_replace('/__SUPERUSERPASSWORD__/','',$force_install_databaserootpass); ?> - +

trans("DatabaseSuperUserAccess"); ?>

- + trans("Login"); ?> - + trans("Password"); ?> - close(); Not database connexion yet + +// $db->close(); Not database connexion yet + +pFooter($err,$setuplang,'jscheckparam'); +?> diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 17203d54f06..c85a3125765 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -384,7 +384,7 @@ Module85Name=Banks and cash Module85Desc=Management of bank or cash accounts Module100Name=External site Module100Desc=Include any external web site into Dolibarr menus and view it into a Dolibarr frame -Module105Name=Mailman and Sip +Module105Name=Mailman and Spip Module105Desc=Mailman or Spip interface for member module Module200Name=LDAP Module200Desc=LDAP directory synchronisation diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 79aac5a7cf4..772007772cf 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -385,7 +385,7 @@ Module85Name= Banques et caisses Module85Desc= Gestion des comptes financiers de type Comptes bancaires, postaux ou Caisses liquides Module100Name=External site Module100Desc=Ajoute un site Web externe dans les menus Dolibarr et l'affiche dans un frame Dolibarr -Module105Name=Mailman and Sip +Module105Name=Mailman and Spip Module105Desc=Interface vers Mailman ou Spip pour le module Adhérent Module200Name= LDAP Module200Desc= Synchronisation avec un annuaire LDAP