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 54a28c2219ecbc2f46e3342d6cf813908a6b247c (commit)
via 64b3d1f3c340475da1af9c7c15491fc0c7d46bb2 (commit)
via 82a45b637092a1d9e574bff77e70f364a900e46a (commit)
via 1163c55e8c93c4962968802f13a6864d5f8418f8 (commit)
from cbaa0750d20e8e874bf706c7c942ccaea147df0f (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=54a28c2219ecbc2f46e3342d6cf813908a6b247c
commit 54a28c2219ecbc2f46e3342d6cf813908a6b247c
Author: Franck Villaume <[email protected]>
Date: Tue May 1 09:37:39 2018 +0200
FusionForge is running at least PHP 5.2.
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 37da750..7d9225d 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -548,19 +548,10 @@ function ShowResultSet($result, $title = '', $linkify =
false, $displayHeaders =
*
*/
function validate_email($address) {
- if (version_compare(PHP_VERSION, '5.2.0', '>=')) {
- if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
- return true;
- } else {
- return false;
- }
- } else {
- if
(preg_match("/^[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\.\/0-9=?A-Z^_`a-z{|}~]+$/",
$address)) {
- return true;
- } else {
- return false;
- }
+ if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+ return true;
}
+ return false;
}
/**
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=64b3d1f3c340475da1af9c7c15491fc0c7d46bb2
commit 64b3d1f3c340475da1af9c7c15491fc0c7d46bb2
Author: Franck Villaume <[email protected]>
Date: Tue May 1 09:34:47 2018 +0200
drop reimplement php functions. PHP provides the needed functions now.
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 80e4c14..37da750 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1153,42 +1153,6 @@ function use_stylesheet($css, $media = '') {
return $GLOBALS['HTML']->addStylesheet($css, $media);
}
-// array_replace_recursive only appeared in PHP 5.3.0
-if (!function_exists('array_replace_recursive')) {
- /**
- * Replaces elements from passed arrays into the first array recursively
- * @param array $a1 The array in which elements are replaced.
- * @param array $a2 The array from which elements will be extracted.
- * @return array Returns an array, or NULL if an error occurs.
- */
- function array_replace_recursive($a1, $a2) {
- $result = $a1;
-
- if (!is_array($a2)) {
- return $a2;
- }
-
- foreach ($a2 as $k => $v) {
- if (!is_array($v) ||
- !isset($result[$k]) || !is_array($result[$k])) {
- $result[$k] = $v;
- }
-
- $result[$k] = array_replace_recursive($result[$k], $v);
- }
-
- return $result;
- }
-}
-
-// json_encode only appeared in PHP 5.2.0
-if (!function_exists('json_encode')) {
- require_once $gfcommon.'include/minijson.php';
- function json_encode($a1) {
- return minijson_encode($a1);
- }
-}
-
/* returns an integer from http://forge/foo/bar.php/123 or false */
function util_path_info_last_numeric_component() {
if (!isset($_SERVER['PATH_INFO'])) {
@@ -1335,22 +1299,6 @@ function util_randnum($min = 0, $max = 32767) {
return ($min + $v);
}
-// sys_get_temp_dir() is only available for PHP >= 5.2.1
-if (!function_exists('sys_get_temp_dir')) {
- function sys_get_temp_dir() {
- if ($temp = getenv('TMP')) {
- return $temp;
- }
- if ($temp = getenv('TEMP')) {
- return $temp;
- }
- if ($temp = getenv('TMPDIR')) {
- return $temp;
- }
- return '/tmp';
- }
-}
-
/* convert '\n' to <br /> or </p><p> */
function util_pwrap($encoded_string) {
return str_replace("<p></p>", "",
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=82a45b637092a1d9e574bff77e70f364a900e46a
commit 82a45b637092a1d9e574bff77e70f364a900e46a
Author: Franck Villaume <[email protected]>
Date: Tue May 1 09:27:51 2018 +0200
show_priority_colors_key function is themable, then belongs to Layout.class.
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 7f41cf5..80e4c14 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -447,20 +447,6 @@ function util_make_links($data = '') {
}
/**
- * show_priority_colors_key - Show the priority colors legend
- *
- * @return string html code
- *
- */
-function show_priority_colors_key() {
- echo '<p><strong> '._('Priority Colors')._(':').'</strong>';
- for ($i = 1; $i < 6; $i++) {
- echo ' <span class="priority'.$i.'">'.$i.'</span>';
- }
- echo '</p>';
-}
-
-/**
* utils_requiredField - Adds the required field marker
*
* @return string A string holding the HTML to mark a required field
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 20ffedc..4b0c3ff 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -750,7 +750,7 @@ if ($art_arr && $art_cnt > 0) {
if (in_array('priority', $browse_fields)) {
echo '<div style="display:table-cell;text-align:right">';
- show_priority_colors_key();
+ echo $HTML->show_priority_colors_key();
echo '</div>';
}
echo '</div>';
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 57cd955..5330b25 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -1348,6 +1348,21 @@ abstract class Layout extends FFError {
}
return $html_content;
}
+
+ /**
+ * show_priority_colors_key - Show the priority colors legend
+ *
+ * @return string html code
+ *
+ */
+ function show_priority_colors_key() {
+ $html = '<p><strong> '._('Priority Colors')._(':').'</strong>';
+ for ($i = 1; $i < 6; $i++) {
+ $html .= ' <span class="priority'.$i.'">'.$i.'</span>';
+ }
+ $html .= '</p>';
+ return $html;
+ }
}
// Local Variables:
diff --git a/src/www/my/dashboard.php b/src/www/my/dashboard.php
index 7b4948f..518049f 100644
--- a/src/www/my/dashboard.php
+++ b/src/www/my/dashboard.php
@@ -209,14 +209,6 @@ if (!session_loggedin()) {
}
echo $HTML->boxBottom();
echo html_ac(html_ap()-2);
-
-// priority colors
-/*
- echo html_ao('tr');
- echo html_ao('td', array('colspan' => '2'));
- show_priority_colors_key();
- echo html_ac(html_ap()-2);
-*/
echo $HTML->listTableBottom();
site_user_footer();
}
diff --git a/src/www/pm/browse_task.php b/src/www/pm/browse_task.php
index a92a6f7..05ecda7 100644
--- a/src/www/pm/browse_task.php
+++ b/src/www/pm/browse_task.php
@@ -297,7 +297,7 @@ if ($rows < 1) {
echo '</div>';
echo '<div style="display:table-cell;text-align:right">';
- show_priority_colors_key();
+ echo $HTML->show_priority_colors_key();
echo '</div>';
echo '</div>';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1163c55e8c93c4962968802f13a6864d5f8418f8
commit 1163c55e8c93c4962968802f13a6864d5f8418f8
Author: Franck Villaume <[email protected]>
Date: Tue May 1 09:18:20 2018 +0200
remove unused & duplicated function utils_buildcheckboxarray. Please use
standard html_build_checkboxes_from_arrays
diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 17b5f24..7f41cf5 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -461,30 +461,6 @@ function show_priority_colors_key() {
}
/**
- * utils_buildcheckboxarray - Build a checkbox array
- *
- * @param int $options Number of options to be in the array
- * @param string $name The name of the checkboxes
- * @param array $checked_array An array of boxes to be pre-checked
- *
- */
-function utils_buildcheckboxarray($options, $name, $checked_array) {
- $option_count = count($options);
- $checked_count = count($checked_array);
-
- for ($i = 1; $i <= $option_count; $i++) {
- echo '
- <br /><input type="checkbox" name="'.$name.'"
value="'.$i.'"';
- for ($j = 0; $j < $checked_count; $j++) {
- if ($i == $checked_array[$j]) {
- echo ' checked';
- }
- }
- echo ' /> '.$options[$i];
- }
-}
-
-/**
* utils_requiredField - Adds the required field marker
*
* @return string A string holding the HTML to mark a required field
-----------------------------------------------------------------------
Summary of changes:
src/common/include/utils.php | 105 +---------------------------------
src/common/tracker/actions/browse.php | 2 +-
src/www/include/Layout.class.php | 15 +++++
src/www/my/dashboard.php | 8 ---
src/www/pm/browse_task.php | 2 +-
5 files changed, 20 insertions(+), 112 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
