Changeset 1065 in ExiteCMS for branches/PLi-Fusion/members.php

Timestamp:

11/05/07 22:23:47 (5 years ago)

Author:

hverton

Message:

Merged trunk revision 1056:1064 into the PLi-Fusion branch

File:

• branches/PLi-Fusion/members.php (modified) (3 diffs)

branches/PLi-Fusion/members.php

@@ -38 +38 @@
 if (iMEMBER) {
     // create the where clause
+    $filter = "user_status = 0";    // only show activated accounts
     if ($sortby == "all") {
-        if ($country == "") {
-            $orderby = "";
-        } else {
-            $orderby = " user_cc_code = '".$country."'";
+        if ($country != "") {
+            $filter .= " AND user_cc_code = '".$country."'";
         }
     } else {
         if ($country == "") {
-            $orderby = " user_name LIKE '".stripinput($sortby)."%' OR user_name LIKE '".strtolower(stripinput($sortby))."%'";
+            $filter .= " AND user_name LIKE '".stripinput($sortby)."%' OR user_name LIKE '".strtolower(stripinput($sortby))."%'";
         } else {
-            $orderby = " user_cc_code = '".$country."' AND (user_name LIKE '".stripinput($sortby)."%' OR user_name LIKE '".strtolower(stripinput($sortby))."%')";
+            $filter .= " AND user_cc_code = '".$country."' AND (user_name LIKE '".stripinput($sortby)."%' OR user_name LIKE '".strtolower(stripinput($sortby))."%')";
         }
     }
@@ -54 +53 @@
     $variables['members'] = array();
     if (!isset($rowstart) || !isNum($rowstart)) $rowstart = 0;
-    $result = dbquery("SELECT * FROM ".$db_prefix."users".($orderby==""?"":" WHERE").$orderby." ORDER BY user_level DESC, user_name LIMIT ".$rowstart.", ".ITEMS_PER_PAGE);
+    $result = dbquery("SELECT * FROM ".$db_prefix."users ".($filter==""?"":("WHERE ".$filter))." ORDER BY user_level DESC, user_name LIMIT ".$rowstart.", ".ITEMS_PER_PAGE);
     $rows = dbrows($result);
     $variables['members'] = array();
@@ -93 +92 @@
     if (count($variables['search'])%2) $variables['search'][] = "";
     $variables['sortby'] = $sortby;
-    $variables['rows'] = dbcount("(*)", "users", $orderby);
+    $variables['rows'] = dbcount("(*)", "users", $filter);
     $variables['rowstart'] = $rowstart;
     $variables['items_per_page'] = ITEMS_PER_PAGE;