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

Diff of /contributions/modules/logintoboggan/logintoboggan.module

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

revision 1.174, Sat Oct 31 21:40:25 2009 UTC revision 1.175, Mon Nov 2 22:15:35 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: logintoboggan.module,v 1.173 2009/10/31 13:32:15 thehunmonkgroup Exp $  // $Id: logintoboggan.module,v 1.174 2009/10/31 21:40:25 thehunmonkgroup Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 163  function logintoboggan_form_logintobogga Line 163  function logintoboggan_form_logintobogga
163   * @ingroup logintoboggan_core   * @ingroup logintoboggan_core
164   */   */
165  function logintoboggan_form_user_profile_form_alter(&$form, &$form_state) {  function logintoboggan_form_user_profile_form_alter(&$form, &$form_state) {
   global $user;  
166    
167    if ($form['#user_category'] == 'account') {    if ($form['#user_category'] == 'account') {
168      $account = $form['#user'];      $account = $form['#user'];
# Line 171  function logintoboggan_form_user_profile Line 170  function logintoboggan_form_user_profile
170    
171      // User is editing their own account settings, or user admin      // User is editing their own account settings, or user admin
172      // is editing their account.      // is editing their account.
173      if ($user->uid == $account->uid || user_access('administer users')) {      if ($GLOBALS['user']->uid == $account->uid || user_access('administer users')) {
174        // Display link to re-send validation e-mail.        // Display link to re-send validation e-mail.
175        // Re-validate link appears if:        // Re-validate link appears if:
176        //   1. Users can create their own password.        //   1. Users can create their own password.
# Line 752  function logintoboggan_menu() { Line 751  function logintoboggan_menu() {
751   * Access check for user revalidation.   * Access check for user revalidation.
752   */   */
753  function logintoboggan_revalidate_access($uid) {  function logintoboggan_revalidate_access($uid) {
754    global $user;    return $GLOBALS['user']->uid && ($GLOBALS['user']->uid == $uid || user_access('administer users'));
   
   return $user->uid && ($user->uid == $uid || user_access('administer users'));  
755  }  }
756    
757  /**  /**
# Line 1030  function logintoboggan_main_settings(&$f Line 1027  function logintoboggan_main_settings(&$f
1027  }  }
1028    
1029  function logintoboggan_denied() {  function logintoboggan_denied() {
1030    global $user;    if ($GLOBALS['user']->uid == 0) {
   if ($user->uid == 0) {  
1031      // Output the user login form.      // Output the user login form.
1032      drupal_set_title(t('Access Denied / User Login'));      drupal_set_title(t('Access Denied / User Login'));
1033      $output = drupal_get_form('user_login');      $output = drupal_get_form('user_login');
Legend:
Removed from v.1.174  
changed lines
  Added in v.1.175
  ViewVC Help
Powered by ViewVC 1.1.2