Will fix later: On installer, we should not enable first 3 fields.
This commit is contained in:
parent
60e7eea449
commit
532180d483
@ -86,6 +86,7 @@ if (! empty($force_install_message))
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
<!-- Documents root $dolibarr_main_document_root -->
|
||||||
<tr>
|
<tr>
|
||||||
<?php
|
<?php
|
||||||
print '<td valign="top" class="label"><b>';
|
print '<td valign="top" class="label"><b>';
|
||||||
@ -118,10 +119,9 @@ if (! empty($force_install_message))
|
|||||||
$dolibarr_main_document_root = preg_replace('/[\\/]+$/','',$dolibarr_main_document_root);
|
$dolibarr_main_document_root = preg_replace('/[\\/]+$/','',$dolibarr_main_document_root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//echo $PMA_MYSQL_INT_VERSION;
|
|
||||||
?>
|
?>
|
||||||
<td class="label" valign="top"><input type="text" size="60"
|
<td class="label" valign="top">
|
||||||
value="<?php print $dolibarr_main_document_root; ?>" name="main_dir">
|
<input type="text" size="60" value="<?php print $dolibarr_main_document_root; ?>"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> name="main_dir">
|
||||||
</td>
|
</td>
|
||||||
<td class="comment"><?php
|
<td class="comment"><?php
|
||||||
print $langs->trans("WithNoSlashAtTheEnd")."<br>";
|
print $langs->trans("WithNoSlashAtTheEnd")."<br>";
|
||||||
@ -134,9 +134,10 @@ if (! empty($force_install_message))
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
<!-- Documents URL $dolibarr_main_data_root -->
|
||||||
<tr>
|
<tr>
|
||||||
<td valign="top" class="label"><b> <?php print $langs->trans("DocumentsDirectory"); ?>
|
<td valign="top" class="label"><b> <?php print $langs->trans("DocumentsDirectory"); ?></b>
|
||||||
</b></td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
if (empty($dolibarr_main_data_root))
|
if (empty($dolibarr_main_data_root))
|
||||||
{
|
{
|
||||||
@ -152,8 +153,8 @@ if (! empty($force_install_message))
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td class="label" valign="top"><input type="text" size="60"
|
<td class="label" valign="top">
|
||||||
value="<?php print $dolibarr_main_data_root; ?>" name="main_data_dir">
|
<input type="text" size="60" value="<?php print $dolibarr_main_data_root; ?>"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> name="main_data_dir">
|
||||||
</td>
|
</td>
|
||||||
<td class="comment"><?php
|
<td class="comment"><?php
|
||||||
print $langs->trans("WithNoSlashAtTheEnd")."<br>";
|
print $langs->trans("WithNoSlashAtTheEnd")."<br>";
|
||||||
@ -167,12 +168,7 @@ if (! empty($force_install_message))
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
<!-- Root URL $dolibarr_main_url_root -->
|
||||||
<td valign="top" class="label"><b> <?php echo $langs->trans("URLRoot"); ?>
|
|
||||||
</b></td>
|
|
||||||
<td valign="top" class="label"><input type="text" size="60"
|
|
||||||
name="main_url"
|
|
||||||
value="
|
|
||||||
<?php
|
<?php
|
||||||
if (! empty($main_url)) $dolibarr_main_url_root=$main_url;
|
if (! empty($main_url)) $dolibarr_main_url_root=$main_url;
|
||||||
if (empty($dolibarr_main_url_root))
|
if (empty($dolibarr_main_url_root))
|
||||||
@ -199,12 +195,14 @@ if (empty($dolibarr_main_url_root))
|
|||||||
$dolibarr_main_url_root = preg_replace('/\/index\.php$/','',$dolibarr_main_url_root); # Supprime le /index.php
|
$dolibarr_main_url_root = preg_replace('/\/index\.php$/','',$dolibarr_main_url_root); # Supprime le /index.php
|
||||||
$dolibarr_main_url_root = preg_replace('/\/install$/','',$dolibarr_main_url_root); # Supprime le /install
|
$dolibarr_main_url_root = preg_replace('/\/install$/','',$dolibarr_main_url_root); # Supprime le /install
|
||||||
}
|
}
|
||||||
|
?>
|
||||||
print $dolibarr_main_url_root;
|
<tr>
|
||||||
?>"></td>
|
<td valign="top" class="label"><b> <?php echo $langs->trans("URLRoot"); ?></b>
|
||||||
<td class="comment"><?php
|
</td>
|
||||||
print $langs->trans("Examples").":<br>";
|
<td valign="top" class="label">
|
||||||
?>
|
<input type="text" size="60" name="main_url"<?php print (empty($todoforce_install_main_data_root)?'':' disabled="true"'); ?> value="<?php print $dolibarr_main_url_root; ?>">
|
||||||
|
</td>
|
||||||
|
<td class="comment"><?php print $langs->trans("Examples").":<br>"; ?>
|
||||||
<ul>
|
<ul>
|
||||||
<li>http://localhost/</li>
|
<li>http://localhost/</li>
|
||||||
<li>http://www.myserver.com:8180/dolibarr</li>
|
<li>http://www.myserver.com:8180/dolibarr</li>
|
||||||
@ -242,7 +240,7 @@ if (1 == 2) { // Disabled during install process because HTTPS may not be yet
|
|||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<!-- moi-->
|
<!-- Driver type -->
|
||||||
<td valign="top" class="label"><b> <?php echo $langs->trans("DriverType"); ?>
|
<td valign="top" class="label"><b> <?php echo $langs->trans("DriverType"); ?>
|
||||||
</b></td>
|
</b></td>
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user