From e497f91aa22d33ea99f497e62ca595f93112075e Mon Sep 17 00:00:00 2001
From: Franck Villaume <franck.villaume@trivialdev.com>
Date: Mon, 16 Apr 2018 19:48:07 +0200
Subject: [PATCH] move html.php into common. fix some random rpm errors

---
 src/{www => common}/include/html.php           | 0
 src/common/include/pre.php                     | 4 ++--
 src/common/widget/Widget_MyArtifacts.class.php | 4 ++--
 src/docs/README.Plugins                        | 2 +-
 src/docs/README.html-elements                  | 2 +-
 src/www/docman/index.php                       | 4 ++--
 src/www/include/Layout.class.php               | 4 ++--
 src/www/pm/ganttpage.php                       | 4 ++--
 8 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{www => common}/include/html.php (100%)

diff --git a/src/www/include/html.php b/src/common/include/html.php
similarity index 100%
rename from src/www/include/html.php
rename to src/common/include/html.php
diff --git a/src/common/include/pre.php b/src/common/include/pre.php
index 54cce1e942..cd81506aaf 100644
--- a/src/common/include/pre.php
+++ b/src/common/include/pre.php
@@ -5,7 +5,7 @@
  * Copyright 1999-2001, VA Linux Systems
  * Copyright 2010, Roland Mas <lolando@debian.org>
  * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2018, 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
@@ -279,7 +279,7 @@ if (getenv('FUSIONFORGE_NO_DB') != 'true' and forge_get_config('database_name')
 		require_once $gfwww.'include/Layout.class.php';
 
 		// Various HTML libs like button bar, themable
-		require_once $gfwww.'include/html.php';
+		require_once $gfcommon.'include/html.php';
 
 		// Forms key generation
 		require_once $gfcommon.'include/forms.php';
diff --git a/src/common/widget/Widget_MyArtifacts.class.php b/src/common/widget/Widget_MyArtifacts.class.php
index 032c1d87a1..dc6284ef6f 100644
--- a/src/common/widget/Widget_MyArtifacts.class.php
+++ b/src/common/widget/Widget_MyArtifacts.class.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
- * Copyright 2012-2013, Franck Villaume - TrivialDev
+ * Copyright 2012-2013,2018, Franck Villaume - TrivialDev
  * Copyright 2013, French Ministry of Education
  * http://fusionforge.org
  *
@@ -23,7 +23,7 @@
 
 require_once 'Widget.class.php';
 require_once $gfcommon.'include/utils.php';
-require_once $gfwww.'include/html.php';
+require_once $gfcommon.'include/html.php';
 require_once $gfcommon.'tracker/ArtifactTypeFactory.class.php';
 require_once $gfcommon.'tracker/ArtifactsForUser.class.php';
 require_once $gfcommon.'tracker/Artifact.class.php';
diff --git a/src/docs/README.Plugins b/src/docs/README.Plugins
index 631c1b61ff..f1aa734561 100644
--- a/src/docs/README.Plugins
+++ b/src/docs/README.Plugins
@@ -433,7 +433,7 @@ had been written.
                (or colspan'ed to 2).
 
   Hook Name  : usermenu
-  Locations  : www/include/html.php
+  Locations  : common/include/html.php
   Description: Prints out a tab to show when displaying user pages.
                Unlike the groupmenu hook, this hook should use the PrintSubMenu
                method to display the tab itself.
diff --git a/src/docs/README.html-elements b/src/docs/README.html-elements
index fbfd6137df..00dd9b8ab9 100644
--- a/src/docs/README.html-elements
+++ b/src/docs/README.html-elements
@@ -1,7 +1,7 @@
 Documentation of new HTML element creation functions
 ────────────────────────────────────────────────────
 
-Functions defined in src/www/include/html.php → available: always.
+Functions defined in src/common/include/html.php → available: always.
 
 
 ‣ Element emission functions (do not echo anything)
diff --git a/src/www/docman/index.php b/src/www/docman/index.php
index 985791ebe5..f58a4c460e 100644
--- a/src/www/docman/index.php
+++ b/src/www/docman/index.php
@@ -6,7 +6,7 @@
  * Copyright 2002-2003, Tim Perdue/GForge, LLC
  * Copyright 2010-2011, Franck Villaume - Capgemini
  * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
- * Copyright 2012-2016, Franck Villaume - TrivialDev
+ * Copyright 2012-2016,2018, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -43,8 +43,8 @@ require_once $gfcommon.'docman/include/constants.php';
 require_once $gfcommon.'include/TextSanitizer.class.php'; // to make the HTML input by the user safe to store
 require_once $gfcommon.'reporting/report_utils.php';
 require_once $gfcommon.'reporting/ReportPerGroupDocmanDownloads.class.php';
+require_once $gfcommon.'include/html.php';
 require_once $gfwww.'search/include/renderers/DocsHtmlSearchRenderer.class.php';
-require_once $gfwww.'include/html.php';
 
 /* are we using docman ? */
 if (!forge_get_config('use_docman'))
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 95c96c4fa6..57cd9550b5 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -8,7 +8,7 @@
  * Copyright 2010-2012, Alain Peyrat - Alcatel-Lucent
  * Copyright © 2011 Thorsten Glaser – tarent GmbH
  * Copyright 2011 - Marc-Etienne Vargenau, Alcatel-Lucent
- * Copyright 2012-2017, Franck Villaume - TrivialDev
+ * Copyright 2012-2018, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -39,7 +39,7 @@
 require_once $gfcommon.'include/constants.php';
 require_once $gfcommon.'include/FusionForge.class.php';
 require_once $gfcommon.'include/Navigation.class.php';
-require_once $gfwww.'include/html.php';
+require_once $gfcommon.'include/html.php';
 
 abstract class Layout extends FFError {
 
diff --git a/src/www/pm/ganttpage.php b/src/www/pm/ganttpage.php
index 59402c6068..3c0461a826 100644
--- a/src/www/pm/ganttpage.php
+++ b/src/www/pm/ganttpage.php
@@ -6,7 +6,7 @@
  * Copyright 2002 GForge, LLC, Tim Perdue
  * Copyright 2010, FusionForge Team
  * Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
- * Copyright 2013-2015, Franck Villaume - TrivialDev
+ * Copyright 2013-2015,2018, Franck Villaume - TrivialDev
  * http://fusionforge.org
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -26,8 +26,8 @@
  */
 
 require_once $gfcommon.'pm/ProjectTaskFactory.class.php';
+require_once $gfcommon.'include/html.php';
 require_once $gfwww.'include/unicode.php';
-require_once $gfwww.'include/html.php';
 
 global $HTML;
 
-- 
2.30.2