[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1930-g81e5c33

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Jun 11 12:45:05 CEST 2017


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  81e5c339151c90ceed1dabd3002779bedb227329 (commit)
       via  ca3b45ee64762dbd3c68c294eb8ac0a360bdbcd6 (commit)
       via  ee2afd69c1bc04fb149fc72ba7c30cc664962b8c (commit)
      from  b722b4dceec03b08702afc3716cf7f311580b777 (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=81e5c339151c90ceed1dabd3002779bedb227329

commit 81e5c339151c90ceed1dabd3002779bedb227329
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 11 12:43:03 2017 +0200

    html id attr cannot be empty

diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index fbb6f9a..452d0e0 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -5,7 +5,7 @@
  * Copyright 2010, Antoine Mercadal - Capgemini
  * Copyright 2010, Marc-Etienne Vargenau, Alcatel-Lucent
  * Copyright 2011, Franck Villaume - Capgemini
- * Copyright 2011-2016, Franck Villaume - TrivialDev
+ * Copyright 2011-2017, Franck Villaume - TrivialDev
  * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -214,7 +214,7 @@ class Theme_Funky extends Layout {
 			$id = $this->toSlug($id);
 			$idtitle = $id.'-title"';
 		} else {
-			$idtitle = "";
+			$idtitle = rand();
 		}
 
 		return html_e('div', array('id' => $idtitle, 'class' => 'box-middle'), $title, false);
@@ -232,7 +232,7 @@ class Theme_Funky extends Layout {
 			$id = $this->toSlug($id);
 			$idcont = $id.'-content"';
 		} else {
-			$idcont = "";
+			$idcont = rand();
 		}
 
 		return html_e('div', array('id' => $idcont, 'class' => 'box-content'), $content, false);

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ca3b45ee64762dbd3c68c294eb8ac0a360bdbcd6

commit ca3b45ee64762dbd3c68c294eb8ac0a360bdbcd6
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 11 12:39:02 2017 +0200

    partial fix for HTML syntax

diff --git a/src/plugins/mediawiki/mediawiki-skin/FusionForge.php b/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
index f5ac2ce..ee1bd27 100644
--- a/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
+++ b/src/plugins/mediawiki/mediawiki-skin/FusionForge.php
@@ -191,8 +191,6 @@ echo $footerEnd;
 </div>
 <?php
 		$this->printTrail();
-		echo Html::closeElement( 'body' );
-		echo Html::closeElement( 'html' );
 		echo "</div></div>\n";
 		$GLOBALS['HTML']->footer($this->params);
 		wfRestoreWarnings();
diff --git a/src/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch b/src/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
index d0033b8..74d99f0 100644
--- a/src/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
+++ b/src/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch
@@ -1,5 +1,5 @@
---- FusionForge.php.renamed	2017-06-08 12:10:54.904065528 +0000
-+++ FusionForge.php	2017-06-08 12:05:33.287459609 +0000
+--- FusionForge.php.renamed	2017-06-10 13:24:53.854529240 +0200
++++ FusionForge.php	2017-06-11 12:37:27.950559193 +0200
 @@ -39,12 +39,31 @@
  	var $skinname = 'fusionforge', $stylename = 'fusionforge',
  		$template = 'FusionForgeTemplate', $useHeadElement = true;
@@ -54,16 +54,18 @@
  ?><div id="globalWrapper">
  <div id="column-content"><div id="content" class="mw-body-primary" role="main">
  	<a id="top"></a>
-@@ -166,6 +193,8 @@
+@@ -164,8 +191,8 @@
+ </div>
+ <?php
  		$this->printTrail();
- 		echo Html::closeElement( 'body' );
- 		echo Html::closeElement( 'html' );
+-		echo Html::closeElement( 'body' );
+-		echo Html::closeElement( 'html' );
 +		echo "</div></div>\n";
 +		$GLOBALS['HTML']->footer($this->params);
  		wfRestoreWarnings();
  	} // end of execute() method
  
-@@ -185,6 +214,28 @@
+@@ -185,6 +212,28 @@
  			$sidebar['LANGUAGES'] = true;
  		}
  

https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ee2afd69c1bc04fb149fc72ba7c30cc664962b8c

commit ee2afd69c1bc04fb149fc72ba7c30cc664962b8c
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Jun 11 12:25:55 2017 +0200

    fix HTML syntax & use HTML helpers

diff --git a/src/www/project/admin/vhost.php b/src/www/project/admin/vhost.php
index 871c160..8e06205 100644
--- a/src/www/project/admin/vhost.php
+++ b/src/www/project/admin/vhost.php
@@ -58,7 +58,7 @@ if (getStringFromRequest('createvhost')) {
 			values ($1, $2, $3, $4)', array($vhost_name, $docdir, $cgidir, $group->getID()));
 
 		if (!$res || db_affected_rows($res) < 1) {
-			$error_msg = _('Cannot insert VHOST entry:').db_error();
+			$error_msg = _('Cannot insert VHOST entry')._(': ').db_error();
 		} else {
 			$feedback = _('Virtual Host scheduled for creation.');
 			$group->addHistory('Added vhost '.$vhost_name.' ','');
@@ -97,7 +97,7 @@ if (getStringFromRequest('deletevhost')) {
 				$group_id));
 
 	if (!$res || db_affected_rows($res) < 1) {
-		$error_msg .= _('Could not delete VHOST entry:').db_error();
+		$error_msg .= _('Could not delete VHOST entry')._(': ').db_error();
 	} else {
 		$feedback .= _('VHOST deleted');
 		$group->addHistory('Virtual Host '.$row_vh['vhost_name'].' Removed','');
@@ -109,10 +109,10 @@ if (getStringFromRequest('deletevhost')) {
 
 project_admin_header(array('title'=>_('Virtual Host Management'),'group'=>$group->getID()));
 
-print '<h2>' . _('Add New Virtual Host') . '</h2>';
+echo html_e('h2', array(), _('Add New Virtual Host'));
 
 print '<p>';
-printf(_('To add a new virtual host - simply point a <strong>CNAME</strong> for <em>yourhost.org</em> at <strong>%1$s.%2$s</strong>.  %3$s does not currently host mail (i.e. cannot be an MX) or DNS</strong>.'), $group->getUnixName(), forge_get_config ('web_host'), forge_get_config ('forge_name'));
+printf(_('To add a new virtual host - simply point a <strong>CNAME</strong> for <em>yourhost.org</em> at <strong>%1$s.%2$s</strong>.  %3$s does not currently host mail (i.e. cannot be an MX) or DNS.'), $group->getUnixName(), forge_get_config ('web_host'), forge_get_config ('forge_name'));
 print '</p>';
 
 print '<p>';
@@ -148,7 +148,7 @@ if (db_numrows($res_db) > 0) {
 	}
 	echo $HTML->listTableBottom();
 } else {
-	echo '<p>'._('No VHOSTs defined').'</p>';
+	echo html_e('p', array(), _('No VHOSTs defined'));
 }
 
 project_admin_footer();

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

Summary of changes:
 src/plugins/mediawiki/mediawiki-skin/FusionForge.php       |  2 --
 src/plugins/mediawiki/mediawiki-skin/FusionForge.php.patch | 14 ++++++++------
 src/www/project/admin/vhost.php                            | 10 +++++-----
 src/www/themes/funky/Theme.class.php                       |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list