summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-07-14 22:23:52 +0200
committerBenny Baumann <BenBE@geshi.org>2013-07-14 22:35:10 +0200
commit75693292de2d907bf2a4b0f12abd7cd68781f95a (patch)
tree918d60a3ffdf5da339aa53ea3556b2bae252d2a2
parent5ce73fd94b81c9444164815236e9d545635d7fda (diff)
downloadcacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.tar.gz
cacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.tar.xz
cacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.zip
bug 1123: fixed merge conflicts on testserver
-rw-r--r--includes/account.php5
-rw-r--r--pages/gpg/0.php2
-rw-r--r--www/gpg.php7
3 files changed, 12 insertions, 2 deletions
diff --git a/includes/account.php b/includes/account.php
index aecbd36..709cfa6 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -17,8 +17,9 @@
*/
require_once("../includes/loggedin.php");
require_once("../includes/lib/l10n.php");
- require_once('lib/check_weak_key.php');
- require_once('notary.inc.php');
+ require_once("../includes/lib/check_weak_key.php");
+ require_once("../includes/temp_functions.php");
+ require_once("../includes/notary.inc.php");
loadem("account");
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index 60b1784..c513793 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,6 +19,8 @@
?>
<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 267fabd..d0ba432 100644
--- a/www/gpg.php
+++ b/www/gpg.php
@@ -286,6 +286,13 @@ 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',