Changeset 1684

Timestamp:

03/05/10 10:40:58 (5 months ago)

Author:

klemens

Message:

Deactivate only active users

Files:

• trunk/plugins/ullCorePlugin/lib/task/UserDeactivationTask.class.php (modified) (3 diffs)

trunk/plugins/ullCorePlugin/lib/task/UserDeactivationTask.class.php

@@ -35 +35 @@
     $this->initializeDatabaseConnection($arguments, $options);
     
+    $inactiveId = Doctrine::getTable('UllUserStatus')->findOneBySlug('inactive')->id;
+    
     $q = new ullDoctrineQuery;
     
@@ -42 +44 @@
       ->orWhere('u.separation_date <= ?', date('Y-m-d'))
       ->wrapExistingWhereInParantheses()
+      ->addWhere('u.ull_user_status_id <> ?', $inactiveId)
     ;
     
@@ -51 +54 @@
     {
       $this->log('Deactivating '. $user->display_name);
-      $user['ull_user_status_id'] = Doctrine::getTable('UllUserStatus')->findOneBySlug('inactive')->id;
+      $user['ull_user_status_id'] = $inactiveId;
       $user->save();
     }