- Code cleanup

1 files changed, 39 insertions, 0 deletions

diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 34fbb55f0..887f80763 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -614,6 +614,45 @@ function profile_admin_delete($fid) {
   }
 }
 
+function profile_search($op = 'search', $keys = null) {
+  switch ($op) {
+    case 'name':
+      if (user_access('access user profiles')) {
+        return t('users');
+      }
+    case 'search':
+      if (user_access('access user profiles')) {
+        $find = array();
+        // Replace wildcards with MySQL/PostgreSQL wildcards.
+        $keys = preg_replace('!\*+!', '%', $keys);
+        if (user_access('administer users')) {
+          // administrators don't have restrictions
+          $result = pager_query("SELECT u.* FROM {users} u INNER JOIN {profile_values} pv ON u.uid = pv.uid WHERE LOWER(pv.value) LIKE LOWER('%%%s%%') OR LOWER(u.name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys, $keys);
+        }
+        else {
+          // non-administrators can only search public fields and active users
+          $result = pager_query("SELECT u.* FROM {users} u INNER JOIN {profile_values} pv ON u.uid = pv.uid INNER JOIN {profile_fields} pf ON pv.fid = pf.fid WHERE ((LOWER(pv.value) LIKE LOWER('%%%s%%') AND pf.visibility IN (%d, %d)) OR LOWER(u.name) LIKE LOWER('%%%s%%')) AND u.status = 1", 15, 0, NULL, $keys, PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS, $keys);
+        }
+
+        while ($account = db_fetch_object($result)) {
+          $user = user_load(array('uid' => $account->uid));
+          $profile_fields = profile_view_profile($user);
+
+          $entry = array();
+          foreach ($profile_fields as $category => $fields) {
+            foreach ($fields as $field) {
+              $entry[] = $field['value'];
+            }
+          }
+
+          $view = implode(' | ', $entry);
+          $find[] = array('title' => $account->name, 'link' => url("user/$account->uid/view"), 'snippet' => search_excerpt($keys, $view));
+        }
+        return $find;
+      }
+  }
+}
+
 function _profile_field_form($type, $edit = array()) {
 
   $form['fields'] = array('#type' => 'fieldset',