[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1alpha0-82-g548df51

[Franck Villaume]

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  548df519ff2ef57b1ef8e39d90270220fda27c55 (commit)
      from  b00d7772c89ac93610139152507e437b2317aa45 (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=548df519ff2ef57b1ef8e39d90270220fda27c55

commit 548df519ff2ef57b1ef8e39d90270220fda27c55
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Dec 2 11:06:38 2017 +0100

    use imgbaseurl. imgroot is not used => removed

diff --git a/src/common/include/plugins_utils.php b/src/common/include/plugins_utils.php
index e6dd838..f52c858 100644
--- a/src/common/include/plugins_utils.php
+++ b/src/common/include/plugins_utils.php
@@ -32,12 +32,6 @@ function isLogged(){
 	return session_loggedin();
 }
 
-
-// DEPRECATED: use session_redirect
-function htmlRedirect($url) {
-	session_redirect($url);
-}
-
 function htmlIframe($url, $poub = array()) {
 	global $HTML, $group_id;
 	$project = group_get_object($group_id);
@@ -116,7 +110,7 @@ function getIcon($url, $w = 16, $h = 16, $args = array()) {
 }
 
 function getImage($img) {
-	echo util_make_url($GLOBALS['HTML']->imgroot.$img);
+	echo util_make_url($GLOBALS['HTML']->imgbaseurl.$img);
 }
 
 function get_server_url() {
diff --git a/src/plugins/taskboard/common/views/taskboard.php b/src/plugins/taskboard/common/views/taskboard.php
index 0448bea..730f97e 100644
--- a/src/plugins/taskboard/common/views/taskboard.php
+++ b/src/plugins/taskboard/common/views/taskboard.php
@@ -287,7 +287,7 @@ var gMessages = {
 	'completedCost' : "<?php echo _('Completed m/d') ?>",
 	'invalidRegEx' : " <?php echo _('Invalid regular expression') ?>"
 }
-var gThemeRoot = "<?php echo $HTML->imgroot ?>";
+var gThemeRoot = "<?php echo $HTML->imgbaseurl ?>";
 
 <?php
 	$releases = array();
diff --git a/src/www/include/html.php b/src/www/include/html.php
index e96b509..84ba721 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -162,8 +162,8 @@ function html_image($src, $width = 0, $height = 0, $args = array(), $display = t
 	if (method_exists($HTML, 'html_image')) {
 		$HTML->html_image($src, $width, $height, $args);
 	}
-	$s = ((session_issecure()) ? forge_get_config('images_secure_url') : forge_get_config('images_url') );
-	return html_abs_image($s.$HTML->imgroot.$src, $width, $height, $args);
+	$s = ((session_issecure()) ? forge_get_config('images_secure_url') : forge_get_config('images_url'));
+	return html_abs_image($s.$HTML->imgbaseurl.$src, $width, $height, $args);
 }
 
 /**
diff --git a/src/www/themes/funky-wOw/Theme.class.php b/src/www/themes/funky-wOw/Theme.class.php
index d74fec5..7f1b012 100644
--- a/src/www/themes/funky-wOw/Theme.class.php
+++ b/src/www/themes/funky-wOw/Theme.class.php
@@ -31,7 +31,6 @@ class Theme_Funky_Wow extends Theme_Funky {
 		parent::__construct();
 		$this->themeurl = util_make_uri('themes/funky-wOw/');
 		$this->imgbaseurl = $this->themeurl . 'images/';
-		$this->imgroot = $this->imgbaseurl;
 		$this->addStylesheet('/themes/funky-wOw/css/theme.css');
 		$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui-1.12.4.css');
 		$this->addStylesheet('/scripts/jquery-ui/css/sunny/jquery-ui.structure-1.12.4.css');
diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index 53dd511..6017273 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -31,7 +31,6 @@ class Theme_Funky extends Layout {
 		parent::__construct();
 		$this->themeurl = util_make_uri('themes/funky/');
 		$this->imgbaseurl = $this->themeurl . 'images/';
-		$this->imgroot = $this->imgbaseurl;
 		$this->addStylesheet('/themes/funky/css/theme.css');
 		$this->addStylesheet('/themes/funky/css/theme-pages.css');
 		$this->addStylesheet('/scripts/jquery-ui/css/overcast/jquery-ui-1.12.1.css');

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/plugins_utils.php             | 8 +-------
 src/plugins/taskboard/common/views/taskboard.php | 2 +-
 src/www/include/html.php                         | 4 ++--
 src/www/themes/funky-wOw/Theme.class.php         | 1 -
 src/www/themes/funky/Theme.class.php             | 1 -
 5 files changed, 4 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
FusionForge