X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fcommon.inc.php;h=b0f5b8a0a0ab76cf3a3bc7107a391d9aed8e3423;hb=29315ae07d98f098e569248b5e25c04c74f51201;hp=04535e13d74b830b317aefd66c7ae006aabf5201;hpb=12262f1306059765d8625a6752364679c8625d31;p=platal.git

diff --git a/include/common.inc.php b/include/common.inc.php
index 04535e1..b0f5b8a 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,20 +19,20 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-function __autoload($cls)
+function xorg_autoload($cls)
 {
     if (!pl_autoload($cls)) {
         $cls = strtolower($cls);
-        if (substr($cls, 0, 4) == 'ufc_' || substr($cls, 0, 4) == 'ufo_' || $cls == 'profilefilter') {
-            __autoload('userfilter');
+        if (substr($cls, 0, 4) == 'ufc_' || substr($cls, 0, 4) == 'ufo_' || $cls == 'profilefilter' || $cls == 'userfiltercondition' || $cls == 'userfilterorder') {
+            xorg_autoload('userfilter');
             return;
         } else if (substr($cls, 0, 4) == 'pfc_'
                 || substr($cls, 0, 4) == 'pfo_'
                 || substr($cls, 0, 8) == 'plfilter') {
-            __autoload('plfilter');
+            xorg_autoload('plfilter');
             return;
-        } else if (substr($cls, 0, 3) == 'de_') {
-            __autoload('direnum');
+        } else if ($cls == 'direnumeration' || substr($cls, 0, 3) == 'de_') {
+            xorg_autoload('direnum');
             return;
         } else if ($cls == 'validate' || substr($cls, -3, 3) == 'req'
                    || substr($cls, -8, 8) == 'validate' || substr($cls, 0, 8) == 'validate') {
@@ -42,11 +42,20 @@ function __autoload($cls)
             require_once 'banana/hooks.inc.php';
             Banana::load(substr($cls, 6));
             return;
+        } else if (substr($cls, 0, 5) == 'raven') {
+            // Handled by Raven autoloader.
+            return;
         }
         include "$cls.inc.php";
     }
 }
 
+function __autoload($cls)
+{
+    return xorg_autoload($cls);
+}
+
+spl_autoload_register('xorg_autoload');
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>