nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missing '/' for closing div tag

Browse Source
This commit is contained in:
Sebastian Mendel
2005-12-06 09:58:21 +00:00
parent e096959857
commit 02d1596902
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -8,6 +8,7 @@ $Source$
2005-12-06 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-06 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: wrong quote * libraries/common.lib.php: wrong quote
thanks to Matt "Cyber Dog" LaPlante thanks to Matt "Cyber Dog" LaPlante
* display_import.lib.php: missing '/' for closing div tag
2005-12-05 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-05 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php: added PMA_array_merge_recursive() * libraries/common.lib.php: added PMA_array_merge_recursive()

28
libraries/display_import.lib.php
View File

@@ -60,7 +60,7 @@ function PMA_importIsActive($what, $val) {
?> ?>
<form action="import.php" method="post" enctype="multipart/form-data" name="import"> <form action="import.php" method="post" enctype="multipart/form-data" name="import">
<?php <?php
if ($import_type == 'server') { if ($import_type == 'server') {
echo PMA_generate_common_hidden_inputs('', '', 1); echo PMA_generate_common_hidden_inputs('', '', 1);
} elseif ($import_type == 'database') { } elseif ($import_type == 'database') {
@@ -74,7 +74,7 @@ echo ' <input type="hidden" name="import_type" value="' . $import_type . '" /
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
//<![CDATA[ //<![CDATA[
function hide_them_all() { function hide_them_all() {
<?php <?php
foreach($import_list as $key => $val) { foreach($import_list as $key => $val) {
if (isset($val['options'])) { if (isset($val['options'])) {
echo 'document.getElementById("' . $key . '_options").style.display = "none";'; echo 'document.getElementById("' . $key . '_options").style.display = "none";';
@@ -85,7 +85,7 @@ echo ' <input type="hidden" name="import_type" value="' . $import_type . '" /
function init_options() { function init_options() {
hide_them_all(); hide_them_all();
<?php <?php
foreach($import_list as $key => $val) { foreach($import_list as $key => $val) {
echo 'if (document.getElementById("radio_import_' . $key . '").checked) {'; echo 'if (document.getElementById("radio_import_' . $key . '").checked) {';
if (isset($val['options'])) { if (isset($val['options'])) {
@@ -100,7 +100,7 @@ echo ' <input type="hidden" name="import_type" value="' . $import_type . '" /
document.getElementById('none_options').style.display = 'block'; document.getElementById('none_options').style.display = 'block';
} }
} }
function match_file(fname) { function match_file(fname) {
farr = fname.toLowerCase().split('.'); farr = fname.toLowerCase().split('.');
if (farr.length != 0) { if (farr.length != 0) {
@@ -120,22 +120,22 @@ foreach($import_list as $key => $val) {
} }
//]]> //]]>
</script> </script>
<h2><?php echo $strImport; ?></h2> <h2><?php echo $strImport; ?></h2>
<!-- File name, and some other common options --> <!-- File name, and some other common options -->
<fieldset class="options"> <fieldset class="options">
<legend><?php echo $strFileToImport; ?></legend> <legend><?php echo $strFileToImport; ?></legend>
<div class="formelementrow"> <div class="formelementrow">
<label for="input_import_file"><?php echo $strLocationTextfile; ?></label> <label for="input_import_file"><?php echo $strLocationTextfile; ?></label>
<input style="margin: 5px" type="file" name="import_file" id="input_import_file" onchange="match_file(this.value);" /> <input style="margin: 5px" type="file" name="import_file" id="input_import_file" onchange="match_file(this.value);" />
<?php <?php
echo PMA_displayMaximumUploadSize($max_upload_size) . "\n"; echo PMA_displayMaximumUploadSize($max_upload_size) . "\n";
// some browsers should respect this :) // some browsers should respect this :)
echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n"; echo PMA_generateHiddenMaxFileSize($max_upload_size) . "\n";
?> ?>
<div> </div>
<?php <?php
if (!empty($cfg['UploadDir'])) { if (!empty($cfg['UploadDir'])) {
$extensions = ''; $extensions = '';
@@ -207,8 +207,8 @@ echo "\n";
</fieldset> </fieldset>
<fieldset class="options"> <fieldset class="options">
<legend><?php echo $strPartialImport; ?></legend> <legend><?php echo $strPartialImport; ?></legend>
<?php <?php
if (isset($timeout_passed) && $timeout_passed) { if (isset($timeout_passed) && $timeout_passed) {
echo '<div class="formelementrow">' . "\n"; echo '<div class="formelementrow">' . "\n";
echo '<input type="hidden" name="skip" value="' . $offset . '" />'; echo '<input type="hidden" name="skip" value="' . $offset . '" />';
@@ -221,7 +221,7 @@ echo "\n";
id="checkbox_allow_interrupt" <?php echo PMA_importCheckboxCheck('allow_interrupt'); ?>/> id="checkbox_allow_interrupt" <?php echo PMA_importCheckboxCheck('allow_interrupt'); ?>/>
<label for="checkbox_allow_interrupt"><?php echo $strAllowInterrupt; ?></label><br /> <label for="checkbox_allow_interrupt"><?php echo $strAllowInterrupt; ?></label><br />
</div> </div>
<div class="formelementrow"> <div class="formelementrow">
<label for="text_skip_queries"><?php echo $strSkipQueries; ?></label> <label for="text_skip_queries"><?php echo $strSkipQueries; ?></label>
<input type="text" name="skip_queries" value="<?php echo PMA_importGetDefault('skip_queries');?>" id="text_skip_queries" /> <input type="text" name="skip_queries" value="<?php echo PMA_importGetDefault('skip_queries');?>" id="text_skip_queries" />
@@ -264,12 +264,12 @@ foreach($import_list as $key => $val) {
} }
echo '<br />'; echo '<br />';
} }
echo '</fieldset>'; echo '</fieldset>';
} }
} }
?> ?>
<fieldset id="none_options" class="options"> <fieldset id="none_options" class="options">
<legend><?php echo $strNoOptions; ?></legend> <legend><?php echo $strNoOptions; ?></legend>