pending commit, finished during MQ/S download ...

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index e393a7f..95c2ec8 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -47,13 +47,11 @@ class ListsModule extends PLModule
     {
         require_once 'lists.inc.php';
 
-        $this->client =& lists_xmlrpc(Session::getInt('uid'), Session::get('password'));
+        $this->client =& lists_xmlrpc(S::v('uid'), S::v('password'));
     }
 
     function handler_lists(&$page)
     {
-        global $globals;
-
         $this->prepare_client($page);
 
         $page->changeTpl('listes/index.tpl');
@@ -82,7 +80,6 @@ class ListsModule extends PLModule
 
     function handler_create(&$page)
     {
-        global $globals;
         $page->changeTpl('listes/create.tpl');
 
         $owners  = preg_split("/[\s]+/", Post::get('owners'), -1, PREG_SPLIT_NO_EMPTY);
@@ -155,7 +152,7 @@ class ListsModule extends PLModule
         if (!$page->nb_errs()) {
             $page->assign('created', true);
             require_once 'validations.inc.php';
-            $req = new ListeReq(Session::getInt('uid'), $liste,
+            $req = new ListeReq(S::v('uid'), $liste,
                                 Post::get('desc'), Post::getInt('advertise'),
                                 Post::getInt('modlevel'), Post::getInt('inslevel'),
                                 $owners, $members);
@@ -165,8 +162,6 @@ class ListsModule extends PLModule
 
     function handler_members(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }
@@ -204,7 +199,7 @@ class ListsModule extends PLModule
 
     function _get_list($offset, $limit)
     {
-        global $globals, $platal;
+        global $platal;
         list($total, $members) = $this->client->get_members_limit($platal->argv[1], $offset, $limit);
 
         $membres = Array();
@@ -226,8 +221,6 @@ class ListsModule extends PLModule
 
     function handler_trombi(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }
@@ -307,8 +300,6 @@ class ListsModule extends PLModule
 
     function handler_moderate(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }
@@ -333,8 +324,8 @@ class ListsModule extends PLModule
             $mail   = $this->client->get_pending_mail($liste, $mid);
             $reason = '';
 
-            $prenom = Session::get('prenom');
-            $nom    = Session::get('nom');
+            $prenom = S::v('prenom');
+            $nom    = S::v('nom');
 
             if (Env::has('mok')) {
                 $action  = 1; /** 2 = ACCEPT **/
@@ -488,8 +479,6 @@ class ListsModule extends PLModule
 
     function handler_options(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }
@@ -541,8 +530,6 @@ class ListsModule extends PLModule
 
     function handler_delete(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }
@@ -571,8 +558,6 @@ class ListsModule extends PLModule
 
     function handler_soptions(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }
@@ -599,8 +584,6 @@ class ListsModule extends PLModule
 
     function handler_check(&$page, $liste = null)
     {
-        global $globals;
-
         if (is_null($liste)) {
             return PL_NOT_FOUND;
         }