/[drupal]/contributions/modules/drupalvb/drupalvb.module
ViewVC logotype

Diff of /contributions/modules/drupalvb/drupalvb.module

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

revision 1.33, Sat Oct 18 17:09:35 2008 UTC revision 1.34, Sun Feb 1 02:00:25 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: drupalvb.module,v 1.32 2008/10/15 02:31:03 sun Exp $  // $Id: drupalvb.module,v 1.33 2008/10/18 17:09:35 sun Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 42  function drupalvb_help($path, $arg) { Line 42  function drupalvb_help($path, $arg) {
42        return t('Allows basic integration of Drupal with a vBulletin forum.');        return t('Allows basic integration of Drupal with a vBulletin forum.');
43    
44      case 'admin/settings/drupalvb':      case 'admin/settings/drupalvb':
45        require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';        module_load_include('inc', 'drupalvb');
46        $vb_config = drupalvb_get('config');        $vb_config = drupalvb_get('config');
47        $vb_options = drupalvb_get('options');        $vb_options = drupalvb_get('options');
48        if (empty($vb_config)) {        if (empty($vb_config)) {
# Line 144  function drupalvb_perm() { Line 144  function drupalvb_perm() {
144   */   */
145  function drupalvb_settings($form = 'integration') {  function drupalvb_settings($form = 'integration') {
146    $path = drupal_get_path('module', 'drupalvb');    $path = drupal_get_path('module', 'drupalvb');
147    require_once $path .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
148    require_once $path .'/drupalvb.admin-pages.inc';    module_load_include('inc', 'drupalvb', 'drupalvb.admin-pages');
149    return drupal_get_form('drupalvb_settings_'. $form);    return drupal_get_form('drupalvb_settings_'. $form);
150  }  }
151    
# Line 162  function drupalvb_settings($form = 'inte Line 162  function drupalvb_settings($form = 'inte
162   */   */
163  function drupalvb_form_alter(&$form, $form_state, $form_id) {  function drupalvb_form_alter(&$form, $form_state, $form_id) {
164    if ($form_id == 'user_login_block' || $form_id == 'user_login') {    if ($form_id == 'user_login_block' || $form_id == 'user_login') {
165      require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';      module_load_include('inc', 'drupalvb');
166    
167      // Splice in our validate handler for authentication if user is performing      // Splice in our validate handler for authentication if user is performing
168      // a vBulletin login.      // a vBulletin login.
# Line 212  function drupalvb_login_validate($form, Line 212  function drupalvb_login_validate($form,
212      return TRUE;      return TRUE;
213    }    }
214    
215    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
216    if (!drupalvb_db_is_valid()) {    if (!drupalvb_db_is_valid()) {
217      return;      return;
218    }    }
# Line 272  function drupalvb_user_pass_validate($fo Line 272  function drupalvb_user_pass_validate($fo
272      return;      return;
273    }    }
274    
275    require_once drupal_get_path('module', 'drupalvb') . '/drupalvb.inc';    module_load_include('inc', 'drupalvb');
276    
277    // Try to import a corresponding user from vB.    // Try to import a corresponding user from vB.
278    if ($userid = db_result(drupalvb_db_query("SELECT userid FROM {user} WHERE username = '%s' OR email = '%s'", drupalvb_htmlspecialchars($name), $name))) {    if ($userid = db_result(drupalvb_db_query("SELECT userid FROM {user} WHERE username = '%s' OR email = '%s'", drupalvb_htmlspecialchars($name), $name))) {
# Line 295  function drupalvb_user_load($userid) { Line 295  function drupalvb_user_load($userid) {
295   * Implementation of hook_user().   * Implementation of hook_user().
296   */   */
297  function drupalvb_user($op, &$edit, &$account, $category = NULL) {  function drupalvb_user($op, &$edit, &$account, $category = NULL) {
298    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
299    if (!drupalvb_db_is_valid()) {    if (!drupalvb_db_is_valid()) {
300      return;      return;
301    }    }
# Line 512  function drupalvb_login() { Line 512  function drupalvb_login() {
512   */   */
513  function drupalvb_logout() {  function drupalvb_logout() {
514    global $user;    global $user;
515    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
516      module_load_include('inc', 'user', 'pages');
517    
518    if ($user->uid) {    if ($user->uid) {
519      if (module_exists('singlesignon')) {      if (module_exists('singlesignon')) {
# Line 635  function drupalvb_block($op = 'list', $d Line 636  function drupalvb_block($op = 'list', $d
636      }      }
637    }    }
638    else if ($op == 'view') {    else if ($op == 'view') {
639      require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';      module_load_include('inc', 'drupalvb');
640      $block = array();      $block = array();
641      if (!drupalvb_db_is_valid()) {      if (!drupalvb_db_is_valid()) {
642        return $block;        return $block;
# Line 933  function theme_drupalvb_username($object Line 934  function theme_drupalvb_username($object
934   */   */
935  function drupalvb_private_messages() {  function drupalvb_private_messages() {
936    global $user;    global $user;
937    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
938    
939    $vb_options = drupalvb_get('options');    $vb_options = drupalvb_get('options');
940    
# Line 1014  function drupalvb_redirect() { Line 1015  function drupalvb_redirect() {
1015   *   The corresponding Drupal uid, if the vBulletin userid could be validated.   *   The corresponding Drupal uid, if the vBulletin userid could be validated.
1016   */   */
1017  function drupalvb_lookup_drupal_user($userid) {  function drupalvb_lookup_drupal_user($userid) {
1018    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
1019    
1020    // Check if this vBulletin user id already exists as Drupal user.    // Check if this vBulletin user id already exists as Drupal user.
1021    if ($uid = drupalvb_user_load($userid)) {    if ($uid = drupalvb_user_load($userid)) {
# Line 1074  function drupalvb_lookup_drupal_user($us Line 1075  function drupalvb_lookup_drupal_user($us
1075   * existing messages.   * existing messages.
1076   */   */
1077  function drupalvb_privatemsg($message, $op) {  function drupalvb_privatemsg($message, $op) {
1078    require_once drupal_get_path('module', 'drupalvb') .'/drupalvb.inc';    module_load_include('inc', 'drupalvb');
1079    if (!(variable_get('drupalvb_pm_sync', FALSE) && drupalvb_db_is_valid())) {    if (!(variable_get('drupalvb_pm_sync', FALSE) && drupalvb_db_is_valid())) {
1080      return;      return;
1081    }    }
Legend:
Removed from v.1.33  
changed lines
  Added in v.1.34
  ViewVC Help
Powered by ViewVC 1.1.2