From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 23 Aug 2008 12:42:45 +0000 (+0200)
Subject: Use Platal::load()
X-Git-Tag: xorg/0.10.0~118
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=adb07f6fa54e996442e9ae1a0fe4158facdb6343;p=platal.git

Use Platal::load()

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

diff --git a/core b/core
index 2417392..ac2f544 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 24173926fa9e13ef5c3509645fca69e5304b0068
+Subproject commit ac2f544d3ee0cfe67fc61759f0f6f72dec7e1cc9
diff --git a/include/userset.inc.php b/include/userset.inc.php
index f45cf48..49c0e02 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -63,8 +63,7 @@ class SearchSet extends UserSet
 
     public function __construct($quick = false, $no_search = false, $join = '', $where = '')
     {
-        require_once dirname(__FILE__).'/../modules/search/search.inc.php';
-
+        Platal::load('search', 'search.inc.php');
         if ($no_search) {
             return;
         }
@@ -79,7 +78,7 @@ class SearchSet extends UserSet
 
     private function getQuick($join, $where)
     {
-        require_once dirname(__FILE__).'/../modules/search/search.inc.php';
+        Platal::load('search', 'search.inc.php');
         global $globals;
         if (!S::logged()) {
             Env::kill('with_soundex');
diff --git a/modules/carnet.php b/modules/carnet.php
index d577057..3a64bb8 100644
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -260,7 +260,7 @@ class CarnetModule extends PLModule
             require_once 'userset.inc.php';
             $base = 'carnet/contacts/search';
 
-            require_once(dirname(__FILE__) . '/search/classes.inc.php');
+            Platal::load('search', 'classes.inc.php');
             ThrowError::$throwHook = array($this, 'searchErrorHandler');
             $view = new SearchSet(true, false, "INNER JOIN contacts AS c2 ON (u.user_id = c2.contact)", "c2.uid = $uid");
         } else {
diff --git a/modules/register.php b/modules/register.php
index 9a32e60..6d1273b 100644
--- a/modules/register.php
+++ b/modules/register.php
@@ -464,7 +464,7 @@ class RegisterModule extends PLModule
             NewsLetter::subscribe();
         }
         if (Post::v('add_to_ax')) {
-            require_once dirname(__FILE__) . '/axletter/axletter.inc.php';
+            Platal::load('axletter', 'axletter.inc.php');
             AXLetter::subscribe();
         }
         if (Post::v('add_to_promo')) {
diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index 3c71652..de5392d 100644
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once dirname(__FILE__).'/lists.php';
+Platal::load('lists');
 
 class XnetListsModule extends ListsModule
 {
@@ -56,8 +56,7 @@ class XnetListsModule extends ListsModule
     function prepare_client(&$page)
     {
         global $globals;
-
-        require_once dirname(__FILE__).'/lists/lists.inc.php';
+        Platal::load('lists', 'lists.inc.php');
 
         $this->client = new MMList(S::v('uid'), S::v('password'),
                                    $globals->asso('mail_domain'));