CAcert Code Development list.

[Wytze van der Raay <wytze AT cacert.org>]

Hi Michael,

Op 25-7-2012 2:23, Michael Tänzer schreef:
> We have a fix for https://bugs.cacert.org/view.php?id=789
> "Editing domain for organisations does not work"
> 
> The fix was reviewed by Dirk Astrath (dastrath) and me (NEOatNHNG) and
> tested by Ulrich Schröter (Uli60), Marcus Mängel (INOPIAE) and JensK.
> 
> 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/29.php
> pages/account/30.php

The patch has been applied to the production server on July 25, 2012.
See also the attached log message. The translations have been updated
in both directions.

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, 25 Jul 2012 17:19:32 +0200
• Organization: CAcert

Fix for https://bugs.cacert.org/view.php?id=789
Editing domain for organisations does not work.

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, 25 Jul 2012 17:16:42 +0200 (CEST)

uid=0(root) gid=0(root) groups=0(root)
account.php 1.156 1.157
Wed Jul 25 17:16:42 CEST 2012
Update of /var/lib/cvs/cacert/includes
In directory hlin:/home/cacert/www/includes

Modified Files:
        account.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=789
Editing domain for organisations does not work.

===================================================================
RCS file: /var/lib/cvs/cacert/includes/account.php,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- account.php 2012/07/04 09:00:17     1.156
+++ account.php 2012/07/25 15:16:41     1.157
@@ -2145,9 +2145,9 @@
 
        if($oldid == 29 && $process != "")
        {
-               $domain = 
mysql_real_escape_string(stripslashes(trim($domainname)));
+               $domain = 
mysql_real_escape_string(stripslashes(trim($_REQUEST['domainname'])));
 
-               $res1 = mysql_query("select * from `orgdomains` where 
`domain` like '$domain' and 
`id`!='".intval($_SESSION['_config']['domid'])."'");
+               $res1 = mysql_query("select * from `orgdomains` where 
`domain` like '$domain' and `id`!='".intval($domid)."'");
                $res2 = mysql_query("select * from `domains` where `domain` 
like '$domain' and `deleted`=0");
                if(mysql_num_rows($res1) > 0 || mysql_num_rows($res2) > 0)
                {
@@ -2157,12 +2157,12 @@
                }
        }
 
-       if(($oldid == 29 || $oldid == 30) && $process != _("Cancel"))
+       if(($oldid == 29 || $oldid == 30) && $process != "")      // 
_("Cancel") is handled in front of account.php
        {
                $query = "select `orgdomaincerts`.`id` as `id` from 
`orgdomlink`, `orgdomaincerts`, `orgdomains` where 
                                `orgdomlink`.`orgdomid`=`orgdomains`.`id` and
                                
`orgdomaincerts`.`id`=`orgdomlink`.`orgcertid` and
-                               
`orgdomains`.`id`='".intval($_SESSION['_config']['domid'])."'";
+                               `orgdomains`.`id`='".intval($domid)."'";
                $res = mysql_query($query);
                while($row = mysql_fetch_assoc($res))
                        mysql_query("update `orgdomaincerts` set 
`revoked`='1970-01-01 10:00:01' where `id`='".$row['id']."'");
@@ -2170,7 +2170,7 @@
                $query = "select `orgemailcerts`.`id` as `id` from 
`orgemailcerts`, `orgemaillink`, `orgdomains` where 
                                `orgemaillink`.`domid`=`orgdomains`.`id` and
                                
`orgemailcerts`.`id`=`orgemaillink`.`emailcertsid` and
-                               
`orgdomains`.`id`='".intval($_SESSION['_config']['domid'])."'";
+                               `orgdomains`.`id`='".intval($domid)."'";
                $res = mysql_query($query);
                while($row = mysql_fetch_assoc($res))
                        mysql_query("update `orgemailcerts` set 
`revoked`='1970-01-01 10:00:01' where `id`='".intval($row['id'])."'");
@@ -2178,23 +2178,23 @@
 
        if($oldid == 29 && $process != "")
        {
-               $row = mysql_fetch_assoc(mysql_query("select * from 
`orgdomains` where `id`='".intval($_SESSION['_config']['domid'])."'"));
-               mysql_query("update `orgdomains` set `domain`='$domain' where 
`id`='".intval($_SESSION['_config']['domid'])."'");
+               $row = mysql_fetch_assoc(mysql_query("select * from 
`orgdomains` where `id`='".intval($domid)."'"));
+               mysql_query("update `orgdomains` set `domain`='$domain' where 
`id`='".intval($domid)."'");
                showheader(_("My CAcert.org Account!"));
                printf(_("'%s' has just been successfully updated in the 
database."), sanitizeHTML($domain));
-               echo "<br><br><a 
href='account.php?id=26&orgid=".intval($_SESSION['_config']['orgid'])."'>"._("Click
 here")."</a> "._("to continue.");
+               echo "<br><br><a 
href='account.php?id=26&orgid=".intval($orgid)."'>"._("Click here")."</a> 
"._("to continue.");
                showfooter();
                exit;
        }
 
        if($oldid == 30 && $process != "")
        {
-               $row = mysql_fetch_assoc(mysql_query("select * from 
`orgdomains` where `id`='".intval($_SESSION['_config']['domid'])."'"));
+               $row = mysql_fetch_assoc(mysql_query("select * from 
`orgdomains` where `id`='".intval($domid)."'"));
                $domain = $row['domain'];
-               mysql_query("delete from `orgdomains` where 
`id`='".intval($_SESSION['_config']['domid'])."'");
+               mysql_query("delete from `orgdomains` where 
`id`='".intval($domid)."'");
                showheader(_("My CAcert.org Account!"));
                printf(_("'%s' has just been successfully deleted from the 
database."), sanitizeHTML($domain));
-               echo "<br><br><a 
href='account.php?id=26&orgid=".intval($_SESSION['_config']['orgid'])."'>"._("Click
 here")."</a> "._("to continue.");
+               echo "<br><br><a 
href='account.php?id=26&orgid=".intval($orgid)."'>"._("Click here")."</a> 
"._("to continue.");
                showfooter();
                exit;
        }
@@ -2980,6 +2980,4 @@
                $_SESSION['_config']['orgid'] = intval($orgid);
        if(intval($memid) > 0)
                $_SESSION['_config']['memid'] = intval($memid);
-       if(intval($domid) > 0)
-               $_SESSION['_config']['domid'] = intval($domid);
 ?>

--- 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, 25 Jul 2012 17:16:46 +0200 (CEST)

uid=0(root) gid=0(root) groups=0(root)
29.php 1.5 1.6 30.php 1.7 1.8
Wed Jul 25 17:16:46 CEST 2012
Update of /var/lib/cvs/cacert/pages/account
In directory hlin:/home/cacert/www/pages/account

Modified Files:
        29.php 30.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=789
Editing domain for organisations does not work.

===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/30.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 30.php      2011/10/21 20:01:45     1.7
+++ 30.php      2012/07/25 15:16:46     1.8
@@ -41,5 +41,6 @@
 <input type="hidden" name="oldid" value="<?=intval($id)?>">
 <input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
 <input type="hidden" name="domain" value="<?=sanitizeHTML($row['domain'])?>">
+<input type="hidden" name="domid" value="<?=intval($_REQUEST['domid'])?>">
 
 </form>
===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/29.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 29.php      2008/09/03 18:36:16     1.5
+++ 29.php      2012/07/25 15:16:46     1.6
@@ -35,10 +35,12 @@
     <td class="DataTD"><input type="text" name="domainname" 
value="<?=sanitizeHTML($_SESSION['_config']['domain'])?>"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" 
value="<?=_("Update")?>"></td>
+    <td class="DataTD"><input type="submit" name="cancel" 
value="<?=_("Cancel")?>"></td>
+    <td class="DataTD"><input type="submit" name="process" 
value="<?=_("Update")?>"></td>
   </tr>
 </table>
 <input type="hidden" name="oldid" value="<?=intval($id)?>">
 <input type="hidden" name="orgid" value="<?=intval($_REQUEST['orgid'])?>">
+<input type="hidden" name="domid" value="<?=intval($_REQUEST['domid'])?>">
 
 </form>

--- End Message ---

Attachment: smime.p7s
Description: S/MIME-cryptografische ondertekening

--- End Message ---

Attachment: smime.p7s
Description: S/MIME-cryptografische ondertekening