Move globals.inc.php to /classes

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/Makefile b/Makefile
index 0b6b37b..9bdef66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ q:
 ## core
 ##
 
-core: spool/templates_c spool/mails_c include/globals.inc.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
+core: spool/templates_c spool/mails_c classes/platalglobals.php configs/platal.cron htdocs/.htaccess spool/conf spool/tmp
 
 spool/templates_c spool/mails_c spool/uploads spool/conf spool/tmp:
        mkdir -p $@

diff --git a/classes/.gitignore b/classes/.gitignore
new file mode 100644 (file)
index 0000000..b478258
--- /dev/null
+++ b/classes/.gitignore
@@ -0,0 +1 @@
+/platalglobals.php

diff --git a/include/globals.inc.php.in b/classes/platalglobals.php.in
similarity index 100%
rename from include/globals.inc.php.in
rename to classes/platalglobals.php.in

diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644 (file)
index c68a431..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/globals.inc.php

diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index 42b047d..f3fc1a8 100644 (file)
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -24,7 +24,6 @@ define('PL_SESSION_CLASS', 'XnetSession');
 define('PL_PAGE_CLASS', 'XnetPage');
 
 require_once dirname(dirname(__FILE__)) . '/core/include/platal.inc.php';
-require_once 'globals.inc.php';
 
 function __autoload($cls)
 {

diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index d463f7d..8927aba 100644 (file)
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -25,7 +25,6 @@ define('PL_PAGE_CLASS', 'XorgPage');
 
 require_once dirname(dirname(__FILE__)) . '/core/include/platal.inc.php';
 require_once 'security.inc.php';
-require_once 'globals.inc.php';
 
 function __autoload($cls)
 {