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 c95d4e977c779902ca102ccb89361694ab9b16a5 (commit)
via b1dd83ea89ea9f2db2d926e834385c317f56b882 (commit)
via 6dc3f2f75761cf005582dd2c0a57cb672f2649cc (commit)
from c75f73c3b974e858f2bbff24a723977058cc90d8 (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=c95d4e977c779902ca102ccb89361694ab9b16a5
commit c95d4e977c779902ca102ccb89361694ab9b16a5
Author: Franck Villaume <[email protected]>
Date: Mon Jun 14 17:45:37 2021 +0200
add default value: fix PHP < 7.1.0 tests
diff --git a/tests/func/SeleniumForge-php700.php
b/tests/func/SeleniumForge-php700.php
index 34f50db..90be79c 100644
--- a/tests/func/SeleniumForge-php700.php
+++ b/tests/func/SeleniumForge-php700.php
@@ -695,7 +695,7 @@ abstract class FForge_SeleniumTestCase extends
PHPUnit_Extensions_Selenium2TestC
return false;
}
- protected function assertMatchesRegularExpression($regexp, $text,
$error_msg) {
+ protected function assertMatchesRegularExpression($regexp, $text,
$error_msg = 'failed') {
if (preg_match($regexp, $text)) {
return true;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b1dd83ea89ea9f2db2d926e834385c317f56b882
commit b1dd83ea89ea9f2db2d926e834385c317f56b882
Author: Franck Villaume <[email protected]>
Date: Mon Jun 14 17:40:23 2021 +0200
clean-up: fix uninitialized value
diff --git a/src/common/include/MailParser.class.php
b/src/common/include/MailParser.class.php
index 012a2ec..d5e2390 100644
--- a/src/common/include/MailParser.class.php
+++ b/src/common/include/MailParser.class.php
@@ -39,14 +39,17 @@ class MailParser extends FFError {
$input_data = fread($fo, $size);
fclose($fo);
- $lines=explode("\n",$input_data);
- $linecount=count($lines);
+ $lines = explode("\n",$input_data);
+ $linecount = count($lines);
unset($input_data);
//
// Read the message line-by-line
//
- for ($i=0; $i<($linecount-1); $i++) {
+ $lbody = '';
+ $lheader = array();
+ $got_headers = false;
+ for ($i = 0; $i < ($linecount-1); $i++) {
//
// Still reading headers
//
@@ -55,28 +58,28 @@ class MailParser extends FFError {
// If we hit a blank line, end of headers
//
if (strlen($lines[$i]) < 2) {
- $got_headers=true;
+ $got_headers = true;
} else {
//
// See if line starts with tab, if
so ignore it for now
//
- if (!preg_match('/^[A-z]/',$lines[$i]))
{
- $header[$lastheader] =
$header[$lastheader]."\n".$lines[$i];
+ if (!preg_match('/^[A-z]/',
$lines[$i])) {
+ $lheader[$lastheader] =
$lheader[$lastheader]."\n".$lines[$i];
} else {
$pos = (strpos($lines[$i],':'));
-
$header[substr($lines[$i],0,$pos)] =
trim(substr($lines[$i],$pos+2,(strlen($lines[$i])-$pos-2)));
-
$lastheader=substr($lines[$i],0,$pos);
+
$lheader[substr($lines[$i],0,$pos)] = trim(substr($lines[$i], $pos+2,
(strlen($lines[$i]) - $pos -2)));
+ $lastheader =
substr($lines[$i], 0, $pos);
}
}
} else {
- $body .= $lines[$i]."\r\n";
+ $lbody .= $lines[$i]."\r\n";
}
}
- $this->body =& $body;
- $this->headers =& $header;
+ $this->body =& $lbody;
+ $this->headers =& $lheader;
- if ($header['Content-Type']) {
- $hdr = strtolower($header['Content-Type']);
+ if ($lheader['Content-Type']) {
+ $hdr = strtolower($lheader['Content-Type']);
if (strpos($hdr,'text/plain') !== false) {
} else {
@@ -84,11 +87,7 @@ class MailParser extends FFError {
return;
}
}
-//echo "\n\n**".$header['Content-Type']."**\n\n";
-
unset ($lines);
-//system("echo \"mp: headers".implode("***\n",$header)."\n\" >>
/tmp/forum.log");
-//system("echo \"mp: body".$body."\n\" >> /tmp/forum.log");
}
function &getBody() {
@@ -161,8 +160,9 @@ class MailParser extends FFError {
* encoded-word = "=?" charset "?" encoding "?" encoded-text
"?="
* See more detail in RFC 2407
*/
- $count=0;
+ $count = 0;
$strlen = strlen($string);
+ $encoded_word_arr = array();
for ($i=0; $i < $strlen; $i++) {
/* Start seperation */
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index ccfc4a2..96b0e05 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -274,6 +274,7 @@ class Navigation extends FFError {
// Outermenu hook
$before = count($menu['urls']);
+ $hookParams = array();
$hookParams['DIRS'] = &$menu['urls'];
$hookParams['TITLES'] = &$menu['titles'];
$hookParams['TOOLTIPS'] = &$menu['tooltips'];
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6dc3f2f75761cf005582dd2c0a57cb672f2649cc
commit 6dc3f2f75761cf005582dd2c0a57cb672f2649cc
Author: Franck Villaume <[email protected]>
Date: Mon Jun 14 17:05:59 2021 +0200
fix workflow: var init
diff --git a/src/common/forum/ForumMessageFactory.class.php
b/src/common/forum/ForumMessageFactory.class.php
index 8f13c1a..0b834ce 100644
--- a/src/common/forum/ForumMessageFactory.class.php
+++ b/src/common/forum/ForumMessageFactory.class.php
@@ -136,8 +136,8 @@ class ForumMessageFactory extends FFError {
* @return array The nested multi-dimensional associative array.
*/
function &nestArray($row) {
- $cnt=count($row);
- for ($i=0; $i<$cnt; $i++) {
+ $msg_arr = array();
+ for ($i=0; $i< count($row); $i++) {
if ($row[$i]) {
$msg_arr["".$row[$i]->getParentID().""][] =&
$row[$i];
}
-----------------------------------------------------------------------
Summary of changes:
src/common/forum/ForumMessageFactory.class.php | 4 +--
src/common/include/MailParser.class.php | 36 +++++++++++++-------------
src/common/include/Navigation.class.php | 1 +
tests/func/SeleniumForge-php700.php | 2 +-
4 files changed, 22 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
