Skip to Content.
Sympa Menu

cacert-devel - Re: Patch request: Bug #1195

Subject: CAcert Code Development list.

List archive

Re: Patch request: Bug #1195


Chronological Thread 
  • From: Wytze van der Raay <wytze AT cacert.org>
  • To: Michael Tänzer <michael.taenzer AT cacert.org>
  • Cc: "critical-admin AT cacert.org" <critical-admin AT cacert.org>, cacert-devel AT lists.cacert.org, Benny Baumann <benbe AT cacert.org>, Marcus Mängel <inopiae AT cacert.org>, Eva Stöwe <eva.stoewe AT cacert.org>, Martin Gummi <martin.gummi AT cacert.org>
  • Subject: Re: Patch request: Bug #1195
  • Date: Wed, 15 Jan 2014 16:53:26 +0100
  • Organization: CAcert

Hi Michael,

On 15.01.2014 00:57, Michael Tänzer wrote:
> We have a fix for https://bugs.cacert.org/view.php?id=1195
> "Take out change ability on pages/account/6.php"
>
> The fix was reviewed by Benny Baumann (BenBE) and me (NEOatNHNG) and
> tested by Eva Stöwe (Eva), Martin Gummi and Marcus Mängel (INOPIAE).
>
> Diff is attached. Please also run the locale makefile so that our
> translators see the new strings (if present) on
> https://translations.cacert.org and new translations get imported into
> the system.
>
> Changed files:
> /includes/account.php
> /pages/account/5.php
> /pages/account/6.php

The patch has been installed on the production server on January 15, 2014.
See also the attached log message.

Regards,
-- wytze

--- Begin Message ---
  • From: Wytze van der Raay <wytze AT cacert.org>
  • To: cacert-systemlog AT lists.cacert.org
  • Subject: Fwd: cvs.cacert.org checkin notification
  • Date: Wed, 15 Jan 2014 16:51:22 +0100
  • Organization: CAcert
Fix for https://bugs.cacert.org/view.php?id=1195
"Take out change ability on pages/account/6.php"

In conjunction with the attached CVS changes a new tarball has been
made available incorporating all updates. The new tarball is available
through http://www.cacert.org/src-lic.php

-- end
--- Begin Message ---
  • From: "root" <root AT cvs.cacert.org>
  • To: critical-admin AT cacert.org
  • Subject: cvs.cacert.org checkin notification
  • Date: Wed, 15 Jan 2014 16:50:37 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
account.php 1.169 1.170
Wed Jan 15 16:50:37 CET 2014
Update of /var/lib/cvs/cacert/includes
In directory webdb:/home/cacert/www/includes

Modified Files:
account.php
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1195
"Take out change ability on pages/account/6.php"

===================================================================
RCS file: /var/lib/cvs/cacert/includes/account.php,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- account.php 2014/01/15 15:40:46 1.169
+++ account.php 2014/01/15 15:50:37 1.170
@@ -1189,24 +1189,6 @@
exit;
}

-
- if($oldid == 6 && $_REQUEST['certid'] != "")
- {
- if(trim($_REQUEST['description']) != ""){
- $description=
trim(mysql_real_escape_string(stripslashes($_REQUEST['description'])));
- }else{
- $description= "";
- }
-
- if(trim($_REQUEST['disablelogin']) == "1"){
- $disablelogin = 1;
- }else{
- $disablelogin = 0;
- }
-
- mysql_query("update `emailcerts` set
`disablelogin`='$disablelogin', `description`='$description' where
`id`='".$_REQUEST['certid']."' and `memid`='".$_SESSION['profile']['id']."'");
- }
-
if($oldid == 13 && $process != "" && $showdetails!="")
{
csrf_check("perschange");

--- End Message ---
--- Begin Message ---
  • From: "root" <root AT cvs.cacert.org>
  • To: critical-admin AT cacert.org
  • Subject: cvs.cacert.org checkin notification
  • Date: Wed, 15 Jan 2014 16:50:40 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
5.php 1.24 1.25 6.php 1.12 1.13
Wed Jan 15 16:50:40 CET 2014
Update of /var/lib/cvs/cacert/pages/account
In directory webdb:/home/cacert/www/pages/account

Modified Files:
5.php 6.php
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1195
"Take out change ability on pages/account/6.php"

===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/6.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- 6.php 2013/08/29 10:03:50 1.12
+++ 6.php 2014/01/15 15:50:40 1.13
@@ -115,7 +115,6 @@
echo "<pre>$cert</pre>";

?>
-<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0"
cellpadding="0" class="wrapper">
<tr>
<td colspan="2" class="title"><?=_("Information about the
certificate")?></td>
@@ -133,16 +132,6 @@
$row['revoke'] = _("Not Revoked");
?>
<tr>
- <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-<? if($verified != _("Pending") && $verified != _("Revoked")) { ?>
- <td class="DataTD"><input type="checkbox"
name="revokeid[<?=$row['id']?>]" ></td>
-<? } else if($verified != _("Revoked")) { ?>
- <td class="DataTD"><input type="checkbox"
name="delid[<?=$row['id']?>]"></td>
-<? } else { ?>
- <td class="DataTD">&nbsp;</td>
-<? } ?>
- </tr>
- <tr>
<td class="DataTD"><?=_("Status")?></td>
<td class="DataTD"><?=$verified?></td>
</tr>
@@ -165,21 +154,14 @@
<tr>
<td class="DataTD"><?=_("Login")?></td>
<td class="DataTD">
- <input type="checkbox" name="disablelogin" value="1"
<?=$row['disablelogin']?"":"checked='checked'"?>/>
+ <input type="checkbox" name="disablelogin"
disabled="disabled" value="1"
<?=$row['disablelogin']?"":"checked='checked'"?>/>
</td>
</tr>
<tr>
<td class="DataTD"><?=_("Comment")?></td>
- <td class="DataTD"><input type="text" name="description"
maxlength="100" size=100
value="<?=htmlspecialchars($row['description'])?>"></td>
- </tr>
- <tr>
- <td class="DataTD" colspan="2"><input type="submit"
name="change" value="<?=_("Change settings")?>"> </td>
+ <td
class="DataTD"><?=htmlspecialchars($row['description'])?></td>
</tr>
</table>
-<input type="hidden" name="oldid" value="6">
-<input type="hidden" name="certid" value="<?=$certid?>">
-</form>
-
<?
showfooter();
exit;
===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/5.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- 5.php 2013/10/23 19:03:34 1.24
+++ 5.php 2014/01/15 15:50:40 1.25
@@ -91,7 +91,7 @@
<td class="DataTD"><?=$row['revoke']?></td>
<td class="DataTD"><?=$row['expires']?></td>
<td class="DataTD">
- <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1"
<?=$row['disablelogin']?"":"checked='checked'"?>/>
+ <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"><input name="comment_<?=$row['id']?>" type="text"
value="<?=htmlspecialchars($row['description'])?>" /></td>

--- End Message ---

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature


--- End Message ---

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature




Archive powered by MHonArc 2.6.18.

Top of Page