From b0904b2bda37b292fa5d29d5d3b7ec64d100ad16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Thu, 4 Dec 2014 18:26:23 +0100 Subject: Source code taken from cacert-20141124.tar.bz2 --- includes/account.php | 617 ++++++++++-------- includes/account_stuff.php | 109 ++-- includes/general.php | 53 +- includes/lib/account.php | 72 ++- includes/lib/check_weak_key.php | 8 +- includes/lib/general.php | 37 +- includes/lib/l10n.php | 150 +++-- includes/loggedin.php | 79 +-- includes/notary.inc.php | 1345 ++++++++++++++++++++++++++++++++++----- 9 files changed, 1819 insertions(+), 651 deletions(-) (limited to 'includes') diff --git a/includes/account.php b/includes/account.php index 7e9ee2a..26845cd 100644 --- a/includes/account.php +++ b/includes/account.php @@ -84,6 +84,11 @@ function buildSubjectFromSession() { $memid = array_key_exists('memid',$_REQUEST) ? intval($_REQUEST['memid']) : 0; $domid = array_key_exists('domid',$_REQUEST) ? intval($_REQUEST['domid']) : 0; + $actionrequest = array_key_exists('action',$_REQUEST) ? $_REQUEST['action'] : ""; + + $ticketno = array_key_exists('ticketno',$_REQUEST) ? $_REQUEST['ticketno'] : ""; + $ticketvalidation = FALSE; + if(!$_SESSION['mconn']) { @@ -146,7 +151,7 @@ function buildSubjectFromSession() { exit; } $hash = make_hash(); - $query = "insert into `email` set `email`='".$_REQUEST['email']."',`memid`='".$_SESSION['profile']['id']."',`created`=NOW(),`hash`='$hash'"; + $query = "insert into `email` set `email`='".$_REQUEST['email']."',`memid`='".intval($_SESSION['profile']['id'])."',`created`=NOW(),`hash`='$hash'"; mysql_query($query); $emailid = mysql_insert_id(); @@ -166,7 +171,7 @@ function buildSubjectFromSession() { { $id = 2; $emailid = intval($_REQUEST['emailid']); - $query = "select * from `email` where `id`='$emailid' and `memid`='".$_SESSION['profile']['id']."' and `hash` = '' and `deleted`=0"; + $query = "select * from `email` where `id`='$emailid' and `memid`='".intval($_SESSION['profile']['id'])."' and `hash` = '' and `deleted`=0"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -186,7 +191,7 @@ function buildSubjectFromSession() { "support@cacert.org", "", "", "CAcert Support"); $_SESSION['profile']['email'] = $row['email']; - $query = "update `users` set `email`='".$row['email']."' where `id`='".$_SESSION['profile']['id']."'"; + $query = "update `users` set `email`='".mysql_real_escape_string($row['email'])."' where `id`='".intval($_SESSION['profile']['id'])."'"; mysql_query($query); showheader(_("My CAcert.org Account!")); printf(_("Your default email address has been updated to '%s'."), sanitizeHTML($row['email'])); @@ -211,7 +216,7 @@ function buildSubjectFromSession() { } $id = intval($id); $query = "select * from `email` where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."' and - `email`!='".$_SESSION['profile']['email']."'"; + `email`!='".mysql_real_escape_string($_SESSION['profile']['email'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) > 0) { @@ -284,6 +289,9 @@ function buildSubjectFromSession() { if($_SESSION['_config']['rootcert'] < 1 || $_SESSION['_config']['rootcert'] > 2) $_SESSION['_config']['rootcert'] = 1; } + + $_SESSION['_config']['hash_alg'] = HashAlgorithms::clean($_REQUEST['hash_alg']); + $csr = ""; if(trim($_REQUEST['optionalCSR']) == "") { @@ -293,11 +301,8 @@ function buildSubjectFromSession() { $_REQUEST['keytype'] = "MS"; $csr = clean_csr($_REQUEST['optionalCSR']); } - if(trim($_REQUEST['description']) != ""){ - $_SESSION['_config']['description']= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); - }else{ - $_SESSION['_config']['description']= ""; - } + + $_SESSION['_config']['description']= trim(stripslashes($_REQUEST['description'])); } if($oldid == 4) @@ -321,7 +326,7 @@ function buildSubjectFromSession() { if(is_array($_SESSION['_config']['addid'])) foreach($_SESSION['_config']['addid'] as $id) { - $res = mysql_query("select * from `email` where `memid`='".$_SESSION['profile']['id']."' and `id`='".intval($id)."'"); + $res = mysql_query("select * from `email` where `memid`='".intval($_SESSION['profile']['id'])."' and `id`='".intval($id)."'"); if(mysql_num_rows($res) > 0) { $row = mysql_fetch_assoc($res); @@ -340,7 +345,7 @@ function buildSubjectFromSession() { showfooter(); exit; } - $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'")); + $user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_SESSION['profile']['id'])."'")); if($_SESSION['_config']['SSO'] == 1) $emails .= "$count.emailAddress = ".$user['uniqueID']."\n"; @@ -384,7 +389,8 @@ function buildSubjectFromSession() { `codesign`='".intval($_SESSION['_config']['codesign'])."', `disablelogin`='".($_SESSION['_config']['disablelogin']?1:0)."', `rootcert`='".intval($_SESSION['_config']['rootcert'])."', - `description`='".$_SESSION['_config']['description']."'"; + `md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."', + `description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'"; mysql_query($query); $emailid = mysql_insert_id(); if(is_array($addys)) @@ -396,7 +402,7 @@ function buildSubjectFromSession() { fclose($fp); $challenge=$_SESSION['spkac_hash']; $CSRname_esc = escapeshellarg($CSRname); - $res=`openssl spkac -verify -in $CSRname_esc`; + $res=shell_exec("openssl spkac -verify -in $CSRname_esc"); if(!strstr($res,"Challenge String: ".$challenge)) { $id = $oldid; @@ -460,7 +466,7 @@ function buildSubjectFromSession() { $tmpname = tempnam("/tmp", "id4csr"); $tmpfname_esc = escapeshellarg($tmpfname); $tmpname_esc = escapeshellarg($tmpname); - $do = `/usr/bin/openssl req -in $tmpfname_esc -out $tmpname_esc`; // -subj "$csr"`; + $do = shell_exec("/usr/bin/openssl req -in $tmpfname_esc -out $tmpname_esc"); // -subj "$csr"; @unlink($tmpfname); $csr = ""; $fp = fopen($tmpname, "r"); @@ -482,13 +488,14 @@ function buildSubjectFromSession() { $query = "insert into emailcerts set `CN`='$defaultemail', `keytype`='".sanitizeHTML($_REQUEST['keytype'])."', - `memid`='".$_SESSION['profile']['id']."', + `memid`='".intval($_SESSION['profile']['id'])."', `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()), `subject`='".mysql_real_escape_string($csrsubject)."', - `codesign`='".$_SESSION['_config']['codesign']."', + `codesign`='".intval($_SESSION['_config']['codesign'])."', `disablelogin`='".($_SESSION['_config']['disablelogin']?1:0)."', - `rootcert`='".$_SESSION['_config']['rootcert']."', - `description`='".$_SESSION['_config']['description']."'"; + `rootcert`='".intval($_SESSION['_config']['rootcert'])."', + `md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."', + `description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'"; mysql_query($query); $emailid = mysql_insert_id(); if(is_array($addys)) @@ -563,7 +570,7 @@ function buildSubjectFromSession() { $addy = array(); $adds = array(); if(strtolower(substr($newdom, -4, 3)) != ".jp") - $adds = explode("\n", trim(`/usr/bin/whois $newdom|grep "@"`)); + $adds = explode("\n", trim(shell_exec("/usr/bin/whois $newdom|grep \"@\""))); if(substr($newdomain, -4) == ".org" || substr($newdomain, -5) == ".info") { if(is_array($adds)) @@ -653,7 +660,7 @@ function buildSubjectFromSession() { $hash = make_hash(); $query = "insert into `domains` set `domain`='".mysql_real_escape_string($_SESSION['_config']['domain'])."', - `memid`='".$_SESSION['profile']['id']."',`created`=NOW(),`hash`='$hash'"; + `memid`='".intval($_SESSION['profile']['id'])."',`created`=NOW(),`hash`='$hash'"; mysql_query($query); $domainid = mysql_insert_id(); @@ -681,7 +688,7 @@ function buildSubjectFromSession() { foreach($_REQUEST['delid'] as $id) { $id = intval($id); - $query = "select * from `domains` where `id`='$id' and `memid`='".$_SESSION['profile']['id']."'"; + $query = "select * from `domains` where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) > 0) { @@ -726,19 +733,15 @@ function buildSubjectFromSession() { exit; } - if(trim($_REQUEST['description']) != ""){ - $_SESSION['_config']['description']= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); - }else{ - $_SESSION['_config']['description']= ""; - } + $_SESSION['_config']['description']= trim(stripslashes($_REQUEST['description'])); $_SESSION['_config']['tmpfname'] = tempnam("/tmp", "id10CSR"); $fp = fopen($_SESSION['_config']['tmpfname'], "w"); fputs($fp, $CSR); fclose($fp); $CSR = escapeshellarg($_SESSION['_config']['tmpfname']); - $_SESSION['_config']['subject'] = trim(`/usr/bin/openssl req -text -noout -in $CSR |tr -d "\\0"|grep "Subject:"`); - $bits = explode(",", trim(`/usr/bin/openssl req -text -noout -in $CSR |tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`)); + $_SESSION['_config']['subject'] = trim(shell_exec("/usr/bin/openssl req -text -noout -in $CSR |tr -d \"\\0\"|grep \"Subject:\"")); + $bits = explode(",", trim(shell_exec("/usr/bin/openssl req -text -noout -in $CSR |tr -d \"\\0\"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:"))); foreach($bits as $val) { $_SESSION['_config']['subject'] .= "/subjectAltName=".trim($val); @@ -765,6 +768,8 @@ function buildSubjectFromSession() { if($_SESSION['_config']['rootcert'] < 1 || $_SESSION['_config']['rootcert'] > 2) $_SESSION['_config']['rootcert'] = 1; } + + $_SESSION['_config']['hash_alg'] = HashAlgorithms::clean($_REQUEST['hash_alg']); } if($process != "" && $oldid == 11) @@ -809,14 +814,16 @@ function buildSubjectFromSession() { `domid`='".mysql_real_escape_string($_SESSION['_config']['rowid']['0'])."', `created`=NOW(),`subject`='".mysql_real_escape_string($subject)."', `rootcert`='".mysql_real_escape_string($_SESSION['_config']['rootcert'])."', - `description`='".$_SESSION['_config']['description']."'"; + `md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."', + `description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'"; } elseif(array_key_exists('0',$_SESSION['_config']['altid']) && $_SESSION['_config']['altid']['0'] > 0) { $query = "insert into `domaincerts` set `CN`='".mysql_real_escape_string($_SESSION['_config']['altrows']['0'])."', `domid`='".mysql_real_escape_string($_SESSION['_config']['altid']['0'])."', `created`=NOW(),`subject`='".mysql_real_escape_string($subject)."', `rootcert`='".mysql_real_escape_string($_SESSION['_config']['rootcert'])."', - `description`='".$_SESSION['_config']['description']."'"; + `md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."', + `description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'"; } else { showheader(_("My CAcert.org Account!")); echo _("Domain not verified."); @@ -870,7 +877,7 @@ function buildSubjectFromSession() { $query = "select *,UNIX_TIMESTAMP(`domaincerts`.`revoked`) as `revoke` from `domaincerts`,`domains` where `domaincerts`.`id`='$id' and `domaincerts`.`domid`=`domains`.`id` and - `domains`.`memid`='".$_SESSION['profile']['id']."'"; + `domains`.`memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -904,8 +911,8 @@ function buildSubjectFromSession() { $newfile=generatecertpath("csr","server",$newid); copy($row['csr_name'], $newfile); $newfile_esc = escapeshellarg($newfile); - $_SESSION['_config']['subject'] = trim(`/usr/bin/openssl req -text -noout -in $newfile_esc |tr -d "\\0"|grep "Subject:"`); - $bits = explode(",", trim(`/usr/bin/openssl req -text -noout -in $newfile_esc |tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`)); + $_SESSION['_config']['subject'] = trim(shell_exec("/usr/bin/openssl req -text -noout -in $newfile_esc |tr -d \"\\0\"|grep \"Subject:\"")); + $bits = explode(",", trim(shell_exec("/usr/bin/openssl req -text -noout -in $newfile_esc |tr -d \"\\0\"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:"))); foreach($bits as $val) { $_SESSION['_config']['subject'] .= "/subjectAltName=".trim($val); @@ -935,7 +942,7 @@ function buildSubjectFromSession() { } else { $drow = mysql_fetch_assoc($res); $crt_name = escapeshellarg($drow['crt_name']); - $cert = `/usr/bin/openssl x509 -in $crt_name`; + $cert = shell_exec("/usr/bin/openssl x509 -in $crt_name"); echo "
\n$cert\n
\n"; } } @@ -963,7 +970,7 @@ function buildSubjectFromSession() { $query = "select *,UNIX_TIMESTAMP(`domaincerts`.`revoked`) as `revoke` from `domaincerts`,`domains` where `domaincerts`.`id`='$id' and `domaincerts`.`domid`=`domains`.`id` and - `domains`.`memid`='".$_SESSION['profile']['id']."'"; + `domains`.`memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -998,7 +1005,7 @@ function buildSubjectFromSession() { $query = "select *,UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired` from `domaincerts`,`domains` where `domaincerts`.`id`='$id' and `domaincerts`.`domid`=`domains`.`id` and - `domains`.`memid`='".$_SESSION['profile']['id']."'"; + `domains`.`memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -1049,7 +1056,7 @@ function buildSubjectFromSession() { { $id = intval($id); $query = "select *,UNIX_TIMESTAMP(`revoked`) as `revoke` from `emailcerts` - where `id`='$id' and `memid`='".$_SESSION['profile']['id']."'"; + where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -1123,7 +1130,7 @@ function buildSubjectFromSession() { { $id = intval($id); $query = "select *,UNIX_TIMESTAMP(`revoked`) as `revoke` from `emailcerts` - where `id`='$id' and `memid`='".$_SESSION['profile']['id']."'"; + where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -1155,7 +1162,7 @@ function buildSubjectFromSession() { { $id = intval($id); $query = "select *,UNIX_TIMESTAMP(`expire`) as `expired` from `emailcerts` - where `id`='$id' and `memid`='".$_SESSION['profile']['id']."'"; + where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."'"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { @@ -1187,14 +1194,14 @@ function buildSubjectFromSession() { { $cid = intval(substr($id,5)); $dis=(array_key_exists('disablelogin_'.$cid,$_REQUEST) && $_REQUEST['disablelogin_'.$cid]=="1")?"0":"1"; - mysql_query("update `emailcerts` set `disablelogin`='$dis' where `id`='$cid' and `memid`='".$_SESSION['profile']['id']."'"); + mysql_query("update `emailcerts` set `disablelogin`='$dis' where `id`='$cid' and `memid`='".intval($_SESSION['profile']['id'])."'"); } if(substr($id,0,14)=="check_comment_") { $cid = intval(substr($id,14)); if(!empty($_REQUEST['check_comment_'.$cid])) { $comment=trim(mysql_real_escape_string(stripslashes($_REQUEST['comment_'.$cid]))); - mysql_query("update `emailcerts` set `description`='$comment' where `id`='$cid' and `memid`='".$_SESSION['profile']['id']."'"); + mysql_query("update `emailcerts` set `description`='$comment' where `id`='$cid' and `memid`='".intval($_SESSION['profile']['id'])."'"); } } } @@ -1268,7 +1275,7 @@ function buildSubjectFromSession() { if($oldid == 13 && $process != "") { - $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted` = 0 group by `to`"; $ddres = mysql_query($ddquery); $ddrow = mysql_fetch_assoc($ddres); $_SESSION['profile']['points'] = $ddrow['total']; @@ -1308,7 +1315,7 @@ function buildSubjectFromSession() { `lname`='".$_SESSION['_config']['user']['lname']."', `suffix`='".$_SESSION['_config']['user']['suffix']."', `dob`='".$_SESSION['_config']['user']['year']."-".$_SESSION['_config']['user']['month']."-".$_SESSION['_config']['user']['day']."' - where `id`='".$_SESSION['profile']['id']."'"; + where `id`='".intval($_SESSION['profile']['id'])."'"; mysql_query($query); } if ($showdetails!="") { @@ -1322,25 +1329,15 @@ function buildSubjectFromSession() { `A3`='".$_SESSION['_config']['user']['A3']."', `A4`='".$_SESSION['_config']['user']['A4']."', `A5`='".$_SESSION['_config']['user']['A5']."' - where `id`='".$_SESSION['profile']['id']."'"; - mysql_query($query); - } - - //!!!Should be rewritten - $_SESSION['_config']['user']['otphash'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['otphash'])))); - $_SESSION['_config']['user']['otppin'] = trim(mysql_real_escape_string(stripslashes(strip_tags($_REQUEST['otppin'])))); - if($_SESSION['_config']['user']['otphash'] != "" && $_SESSION['_config']['user']['otppin'] != "") - { - $query = "update `users` set `otphash`='".$_SESSION['_config']['user']['otphash']."', - `otppin`='".$_SESSION['_config']['user']['otppin']."' where `id`='".$_SESSION['profile']['id']."'"; + where `id`='".intval($_SESSION['profile']['id'])."'"; mysql_query($query); } $_SESSION['_config']['user']['set'] = 0; - $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."'")); + $_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_SESSION['profile']['id'])."'")); $_SESSION['profile']['loggedin'] = 1; - $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`"; + $ddquery = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted` = 0 group by `to`"; $ddres = mysql_query($ddquery); $ddrow = mysql_fetch_assoc($ddres); $_SESSION['profile']['points'] = $ddrow['total']; @@ -1374,7 +1371,7 @@ function buildSubjectFromSession() { if($_SESSION['_config']['hostname'] != $_SESSION['_config']['securehostname']) { - $match = mysql_query("select * from `users` where `id`='".$_SESSION['profile']['id']."' and + $match = mysql_query("select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and (`password`=old_password('".$_SESSION['_config']['user']['oldpass']."') or `password`=sha1('".$_SESSION['_config']['user']['oldpass']."'))"); $rc = mysql_num_rows($match); @@ -1396,7 +1393,7 @@ function buildSubjectFromSession() { echo _("You failed to correctly enter your current Pass Phrase."); } else { mysql_query("update `users` set `password`=sha1('".$_SESSION['_config']['user']['pword1']."') - where `id`='".$_SESSION['profile']['id']."'"); + where `id`='".intval($_SESSION['profile']['id'])."'"); echo '

', _("Pass Phrase Changed Successfully"), '

', "\n"; echo _("Your Pass Phrase has been updated and your primary email account has been notified of the change."); $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n"; @@ -1438,14 +1435,9 @@ function buildSubjectFromSession() { $_SESSION['_config']['emails'][] = $val; } $_SESSION['_config']['name'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['name']))); - $_SESSION['_config']['OU'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['OU']))); - + $_SESSION['_config']['OU'] = stripslashes(trim($_REQUEST['OU'])); - if(trim($_REQUEST['description']) != ""){ - $_SESSION['_config']['description']= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); - }else{ - $_SESSION['_config']['description']= ""; - } + $_SESSION['_config']['description']= trim(stripslashes($_REQUEST['description'])); } if($oldid == 16 && (intval(count($_SESSION['_config']['emails'])) + 0) <= 0) @@ -1474,11 +1466,9 @@ function buildSubjectFromSession() { if($_SESSION['_config']['rootcert'] < 1 || $_SESSION['_config']['rootcert'] > 2) $_SESSION['_config']['rootcert'] = 1; - if(trim($_REQUEST['description']) != ""){ - $_SESSION['_config']['description']= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); - }else{ - $_SESSION['_config']['description']= ""; - } + $_SESSION['_config']['hash_alg'] = HashAlgorithms::clean($_REQUEST['hash_alg']); + + $_SESSION['_config']['description']= trim(stripslashes($_REQUEST['description'])); if(@count($_SESSION['_config']['emails']) > 0) $id = 17; @@ -1514,7 +1504,7 @@ function buildSubjectFromSession() { if($_SESSION['_config']['name'] != "") $emails .= "commonName = ".$_SESSION['_config']['name']."\n"; if($_SESSION['_config']['OU']) - $emails .= "organizationalUnitName = ".$_SESSION['_config']['OU']."\n"; + $emails .= "organizationalUnitName = ".mysql_real_escape_string($_SESSION['_config']['OU'])."\n"; if($org['O']) $emails .= "organizationName = ".$org['O']."\n"; if($org['L']) @@ -1539,13 +1529,14 @@ function buildSubjectFromSession() { $query = "insert into `orgemailcerts` set `CN`='$defaultemail', - `ou`='".$_SESSION['_config']['OU']."', + `ou`='".mysql_real_escape_string($_SESSION['_config']['OU'])."', `keytype`='NS', - `orgid`='".$org['orgid']."', + `orgid`='".intval($org['orgid'])."', `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()), - `codesign`='".$_SESSION['_config']['codesign']."', - `rootcert`='".$_SESSION['_config']['rootcert']."', - `description`='".$_SESSION['_config']['description']."'"; + `codesign`='".intval($_SESSION['_config']['codesign'])."', + `rootcert`='".intval($_SESSION['_config']['rootcert'])."', + `md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."', + `description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'"; mysql_query($query); $emailid = mysql_insert_id(); @@ -1558,7 +1549,7 @@ function buildSubjectFromSession() { fclose($fp); $challenge=$_SESSION['spkac_hash']; $CSRname_esc = escapeshellarg($CSRname); - $res=`openssl spkac -verify -in $CSRname_esc`; + $res=shell_exec("openssl spkac -verify -in $CSRname_esc"); if(!strstr($res,"Challenge String: ".$challenge)) { $id = $oldid; @@ -1612,7 +1603,7 @@ function buildSubjectFromSession() { $tmpname = tempnam("/tmp", "id17csr"); $tmpfname_esc = escapeshellarg($tmpfname); $tmpname_esc = escapeshellarg($tmpname); - $do = `/usr/bin/openssl req -in $tmpfname_esc -out $tmpname_esc`; + $do = shell_exec("/usr/bin/openssl req -in $tmpfname_esc -out $tmpname_esc"); @unlink($tmpfname); $csr = ""; $fp = fopen($tmpname, "r"); @@ -1633,14 +1624,15 @@ function buildSubjectFromSession() { $query = "insert into `orgemailcerts` set `CN`='$defaultemail', - `ou`='".$_SESSION['_config']['OU']."', + `ou`='".mysql_real_escape_string($_SESSION['_config']['OU'])."', `keytype`='" . sanitizeHTML($_REQUEST['keytype']) . "', - `orgid`='".$org['orgid']."', + `orgid`='".intval($org['orgid'])."', `created`=FROM_UNIXTIME(UNIX_TIMESTAMP()), - `subject`='$csrsubject', - `codesign`='".$_SESSION['_config']['codesign']."', - `rootcert`='".$_SESSION['_config']['rootcert']."', - `description`='".$_SESSION['_config']['description']."'"; + `subject`='".mysql_real_escape_string($csrsubject)."', + `codesign`='".intval($_SESSION['_config']['codesign'])."', + `rootcert`='".intval($_SESSION['_config']['rootcert'])."', + `md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."', + `description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'"; mysql_query($query); $emailid = mysql_insert_id(); @@ -1682,7 +1674,7 @@ function buildSubjectFromSession() { echo "Renewing certificate #$id ...\n
"; $id = intval($id); $query = "select *,UNIX_TIMESTAMP(`revoked`) as `revoke` from `orgemailcerts`, `org` - where `orgemailcerts`.`id`='$id' and `org`.`memid`='".$_SESSION['profile']['id']."' and + where `orgemailcerts`.`id`='$id' and `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `org`.`orgid`=`orgemailcerts`.`orgid`"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) @@ -1755,7 +1747,7 @@ function buildSubjectFromSession() { { $id = intval($id); $query = "select *,UNIX_TIMESTAMP(`revoked`) as `revoke` from `orgemailcerts`, `org` - where `orgemailcerts`.`id`='$id' and `org`.`memid`='".$_SESSION['profile']['id']."' and + where `orgemailcerts`.`id`='".intval($id)."' and `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `org`.`orgid`=`orgemailcerts`.`orgid`"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) @@ -1788,7 +1780,7 @@ function buildSubjectFromSession() { { $id = intval($id); $query = "select *,UNIX_TIMESTAMP(`expire`) as `expired` from `orgemailcerts`, `org` - where `orgemailcerts`.`id`='$id' and `org`.`memid`='".$_SESSION['profile']['id']."' and + where `orgemailcerts`.`id`='".intval($id)."' and `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `org`.`orgid`=`orgemailcerts`.`orgid`"; $res = mysql_query($query); if(mysql_num_rows($res) <= 0) @@ -1858,19 +1850,15 @@ function buildSubjectFromSession() { exit; } - if(trim($_REQUEST['description']) != ""){ - $_SESSION['_config']['description']= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); - }else{ - $_SESSION['_config']['description']= ""; - } + $_SESSION['_config']['description']= trim(stripslashes($_REQUEST['description'])); $_SESSION['_config']['tmpfname'] = tempnam("/tmp", "id20CSR"); $fp = fopen($_SESSION['_config']['tmpfname'], "w"); fputs($fp, $CSR); fclose($fp); $CSR = escapeshellarg($_SESSION['_config']['tmpfname']); - $_SESSION['_config']['subject'] = trim(`/usr/bin/openssl req -text -noout -in $CSR |tr -d "\\0"|grep "Subject:"`); - $bits = explode(",", trim(`/usr/bin/openssl req -text -noout -in $CSR |tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`)); + $_SESSION['_config']['subject'] = trim(shell_exec("/usr/bin/openssl req -text -noout -in $CSR |tr -d \"\\0\"|grep \"Subject:\"")); + $bits = explode(",", trim(shell_exec("/usr/bin/openssl req -text -noout -in $CSR |tr -d \"\\0\"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:"))); foreach($bits as $val) { $_SESSION['_config']['subject'] .= "/subjectAltName=".trim($val); @@ -1883,16 +1871,16 @@ function buildSubjectFromSession() { getalt2(); $query = "select * from `orginfo`,`org`,`orgdomains` where - `org`.`memid`='".$_SESSION['profile']['id']."' and + `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `org`.`orgid`=`orginfo`.`id` and `org`.`orgid`=`orgdomains`.`orgid` and - `orgdomains`.`domain`='".$_SESSION['_config']['0.CN']."'"; + `orgdomains`.`domain`='".mysql_real_escape_string($_SESSION['_config']['0.CN'])."'"; $_SESSION['_config']['CNorg'] = mysql_fetch_assoc(mysql_query($query)); $query = "select * from `orginfo`,`org`,`orgdomains` where - `org`.`memid`='".$_SESSION['profile']['id']."' and + `org`.`memid`='".intval($_SESSION['profile']['id'])."' and `org`.`orgid`=`orginfo`.`id` and `org`.`orgid`=`orgdomains`.`orgid` and - `orgdomains`.`domain`='".$_SESSION['_config']['0.subjectAltName']."'"; + `orgdomains`.`domain`='".mysql_real_escape_string($_SESSION['_config']['0.subjectAltName'])."'"; $_SESSION['_config']['SANorg'] = mysql_fetch_assoc(mysql_query($query)); //echo "
"; print_r($_SESSION['_config']); die;
 
@@ -1908,6 +1896,8 @@ function buildSubjectFromSession() {
 		$_SESSION['_config']['rootcert'] = intval($_REQUEST['rootcert']);
 		if($_SESSION['_config']['rootcert'] < 1 || $_SESSION['_config']['rootcert'] > 2)
 			$_SESSION['_config']['rootcert'] = 1;
+
+		$_SESSION['_config']['hash_alg'] = HashAlgorithms::clean($_REQUEST['hash_alg']);
 	}
 
 	if($process != "" && $oldid == 21)
@@ -1942,14 +1932,14 @@ function buildSubjectFromSession() {
 		if($_SESSION['_config']['rowid']['0'] > 0)
 		{
 			$query = "select * from `org`,`orginfo` where
-					`orginfo`.`id`='".$_SESSION['_config']['rowid']['0']."' and
+					`orginfo`.`id`='".intval($_SESSION['_config']['rowid']['0'])."' and
 					`orginfo`.`id`=`org`.`orgid` and
-					`org`.`memid`='".$_SESSION['profile']['id']."'";
+					`org`.`memid`='".intval($_SESSION['profile']['id'])."'";
 		} else {
 			$query = "select * from `org`,`orginfo` where
-					`orginfo`.`id`='".$_SESSION['_config']['altid']['0']."' and
+					`orginfo`.`id`='".intval($_SESSION['_config']['altid']['0'])."' and
 					`orginfo`.`id`=`org`.`orgid` and
-					`org`.`memid`='".$_SESSION['profile']['id']."'";
+					`org`.`memid`='".intval($_SESSION['profile']['id'])."'";
 		}
 		$org = mysql_fetch_assoc(mysql_query($query));
 		$csrsubject = "";
@@ -1977,22 +1967,24 @@ function buildSubjectFromSession() {
 		if($_SESSION['_config']['rowid']['0'] > 0)
 		{
 			$query = "insert into `orgdomaincerts` set
-					`CN`='".$_SESSION['_config']['rows']['0']."',
-					`orgid`='".$org['id']."',
+					`CN`='".mysql_real_escape_string($_SESSION['_config']['rows']['0'])."',
+					`orgid`='".intval($org['id'])."',
 					`created`=NOW(),
-					`subject`='$csrsubject',
-					`rootcert`='".$_SESSION['_config']['rootcert']."',
-					`type`='$type',
-					`description`='".$_SESSION['_config']['description']."'";
+					`subject`='".mysql_real_escape_string($csrsubject)."',
+					`rootcert`='".intval($_SESSION['_config']['rootcert'])."',
+					`md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."',
+					`type`='".$type."',
+					`description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'";
 		} else {
 			$query = "insert into `orgdomaincerts` set
-					`CN`='".$_SESSION['_config']['altrows']['0']."',
-					`orgid`='".$org['id']."',
+					`CN`='".mysql_real_escape_string($_SESSION['_config']['altrows']['0'])."',
+					`orgid`='".intval($org['id'])."',
 					`created`=NOW(),
-					`subject`='$csrsubject',
-					`rootcert`='".$_SESSION['_config']['rootcert']."',
-					`type`='$type',
-					`description`='".$_SESSION['_config']['description']."'";
+					`subject`='".mysql_real_escape_string($csrsubject)."',
+					`rootcert`='".intval($_SESSION['_config']['rootcert'])."',
+					`md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."',
+					`type`='".$type."',
+					`description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'";
 		}
 		mysql_query($query);
 		$CSRid = mysql_insert_id();
@@ -2003,10 +1995,10 @@ function buildSubjectFromSession() {
 		mysql_query("update `orgdomaincerts` set `CSR_name`='$CSRname' where `id`='$CSRid'");
 		if(is_array($_SESSION['_config']['rowid']))
 			foreach($_SESSION['_config']['rowid'] as $id)
-				mysql_query("insert into `orgdomlink` set `orgdomid`='$id', `orgcertid`='$CSRid'");
+				mysql_query("insert into `orgdomlink` set `orgdomid`='".intval($id)."', `orgcertid`='$CSRid'");
 		if(is_array($_SESSION['_config']['altid']))
 			foreach($_SESSION['_config']['altid'] as $id)
-				mysql_query("insert into `orgdomlink` set `orgdomid`='$id', `orgcertid`='$CSRid'");
+				mysql_query("insert into `orgdomlink` set `orgdomid`='".intval($id)."', `orgcertid`='$CSRid'");
 		waitForResult("orgdomaincerts", $CSRid,$oldid);
 		$query = "select * from `orgdomaincerts` where `id`='$CSRid' and `crt_name` != ''";
 		$res = mysql_query($query);
@@ -2037,7 +2029,7 @@ function buildSubjectFromSession() {
 						`orgdomaincerts`,`org`
 						where `orgdomaincerts`.`id`='$id' and
 						`orgdomaincerts`.`orgid`=`org`.`orgid` and
-						`org`.`memid`='".$_SESSION['profile']['id']."'";
+						`org`.`memid`='".intval($_SESSION['profile']['id'])."'";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) <= 0)
 				{
@@ -2079,7 +2071,7 @@ function buildSubjectFromSession() {
 				echo _("Renewing").": ".$row['CN']."
\n";
 				$res = mysql_query("select * from `orgdomlink` where `orgcertid`='".$row['id']."'");
 				while($r2 = mysql_fetch_assoc($res))
-					mysql_query("insert into `orgdomlink` set `orgdomid`='".$r2['id']."', `orgcertid`='$newid'");
+					mysql_query("insert into `orgdomlink` set `orgdomid`='".intval($r2['orgdomid'])."', `orgcertid`='$newid'");
 				waitForResult("orgdomaincerts", $newid,$oldid,0);
 				$query = "select * from `orgdomaincerts` where `id`='$newid' and `crt_name` != ''";
 				$res = mysql_query($query);
@@ -2089,7 +2081,7 @@ function buildSubjectFromSession() {
 				} else {
 					$drow = mysql_fetch_assoc($res);
 					$crtname = escapeshellarg($drow['crt_name']);
-					$cert = `/usr/bin/openssl x509 -in $crtname`;
+					$cert = shell_exec("/usr/bin/openssl x509 -in $crtname");
 					echo "
\n$cert\n
\n";
 				}
 			}
@@ -2116,7 +2108,7 @@ function buildSubjectFromSession() {
 						`orgdomaincerts`,`org`
 						where `orgdomaincerts`.`id`='$id' and
 						`orgdomaincerts`.`orgid`=`org`.`orgid` and
-						`org`.`memid`='".$_SESSION['profile']['id']."'";
+						`org`.`memid`='".intval($_SESSION['profile']['id'])."'";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) <= 0)
 				{
@@ -2151,7 +2143,7 @@ function buildSubjectFromSession() {
 						`orgdomaincerts`,`org`
 						where `orgdomaincerts`.`id`='$id' and
 						`orgdomaincerts`.`orgid`=`org`.`orgid` and
-						`org`.`memid`='".$_SESSION['profile']['id']."'";
+						`org`.`memid`='".intval($_SESSION['profile']['id'])."'";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) <= 0)
 				{
@@ -2267,7 +2259,7 @@ function buildSubjectFromSession() {
 						`ST`='".$_SESSION['_config']['ST']."',
 						`C`='".$_SESSION['_config']['C']."',
 						`comments`='".$_SESSION['_config']['comments']."'
-					where `id`='".$_SESSION['_config']['orgid']."'");
+					where `id`='".intval($_SESSION['_config']['orgid'])."'");
 			showheader(_("My CAcert.org Account!"));
 			printf(_("'%s' has just been successfully updated in the database."), sanitizeHTML($_SESSION['_config']['O']));
 			showfooter();
@@ -2447,11 +2439,11 @@ function buildSubjectFromSession() {
 	{
 		csrf_check('orgadmadd');
 		if($_SESSION['profile']['orgadmin'] == 1)
-			$masteracc = $_SESSION['_config'][masteracc] = intval($_REQUEST['masteracc']);
+			$masteracc = $_SESSION['_config']['masteracc'] = intval($_REQUEST['masteracc']);
 		else
-			$masteracc = $_SESSION['_config'][masteracc] = 0;
+			$masteracc = $_SESSION['_config']['masteracc'] = 0;
 		$_REQUEST['email'] = $_SESSION['_config']['email'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['email'])));
-		$OU = $_SESSION['_config']['OU'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['OU'])));
+		$_SESSION['_config']['OU'] = stripslashes(trim($_REQUEST['OU']));
 		$comments = $_SESSION['_config']['comments'] = mysql_real_escape_string(stripslashes(trim($_REQUEST['comments'])));
 		$res = mysql_query("select * from `users` where `email`='".$_REQUEST['email']."' and `deleted`=0");
 		if(mysql_num_rows($res) <= 0)
@@ -2473,7 +2465,7 @@ function buildSubjectFromSession() {
 						set `memid`='".intval($row['id'])."',
 							`orgid`='".intval($_SESSION['_config']['orgid'])."',
 							`masteracc`='$masteracc',
-							`OU`='$OU',
+							`OU`='".mysql_real_escape_string($_SESSION['_config']['OU'])."',
 							`comments`='$comments'");
 			}
 		}
@@ -2482,7 +2474,7 @@ function buildSubjectFromSession() {
 	if(($oldid == 34 || $id == 34) && $_SESSION['profile']['orgadmin'] != 1)
 	{
 		$orgid = intval($_SESSION['_config']['orgid']);
-		$res = mysql_query("select * from `org` where `orgid`='$orgid' and `memid`='".$_SESSION['profile']['id']."' and `masteracc`='1'");
+		$res = mysql_query("select * from `org` where `orgid`='$orgid' and `memid`='".intval($_SESSION['profile']['id'])."' and `masteracc`='1'");
 		if(mysql_num_rows($res) <= 0)
 			$id = 32;
 	}
@@ -2541,7 +2533,7 @@ function buildSubjectFromSession() {
 		{
 			if($key == $lang)
 			{
-				mysql_query("update `users` set `language`='$lang' where `id`='".$_SESSION['profile']['id']."'");
+				mysql_query("update `users` set `language`='$lang' where `id`='".intval($_SESSION['profile']['id'])."'");
 				$_SESSION['profile']['language'] = $lang;
 				showheader(_("My CAcert.org Account!"));
 				echo _("Your language setting has been updated.");
@@ -2696,10 +2688,27 @@ function buildSubjectFromSession() {
 		$oldid=0;
 	}
 
-	if($oldid == 43 && $_REQUEST['action'] == "updatedob")
+	//check if ticket number was entered
+	if ( $id == 43 || $oldid == 43 || $id == 44 || $oldid == 44 ) {
+		if ($ticketno != "" ) {
+			$ticketno = trim($_REQUEST['ticketno']);
+			$ticketvalidation = valid_ticket_number($ticketno);
+		}
+
+		$_SESSION['ticketno'] = $ticketno;
+	}
+
+	if($oldid == 43 && $actionrequest == "updatedob" && $ticketvalidation == TRUE)
 	{
 		$id = 43;
 		$oldid=0;
+		$userid = intval($_REQUEST['userid']);
+		if (!write_se_log($userid, $_SESSION['profile']['id'],'SE Name/DOB Change',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$fname = mysql_real_escape_string($_REQUEST['fname']);
 		$mname = mysql_real_escape_string($_REQUEST['mname']);
 		$lname = mysql_real_escape_string($_REQUEST['lname']);
@@ -2707,21 +2716,29 @@ function buildSubjectFromSession() {
 		$day = intval($_REQUEST['day']);
 		$month = intval($_REQUEST['month']);
 		$year = intval($_REQUEST['year']);
-		$userid = intval($_REQUEST['userid']);
-		$query = "select `fname`,`mname`,`lname`,`suffix`,`dob` from `users` where `id`='$userid'";
-		$details = mysql_fetch_assoc(mysql_query($query));
-		$query = "insert into `adminlog` set `when`=NOW(),`old-lname`='${details['lname']}',`old-dob`='${details['dob']}',
-				`new-lname`='$lname',`new-dob`='$year-$month-$day',`uid`='$userid',`adminid`='".$_SESSION['profile']['id']."'";
-		mysql_query($query);
 		$query = "update `users` set `fname`='$fname',`mname`='$mname',`lname`='$lname',`suffix`='$suffix',`dob`='$year-$month-$day' where `id`='$userid'";
 		mysql_query($query);
+	}elseif($oldid == 43 && $actionrequest == "updatedob" && $ticketvalidation == FALSE){
+		$id = 43;
+		$oldid=0;
+		$_SESSION['ticketmsg']='No action (name/dob change) taken. Ticket number is missing!';
 	}
 
-	if($oldid == 43 && $_REQUEST['action'] == 'revokecert')
+	if($oldid == 43 && $actionrequest == 'revokecert' && $ticketvalidation == TRUE)
 	{
 		$userid = intval($_REQUEST['userid']);
+		if (!write_se_log($userid, $_SESSION['profile']['id'], 'SE Revoke all certificates',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		revoke_all_private_cert($userid);
 		$id=43;
+	}elseif($oldid == 43 && $actionrequest == "revokecert" && $ticketvalidation == FALSE){
+		$id = 43;
+		$oldid=0;
+		$_SESSION['ticketmsg']='No certificates revokes. Ticket number is missing!';
 	}
 
 	if($oldid == 48 && $_REQUEST['domain'] == "")
@@ -2738,8 +2755,7 @@ function buildSubjectFromSession() {
 
 	if($id == 44)
 	{
-		if($_REQUEST['userid'] != "")
-			$_REQUEST['userid'] = intval($_REQUEST['userid']);
+		$_REQUEST['userid'] = intval($_REQUEST['userid']);
 		$row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'"));
 		if($row['email'] == "")
 			$id = 42;
@@ -2747,18 +2763,25 @@ function buildSubjectFromSession() {
 			$_REQUEST['email'] = $row['email'];
 	}
 
-	if($oldid == 44)
+	if($oldid == 44 && $ticketvalidation == TRUE)
 	{
 		showheader(_("My CAcert.org Account!"));
 		if(intval($_REQUEST['userid']) <= 0)
 		{
 			echo _("No such user found.");
 		} else {
+			if (!write_se_log(intval($_REQUEST['userid']), $_SESSION['profile']['id'],'SE reset password',$ticketno)) {
+				showheader(_("Something went wrong"));
+				echo _("Writing to the admin log failed. Can't continue.");
+				showfooter();
+				exit;
+			}
 			mysql_query("update `users` set `password`=sha1('".mysql_real_escape_string(stripslashes($_REQUEST['newpass']))."') where `id`='".intval($_REQUEST['userid'])."'");
 			$row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'"));
 			printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email']));
 
-
+		$my_translation = L10n::get_translation();
+		L10n::set_recipient_language(intval($_REQUEST['userid']));
 			$body  = sprintf(_("Hi %s,"),$row['fname'])."\n\n";
 			$body .= _("You are receiving this email because a CAcert administrator ".
 					"has changed the password on your account.")."\n\n";
@@ -2767,18 +2790,24 @@ function buildSubjectFromSession() {
 
 			sendmail($row['email'], "[CAcert.org] "._("Password Update Notification"), $body,
 						"support@cacert.org", "", "", "CAcert Support");
+		L10n::set_translation($my_translation);
 		}
 
 		showfooter();
 		exit;
+	}elseif($oldid == 44 && $ticketvalidation == FALSE){
+		$_SESSION['ticketmsg']='No password reset taken. Ticket number is missing!';
 	}
 
+
 	if($process != "" && $oldid == 45)
 	{
 		$CSR = clean_csr($CSR);
 		$_SESSION['_config']['CSR'] = $CSR;
-		$_SESSION['_config']['subject'] = trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep "Subject:"`);
-		$bits = explode(",", trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`));
+		runCommand("/usr/bin/openssl req -text -noout|tr -d \"\\0\"|grep \"Subject:\"", $CSR, $CSRSubjects);
+		runCommand("/usr/bin/openssl req -text -noout|tr -d \"\\0\"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:", $CSR, $CSRAlts);
+		$_SESSION['_config']['subject'] = trim($CSRSubjects);
+		$bits = explode(",", trim($CSRAlts));
 		foreach($bits as $val)
 		{
 			$_SESSION['_config']['subject'] .= "/subjectAltName=".trim($val);
@@ -2802,8 +2831,11 @@ function buildSubjectFromSession() {
 	if($process != "" && $oldid == 46)
 	{
 		$CSR = clean_csr($_SESSION['_config']['CSR']);
-		$_SESSION['_config']['subject'] = trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep "Subject:"`);
-		$bits = explode(",", trim(`echo "$CSR"|/usr/bin/openssl req -text -noout|tr -d "\\0"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:`));
+		runCommand("/usr/bin/openssl req -text -noout|tr -d \"\\0\"|grep \"Subject:\"", $CSR, $CSRSubjects);
+		runCommand("/usr/bin/openssl req -text -noout|tr -d \"\\0\"|grep -A1 'X509v3 Subject Alternative Name:'|grep DNS:", $CSR, $CSRAlts);
+
+		$_SESSION['_config']['subject'] = trim($CSRSubjects);
+		$bits = explode(",", trim($CSRAlts));
 		foreach($bits as $val)
 		{
 			$_SESSION['_config']['subject'] .= "/subjectAltName=".trim($val);
@@ -2839,10 +2871,10 @@ function buildSubjectFromSession() {
 		$CSRid = mysql_insert_id();
 
 		foreach($_SESSION['_config']['rowid'] as $dom)
-			mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='$dom'");
+			mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='".intval($dom)."'");
 		if(is_array($_SESSION['_config']['altid']))
 		foreach($_SESSION['_config']['altid'] as $dom)
-			mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='$dom'");
+			mysql_query("insert into `domlink` set `certid`='$CSRid', `domid`='".intval($dom)."'");
 
 		$CSRname=generatecertpath("csr","server",$CSRid);
 		$fp = fopen($CSRname, "w");
@@ -2865,150 +2897,279 @@ function buildSubjectFromSession() {
 		}
 	}
 
-	if($id == 43 && array_key_exists('tverify',$_REQUEST) && $_REQUEST['tverify'] > 0)
+	/* presently not needed
+	if($id == 43 && array_key_exists('tverify',$_REQUEST) && $_REQUEST['tverify'] > 0 && $ticketvalidation==TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['tverify']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change tverify status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['tverify'];
 		mysql_query("update `users` set `tverify`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('tverify',$_REQUEST) && $_REQUEST['tverify'] > 0 && $ticketvalidation==FALSE){
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
+	*/
 
-	if($id == 43 && array_key_exists('assurer',$_REQUEST) && $_REQUEST['assurer'] > 0)
+	if($id == 43 && array_key_exists('assurer',$_REQUEST) && $_REQUEST['assurer'] > 0 && $ticketvalidation == TRUE)
 	{
 		csrf_check('admsetassuret');
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['assurer']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change assurer status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['assurer'];
 		mysql_query("update `users` set `assurer`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('assurer',$_REQUEST) && $_REQUEST['assurer'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['assurer']);
+		$_SESSION['ticketmsg']='No action (Change assurer status) taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('assurer_blocked',$_REQUEST) && $_REQUEST['assurer_blocked'] > 0)
+	if($id == 43 && array_key_exists('assurer_blocked',$_REQUEST) && $_REQUEST['assurer_blocked'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['assurer_blocked']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change assurer blocked status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['assurer_blocked'];
 		mysql_query("update `users` set `assurer_blocked`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('assurer_blocked',$_REQUEST) && $_REQUEST['assurer_blocked'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['assurer_blocked']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('locked',$_REQUEST) && $_REQUEST['locked'] > 0)
+	if($id == 43 && array_key_exists('locked',$_REQUEST) && $_REQUEST['locked'] > 0 && $ticketvalidation == TRUE)
 	{
 		csrf_check('admactlock');
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['locked']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change locked status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['locked'];
 		mysql_query("update `users` set `locked`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('locked',$_REQUEST) && $_REQUEST['locked'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['locked']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] > 0)
+	if($id == 43 && array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] > 0 && $ticketvalidation == TRUE)
 	{
 		csrf_check('admcodesign');
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['codesign']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change codesign status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['codesign'];
 		mysql_query("update `users` set `codesign`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('codesign',$_REQUEST) && $_REQUEST['codesign'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['codesign']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('orgadmin',$_REQUEST) && $_REQUEST['orgadmin'] > 0)
+	if($id == 43 && array_key_exists('orgadmin',$_REQUEST) && $_REQUEST['orgadmin'] > 0 && $ticketvalidation == TRUE)
 	{
 		csrf_check('admorgadmin');
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['orgadmin']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change org assuer status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['orgadmin'];
 		mysql_query("update `users` set `orgadmin`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('orgadmin',$_REQUEST) && $_REQUEST['orgadmin'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['orgadmin']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('ttpadmin',$_REQUEST) && $_REQUEST['ttpadmin'] > 0)
+	if($id == 43 && array_key_exists('ttpadmin',$_REQUEST) && $_REQUEST['ttpadmin'] > 0 && $ticketvalidation == TRUE)
 	{
 		csrf_check('admttpadmin');
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['ttpadmin']);
+		if(!write_se_log($memid, $_SESSION['profile']['id'],'SE Change ttp admin status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['ttpadmin'];
 		mysql_query("update `users` set `ttpadmin`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('ttpadmin',$_REQUEST) && $_REQUEST['ttpadmin'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['ttpadmin']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('adadmin',$_REQUEST) && $_REQUEST['adadmin'] > 0)
+	if($id == 43 && array_key_exists('adadmin',$_REQUEST) && $_REQUEST['adadmin'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['adadmin']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change advertising admin status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = $row['adadmin'] + 1;
 		if($ver > 2)
 			$ver = 0;
 		mysql_query("update `users` set `adadmin`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('adadmin',$_REQUEST) && $_REQUEST['adadmin'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['adadmin']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('locadmin',$_REQUEST) && $_REQUEST['locadmin'] > 0)
+	if($id == 43 && array_key_exists('locadmin',$_REQUEST) && $_REQUEST['locadmin'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['locadmin']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change location admin status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['locadmin'];
 		mysql_query("update `users` set `locadmin`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('locadmin',$_REQUEST) && $_REQUEST['locadmin'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['locadmin']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('admin',$_REQUEST) && $_REQUEST['admin'] > 0)
+	if($id == 43 && array_key_exists('admin',$_REQUEST) && $_REQUEST['admin'] > 0 && $ticketvalidation == TRUE)
 	{
 		csrf_check('admsetadmin');
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['admin']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change SE status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `users` where `id`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['admin'];
 		mysql_query("update `users` set `admin`='$ver' where `id`='$memid'");
+	}elseif($id == 43 && array_key_exists('admin',$_REQUEST) && $_REQUEST['admin'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['admin']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('general',$_REQUEST) && $_REQUEST['general'] > 0)
+	if($id == 43 && array_key_exists('general',$_REQUEST) && $_REQUEST['general'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['general']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change general status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `alerts` where `memid`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['general'];
 		mysql_query("update `alerts` set `general`='$ver' where `memid`='$memid'");
+	}elseif($id == 43 && array_key_exists('general',$_REQUEST) && $_REQUEST['general'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['general']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('country',$_REQUEST) && $_REQUEST['country'] > 0)
+	if($id == 43 && array_key_exists('country',$_REQUEST) && $_REQUEST['country'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['country']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change country status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `alerts` where `memid`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['country'];
 		mysql_query("update `alerts` set `country`='$ver' where `memid`='$memid'");
+	}elseif($id == 43 && array_key_exists('country',$_REQUEST) && $_REQUEST['country'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['country']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('regional',$_REQUEST) && $_REQUEST['regional'] > 0)
+	if($id == 43 && array_key_exists('regional',$_REQUEST) && $_REQUEST['regional'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['regional']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change regional status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `alerts` where `memid`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['regional'];
 		mysql_query("update `alerts` set `regional`='$ver' where `memid`='$memid'");
+	}elseif($id == 43 && array_key_exists('regional',$_REQUEST) && $_REQUEST['regional'] > 0 && $ticketvalidation == FALSE){
+		$_REQUEST['userid'] = intval($_REQUEST['regional']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
-	if($id == 43 && array_key_exists('radius',$_REQUEST) && $_REQUEST['radius'] > 0)
+	if($id == 43 && array_key_exists('radius',$_REQUEST) && $_REQUEST['radius'] > 0 && $ticketvalidation == TRUE)
 	{
 		$memid = $_REQUEST['userid'] = intval($_REQUEST['radius']);
+		if (!write_se_log($memid, $_SESSION['profile']['id'],'SE Change radius status',$ticketno)) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			showfooter();
+			exit;
+		}
 		$query = "select * from `alerts` where `memid`='$memid'";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$ver = !$row['radius'];
 		mysql_query("update `alerts` set `radius`='$ver' where `memid`='$memid'");
+	}elseif($id == 43 && array_key_exists('radius',$_REQUEST) && $_REQUEST['radius'] > 0 && $ticketvalidation == false){
+		$_REQUEST['userid'] = intval($_REQUEST['radius']);
+		$_SESSION['ticketmsg']='No action taken. Ticket number is missing!';
 	}
 
 	if($id == 50)
 	{
-		if(array_key_exists('userid',$_REQUEST) && $_REQUEST['userid'] != "")
+		if(array_key_exists('userid',$_REQUEST) && $_REQUEST['userid'] !== "") {
 			$_REQUEST['userid'] = intval($_REQUEST['userid']);
+		}
 
 		$row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'"));
-		if($row['email'] == "")
+		if($row['email'] == "") {
 			$id = 42;
-		else
+		} else {
 			$_REQUEST['email'] = $row['email'];
+		}
 	}
 
 	if($oldid == 50)
@@ -3023,151 +3184,69 @@ function buildSubjectFromSession() {
 		if (trim($_REQUEST['arbitrationno'])==""){
 			showheader(_("My CAcert.org Account!"));
 			echo _("You did not enter an arbitration number entry.");
+			printf('
' . _('Back to previous page.') .'');
 			showfooter();
 			exit;
 		}
 		if ( 1 !== preg_match('/^[a-z]\d{8}\.\d+\.\d+$/i',trim($_REQUEST['arbitrationno'])) ) {
 			showheader(_("My CAcert.org Account!"));
 			printf(_("'%s' is not a valid arbitration number entry."), sanitizeHTML(trim($_REQUEST['arbitrationno'])));
+			printf('
' . _('Back to previous page.') .'');
 			showfooter();
 			exit;
 		}
 		if (check_email_exists(trim($_REQUEST['arbitrationno']).'@cacert.org')) {
 			showheader(_("My CAcert.org Account!"));
 			printf(_("The email address '%s' is already in a different account. Can't continue."), sanitizeHTML($_REQUEST['arbitrationno'].'@cacert.org'));
+			printf('
' . _('Back to previous page.') .'');
 			showfooter();
 			exit;
-		 }
-		if (check_client_cert_running($_REQUEST['userid'],1) ||
-			check_server_cert_running($_REQUEST['userid'],1) ||
-			check_gpg_cert_running($_REQUEST['userid'],1)) {
+		}
+		if (check_client_cert_running(intval($_REQUEST['userid']),1) ||
+			check_server_cert_running(intval($_REQUEST['userid']),1) ||
+			check_gpg_cert_running(intval($_REQUEST['userid']),1)) {
 			showheader(_("My CAcert.org Account!"));
 			printf(_("The CCA retention time for at least one certificate is not over. Can't continue."));
+			printf('
' . _('Back to previous page.') .'');
 			showfooter();
 			exit;
 		}
-		if (check_is_orgadmin($_REQUEST['userid'],1)) {
+		if (check_is_orgadmin(intval($_REQUEST['userid']),1)) {
 			showheader(_("My CAcert.org Account!"));
 			printf(_("The user is listed as Organisation Administrator. Can't continue."));
+			printf('
' . _('Back to previous page.') .'');
 			showfooter();
 			exit;
 		}
-		account_delete($_REQUEST['userid'], trim($_REQUEST['arbitrationno']), $_SESSION['profile']['id']);
+		if (!write_se_log(intval($_REQUEST['userid']), $_SESSION['profile']['id'], 'SE Account delete', trim($_REQUEST['arbitrationno']))) {
+			showheader(_("Something went wrong"));
+			echo _("Writing to the admin log failed. Can't continue.");
+			printf('
' . _('Back to previous page.') .'');
+			showfooter();
+			exit;
+		}
+		account_delete(intval($_REQUEST['userid']), trim($_REQUEST['arbitrationno']), $_SESSION['profile']['id']);
 	}
 
-	if(($id == 51 || $id == 52 || $oldid == 52) && $_SESSION['profile']['tverify'] <= 0)
+	if(($id == 51 || $id == 52 || $oldid == 52))
 	{
 		showheader(_("My CAcert.org Account!"));
-		echo _("You don't have access to this area.");
+		echo _("You don't have access to this area.\nThe Tverify programme is terminated as of 16th November 2010" );
 		showfooter();
 		exit;
 	}
 
-	if($oldid == 52)
-	{
-		$uid = intval($_REQUEST['uid']);
-		$query = "select * from `tverify` where `id`='$uid' and `modified`=0";
-		$rc = mysql_num_rows(mysql_query($query));
-		if($rc <= 0)
+	if($id == 59){
+		if (!($oldid == 43 && $_SESSION['profile']['admin'] == 1) &&
+		    !($oldid == 13 && intval($_REQUEST['userid']) == $_SESSION['profile']['id']))
 		{
 			showheader(_("My CAcert.org Account!"));
-			echo _("Unable to find a valid tverify request for this ID.");
+			echo _("You do not have access to this page.");
 			showfooter();
 			exit;
 		}
 	}
 
-	if($oldid == 52)
-	{
-		$query = "select * from `tverify-vote` where `tverify`='$uid' and `memid`='".$_SESSION['profile']['id']."'";
-		$rc = mysql_num_rows(mysql_query($query));
-		if($rc > 0)
-		{
-			showheader(_("My CAcert.org Account!"));
-			echo _("You have already voted on this request.");
-			showfooter();
-			exit;
-		}
-	}
-
-	if($oldid == 52 && ($_REQUEST['agree'] != "" || $_REQUEST['disagree'] != ""))
-	{
-		$vote = -1;
-		if($_REQUEST['agree'] != "")
-			$vote = 1;
-
-		$query = "insert into `tverify-vote` set
-				`tverify`='$uid',
-				`memid`='".$_SESSION['profile']['id']."',
-				`when`=NOW(), `vote`='$vote',
-				`comment`='".mysql_real_escape_string($_REQUEST['comment'])."'";
-		mysql_query($query);
-
-		$rc = mysql_num_rows(mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='1'"));
-		if($rc >= 8)
-		{
-			mysql_query("update `tverify` set `modified`=NOW() where `id`='$uid'");
-			$tverify = mysql_fetch_assoc(mysql_query("select * from `tverify` where `id`='$uid'"));
-			$memid = $tverify['memid'];
-			$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$memid'"));
-			$tmp = mysql_fetch_assoc(mysql_query("select sum(`points`) as `points` from `notary` where `to`='$memid'"));
-
-			$points = 0;
-			if($tverify['URL'] != "" && $tverify['photoid'] != "")
-				$points = 150 - intval($tmp['points']);
-			if($tverify['URL'] != "" && $tverify['photoid'] == "")
-				$points = 90 - intval($tmp['points']);
-			if($tverify['URL'] == "" && $tverify['photoid'] == "")
-				$points = 50 - intval($tmp['points']);
-
-			if($points < 0)
-				$points = 0;
-
-			if($points > 0)
-			{
-				mysql_query("insert into `notary` set `from`='0', `to`='$memid', `points`='$points',
-						`method`='Thawte Points Transfer', `when`=NOW()");
-				fix_assurer_flag($memid);
-			}
-			$totalpoints = intval($tmp['points']) + $points;
-
-			$body  = _("Your request to have points transfered was successful. You were issued $points points as a result, and you now have $totalpoints in total")."\n\n"._("The following comments were made by reviewers")."\n\n";
-			$res = mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='1'");
-			while($row = mysql_fetch_assoc($res))
-				$body .= $row['comment']."\n";
-			$body .= "\n";
-
-			$body .= _("Best regards")."\n";
-			$body .= _("CAcert Support Team");
-			sendmail($user['email'], "[CAcert.org] Thawte Notary Points Transfer", $body, "website-form@cacert.org", "support@cacert.org", "", "CAcert Tverify");
-		}
-
-		$rc = mysql_num_rows(mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='-1'"));
-		if($rc >= 4)
-		{
-			mysql_query("update `tverify` set `modified`=NOW() where `id`='$uid'");
-			$tverify = mysql_fetch_assoc(mysql_query("select * from `tverify` where `id`='$uid'"));
-			$memid = $tverify['memid'];
-			$user = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$memid'"));
-
-			$body  = _("Unfortunately your request for a points increase has been denied, below is the comments from people that reviewed your request as to why they rejected your application.")."\n\n";
-			$res = mysql_query("select * from `tverify-vote` where `tverify`='$uid' and `vote`='-1'");
-			while($row = mysql_fetch_assoc($res))
-				$body .= $row['comment']."\n";
-			$body .= "\n";
-
-			$body .= _("You are welcome to try submitting another request at any time in the future, please make sure you take the reviewer comments into consideration or you risk having your application rejected again.")."\n\n";
-
-			$body .= _("Best regards")."\n";
-			$body .= _("CAcert Support Team");
-			sendmail($user['email'], "[CAcert.org] Thawte Notary Points Transfer", $body, "website-form@cacert.org", "support@cacert.org", "", "CAcert Tverify");
-		}
-
-		showheader(_("My CAcert.org Account!"));
-		echo _("Your vote has been accepted.");
-		showfooter();
-		exit;
-	}
 
 	if(intval($cert) > 0)
 		$_SESSION['_config']['cert'] = intval($cert);
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index dbebf6a..0fda2f1 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -22,6 +22,7 @@
 	function showheader($title = "CAcert.org", $title2 = "")
 	{
 		global $id, $PHP_SELF;
+	$PHP_SELF = &$_SERVER['PHP_SELF'];
 	$expand="";
 	$tmpid = $id;
 	if($PHP_SELF == "/wot.php")
@@ -35,46 +36,51 @@
 
 	switch($tmpid)
 	{
-		case 1:
-		case 2: $expand = " explode('emailacc');"; break;
-		case 3:
-		case 4:
-		case 5:
-		case 6: $expand = " explode('clicerts');"; break;
-		case 7:
-		case 8:
-		case 9: $expand = " explode('domains');"; break;
-		case 10:
-		case 11:
-		case 12:
-		case 15: $expand = " explode('servercert');"; break;
-		case 13:
-		case 14:
-		case 36:
-		case 41:
+		case 1:                                                 // Add email address
+		case 2: $expand = " explode('emailacc');"; break;       // View email addresses
+		case 3:                                                 // Add Client certificate
+		case 4:                                                 // Confirm Client Certificate Request
+		case 5:                                                 // View Client Certificates
+		case 6: $expand = " explode('clicerts');"; break;       // Client Certificate page
+		case 7:                                                 // Add new domain
+		case 8:                                                 // Confirm Domain page
+		case 9: $expand = " explode('domains');"; break;        // View Domains
+		case 10:                                                // Add Server Certifiacte
+		case 11:                                                // Confirm Server Certificate Rewust
+		case 12:                                                // View Server Cerificate
+		case 15: $expand = " explode('servercert');"; break;    // Server Certificate page
+		case 13:                                                // ViewEdit
+		case 14:                                                // Change password
+		case 36:                                                // My Alert settings
+		case 41:                                                // Language Settings
+		case 55:                                                // Trainings
+		case 59:                                                // Account History
 		case 507:
-		case 508:
-		case 513: $expand = " explode('mydetails');"; break;
-		case 16:
-		case 17:
-		case 18:
-		case 19: $expand = " explode('clientorg');"; break;
-		case 20:
-		case 21:
-		case 22:
-		case 23: $expand = " explode('serverorg');"; break;
-		case 24:
-		case 25:
-		case 26:
-		case 27:
-		case 28:
-		case 29:
-		case 30:
+		case 508:                                               // My Listing
+		case 510:                                               // Old points calculation
+		case 515:                                               // New points calculation
+		case 513: $expand = " explode('mydetails');"; break;    // My Location
+		case 16:                                                // Add Org Client Cert
+		case 17:                                                // Confirm Org Client Certificate Request
+		case 18:                                                // View Org Client Certificate
+		case 19: $expand = " explode('clientorg');"; break;     // Org Cleint Cert page
+		case 20:                                                // Add Org Server Cert
+		case 21:                                                // Conform Org Server Cert Request
+		case 22:                                                // View Org Server Certs
+		case 23: $expand = " explode('serverorg');"; break;     // Org Server Certificate page
+		case 24:                                                // Add new Organisation
+		case 25:                                                // View Organisation List
+		case 26:                                                // View Organisation Domains
+		case 27:                                                // Edit Org Account
+		case 28:                                                // View Add Org Domain
+		case 29:                                                // Edit Org Domain
+		case 30:                                                // Delete Org Domain
 		case 31:
-		case 32:
-		case 33:
-		case 34:
-		case 35: $expand = " explode('orgadmin');"; break;
+		case 32:                                                // View Org Admin
+		case 33:                                                // Add Org Admin
+		case 34:                                                // Delete Org Admin
+		case 60:                                                // View Organisation Account History
+		case 35: $expand = " explode('orgadmin');"; break;      // View Org Admin Organisation List
 		case 42:
 		case 43:
 		case 44:
@@ -86,20 +92,19 @@
 		case 50:
 		case 54:
 		case 53: $expand = " explode('sysadmin');"; break;
-		case 500:
+		case 500:                                               // CAcert Web of Trust
 		case 501:
-		case 502:
-		case 503:
-		case 504:
-		case 505:
+		case 502:                                               // Become an Assurer
+		case 503:                                               // CAcert Web of Trust Roles
+		case 504:                                               // TTP
+		case 505:                                               // Assurer Some one
 		case 506:
 		case 509:
-		case 510:
 		case 511:
-		case 512: $expand = " explode('WoT');"; break;
+		case 512: $expand = " explode('WoT');"; break;          // Find Assurer
 		case 1000:
 		case 1001:
-		case 1002:
+		case 1002:                                              // View GPG key
 		case 1003:
 		case 1004:
 		case 1005:
@@ -108,9 +113,9 @@
 		case 1008:
 		case 1009:
 		case 1010: $expand = " explode('gpg');"; break;
-		case 1500:
-		case 1501:
-		case 1502:
+		case 1500:                                              // Dipute
+		case 1501:                                              // Dispute Email Request
+		case 1502:                                              // ViewEdit
 		case 1503:
 		case 1504:
 		case 1505:
@@ -172,9 +177,11 @@ function hideall() {
     
     

       
+ 

-      
     

     

@@ -217,7 +224,7 @@ function hideall() {
 
     

       
+ 

-      
+      
     

     

       
+ 
 0)
+	if(array_key_exists('profile',$_SESSION) && is_array($_SESSION['profile']) && array_key_exists('id',$_SESSION['profile']) && $_SESSION['profile']['id'] > 0)
 	{
-		$locked = mysql_fetch_assoc(mysql_query("select `locked` from `users` where `id`='".$_SESSION['profile']['id']."'"));
+		$locked = mysql_fetch_assoc(mysql_query("select `locked` from `users` where `id`='".intval($_SESSION['profile']['id'])."'"));
 		if($locked['locked'] == 0)
 		{
-			$query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`";
+			$query = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted` = 0 group by `to`";
 			$res = mysql_query($query);
 			$row = mysql_fetch_assoc($res);
 			$_SESSION['profile']['points'] = $row['total'];
@@ -169,19 +169,19 @@
 			$points++;
 
 		//echo "Points due to length and charset: $points
";
-		
+
 		// check for historical password proposal
 		if ($pwd === "Fr3d Sm|7h") {
 			return 0;
 		}
-		
+
 		return $points;
 	}
 
 	function checkpw($pwd, $email, $fname, $mname, $lname, $suffix)
 	{
 		$points = checkpwlight($pwd);
-		
+
 		if(@strstr(strtolower($pwd), strtolower($email)))
 			$points--;
 
@@ -219,7 +219,7 @@
 		//echo "Points due to name matches: $points
";
 
 		$shellpwd = escapeshellarg($pwd);
-		$do = `grep -F -- $shellpwd /usr/share/dict/american-english`;
+		$do = shell_exec("grep -F -- $shellpwd /usr/share/dict/american-english");
 		if($do)
 			$points--;
 
@@ -232,7 +232,7 @@
 	{
 		$bits = explode(": ", $_SESSION['_config']['subject'], 2);
 		$bits = str_replace(", ", "|", str_replace("/", "|", array_key_exists('1',$bits)?$bits['1']:""));
-		$bits = explode("|", $bits);    
+		$bits = explode("|", $bits);
 
 		$_SESSION['_config']['cnc'] = $_SESSION['_config']['subaltc'] = 0;
 		$_SESSION['_config']['OU'] = "";
@@ -287,7 +287,7 @@
 					$dom = $bits[$i];
 				$_SESSION['_config']['row'] = "";
 				$dom = mysql_real_escape_string($dom);
-				$query = "select * from domains where `memid`='".$_SESSION['profile']['id']."' and `domain` like '$dom' and `deleted`=0 and `hash`=''";
+				$query = "select * from domains where `memid`='".intval($_SESSION['profile']['id'])."' and `domain` like '$dom' and `deleted`=0 and `hash`=''";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) > 0)
 				{
@@ -339,7 +339,7 @@
 					$dom = $bits[$i];
 				$_SESSION['_config']['altrow'] = "";
 				$dom = mysql_real_escape_string($dom);
-				$query = "select * from domains where `memid`='".$_SESSION['profile']['id']."' and `domain` like '$dom' and `deleted`=0 and `hash`=''";
+				$query = "select * from domains where `memid`='".intval($_SESSION['profile']['id'])."' and `domain` like '$dom' and `deleted`=0 and `hash`=''";
 				$res = mysql_query($query);
 				if(mysql_num_rows($res) > 0)
 				{
@@ -378,7 +378,7 @@
 				$_SESSION['_config']['row'] = "";
 				$dom = mysql_real_escape_string($dom);
 				$query = "select *, `orginfo`.`id` as `id` from `orginfo`,`orgdomains`,`org` where
-						`org`.`memid`='".$_SESSION['profile']['id']."' and
+						`org`.`memid`='".intval($_SESSION['profile']['id'])."' and
 						`org`.`orgid`=`orginfo`.`id` and
 						`orgdomains`.`orgid`=`orginfo`.`id` and
 						`orgdomains`.`domain`='$dom'";
@@ -426,7 +426,7 @@
 				$_SESSION['_config']['altrow'] = "";
 				$dom = mysql_real_escape_string($dom);
 				$query = "select * from `orginfo`,`orgdomains`,`org` where
-						`org`.`memid`='".$_SESSION['profile']['id']."' and
+						`org`.`memid`='".intval($_SESSION['profile']['id'])."' and
 						`org`.`orgid`=`orginfo`.`id` and
 						`orgdomains`.`orgid`=`orginfo`.`id` and
 						`orgdomains`.`domain`='$dom'";
@@ -458,7 +458,7 @@
 				$dom = $bits[$i];
 			$dom = mysql_real_escape_string($dom);
 			$query = "select * from `org`,`orgdomains`,`orginfo`
-					where `org`.`memid`='".$_SESSION['profile']['id']."'
+					where `org`.`memid`='".intval($_SESSION['profile']['id'])."'
 					and `orgdomains`.`orgid`=`org`.`orgid`
 					and `orginfo`.`id`=`org`.`orgid`
 					and `orgdomains`.`domain`='$dom'";
@@ -477,12 +477,12 @@
 		if($id <= 0)
 			$id = $_SESSION['profile']['id'];
 
-		$query = "select sum(`points`) as `points` from `notary` where `to`='$id' group by `to`";
+		$query = "select sum(`points`) as `points` from `notary` where `to`='$id' and `deleted` = 0 group by `to`";
 		$row = mysql_fetch_assoc(mysql_query($query));
 		$points = $row['points'];
 
 		$dob = date("Y-m-d", mktime(0,0,0,date("m"),date("d"),date("Y")-18));
-		$query = "select * from `users` where `id`='".$_SESSION['profile']['id']."' and `dob` < '$dob'";
+		$query = "select * from `users` where `id`='".intval($_SESSION['profile']['id'])."' and `dob` < '$dob'";
 		if(mysql_num_rows(mysql_query($query)) < 1)
 		{
 			if($points >= 100)
@@ -527,7 +527,8 @@
 		$fp = fopen($tmpfname, "w");
 		fputs($fp, $message);
 		fclose($fp);
-		$do = `/usr/bin/gpg --homedir /home/gpg --clearsign "$tmpfname"|/usr/sbin/sendmail "$to"`;
+		$to_esc = escapeshellarg($to);
+		$do = shell_exec("/usr/bin/gpg --homedir /home/gpg --clearsign \"$tmpfname\"|/usr/sbin/sendmail ".$to_esc);
 		@unlink($tmpfname);
 	}
 
@@ -538,9 +539,9 @@
 		{
 			list($username,$domain)=explode('@',$email,2);
 			$dom = escapeshellarg($domain);
-			$line = trim(`dig +short MX $dom 2>&1`);
+			$line = trim(shell_exec("dig +short MX $dom 2>&1"));
 #echo $email."-$dom-$line-\n";
-#echo `dig +short mx heise.de 2>&1`."-
\n";
+#echo shell_exec("dig +short mx heise.de 2>&1")."-
\n";
 
 			$list = explode("\n", $line);
 			foreach($list as $row) {
@@ -557,7 +558,7 @@
 				$fp = @fsockopen($domain,25,$errno,$errstr,5);
 				if($fp)
 				{
-				
+
 					$line = fgets($fp, 4096);
                                         while(substr($line, 0, 4) == "220-")
                                                $line = fgets($fp, 4096);
@@ -581,7 +582,7 @@
 
 					$line = mysql_real_escape_string(trim(strip_tags($line)));
 					$query = "insert into `pinglog` set `when`=NOW(), `email`='$myemail', `result`='$line'";
-					if(is_array($_SESSION['profile'])) $query.=", `uid`='".$_SESSION['profile']['id']."'";
+					if(is_array($_SESSION['profile'])) $query.=", `uid`='".intval($_SESSION['profile']['id'])."'";
 					mysql_query($query);
 
 					if(substr($line, 0, 3) != "250")
@@ -591,7 +592,7 @@
 				}
 			}
 		}
-		$query = "insert into `pinglog` set `when`=NOW(), `uid`='".$_SESSION['profile']['id']."',
+		$query = "insert into `pinglog` set `when`=NOW(), `uid`='".intval($_SESSION['profile']['id'])."',
 				`email`='$myemail', `result`='Failed to make a connection to the mail server'";
 		mysql_query($query);
 		return _("Failed to make a connection to the mail server");
@@ -662,9 +663,9 @@
 		return $ticket;
 	}
 
-	function sanitizeHTML($input) 
+	function sanitizeHTML($input)
 	{
-		return htmlentities(strip_tags($input), ENT_QUOTES);
+		return htmlentities(strip_tags($input), ENT_QUOTES, 'ISO-8859-1');
 		//In case of problems, please use the following line again:
 		//return htmlentities(strip_tags(utf8_decode($input)), ENT_QUOTES);
 		//return htmlspecialchars(strip_tags($input));
@@ -732,7 +733,7 @@
 		$text=preg_replace("/[^\w-.@]/","",$text);
 		return($text);
 	}
-	
+
 
 	// returns text message to be shown to the user given the result of is_no_assurer
 	function no_assurer_text($Status)
@@ -775,7 +776,7 @@
 			$name="../$type/$kind/".intval($id/1000)."/$kind-".intval($id).".$type";
 			if (!is_dir("../csr")) { mkdir("../csr",0777); }
 			if (!is_dir("../crt")) { mkdir("../crt",0777); }
-			
+
 			if (!is_dir("../csr/$kind")) { mkdir("../csr/$kind",0777); }
 			if (!is_dir("../crt/$kind")) { mkdir("../crt/$kind",0777); }
 			if (!is_dir("../csr/$kind/".intval($id/1000))) { mkdir("../csr/$kind/".intval($id/1000)); }
diff --git a/includes/lib/account.php b/includes/lib/account.php
index e311668..dd8afd3 100644
--- a/includes/lib/account.php
+++ b/includes/lib/account.php
@@ -19,10 +19,10 @@
 
 /**
  * Function to recalculate the cached Assurer status
- * 
+ *
  * @param int $userID
  * 	if the user ID is not given the flag will be recalculated for all users
- * 
+ *
  * @return bool
  * 	false if there was an error on fixing the flag. This does NOT return the
  * 	new value of the flag
@@ -30,7 +30,7 @@
 function fix_assurer_flag($userID = NULL)
 {
 	// Update Assurer-Flag on users table if 100 points and CATS passed.
-	// 
+	//
 	// We may have some performance issues here if no userID is given
 	// there are ~150k assurances and ~220k users currently
 	// but the exists-clause on cats_passed should be a good filter
@@ -46,20 +46,21 @@ function fix_assurer_flag($userID = NULL)
 				WHERE `cp`.`variant_id` = `cv`.`id`
 					AND `cv`.`type_id` = 1
 					AND `cp`.`user_id` = `u`.`id`
-			) 
+			)
 			AND (
 				SELECT SUM(`points`) FROM `notary` AS `n`
 				WHERE `n`.`to` = `u`.`id`
 					AND (`n`.`expire` > now()
-					OR `n`.`expire` IS NULL)
+					     OR `n`.`expire` IS NULL)
+					AND `n`.`deleted` = 0
 			) >= 100';
-	
+
 	$query = mysql_query($sql);
 	if (!$query) {
 		return false;
 	}
 	// Challenge has been passed and non-expired points >= 100
-	
+
 	// Reset flag if requirements are not met
 	//
 	// Also a bit performance critical but assurer flag is only set on
@@ -86,13 +87,64 @@ function fix_assurer_flag($userID = NULL)
 							`n`.`expire` > now()
 							OR `n`.`expire` IS NULL
 						)
+						AND `n`.`deleted` = 0
 				) < 100
 			)';
-	
+
 	$query = mysql_query($sql);
 	if (!$query) {
 		return false;
 	}
-	
+
 	return true;
-}
\ No newline at end of file
+}
+
+/**
+ * Supported hash algorithms for signing certificates
+ */
+class HashAlgorithms {
+	/**
+	 * Default hash algorithm identifier for signing
+	 * @var string
+	 */
+	public static $default = 'sha256';
+
+	/**
+	 * Get display strings for the supported hash algorithms
+	 * @return array(string=>array('name'=>string, 'info'=>string))
+	 *     - [$hash_identifier]['name'] = Name that should be displayed in UI
+	 *     - [$hash_identifier]['info'] = Additional information that can help
+	 *       with the selection of a suitable algorithm
+	 */
+	public static function getInfo() {
+		return array(
+				'sha256' => array(
+						'name' => 'SHA-256',
+						'info' => _('Currently recommended, because the other algorithms might break on some older versions of the GnuTLS library (older than 3.x) still shipped in Debian for example.'),
+					),
+				'sha384' => array(
+						'name' => 'SHA-384',
+						'info' => '',
+					),
+				'sha512' => array(
+						'name' => 'SHA-512',
+						'info' => _('Highest protection against hash collision attacks of the algorithms offered here.'),
+					),
+			);
+	}
+
+	/**
+	 * Check if the input is a supported hash algorithm identifier otherwise
+	 * return the identifier of the default hash algorithm
+	 *
+	 * @param string $hash_identifier
+	 * @return string The cleaned identifier
+	 */
+	public static function clean($hash_identifier) {
+		if (array_key_exists($hash_identifier, self::getInfo() )) {
+			return $hash_identifier;
+		} else {
+			return self::$default;
+		}
+	}
+}
diff --git a/includes/lib/check_weak_key.php b/includes/lib/check_weak_key.php
index 8ad2ccf..dd4f3a5 100644
--- a/includes/lib/check_weak_key.php
+++ b/includes/lib/check_weak_key.php
@@ -128,7 +128,7 @@ function checkWeakKeyText($text)
 
 	if ($algorithm === "rsaEncryption")
 	{
-		if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, $keysize))
+		if (!preg_match('/^\s*Public-Key: \((\d+) bit\)$/m', $text, $keysize))
 		{
 			return failWithId("checkWeakKeyText(): Couldn't parse the RSA ".
 						"key size.\nData:\n$text");
@@ -173,7 +173,7 @@ function checkWeakKeyText($text)
 			$exponent = $exponent[1]; // exponent might be very big =>
 			//handle as string using bc*()
 
-			if (bccomp($exponent, "3") === 0)
+			if (bccomp($exponent, "65537") < 0)
 			{
 				return sprintf(_("The keys you use might be insecure. ".
 							"Although there is currently no known attack for ".
@@ -308,7 +308,7 @@ function checkDebianVulnerability($text, $keysize = 0)
 		if ($algorithm !== "rsaEncryption") return false;
 			
 		/* Extract public key size */
-		if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text,
+		if (!preg_match('/^\s*Public-Key: \((\d+) bit\)$/m', $text,
 		$keysize))
 		{
 			trigger_error("checkDebianVulnerability(): Couldn't parse the ".
@@ -338,7 +338,7 @@ function checkDebianVulnerability($text, $keysize = 0)
 
 
 	/* Extract RSA modulus */
-	if (!preg_match('/^\s*Modulus \(\d+ bit\):\n'.
+	if (!preg_match('/^\s*Modulus:\n'.
 				'((?:\s*[0-9a-f][0-9a-f]:(?:\n)?)+[0-9a-f][0-9a-f])$/m',
 	$text, $modulus))
 	{
diff --git a/includes/lib/general.php b/includes/lib/general.php
index 85b132d..127c6b7 100644
--- a/includes/lib/general.php
+++ b/includes/lib/general.php
@@ -18,10 +18,10 @@
 
 /**
  * Checks if the user may log in and retrieve the user id
- * 
+ *
  * Usually called with $_SERVER['SSL_CLIENT_M_SERIAL'] and
  * 	$_SERVER['SSL_CLIENT_I_DN_CN']
- * 
+ *
  * @param $serial string
  * 	usually $_SERVER['SSL_CLIENT_M_SERIAL']
  * @param $issuer_cn string
@@ -43,7 +43,7 @@ function get_user_id_from_cert($serial, $issuer_cn)
 		$row = mysql_fetch_assoc($res);
 		return intval($row['memid']);
 	}
-	
+
 	return -1;
 }
 
@@ -71,7 +71,7 @@ function failWithId($errormessage) {
 
 /**
  * Runs a command on the shell and return it's exit code and output
- * 
+ *
  * @param string $command
  * 		The command to run. Make sure that you escapeshellarg() any non-constant
  * 		parts as this is executed on a shell!
@@ -85,7 +85,7 @@ function failWithId($errormessage) {
  * @param string|bool $errors
  * 		The output the command wrote to STDERR (this is passed as reference),
  * 		if true (default) the output will be written to the real STDERR
- * 
+ *
  * @return int|bool
  * 		The exit code of the command, true if the execution of the command
  * 		failed (true because then
@@ -93,38 +93,38 @@ function failWithId($errormessage) {
  */
 function runCommand($command, $input = "", &$output = null, &$errors = true) {
 	$descriptorspec = array();
-	
+
 	if ($input !== true) {
 		$descriptorspec[0] = array("pipe", "r"); // STDIN for child
 	}
-	
+
 	if ($output !== true) {
 		$descriptorspec[1] = array("pipe", "w"); // STDOUT for child
 	}
-	
+
 	if ($errors !== true) {
 		$descriptorspec[2] = array("pipe", "w"); // STDERR for child
 	}
-	
+
 	$proc = proc_open($command, $descriptorspec, $pipes);
-	
+
 	if (is_resource($proc))
 	{
 		if ($input !== true) {
 			fwrite($pipes[0], $input);
 			fclose($pipes[0]);
 		}
-		
+
 		if ($output !== true) {
 			$output = stream_get_contents($pipes[1]);
 		}
-		
+
 		if ($errors !== true) {
 			$errors = stream_get_contents($pipes[2]);
 		}
-		
+
 		return proc_close($proc);
-		
+
 	} else {
 		return true;
 	}
@@ -145,19 +145,18 @@ function runCommand($command, $input = "", &$output = null, &$errors = true) {
 		{
 			$Result |= 5;
 		}
-		
-		$query = mysql_query('SELECT SUM(`points`) AS `points` FROM `notary` AS `n` WHERE `n`.`to` = \''.(int)intval($userID).'\' AND `n`.`expire` < now()');
+
+		$query = mysql_query('SELECT SUM(`points`) AS `points` FROM `notary` AS `n` WHERE `n`.`to` = \''.(int)intval($userID).'\' AND `n`.`expire` < now() and `deleted` = 0');
 		$row = mysql_fetch_assoc($query);
 		if ($row['points'] < 100) {
 			$Result |= 3;
 		}
-		
+
 		$query = mysql_query('SELECT `assurer_blocked` FROM `users` WHERE `id` = \''.(int)intval($userID).'\'');
 		$row = mysql_fetch_assoc($query);
 		if ($row['assurer_blocked'] > 0) {
 			$Result |= 9;
 		}
-		
+
 		return $Result;
 	}
-	
\ No newline at end of file
diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php
index 85b7aff..4859946 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -22,10 +22,10 @@
 class L10n {
 	/**
 	 * These are tranlations we currently support.
-	 * 
+	 *
 	 * If another translation is added, it doesn't suffice to have gettext set
 	 * up, you also need to add it here, because it acts as a white list.
-	 * 
+	 *
 	 * @var array("ISO-language code" => "native name of the language")
 	 */
 	public static $translations = array(
@@ -53,15 +53,15 @@ class L10n {
 				"zh-cn" => "中文(简体)",
 				"zh-tw" => "中文(臺灣)",
 			);
-	
+
 	/**
 	 * setlocale needs a language + region code for whatever reason so here's
 	 * the mapping from a translation code to locales with the region that
 	 * seemed the most common for this language
-	 * 
+	 *
 	 * You probably never need this. Use {@link set_translation()} to change the
 	 * language instead of manually calling setlocale().
-	 * 
+	 *
 	 * @var array(string => string)
 	 */
 	private static $locales = array(
@@ -101,11 +101,11 @@ class L10n {
 				"zh-cn" => "zh_CN",
 				"zh-tw" => "zh_TW",
 			);
-	
+
 	/**
 	 * Auto-detects the language that should be used and sets it. Only works for
 	 * HTTP, not in a command line script.
-	 * 
+	 *
 	 * Priority:
 	 * 
    
 	 * 	
  1. explicit parameter "lang" passed in HTTP (e.g. via GET)
    2. 
@@ -128,10 +128,10 @@ class L10n {
 				return;
 			}
 		}
-		
-		
+
+
 		$languages = array();
-		
+
 		// parse Accept-Language header
 		if (array_key_exists('HTTP_ACCEPT_LANGUAGE', $_SERVER)) {
 			$bits = explode(",", strtolower(
@@ -144,29 +144,29 @@ class L10n {
 					$c = floatval(substr($b[1], 2));
 				else
 					$c = 1;
-				
+
 				if ($c != 0)
 				{
 					$languages[trim($b[0])] = $c;
 				}
 			}
 		}
-		
+
 		// check if there is an explicit language given as parameter
 		if(array_key_exists("lang",$_REQUEST) && trim($_REQUEST["lang"]) != "")
 		{
 			// higher priority than those values in the header
 			$languages[strtolower(trim($_REQUEST["lang"]))] = 2.0;
 		}
-		
+
 		arsort($languages, SORT_NUMERIC);
-		
+
 		// this is used to be compatible with browsers like internet
 		// explorer which only provide the language code including the
 		// region not without. Also handles the fallback to English (qvalues
 		// may only have three digits after the .)
 		$fallbacks = array("en" => 0.0005);
-		
+
 		foreach($languages as $lang => $qvalue)
 		{
 			// ignore any non-conforming values (that's why we don't need to
@@ -179,7 +179,7 @@ class L10n {
 			}
 			$lang_prefix = $matches[1]; // usually two-letter language code
 			$fallbacks[$lang_prefix] = $qvalue;
-			
+
 			$chosen_translation = "";
 			if ($lang === '*') {
 				// According to the standard '*' matches anything but any
@@ -202,7 +202,7 @@ class L10n {
 					}
 				}
 			}
-			
+
 			if ($chosen_translation !== "")
 			{
 				if (self::set_translation($chosen_translation)) {
@@ -210,7 +210,7 @@ class L10n {
 				}
 			}
 		}
-		
+
 		// No translation found yet => try the prefixes
 		arsort($fallbacks, SORT_NUMERIC);
 		foreach ($fallbacks as $lang => $qvalue) {
@@ -218,16 +218,47 @@ class L10n {
 				return;
 			}
 		}
-		
+
 		// should not get here, as the fallback of "en" is provided and that
 		// should always work => log an error
 		trigger_error("L10n::detect_language(): could not set language",
 		        E_USER_WARNING);
 	}
-	
+
+	/**
+	 * Normalise the translation code (e.g. from the old codes to the new)
+	 *
+	 * @return string
+	 * 		a translation code or the empty string if it can't be normalised
+	 */
+	public static function normalise_translation($translation_code) {
+		// check $translation_code against whitelist
+		if (array_key_exists($translation_code, self::$translations) ) {
+			return $translation_code;
+		}
+
+		// maybe it's a locale as previously used in the system? e.g. en_AU
+		if (preg_match('/^([a-z][a-z])_([A-Z][A-Z])$/', $translation_code, $matches) !== 1) {
+			return '';
+		}
+
+		$lang_code = $matches[1];
+		$region_code = strtolower($matches[2]);
+
+		if (array_key_exists("${lang_code}-${region_code}", self::$translations)) {
+			return "${lang_code}-${region_code}";
+		}
+
+		if (array_key_exists($lang_code, self::$translations)) {
+			return $lang_code;
+		}
+
+		return '';
+	}
+
 	/**
 	 * Get the set translation
-	 * 
+	 *
 	 * @return string
 	 * 		a translation code or the empty string if not set
 	 */
@@ -238,13 +269,13 @@ class L10n {
 			return "";
 		}
 	}
-	
+
 	/**
 	 * Set the translation to use.
-	 * 
+	 *
 	 * @param string $translation_code
 	 * 		the translation code as specified in the keys of {@link $translations}
-	 * 
+	 *
 	 * @return bool
 	 * 		
      
 	 * 		
    • true if the translation has been set successfully
      • 
@@ -255,27 +286,11 @@ class L10n {
 	 * 		
    
 	 */
 	public static function set_translation($translation_code) {
-		// check $translation_code against whitelist
-		if ( !array_key_exists($translation_code, self::$translations) ) {
-			// maybe it's a locale as previously used in the system? e.g. en_AU
-			if ( preg_match('/^([a-z][a-z])_([A-Z][A-Z])$/', $translation_code,
-			                    $matches) !== 1 ) {
-				return false;
-			}
-			
-			$lang_code = $matches[1];
-			$region_code = strtolower($matches[2]);
-			
-			if ( array_key_exists("${lang_code}-${region_code}",
-			                          self::$translations) ) {
-				$translation_code = "${lang_code}-${region_code}";
-			} elseif ( array_key_exists($lang_code, self::$translations) ) {
-				$translation_code = $lang_code;
-			} else {
-				return false;
-			}
+		$translation_code = self::normalise_translation($translation_code);
+		if (empty($translation_code)) {
+			return false;
 		}
-		
+
 		// map translation to locale
 		if ( !array_key_exists($translation_code, self::$locales) ) {
 			// weird. maybe you added a translation but haven't added a
@@ -285,7 +300,7 @@ class L10n {
 			return false;
 		}
 		$locale = self::$locales[$translation_code];
-		
+
 		// set up locale
 		if ( !putenv("LANG=$locale") ) {
 			trigger_error("L10n::set_translation(): could not set the ".
@@ -297,42 +312,42 @@ class L10n {
 				"LC_ALL to $locale", E_USER_WARNING);
 			return false;
 		}
-		
-		
+
+
 		// only set if we're running in a server not in a script
 		if (isset($_SESSION)) {
 			// save the setting
 			$_SESSION['_config']['language'] = $translation_code;
-			
-			
+
+
 			// Set up the recode settings needed e.g. in PDF creation
 			$_SESSION['_config']['recode'] = "html..latin-1";
-			
+
 			if($translation_code === "zh-cn" || $translation_code === "zh-tw")
 			{
 				$_SESSION['_config']['recode'] = "html..gb2312";
-				
+
 			} else if($translation_code === "pl" || $translation_code === "hu") {
 				$_SESSION['_config']['recode'] = "html..ISO-8859-2";
-				
+
 			} else if($translation_code === "ja") {
 				$_SESSION['_config']['recode'] = "html..SHIFT-JIS";
-				
+
 			} else if($translation_code === "ru") {
 				$_SESSION['_config']['recode'] = "html..ISO-8859-5";
-				
+
 			} else if($translation_code == "lt") { // legacy, keep for reference
 				$_SESSION['_config']['recode'] = "html..ISO-8859-13";
-				
+
 			}
 		}
-		
+
 		return true;
 	}
-	
+
 	/**
 	 * Sets up the text domain used by gettext
-	 * 
+	 *
 	 * @param string $domain
 	 * 		the gettext domain that should be used, defaults to "messages"
 	 */
@@ -340,4 +355,21 @@ class L10n {
 		bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale');
 		textdomain($domain);
 	}
-}
\ No newline at end of file
+
+	public static function set_recipient_language($accountid) {
+		//returns the language of a recipient to make sure that the language is correct
+		//use together with
+		$query = "select `language` from `users` where `id`='".intval($accountid)."'";
+		$res = mysql_query($query);
+		if (mysql_num_rows($res)>=0) {
+			$row = mysql_fetch_assoc($res);
+			if (NULL==$row['language'] || $row['language']=='') {
+				self::set_translation('en');
+			} else {
+				self::set_translation($row['language']);
+			}
+		} else {
+			self::set_translation('en');
+		}
+	}
+}
diff --git a/includes/loggedin.php b/includes/loggedin.php
index 4f9b8e8..c14f8c2 100644
--- a/includes/loggedin.php
+++ b/includes/loggedin.php
@@ -19,6 +19,7 @@
 	include_once("../includes/lib/general.php");
 	require_once("../includes/lib/l10n.php");
 	include_once("../includes/mysql.php");
+	require_once('../includes/notary.inc.php');
 
 	if(!isset($_SESSION['profile']) || !is_array($_SESSION['profile'])) {
 		$_SESSION['profile'] = array( 'id' => 0, 'loggedin' => 0 );
@@ -38,18 +39,18 @@
 			if($key == '_config' || $key == 'mconn' || 'csrf_' == substr($key, 0, 5))
 				continue;
 			if(is_int($key) || is_string($key))
-		                unset($_SESSION[$key]);
-		        unset($$key);
-		        //session_unregister($key);
+				unset($_SESSION[$key]);
+			unset($$key);
+			//session_unregister($key);
 		}
 
-		$_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='$uid'"));
+		$_SESSION['profile'] = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($uid)."'"));
 		if($_SESSION['profile']['locked'] == 0)
 			$_SESSION['profile']['loggedin'] = 1;
 		else
 			unset($_SESSION['profile']);
 	}
-  
+
 	if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && ($_SESSION['profile']['id'] == 0 || $_SESSION['profile']['loggedin'] == 0))
 	{
 		$user_id = get_user_id_from_cert($_SERVER['SSL_CLIENT_M_SERIAL'],
@@ -64,13 +65,13 @@
 				if($key == '_config' || $key == 'mconn' || 'csrf_' == substr($key, 0, 5))
 					continue;
 				if(is_int($key) || is_string($key))
-			                unset($_SESSION[$key]);
-			        unset($$key);
-			        //session_unregister($key);
+					unset($_SESSION[$key]);
+				unset($$key);
+				//session_unregister($key);
 			}
 
 			$_SESSION['profile'] = mysql_fetch_assoc(mysql_query(
-					"select * from `users` where `id`='".$user_id."'"));
+					"select * from `users` where `id`='".intval($user_id)."'"));
 			if($_SESSION['profile']['locked'] == 0)
 				$_SESSION['profile']['loggedin'] = 1;
 			else
@@ -82,38 +83,26 @@
 			{
 				if($key == '_config' || $key == 'mconn' || 'csrf_' == substr($key, 0, 5))
 					continue;
-			        unset($_SESSION[$key]);
-			        unset($$key);
-			        //session_unregister($key);
+				unset($_SESSION[$key]);
+				unset($$key);
+				//session_unregister($key);
 			}
 
-			$_SESSION['_config']['oldlocation'] = '';
-
-			foreach($_GET as $key => $val)
-			{
-				if($_SESSION['_config']['oldlocation'])
-					$_SESSION['_config']['oldlocation'] .= "&";
-
-				$key = str_replace(array("\n", "\r"), '', $key);
-				$val = str_replace(array("\n", "\r"), '', $val);
-				$_SESSION['_config']['oldlocation'] .= "$key=$val";
- 			}
-			$_SESSION['_config']['oldlocation'] = substr($_SERVER['SCRIPT_NAME'], 1)."?".$_SESSION['_config']['oldlocation'];
-
-			header("location: https://".$_SESSION['_config']['securehostname']."/index.php?id=4");
+			$_SESSION['_config']['oldlocation'] = $_SERVER['REQUEST_URI'];
+			header("Location: https://{$_SESSION['_config']['securehostname']}/index.php?id=4");
 			exit;
 		}
 	}
 
 	if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && ($_SESSION['profile']['id'] <= 0 || $_SESSION['profile']['loggedin'] == 0))
 	{
-		header("location: https://".$_SESSION['_config']['normalhostname']);
+		header("Location: https://{$_SESSION['_config']['normalhostname']}");
 		exit;
 	}
 
 	if($_SERVER['HTTP_HOST'] == $_SESSION['_config']['securehostname'] && $_SESSION['profile']['id'] > 0 && $_SESSION['profile']['loggedin'] > 0)
 	{
-		$query = "select sum(`points`) as `total` from `notary` where `to`='".$_SESSION['profile']['id']."' group by `to`";
+		$query = "select sum(`points`) as `total` from `notary` where `to`='".intval($_SESSION['profile']['id'])."' and `deleted` = 0 group by `to`";
 		$res = mysql_query($query);
 		$row = mysql_fetch_assoc($res);
 		$_SESSION['profile']['points'] = $row['total'];
@@ -121,7 +110,7 @@
 		if($_SESSION['profile']['language'] == "")
 		{
 			$query = "update `users` set `language`='".L10n::get_translation()."'
-							where `id`='".$_SESSION['profile']['id']."'";
+							where `id`='".intval($_SESSION['profile']['id'])."'";
 			mysql_query($query);
 		} else {
 			L10n::set_translation($_SESSION['profile']['language']);
@@ -136,32 +125,28 @@
 		$_SESSION['profile'] = "";
 		foreach($_SESSION as $key => $value)
 		{
-		        unset($_SESSION[$key]);
-		        unset($$key);
-		        //session_unregister($key);
+			unset($_SESSION[$key]);
+			unset($$key);
+			//session_unregister($key);
 		}
 
-		header("location: https://".$normalhost."/index.php");
+		header("Location: https://{$normalhost}/index.php");
 		exit;
 	}
 
 	if($_SESSION['profile']['loggedin'] < 1)
 	{
-		$_SESSION['_config']['oldlocation'] = '';
-
-		foreach($_REQUEST as $key => $val)
-		{
-			if('' != $_SESSION['_config']['oldlocation'])
-				$_SESSION['_config']['oldlocation'] .= "&";
+		$_SESSION['_config']['oldlocation'] = $_SERVER['REQUEST_URI'];
+		header("Location: https://{$_SERVER['HTTP_HOST']}/index.php?id=4");
+		exit;
+	}
 
-			$key = str_replace(array("\n", "\r"), '', $key);
-			$val = str_replace(array("\n", "\r"), '', $val);
-			$_SESSION['_config']['oldlocation'] .= "$key=$val";
+	if (!isset($_SESSION['profile']['ccaagreement']) || !$_SESSION['profile']['ccaagreement']) {
+		$_SESSION['profile']['ccaagreement']=get_user_agreement_status($_SESSION['profile']['id'],'CCA');
+		if (!$_SESSION['profile']['ccaagreement']) {
+			$_SESSION['_config']['oldlocation'] = $_SERVER['REQUEST_URI'];
+			header("Location: https://{$_SERVER['HTTP_HOST']}/index.php?id=52");
+			exit;
 		}
-		$_SESSION['_config']['oldlocation'] = substr($_SERVER['SCRIPT_NAME'], 1)."?".$_SESSION['_config']['oldlocation'];
-		$hostname=$_SERVER['HTTP_HOST'];
-		$hostname = str_replace(array("\n", "\r"), '', $hostname);
-		header("location: https://".$hostname."/index.php?id=4");
-		exit;
 	}
 ?>
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index b34b2f4..3b8e736 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -16,6 +16,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+define('NULL_DATETIME', '0000-00-00 00:00:00');
+define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
+
 	function query_init ($query)
 	{
 		return mysql_query($query);
@@ -35,7 +38,7 @@
 	function get_number_of_assurances ($userid)
 	{
 		$res = query_init ("SELECT count(*) AS `list` FROM `notary`
-		     	WHERE `method` = 'Face to Face Meeting' AND `from`='".intval($userid)."' ");
+			WHERE `method` = 'Face to Face Meeting' AND `from`='".intval($userid)."' and `deleted` = 0");
 		$row = query_getnextrow($res);
 
 		return intval($row['list']);
@@ -44,7 +47,7 @@
 	function get_number_of_ttpassurances ($userid)
 	{
 		$res = query_init ("SELECT count(*) AS `list` FROM `notary`
-			WHERE (`method`='Trusted Third Parties' or `method`='TTP-Assisted') AND `to`='".intval($userid)."' ");
+			WHERE (`method`='Trusted Third Parties' or `method`='TTP-Assisted') AND `to`='".intval($userid)."' and `deleted` = 0");
 		$row = query_getnextrow($res);
 
 		return intval($row['list']);
@@ -53,7 +56,7 @@
 	function get_number_of_assurees ($userid)
 	{
 		$res = query_init ("SELECT count(*) AS `list` FROM `notary`
-			WHERE `method` = 'Face to Face Meeting' AND `to`='".intval($userid)."' ");
+			WHERE `method` = 'Face to Face Meeting' AND `to`='".intval($userid)."' and `deleted` = 0");
 		$row = query_getnextrow($res);
 
 		return intval($row['list']);
@@ -62,7 +65,7 @@
 	function get_top_assurer_position ($no_of_assurances)
 	{
 		$res = query_init ("SELECT count(*) AS `list` FROM `notary`
-			WHERE `method` = 'Face to Face Meeting'
+			WHERE `method` = 'Face to Face Meeting' and `deleted` = 0
 			GROUP BY `from` HAVING count(*) > '".intval($no_of_assurances)."'");
 		return intval(query_get_number_of_rows($res)+1);
 	}
@@ -70,32 +73,52 @@
 	function get_top_assuree_position ($no_of_assurees)
 	{
 		$res = query_init ("SELECT count(*) AS `list` FROM `notary`
-			WHERE `method` = 'Face to Face Meeting'
+			WHERE `method` = 'Face to Face Meeting' and `deleted` = 0
 			GROUP BY `to` HAVING count(*) > '".intval($no_of_assurees)."'");
 		return intval(query_get_number_of_rows($res)+1);
 	}
 
-	function get_given_assurances ($userid)
+	/**
+	 * Get the list of assurances given by the user
+	 * @param int $userid - id of the assurer
+	 * @param int $log - if set to 1 also includes deleted assurances
+	 * @return resource - a MySQL result set
+	 */
+	function get_given_assurances($userid, $log=0)
 	{
-		$res = query_init ("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` order by `id` asc");
+		$deleted='';
+		if ($log == 0) {
+			$deleted = ' and `deleted` = 0 ';
+		}
+		$res = query_init("select * from `notary` where `from`='".intval($userid)."' and `from` != `to` $deleted order by `id` asc");
 		return $res;
 	}
 
-	function get_received_assurances ($userid)
+	/**
+	 * Get the list of assurances received by the user
+	 * @param int $userid - id of the assuree
+	 * @param int $log - if set to 1 also includes deleted assurances
+	 * @return resource - a MySQL result set
+	 */
+	function get_received_assurances($userid, $log=0)
 	{
-		$res = query_init ("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` order by `id` asc ");
+		$deleted='';
+		if ($log == 0) {
+			$deleted = ' and `deleted` = 0 ';
+		}
+		$res = query_init("select * from `notary` where `to`='".intval($userid)."' and `from` != `to` $deleted order by `id` asc  ");
 		return $res;
 	}
 
 	function get_given_assurances_summary ($userid)
 	{
-		$res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' group by points,awarded,method");
+		$res = query_init ("select count(*) as number,points,awarded,method from notary where `from`='".intval($userid)."' and `deleted` = 0 group by points,awarded,method");
 		return $res;
 	}
 
 	function get_received_assurances_summary ($userid)
 	{
-		$res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' group by points,awarded,method");
+		$res = query_init ("select count(*) as number,points,awarded,method from notary where `to`='".intval($userid)."' and `deleted` = 0 group by points,awarded,method");
 		return $res;
 	}
 
@@ -113,69 +136,177 @@
 		return mysql_num_rows($res);
 	}
 
-	function calc_experience ($row,&$points,&$experience,&$sum_experience,&$revoked)
+
+	/**
+	 * Calculate awarded points (corrects some issues like out of range points
+	 * or points that were issued by means that have been deprecated)
+	 *
+	 * @param array $row - associative array containing the data from the
+	 *     `notary` table
+	 * @return int - the awarded points for this assurance
+	 */
+	function calc_awarded($row)
+	{
+		// Back in the old days there was no `awarded` column => is now zero,
+		// there the `points` column contained that data
+		$points = max(intval($row['awarded']), intval($row['points']));
+
+		// Set negative points to zero, yes there are such things in the database
+		$points = max($points, 0);
+
+		switch ($row['method'])
+		{
+			// These programmes have been revoked
+			case 'Thawte Points Transfer':	  // revoke all Thawte-points     (as per arbitration)
+			case 'CT Magazine - Germany':	   // revoke c't		   (only one test-entry)
+			case 'Temporary Increase':	      // revoke 'temporary increase'  (Current usage breaks audit aspects, needs to be reimplemented)
+				$points = 0;
+				break;
+
+			case 'Administrative Increase':	 // ignore AI with 2 points or less (historical for experiance points, now other calculation)
+				if ($points <= 2)	       // maybe limit to 35/50 pts in the future?
+					$points = 0;
+				break;
+
+			// TTP assurances, limit to 35
+			case 'TTP-Assisted':
+				$points = min($points, 35);
+				break;
+
+				// TTP TOPUP, limit to 30
+			case 'TOPUP':
+				$points = min($points, 30);
+
+			// All these should be preserved for the time being
+			case 'Unknown':			 // to be revoked in the future? limit to max 50 pts?
+			case 'Trusted Third Parties':	     // to be revoked in the future? limit to max 35 pts?
+			case '':				// to be revoked in the future? limit to max 50 pts?
+			case 'Face to Face Meeting': // normal assurances (and superassurances?), limit to 35/50 pts in the future?
+				break;
+
+			default:				// should never happen ... ;-)
+				$points = 0;
+		}
+
+		return $points;
+	}
+
+
+	/**
+	 * Calculate the experience points from a given Assurance
+	 * @param array  $row - [inout] associative array containing the data from
+	 *     the `notary` table, the keys 'experience' and 'calc_awarded' will be
+	 *     added
+	 * @param int    $sum_points - [inout] the sum of already counted assurance
+	 *     points the assurer issued
+	 * @param int    $sum_experience - [inout] the sum of already counted
+	 *     experience points that were awarded to the assurer
+	 */
+	function calc_experience(&$row, &$sum_points, &$sum_experience)
 	{
-		$apoints = max($row['points'], $row['awarded']);
-		$points += $apoints;
-		$experience = " ";
-		$revoked = false;				# to be coded later (after DB-upgrade)
+		$row['calc_awarded'] = calc_awarded($row);
+
+		// Don't count revoked assurances even if we are displaying them
+		if ($row['deleted'] !== NULL_DATETIME) {
+			$row['experience'] = 0;
+			return;
+		}
+
+		$experience = 0;
 		if ($row['method'] == "Face to Face Meeting")
 		{
-			$sum_experience = $sum_experience +2;
-			$experience = "2";
+			$experience = 2;
 		}
-		return $apoints;
+		$sum_experience += $experience;
+		$row['experience'] = $experience;
+
+		$sum_points += $row['calc_awarded'];
 	}
 
-	function calc_assurances ($row,&$points,&$experience,&$sumexperience,&$awarded,&$revoked)
+	/**
+	 * Calculate the points received from a received Assurance
+	 * @param array  $row - [inout] associative array containing the data from
+	 *     the `notary` table, the keys 'experience' and 'calc_awarded' will be
+	 *     added
+	 * @param int    $sum_points - [inout] the sum of already counted assurance
+	 *     points the assuree received
+	 * @param int    $sum_experience - [inout] the sum of already counted
+	 *     experience points that were awarded to the assurer
+	 */
+	function calc_assurances(&$row, &$sum_points, &$sum_experience)
 	{
-		$awarded = calc_points($row);
-		$revoked = false;
+		$row['calc_awarded'] = calc_awarded($row);
+		$experience = 0;
 
-		if ($awarded > 100)
+		// High point values mean that some of them are experience points
+		if ($row['calc_awarded'] > 100)
 		{
-			$experience = $awarded - 100;		// needs to be fixed in the future (limit 50 pts and/or no experience if pts > 100)
-			$awarded = 100;
+			$experience = $row['calc_awarded'] - 100;		// needs to be fixed in the future (limit 50 pts and/or no experience if pts > 100)
+			$row['calc_awarded'] = 100;
 		}
-		else
-			$experience = 0;
 
 		switch ($row['method'])
 		{
 			case 'Thawte Points Transfer':
 			case 'CT Magazine - Germany':
 			case 'Temporary Increase':	      // Current usage of 'Temporary Increase' may break audit aspects, needs to be reimplemented
-				$awarded=sprintf("%s",_("Revoked"));
-				$experience=0;
-				$revoked=true;
+				$experience = 0;
+				$row['deleted'] = THAWTE_REVOCATION_DATETIME;
 				break;
-			default:
-				$points += $awarded;
 		}
-		$sumexperience = $sumexperience + $experience;
-	}
 
+		// Don't count revoked assurances even if we are displaying them
+		if ($row['deleted'] !== NULL_DATETIME) {
+			$row['experience'] = 0;
+			return;
+		}
+
+		$sum_experience += $experience;
+		$row['experience'] = $experience;
+		$sum_points += $row['calc_awarded'];
+	}
 
-	function show_user_link ($name,$userid)
+	/**
+	 * Generate a link to the support engineer page for the user with the name
+	 * of the user as link text
+	 * @param array $user - associative array containing the data from the
+	 *     `user` table
+	 * @return string
+	 */
+	function show_user_link($user)
 	{
-		$name = trim($name);
+		$name = trim($user['fname'].' '.$user['lname']);
+		$userid = intval($user['id']);
+
 		if($name == "")
 		{
-			if ($userid == 0)
+			if ($userid == 0) {
 				$name = _("System");
-			else
+			} else {
 				$name = _("Deleted account");
+			}
 		}
 		else
-			$name = "".sanitizeHTML($name)."";
+		{
+			$name = "".sanitizeHTML($name)."";
+		}
+
 		return $name;
 	}
 
-	function show_email_link ($email,$userid)
+	/**
+	 * Generate a link to the support engineer page for the user with the email
+	 * address as link text
+	 * @param array $user - associative array containing the data from the
+	 *     `user` table
+	 * @return string
+	 */
+	function show_email_link($user)
 	{
-		$email = trim($email);
-		if($email != "")
-			$email = "".sanitizeHTML($email)."";
+		$email = trim($user['email']);
+		if($email != "") {
+			$email = "".sanitizeHTML($email)."";
+		}
 		return $email;
 	}
 
@@ -215,35 +346,41 @@
 
 
-
-		
-
-		
-
+		
@@ -251,43 +388,88 @@
 		
-		
+		
-		 class="DataTD">:
-		
+		
+		
-		
+		
-
 	
    
 	
    
 	
    
 	
    
 		
 		
 
 		
 		
 
 		
 		
 		
 
 
 	
    
 
 	
    :
 		 
 		:
 
 		 
 
    
 
    
 
    
 >
 		>
 
 		>
@@ -319,26 +501,30 @@
 		}
 ?>
 		>
-		>
-		>
+		>%s",_("Revoked")) : $awarded?>
+		>
 		>
-		>
+		>
 
-		> 
+		>
+
+		>');">
 
-		>');">
+		> 
 
-    
+	
  100, awarded shows correct value
-		else
-			$points = intval($row['points']);       // on very old assurances, awarded is '0' instead of correct value
-		switch ($row['method'])
-		{
-			case 'Thawte Points Transfer':	  // revoke all Thawte-points     (as per arbitration)
-			case 'CT Magazine - Germany':	   // revoke c't		   (only one test-entry)
-			case 'Temporary Increase':	      // revoke 'temporary increase'  (Current usage breaks audit aspects, needs to be reimplemented)
-				$points = 0;
-				break;
-			case 'Administrative Increase':	 // ignore AI with 2 points or less (historical for experiance points, now other calculation)
-				if ($points <= 2)	       // maybe limit to 35/50 pts in the future?
-					$points = 0;
-				break;
-			case 'Unknown':			 // to be revoked in the future? limit to max 50 pts?
-			case 'Trusted Third Parties':	     // to be revoked in the future? limit to max 35 pts?
-			case 'TTP-Assisted':	     // TTP assurances, limit to 35
-			case 'TOPUP':	     // TOPUP to be delevoped in the future, limit to 30
-			case '':				// to be revoked in the future? limit to max 50 pts?
-			case 'Face to Face Meeting':	    // normal assurances, limit to 35/50 pts in the future?
-				break;
-			default:				// should never happen ... ;-)
-				$points = 0;
-		}
-		if ($points < 0)				// ignore negative points (bug needs to be fixed)
-			$points = 0;
-		return $points;
-	}
-
 	function max_points($userid)
 	{
 		return output_summary_content ($userid,0);
@@ -486,7 +663,7 @@
 		$res = get_received_assurances_summary($userid);
 		while($row = mysql_fetch_assoc($res))
 		{
-			$points = calc_points ($row);
+			$points = calc_awarded($row);
 
 			if ($points > $max_points)			// limit to 100 points, above is experience (needs to be fixed)
 			{
@@ -591,18 +768,66 @@
 		return $issue_points;
 	}
 
-	function output_given_assurances($userid,$support=0)
+	/**
+	 * Render assurances given by the user
+	 * @param int $userid
+	 * @param int $support - set to 1 if the output is for the support interface
+	 * @param string $ticketno - the ticket number set in the support interface
+	 * @param int $log - if set to 1 also includes deleted assurances
+	 */
+	function output_given_assurances($userid, $support=0, $ticketno='', $log=0)
 	{
-		output_assurances_header(_("Assurance Points You Issued"),$support);
-		output_given_assurances_content($userid,$points,$sum_experience,$support);
-		output_assurances_footer(_("Total Points Issued"),$points,_("Total Experience Points"),$sum_experience,$support);
+		output_assurances_header(
+				_("Assurance Points You Issued"),
+				$support,
+				$log);
+
+		output_given_assurances_content(
+				$userid,
+				$sum_points,
+				$sum_experience,
+				$support,
+				$ticketno,
+				$log);
+
+		output_assurances_footer(
+				_("Total Points Issued"),
+				$sum_points,
+				_("Total Experience Points"),
+				$sum_experience,
+				$support,
+				$log);
 	}
 
-	function output_received_assurances($userid,$support=0)
+	/**
+	 * Render assurances received by the user
+	 * @param int $userid
+	 * @param int $support - set to 1 if the output is for the support interface
+	 * @param string $ticketno - the ticket number set in the support interface
+	 * @param int $log - if set to 1 also includes deleted assurances
+	 */
+	function output_received_assurances($userid, $support=0, $ticketno='', $log=0)
 	{
-		output_assurances_header(_("Your Assurance Points"),$support);
-		output_received_assurances_content($userid,$points,$sum_experience,$support);
-		output_assurances_footer(_("Total Assurance Points"),$points,_("Total Experience Points"),$sum_experience,$support);
+		output_assurances_header(
+				_("Assurance Points You Received"),
+				$support,
+				$log);
+
+		output_received_assurances_content(
+				$userid,
+				$sum_points,
+				$sum_experience,
+				$support,
+				$ticketno,
+				$log);
+
+		output_assurances_footer(
+				_("Total Points Received"),
+				$sum_points,
+				_("Total Experience Points"),
+				$sum_experience,
+				$support,
+				$log);
 	}
 
 	function output_summary($userid)
@@ -658,18 +883,31 @@
 	}
 
 	/**
-	 * get_first_user_agreement()
-	 *  returns the first user_agreement entry of the requested type depending on thes status of active of a given user
-	 * @param mixed $memid
-	 * @param integer $active, 0 - passive, 1 -active
-	 * @param string $type
-	 * @return
+	 * Get the first user_agreement entry of the requested type
+	 * @param int $memid
+	 * @param string $type - the type of user agreement, by default all
+	 *     agreements are listed
+	 * @param int $active - whether to get active or passive agreements:
+	 *     0 := passive
+	 *     1 := active
+	 *     null := both
+	 * @return array(string=>mixed) - an associative array containing
+	 *     'document', 'date', 'method', 'comment', 'active'
 	 */
-	function get_first_user_agreement($memid, $active=1, $type="CCA"){
-	//returns an array (`document`,`date`,`method`, `comment`,`active`)
+	function get_first_user_agreement($memid, $type=null, $active=null){
+		$filter = '';
+		if (!is_null($type)) {
+			$filter .= " AND u.`document` = '".mysql_real_escape_string($type)."'";
+		}
+
+		if (!is_null($active)) {
+			$filter .= " AND u.`active` = ".intval($active);
+		}
+
 		$query="SELECT u.`document`, u.`date`, u.`method`, u.`comment`, u.`active` FROM `user_agreements` AS u
-			WHERE u.`document` = '" . mysql_real_escape_string($type) . "' AND u.`memid`=" . intval($memid) . " AND u.`active`=" . intval($active) .
-			" ORDER BY u.`date` Limit 1;";
+			WHERE u.`memid`=".intval($memid)."
+				$filter
+			ORDER BY u.`date` LIMIT 1";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) >0){
 			$rec = mysql_fetch_assoc($res);
@@ -680,15 +918,31 @@
 	}
 
 	/**
-	 * get_last_user_agreement()
-	 *  returns the last user_agreement entry of a given type and of a given user
-	 * @param mixed $memid
-	 * @param string $type
-	 * @return
+	 * Get the last user_agreement entry of the requested type
+	 * @param int $memid
+	 * @param string $type - the type of user agreement, by default all
+	 *     agreements are listed
+	 * @param int $active - whether to get active or passive agreements:
+	 *     0 := passive,
+	 *     1 := active,
+	 *     null := both
+	 * @return array(string=>mixed) - an associative array containing
+	 *     'document', 'date', 'method', 'comment', 'active'
 	 */
-	function get_last_user_agreement($memid, $type="CCA"){
-	//returns an array (`document`,`date`,`method`, `comment`,`active`)
-		$query="SELECT u.`document`, u.`date`, u.`method`, u.`comment`, u.`active` FROM user_agreements u WHERE u.`document` = '" . mysql_real_escape_string($type) . "' AND (u.`memid`=" . intval($memid) . " ) order by `date` desc limit 1 " ;
+	function get_last_user_agreement($memid, $type=null, $active=null){
+		$filter = '';
+		if (!is_null($type)) {
+			$filter .= " AND u.`document` = '".mysql_real_escape_string($type)."'";
+		}
+
+		if (!is_null($active)) {
+			$filter .= " AND u.`active` = ".intval($active);
+		}
+
+		$query="SELECT u.`document`, u.`date`, u.`method`, u.`comment`, u.`active` FROM `user_agreements` AS u
+			WHERE u.`memid`=".intval($memid)."
+				$filter
+			ORDER BY u.`date` DESC LIMIT 1";
 		$res = mysql_query($query);
 		if(mysql_num_rows($res) >0){
 			$rec = mysql_fetch_assoc($res);
@@ -698,6 +952,34 @@
 		return $rec;
 	}
 
+/**
+ * Get the all user_agreement entries of the requested type
+ * @param int $memid
+ * @param string $type - the type of user agreement, by default all
+ *     agreements are listed
+ * @param int $active - whether to get an active or passive agreements:
+ *     0 := passive,
+ *     1 := active,
+ *     null := both
+ * @return resource - a mysql result set containing all agreements
+ */
+function get_user_agreements($memid, $type=null, $active=null){
+	$filter = '';
+	if (!is_null($type)) {
+		$filter .= " AND u.`document` = '".mysql_real_escape_string($type)."'";
+	}
+
+	if (!is_null($active)) {
+		$filter .= " AND u.`active` = ".intval($active);
+	}
+
+	$query="SELECT u.`document`, u.`date`, u.`method`, u.`comment`, u.`active` FROM `user_agreements` AS u
+		WHERE u.`memid`=".intval($memid)."
+			$filter
+		ORDER BY u.`date`";
+	return mysql_query($query);
+}
+
 	/**
 	 * delete_user_agreement()
 	 *  deletes all entries for a given type from user_agreement of a given user, if type is not given all
@@ -706,7 +988,6 @@
 	 * @return
 	 */
 	function delete_user_agreement($memid, $type=false){
-	//deletes all entries to an user for the given type of user agreements
 		if ($type === false) {
 			$filter = '';
 		} else {
@@ -774,7 +1055,7 @@
 
-	
+	
  0";
+	}
+	$query .= " ORDER BY `emailcerts`.`modified` desc";
+	return mysql_query($query);
+}
+
+/**
+ * Get all server certs linked to the account
+ * @param int $userid
+ * @param int $viewall - states if expired certs should be visible, default = 0 - not visible
+ * @return resource - a mysql result set
+ */
+function get_server_certs($userid, $viewall=0){
+	//add to account/12.php
+	$userid = intval($userid);
+	$query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`,
+			UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`,
+			UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`,
+			`domaincerts`.`expire`,
+			`domaincerts`.`revoked` as `revoke`,
+			UNIX_TIMESTAMP(`revoked`) as `revoked`,
+			`domaincerts`.`CN`,
+			`domaincerts`.`serial`,
+			`domaincerts`.`id`,
+			`domaincerts`.`description`
+			from `domaincerts`,`domains`
+			where `domains`.`memid`='".$userid."' and `domaincerts`.`domid`=`domains`.`id`";
+	if($viewall == 0)
+	{
+		$query .= " AND `domaincerts`.`revoked`=0 AND `domaincerts`.`renewed`=0";
+		$query .= " HAVING `timeleft` > 0";
+	}
+	$query .= " ORDER BY `domaincerts`.`modified` desc";
+	return mysql_query($query);
+}
+
+/**
+ * Get all gpg certs linked to the account
+ * @param int $userid
+ * @param int $viewall - states if expired certs should be visible, default = 0 - not visible
+ * @return resource - a mysql result set
+ */
+function get_gpg_certs($userid, $viewall=0){
+	//add to gpg/2.php
+	$userid = intval($userid);
+	$query = $query = "select UNIX_TIMESTAMP(`issued`) as `issued`,
+			UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() as `timeleft`,
+			UNIX_TIMESTAMP(`expire`) as `expired`,
+			`expire`, `id`, `level`, `email`, `keyid`, `description`
+			from `gpg` where `memid`='".$userid."'";
+	if ($viewall == 0) {
+		$query .= " HAVING `timeleft` > 0";
+	}
+	$query .= " ORDER BY `issued` desc";
+	return mysql_query($query);
+}
+
+
+
+/**
+ * Show the table header to the email table for the admin log
+ */
+function output_log_email_header(){
+	?>
+	
+		
+		
+		
+	
+
+	
+	
+		
+		
+		
+	
+	
+	
+		
+		
+		
+	
+
+	
+	
+		
+		
+		
+	
+	
+	
+		
+		
+		
+		
+	
+	
+	
+		
+		
+		
+		
+	
+	
+	
+		
+		
+		
+	
+	
+	
+		
+		
+		
+	
+	
+	
+		
+		
+		
+			
+			
+			
+	
+	
+	
+		
+		
+		
+			
+			
+			
+	
+	
+	
+		
+			
+			
+		
+		
+		
+		
+		
+		
+		
+			
+			
+	
+	 0) {
+		$verified = _("Valid");
+	} else {
+		$verified = _("Expired");
+	}
+
+	if ($row['expired'] == 0) {
+		$verified = _("Pending");
+	}
+
+	if ($row['revoked'] == 0) {
+		$row['revoke'] = _("Not Revoked");
+	} else {
+		$verified = _("Revoked");
+	}
+
+	?>
+	
+	
+			
+				
+			
+			
+			 
+			
+			
+				
+			
+			
+	
+	
+		
+		
+		
+			
+				
+			
+		
+		
+	
+	
+	
+	
+		 />
+		
+	
+	
+		
+			
+		
+		
+			
+				
+			
+			
+	
+	
+	
+	
+			
+			
+		
+		
+		
+		
+		
+		
+			
+			
+	
+	 0) {
+		$verified = _("Valid");
+	} else {
+		$verified = _("Expired");
+	}
+
+	if ($row['expired'] == 0) {
+		$verified = _("Pending");
+	}
+
+	if ($row['revoked'] == 0) {
+		$row['revoke'] = _("Not Revoked");
+	} else {
+		$verified = _("Revoked");
+	}
+
+	?>
+	
+	
+			
+				
+			
+			
+			 
+			
+			
+				
+			
+			
+	
+	
+		
+		
+		
+			
+				
+			
+		
+		
+	
+	
+	
+	
+		
+			
+		
+		
+			
+				
+			
+			
+	
+	
+	
+		
+		
+		
+		
+		
+			
+			
+	
+	 0) {
+		$verified = _("Valid");
+	} else {
+		$verified = _("Expired");
+	}
+
+	if ($row['expired'] == 0) {
+		$verified = _("Pending");
+	}
+
+	?>
+	
+		
+	
+		
+		
+		
+			
+				
+			
+		
+		
+	
+	
+		
+		
+		
+			
+				
+			
+		
+		
+		
+			
+		
+		
+			
+				
+			
+			
+	
+