From 528823855fced9a8302245de0e5567275af066f0 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 11 May 2006 08:32:33 +0000 Subject: [PATCH] * 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 --- TODO | 8 +++++--- include/functions.inc | 12 ++++++++++-- plugins/admin/systems/class_workstationGeneric.inc | 3 ++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 9080d5584..6abb8a886 100644 --- 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 6d738c32a..4c4103965 100644 --- 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 9de46c982..409316227 100644 --- 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= ""; -- 2.30.2