* Introduced FAIstate in workstationGeneric

* Fixed problem when the user who actually locked
  an entry is not existing anymore

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3279 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/TODO b/TODO
index 9080d558413251b371b4727cd606150ba205e083..6abb8a8867d8b3eaf3c0971087924151fb651bce 100644 (file)
--- a/TODO
+++ b/TODO
@@ -26,13 +26,15 @@ Target for 2.4.1:
 
 * Auto-Resize for subdialogs
 
+* Change FAIstate when triggering actions
+  (install, sysinfo, softupdate)
+
 
 Now:
 * Add iframe progress for departments when handling tagging
-* check class_plugin.inc and what effects a ldap->cat(..., $this->attributes)
-  will have to other plugins
+* evaluate what effects a ldap->cat(..., $this->attributes)
+  will have to other plugins in class_plugin.inc
 * Enhance show_ldap_error() with an additional programmer supplied message
-* Change FAIstate when triggering actions
 * Changing LDAP-Servers -> start tab!
 
 

diff --git a/include/functions.inc b/include/functions.inc
index 6d738c32acb5b250340fd7621ccae6f985c3d2ee..4c410396501cd158c425bcaf6c02d0c4b5d77c8f 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -1004,8 +1004,16 @@ function gen_locked_message($user, $dn)
   $ldap= $config->get_ldap_link();
   $ldap->cat ($user, array('uid', 'cn'));
   $attrs= $ldap->fetch();
-  $uid= $attrs["uid"][0];
-  $cn= $attrs["cn"][0];
+
+  /* Stop if we have no user here... */
+  if (count($attrs)){
+    $uid= $attrs["uid"][0];
+    $cn= $attrs["cn"][0];
+  } else {
+    $uid= $attrs["uid"][0];
+    $cn= $attrs["cn"][0];
+  }
+  
   $remove= false;
 
   if((isset($_SESSION['LOCK_VARS_TO_USE']))&&(count($_SESSION['LOCK_VARS_TO_USE']))){

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 9de46c9825fdba00b848790f41322c613ef94a6f..409316227b38153f6ac03cdc26e8b2970d1dddc1 100644 (file)
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -24,8 +24,9 @@ class workgeneric extends plugin
   var $ghGfxAdapter= "-";
   var $ghSoundAdapter= "-";
   var $gotoLastUser= "-";
-  var $FAIscript="";
+  var $FAIscript= "";
   var $didAction= FALSE;
+  var $FAIstate= "";
 
   /* Needed values and lists */
   var $base= "";