Refactored memcp.php for new version.

miqrogroove · Feb 15, 2025 · e8e6301 · e8e6301
1 parent 694b617
commit e8e6301
Show file tree

Hide file tree

Showing 33 changed files with 1,232 additions and 895 deletions.
diff --git a/admin/members.php b/admin/members.php
@@ -99,52 +99,23 @@
 if (noSubmit('membersubmit')) {
     if (!$members) {
         $body = $template->process('admin_members_search.php');
-    } else if ($members == "search") {
+    } elseif ($members == "search") {
         $template->token = $token->create('Control Panel/Members', 'mass-edit', $vars::NONCE_FORM_EXP);
 
         $body = $template->process('admin_members_edit_start.php');
 
         $query = $db->query("SELECT * FROM " . $vars->tablepre . "members $where ORDER BY username");
 
-        while($member = $db->fetch_array($query)) {
+        while ($member = $db->fetch_array($query)) {
             $template->member = $member;
             $template->userLink = recodeOut($member['username']);
             $template->statusAttr = attrOut($member['customstatus']);
-            $template->sadminselect = '';
-            $template->adminselect = '';
-            $template->smodselect = '';
-            $template->modselect = '';
-            $template->memselect = '';
-            $template->banselect = '';
+            $template->userStatus = $core->userStatusControl("status{$member['uid']}", $member['status']);
             $template->noban = '';
             $template->u2uban = '';
             $template->postban = '';
             $template->bothban = '';
 
-            switch($member['status']) {
-                case 'Super Administrator':
-                    $template->sadminselect = $vars::selHTML;
-                    break;
-                case 'Administrator':
-                    $template->adminselect = $vars::selHTML;
-                    break;
-                case 'Super Moderator':
-                    $template->smodselect = $vars::selHTML;
-                    break;
-                case 'Moderator':
-                    $template->modselect = $vars::selHTML;
-                    break;
-                case 'Member':
-                    $template->memselect = $vars::selHTML;
-                    break;
-                case 'Banned':
-                    $template->banselect = $vars::selHTML;
-                    break;
-                default:
-                    $template->memselect = $vars::selHTML;
-                    break;
-            }
-
             switch($member['ban']) {
                 case 'u2u':
                     $template->u2uban = $vars::selHTML;
@@ -180,17 +151,17 @@
         $template->srchstatus = $srchstatus;
         $body .= $template->process('admin_members_edit_end.php');
     }
-} else if (onSubmit('membersubmit')) {
+} elseif (onSubmit('membersubmit')) {
     $core->request_secure('Control Panel/Members', 'mass-edit', error_header: true);
-    $query = $db->query("SELECT uid, username, password, status FROM " . $vars->tablepre . "members $where");
+    $query = $db->query("SELECT uid, username, status FROM " . $vars->tablepre . "members $where");
 
     // Guarantee this request will not remove all Super Administrators.
     if (X_SADMIN && $db->num_rows($query) > 0) {
         $saquery = $db->query("SELECT COUNT(uid) FROM " . $vars->tablepre . "members WHERE status='Super Administrator'");
         $sa_count = (int) $db->result($saquery, 0);
         $db->free_result($saquery);
 
-        while($mem = $db->fetch_array($query)) {
+        while ($mem = $db->fetch_array($query)) {
             if ($mem['status'] == 'Super Administrator' && $core->postedVar('status'.$mem['uid']) != 'Super Administrator') {
                 $sa_count--;
             }
@@ -202,7 +173,7 @@
     }
 
     // Now execute this request
-    while($mem = $db->fetch_array($query)) {
+    while ($mem = $db->fetch_array($query)) {
         $origstatus = $mem['status'];
         $status = $core->postedVar('status'.$mem['uid']);
         if ($status == '') {
@@ -234,9 +205,17 @@
             $db->query("DELETE FROM " . $vars->tablepre . "u2u WHERE owner='{$mem['username']}'");
             $db->query("UPDATE " . $vars->tablepre . "whosonline SET username='xguest123' WHERE username='{$mem['username']}'");
         } else {
-            $db->query("UPDATE " . $vars->tablepre . "members SET ban='$banstatus', status='$status', postnum='$postnum', customstatus='$cusstatus'$queryadd WHERE uid={$mem['uid']}");
-            if ('' != $queryadd) {
-                $session->logoutAll($mem['username']);
+            $db->query("UPDATE " . $vars->tablepre . "members SET ban='$banstatus', status='$status', postnum='$postnum', customstatus='$cusstatus' WHERE uid={$mem['uid']}");
+
+            if (getRawString('pw' . $mem['uid']) != '') {
+                $newPass = $core->assertPasswordPolicy('pw' . $mem['uid'], 'pw' . $mem['uid']);
+                $passMan = new \XMB\Password($sql);
+                $passMan->changePassword($mem['username'], $newPass);
+                unset($newPass, $passMan);
+
+                // Force logout and delete cookies.
+                $sql->deleteWhosonline($mem['username']);
+                $session->logoutAll($mem['username'], isSelf: false);
             }
         }
     }

diff --git a/buddy.php b/buddy.php
@@ -34,8 +34,6 @@
 $template = \XMB\Services\template();
 $vars = \XMB\Services\vars();
 
-require XMB_ROOT . 'include/buddy.inc.php';
-
 header('X-Robots-Tag: noindex');
 
 if (X_GUEST) {