Fix proposed by Uli in https://bugs.cacert.org/view.php?id=789
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Sep 2011 21:37:39 +0000 (23:37 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Sep 2011 21:37:39 +0000 (23:37 +0200)
includes/account.php [changed mode: 0644->0755]
pages/account/29.php [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 24c61d8..bdab5db
                        $_SESSION['_config']['errmsg'] = sprintf(_("The domain '%s' is already in a different account and is listed as valid. Can't continue."), sanitizeHTML($domain));
                        $id = $oldid;
                        $oldid=0;
+                       // reset domid into its original state
+                       $domid = $_SESSION['_config']['domid'];
+                       $_REQUEST['domid'] = $domid;
                }
        }
 
old mode 100644 (file)
new mode 100755 (executable)
index c1a3def..bc930f6
@@ -35,7 +35,8 @@
     <td class="DataTD"><input type="text" name="domainname" value="<?=sanitizeHTML($_SESSION['_config']['domain'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_("Update")?>"></td>
+    <td class="DataTD"><input type="submit" name="process" value="<?=_("Cancel")?>"></td>
+    <td class="DataTD"><input type="submit" name="process" value="<?=_("Update")?>"></td>
   </tr>
 </table>
 <input type="hidden" name="oldid" value="<?=intval($id)?>">