From c6e05a8eebc58624c675d4b10d33e94e6b6fa83b Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 12 Sep 2011 10:16:19 -0400 Subject: [PATCH] Implemented: FS#1385 - Define all Email aliases in dovecot autoresponder --- server/lib/classes/tpl.inc.php | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/lib/classes/tpl.inc.php b/server/lib/classes/tpl.inc.php index 285fc66..af2e0da 100644 --- a/server/lib/classes/tpl.inc.php +++ b/server/lib/classes/tpl.inc.php @@ -967,7 +967,9 @@ // check fullpath first.. $fullpath = $filepath.'/'.$filename; - if (is_file($fullpath)) return $fullpath; + if (is_file($fullpath)) { + return $fullpath; + } // ..then check for relative path for current directory.. if (!empty($this->_currentincludedir)) { @@ -992,17 +994,23 @@ // ..then check path from TEMPLATE_DIR.. if (!empty($this->OPTIONS['TEMPLATE_DIR'])) { $fullpath = realpath($this->OPTIONS['TEMPLATE_DIR'].'/'.$filepath.'/'.$filename); - if (is_file($fullpath)) return $fullpath; + if (is_file($fullpath)) { + return $fullpath; + } } // ..then check relative path from executing php script.. $fullpath = realpath($filepath.'/'.$filename); - if (is_file($fullpath)) return $fullpath; + if (is_file($fullpath)) { + return $fullpath; + } // ..then check path from template file. if (!empty($this->VLIBTEMPLATE_ROOT)) { $fullpath = realpath($this->VLIBTEMPLATE_ROOT.'/'.$filepath.'/'.$filename); - if (is_file($fullpath)) return $fullpath; + if (is_file($fullpath)) { + return $fullpath; + } } return false; // uh oh, file not found -- Gitblit v1.9.1