[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Sat, 12 Jan 2013 17:05:31 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=329106
Log:
Gwynne doesn't need to get every commit email anymore.
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2013-01-12 14:29:26 UTC (rev 329105)
+++ SVNROOT/commit-email.php2013-01-12 17:05:31 UTC (rev 329106)
@@ -109,7 +109,7 @@
'|^SVNROOT|' = array('php-cvs@lists.php.net'),
);
$fallback_addresses = array('php-cvs@lists.php.net');
-$always_addresses = array('gwy...@php.net', 'ping+twvhw...@cia.vc');
+$always_addresses = array('ping+twvhw...@cia.vc');
//
-
// Build list of e-mail addresses and parent changed path
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
bjoriFri, 01 Jul 2011 07:27:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312752
Log:
Checkout felipes idea on fixing mails when committing to /systems/
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2011-07-01 06:54:56 UTC (rev 312751)
+++ SVNROOT/commit-email.php2011-07-01 07:27:04 UTC (rev 312752)
@@ -134,6 +134,9 @@
$emails_to = $fallback_addresses;
}
$emails_to = array_unique($emails_to);
+if (count($emails_to) == 1 $emails_to[0] == syst...@php.net) {
+$envelope_sender = bounce-no-u...@php.net;
+}
//
-
// Process diffs
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Tue, 28 Jun 2011 06:12:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312547
Log:
Added the cia.vc service using a simple email hook
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2011-06-28 05:42:04 UTC (rev 312546)
+++ SVNROOT/commit-email.php2011-06-28 06:12:33 UTC (rev 312547)
@@ -109,7 +109,7 @@
'|^SVNROOT|' = array('php-cvs@lists.php.net'),
);
$fallback_addresses = array('php-cvs@lists.php.net');
-$always_addresses = array('gwy...@php.net');
+$always_addresses = array('gwy...@php.net', 'ping+twvhw...@cia.vc');
//
-
// Build list of e-mail addresses and parent changed path
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Thu, 23 Jun 2011 15:02:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=312407
Log:
removed jani from default php-bugs commits
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2011-06-23 15:00:00 UTC (rev 312406)
+++ SVNROOT/commit-email.php2011-06-23 15:02:41 UTC (rev 312407)
@@ -25,7 +25,7 @@
'|^web/bugtracker|' = array('php-webmas...@lists.php.net'),
'|^web/presentations|' = array('p...@lists.php.net'),
'|^web/pres2|' = array('p...@lists.php.net'),
-'|^web/php-bugs|' = array('php-webmas...@lists.php.net', 'j...@php.net'),
+'|^web/php-bugs|' = array('php-webmas...@lists.php.net'),
'|^web/php|' = array('php-webmas...@lists.php.net'),
'|^web/pecl|' = array('pecl-...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Mon, 21 Mar 2011 17:59:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=309502
Log:
Added the Serbian translation for the PHP Docs
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2011-03-21 17:53:26 UTC (rev 309501)
+++ SVNROOT/commit-email.php2011-03-21 17:59:54 UTC (rev 309502)
@@ -66,6 +66,7 @@
'|^phpdoc/ru|' = array('doc...@lists.php.net'),
'|^phpdoc/sk|' = array('doc...@lists.php.net'),
'|^phpdoc/sl|' = array('doc...@lists.php.net'),
+ '|^phpdoc/sr|' = array('doc...@lists.php.net'),
'|^phpdoc/sv|' = array('doc...@lists.php.net'),
'|^phpdoc/tr|' = array('doc...@lists.php.net'),
'|^phpdoc/tw|' = array('doc...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Wed, 17 Nov 2010 03:09:56 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=305433
Log:
Added new (temp and future) php-gtk documentation locations
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2010-11-17 02:53:29 UTC (rev 305432)
+++ SVNROOT/commit-email.php2010-11-17 03:09:56 UTC (rev 305433)
@@ -15,6 +15,9 @@
// GTK
'|^gtk/php-gtk-web|' = array('gtk-webmas...@php.net'),
'|^gtk/php-gtk-doc|' = array('php-gtk-...@lists.php.net'),
+'|^phpdoc/doc-base/branches/gtk-docgen|' =
array('php-gtk-...@lists.php.net'),
+'|^phpdoc/en/branches/php-gtk|' = array('php-gtk-...@lists.php.net'),
+'|^phpdoc/en/trunk/reference/php-gtk|' =
array('php-gtk-...@lists.php.net'),
'|^gtk/php-gtk|' = array('php-gtk-...@lists.php.net'),
'|^gtk|' = array('php-gtk-...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Tue, 09 Mar 2010 16:43:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295999
Log:
Change order, as checks are top to bottom
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2010-03-09 16:41:55 UTC (rev 295998)
+++ SVNROOT/commit-email.php2010-03-09 16:43:19 UTC (rev 295999)
@@ -22,8 +22,8 @@
'|^web/bugtracker|' = array('php-webmas...@lists.php.net'),
'|^web/presentations|' = array('p...@lists.php.net'),
'|^web/pres2|' = array('p...@lists.php.net'),
+'|^web/php-bugs|' = array('php-webmas...@lists.php.net', 'j...@php.net'),
'|^web/php|' = array('php-webmas...@lists.php.net'),
-'|^web/php-bugs|' = array('php-webmas...@lists.php.net', 'j...@php.net'),
'|^web/pecl|' = array('pecl-...@lists.php.net'),
// Zend/TSRM
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Sun, 07 Mar 2010 18:01:59 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=295936
Log:
bugtracker to php-bugs cleanup
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2010-03-07 17:59:23 UTC (rev 295935)
+++ SVNROOT/commit-email.php2010-03-07 18:01:59 UTC (rev 295936)
@@ -23,6 +23,7 @@
'|^web/presentations|' = array('p...@lists.php.net'),
'|^web/pres2|' = array('p...@lists.php.net'),
'|^web/php|' = array('php-webmas...@lists.php.net'),
+'|^web/php-bugs|' = array('php-webmas...@lists.php.net', 'j...@php.net'),
'|^web/pecl|' = array('pecl-...@lists.php.net'),
// Zend/TSRM
@@ -77,7 +78,6 @@
'|^pear/pearweb|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
'|^pear/peardoc|' = array('pear-...@lists.php.net'),
'|^pear/pear-core|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
-'|^pear/packages/Bugtracker|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net', 'j...@php.net'),
'|^pear/packages/installphars|' = array('pear-c...@lists.php.net'),
'|^pear/packages|' = array('pear-...@lists.php.net'),
'|^pear/ci|' = array('pear-...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Wed, 02 Dec 2009 13:56:50 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291593
Log:
Limit subject to 500 instead of 900. Quick hack that should guarantee correct
encoding in all non-pathological cases.
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-12-02 13:44:32 UTC (rev 291592)
+++ SVNROOT/commit-email.php2009-12-02 13:56:50 UTC (rev 291593)
@@ -166,13 +166,13 @@
function utf8_safe_header($header_value)
{
// As per experience and
http://www.php.net/manual/en/function.imap-8bit.php#75081
-// 1 - Limit string to 900 chars, giving some slop for the replacements
and extensions
+// 1 - Limit string to 500 chars, giving a really huge slop for the
replacements and extensions
// 2 - imap_8bit() the string
// 3 - Replace =\r\n with nothing, _ with =5F, and ? with =3F
// 6 - Replace space with _
// 7 - Surround with =?utf-8?q??=
return '=?utf-8?q?' . str_replace(' ', '_', str_replace(array('_',
=\r\n, '?'), array('=5F', '', '=3F'),
-imap_8bit(substr($header_value, 0, 900 . '?=';
+imap_8bit(substr($header_value, 0, 500 . '?=';
}
//
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php global_avail
philip Mon, 30 Nov 2009 18:41:06 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291516
Log:
Doc karma for Satoru Yoshida (satoruyoshida)
Changed paths:
U SVNROOT/commit-email.php
U SVNROOT/global_avail
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php 2009-11-30 18:03:21 UTC (rev 291515)
+++ SVNROOT/commit-email.php 2009-11-30 18:41:06 UTC (rev 291516)
@@ -172,6 +172,10 @@
$readable_path_list = . implode(PHP_EOL . , $commit_info['raw_changed_paths']);
$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) - strlen($email_date)));
+if ((strlen($readable_path_list) + $diffs_length) 25) {
+$readable_path_list = 'changed paths exceeded maximum size';
+}
+
$msg_body = MIMEBODY
From: {$fullname} {$commit_info['author']...@php.net
To: {$email_list}
Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail 2009-11-30 18:03:21 UTC (rev 291515)
+++ SVNROOT/global_avail 2009-11-30 18:41:06 UTC (rev 291516)
@@ -47,7 +47,7 @@
# The PHP Documentation Group maintains the documentation and its
# translations.
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Mon, 30 Nov 2009 19:24:54 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291518
Log:
- This deals with an accidental commit I made 30 minutes ago (thanks to Pierre
for spotting this)
- This check ensures the commit mail size doesn't exceed our mailing list
maximum
- A check for diff size already exists, while this now also checks path size
(so when a ton of files are touched)
- Updated code to use 262144, like the diff check does, as an excuse to make
this commit
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-11-30 19:13:50 UTC (rev 291517)
+++ SVNROOT/commit-email.php2009-11-30 19:24:54 UTC (rev 291518)
@@ -172,7 +172,8 @@
$readable_path_list = . implode(PHP_EOL . ,
$commit_info['raw_changed_paths']);
$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) -
strlen($email_date)));
-if ((strlen($readable_path_list) + $diffs_length) 25) {
+// Help ensure all commits make it to the mailing lists, which have size
restrictions
+if ((strlen($readable_path_list) + $diffs_length) 262144) {
$readable_path_list = 'changed paths exceeded maximum size';
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 01 Dec 2009 04:29:13 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=291534
Log:
1) sanitize Subject and From headers more thorughly, 2) calculate large email
sizes more correctly
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-12-01 02:05:28 UTC (rev 291533)
+++ SVNROOT/commit-email.php2009-12-01 04:29:13 UTC (rev 291534)
@@ -162,18 +162,37 @@
}
//
-
+// Safely utf-8-ize an email header with the short version of quoted-printable
+function utf8_safe_header($header_value)
+{
+// As per experience and
http://www.php.net/manual/en/function.imap-8bit.php#75081
+// 1 - Limit string to 900 chars, giving some slop for the replacements
and extensions
+// 2 - imap_8bit() the string
+// 3 - Replace =\r\n with nothing, _ with =5F, and ? with =3F
+// 6 - Replace space with _
+// 7 - Surround with =?utf-8?q??=
+return '=?utf-8?q?' . str_replace(' ', '_', str_replace(array('_',
=\r\n, '?'), array('=5F', '', '=3F'),
+imap_8bit(substr($header_value, 0, 900 . '?=';
+}
+
+//
-
// Build e-mail
$boundary = sha1({$commit_info['author']}{$commit_info['date']});
$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
-$subject = substr(svn: {$paths_list}, 0, 970); // Max SMTP line length =
998. Some slop in this value.
+$subject = utf8_safe_header(svn: {$paths_list});
$email_date = date(DATE_RFC2822, $commit_info['date']);
-$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
+$fullname = utf8_safe_header($commit_info['author_name']);
$email_list = implode(', ', $emails_to);
$readable_path_list = . implode(PHP_EOL . ,
$commit_info['raw_changed_paths']);
$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) -
strlen($email_date)));
-// Help ensure all commits make it to the mailing lists, which have size
restrictions
-if ((strlen($readable_path_list) + $diffs_length) 262144) {
+// Help ensure all commits make it to the mailing lists, which have size
restrictions.
+// Add the path list length to: 1) the diff string length (which will be zero
if diffs ARE attached), and
+// 2) the diff data length (which will be zero if diffs are NOT attached).
+// If the total is larger than 256K, don't include the path list. If it still
goes over the limit even after that,
+// the email is gonna be too big to send no matter what we do.
+$diff_data = $diffs_string === NULL ?
wordwrap(base64_encode($commit_info['diffs']), 80, PHP_EOL, TRUE) : '';
+if ((strlen($readable_path_list) + strlen($diffs_string) + strlen($diff_data))
262144) {
$readable_path_list = 'changed paths exceeded maximum size';
}
@@ -205,7 +224,6 @@
MIMEBODY;
if ($diffs_string === NULL) {
-$diff_data = wordwrap(base64_encode($commit_info['diffs']), 80, PHP_EOL,
TRUE);
$msg_body .= MIMEBODY
Content-Type: text/x-diff; charset=utf-8
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 25 Aug 2009 11:00:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287681
Log:
go back to noreply@, if nothing else it's more correct and seems to mostly work
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-25 10:39:45 UTC (rev 287680)
+++ SVNROOT/commit-email.php2009-08-25 11:00:07 UTC (rev 287681)
@@ -7,7 +7,7 @@
// Constants
$smtp_server = '127.0.0.1';
-$envelope_sender = 'this-will-bou...@php.net'; // 'nore...@php.net';
+$envelope_sender = 'nore...@php.net';
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 18 Aug 2009 07:38:47 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287438
Log:
Jani is now CC'd on bugtracker commits, per Jani's request
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-18 05:37:08 UTC (rev 287437)
+++ SVNROOT/commit-email.php2009-08-18 07:38:47 UTC (rev 287438)
@@ -76,6 +76,7 @@
'|^pear/pearweb|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
'|^pear/peardoc|' = array('pear-...@lists.php.net'),
'|^pear/pear-core|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
+'|^pear/packages/Bugtracker|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net', 'j...@php.net'),
'|^pear/packages/installphars|' = array('pear-c...@lists.php.net'),
'|^pear/packages|' = array('pear-...@lists.php.net'),
'|^pear/ci|' = array('pear-...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 18 Aug 2009 07:51:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287439
Log:
change commit email envelope sender, per bjori's request
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-18 07:38:47 UTC (rev 287438)
+++ SVNROOT/commit-email.php2009-08-18 07:51:41 UTC (rev 287439)
@@ -7,6 +7,7 @@
// Constants
$smtp_server = '127.0.0.1';
+$envelope_sender = 'nore...@php.net'; // this-will-bou...@php.net
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
@@ -234,7 +235,7 @@
$rcpt_commands = RCPT TO: . implode(\r\nRCPT TO:, $smtp_recipients) .
;
fwrite($socket, SMTP
EHLO localhost\r
-MAIL FROM:this-will-bou...@php.net BODY=8BITMIME\r
+MAIL FROM:{$envelope_sender} BODY=8BITMIME\r
{$rcpt_commands}\r
DATA\r
{$msg_body}\r
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Tue, 18 Aug 2009 10:17:41 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287444
Log:
the envelope sender seems to trigger some particular configuration in the lists
MX; reverting it to its former value for now
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-18 10:12:32 UTC (rev 287443)
+++ SVNROOT/commit-email.php2009-08-18 10:17:41 UTC (rev 287444)
@@ -7,7 +7,7 @@
// Constants
$smtp_server = '127.0.0.1';
-$envelope_sender = 'nore...@php.net'; // this-will-bou...@php.net
+$envelope_sender = 'this-will-bou...@php.net'; // 'nore...@php.net';
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Thu, 13 Aug 2009 07:49:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287205
Log:
pear/ci and pear/pear-mirror shouldn't go to pear-core@, per cweiske's request
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-13 07:38:05 UTC (rev 287204)
+++ SVNROOT/commit-email.php2009-08-13 07:49:49 UTC (rev 287205)
@@ -78,6 +78,8 @@
'|^pear/pear-core|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
'|^pear/packages/installphars|' = array('pear-c...@lists.php.net'),
'|^pear/packages|' = array('pear-...@lists.php.net'),
+'|^pear/ci|' = array('pear-...@lists.php.net'),
+'|^pear/pear-mirror|' = array('pear-...@lists.php.net'),
'|^pear|' = array('pear-...@lists.php.net', 'pear-c...@lists.php.net'),
// PECL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Mon, 10 Aug 2009 19:39:28 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=287054
Log:
Bcc addresses that get copies of all emails; reduces confusion and clutter
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-08-10 19:34:56 UTC (rev 287053)
+++ SVNROOT/commit-email.php2009-08-10 19:39:28 UTC (rev 287054)
@@ -125,7 +125,6 @@
if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
-$emails_to = array_merge($emails_to, $always_addresses);
$emails_to = array_unique($emails_to);
//
-
@@ -228,7 +227,8 @@
fail(Couldn't connect to SMTP server {$smtp_server}. Errno: {$errno}.\n);
}
-$rcpt_commands = RCPT TO: . implode(\r\nRCPT TO:, $emails_to) . ;
+$smtp_recipients = array_unique(array_merge($emails_to, $always_addresses));
+$rcpt_commands = RCPT TO: . implode(\r\nRCPT TO:, $smtp_recipients) .
;
fwrite($socket, SMTP
EHLO localhost\r
MAIL FROM:this-will-bou...@php.net BODY=8BITMIME\r
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Fri, 31 Jul 2009 23:46:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286604
Log:
utf-8 is a charset, not an encoding, as far as RFC2822 is concerned. This
wasn't causing any problems since the charset of the attachment isn't
necessarily used, but it's good to have it correct anyway
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-31 23:44:52 UTC (rev 286603)
+++ SVNROOT/commit-email.php2009-07-31 23:46:19 UTC (rev 286604)
@@ -200,7 +200,7 @@
$diff_data = wordwrap(base64_encode($commit_info['diffs']), 80, PHP_EOL,
TRUE);
$msg_body .= MIMEBODY
-Content-Type: text/x-diff; encoding=utf-8
+Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename=svn-diffs-{$REV}.txt
Content-Transfer-Encoding: base64
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
philip Wed, 29 Jul 2009 17:35:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286527
Log:
web/pecl - pecl-...@lists.php.net
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-29 17:31:25 UTC (rev 286526)
+++ SVNROOT/commit-email.php2009-07-29 17:35:19 UTC (rev 286527)
@@ -22,6 +22,7 @@
'|^web/presentations|' = array('p...@lists.php.net'),
'|^web/pres2|' = array('p...@lists.php.net'),
'|^web/php|' = array('php-webmas...@lists.php.net'),
+'|^web/pecl|' = array('pecl-...@lists.php.net'),
// Zend/TSRM
'|^php/ZendAPI|' = array('zend-engine-...@lists.php.net',
'doc-...@lists.php.net'),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /SVNROOT/ commit-email.php
gwynne Mon, 27 Jul 2009 18:15:14 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286425
Log:
pear_avail commits should go to pear lists, and no need for sending SVNROOT
commits to svn-migration anymore
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-27 17:51:08 UTC (rev 286424)
+++ SVNROOT/commit-email.php2009-07-27 18:15:14 UTC (rev 286425)
@@ -96,7 +96,8 @@
// Internals
'|^systems|' = array('syst...@php.net'),
-'|^SVNROOT|' = array('svn-migrat...@lists.php.net',
'php-cvs@lists.php.net'),
+'|^SVNROOT/pear_avail|' = array('pear-...@lists.php.net',
'pear-c...@lists.php.net'),
+'|^SVNROOT|' = array('php-cvs@lists.php.net'),
);
$fallback_addresses = array('php-cvs@lists.php.net');
$always_addresses = array('gwy...@php.net');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 23 Jul 2009 17:06:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284661
Log:
fix the issue with non-confluent parent paths (multi-project commits)
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-23 17:04:24 UTC (rev 284660)
+++ SVNROOT/commit-email.php2009-07-23 17:06:43 UTC (rev 284661)
@@ -118,7 +118,7 @@
//
-
// Build list of e-mail addresses and parent changed path
$emails_to = array();
-$parent_path = $commit_info['dirs_changed'][0];
+$parent_path = '/' . $commit_info['dirs_changed'][0];
foreach ($commit_info['dirs_changed'] as $changed_path) {
foreach ($commit_email_list as $regex = $email_list) {
@@ -127,12 +127,13 @@
break;
}
}
-if ($changed_path === '/') {
-$parent_path = '';
-} else {
-$parent_path = common_prefix($parent_path, $changed_path);
-}
+$parent_path = common_prefix($parent_path, '/' . ($changed_path === '/' ?
'' : $changed_path));
}
+$parent_path = dirname($parent_path . '~');
+if ($parent_path !== '/') {
+$parent_path .= '/';
+}
+
if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
@@ -162,11 +163,11 @@
//
-
// Process changed paths
-$paths_list = $parent_path === '' ? '/' : $parent_path;
+$paths_list = $parent_path;
foreach ($commit_info['changed_paths'] as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
-$paths_list .= ' ' . substr($changed_path, strlen($parent_path));
+$paths_list .= ' ' . substr($changed_path, strlen($parent_path) - 1);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
On 07/21/2009 09:57 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 I wouldn't trust everything I read on some random README nobody has updated for ages. :D --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
Jani Taskinen wrote: On 07/21/2009 09:57 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 I wouldn't trust everything I read on some random README nobody has updated for ages. :D Then I suggest you guys update it and give us a status report. We aren't mind readers. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
On 07/21/2009 10:13 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/21/2009 09:57 AM, Rasmus Lerdorf wrote: Jani Taskinen wrote: On 07/20/2009 07:16 PM, Rasmus Lerdorf wrote: Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. Define ready ? It's already ready, there's nothing missing in it.. From the README: === Status === - Alpha - Likely implementation date: Q4 2009 I wouldn't trust everything I read on some random README nobody has updated for ages. :D Then I suggest you guys update it and give us a status report. We aren't mind readers. pear2 (?) is gonna try it out first. We'll see if it works there and then convert current bugs.php.net to it. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Tue, 21 Jul 2009 08:43:49 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284472
Log:
whoops, bug links go with the log message
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-21 08:33:19 UTC (rev 284471)
+++ SVNROOT/commit-email.php2009-07-21 08:43:49 UTC (rev 284472)
@@ -192,10 +192,10 @@
\r\n .
Log:\r\n .
{$commit_info['log_message']}\r\n .
+{$bugs_body}\r\n .
\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-{$bugs_body}\r\n .
str_replace(\n, \r\n, $diffs_string);
if ($diffs_string === NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Tue, 21 Jul 2009 11:47:57 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284485
Log:
- fix bjori's newlines once and for all, I hope- a bit more reorganization of
the code- use easier-to-read-and-understand heredocs- allow a slightly longer
subject- give the diff attachment a more useful name- don't use inconsistent
tabbing anymore- a couple extra comments
Changed paths:
U SVNROOT/commit-email.php
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-21 11:36:18 UTC (rev 284484)
+++ SVNROOT/commit-email.php2009-07-21 11:47:57 UTC (rev 284485)
@@ -146,72 +146,89 @@
($diffs_length 8192 ? NULL : $commit_info['diffs']));
//
-
-// Build e-mail
-$boundary = sha1({$commit_info['author']}{$commit_info['date']});
-$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
-$subject = svn: . ($parent_path === '' ? '/' : $parent_path);
-
-foreach ($commit_info['changed_paths'] as $changed_path) {
-$changed_path = trim(strstr($changed_path, ' '));
-if (substr($changed_path, -1) !== '/') {
-$subject .= ' ' . substr($changed_path, strlen($parent_path));
-}
-}
-$subject = substr($subject, 0, 950); // Max SMTP line length = 998. Some slop
in this value.
-
-$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
-
-$msg_headers = From: {$fullname} {$commit_info['author']...@php.net\r\n .
- To: . implode(', ', $emails_to) . \r\n .
- Message-ID: svn{$message...@svn.php.net\r\n .
- Date: . date(DATE_RFC822, $commit_info['date']) . \r\n .
- Subject: {$subject}\r\n .
- MIME-Version: 1.0\r\n .
- Content-Type: multipart/mixed; boundary=\{$boundary}\\r\n;
-
+// Process bugs
$bugs_body = '';
if (isset($bug_list) count($bug_list) 0) {
-$bugs_body = count($bug_list) 1 ? Bugs: : Bug: ;
+$bugs_body = count($bug_list) 1 ? \nBugs: : \nBug: ;
foreach ($bug_list as $n = $bug) {
if (isset($bug['error'])) {
$status = '(error getting bug information)';
} else {
$status = ({$bug['status']}) {$bug['short_desc']};
}
-$bugs_body .= {$bug['url']} {$status}\r\n ;
+$bugs_body .= {$bug['url']} {$status}\n ;
}
}
-$msg_body = --{$boundary}\r\n .
-Content-Type: text/plain; charset=\utf-8\\r\n .
-Content-Transfer-Encoding: 8bit\r\n .
-\r\n .
-{$commit_info['author']}\t\t . date(DATE_RFC2822,
$commit_info['date']) . \r\n .
-\r\n .
-Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
-\r\n .
-Log:\r\n .
-{$commit_info['log_message']}\r\n .
-{$bugs_body}\r\n .
-\r\n .
-Changed paths:\r\n .
-\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-str_replace(\n, \r\n, $diffs_string);
+//
-
+// Process changed paths
+$paths_list = $parent_path === '' ? '/' : $parent_path;
+foreach ($commit_info['changed_paths'] as $changed_path) {
+$changed_path = trim(strstr($changed_path, ' '));
+if (substr($changed_path, -1) !== '/') {
+$paths_list .= ' ' . substr($changed_path, strlen($parent_path));
+}
+}
+//
-
+// Build e-mail
+$boundary = sha1({$commit_info['author']}{$commit_info['date']});
+$messageid = {$commit_info['author']}-{$commit_info['date']}-{$REV}- .
mt_rand();
+$subject = substr(svn: {$paths_list}, 0, 970); // Max SMTP line length =
998. Some slop in this value.
+$email_date = date(DATE_RFC2822, $commit_info['date']);
+$fullname = =?utf-8?q? . imap_8bit(str_replace(array('?', ' '), array('=3F',
'_'), $commit_info['author_name'])) . ?=;
+$email_list = implode(', ', $emails_to);
+$readable_path_list = . implode(\n,
$commit_info['changed_paths']);
+$nspaces = str_repeat( , max(1, 72 - strlen($commit_info['author']) -
strlen($email_date)));
+
+$msg_body = MIMEBODY
+From: {$fullname} {$commit_info['author']...@php.net
+To: {$email_list}
+Message-ID: svn{$message...@svn.php.net
+Date: {$email_date}
+Subject: {$subject}
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary={$boundary}
+
+--{$boundary}
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+{$commit_info['author']}{$nspaces}{$email_date}
+
+Revision: http://svn.php.net/viewvc?view=revisionrevision={$REV}
+
+Log:
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Mon, 20 Jul 2009 10:14:10 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284425
Changed paths:
U SVNROOT/commit-email.php
Log:
again with the need for better debugging. no more empty diff attachments
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-20 10:12:34 UTC (rev 284424)
+++ SVNROOT/commit-email.php2009-07-20 10:14:10 UTC (rev 284425)
@@ -205,7 +205,7 @@
Content-Disposition: attachment; filename=\{$boundary}.txt\\r\n .
Content-Transfer-Encoding: base64\r\n .
\r\n .
-wordwrap(base64_encode($diffs), 80, \r\n, TRUE) . \r\n;
+wordwrap(base64_encode($commit_info['diffs']), 80, \r\n, TRUE) .
\r\n;
}
$msg_body .= \r\n--{$boundary}--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
This is all nice and that crap, but since you didn't merge it into
pear/packages/Bugtracker, it will all be lost once that stuff is taken
into action..so please merge this there too. :D
--Jani
On 07/20/2009 12:08 AM, Rasmus Lerdorf wrote:
rasmus Sun, 19 Jul 2009 21:08:22 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284386
Changed paths:
U SVNROOT/commit-email.php
U web/php-bugs/trunk/bug.php
A web/php-bugs/trunk/rpc.php
Log:
Bugs mentioned in commit messages now update the bug db and also
pull the status of the bug back into the commit email.
(I'm pretty sure this won't work on the first try)
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 20:53:26 UTC (rev 284385)
+++ SVNROOT/commit-email.php2009-07-19 21:08:22 UTC (rev 284386)
@@ -9,6 +9,7 @@
// Constants
$version = substr('$Revision$', strlen('$Revision: '), -2);
$smtp_server = '127.0.0.1';
+
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
@@ -218,8 +219,34 @@
$bugs_body = '';
if ($bugs) {
+include '/home/svn/SVNROOT/secret.inc';
+$bugs_body = (count($bugs_array[1])1) ? Bug: : Bugs: ;
foreach ($bugs_array[1] as $k=$bug_id) {
-$bugs_body .= ' '.$bug_urls[$k]./$bug_id\r\n;
+$bug_sdesc = '';
+$bug_status = '';
+if($bug_urls[$k]=='http://bugs.php.net') {
+$ch = curl_init('http://bugs.php.net/rpc.php');
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($ch, CURLOPT_POST, 1);
+$ncomment = Automatic comment from SVN on behalf of {$from[0]}\n
.
+Log: $commit_log\n .
+Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\n;;
+curl_setopt($ch, CURLOPT_POSTFIELDS, user= .
rawurlencode($from[0]) .
+ id={$bug_id} .
+ ncomment= . rawurlencode($ncomment) .
+ MAGIC_COOKIE=$SVN_MAGIC_COOKIE);
+$ret = curl_exec($ch);
+if($ret !== false ) {
+$json = json_decode($ret,true);
+if(isset($json['result']['status'])) {
+$bug_status = '('.$json['result']['status']['status'].')';
+$bug_sdesc = $json['result']['status']['sdesc'];
+}
+}
+curl_close($ch);
+}
+if($k) $bugs_body .= ' ';
+$bugs_body .= $bug_urls[$k]./$bug_id{$bug_status}{$bug_sdesc}\r\n;
}
}
@@ -229,7 +256,7 @@
\r\n .
{$commit_user}\t\t . date(DATE_RFC2822, $commit_date) . \r\n .
\r\n .
-URL: http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n;
.
+Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
$bugs_body .
\r\n .
Changed paths:\r\n .
Modified: web/php-bugs/trunk/bug.php
===
--- web/php-bugs/trunk/bug.php 2009-07-19 20:53:26 UTC (rev 284385)
+++ web/php-bugs/trunk/bug.php 2009-07-19 21:08:22 UTC (rev 284386)
@@ -124,7 +124,7 @@
if (!$errors) {
$query = INSERT INTO bugdb_comments (bug,email,ts,comment)
VALUES
- . ('$id',' . $in['commentemail'] .
',NOW(),'$ncomment');
+ . ('$id',' . mysql_real_escape_string($in['commentemail']) .
',NOW(),'.mysql_real_escape_string($ncomment).');
$success = @mysql_query($query);
}
$from = stripslashes($in['commentemail']);
@@ -160,12 +160,12 @@
if (!$errors !($errors = incoming_details_are_valid($in))) {
/* update bug record */
- $query = UPDATE bugdb SET sdesc=' . $in['sdesc'] . ',status=' . $in['status'] . ',
bug_type=' . $in['bug_type'] . ', php_version=' . $in['php_version'] . ', php_os=' . $in['php_os'] . ',
ts2=NOW(), email='$from' WHERE id=$id;
+ $query = UPDATE bugdb SET sdesc=' . mysql_real_escape_string($in['sdesc']) . ',status=' .
mysql_real_escape_string($in['status']) . ', bug_type=' . mysql_real_escape_string($in['bug_type']) . ', php_version=' .
mysql_real_escape_string($in['php_version']) . ', php_os=' . mysql_real_escape_string($in['php_os']) . ', ts2=NOW(),
email='.mysql_real_escape_string($from).' WHERE id=$id;
$success = @mysql_query($query);
/* add comment */
if ($success !empty($ncomment)) {
- $query = INSERT INTO bugdb_comments (bug, email, ts,
comment) VALUES ($id,'$from',NOW(),'$ncomment');
+ $query = INSERT INTO bugdb_comments (bug, email, ts, comment) VALUES
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Mon, 20 Jul 2009 15:15:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284447
Changed paths:
U SVNROOT/commit-email.php
Log:
move log above changed paths, per Derick's request
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-20 15:12:46 UTC (rev 284446)
+++ SVNROOT/commit-email.php2009-07-20 15:15:03 UTC (rev 284447)
@@ -190,11 +190,11 @@
\r\n .
Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
\r\n .
+Log:\r\n .
+{$commit_info['log_message']}\r\n .
+\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $commit_info['changed_paths']) . \r\n .
-\r\n .
-Log:\r\n .
-{$commit_info['log_message']}\r\n .
{$bugs_body}\r\n .
str_replace(\n, \r\n, $diffs_string);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
Jani Taskinen wrote: This is all nice and that crap, but since you didn't merge it into pear/packages/Bugtracker, it will all be lost once that stuff is taken into action..so please merge this there too. :D It will be merged long before Bugtracker is ready. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 16:05:55 + URL: http://svn.php.net/viewvc?view=revisionrevision=284370 Changed paths: U SVNROOT/commit-email.php Log: Support #12345 as well Modified: SVNROOT/commit-email.php === --- SVNROOT/commit-email.php2009-07-19 16:05:08 UTC (rev 284369) +++ SVNROOT/commit-email.php2009-07-19 16:05:55 UTC (rev 284370) @@ -122,7 +122,7 @@ $commit_date = strtotime(substr($commit_info[1], 0, strlen(-00-00 00:00:00 +))); $commit_log = implode(\n, array_slice($commit_info, 3)); // Support bug#1234 bug url extraction -$bugs = preg_match_all(/bug[\\s#:]*([0-9]+)/i, $commit_log, $bugs_array); +$bugs = preg_match_all(/(?:bug|#)[\\s#:]*([0-9]+)/i, $commit_log, $bugs_array); // - // Determine from address -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 17:13:35 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284381
http://bugs.php.net/1234
http://bugs.php.net/1234
Changed paths:
U SVNROOT/commit-email.php
Log:
Support for pecl bug 1234 and pear bug 1234 which is only
really
needed if referencing a pecl/pear bug when committing
to php-src or
vice-versa. Otherwise it will pick up the bug
type from the commit
path.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 17:02:03 UTC (rev 284380)
+++ SVNROOT/commit-email.php2009-07-19 17:13:35 UTC (rev 284381)
@@ -123,6 +123,7 @@
$commit_log = implode(\n, array_slice($commit_info, 3));
// Support bug#1234 bug url extraction
$bugs = preg_match_all(/(?:bug|#)[\\s#:]*([0-9]+)/i, $commit_log,
$bugs_array);
+$bugs = preg_match_all(/(?:pecl|pear|)\\s*(?:bug|#)[\\s#:]*([0-9]+)/i,
$commit_log, $bugs_array);
//
-
// Determine from address
@@ -189,6 +190,14 @@
case 'pecl': $bug_url = 'http://pecl.php.net/bugs'; break;
default: $bug_url = 'http://bugs.php.net'; break;
}
+
+foreach($bugs_array[0] as $k=$bug_match) {
+ if(stristr($bug_match,'pecl')) $bug_urls[$k] = 'http://pecl.php.net/bugs';
+ else if(stristr($bug_match,'pear')) $bug_urls[$k] =
'http://pear.php.net/bugs';
+ else $bug_urls[$k] = $bug_url;
+
+}
+
foreach ($changed_paths as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
@@ -209,8 +218,8 @@
$bugs_body = '';
if ($bugs) {
-foreach ($bugs_array[1] as $bug_id) {
-$bugs_body .= $bug_url/$bug_id\r\n;
+foreach ($bugs_array[1] as $k=$bug_id) {
+$bugs_body .= ' '.$bug_urls[$k]./$bug_id\r\n;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 17:18:03 + URL: http://svn.php.net/viewvc?view=revisionrevision=284382 Changed paths: U SVNROOT/commit-email.php Log: Let's try it without word-wrapping. Let people do their own formatting in these messages instead. Modified: SVNROOT/commit-email.php === --- SVNROOT/commit-email.php2009-07-19 17:13:35 UTC (rev 284381) +++ SVNROOT/commit-email.php2009-07-19 17:18:03 UTC (rev 284382) @@ -236,7 +236,7 @@ \t . implode(\r\n\t, $changed_paths) . \r\n . \r\n . Log:\r\n . -wordwrap($commit_log, 72, \r\n) . \r\n . +$commit_log . \r\n . \r\n . $diffs_string; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/bug.php web/php-bugs/trunk/rpc.php
rasmus Sun, 19 Jul 2009 21:08:22 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284386
Changed paths:
U SVNROOT/commit-email.php
U web/php-bugs/trunk/bug.php
A web/php-bugs/trunk/rpc.php
Log:
Bugs mentioned in commit messages now update the bug db and also
pull the status of the bug back into the commit email.
(I'm pretty sure this won't work on the first try)
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 20:53:26 UTC (rev 284385)
+++ SVNROOT/commit-email.php2009-07-19 21:08:22 UTC (rev 284386)
@@ -9,6 +9,7 @@
// Constants
$version = substr('$Revision$', strlen('$Revision: '), -2);
$smtp_server = '127.0.0.1';
+
$commit_email_list = array(
// FastCGI ISAPI
'|^php/fastcgi-isapi|' = array('sh...@php.net', 'w...@php.net',
'ed...@php.net'),
@@ -218,8 +219,34 @@
$bugs_body = '';
if ($bugs) {
+include '/home/svn/SVNROOT/secret.inc';
+$bugs_body = (count($bugs_array[1])1) ? Bug: : Bugs: ;
foreach ($bugs_array[1] as $k=$bug_id) {
-$bugs_body .= ' '.$bug_urls[$k]./$bug_id\r\n;
+$bug_sdesc = '';
+$bug_status = '';
+if($bug_urls[$k]=='http://bugs.php.net') {
+$ch = curl_init('http://bugs.php.net/rpc.php');
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+curl_setopt($ch, CURLOPT_POST, 1);
+$ncomment = Automatic comment from SVN on behalf of {$from[0]}\n
.
+Log: $commit_log\n .
+Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\n;;
+curl_setopt($ch, CURLOPT_POSTFIELDS, user= .
rawurlencode($from[0]) .
+ id={$bug_id} .
+ ncomment= . rawurlencode($ncomment) .
+ MAGIC_COOKIE=$SVN_MAGIC_COOKIE);
+$ret = curl_exec($ch);
+if($ret !== false ) {
+$json = json_decode($ret,true);
+if(isset($json['result']['status'])) {
+$bug_status = '('.$json['result']['status']['status'].')';
+$bug_sdesc = $json['result']['status']['sdesc'];
+}
+}
+curl_close($ch);
+}
+if($k) $bugs_body .= ' ';
+$bugs_body .= $bug_urls[$k]./$bug_id{$bug_status}{$bug_sdesc}\r\n;
}
}
@@ -229,7 +256,7 @@
\r\n .
{$commit_user}\t\t . date(DATE_RFC2822, $commit_date) . \r\n .
\r\n .
-URL: http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n;
.
+Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
$bugs_body .
\r\n .
Changed paths:\r\n .
Modified: web/php-bugs/trunk/bug.php
===
--- web/php-bugs/trunk/bug.php 2009-07-19 20:53:26 UTC (rev 284385)
+++ web/php-bugs/trunk/bug.php 2009-07-19 21:08:22 UTC (rev 284386)
@@ -124,7 +124,7 @@
if (!$errors) {
$query = INSERT INTO bugdb_comments (bug,email,ts,comment)
VALUES
- . ('$id',' . $in['commentemail'] .
',NOW(),'$ncomment');
+ . ('$id',' .
mysql_real_escape_string($in['commentemail']) .
',NOW(),'.mysql_real_escape_string($ncomment).');
$success = @mysql_query($query);
}
$from = stripslashes($in['commentemail']);
@@ -160,12 +160,12 @@
if (!$errors !($errors = incoming_details_are_valid($in))) {
/* update bug record */
- $query = UPDATE bugdb SET sdesc=' . $in['sdesc'] .
',status=' . $in['status'] . ', bug_type=' . $in['bug_type'] . ',
php_version=' . $in['php_version'] . ', php_os=' . $in['php_os'] . ',
ts2=NOW(), email='$from' WHERE id=$id;
+ $query = UPDATE bugdb SET sdesc=' .
mysql_real_escape_string($in['sdesc']) . ',status=' .
mysql_real_escape_string($in['status']) . ', bug_type=' .
mysql_real_escape_string($in['bug_type']) . ', php_version=' .
mysql_real_escape_string($in['php_version']) . ', php_os=' .
mysql_real_escape_string($in['php_os']) . ', ts2=NOW(),
email='.mysql_real_escape_string($from).' WHERE id=$id;
$success = @mysql_query($query);
/* add comment */
if ($success !empty($ncomment)) {
- $query = INSERT INTO bugdb_comments (bug, email, ts,
comment) VALUES ($id,'$from',NOW(),'$ncomment');
+ $query = INSERT INTO bugdb_comments (bug, email, ts,
comment) VALUES
($id,'.mysql_real_escape_string($from).',NOW(),'.mysql_real_escape_string($ncomment).');
$success = @mysql_query($query);
}
}
@@ -215,11 +215,11 @@
if (!$errors !($errors = incoming_details_are_valid($in))) {
$query = 'UPDATE
[PHP-CVS] svn: / SVNROOT/commit-email.php web/php-bugs/trunk/rpc.php
rasmus Sun, 19 Jul 2009 22:16:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284389
Changed paths:
U SVNROOT/commit-email.php
U web/php-bugs/trunk/rpc.php
Log:
Tweaks
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 22:14:12 UTC (rev 284388)
+++ SVNROOT/commit-email.php2009-07-19 22:16:35 UTC (rev 284389)
@@ -123,7 +123,6 @@
$commit_date = strtotime(substr($commit_info[1], 0, strlen(-00-00
00:00:00 +)));
$commit_log = implode(\n, array_slice($commit_info, 3));
// Support bug#1234 bug url extraction
-$bugs = preg_match_all(/(?:bug|#)[\\s#:]*([0-9]+)/i, $commit_log,
$bugs_array);
$bugs = preg_match_all(/(?:pecl|pear|)\\s*(?:bug|#)[\\s#:]*([0-9]+)/i,
$commit_log, $bugs_array);
//
-
@@ -220,7 +219,7 @@
$bugs_body = '';
if ($bugs) {
include '/home/svn/SVNROOT/secret.inc';
-$bugs_body = (count($bugs_array[1])1) ? Bug: : Bugs: ;
+$bugs_body = (count($bugs_array[1])1) ? Bugs: : Bug: ;
foreach ($bugs_array[1] as $k=$bug_id) {
$bug_sdesc = '';
$bug_status = '';
@@ -257,7 +256,7 @@
{$commit_user}\t\t . date(DATE_RFC2822, $commit_date) . \r\n .
\r\n .
Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
-$bugs_body .
+\r\n. $bugs_body .
\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $changed_paths) . \r\n .
Modified: web/php-bugs/trunk/rpc.php
===
--- web/php-bugs/trunk/rpc.php 2009-07-19 22:14:12 UTC (rev 284388)
+++ web/php-bugs/trunk/rpc.php 2009-07-19 22:16:35 UTC (rev 284389)
@@ -50,6 +50,7 @@
$success = @mysql_query($query);
if($success) {
echo json_encode(array('result'=array('status'=$bug)));
+exit;
} else {
echo json_encode(array('result'=array('error'=mysql_error(;
exit;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 22:32:22 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284393
Changed paths:
U SVNROOT/commit-email.php
Log:
Whitespace tweaks
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 22:23:38 UTC (rev 284392)
+++ SVNROOT/commit-email.php2009-07-19 22:32:22 UTC (rev 284393)
@@ -219,7 +219,7 @@
$bugs_body = '';
if ($bugs) {
include '/home/svn/SVNROOT/secret.inc';
-$bugs_body = (count($bugs_array[1])1) ? Bugs: : Bug: ;
+$bugs_body = (count($bugs_array[1])1) ? \r\nBugs: : \r\nBug: ;
foreach ($bugs_array[1] as $k=$bug_id) {
$bug_sdesc = '';
$bug_status = '';
@@ -238,8 +238,8 @@
if($ret !== false ) {
$json = json_decode($ret,true);
if(isset($json['result']['status'])) {
-$bug_status = '('.$json['result']['status']['status'].')';
-$bug_sdesc = $json['result']['status']['sdesc'];
+$bug_status = ' ('.$json['result']['status']['status'].')';
+$bug_sdesc = ' '.$json['result']['status']['sdesc'];
}
}
curl_close($ch);
@@ -256,14 +256,13 @@
{$commit_user}\t\t . date(DATE_RFC2822, $commit_date) . \r\n .
\r\n .
Revision:
http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n; .
-\r\n. $bugs_body .
\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $changed_paths) . \r\n .
\r\n .
Log:\r\n .
$commit_log . \r\n .
-\r\n .
+$bugs_body\r\n .
$diffs_string;
if ($diffs_string === NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 23:48:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=284400
Changed paths:
U SVNROOT/commit-email.php
Log:
Last WS fix
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-19 23:33:50 UTC (rev 284399)
+++ SVNROOT/commit-email.php2009-07-19 23:48:04 UTC (rev 284400)
@@ -219,7 +219,7 @@
$bugs_body = '';
if ($bugs) {
include '/home/svn/SVNROOT/secret.inc';
-$bugs_body = (count($bugs_array[1])1) ? \r\nBugs: : \r\nBug: ;
+$bugs_body = (count($bugs_array[1])1) ? Bugs: : Bug: ;
foreach ($bugs_array[1] as $k=$bug_id) {
$bug_sdesc = '';
$bug_status = '';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sat, 18 Jul 2009 22:18:28 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284338
Changed paths:
U SVNROOT/commit-email.php
Log:
Try to be smarter about which bug url to use - Hopefully we will
be down
to a single unified bug system soon
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-18 21:46:52 UTC (rev 284337)
+++ SVNROOT/commit-email.php2009-07-18 22:18:28 UTC (rev 284338)
@@ -184,6 +184,11 @@
$boundary = sha1({$commit_user}{$commit_date});
$messageid = {$commit_user}-{$commit_date}-{$REV}- . mt_rand();
$subject = svn: . ($parent_path === '' ? '/' : $parent_path);
+switch (substr(trim($changed_paths[0]),4)) {
+case 'pear': $bug_url = 'http://pear.php.net/bugs'; break;
+case 'pecl': $bug_url = 'http://pecl.php.net/bugs'; break;
+default: $bug_url = 'http://bugs.php.net'; break;
+}
foreach ($changed_paths as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
@@ -205,7 +210,7 @@
$bugs_body = '';
if ($bugs) {
foreach ($bugs_array[1] as $bug_id) {
-$bugs_body .= http://bugs.php.net/$bug_id\r\n;;
+$bugs_body .= $bug_url/$bug_id\r\n;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Sun, 19 Jul 2009 00:46:14 + URL: http://svn.php.net/viewvc?view=revisionrevision=284341 Changed paths: U SVNROOT/commit-email.php Log: Support Bug: 12345 as well Modified: SVNROOT/commit-email.php === --- SVNROOT/commit-email.php2009-07-19 00:33:39 UTC (rev 284340) +++ SVNROOT/commit-email.php2009-07-19 00:46:14 UTC (rev 284341) @@ -122,7 +122,7 @@ $commit_date = strtotime(substr($commit_info[1], 0, strlen(-00-00 00:00:00 +))); $commit_log = implode(\n, array_slice($commit_info, 3)); // Support bug#1234 bug url extraction -$bugs = preg_match_all(/bug[\\s#]*([0-9]+)/i, $commit_log, $bugs_array); +$bugs = preg_match_all(/bug[\\s#:]*([0-9]+)/i, $commit_log, $bugs_array); // - // Determine from address -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php post-commit
gwynne Fri, 17 Jul 2009 11:28:19 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284250
Changed paths:
U SVNROOT/commit-email.php
U SVNROOT/post-commit
Log:
cleanliness in commit-email, use a consistent DEBUG flag instead of repeating
annoying if checks
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 11:13:51 UTC (rev 284249)
+++ SVNROOT/commit-email.php2009-07-17 11:28:19 UTC (rev 284250)
@@ -211,13 +211,13 @@
wordwrap(base64_encode($diffs), 80, \r\n, TRUE) . \r\n;
}
-$msg_body .= \r\n--{$boundary}--\r\n;
+$msg_body .= \r\n--{$boundary}--;
$complete_email = $msg_headers . \r\n . str_replace(\r\n.\r\n,
\r\n..\r\n, $msg_body);
//
-
// Send e-mail
-if (isset($_ENV['DEBUG']) $_ENV['DEBUG'] == 'DEBUG') {
+if ($is_DEBUG) {
$socket = fopen(php://stdout, w);
} else {
$socket = fsockopen($smtp_server, getservbyname('smtp', 'tcp'), $errno);
@@ -238,7 +238,9 @@
.\r\n .
QUIT\r\n);
-$discard = stream_get_contents($socket);
+if (!$is_DEBUG) {
+$discard = stream_get_contents($socket);
+}
fclose($socket);
?
Modified: SVNROOT/post-commit
===
--- SVNROOT/post-commit 2009-07-17 11:13:51 UTC (rev 284249)
+++ SVNROOT/post-commit 2009-07-17 11:28:19 UTC (rev 284250)
@@ -16,6 +16,7 @@
//
-
// Constants
$version = substr('$Revision$', strlen('$Revision: '), -2);
+$is_DEBUG = (isset($_ENV['DEBUG']) $_ENV['DEBUG'] === 'DEBUG');
//
-
// Version check
@@ -63,7 +64,7 @@
//
-
// If SVNROOT had a commit, we need to update the admin copy
if ($SVNROOT_changed) {
-if (isset($_ENV['DEBUG']) $_ENV['DEBUG'] == 'DEBUG') {
+if ($is_DEBUG) {
print Updating SVNROOT...\n;
}
chdir(dirname(__FILE__));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Fri, 17 Jul 2009 12:39:24 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284257
Changed paths:
U SVNROOT/commit-email.php
Log:
significantly improve email subject handling. I hope. Also make the message ID
more useful.
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 12:31:58 UTC (rev 284256)
+++ SVNROOT/commit-email.php2009-07-17 12:39:24 UTC (rev 284257)
@@ -103,6 +103,19 @@
$always_addresses = array('gwy...@php.net');
//
-
+function common_prefix($str1, $str2)
+{
+$result = ;
+$i = 0;
+$max = min(strlen($str1), strlen($str2));
+while ($i $max $str1[$i] === $str2[$i]) {
+$result .= $str1[$i];
+++$i;
+}
+return $result;
+}
+
+//
-
// Get info from commit
$commit_info = run_svnlook('info');
$commit_user = trim($commit_info[0]);
@@ -144,11 +157,13 @@
break;
}
}
-if (substr_count($changed_path, '/') substr_count($parent_path, '/')) {
-$parent_path = $changed_path;
+if ($changed_path === '/') {
+$parent_path = '';
+} else {
+$parent_path = common_prefix($parent_path, $changed_path);
}
}
-if (count($emails_to) == 0) {
+if (count($emails_to) === 0) {
$emails_to = $fallback_addresses;
}
$emails_to = array_merge($emails_to, $always_addresses);
@@ -165,12 +180,12 @@
//
-
// Build e-mail
$boundary = sha1({$commit_user}{$commit_date});
-$messageid = {$boundary} . mt_rand();
-$subject = svn: {$parent_path};
+$messageid = {$commit_user}-{$commit_date}-{$REV}- . mt_rand();
+$subject = svn: . ($parent_path === '' ? '/' : $parent_path);
foreach ($changed_paths as $changed_path) {
$changed_path = trim(strstr($changed_path, ' '));
if (substr($changed_path, -1) !== '/') {
-$subject .= ' ' . substr($changed_path, $parent_path === '/' ? 0 :
strlen($parent_path));
+$subject .= ' ' . substr($changed_path, strlen($parent_path));
}
}
$subject = substr($subject, 0, 950); // Max SMTP line length = 998. Some slop
in this value.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Fri, 17 Jul 2009 23:47:14 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284287
Changed paths:
U SVNROOT/commit-email.php
Log:
Extract urls from various bug 1234, bug1234, bug#1234 combinations in the
commit
log and add them to the URL section
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 22:46:54 UTC (rev 284286)
+++ SVNROOT/commit-email.php2009-07-17 23:47:14 UTC (rev 284287)
@@ -121,6 +121,8 @@
$commit_user = trim($commit_info[0]);
$commit_date = strtotime(substr($commit_info[1], 0, strlen(-00-00
00:00:00 +)));
$commit_log = implode(\n, array_slice($commit_info, 3));
+// Support bug#1234 bug url extraction
+$bugs = preg_match_all(/bug[\\s#]*([0-9]+)/i, $commit_log, $bugs_array);
//
-
// Determine from address
@@ -200,6 +202,13 @@
MIME-Version: 1.0\r\n .
Content-Type: multipart/mixed; boundary=\{$boundary}\\r\n;
+$bugs_body = '';
+if ($bugs) {
+foreach ($bugs_array[1] as $bug_id) {
+$bugs_body .= http://bugs.php.net/$bug_id\r\n;;
+}
+}
+
$msg_body = --{$boundary}\r\n .
Content-Type: text/plain; charset=\utf-8\\r\n .
Content-Transfer-Encoding: 8bit\r\n .
@@ -207,6 +216,7 @@
{$commit_user}\t\t . date(DATE_RFC2822, $commit_date) . \r\n .
\r\n .
URL: http://svn.php.net/viewvc?view=revisionrevision={$REV}\r\n;
.
+$bugs_body .
\r\n .
Changed paths:\r\n .
\t . implode(\r\n\t, $changed_paths) . \r\n .
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
rasmus Fri, 17 Jul 2009 23:58:14 + URL: http://svn.php.net/viewvc?view=revisionrevision=284288 Changed paths: U SVNROOT/commit-email.php Log: Wrap at the more standard 72 chars here Modified: SVNROOT/commit-email.php === --- SVNROOT/commit-email.php2009-07-17 23:47:14 UTC (rev 284287) +++ SVNROOT/commit-email.php2009-07-17 23:58:14 UTC (rev 284288) @@ -222,7 +222,7 @@ \t . implode(\r\n\t, $changed_paths) . \r\n . \r\n . Log:\r\n . -wordwrap($commit_log, 80, \r\n) . \r\n . +wordwrap($commit_log, 72, \r\n) . \r\n . \r\n . $diffs_string; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php httpd.conf
gwynne Fri, 17 Jul 2009 00:54:03 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284219
Changed paths:
U SVNROOT/commit-email.php
U SVNROOT/httpd.conf
Log:
a pair of fixes from dsp
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-17 00:48:59 UTC (rev 284218)
+++ SVNROOT/commit-email.php2009-07-17 00:54:03 UTC (rev 284219)
@@ -23,7 +23,7 @@
'|^web/bugtracker|' = array('php-webmas...@lists.php.net'),
'|^web/presentations|' = array('p...@lists.php.net'),
'|^web/pres2|' = array('p...@lists.php.net'),
-'|^web/php-|' = array('php-webmas...@lists.php.net'),
+'|^web/php|' = array('php-webmas...@lists.php.net'),
// Zend/TSRM
'|^php/ZendAPI|' = array('zend-engine-...@lists.php.net',
'doc-...@lists.php.net'),
Modified: SVNROOT/httpd.conf
===
--- SVNROOT/httpd.conf 2009-07-17 00:48:59 UTC (rev 284218)
+++ SVNROOT/httpd.conf 2009-07-17 00:54:03 UTC (rev 284219)
@@ -22,7 +22,6 @@
DAV svn
SVNPath /home/svn/repository
Order allow,deny
- Deny from 81.146.52.16
Allow from all
LimitExcept GET PROPFIND OPTIONS REPORT
Satisfy All
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 16 Jul 2009 01:03:23 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284165
Changed paths:
U SVNROOT/commit-email.php
Log:
gwynne made a logic booboo
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-16 01:00:22 UTC (rev 284164)
+++ SVNROOT/commit-email.php2009-07-16 01:03:23 UTC (rev 284165)
@@ -121,7 +121,7 @@
$saw_last_ISO = TRUE;
}
if ($username === $commit_user) {
-if ($saw_last_ISO === TRUE) {
+if ($saw_last_ISO !== TRUE) {
$fullname = iconv(ISO-8859-1, UTF-8//TRANSLIT, $fullname);
}
$from = array($username, $fullname);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: SVNROOT/ commit-email.php
gwynne Thu, 16 Jul 2009 05:31:26 +
URL: http://svn.php.net/viewvc?view=revisionrevision=284177
Changed paths:
U SVNROOT/commit-email.php
Log:
handle the case of an empty diff (only deleted files) correctly
Modified: SVNROOT/commit-email.php
===
--- SVNROOT/commit-email.php2009-07-16 05:22:15 UTC (rev 284176)
+++ SVNROOT/commit-email.php2009-07-16 05:31:26 UTC (rev 284177)
@@ -160,7 +160,7 @@
$diffs = implode(\n, $diffs);
$diffs_length = strlen($diffs);
$diffs_string = ($diffs_length 262144 ? diffs exceeded maximum size :
-($diffs_length 8192 ? : $diffs));
+($diffs_length 8192 ? NULL : $diffs));
//
-
// Build e-mail
@@ -201,7 +201,7 @@
\r\n .
$diffs_string;
-if ($diffs_string === ) {
+if ($diffs_string === NULL) {
$msg_body .=
--{$boundary}\r\n .
Content-Type: text/x-diff; encoding=\utf-8\\r\n .
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
