diff options
author | Bernhard Fröhlich <bernhard@cacert.org> | 2011-09-06 22:46:03 +0200 |
---|---|---|
committer | Bernhard Fröhlich <bernhard@cacert.org> | 2011-09-06 22:46:03 +0200 |
commit | cca380eead37696aea06686d3d3ed61960e32732 (patch) | |
tree | be5c5a4d98be5852496229c035b333dee2fbaacc | |
parent | ed99f6f3cd1132c508d76b31260e0fd0a080f702 (diff) | |
download | cacert-devel-bug-824.tar.gz cacert-devel-bug-824.tar.xz cacert-devel-bug-824.zip |
Removed changes not relevant for bug#824 (IMHO)bug-824
-rw-r--r-- | includes/account.php | 111 |
1 files changed, 7 insertions, 104 deletions
diff --git a/includes/account.php b/includes/account.php index 98b5850..c00200b 100644 --- a/includes/account.php +++ b/includes/account.php @@ -136,50 +136,10 @@ if($process != "" && $oldid == 2) { - -/* sample code from id=29 - if($oldid == 29 && $process != "") - { - $domain = mysql_real_escape_string(stripslashes(trim($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"); - if(mysql_num_rows($res1) > 0 || mysql_num_rows($res2) > 0) - { - $_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; - } - } - */ - // $_REQUEST['delid'] exist $id = 2; csrf_check("chgdef"); - $id = 60; - if(array_key_exists('delid',$_REQUEST) && is_array($_REQUEST['delid'])) - { - // $_SESSION['profile']['id'] - // $_SESSION['profile']['email'] - $oldid=0; - } - else - { showheader(_("My CAcert.org Account!")); $delcount = 0; - echo _("You did not select any email accounts for removal."); - echo _("You failed to select any accounts to be removed, or you attempted to remove the default account. No action was taken."); - showfooter(); - exit; - } - -/* - $id = 2; - csrf_check("chgdef"); - showheader(_("My CAcert.org Account!")); - $delcount = 0; if(array_key_exists('delid',$_REQUEST) && is_array($_REQUEST['delid'])) { foreach($_REQUEST['delid'] as $id) @@ -220,8 +180,6 @@ showfooter(); exit; - */ - } if($process != "" && $oldid == 3) @@ -286,7 +244,7 @@ { $id = 4; showheader(_("My CAcert.org Account!")); - printf(_("I didn't receive a valid Certificate Request, hit the back button and try again. [%s]"), 2); + printf(_("I didn't receive a valid Certificate Request, hit the back button and try again. [%s]"), 2); showfooter(); exit; } @@ -1544,7 +1502,7 @@ { $id = 17; showheader(_("My CAcert.org Account!")); - printf(_("I didn't receive a valid Certificate Request, hit the back button and try again. [%s]"), 6); + printf(_("I didn't receive a valid Certificate Request, hit the back button and try again. [%s]"), 6); showfooter(); exit; } @@ -1614,10 +1572,10 @@ } mysql_query("update `orgemailcerts` set `csr_name`='$CSRname' where `id`='$emailid'"); } else if($_REQUEST['keytype'] == "MS" || $_REQUEST['keytype']=="VI") { - if ($csr=="") { - $csr = "-----BEGIN CERTIFICATE REQUEST-----\n".clean_csr($_REQUEST['CSR'])."-----END CERTIFICATE REQUEST-----\n"; - // else use optional CSR - } + if ($csr=="") { + $csr = "-----BEGIN CERTIFICATE REQUEST-----\n".clean_csr($_REQUEST['CSR'])."-----END CERTIFICATE REQUEST-----\n"; + // else use optional CSR + } if (($weakKey = checkWeakKeyCSR($csr)) !== "") { $id = 17; @@ -1669,7 +1627,7 @@ if($csr == "") { showheader(_("My CAcert.org Account!")); - printf(_("I didn't receive a valid Certificate Request, hit the back button and try again. [%s]"), 7); + printf(_("I didn't receive a valid Certificate Request, hit the back button and try again. [%s]"), 7); showfooter(); exit; } @@ -2285,9 +2243,6 @@ $_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; } } @@ -3095,58 +3050,6 @@ exit; } - if($process != "" && $oldid == 60) - { - // delete user account email confirmed - $id = 60; - csrf_check("chgdefcnfd"); - showheader(_("My CAcert.org Account!")); - $delcount = 0; - if(array_key_exists('delid',$_REQUEST) && is_array($_REQUEST['delid'])) - { - echo _("The following email addresses and associated client certificates have been removed:")."<br><br>\n"; - foreach($_REQUEST['delid'] as $id) - { - $id = intval($id); - $query = "select * from `email` where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."' and - `email`!='".$_SESSION['profile']['email']."'"; - $res = mysql_query($query); - if(mysql_num_rows($res) > 0) - { - $row = mysql_fetch_assoc($res); - echo $row['email']."<br>\n"; - $query = "select `emailcerts`.`id` - from `emaillink`,`emailcerts` where - `emailid`='$id' and `emaillink`.`emailcertsid`=`emailcerts`.`id` and - `revoked`=0 and UNIX_TIMESTAMP(`expire`)-UNIX_TIMESTAMP() > 0 - group by `emailcerts`.`id`"; - $dres = mysql_query($query); - while($drow = mysql_fetch_assoc($dres)) - mysql_query("update `emailcerts` set `revoked`='1970-01-01 10:00:01' where `id`='".$drow['id']."'"); - - $query = "update `email` set `deleted`=NOW() where `id`='$id'"; - mysql_query($query); - $delcount++; - } - } - } - else - { - echo _("You did not select any email address for removal."); - } - if($delcount > 0) - { - echo "<br>\n"; - printf(_("%s email address(es) and associated client certificates have been removed."), intval($delcount)); - echo "<br>\n"; - } else { - echo _("You failed to select any accounts to be removed, or you attempted to remove the default account. No action was taken."); - } - - showfooter(); - exit; - } - if(intval($cert) > 0) $_SESSION['_config']['cert'] = intval($cert); if(intval($orgid) > 0) |