[Fusionforge-commits] FusionForge branch master updated. 995b186a3233a75de143b1f7c3f7a5cce45b9f03

Franck VILLAUME nerville at fusionforge.org
Wed Nov 27 11:53:44 CET 2013


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  995b186a3233a75de143b1f7c3f7a5cce45b9f03 (commit)
       via  ba27d061410e93fc8519ca2e3c6b45d2406341e3 (commit)
       via  a4724641f37b9cee40a36db1ca0e279b584c0025 (commit)
       via  55a59778164bd442370f8c98df726fad53c2e622 (commit)
      from  0008d8c43afa54c328edbe71a4d7fafcc3387642 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 995b186a3233a75de143b1f7c3f7a5cce45b9f03
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Nov 27 11:52:26 2013 +0100

    util_send_message: add CC

diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index d8b9bc9..b4b9322 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -176,19 +176,18 @@ function util_check_url($url) {
  * util_send_message() - Send email
  * This function should be used in place of the PHP mail() function
  *
- * @param string      $to            The email recipients address
- * @param string      $subject       The email subject
- * @param string      $body          The body of the email message
- * @param string      $from          The optional email sender address.  Defaults to 'noreply@'
- * @param string      $BCC           The addresses to blind-carbon-copy this message
- * @param string      $sendername    The optional email sender name. Defaults to ''
- * @param bool|string $extra_headers Whether to send plain text or html email
- * @param bool        $send_html_email
+ * @param	string		$to			The email recipients address
+ * @param	string		$subject		The email subject
+ * @param	string		$body			The body of the email message
+ * @param	string		$from			The optional email sender address.  Defaults to 'noreply@'
+ * @param	string		$BCC			The addresses to blind-carbon-copy this message (comma-separated)
+ * @param	string		$sendername		The optional email sender name. Defaults to ''
+ * @param	bool|string	$extra_headers
+ * @param	bool		$send_html_email	Whether to send plain text or html email
+ * @param	string		$CC			The addresses to carbon-copy this message (comma-separated)
  */
 function util_send_message($to, $subject, $body, $from = '', $BCC = '', $sendername = '', $extra_headers = '',
-						   $send_html_email = false) {
-
-
+						   $send_html_email = false, $CC = '') {
 	if (!$to) {
 		$to = 'noreply@'.forge_get_config('web_host');
 	}
@@ -213,6 +212,9 @@ function util_send_message($to, $subject, $body, $from = '', $BCC = '', $sendern
 	if (!empty($BCC)) {
 		$body2 .= "\nBCC: $BCC";
 	}
+	if (!empty($CC)) {
+		$body2 .= "\nCC: $CC";
+	}
 	$send_html_email? $type = "html" : $type = "plain";
 	$body2 .= "\n".util_encode_mimeheader("Subject", $subject, $charset).
 		"\nContent-type: text/$type; charset=$charset".

commit ba27d061410e93fc8519ca2e3c6b45d2406341e3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Nov 27 10:11:52 2013 +0100

    forumml plugin: indent, proper comment style

diff --git a/src/plugins/forumml/www/forumml_utils.php b/src/plugins/forumml/www/forumml_utils.php
index 2b8ca36..895f92b 100644
--- a/src/plugins/forumml/www/forumml_utils.php
+++ b/src/plugins/forumml/www/forumml_utils.php
@@ -1,27 +1,25 @@
 <?php
-#
-# Copyright (c) STMicroelectronics, 2005. All Rights Reserved.
-
- # Originally written by Jean-Philippe Giola, 2005
- #
- # This file is a part of codendi.
- #
- # codendi is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- #
- # codendi is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License along
- # with this program; if not, write to the Free Software Foundation, Inc.,
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- #
- # $Id$
- #
+/**
+ * Copyright (c) STMicroelectronics, 2005. All Rights Reserved.
+ *
+ * Originally written by Jean-Philippe Giola, 2005
+ *
+ * This file is a part of Fusionforge.
+ *
+ * Fusionforge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Fusionforge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 define('FORUMML_MESSAGE_ID', 1);
 define('FORUMML_DATE', 2);
@@ -124,7 +122,7 @@ function plugin_forumml_show_all_threads($p,$list_id,$list_name,$offset) {
 
 	// Total number of threads
 	$nbThreads = 0;
-$res = getForumMLDao()->countAllThreadsFromList($list_id);
+	$res = getForumMLDao()->countAllThreadsFromList($list_id);
 	if ($res && !db_error()) {
 		$row = $res->getRow();
 		$nbThreads = $row['nb'];
diff --git a/src/plugins/forumml/www/message.php b/src/plugins/forumml/www/message.php
index 264f891..5a323b1 100644
--- a/src/plugins/forumml/www/message.php
+++ b/src/plugins/forumml/www/message.php
@@ -19,7 +19,6 @@
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
  */
 
 /*

commit a4724641f37b9cee40a36db1ca0e279b584c0025
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Nov 27 10:04:33 2013 +0100

    Forumml plugin: codendi -> Fusionforge

diff --git a/src/plugins/forumml/www/index.php b/src/plugins/forumml/www/index.php
index 98b41c6..9bbccf4 100644
--- a/src/plugins/forumml/www/index.php
+++ b/src/plugins/forumml/www/index.php
@@ -5,14 +5,14 @@
  *
  * Originally written by Jean-Philippe Giola, 2005
  *
- * This file is a part of codendi.
+ * This file is a part of Fusionforge.
  *
- * codendi is free software; you can redistribute it and/or modify
+ * Fusionforge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * codendi is distributed in the hope that it will be useful,
+ * Fusionforge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -21,7 +21,6 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * $Id$
  */
 
 /*
diff --git a/src/plugins/forumml/www/message.php b/src/plugins/forumml/www/message.php
index ab81706..264f891 100644
--- a/src/plugins/forumml/www/message.php
+++ b/src/plugins/forumml/www/message.php
@@ -4,14 +4,14 @@
  *
  * Originally written by Jean-Philippe Giola, 2005
  *
- * This file is a part of codendi.
+ * This file is a part of Fusionforge.
  *
- * codendi is free software; you can redistribute it and/or modify
+ * Fusionforge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * codendi is distributed in the hope that it will be useful,
+ * Fusionforge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -20,7 +20,6 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * $Id$
  */
 
 /*

commit 55a59778164bd442370f8c98df726fad53c2e622
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Nov 27 10:00:39 2013 +0100

    MailingList: indent

diff --git a/src/common/mail/MailingList.class.php b/src/common/mail/MailingList.class.php
index 2fe1fc8..c2d8f1b 100644
--- a/src/common/mail/MailingList.class.php
+++ b/src/common/mail/MailingList.class.php
@@ -390,7 +390,7 @@ Thank you for registering your project with %1$s.'), forge_get_config ('forge_na
 	 *
 	 * @param	boolean	$sure I'm Sure.
 	 * @param	boolean	$really_sure I'm Really Sure.
-	 * @return	boolean success;
+	 * @return	boolean	success;
 	 */
 	function delete($sure,$really_sure) {
 
diff --git a/src/common/mail/MailingListFactory.class.php b/src/common/mail/MailingListFactory.class.php
index 74ab6a7..d7ad811 100644
--- a/src/common/mail/MailingListFactory.class.php
+++ b/src/common/mail/MailingListFactory.class.php
@@ -31,7 +31,7 @@ class MailingListFactory extends Error {
 	/**
 	 * The Group object.
 	 *
-	 * @var	 object  $Group.
+	 * @var	 object	$Group.
 	 */
 	var $Group;
 
@@ -67,9 +67,9 @@ class MailingListFactory extends Error {
 	}
 
 	/**
-	 *	getGroup - get the Group object this MailingListFactory is associated with.
+	 * getGroup - get the Group object this MailingListFactory is associated with.
 	 *
-	 *	@return object	The Group object.
+	 * @return	object	The Group object.
 	 */
 	function &getGroup() {
 		return $this->Group;

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/utils.php                 |   24 ++++++++------
 src/common/mail/MailingList.class.php        |    2 +-
 src/common/mail/MailingListFactory.class.php |    6 ++--
 src/plugins/forumml/www/forumml_utils.php    |   46 ++++++++++++--------------
 src/plugins/forumml/www/index.php            |    7 ++--
 src/plugins/forumml/www/message.php          |    8 ++---
 6 files changed, 45 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list