Merge branch 'xorg/maint' into xorg/master

[platal.git] / include / common.inc.php

diff --git a/include/common.inc.php b/include/common.inc.php
index fdffbf4..1c0b9d3 100644 (file)
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,7 +23,7 @@ function __autoload($cls)
 {
     if (!pl_autoload($cls)) {
         $cls = strtolower($cls);
-        if (substr($cls, 0, 4) == 'ufc_' || substr($cls, 0, 4) == 'ufo_' || $cls == 'profilefilter') {
+        if (substr($cls, 0, 4) == 'ufc_' || substr($cls, 0, 4) == 'ufo_' || $cls == 'profilefilter' || $cls == 'userfiltercondition' || $cls == 'userfilterorder') {
             __autoload('userfilter');
             return;
         } else if (substr($cls, 0, 4) == 'pfc_'
@@ -34,11 +34,12 @@ function __autoload($cls)
         } else if (substr($cls, 0, 3) == 'de_') {
             __autoload('direnum');
             return;
-        } else if (substr($cls, -3, 3) == 'req') {
-            include 'validations.inc.php';
+        } else if ($cls == 'validate' || substr($cls, -3, 3) == 'req'
+                   || substr($cls, -8, 8) == 'validate' || substr($cls, 0, 8) == 'validate') {
+            require_once 'validations.inc.php';
             return;
         } else if (substr($cls, 0, 6) == 'banana') {
-            require_once 'banana/banana.inc.php';
+            require_once 'banana/hooks.inc.php';
             Banana::load(substr($cls, 6));
             return;
         }
@@ -46,5 +47,6 @@ function __autoload($cls)
     }
 }
 
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>