From 900a5800892100ca4cefdc3d43b87861b110878e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 12 May 2011 12:57:28 -0400
Subject: [PATCH] - Bug #3301108 Synchronize and already configured host -
 Also, some fields must be readonly instead of disabled

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

diff --git a/ChangeLog b/ChangeLog
index d7715ad5a..e3a38715a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 ======================
 
 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 bb08fd666..d09705916 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>