From f8442b3303bc790814109a78aa4362477acf7b15 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 12 Sep 2011 11:11:03 +0000
Subject: [PATCH] Fixed: FS#1737 - WebDAV - PHP files Fixed: PHP notice in
 tform_actions.inc.php

---
 interface/lib/classes/tform_actions.inc.php |  2 +-
 server/conf/vhost.conf.master               | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php
index 84e997b97c..5c03b2730b 100644
--- a/interface/lib/classes/tform_actions.inc.php
+++ b/interface/lib/classes/tform_actions.inc.php
@@ -139,7 +139,7 @@ class tform_actions {
                                 session_write_close();
                                 header($redirect);
 							// When a returnto variable is set
-							} elseif ($_SESSION["s"]["form"]["return_to_url"] != '') {
+							} elseif (isset($_SESSION["s"]["form"]["return_to_url"]) && $_SESSION["s"]["form"]["return_to_url"] != '') {
 								$redirect = $_SESSION["s"]["form"]["return_to_url"];
 								$_SESSION["s"]["form"]["return_to_url"] = '';
 								session_write_close();
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 27484d4d88..d118124f7f 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -203,6 +203,12 @@
     </IfModule>
 
     <IfModule mod_dav_fs.c>
+	  # Do not execute PHP files in webdav directory
+	  <Directory {tmpl_var name='document_root'}/webdav>
+	    <FilesMatch "\.ph(p3?|tml)$">
+          SetHandler None
+        </FilesMatch>
+	  </Directory>
       # DO NOT REMOVE THE COMMENTS!
       # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
       # WEBDAV BEGIN
@@ -411,6 +417,12 @@
     </IfModule>
 
     <IfModule mod_dav_fs.c>
+	  # Do not execute PHP files in webdav directory
+	  <Directory {tmpl_var name='document_root'}/webdav>
+	    <FilesMatch "\.ph(p3?|tml)$">
+          SetHandler None
+        </FilesMatch>
+	  </Directory>
       # DO NOT REMOVE THE COMMENTS!
       # IF YOU REMOVE THEM, WEBDAV WILL NOT WORK ANYMORE!
       # WEBDAV BEGIN
-- 
GitLab