Merge remote-tracking branch 'origin/master'

2012-04-26 16:18:52 +02:00 · 2012-04-26 16:18:52 +02:00 · 33e5299b15
commit 33e5299b15
parent c8eba8aacb b4b6919746
4 changed files with 86 additions and 38 deletions
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@ -106,18 +106,30 @@ require_once 'libraries/header_scripts.inc.php';
            var field = 'fields';
            var field_null = 'fields_null';

-            <?php if (isset($rownumber)) { ?>
+            <?php
+            if (isset($rownumber)) {
+            ?>
            var element_name = field + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']';
            var null_name = field_null + '[multi_edit][<?php echo htmlspecialchars($rownumber); ?>][' + fieldmd5 + ']';
-            <?php } else { ?>
+            <?php
+            } else {
+            ?>
            var element_name = field + '[]';
-            <?php } ?>
+            <?php
+            }
+            ?>

-            <?php if (isset($fieldkey) && is_numeric($fieldkey)) { ?>
+            <?php
+            if (isset($fieldkey) && is_numeric($fieldkey)) {
+            ?>
            var element_name_alt = field + '[<?php echo $fieldkey; ?>]';
-            <?php } else { ?>
+            <?php
+            } else {
+            ?>
            var element_name_alt = field + '[0]';
-            <?php } ?>
+            <?php
+            }
+            ?>

            if (opener.document.insertForm.elements[element_name]) {
                // Edit/Insert form
@ -149,9 +161,13 @@ require_once 'libraries/header_scripts.inc.php';
 <input type="hidden" name="field" value="<?php echo htmlspecialchars($field); ?>" />
 <input type="hidden" name="fieldkey"
    value="<?php echo isset($fieldkey) ? htmlspecialchars($fieldkey) : ''; ?>" />
-<?php if (isset($rownumber)) { ?>
+<?php
+if (isset($rownumber)) {
+?>
 <input type="hidden" name="rownumber" value="<?php echo htmlspecialchars($rownumber); ?>" />
-<?php } ?>
+<?php
+}
+?>
 <span class="formelement">
    <label for="input_foreign_filter"><?php echo __('Search') . ':'; ?></label>
    <input type="text" name="foreign_filter" id="input_foreign_filter"
--- a/db_datadict.php
+++ b/db_datadict.php
@ -233,7 +233,11 @@ foreach ($tables as $table) {
    <td<?php echo $type_nowrap; ?> lang="en" dir="ltr"><?php echo $type; ?></td>
 <?php /*    <td<?php echo $type_nowrap; ?>><?php echo $attribute; ?></td>*/ ?>
    <td><?php echo (($row['Null'] == 'NO') ? __('No') : __('Yes')); ?></td>
-    <td class="nowrap"><?php if (isset($row['Default'])) { echo $row['Default']; } ?></td>
+    <td class="nowrap"><?php
+    if (isset($row['Default'])) {
+        echo $row['Default'];
+    }
+    ?></td>
 <?php /*    <td<?php echo $type_nowrap; ?>><?php echo $row['Extra']; ?></td>*/ ?>
        <?php
        if ($have_rel) {
--- a/db_operations.php
+++ b/db_operations.php
@ -490,12 +490,12 @@ echo __('Remove database');
 </ul>
 </fieldset>
 </div>
-<?php } ?>
-    <?php
-    /**
-     * Copy database
-     */
-    ?>
+<?php
+}
+/**
+ * Copy database
+ */
+?>
        <div class="operations_half_width clearfloat">
        <form id="copy_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php"
        onsubmit="return emptyFormElements(this, 'newname')">
--- a/db_structure.php
+++ b/db_structure.php
@ -461,25 +461,31 @@ foreach ($tables as $keyname => $each_table) {
    <th><?php echo $browse_table_label; ?>
        <?php echo (! empty($tracking_icon) ? $tracking_icon : ''); ?>
    </th>
-   <?php if ($server_slave_status) { ?><td class="center"><?php
+    <?php
+    if ($server_slave_status) {
+       ?><td class="center"><?php
        echo $ignored
            ? PMA_getImage('s_cancel.png', 'NOT REPLICATED')
            : ''.
        $do
            ? PMA_getImage('s_success.png', 'REPLICATED')
-            : ''; ?></td><?php } ?>
+            : ''; ?></td><?php
+    }
+    ?>
    <td class="center"><?php echo $browse_table; ?></td>
    <td class="center">
        <a href="tbl_structure.php?<?php echo $tbl_url_query; ?>">
            <?php echo $titles['Structure']; ?></a></td>
    <td class="center"><?php echo $search_table; ?></td>
-    <?php if (! $db_is_information_schema) { ?>
+    <?php
+    if (! $db_is_information_schema) {
+        ?>
    <td class="insert_table center">
        <a <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? 'class="ajax"' : ''); ?> href="tbl_change.php?<?php echo $tbl_url_query; ?>">
            <?php echo $titles['Insert']; ?></a></td>
    <td class="center"><?php echo $empty_table; ?></td>
    <td class="center">
-    <a 
+    <a
    <?php if ($GLOBALS['cfg']['AjaxEnable']) {
            echo 'class="drop_table_anchor';
            if ($table_is_view || $each_table['ENGINE'] == null) {
@ -494,7 +500,8 @@ foreach ($tables as $keyname => $each_table) {
            echo urlencode($drop_query); ?>&amp;message_to_show=<?php
            echo urlencode($drop_message); ?>" >
            <?php echo $titles['Drop']; ?></a></td>
-    <?php } // end if (! $db_is_information_schema)
+    <?php
+    } // end if (! $db_is_information_schema)

    // there is a null value in the ENGINE
    // - when the table needs to be repaired, or
@ -530,41 +537,62 @@ foreach ($tables as $keyname => $each_table) {
        }
    ?>
    <td class="value tbl_rows"><?php echo $row_count_pre . PMA_formatNumber($each_table['TABLE_ROWS'], 0) . $show_superscript; ?></td>
-        <?php if (!($cfg['PropertiesNumColumns'] > 1)) { ?>
+    <?php
+    if (!($cfg['PropertiesNumColumns'] > 1)) {
+    ?>
    <td class="nowrap"><?php echo ($table_is_view ? __('View') : $each_table['ENGINE']); ?></td>
-            <?php if (isset($collation)) { ?>
+        <?php
+        if (isset($collation)) {
+        ?>
    <td class="nowrap"><?php echo $collation ?></td>
-            <?php } ?>
-        <?php } ?>
-
-        <?php if ($is_show_stats) { ?>
+    <?php
+        }
+    }
+    if ($is_show_stats) {
+    ?>
    <td class="value tbl_size"><a
        href="tbl_structure.php?<?php echo $tbl_url_query; ?>#showusage"
        ><?php echo '<span>' . $formatted_size . '</span> <span class="unit">' . $unit . '</span>'; ?></a></td>
    <td class="value tbl_overhead"><?php echo $overhead; ?></td>
-        <?php } // end if
-        if ($GLOBALS['cfg']['ShowDbStructureCreation']) { ?>
+    <?php
+    } // end if
+    if ($GLOBALS['cfg']['ShowDbStructureCreation']) {
+    ?>
    <td class="value tbl_creation"><?php echo $create_time ? PMA_localisedDate(strtotime($create_time)) : '-'; ?></td>
-        <?php } // end if
-        if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']) { ?>
+    <?php
+    } // end if
+    if ($GLOBALS['cfg']['ShowDbStructureLastUpdate']) {
+    ?>
    <td class="value tbl_last_update"><?php echo $update_time ? PMA_localisedDate(strtotime($update_time)) : '-'; ?></td>
-        <?php } // end if
-        if ($GLOBALS['cfg']['ShowDbStructureLastCheck']) { ?>
+    <?php
+    } // end if
+    if ($GLOBALS['cfg']['ShowDbStructureLastCheck']) {
+    ?>
    <td class="value tbl_last_check"><?php echo $check_time ? PMA_localisedDate(strtotime($check_time)) : '-'; ?></td>
-        <?php } // end if ?>
-    <?php } elseif ($table_is_view) { ?>
+    <?php
+    } // end if
+    } elseif ($table_is_view) {
+    ?>
    <td class="value">-</td>
    <td><?php echo __('View'); ?></td>
    <td>---</td>
-        <?php if ($is_show_stats) { ?>
+        <?php
+        if ($is_show_stats) {
+            ?>
    <td class="value">-</td>
    <td class="value">-</td>
-        <?php } ?>
-    <?php } else { ?>
+        <?php
+        }
+        ?>
+    <?php
+    } else {
+        ?>
    <td colspan="<?php echo ($colspan_for_structure - ($db_is_information_schema ? 5 : 8)) ?>"
        class="center">
        <?php echo __('in use'); ?></td>
-    <?php } // end if (isset($each_table['TABLE_ROWS'])) else ?>
+    <?php
+    } // end if (isset($each_table['TABLE_ROWS'])) else
+    ?>
 </tr>
    <?php
 } // end foreach