CAcert Code Development list.

[Benny Baumann <benbe AT cacert.org>]

Am 24.04.2013 15:36, schrieb Wytze van der Raay:
> Op 24-4-2013 15:21, Wytze van der Raay schreef:
>> Op 16-4-2013 19:07, Michael Tänzer schreef:
>>> We have a fix for https://bugs.cacert.org/view.php?id=1112
>>> "Exchange the text on the TTP page according to the new TTP programm"
>>>
>>> The fix was reviewed by Benny Baumann (BenBE) and me (NEOatNHNG) and
>>> tested by Werner Dworak, 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/wot.inc.php
>>> /pages/wot/4.php
>>> /www/wot.php
>> The fix has been installed on the production server on April 24, 2013.
>> See also the attached log message. The requested translation server
>> updates have also been performed.
> It turns out that I've inadvertently included a change to the file
> includes/mysql.php.sample with this commit as well:
Could you open those as a set of new tickets for proper incorperation
into the source upstream?

If you can attach GIT-compatible patch files to those tickets that would
be great.
>> RCS file: /var/lib/cvs/cacert/includes/mysql.php.sample,v
>> retrieving revision 1.14
>> retrieving revision 1.15
>> diff -u -r1.14 -r1.15
>> --- mysql.php.sample 2012/10/13 13:53:53     1.14
>> +++ mysql.php.sample 2013/04/24 13:13:06     1.15
>> @@ -64,7 +64,8 @@
>>              fputs($smtp, "DATA\r\n");
>>              $InputBuffer = fgets($smtp, 1024);
>>              fputs($smtp, "X-Mailer: CAcert.org Website\r\n");
>> -            fputs($smtp, "X-OriginatingIP: 
>> ".$_SERVER["REMOTE_ADDR"]."\r\n");
>> +            if (array_key_exists("REMOTE_ADDR", $_SERVER))
>> +                    fputs($smtp, "X-OriginatingIP: 
>> ".$_SERVER["REMOTE_ADDR"]."\r\n");
>>              fputs($smtp, "Sender: $errorsto\r\n");
>>              fputs($smtp, "Errors-To: $errorsto\r\n");
>>              if($replyto != "")
> While this is not part of the bug fix you've submitted, I would strongly
> suggest to keep this in. We DO need this patch to avoid lots of
> undesirable error messages on the server when running the CAcert cron
> warning.php script, and I had tentatively added it to the server for
> later submission. It's one of the many issues with obsolete or bad php5
> coding in the existing CAcert application which do not work well with
> more recent php5 releases.
Patch seems legit, but more on an proper ticket on bugs.cacert.org.
> Regards,
> -- wytze
>
Regards,
BenBE.

Attachment: smime.p7s
Description: S/MIME Kryptografische Unterschrift