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, 6.1 has been updated
via c22f909f7c93f90e218fdc6a9f204f9ab7078d1b (commit)
via ad6306f0fb177e032a9413a822d9bc8f768ba9e1 (commit)
from c9f4b9d275025f2d6de6092f6af566999a7c31fa (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c22f909f7c93f90e218fdc6a9f204f9ab7078d1b
commit c22f909f7c93f90e218fdc6a9f204f9ab7078d1b
Author: Franck Villaume <[email protected]>
Date: Sun Sep 8 15:18:11 2019 +0200
sync
diff --git a/src/CHANGES b/src/CHANGES
index bd8a4d8..a62d6fc 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -3,6 +3,7 @@ FusionForge 6.1.1:
* Plugin Scmhook: fix scmhook commitEmail for scmhg broken [#903] (TrivialDev)
* Plugin Scmsvn: fix <reponame>_scmsvn_paths.txt support [#906] (TrivialDev)
* Plugin Scmgit: fix wrong host for js, css inclusion [#909] (TrivialDev)
+* Project Admin: fix FRS notification settings [#910] (TrivialDev)
* Widget User Page: fix owner test to ensure the user is the owner of the
layout.
FusionForge 6.1:
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ad6306f0fb177e032a9413a822d9bc8f768ba9e1
commit ad6306f0fb177e032a9413a822d9bc8f768ba9e1
Author: Franck Villaume <[email protected]>
Date: Sun Sep 8 15:17:23 2019 +0200
fix [#910] The fields new_frs_adress and send_all_frs are not saved when
editing project configuration
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 0ca2f42..a1e0169 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -510,13 +510,15 @@ class Group extends FFError {
* @param string $tags
* @param bool $use_activity
* @param bool $is_public group is publicly
accessible
+ * @param string $new_doc_address
+ * @param bool $send_all_docs
* @return int status.
* @access public
*/
function update(&$user, $group_name, $homepage, $short_description,
$use_mail, $use_survey, $use_forum,
$use_pm, $use_pm_depend_box, $use_scm, $use_news, $use_docman,
$new_doc_address, $send_all_docs, $logo_image_id,
- $use_ftp, $use_tracker, $use_frs, $use_stats, $tags,
$use_activity, $is_public) {
+ $use_ftp, $use_tracker, $use_frs, $use_stats, $tags,
$use_activity, $is_public, $new_frs_address, $send_all_frs) {
$perm =& $this->getPermission();
@@ -545,6 +547,14 @@ class Group extends FFError {
}
}
+ if ($new_frs_address) {
+ $invalid_mails = validate_emails($new_frs_address);
+ if (count($invalid_mails) > 0) {
+ $this->setError(sprintf(ngettext('New FRS
Address Appeared Invalid: %s', 'New FRS Addresses Appeared Invalid: %s',
count($invalid_mails)),implode(',',$invalid_mails)));
+ return false;
+ }
+ }
+
// in the database, these all default to '1',
// so we have to explicitly set 0
if (!$use_mail) {
@@ -590,6 +600,10 @@ class Group extends FFError {
$send_all_docs = 0;
}
+ if (!$send_all_frs) {
+ $send_all_frs = 0;
+ }
+
$homepage = ltrim($homepage);
if (!$homepage) {
$homepage =
util_make_url('/projects/'.$this->getUnixName().'/');
@@ -614,8 +628,10 @@ class Group extends FFError {
use_tracker=$14,
use_frs=$15,
use_stats=$16,
- use_activity=$17
- WHERE group_id=$18',
+ use_activity=$17,
+ new_frs_address=$18,
+ send_all_frs=$19
+ WHERE group_id=$20',
array(htmlspecialchars($group_name),
$homepage,
htmlspecialchars($short_description),
@@ -633,6 +649,8 @@ class Group extends FFError {
$use_frs,
$use_stats,
$use_activity,
+ $new_frs_address,
+ $send_all_frs,
$this->getID()));
if (!$res || db_affected_rows($res) < 1) {
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/common/include/Group.class.php | 24 +++++++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
