[Fusionforge-commits] FusionForge branch master updated. 6.0.4-584-ge490387

Franck Villaume nerville at libremir.placard.fr.eu.org
Wed Jun 22 09:46:15 CEST 2016


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  e4903874973cf38aeee526bc329b0185094caeb7 (commit)
      from  818adf9ba94d32ba5abe463572c2feb6afd15391 (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=e4903874973cf38aeee526bc329b0185094caeb7

commit e4903874973cf38aeee526bc329b0185094caeb7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Wed Jun 22 09:46:09 2016 +0200

    MoinMoin plugin: fix usage of iframe. Use htmlIframe to do proper & automatic resize. Add missing Licence

diff --git a/src/plugins/moinmoin/www/frame.php b/src/plugins/moinmoin/www/frame.php
index 9e45ffe..d2ca0b4 100644
--- a/src/plugins/moinmoin/www/frame.php
+++ b/src/plugins/moinmoin/www/frame.php
@@ -1,11 +1,26 @@
 <?php
-
-/*
+/**
  * MoinMoinWiki plugin
  *
- * Copyright 2009-2011, Roland Mas
  * Copyright 2006, Daniel Perez
+ * Copyright 2009-2011, Roland Mas
+ * Copyright 2016, Franck Villaume - TrivialDev
+ *
+ * This file is part of FusionForge.
+ *
+ * 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.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 require_once '../../env.inc.php';
@@ -33,7 +48,7 @@ $params['sectionvals'] = array ($group->getPublicName());
 site_project_header($params);
 
 if (file_exists (forge_get_config('data_path').'/plugins/moinmoin/wikidata/'.$group->getUnixName().'.py')) {
-	echo '<iframe src="'.util_make_url('/plugins/moinmoin/'.$group->getUnixName().'/FrontPage').'" frameborder="0" width=100% height=700></iframe>' ;
+	htmlIframe('/plugins/moinmoin/'.$group->getUnixName().'/FrontPage');
 } else {
 	print '<h2>'._('Wiki not created yet, please wait for a few minutes.').'</h2>';
 }

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

Summary of changes:
 src/plugins/moinmoin/www/frame.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list