Take care about filenames containing a /. Just use the basename then.

[gosa.git] / gosa-core / include / class_gosaSupportDaemon.inc

diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc
index 13f6470060cc3ccf026bb7470f06ab01568f12f5..6c1fd89606671a616dc39c4530530dd6dc79b116 100644 (file)
--- a/gosa-core/include/class_gosaSupportDaemon.inc
+++ b/gosa-core/include/class_gosaSupportDaemon.inc
@@ -827,6 +827,13 @@ class gosaSupportDaemon
         }
         if ($xml_elem['type'] == 'complete') {
 
+          $start_level = 1;
+          $test2 = &$params;
+          while($start_level < $xml_elem['level']) {
+            $test2 = &$test2[$level[$start_level]];
+            $start_level++;
+          }
+
           /* Save tag attributes too. 
               e.g. <tag attr="val">
            */
@@ -836,12 +843,6 @@ class gosaSupportDaemon
             }
           }
 
-          $start_level = 1;
-          $test2 = &$params;
-          while($start_level < $xml_elem['level']) {
-            $test2 = &$test2[$level[$start_level]];
-            $start_level++;
-          }
           if(!isset($test2[$xml_elem['tag']])){
             if(isset($xml_elem['value'])){
               $test2[$xml_elem['tag']] = $xml_elem['value'];
@@ -1839,7 +1840,7 @@ class gosaSupportDaemon
       @param  ...
       @return Array   All queued entries.
    */
-  public function DAK_get_queue_entries($server)  
+  public function DAK_keyring_entries($server)  
   {
     /* Ensure that we send the event to a valid mac address 
      */
@@ -1898,6 +1899,11 @@ class gosaSupportDaemon
       $key = preg_replace("/^.*\n\n/sim","",$key);
       /* Remove footer */
       $key = preg_replace("/-----.*$/sim","",$key);
+    }elseif (!preg_match('%^[a-zA-Z0-9/+]*={0,2}$%', $key)) {
+      
+      /* Encode key if it is raw.
+       */
+      $key = base64_encode($key);
     }
 
     /* Create query
@@ -1933,7 +1939,7 @@ class gosaSupportDaemon
     $xml_msg = "<xml> 
                   <header>gosa_remove_dak_key</header> 
                   <target>".$server."</target> 
-                  <uid>".$key."</uid> 
+                  <keyid>".$key."</keyid> 
                   <source>GOSA</source>
                 </xml>";