Use 'changeTpl' for xnet pages and use handler permission instead of page restriction

[platal.git] / modules / lists.php

diff --git a/modules/lists.php b/modules/lists.php
index 009950b..8dbf769 100644 (file)
--- a/modules/lists.php
+++ b/modules/lists.php
@@ -21,7 +21,7 @@
 
 class ListsModule extends PLModule
 {
-    var $client;
+    protected $client;
 
     function handlers()
     {
@@ -225,16 +225,6 @@ class ListsModule extends PLModule
         }
     }
 
-    function changeTpl($tpl)
-    {
-        if (!empty($GLOBALS['IS_XNET_SITE'])) {
-            new_group_open_page($tpl);
-        } else {
-            global $page;
-            $page->changeTpl($tpl);
-        }
-    }
-
     function handler_members(&$page, $liste = null)
     {
         if (is_null($liste)) {
@@ -243,7 +233,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/members.tpl');
+        $page->changeTpl('lists/members.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe($liste);
@@ -315,7 +305,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/trombi.tpl');
+        $page->changeTpl('lists/trombi.tpl');
 
         if (Get::has('del')) {
             $this->client->unsubscribe($liste);
@@ -351,7 +341,7 @@ class ListsModule extends PLModule
 
         $domain = $this->prepare_client($page);
 
-        $this->changeTpl('lists/archives.tpl');
+        $page->changeTpl('lists/archives.tpl');
 
         if (list($det) = $this->client->get_members($liste)) {
             if (substr($liste,0,5) != 'promo' && ($det['ins'] || $det['priv'])
@@ -451,7 +441,7 @@ class ListsModule extends PLModule
 
         $domain = $this->prepare_client($page);
 
-        $this->changeTpl('lists/moderate.tpl');
+        $page->changeTpl('lists/moderate.tpl');
 
         $page->register_modifier('hdc', 'list_header_decode');
 
@@ -513,7 +503,7 @@ class ListsModule extends PLModule
             if (list($subs,$mails) = $this->client->get_pending_ops($liste)) {
                 foreach($subs as $user) {
                     if ($user['id'] == Env::v('sid')) {
-                        $this->changeTpl('lists/moderate_sub.tpl');
+                        $page->changeTpl('lists/moderate_sub.tpl');
                         $page->assign('del_user', $user);
                         return;
                     }
@@ -533,6 +523,22 @@ class ListsModule extends PLModule
         }
     }
 
+    static public function no_login_callback($login)
+    {
+        require_once 'user.func.inc.php';
+        global $list_unregistered;
+
+        $users = get_not_registered_user($login, true);
+        if ($users->total()) {
+            if (!isset($list_unregistered)) {
+                $list_unregistered = array();
+            }
+            $list_unregistered[$login] = $users;
+        } else {
+            _default_user_callback($login);
+        }
+    }
+
     function handler_admin(&$page, $liste = null)
     {
         global $globals;
@@ -541,13 +547,43 @@ class ListsModule extends PLModule
             return PL_NOT_FOUND;
         }
 
-        $this->prepare_client($page);
+        $domain = $this->prepare_client($page);
+
+        $page->changeTpl('lists/admin.tpl');
 
-        $this->changeTpl('lists/admin.tpl');
+        if (Env::has('send_mark')) {
+            $actions = Env::v('mk_action');
+            $uids    = Env::v('mk_uid');
+            $mails   = Env::v('mk_email');
+            foreach ($actions as $key=>$action) {
+                switch ($action) {
+                  case 'none':
+                    break;
+
+                  case 'marketu': case 'markets':
+                    require_once 'emails.inc.php';
+                    $mail = valide_email($mails[$key]);
+                    if (isvalid_email_redirection($mail)) {
+                        $from = ($action == 'marketu') ? 'user' : 'staff';
+                        $market = Marketing::get($uids[$key], $mail);
+                        if (!$market) {
+                            $market = new Marketing($uids[$key], $mail, 'list', "$liste@$domain", $from, S::v('uid'));
+                            $market->add();
+                            break;
+                        }
+                    }
+
+                  default:
+                    XDB::execute('INSERT IGNORE INTO  register_subs (uid, type, sub, domain)
+                                              VALUES  ({?}, \'list\', {?}, {?})',
+                                  $uids[$key], $liste, $domain);
+                }
+            }
+        }
 
         if (Env::has('add_member')) {
             require_once('user.func.inc.php');
-            $members = get_users_forlife_list(Env::v('add_member'));
+            $members = get_users_forlife_list(Env::v('add_member'), false, array('ListsModule', 'no_login_callback'));
             $arr = $this->client->mass_subscribe($liste, $members);
             if (is_array($arr)) {
                 foreach($arr as $addr) {
@@ -568,7 +604,7 @@ class ListsModule extends PLModule
 
         if (Env::has('add_owner')) {
             require_once('user.func.inc.php');
-            $owners = get_users_forlife_list(Env::v('add_owner'));
+            $owners = get_users_forlife_list(Env::v('add_owner'), false, array('ListsModule', 'no_login_callback'));
             if ($owners) {
                 foreach ($owners as $login) {
                     if ($this->client->add_owner($liste, $login)) {
@@ -588,6 +624,10 @@ class ListsModule extends PLModule
         }
 
         if (list($det,$mem,$own) = $this->client->get_members($liste)) {
+            global $list_unregistered;
+            if ($list_unregistered) {
+                $page->assign_by_ref('unregistered', $list_unregistered);
+            }
             $membres = list_sort_members($mem, @$tri_promo);
             $moderos = list_sort_owners($own, @$tri_promo);
 
@@ -611,7 +651,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/options.tpl');
+        $page->changeTpl('lists/options.tpl');
 
         if (Post::has('submit')) {
             $values = $_POST;
@@ -673,7 +713,7 @@ class ListsModule extends PLModule
             $type   = 'list';
         }
 
-        $this->changeTpl('lists/delete.tpl');
+        $page->changeTpl('lists/delete.tpl');
         if (Post::v('valid') == 'OUI') {
             if ($this->client->delete_list($liste, Post::b('del_archive'))) {
                 foreach (array('', '-owner', '-admin', '-bounces') as $app) {
@@ -704,7 +744,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/soptions.tpl');
+        $page->changeTpl('lists/soptions.tpl');
 
         if (Post::has('submit')) {
             $values = $_POST;
@@ -731,7 +771,7 @@ class ListsModule extends PLModule
 
         $this->prepare_client($page);
 
-        $this->changeTpl('lists/check.tpl');
+        $page->changeTpl('lists/check.tpl');
 
         if (Post::has('correct')) {
             $this->client->check_options($liste, true);
@@ -746,7 +786,7 @@ class ListsModule extends PLModule
     }
 
     function handler_admin_all(&$page) {
-        $this->changeTpl('lists/admin_all.tpl');
+        $page->changeTpl('lists/admin_all.tpl');
         $page->assign('xorg_title','Polytechnique.org - Administration - Mailing lists');
 
         $client = new MMList(S::v('uid'), S::v('password'));