summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2012-11-21 00:43:32 +0100
committerBenny Baumann <BenBE@geshi.org>2012-11-21 00:43:32 +0100
commit3a2d96a45c2b7d9c7719e32216241b1794fb484b (patch)
tree21b011a5daf50a78515025cc984af51aab84b390
parentb651c0020dffd9bdd6b97154e4bc2b61883275ec (diff)
parent7fb567534aa04c1b5883a133ca039c9d54557d74 (diff)
downloadcacert-devel-3a2d96a45c2b7d9c7719e32216241b1794fb484b.tar.gz
cacert-devel-3a2d96a45c2b7d9c7719e32216241b1794fb484b.tar.xz
cacert-devel-3a2d96a45c2b7d9c7719e32216241b1794fb484b.zip
Merge branch 'bug-782' into testserver
-rw-r--r--includes/account.php14
-rw-r--r--pages/account/5.php4
2 files changed, 9 insertions, 9 deletions
diff --git a/includes/account.php b/includes/account.php
index ec03c9f..280f122 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -410,7 +410,7 @@ function buildSubject() {
`codesign`='".intval($_SESSION['_config']['codesign'])."',
`disablelogin`='".($_SESSION['_config']['disablelogin']?1:0)."',
`rootcert`='".intval($_SESSION['_config']['rootcert'])."',
- `description`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_SESSION['_config']['description']."'";
mysql_query($query);
$emailid = mysql_insert_id();
if(is_array($addys))
@@ -511,7 +511,7 @@ function buildSubject() {
`codesign`='".$_SESSION['_config']['codesign']."',
`disablelogin`='".($_SESSION['_config']['disablelogin']?1:0)."',
`rootcert`='".$_SESSION['_config']['rootcert']."',
- `description`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_SESSION['_config']['description']."'";
mysql_query($query);
$emailid = mysql_insert_id();
if(is_array($addys))
@@ -824,14 +824,14 @@ function buildSubject() {
`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`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_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`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_SESSION['_config']['description']."'";
} else {
showheader(_("My CAcert.org Account!"));
echo _("Domain not verified.");
@@ -1532,7 +1532,7 @@ echo "points2 (".$_SESSION['profile']['xpoints']."/".$_SESSION['profile']['point
`created`=FROM_UNIXTIME(UNIX_TIMESTAMP()),
`codesign`='".$_SESSION['_config']['codesign']."',
`rootcert`='".$_SESSION['_config']['rootcert']."',
- `description`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_SESSION['_config']['description']."'";
mysql_query($query);
$emailid = mysql_insert_id();
@@ -1623,7 +1623,7 @@ echo "points2 (".$_SESSION['profile']['xpoints']."/".$_SESSION['profile']['point
`subject`='$csrsubject',
`codesign`='".$_SESSION['_config']['codesign']."',
`rootcert`='".$_SESSION['_config']['rootcert']."',
- `description`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_SESSION['_config']['description']."'";
mysql_query($query);
$emailid = mysql_insert_id();
@@ -1937,7 +1937,7 @@ echo "points2 (".$_SESSION['profile']['xpoints']."/".$_SESSION['profile']['point
`subject`='$csrsubject',
`rootcert`='".$_SESSION['_config']['rootcert']."',
`type`='$type',
- `description`='".intval($_SESSION['_config']['description'])."'";
+ `description`='".$_SESSION['_config']['description']."'";
}
mysql_query($query);
$CSRid = mysql_insert_id();
diff --git a/pages/account/5.php b/pages/account/5.php
index 52266ec..b10dd75 100644
--- a/pages/account/5.php
+++ b/pages/account/5.php
@@ -94,7 +94,7 @@
<input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
<input type="hidden" name="cert_<?=$row['id']?>" value="1"/>
</td>
- <td class="DataTD"><textarea name="description[]" cols="80" rows="5"></textarea><?=$row['description']?></textarea></td>
+ <td class="DataTD"><textarea name="description_<?=$row['id']?>" cols="50" rows="2"><?=htmspecialchars($row['description'])?></textarea></td>
<td class="DataTD">
<input type="submit" name="descriptionsave_<?=$row['id']?>" value="<?=_("Save comment")?>">
</td>
@@ -116,7 +116,7 @@
<td class="DataTD" colspan="5"><input type="submit" name="renew" value="<?=_("Renew")?>">&#160;&#160;&#160;&#160;
<input type="submit" name="revoke" value="<?=_("Revoke/Delete")?>"></td>
- <td class="DataTD" colspan="3"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
+ <td class="DataTD" colspan="4"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
</tr>
<? } ?>