Projet

Général

Profil

Révision 5136ce55

Ajouté par Assos Assos il y a plus de 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/ldap/ldap_user/ldap_user.cron.inc
134 134
            'ldap server %sid had error while querying to
135 135
            deal with orphaned ldap user entries.  Please check that the ldap
136 136
            server is configured correctly.  Query; %query',
137
            array('%sid' => $sid, '%query' => $query),
137
            array('%sid' => $sid, '%query' => serialize($query)),
138 138
            WATCHDOG_ERROR);
139 139
          continue;
140 140
        }
......
156 156
      foreach ($puid_x_puid_attrs as $puid_attr => $puids) {
157 157
        foreach ($puids as $puid => $user_data) {
158 158

  
159
          $account = $accounts[$user_data['uid']];
160
          $user_edit['ldap_user_last_checked'][LANGUAGE_NONE][0]['value'] = $check_time;
161
          $account = user_save($account, $user_edit, 'ldap_user');
162
          if (!$user_data['exists']) {
163
              /**
164
            * $ldap_user_conf->orphanedDrupalAcctBehavior will either be
165
             *  'ldap_user_orphan_email' or one of the user module options:
166
             *     user_cancel_block, user_cancel_block_unpublish,
167
             *     user_cancel_reassign, user_cancel_delete
168
             */
169
            if ($ldap_user_conf->orphanedDrupalAcctBehavior == 'ldap_user_orphan_email') {
170
               $email_list[] = $account->name . "," . $account->mail . "," . $base_url . "/user/$uid/edit";
171
            }
172
            else {
173
               _user_cancel(array(), $account, $ldap_user_conf->orphanedDrupalAcctBehavior);
159
          if ($account = $accounts[$user_data['uid']]) {
160
            $user_edit['ldap_user_last_checked'][LANGUAGE_NONE][0]['value'] = $check_time;
161
            $account = user_save($account, $user_edit, 'ldap_user');
162
            if (!$user_data['exists']) {
163
                /**
164
              * $ldap_user_conf->orphanedDrupalAcctBehavior will either be
165
               *  'ldap_user_orphan_email' or one of the user module options:
166
               *     user_cancel_block, user_cancel_block_unpublish,
167
               *     user_cancel_reassign, user_cancel_delete
168
               */
169
              if ($ldap_user_conf->orphanedDrupalAcctBehavior == 'ldap_user_orphan_email') {
170
                 $email_list[] = $account->name . "," . $account->mail . "," . $base_url . "/user/$uid/edit";
171
              }
172
              else {
173
                 _user_cancel(array(), $account, $ldap_user_conf->orphanedDrupalAcctBehavior);
174
              }
174 175
            }
175 176
          }
176 177
        }

Formats disponibles : Unified diff