/[drupal]/contributions/modules/nf_handshake/nf_handshake.module

Diff of /contributions/modules/nf_handshake/nf_handshake.module

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.1.2.5,
Tue Sep 18 04:22:20 2007 UTC
+revision 1.1.2.6,
Fri Oct 26 19:49:25 2007 UTC
 Line 12
   * @link none yet
   * TODO fix date presentation
   * TODO remove all handshake menu items/user profile items from user 1 and other 'administer handshake' people if the settings match
-  * TODO allow admin to designate some fields as always viewable (handshake not needed); display above handshake/contact option
+  * TODO allow admin to designate some fields as always viewable (handshake not needed); display above handshake/contact option if have permission to view this
-  * TODO user search - by username, by address, by ???; allow admin to specify fields that are searchable; make as a separate,
+  * TODO allow users to designate some fields as always viewable (handshake not needed); display above handshake/contact option
+  * TODO user search - by address, by ???; allow admin to specify fields that are searchable; make as a separate,
   * companion module like nf_handshake_user_search.module; if search field is 'always viewable' then results would include everyone who meets
   * the criteria, otherwise, only those where a handshake exists and that data is exposed.
   * TODO Add tab in admin UI so admin can selectively place sub-fields of complex CCK fields into either a separate effective field
-Line 106 
 function nf_handshake_perm() {
+Line 107 
 function nf_handshake_perm() {
  function nf_handshake_menu($may_cache) {
    $items = array();
    global $user;
-   if (!$may_cache) {
+   if ($may_cache) {
      //-----------------------admin ui menu items----------------------------------
      $items[] = array( //setup which data can be exchanged in the handshake process
      'path' => 'admin/user/nf_handshake',
-Line 281 
 someone that has another field type in t
+Line 282 
 someone that has another field type in t
      'access' => user_access('intitiate handshake')|| user_access('accept handshake'),
      'type' => MENU_CALLBACK,
      );
-   //}
+   }
-   //else {//TODO remove the comments here before final version
+   else {
      //-----------------------user-viewable menu itmes----------------------------------
      $admin_access = user_access('administer users');
      $access_access = user_access('administer access control');
-Line 321 
 someone that has another field type in t
+Line 322 
 someone that has another field type in t
      $flags_to_attend += nf_handshake_get_read_handshake_flags_auid($user->uid);
      $new = $new_handshakes + $flags_to_attend;
      $items[] = array(
-     'path' => 'user/' .$user->uid. '/nf_handshake/inbox',
+     'path' => 'user/' .$user->uid. '/nf_handshake',
-     'title' => t('Handshakes'). ($new ? ' (' .$new. ')' : ' -') . ($unanswered_handshakes ? ' (' .$unanswered_handshakes. ')' : ' -'),
+     'title' => t('Handshakes'),
      'callback' => 'drupal_get_form',
-     'callback arguments' => array('nf_handshake_inbox'),
+     'callback arguments' => array('nf_handshake_view_contacts'),
-     'access' => user_access('accept handshake'),
+     'access' => user_access('view own handshakes'),
-     'type' => MENU_LOCAL_TASK|MENU_DYNAMIC_ITEM,
+     'type' => MENU_LOCAL_TASK,
      );
      //view handshake list
      $items[] = array(
      'path' => 'user/' .$user->uid. '/nf_handshake/view_contacts',
-     'title' => t('Handshake contacts'),
+     'title' => t('Contacts'),
-     'callback' => 'drupal_get_form',
-     'callback arguments' => array('nf_handshake_view_contacts'),
      'access' => user_access('view own handshakes'),
-     'type' => MENU_LOCAL_TASK|MENU_DYNAMIC_ITEM,
+     'type' => MENU_DEFAULT_LOCAL_TASK,
+     'weight' => -10,
+     );
+     $items[] = array(
+     'path' => 'user/' .$user->uid. '/nf_handshake/inbox',
+     'title' => t('Handshake inbox'). ($new ? ' (' .$new. ')' : ' -') . ($unanswered_handshakes ? ' (' .$unanswered_handshakes. ')' : ' -'),
+     'callback' => 'drupal_get_form',
+     'callback arguments' => array('nf_handshake_inbox'),
+     'access' => user_access('accept handshake'),
+     'type' => MENU_LOCAL_TASK,
+     'weight' => -6,
+     );
+     $items[] = array(
+     'path' => 'user/' .$user->uid. '/nf_handshake/search',
+     'title' => t('User search'),
+     'callback' => 'nf_handshake_search_view',
+     'access' => user_access('access user profiles'),
+     'type' => MENU_LOCAL_TASK,
+     'weight' => -4,
      );
      //view a handshake request
-Line 375 
 function nf_handshake_cron() {
+Line 391 
 function nf_handshake_cron() {
        $unit = 60*60*24*365;
        break;
    }
-   $sql = "SELECT auid, iuid, datestamp FROM {nf_handshake} WHERE hstatus = '%s' OR hstatus = '%s' AND duration < %d";
+   $sql = "SELECT auid, iuid, datestamp, duration FROM {nf_handshake} WHERE (hstatus = %d OR hstatus = %d) AND duration < %d";
    $results = db_query($sql, NFHANDSHAKE_PENDING, NFHANDSHAKE_REVIEWED, time());
    while ($result = db_fetch_object($results)) {
      $entries['auid'][] = $result->auid;
-Line 384 
 function nf_handshake_cron() {
+Line 401 
 function nf_handshake_cron() {
    }
    $sql1 = "UPDATE {nf_handshake} SET duration = %d, hstatus = %d WHERE iuid= %d AND auid = %d";
    $sql2 = "DELETE FROM {nf_handshake_manage} WHERE iuid= %d AND auid = %d";
-   foreach ($entries['auid'] as $key => $value) {
+   if (!empty($entries['auid'])) {
-     $duration = $entries['datestamp'][$key] + ($unit*$number);
+     foreach ($entries['auid'] as $key => $value) {
-     $success1 = db_query($sql1, $duration, NFHANDSHAKE_REJECTED, $entries['iuid'][$key], $entries['auid'][$key]);
+       $duration = $entries['datestamp'][$key] + ($unit*$number);
-     $success2 = db_query($sql2, $entries['iuid'][$key], $entries['auid'][$key]);
+       $success1 = db_query($sql1, $duration, NFHANDSHAKE_REJECTED, $entries['iuid'][$key], $entries['auid'][$key]);
+       $success2 = db_query($sql2, $entries['iuid'][$key], $entries['auid'][$key]);
+     }
    }
    //Expire rejected handshakes NFHANDSHAKE_EXPIRED
    $sql3 = "UPDATE {nf_handshake} SET hstatus = %d WHERE duration < %d AND hstatus = %d";
-Line 1466 
 function nf_handshake_flag_decisions() {
+Line 1485 
 function nf_handshake_flag_decisions() {
   *
   * If the user is an admin or is trying to view his own profile, call user_view so it's shown to him like normal.
   * Otherwise, check if the current user has previously shaken hands with the user whose profile he's trying to
-  * view. If so and it was accepted, present the exposed data. If so and it the request is pending or some other
+  * view. If so and it was accepted, present the exposed data. If so and if the request is pending or some other
   * intermediate condition exists, show what that condition is. If no handshake has been made, present the user
   * with a form to request a handshake from the other user.
   *
-Line 2426 
 function theme_nf_handshake_inbox($form)
+Line 2445 
 function theme_nf_handshake_inbox($form)
      '#weight' => 0,
      );
    $output .= theme('fieldset', $fieldset2);
-   $output .= '<br />' .l(t('View your handshake contacts'), 'user/' .$user->uid. '/nf_handshake/view_contacts', array('title' => t("View all of the people you have shaken hands with.")));
+   $output .= '<br />' .l(t('View your handshake contacts'), 'user/' .$user->uid. '/nf_handshake', array('title' => t("View all of the people you have shaken hands with.")));
    $output .= drupal_render($form);
    return $output;
  } // function theme_nf_handshake_inbox()
-Line 3754 
 function theme_nf_handshake_view_contact
+Line 3773 
 function theme_nf_handshake_view_contact
                   array('title' => t("You may revoke specific fields from the handshake at any time.")));
      $rows[] = array(l($username, 'user/' .$uid), date('M j Y', $datestamp), date('M j Y', $duration), $contact, $revoke, $extend, $upgrade, $downgrade);
    }
    $output .= theme('table', $header, $rows, array('width' => '100%'));
    $output .= drupal_render($form);
    return $output;
  } // function theme_nf_handshake_view_contacts()
+ /**
+  * Menu callback; presents the search form and/or search results.
+  */
+ function nf_handshake_search_view() {
+   $type = 'username';
+   // Search form submits with POST but redirects to GET. This way we can keep
+   // the search query URL clean as a whistle:
+   // search/type/keyword+keyword
+   if (!isset($_POST['form_id'])) {
+     if ($type == '') {
+       // Note: search/node can not be a default tab because it would take on the
+       // path of its parent (search). It would prevent remembering keywords when
+       // switching tabs. This is why we drupal_goto to it from the parent instead.
+       drupal_goto('search/node');
+     }
+     $keys = nf_handshake_search_get_keys();
+     // Only perform search if there is non-whitespace search term:
+     if (trim($keys)) {
+       // Log the search keys:
+       //watchdog('nf_handshake', t('%keys (@type).', array('%keys' => $keys, '@type' => module_invoke($type, 'search', 'name'))), WATCHDOG_NOTICE, l(t('results'), 'search/'. $type .'/'. $keys));
+       // Collect the search results:
+       $results = array();
+       // Replace wildcards with MySQL/PostgreSQL wildcards.
+       $keys = preg_replace('!\*+!', '%', $keys);
+       $result = pager_query("SELECT name, uid FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys);
+       while ($account = db_fetch_object($result)) {
+         $results[] = array('title' => $account->name, 'link' => url('user/'. $account->uid, NULL, NULL, TRUE));
+       }
+       if (isset($results) && is_array($results) && count($results)) {
+         $results = theme('search_page', $results, $type);
+       }
+       if ($results) {
+         $results = theme('box', t('Search results'), $results);
+       }
+       else {
+         $results = theme('box', t('Your search yielded no results'), search_help('search#noresults'));
+       }
+     }
+     // Construct the search form.
+     $output = drupal_get_form('nf_handshake_search_box', $keys);
+     $output .= $results;
+     return $output;
+   }
+   return drupal_get_form('nf_handshake_search_box', $keys);
+ } // function nf_handshake_search_view()
+ /**
+  * Output a search form for the search block and the theme's search box.
+  */
+ function nf_handshake_search_box($keys = '') {
+   // Add CSS
+   drupal_add_css(drupal_get_path('module', 'search') .'/search.css', 'module', 'all', FALSE);
+   // Use search_keys instead of keys to avoid ID conflicts with the search block.
+   $form['nf_handshake_search_box_keys'] = array(
+     '#type' => 'textfield',
+     '#title' => t('Username search'),
+     '#size' => 40,
+     '#default_value' => $keys,
+   );
+   $form['submit'] = array('#type' => 'submit', '#value' => t('Search'));
+   if ($results !== '') {
+     $form['results'] = $results;
+   }
+   return $form;
+ } // function nf_handshake_search_box()
+ /**
+  * Process a block search form submission.
+  */
+ function nf_handshake_search_box_submit($form_id, $form_values) {
+   global $user;
+   $keys = $form_values['nf_handshake_search_box_keys'];
+   if ($keys == '') {
+     form_set_error('keys', t('Please enter some keywords.'));
+     // Fall through to the drupal_goto() call.
+   }
+   return 'user/'. $user->uid .'/nf_handshake/search/'. $keys;
+ } // function nf_handshake_search_box_form_submit()
+ /**
+  * Theme the theme search form.
+  */
+ function theme_nf_handshake_search_box($form) {
+   $output = '<div class="search-form">'. drupal_render($form) .'</div>';
+   if (isset($form['results']) && is_array($form['results']) && count($form['results'])) {
+     $output .=  theme('search_page', $form['results'], 'user');
+   }
+   return;
+ }
  //-----------------------------------------Helper Functions-----------------------------------------
  //-----------------------------------------Helper Functions-----------------------------------------
  //-----------------------------------------Helper Functions-----------------------------------------
  /**
+  * Helper function for grabbing search keys.
+  */
+ function nf_handshake_search_get_keys() {
+   // Extract keys as remainder of path
+   // Note: support old GET format of searches for existing links.
+   $path = explode('/', $_GET['q'], 5);
+   return count($path) == 5 ? $path[4] : $_REQUEST['keys'];
+ }
+ /**
   * return an array that can be used in a drop down selector and which corresponds to the constants for the user flags.
   */
  function nf_handshake_get_status_flags() {

 Legend:



Removed from v.1.1.2.5
 


changed lines


 
Added in v.1.1.2.6
 Legend:



Removed from v.1.1.2.5
 


changed lines


 
Added in v.1.1.2.6
-Removed from v.1.1.2.5
+Added in v.1.1.2.6

	ViewVC Help
Powered by ViewVC 1.1.2