Moved remaining kerberos stuff to the password method.

[gosa.git] / html / getFAIscript.php

diff --git a/html/getFAIscript.php b/html/getFAIscript.php
index e86bdcc78277a4f5bd777807aa3d7682eaf665a6..45277a6fdcf544184923056b6fb79af62dddd2e0 100644 (file)
--- a/html/getFAIscript.php
+++ b/html/getFAIscript.php
@@ -24,7 +24,7 @@ restore_error_handler();
   $ldap = $_SESSION['config']->get_ldap_link();
   $ldap->cd($_SESSION['config']->current['BASE']);
 
-  $sr= $ldap->cat($id);
+  $sr= $ldap->cat($id, array("FAItemplateFile", "FAIscript", "cn", "objectClass"));
   $ei= ldap_first_entry($ldap->cid, $sr);
   if(isset($_GET['is_template'])){
     $tmp = ldap_get_values_len($ldap->cid, $ei,"FAItemplateFile");
@@ -49,6 +49,7 @@ restore_error_handler();
     header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
     header("Cache-Control: no-cache");
     header("Pragma: no-cache");
+    header("Content-transfer-encoding: binary\n");
     header("Cache-Control: post-check=0, pre-check=0");
     header("Content-type: application/octet-stream");
     header("Content-Disposition: attachment; filename=".$name);
@@ -61,26 +62,27 @@ restore_error_handler();
 /* Basic setup, remove eventually registered sessions */
 @require_once ("../include/php_setup.inc");
 @require_once ("functions.inc");
-error_reporting (E_ALL);
+error_reporting (E_ALL | E_STRICT);
 session_start ();
 
 /* Logged in? Simple security check */
 if (!isset($_SESSION['ui'])){
-  gosa_log ("Error: getFAIScript.php called without session");
-  header ("Location: ../index.php");
+  new log("security","fai","",array(),"Error: getFAIScript.php called without session") ;
+  header ("Location: index.php");
   exit;
 }
 $ui= $_SESSION["ui"];
 $config= $_SESSION['config'];
 
 /* Check ACL's */
-$acl= get_permissions ($config->current['BASE'], $ui->subtreeACL);
-$acl= get_module_permission($acl, "all", $config->current['BASE']);
-if (chkacl($acl, "all") != ""){
-  header ("Location: ../index.php");
+#FIXME Use more specific acl categories instead of all/all
+$ui = get_userinfo();
+$acl = $ui->get_permissions(base64_decode($_GET['id']),"all/all");
+if(!preg_match("/r/",$acl)){
+  header ("Location: index.php");
   exit;
 }
-$dir = search_config($config->data,"environment", "KIOSKPATH");
+$dir= $config->search('environment', 'kioskpath', array('main','tabs'));
 getFAIScript(base64_decode($_GET['id']));
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: