lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Show root install param only if required.

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-04 10:23:59 +02:00
parent 571041e5d5
commit 59bd8ada73
5 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/admin/system/database-tables.php
View File

@ -77,14 +77,14 @@ else
print '<td>'.$langs->trans("TableName").'</td>'; print '<td>'.$langs->trans("TableName").'</td>';
print '<td colspan="2">'.$langs->trans("Type").'</td>'; print '<td colspan="2">'.$langs->trans("Type").'</td>';
print '<td>'.$langs->trans("Format").'</td>'; print '<td>'.$langs->trans("Format").'</td>';
print '<td>'.$langs->trans("NbOfRecord").'</td>'; print '<td align="right">'.$langs->trans("NbOfRecord").'</td>';
print '<td>Avg_row_length</td>'; print '<td align="right">Avg_row_length</td>';
print '<td>Data_length</td>'; print '<td align="right">Data_length</td>';
print '<td>Max_Data_length</td>'; print '<td align="right">Max_Data_length</td>';
print '<td>Index_length</td>'; print '<td align="right">Index_length</td>';
print '<td>Increment</td>'; print '<td align="right">Increment</td>';
print '<td>Last check</td>'; print '<td align="right">Last check</td>';
print '<td>Collation</td>'; print '<td align="right">Collation</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SHOW TABLE STATUS"; $sql = "SHOW TABLE STATUS";

4
htdocs/admin/system/phpinfo.php
View File

@ -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('/class="h"/i','class="liste_titre"',$chaine);
$chaine = preg_replace('/<th colspan="2">/i','<td>',$chaine); $chaine = preg_replace('/<th colspan="2">/i','<td>',$chaine);
$chaine = preg_replace('/th>/i','td>',$chaine); $chaine = preg_replace('/th>/i','td>',$chaine);
// Titres // Titles
$chaine = preg_replace('/<h1([^>]*)>/i','<div class="titre">',$chaine); $chaine = preg_replace('/<h1([^>]*)>/i','<div class="titre">',$chaine);
$chaine = preg_replace('/<h2>/i','<div class="titre">',$chaine); $chaine = preg_replace('/<h2>/i','<div class="titre">',$chaine);
$chaine = preg_replace('/<\/h1>/i','</div><br>',$chaine); $chaine = preg_replace('/<\/h1>/i','</div><br>',$chaine);
@ -110,6 +110,8 @@ $chaine = preg_replace('/<td class="e">/i','<td class="impair">',$chaine);
$chaine = preg_replace('/<td class="v">/i','<td class="pair">',$chaine); $chaine = preg_replace('/<td class="v">/i','<td class="pair">',$chaine);
$chaine = preg_replace('/<div class="titre">Configuration<\/div><br>/i','',$chaine); $chaine = preg_replace('/<div class="titre">Configuration<\/div><br>/i','',$chaine);
// Add LF
$chaine = preg_replace('/(pcntl_[a-z]+),/','$1, ',$chaine);
if (isset($title)) if (isset($title))
{ {

17
htdocs/install/fileconf.php
View File

@ -411,13 +411,13 @@ if (! empty($force_install_message))
$force_install_databaserootlogin=preg_replace('/__SUPERUSERLOGIN__/','root',$force_install_databaserootlogin); $force_install_databaserootlogin=preg_replace('/__SUPERUSERLOGIN__/','root',$force_install_databaserootlogin);
$force_install_databaserootpass=preg_replace('/__SUPERUSERPASSWORD__/','',$force_install_databaserootpass); $force_install_databaserootpass=preg_replace('/__SUPERUSERPASSWORD__/','',$force_install_databaserootpass);
?> ?>
<tr class="hidesqlite"> <tr class="hidesqlite hideroot">
<td colspan="3" class="label" align="center"><br> <td colspan="3" class="label" align="center"><br>
<h3><?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3> <h3><?php echo $langs->trans("DatabaseSuperUserAccess"); ?></h3>
</td> </td>
</tr> </tr>
<tr class="hidesqlite"> <tr class="hidesqlite hideroot">
<td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td> <td class="label" valign="top"><?php echo $langs->trans("Login"); ?></td>
<td class="label" valign="top"><input type="text" id="db_user_root" <td class="label" valign="top"><input type="text" id="db_user_root"
name="db_user_root" class="needroot" name="db_user_root" class="needroot"
@ -434,7 +434,7 @@ if (! empty($force_install_message))
</tr> </tr>
<tr class="hidesqlite"> <tr class="hidesqlite hideroot">
<td class="label" valign="top"><?php echo $langs->trans("Password"); ?> <td class="label" valign="top"><?php echo $langs->trans("Password"); ?>
</td> </td>
<td class="label" valign="top"><input type="text" autocomplete="off" <td class="label" valign="top"><input type="text" autocomplete="off"
@ -463,10 +463,12 @@ jQuery(document).ready(function() {
/*alert(jQuery("#db_create_database").attr("checked")); */ /*alert(jQuery("#db_create_database").attr("checked")); */
if (jQuery("#db_create_database").attr("checked") || jQuery("#db_create_user").attr("checked")) if (jQuery("#db_create_database").attr("checked") || jQuery("#db_create_user").attr("checked"))
{ {
jQuery(".hideroot").show();
jQuery(".needroot").removeAttr('disabled'); jQuery(".needroot").removeAttr('disabled');
} }
else else
{ {
jQuery(".hideroot").hide();
jQuery(".needroot").attr('disabled','disabled'); jQuery(".needroot").attr('disabled','disabled');
} }
} }
@ -549,9 +551,10 @@ function jscheckparam()
} }
</script> </script>
<?php
// $db->close(); Not database connexion yet <?php
pFooter($err,$setuplang,'jscheckparam'); // $db->close(); Not database connexion yet
?>
pFooter($err,$setuplang,'jscheckparam');
?>

2
htdocs/langs/en_US/admin.lang
View File

@ -384,7 +384,7 @@ Module85Name=Banks and cash
Module85Desc=Management of bank or cash accounts Module85Desc=Management of bank or cash accounts
Module100Name=External site Module100Name=External site
Module100Desc=Include any external web site into Dolibarr menus and view it into a Dolibarr frame 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 Module105Desc=Mailman or Spip interface for member module
Module200Name=LDAP Module200Name=LDAP
Module200Desc=LDAP directory synchronisation Module200Desc=LDAP directory synchronisation

2
htdocs/langs/fr_FR/admin.lang
View File

@ -385,7 +385,7 @@ Module85Name= Banques et caisses
Module85Desc= Gestion des comptes financiers de type Comptes bancaires, postaux ou Caisses liquides Module85Desc= Gestion des comptes financiers de type Comptes bancaires, postaux ou Caisses liquides
Module100Name=External site Module100Name=External site
Module100Desc=Ajoute un site Web externe dans les menus Dolibarr et l'affiche dans un frame Dolibarr 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 Module105Desc=Interface vers Mailman ou Spip pour le module Adhérent
Module200Name= LDAP Module200Name= LDAP
Module200Desc= Synchronisation avec un annuaire LDAP Module200Desc= Synchronisation avec un annuaire LDAP