Better that way

[platal.git] / include / user.func.inc.php

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index 42ac932..d0fe12e 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -57,12 +57,9 @@ function user_clear_all_subs($user_id, $really_del=true)
     XDB::execute("DELETE FROM requests        WHERE user_id={?}", $uid);
     XDB::execute("DELETE FROM user_changes    WHERE user_id={?}", $uid);
     XDB::execute("DELETE FROM watch_sub       WHERE uid={?}", $uid);
-    
-    include_once('lists.inc.php');
-    if (function_exists(lists_xmlrpc)) {
-        $client =& lists_xmlrpc(S::v('id'), S::v('password'));
-        $client->kill($alias, $really_del);
-    }
+
+    $mmlist = new MMList(S::v('id'), S::v('password'));
+    $mmlist->kill($alias, $really_del);
 }
 
 // }}}
@@ -150,6 +147,29 @@ function get_user_forlife($data) {
 }
 
 // }}}
+// {{{ function get_users_forlife_list()
+
+function get_users_forlife_list($members, $strict = false)
+{
+    if (strlen(trim($members)) == 0) {
+        return null;
+    }
+    $members = explode(' ', $members);
+    if ($members) {
+        $list = array();
+        foreach ($members as $i => $alias) {
+            if (($login = get_user_forlife($alias)) !== false) {
+                $list[$i] = $login;
+            } else if(!$strict) {
+                $list[$i] = $alias;
+            }
+        }
+        return $list;
+    }
+    return null;
+}
+
+// }}}
 // {{{ function has_user_right()
 function has_user_right($pub, $view = 'private') {
     if ($pub == $view) return true;