Added acls to mimetype

[gosa.git] / plugins / admin / applications / class_applicationGeneric.inc

diff --git a/plugins/admin/applications/class_applicationGeneric.inc b/plugins/admin/applications/class_applicationGeneric.inc
index 967eaaf634992091264694944290d529e0881e14..c483bb97d3e71f8fb6338caed3e79767b3e5e848 100644 (file)
--- a/plugins/admin/applications/class_applicationGeneric.inc
+++ b/plugins/admin/applications/class_applicationGeneric.inc
@@ -110,6 +110,17 @@ class application extends plugin
 
     $smarty= get_smarty();
 
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translation){
+      $smarty->assign($name."ACL",$this->getacl($name));
+    }
+ 
+    $baseACL = $this->getacl("base");
+    if(!$this->acl_is_moveable()) {
+      $baseACL = preg_replace("/w/","",$baseACL);
+    }
+    $smarty->assign("baseACL",          $baseACL);
+
     /* Do we represent a valid group? */
     if (!$this->is_account && $this->parent == NULL){
       $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
@@ -117,9 +128,21 @@ class application extends plugin
       return ($display);
     }
 
-    $_SESSION['binary']       = $this->gotoLogonScript;
-    $_SESSION['binarytype']   = "octet-stream";
-    $_SESSION['binaryfile']   = $this->cn.".gosaApplication";
+    /* Download requested */
+    foreach($_POST as $name => $value){
+      if(preg_match("/^downloadScript/",$name)){
+        $_SESSION['binary']       = $this->gotoLogonScript;
+        $_SESSION['binarytype']   = "octet-stream";
+        $_SESSION['binaryfile']   = $this->cn.".gosaApplication";
+        header("location: getbin.php ");
+        exit();
+      }
+    }
+
+    /* Reassign picture data, sometimes its corrupt cause we started a download of application scripts */
+    $_SESSION['binary']     = $this->iconData;
+    $_SESSION['binarytype'] = "image/jpeg";
+    
     $smarty->assign("rand", rand(0, 10000));
     $head = $this->generateTemplate();
     $this->gotoLogonScript= $this->generateTemplate().preg_replace('/.*### END HEADER ###/s', '', $this->gotoLogonScript);
@@ -172,9 +195,7 @@ class application extends plugin
     /* Variables */
     foreach(array("description", "gosaApplicationExecute", "gosaApplicationName","cn") as $val){
       $smarty->assign($val, $this->$val);
-      $smarty->assign($val."ACL", chkacl($this->acl, $val));
     }
-    $smarty->assign("baseACL", chkacl($this->acl,"base"));
 
     /* Checkboxes */
     foreach (array("G" => "exec_for_groupmembers", "O" => "overwrite_config",
@@ -190,7 +211,6 @@ class application extends plugin
     $smarty->assign("isReleaseApplikation" , $this->isReleaseApplikation);
     $smarty->assign("gotoLogonScript",htmlentities($this->gotoLogonScript, ENT_COMPAT, 'UTF-8'));
     $smarty->assign("base_select", $this->base);
-    $smarty->assign("gosaApplicationFlagsACL", chkacl($this->acl, "gosaApplicationFlags"));
     /* Show main page */
     return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
   }
@@ -254,7 +274,7 @@ class application extends plugin
       if (isset($_POST['overwrite_config']) && $_POST['overwrite_config'] == 1){
         $flag.= "O";
       }
-      if (chkacl ($this->acl, "gosaApplicationFlags") ==""){
+      if ($this->acl_is_writeable("gosaApplicationFlags")){
         $this->gosaApplicationFlags= "[$flag]";
       }
 
@@ -317,11 +337,7 @@ class application extends plugin
         $this->set_picture($_FILES['picture_file']['tmp_name']);
       }        
 
-
-      /* Save base, since this is no LDAP attribute */
-      if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
-        $this->base= $_POST['base'];
-      }
+      $this->base= $_POST['base'];
     }
 
     if($this->isReleaseApplikation){
@@ -348,9 +364,7 @@ class application extends plugin
     }
 
     $ui= get_userinfo();
-    $acl= get_permissions ($new_dn, $ui->subtreeACL);
-    $acl= get_module_permission($acl, "application", $new_dn);
-    if (chkacl($acl, "create") != ""){
+    if (!$this->acl_is_createable() && $this->dn == "new"){
       $message[]= _("You have no permissions to create a application on this 'Base'.");
     }
 
@@ -398,6 +412,9 @@ class application extends plugin
   /* Save to LDAP */
   function save()
   {
+    /* Get application script without header part, to check if we must save the script itself */
+    $script = preg_replace('/.*### END HEADER ###/s', '', $this->gotoLogonScript);
+
     plugin::save();
     $this->attrs["gosaApplicationIcon"]= $this->gosaApplicationIcon;
 
@@ -407,11 +424,23 @@ class application extends plugin
 
     $a= $ldap->fetch();
     if (count($a)){
+
+      /* Remove gotoLogonScript if it is empty */
+      if(empty($script))    {
+        $this->attrs['gotoLogonScript'] = array();
+      }
+
       $ldap->cd($this->dn);
       $this->cleanup();
       $ldap->modify ($this->attrs); 
       $this->handle_post_events("modify");
     } else {
+      
+      /* Remove gotoLogonScript if it is empty */
+      if(empty($script))    {
+        unset($this->attrs['gotoLogonScript']);
+      }
+
       $ldap->cd($this->config->current['BASE']);
       $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
       $ldap->cd($this->dn);
@@ -485,13 +514,13 @@ class application extends plugin
                                                           "objectClass"  => "gosaApplication")),
           "plProvidedAcls"=> array(
             "cn"                => _("Name"),
+            "base"              => _("Base"),
             "description"       => _("Description"),
             "gosaApplicationExecute"  => _("Execute"),
             "gosaApplicationName"     => _("Name"),
             "gosaApplicationIcon"     => _("Icon"),
             "gosaApplicationFlags"    => _("Flag"),
             "gotoLogonScript"         => _("Script content"),
-            "gosaApplicationParameter"=> _("Application parameter"),
 
             "exec_for_groupmembers" => _("Only executable for members"),              // G
             "place_on_desktop"      => _("Place icon on members desktop"),            // D