diff options
| author | Michael Tänzer <neo@nhng.de> | 2013-08-25 00:27:52 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2013-08-25 00:27:52 +0200 |
| commit | c6fd753005d2651382fc8aa21933376225035a31 (patch) | |
| tree | 0c930329a4d50f389e49ff97c15b5c651b7864f8 | |
| parent | 75693292de2d907bf2a4b0f12abd7cd68781f95a (diff) | |
| download | cacert-devel-c6fd753005d2651382fc8aa21933376225035a31.tar.gz cacert-devel-c6fd753005d2651382fc8aa21933376225035a31.tar.xz cacert-devel-c6fd753005d2651382fc8aa21933376225035a31.zip | |
Revert "bug 1123: fixed merge conflicts on testserver"
This reverts commit 75693292de2d907bf2a4b0f12abd7cd68781f95a.
| -rw-r--r-- | includes/account.php | 5 | ||||
| -rw-r--r-- | pages/gpg/0.php | 2 | ||||
| -rw-r--r-- | www/gpg.php | 7 |
3 files changed, 2 insertions, 12 deletions
diff --git a/includes/account.php b/includes/account.php index 709cfa6..aecbd36 100644 --- a/includes/account.php +++ b/includes/account.php @@ -17,9 +17,8 @@ */ require_once("../includes/loggedin.php"); require_once("../includes/lib/l10n.php"); - require_once("../includes/lib/check_weak_key.php"); - require_once("../includes/temp_functions.php"); - require_once("../includes/notary.inc.php"); + require_once('lib/check_weak_key.php'); + require_once('notary.inc.php'); loadem("account"); diff --git a/pages/gpg/0.php b/pages/gpg/0.php index c513793..60b1784 100644 --- a/pages/gpg/0.php +++ b/pages/gpg/0.php @@ -19,8 +19,6 @@ ?> <p><?=_("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p> <form method="post" action="gpg.php"> -<p><?=_("Optional comment, only used in the certifictate overview")?><br /> - <input type="text" name="description" maxlength="80" size=80 /></p> <textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br /> <p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br /> <?=_("Please Note: You need to accept the CCA to proceed.")?></p> diff --git a/www/gpg.php b/www/gpg.php index d0ba432..267fabd 100644 --- a/www/gpg.php +++ b/www/gpg.php @@ -286,13 +286,6 @@ function verifyEmail($email) { write_user_agreement(intval($_SESSION['profile']['id']), "CCA", "certificate creation", "", 1); - //set variable for comment - if(trim($_REQUEST['description']) == ""){ - $description= ""; - }else{ - $description= trim(mysql_real_escape_string(stripslashes($_REQUEST['description']))); - } - $query = "insert into `gpg` set `memid`='".intval($_SESSION['profile']['id'])."', `email`='".mysql_real_escape_string($lastvalidemail)."', `level`='1', |