diff options
| author | Bernhard Fröhlich <bernhard@cacert.org> | 2011-09-26 23:42:57 +0200 |
|---|---|---|
| committer | Bernhard Fröhlich <bernhard@cacert.org> | 2011-09-26 23:42:57 +0200 |
| commit | 0c71f697bf7a7de87fc7f601dbd620672bdc7958 (patch) | |
| tree | a3eaf32890c0b975ebbe48cc04f7d78923d75ec6 /includes/account.php | |
| parent | 2a3fdbe67b039d1017d31ee8787b193c9283a7d8 (diff) | |
| download | cacert-devel-0c71f697bf7a7de87fc7f601dbd620672bdc7958.tar.gz cacert-devel-0c71f697bf7a7de87fc7f601dbd620672bdc7958.tar.xz cacert-devel-0c71f697bf7a7de87fc7f601dbd620672bdc7958.zip | |
Applied account-diff-20110926.php provided by Uli
Diffstat (limited to 'includes/account.php')
| -rwxr-xr-x | includes/account.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/includes/account.php b/includes/account.php index 24c61d8..171c79e 100755 --- a/includes/account.php +++ b/includes/account.php @@ -2138,7 +2138,8 @@ if($oldid == 29 && $process != "") { - $domain = mysql_real_escape_string(stripslashes(trim($domainname))); + // $domain = mysql_real_escape_string(stripslashes(trim($domainname))); + $domain = $_SESSION['_config']['domain'] = trim(mysql_real_escape_string(stripslashes($_REQUEST['domainname']))); $res1 = mysql_query("select * from `orgdomains` where `domain` like '$domain' and `id`!='".intval($_SESSION['_config']['domid'])."'"); $res2 = mysql_query("select * from `domains` where `domain` like '$domain' and `deleted`=0"); @@ -2147,10 +2148,13 @@ $_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; } } - if(($oldid == 29 || $oldid == 30) && $process != _("Cancel")) + if(($oldid == 29 || $oldid == 30) && $process != "") // _("Cancel") is handled in front of account.php { $query = "select `orgdomaincerts`.`id` as `id` from `orgdomlink`, `orgdomaincerts`, `orgdomains` where `orgdomlink`.`orgdomid`=`orgdomains`.`id` and |