diff --git a/filemanager/inc/db.inc.php b/filemanager/inc/db.inc.php
index deee016c68..ff0afccde6 100755
--- a/filemanager/inc/db.inc.php
+++ b/filemanager/inc/db.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 error_reporting (8);
 
diff --git a/filemanager/inc/footer.inc.php b/filemanager/inc/footer.inc.php
index 770465f09e..62a2de0c86 100644
--- a/filemanager/inc/footer.inc.php
+++ b/filemanager/inc/footer.inc.php
@@ -1,3 +1,3 @@
-<?
+<?php
 
 ?>
diff --git a/filemanager/inc/functions.inc.php b/filemanager/inc/functions.inc.php
index adc4f53e1b..f8671376f7 100644
--- a/filemanager/inc/functions.inc.php
+++ b/filemanager/inc/functions.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 require ("./inc/main.inc.php");
 
diff --git a/filemanager/inc/header.inc.php b/filemanager/inc/header.inc.php
index 770465f09e..62a2de0c86 100644
--- a/filemanager/inc/header.inc.php
+++ b/filemanager/inc/header.inc.php
@@ -1,3 +1,3 @@
-<?
+<?php
 
 ?>
diff --git a/filemanager/inc/hook_admin.inc.php b/filemanager/inc/hook_admin.inc.php
index 770465f09e..62a2de0c86 100644
--- a/filemanager/inc/hook_admin.inc.php
+++ b/filemanager/inc/hook_admin.inc.php
@@ -1,3 +1,3 @@
-<?
+<?php
 
 ?>
diff --git a/filemanager/inc/html.inc.php b/filemanager/inc/html.inc.php
index e346a5bd5f..62e17323dc 100755
--- a/filemanager/inc/html.inc.php
+++ b/filemanager/inc/html.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 function html_form_begin ($action, $method = "post", $enctype = NULL, $string = HTML_FORM_BEGIN_STRING, $return = 0)
 {
@@ -199,6 +199,9 @@ function html_text_summary ($text = NULL, $size = NULL, $return = 0, $lang = 0)
 	$rstring .= html_nbsp (3, $return);
 	if ($size != NULL && $size >= 0)
 		$rstring .= borkb ($size, 1, $return);
+
+	$rstring = html_encode ($rstring, 1);
+
 	if ($return)
 		return ($rstring);
 }
diff --git a/filemanager/inc/main.inc.php b/filemanager/inc/main.inc.php
index 69115632fb..d478b45095 100755
--- a/filemanager/inc/main.inc.php
+++ b/filemanager/inc/main.inc.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 ### Start Configuration Options ###
 ### These are automatically set in phpGW - do not edit ###
diff --git a/filemanager/index.php b/filemanager/index.php
index 81219005a0..b2953619e5 100755
--- a/filemanager/index.php
+++ b/filemanager/index.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $phpgw_info["flags"] = array("currentapp" => "phpwebhosting",
 				"noheader" => False,
@@ -133,14 +133,16 @@ if ((preg_match ("+^$fakebase\/(.*)(\/|$)+U", $path, $matches)) && $matches[1] !
 		html_page_close ();
 	}
 
-/* WIP - how are we actually supposed to use the API to determine if a group has access to an app?
-	$group_acl = CreateObject('phpgwapi.acl', $phpgw->accounts->name2id ($matches[1]));
-	if ($group_acl->get_specific_rights () == False)
+	$group_applications = CreateObject('phpgwapi.applications', $phpgw->accounts->name2id ($matches[1]));
+
+	$app_array = $group_applications->read_account_specific ();
+	if (!$app_array[$appname]["enabled"])
 	{
 		echo $phpgw->common->error_list (array ("The group $matches[1] does not have access to $appname"));
+		html_break (2);
+		html_link ("$appname/index.php?path=$homedir", "Go to your home directory");
 		html_page_close ();
 	}
-*/
 }
 else
 {
diff --git a/filemanager/test.php b/filemanager/test.php
index d8dd279fa7..df3ab6ba7b 100644
--- a/filemanager/test.php
+++ b/filemanager/test.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
 $phpgw_info["flags"] = array("currentapp" => "phpwebhosting",
                                 "noheader" => False,