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 aed103c1da2798cb1e3fcac7a677d6958e94e492 (commit)
from ab2372cc64696422564039192f2cbc5b49526d4a (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=aed103c1da2798cb1e3fcac7a677d6958e94e492
commit aed103c1da2798cb1e3fcac7a677d6958e94e492
Author: Franck Villaume <[email protected]>
Date: Fri Apr 23 13:49:32 2021 +0200
PHP7 support: drop split() function
diff --git a/src/common/frs/actions/editfile.php
b/src/common/frs/actions/editfile.php
index a033e3f..5b86c8e 100644
--- a/src/common/frs/actions/editfile.php
+++ b/src/common/frs/actions/editfile.php
@@ -50,8 +50,6 @@ if (!$frsf || !is_object($frsf)) {
} elseif ($frsf->isError()) {
exit_error($frsf->getErrorMessage(),'frs');
} else {
- //$date_list = split('[- :]',$release_time,5);
- //$release_time =
mktime($date_list[3],$date_list[4],0,$date_list[1],$date_list[2],$date_list[0]);
$release_time = strtotime($release_time);
if (!$frsf->update($type_id, $processor_id, $release_time,
$new_release_id)) {
$error_msg = $frsf->getErrorMessage();
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 3017126..f055897 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -7,7 +7,7 @@
* Copyright 2009-2011, Franck Villaume - Capgemini
* Copyright 2010-2012, Thorsten Glaser - Tarent
* Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
- * Copyright 2013,2016-2018, Franck Villaume - TrivialDev
+ * Copyright 2013,2016-2018,2021, Franck Villaume - TrivialDev
* Copyright 2016, Stéphane-Eymeric Bredthauer - TrivalDev
*
* This file is part of FusionForge. FusionForge is free software;
@@ -407,7 +407,7 @@ function util_make_links($data = '') {
return ($data);
}
- $lines = split("\n", $data);
+ $lines = explode("\n", $data);
$newText = "";
foreach ($lines as $key => $line) {
// Do not scan lines if they already have hyperlinks.
diff --git a/src/plugins/aselectextauth/common/ASelectAuthPlugin.class.php
b/src/plugins/aselectextauth/common/ASelectAuthPlugin.class.php
index 51b3cb5..0e53bf0 100644
--- a/src/plugins/aselectextauth/common/ASelectAuthPlugin.class.php
+++ b/src/plugins/aselectextauth/common/ASelectAuthPlugin.class.php
@@ -1,9 +1,10 @@
<?php
-/** External authentication via A-Select for Gforge
+/**
+ * External authentication via A-Select for FusionForge
*
- * This file is part of Gforge
+ * This file is part of FusionForge
*
- * This plugin, like Gforge, is free software; you can redistribute it
+ * This plugin, like 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.
@@ -38,7 +39,6 @@ Service Providers.");
switch ($hookname) {
case "session_set_entry":
-
$Aselect = new Aselect();
$loginname =
strtolower($Aselect->getUserName());//Since A-Select UserID is
//not case sensitive we
pass it to lower case
@@ -71,8 +71,8 @@ Service Providers.");
return false ;
}
} else {
- $GLOBALS['aselect_auth_failed']=true;
- return false;
+ $GLOBALS['aselect_auth_failed']=true;
+ return false;
}
}
diff --git a/src/plugins/aselectextauth/common/Aselect.class.php
b/src/plugins/aselectextauth/common/Aselect.class.php
index b5b39b0..d07ee13 100644
--- a/src/plugins/aselectextauth/common/Aselect.class.php
+++ b/src/plugins/aselectextauth/common/Aselect.class.php
@@ -1,9 +1,10 @@
<?php
-/** A-Select class for Gforge
+/**
+ * A-Select class for FusionForge
*
- * This file is part of Gforge
+ * This file is part of FusionForge
*
- * This class, like Gforge, is free software; you can redistribute it
+ * This class, like 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.
@@ -42,18 +43,18 @@ class ASelect {
$a = explode('&', $_COOKIE['aselectattributes']);
$i = 0;
while ($i < count($a)) {
- $b = split('=', $a[$i]);
- $this->$attributes[htmlspecialchars(urldecode($b[0]))]
= htmlspecialchars(urldecode($b[1]));
- $i++;
- }
- } else {
- //nothing to be done here yet.
+ $b = explode('=', $a[$i]);
+
$this->$attributes[htmlspecialchars(urldecode($b[0]))] =
htmlspecialchars(urldecode($b[1]));
+ $i++;
}
+ } else {
+ //nothing to be done here yet.
+ }
if(isset($_COOKIE['aselectticket'])){
$this->ticket = $_COOKIE['aselectticket'];
} else {
- $this->ticket = '';
+ $this->ticket = '';
}
}
diff --git a/src/plugins/aselectextauth/common/aselectextauth-init.php
b/src/plugins/aselectextauth/common/aselectextauth-init.php
index 539929b..3e1f4d7 100644
--- a/src/plugins/aselectextauth/common/aselectextauth-init.php
+++ b/src/plugins/aselectextauth/common/aselectextauth-init.php
@@ -1,9 +1,10 @@
<?php
-/** External authentication via A-Select for Gforge
+/**
+ * External authentication via A-Select for FusionForge
*
- * This file is part of Gforge
+ * This file is part of FusionForge
*
- * This plugin, like Gforge, is free software; you can redistribute it
+ * This plugin, like 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.
diff --git a/src/plugins/doaprdf/include/doaprdfPlugin.class.php
b/src/plugins/doaprdf/include/doaprdfPlugin.class.php
index 3bfa4b0..aef28a7 100644
--- a/src/plugins/doaprdf/include/doaprdfPlugin.class.php
+++ b/src/plugins/doaprdf/include/doaprdfPlugin.class.php
@@ -3,6 +3,7 @@
* doaprdfPlugin Class
*
* Copyright 2011, Olivier Berger & Institut Telecom
+ * Copyright 2021, Franck Villaume - TrivialDev
*
* This program was developped in the frame of the COCLICO project
* (http://www.coclico-project.org/) with financial support of the Paris
@@ -98,7 +99,7 @@ with content-negotiation (application/rdf+xml).");
$res->setProp('doap:homepage', $homepages);
$tags = array();
if($tags_list) {
- $tags = split(', ',$tags_list);
+ $tags = explode(', ',$tags_list);
$res->setProp('dcterms:subject', $tags);
}
diff --git a/src/plugins/mantisbt/action/updateVersion.php
b/src/plugins/mantisbt/action/updateVersion.php
index bf3dc88..e1f81a5 100644
--- a/src/plugins/mantisbt/action/updateVersion.php
+++ b/src/plugins/mantisbt/action/updateVersion.php
@@ -3,7 +3,7 @@
* MantisBT plugin
*
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright 2012, Franck Villaume - TrivialDev
+ * Copyright 2012,2021, Franck Villaume - TrivialDev
* http://fusionforge.org
*
* This file is part of FusionForge. FusionForge is free software;
@@ -36,7 +36,7 @@ $version_data['released'] =
getIntFromRequest('version_release');
$version_data['project_id'] = $mantisbtConf['id_mantisbt'];
$version_data['name'] = getStringFromRequest('version_name');
$version_data['description'] = getStringFromRequest('version_description');
-list($day, $month, $year) = split('[/.-]',
getStringFromRequest('version_date_order'));
+list($day, $month, $year) = preg_split('[/.-]',
getStringFromRequest('version_date_order'));
$version_data['date_order'] = $month."/".$day."/".$year;
try {
diff --git a/src/www/reporting/timeadd.php b/src/www/reporting/timeadd.php
index 1e9d42c..ff27261 100644
--- a/src/www/reporting/timeadd.php
+++ b/src/www/reporting/timeadd.php
@@ -77,9 +77,6 @@ if (getStringFromRequest('submit')) {
$days_adjust = getIntFromRequest('days_adjust');
if ($project_task_id && $week && $time_code && $hours) { # &&
$days_adjust has always a valid number. No need to prove.
-
- //$date_list = split('[- :]',$report_date,5);
- //$report_date =
mktime($date_list[3],$date_list[4],0,$date_list[1],$date_list[2],$date_list[0]);
//make it 12 NOON of the report_date
$report_date=($week +
($days_adjust*REPORT_DAY_SPAN))+(12*60*60);
$res = db_query_params ('INSERT INTO rep_time_tracking
(user_id,week,report_date,project_task_id,time_code,hours)
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/actions/editfile.php | 2 --
src/common/include/utils.php | 4 ++--
.../common/ASelectAuthPlugin.class.php | 12 ++++++------
src/plugins/aselectextauth/common/Aselect.class.php | 21 +++++++++++----------
.../aselectextauth/common/aselectextauth-init.php | 7 ++++---
src/plugins/doaprdf/include/doaprdfPlugin.class.php | 3 ++-
src/plugins/mantisbt/action/updateVersion.php | 4 ++--
src/www/reporting/timeadd.php | 3 ---
8 files changed, 27 insertions(+), 29 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
