From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 30 Jun 2008 05:48:39 +0000 (+0000)
Subject: Updated kiosk service.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4a380c8de3195abf1c9c252747daf8b6c582902a;p=gosa.git

Updated kiosk service.
-Fixed problem with unknown cn attribute.


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

diff --git a/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc b/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc
index 9136a0891..4ef9ac68e 100644
--- a/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc
+++ b/gosa-plugins/goto/admin/systems/services/kiosk/class_goKioskService.inc
@@ -4,7 +4,7 @@ class goKioskService extends goService{
 	
   /* This plugin only writes its objectClass */
   var $objectclasses    = array("goEnvironmentServer");
-  var $attributes       = array("gotoKioskProfile","cn");
+  var $attributes       = array("gotoKioskProfile");
   var $StatusFlag       = "";
  
   /* This class can't be assigned twice so it conflicts with itsself */
@@ -13,12 +13,12 @@ class goKioskService extends goService{
   var $baseDir          = "../kiosk";
   var $filesToAttach    = array();
   var $cn               = "unknown";  
+  var $orig_cn          = "unknown";  
   var $gotoKioskProfiles= array();
   var $gotoKioskProfile = array();
-
   var $server_path      = "http://%cn/kiosk";
  
-  function goKioskService(&$config,$dn)
+  function goKioskService(&$config, $dn, $parent)
   {
     goService::goService($config,$dn);
 
@@ -26,9 +26,19 @@ class goKioskService extends goService{
     $this->baseDir = $this->config->search('environment', 'kioskpath',array('menu','tabs'));
     $this->server_path = preg_replace("/%cn/", $this->cn, $this->server_path);
 
+    /* Get the current object name. 
+     */
+    if(isset($parent->parent->cn)){
+      $this->cn = &$parent->parent->cn;
+    }elseif(isset($this->attrs['cn'][0])){
+      $this->cn = $this->attrs['cn'][0];
+    }
+    $this->orig_cn = $this->cn;
+
     /* Load list of profiles and check if they still exists */
     if ($this->baseDir == ""){
-#      msg_dialog::display(_("Configuration error"), msgPool::cmdnotfound("KIOSKPATH",_("Kiosk profile service")), ERROR_DIALOG);
+#      msg_dialog::display(_("Configuration error"), 
+#      msgPool::cmdnotfound("KIOSKPATH",_("Kiosk profile service")), ERROR_DIALOG);
     }else{
       $this->gotoKioskProfiles = array();
       if(isset($this->attrs['gotoKioskProfile']) && is_array($this->attrs['gotoKioskProfile'])){
@@ -50,7 +60,7 @@ class goKioskService extends goService{
   {
     $ldap = $this->config->get_ldap_link();
     $ldap->cd($this->config->current['BASE']);
-    $ldap->search("(&(objectClass=gotoEnvironment)(gotoKioskProfile=*/".$this->cn."/*))",array("cn"));
+    $ldap->search("(&(objectClass=gotoEnvironment)(gotoKioskProfile=*/".$this->orig_cn."/*))",array("cn"));
     if ($ldap->count() != 0){
       $obj= array();
       while($attrs = $ldap->fetch()){