From 89461c1cb28edf771a1061fe116fc94379890637 Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique@fournier38.fr>
Date: Fri, 2 Jun 2017 09:46:42 +0000
Subject: [PATCH] All the require_once are now prefixed by domframework to
 allow multiple loading of the page (without "Cannot redeclare class output")

git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3750 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
---
 authsympa.php  | 2 +-
 outputcsv.php  | 2 +-
 outputhtml.php | 2 +-
 outputjson.php | 2 +-
 outputrest.php | 4 ++--
 outputtxt.php  | 2 +-
 outputxml.php  | 2 +-
 renderer.php   | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/authsympa.php b/authsympa.php
index c90621b..d227695 100644
--- a/authsympa.php
+++ b/authsympa.php
@@ -3,7 +3,7 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("auth.php");
+require_once ("domframework/auth.php");
 /** User authentication against SYMPA server
     Sympa is a mailling list server. It can handle authentication with
     - a username (a email adress)
diff --git a/outputcsv.php b/outputcsv.php
index f376ff4..4218b36 100644
--- a/outputcsv.php
+++ b/outputcsv.php
@@ -3,7 +3,7 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("output.php");
+require_once ("domframework/output.php");
 /** Display in CSV the data provided */
 class outputcsv extends output
 {
diff --git a/outputhtml.php b/outputhtml.php
index cade88d..5915ff9 100644
--- a/outputhtml.php
+++ b/outputhtml.php
@@ -3,7 +3,7 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("output.php");
+require_once ("domframework/output.php");
 /** Display in HTML the data provided, with the layout support */
 class outputhtml extends output
 {
diff --git a/outputjson.php b/outputjson.php
index 582bb02..458bb6c 100644
--- a/outputjson.php
+++ b/outputjson.php
@@ -3,7 +3,7 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("output.php");
+require_once ("domframework/output.php");
 /** Display in JSON the data provided
   * The data must NOT be binary !
   */
diff --git a/outputrest.php b/outputrest.php
index e9c1daa..a980fd4 100644
--- a/outputrest.php
+++ b/outputrest.php
@@ -3,8 +3,8 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("output.php");
-require_once ("rest.php");
+require_once ("domframework/output.php");
+require_once ("domframework/rest.php");
 /** Display in REST the data provided.
   * Allow all the output types : JSON, XML, TXT...
   */
diff --git a/outputtxt.php b/outputtxt.php
index fbd0392..a508209 100644
--- a/outputtxt.php
+++ b/outputtxt.php
@@ -3,7 +3,7 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("output.php");
+require_once ("domframework/output.php");
 /** Display in Text the data provided */
 class outputtxt extends output
 {
diff --git a/outputxml.php b/outputxml.php
index 06a23c9..095594a 100644
--- a/outputxml.php
+++ b/outputxml.php
@@ -3,7 +3,7 @@
     @package domframework
     @author Dominique Fournier <dominique@fournier38.fr> */
 
-require_once ("output.php");
+require_once ("domframework/output.php");
 /** Display in XML the data provided */
 class outputxml extends output
 {
diff --git a/renderer.php b/renderer.php
index d145d54..ce5996e 100644
--- a/renderer.php
+++ b/renderer.php
@@ -27,7 +27,7 @@ class renderer
       $this->output */
   public function run ()
   {
-    if (!@require_once ("output$this->output.php"))
+    if (!@require_once ("domframework/output$this->output.php"))
       throw new Exception ("Renderer '$this->output' not found", 500);
     $class = "output$this->output";
     $reflection = new ReflectionMethod ($class, "out");