[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0-149-g3ff4912

[Marc Delisle]

The branch, master has been updated
       via  3ff49129e11e9e6e9ba9fd6ca376fbf510c2ffb4 (commit)
       via  900a5800892100ca4cefdc3d43b87861b110878e (commit)
      from  3d0499c185bdb33cb619600d97b62989c693d5b9 (commit)


- Log -----------------------------------------------------------------
commit 3ff49129e11e9e6e9ba9fd6ca376fbf510c2ffb4
Merge: 3d0499c185bdb33cb619600d97b62989c693d5b9 900a5800892100ca4cefdc3d43b87861b110878e
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu May 12 12:59:28 2011 -0400

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    1 +
 server_synchronize.php |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23f11a9..7d471e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 + rfe #2021981 [interface] Add support for mass prefix change.
 
 3.4.1.0 (not yet released)
+- bug #3301108 [interface] Synchronize and already configured host
 
 3.4.0.0 (2011-05-11)
 + rfe #2890226 [view] Enable VIEW rename 
diff --git a/server_synchronize.php b/server_synchronize.php
index bb08fd6..d097059 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -1105,9 +1105,9 @@ if (isset($_REQUEST['synchronize_db'])) {
         'ASC', 0, true);
 
     if ($GLOBALS['cfg']['AllowArbitraryServer'] === false) {
-        $possibly_disabled = ' disabled="disabled"';
+        $possibly_readonly = ' readonly="readonly"';
     } else {
-        $possibly_disabled = '';
+        $possibly_readonly = '';
     }
 
     foreach ($cons as $type) {
@@ -1172,27 +1172,27 @@ if (isset($_REQUEST['synchronize_db'])) {
       </tr>
 	<tr class="even toggler remote-server">
 	    <td><?php echo __('Server'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_disabled; ?>/></td>
+        <td><input type="text" name="<?php echo $type; ?>_host" class="server-host" <?php echo $possibly_readonly; ?>/></td>
 	</tr>
 	<tr class="odd toggler remote-server">
 	    <td><?php echo __('Port'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_disabled; ?> value="3306" maxlength="5" size="5" /></td>
+        <td><input type="text" name="<?php echo $type; ?>_port" class="server-port" <?php echo $possibly_readonly; ?> value="3306" maxlength="5" size="5" /></td>
 	</tr>
 	<tr class="even toggler remote-server">
 	    <td><?php echo __('Socket'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_disabled; ?>/></td>
+        <td><input type="text" name="<?php echo $type; ?>_socket" class="server-socket" <?php echo $possibly_readonly; ?>/></td>
 	</tr>
 	<tr class="odd toggler remote-server">
 	    <td><?php echo __('User name'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_disabled; ?>/></td>
+        <td><input type="text" name="<?php echo $type; ?>_username" class="server-user" <?php echo $possibly_readonly; ?>/></td>
 	</tr>
 	<tr class="even toggler remote-server">
 	    <td><?php echo __('Password'); ?></td>
-        <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" <?php echo $possibly_disabled; ?>/> </td>
+        <td><input type="password" name="<?php echo $type; ?>_pass" class="server-pass" /> </td>
 	</tr>
 	<tr class="odd toggler remote-server">
 	    <td><?php echo __('Database'); ?></td>
-        <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" <?php echo $possibly_disabled; ?>/></td>
+        <td><input type="text" name="<?php echo $type; ?>_db" class="server-db" /></td>
 	</tr>
 	<tr class="even toggler current-server" style="display: none;">
 	    <td><?php echo __('Database'); ?></td>


hooks/post-receive
-- 
phpMyAdmin