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 6190fcae21a134093d7085b0c1d2853193fbcd79 (commit)
via 26dec56a8511eb7c41d577cd0139bb4b12b52ba4 (commit)
via 1bd195ca2a8b4d63ced45452cfc8a82ff47e6251 (commit)
via 497f6b22fbcc43893d1adbf66e33e3c5d776b7bb (commit)
from 175e1ac1b62f550036c44cdbc01c14e4c3569aa8 (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=6190fcae21a134093d7085b0c1d2853193fbcd79
commit 6190fcae21a134093d7085b0c1d2853193fbcd79
Author: Franck Villaume <[email protected]>
Date: Wed May 19 21:18:45 2021 +0200
fix PHP8 failure on unset global var
diff --git a/src/www/include/trove.php b/src/www/include/trove.php
index 9027ec4..e555903 100644
--- a/src/www/include/trove.php
+++ b/src/www/include/trove.php
@@ -258,7 +258,7 @@ function trove_catselectfull($node, $selected, $name,
$title='') {
* @param int $a_complete
* @return string
*/
-function trove_getcatlisting($group_id, $a_filter, $a_cats, $a_complete=0) {
+function trove_getcatlisting($group_id, $a_filter, $a_cats, $a_complete = 0) {
global $discrim_url;
global $expl_discrim;
global $form_cat;
@@ -304,9 +304,11 @@ function trove_getcatlisting($group_id, $a_filter,
$a_cats, $a_complete=0) {
// filter links, to add discriminators
// first check to see if filter is already applied
$filterisalreadyapplied = 0;
- for ($i=0;$i<sizeof($expl_discrim);$i++) {
- if ($folders_ids[$folders_len-1] == $expl_discrim[$i]) {
- $filterisalreadyapplied = 1;
+ if (is_array($expl_discrim)) { // in Widget_ProjectInfo class,
$expl_discrim is null.
+ for ($i=0;$i < count($expl_discrim); $i++) {
+ if ($folders_ids[$folders_len-1] ==
$expl_discrim[$i]) {
+ $filterisalreadyapplied = 1;
+ }
}
}
// then print the stuff
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=26dec56a8511eb7c41d577cd0139bb4b12b52ba4
commit 26dec56a8511eb7c41d577cd0139bb4b12b52ba4
Author: Franck Villaume <[email protected]>
Date: Wed May 19 21:05:30 2021 +0200
use empty when possible
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 2aecdfd..ef24378 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -283,10 +283,7 @@ function util_convert_body($str, $charset) {
*/
function util_handle_message($id_arr, $subject, $body, $extra_emails = '',
$from = '') {
$address = array();
-
- if (count($id_arr) < 1) {
-
- } else {
+ if (!empty($id_arr)) {
$res = db_query_params('SELECT user_id,email FROM users WHERE
user_id = ANY ($1)',
array(db_int_array_to_any_clause($id_arr)));
$rows = db_numrows($res);
@@ -298,7 +295,7 @@ function util_handle_message($id_arr, $subject, $body,
$extra_emails = '', $from
}
$address['email'][] = db_result($res,$i,'email');
}
- if (isset ($address['email']) && count($address['email']) > 0) {
+ if (isset ($address['email']) && !empty($address['email'])) {
$extra_emails = implode($address['email'],
',').','.$extra_emails;
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1bd195ca2a8b4d63ced45452cfc8a82ff47e6251
commit 1bd195ca2a8b4d63ced45452cfc8a82ff47e6251
Author: Franck Villaume <[email protected]>
Date: Wed May 19 21:01:37 2021 +0200
remove unused param dummy in util_handle_message
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 70fc8ce..2aecdfd 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -279,10 +279,9 @@ function util_convert_body($str, $charset) {
* @param string $subject subject of the message
* @param string $body the message body
* @param string $extra_emails a comma-separated list of email address
- * @param string $dummy1 ignored (no longer used)
* @param string $from From header
*/
-function util_handle_message($id_arr, $subject, $body, $extra_emails = '',
$dummy1 = '', $from = '') {
+function util_handle_message($id_arr, $subject, $body, $extra_emails = '',
$from = '') {
$address = array();
if (count($id_arr) < 1) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=497f6b22fbcc43893d1adbf66e33e3c5d776b7bb
commit 497f6b22fbcc43893d1adbf66e33e3c5d776b7bb
Author: Franck Villaume <[email protected]>
Date: Wed May 19 20:46:39 2021 +0200
handle the weird situation when there is no scm report in database and user
wants to access to the report...
diff --git a/src/www/scm/include/scm_utils.php
b/src/www/scm/include/scm_utils.php
index 2dd27b3..1cf2d47 100644
--- a/src/www/scm/include/scm_utils.php
+++ b/src/www/scm/include/scm_utils.php
@@ -113,7 +113,11 @@ function commitstime_graph($group_id, $chartid) {
$start = $g->getStartDate();
$monthsArr[] = date('Ym', $start);
if ( $firstDateInDB < $monthsArr[0] ) {
- $monthsArr[0] = $firstDateInDB;
+ if (0 == $firstDateInDB) {
+ $monthsArr[0] = '000000';
+ } else {
+ $monthsArr[0] = $firstDateInDB;
+ }
$start = mktime(0, 0, 0, substr($monthsArr[0], 4, 2) , 1,
substr($monthsArr[0], 0, 4));
}
$timeStampArr[] = mktime(0, 0, 0, substr($monthsArr[0], 4, 2) , 1,
substr($monthsArr[0], 0, 4));
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils.php | 10 +++-------
src/www/include/trove.php | 10 ++++++----
src/www/scm/include/scm_utils.php | 6 +++++-
3 files changed, 14 insertions(+), 12 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
