Move include/directory.enums.inc.php to classes/ directory.

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

diff --git a/include/directory.enums.inc.php b/classes/direnum.php
similarity index 100%
rename from include/directory.enums.inc.php
rename to classes/direnum.php

diff --git a/classes/profile.php b/classes/profile.php
index cdd639d..1a363c6 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -485,7 +485,6 @@ class Profile
             $order = '';
         }
 
-        require_once 'directory.enums.inc.php';
         return XDB::Iterator('SELECT  p.*, p.sex = \'female\' AS sex, pe.entry_year, pe.grad_year,
                                       pn_f.name AS firstname, pn_l.name AS lastname, pn_n.name AS nickname,
                                       IF(pn_uf.name IS NULL, pn_f.name, pn_uf.name) AS firstname_ordinary,

diff --git a/include/common.inc.php b/include/common.inc.php
index 8d0a1ec..f8340f8 100644 (file)
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -31,6 +31,8 @@ function __autoload($cls)
                 || substr($cls, 0, 8) == 'plfilter') {
             __autoload('plfilter');
             return;
+        } else if (substr($cls, 0, 3) == 'de_') {
+            __autoload('direnum');
         } else if (substr($cls, -3, 3) == 'req') {
             @include 'validations.inc.php';
             return;

diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php
index 171b05c..9385cb1 100644 (file)
--- a/include/ufbuilder.inc.php
+++ b/include/ufbuilder.inc.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'directory.enums.inc.php';
-
 // {{{ class UserFilterBuilder
 class UserFilterBuilder
 {

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index 9026171..9cbd7c0 100644 (file)
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -129,7 +129,6 @@ class VCard extends PlVCard
         if (!is_null($user)) {
             $groups = $user->groups();
             if (count($groups)) {
-                require_once "directory.enums.inc.php";
                 $gn = DirEnum::getOptions(DirEnum::GROUPESX);
                 $gns = array();
                 foreach (array_keys($groups) as $gid) {
@@ -142,7 +141,6 @@ class VCard extends PlVCard
         $binets = $pf->getBinets();
 
         if (count($binets)) {
-            require_once "directory.enums.inc.php";
             $bn = DirEnum::getOptions(DirEnum::BINETS);
             $bns = array();
             foreach ($binets as $bid) {
@@ -151,7 +149,6 @@ class VCard extends PlVCard
             $entry->set('X-BINETS', join(', ', $bid));
         }
         if (!empty($pf->section)) {
-            require_once "directory.enums.inc.php";
             $sections = DirEnum::getOptions(DirEnum::SECTIONS);
             $entry->set('X-SECTION', $sections[$pf->section]);
         }

diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php
index 06042bc..0373eb8 100644 (file)
--- a/include/webservices/manageurs.server.inc.php
+++ b/include/webservices/manageurs.server.inc.php
@@ -175,7 +175,6 @@ function get_nouveau_infos($method, $params) {
     }
     // We check we actually have an identification number.
     if(!empty($params[1])) {
-        require_once 'directory.enums.inc.php';
         $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
         $nameTypes = array_flip($nameTypes);
 

diff --git a/modules/admin.php b/modules/admin.php
index 5eb630a..07dace9 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -697,7 +697,6 @@ class AdminModule extends PLModule
         $page->changeTpl('admin/add_accounts.tpl');
 
         if (Env::has('add_type') && Env::has('people')) {
-            require_once 'directory.enums.inc.php';
             $lines = explode("\n", Env::t('people'));
             $separator = Env::t('separator');
             $promotion = Env::i('promotion');

diff --git a/modules/profile.php b/modules/profile.php
index 18faa1b..eed29c2 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -638,8 +638,6 @@ class ProfileModule extends PLModule
 
         $page->setTitle('Conseil Pro');
 
-        require_once "directory.enums.inc.php";
-
         // Retrieval of sector names
         $sectors = DirEnum::getOptions(DirEnum::SECTORS);
         $sectors[''] = '';

diff --git a/modules/register.php b/modules/register.php
index e2810cb..9c90e09 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -49,8 +49,6 @@ class RegisterModule extends PLModule
         }
 
         if ($hash) {
-            require_once 'directory.enums.inc.php';
-
             $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
             $nameTypes = array_flip($nameTypes);
             $res = XDB::query("SELECT  a.uid, pd.promo, pnl.name AS lastname, pnf.name AS firstname, p.xorg_id AS xorgid,
@@ -270,7 +268,6 @@ class RegisterModule extends PLModule
             return PL_FORBIDDEN;
         }
 
-        require_once 'directory.enums.inc.php';
         $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
         $nameTypes = array_flip($nameTypes);
 

diff --git a/modules/search.php b/modules/search.php
index 1dadf49..c0b2791 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -193,7 +193,6 @@ class SearchModule extends PLModule
             die();
         }
 
-        require_once 'directory.enums.inc.php';
         $enums = array(
             'binetTxt'           => DirEnum::BINETS,
             'groupexTxt'         => DirEnum::GROUPESX,
@@ -242,7 +241,6 @@ class SearchModule extends PLModule
     {
         // Give the list of all values possible of type and builds a select input for it
         $ids = null;
-        require_once 'directory.enums.inc.php';
 
         switch ($type) {
         case 'binet':