From 1df4b68ac8b30438021c2b858e7b1c1b87420d8e Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 26 Nov 2007 23:30:16 +0000 Subject: [PATCH] several *.php files: - no longer use $incpath - merging admin/ is done http://sourceforge.net/tracker/index.php?func=detail&aid=1838327&group_id=191583&atid=937964 Note that $incpath is still used by common.php - removing it would break users/ git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@243 a1433add-5e2c-0410-b055-b7f2511e0802 --- create-alias.php | 8 ++++---- create-mailbox.php | 8 ++++---- delete.php | 8 ++++---- edit-active.php | 8 ++++---- edit-alias.php | 8 ++++---- edit-mailbox.php | 8 ++++---- edit-vacation.php | 8 ++++---- search.php | 8 ++++---- viewlog.php | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) diff --git a/create-alias.php b/create-alias.php index eccd830f..64d890e4 100644 --- a/create-alias.php +++ b/create-alias.php @@ -152,8 +152,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/create-alias.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/create-alias.tpl"); +include ("templates/footer.tpl"); ?> diff --git a/create-mailbox.php b/create-mailbox.php index af2c0915..ebf0d8d5 100644 --- a/create-mailbox.php +++ b/create-mailbox.php @@ -330,10 +330,10 @@ TODO: this is the end of /create-mailbox.php code segment } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/create-mailbox.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/create-mailbox.tpl"); +include ("templates/footer.tpl"); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/delete.php b/delete.php index 81e33d39..b9504056 100644 --- a/delete.php +++ b/delete.php @@ -164,10 +164,10 @@ else } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/message.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/message.tpl"); +include ("templates/footer.tpl"); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/edit-active.php b/edit-active.php index a52f108f..519b6cdb 100644 --- a/edit-active.php +++ b/edit-active.php @@ -91,9 +91,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET") } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/message.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/message.tpl"); +include ("templates/footer.tpl"); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/edit-alias.php b/edit-alias.php index c48ab2e1..f41c0455 100644 --- a/edit-alias.php +++ b/edit-alias.php @@ -124,8 +124,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/edit-alias.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/edit-alias.tpl"); +include ("templates/footer.tpl"); ?> diff --git a/edit-mailbox.php b/edit-mailbox.php index dc23081b..f6dfd44d 100644 --- a/edit-mailbox.php +++ b/edit-mailbox.php @@ -157,9 +157,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/edit-mailbox.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/edit-mailbox.tpl"); +include ("templates/footer.tpl"); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/edit-vacation.php b/edit-vacation.php index 831d5bca..42419594 100644 --- a/edit-vacation.php +++ b/edit-vacation.php @@ -191,9 +191,9 @@ else { $tMessage = $PALANG['pVacation_result_error']; } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/edit-vacation.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/edit-vacation.tpl"); +include ("templates/footer.tpl"); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?> diff --git a/search.php b/search.php index 50cb2856..cd094c60 100644 --- a/search.php +++ b/search.php @@ -116,9 +116,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/search.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/search.tpl"); +include ("templates/footer.tpl"); ?> diff --git a/viewlog.php b/viewlog.php index b84eff2a..d7766dde 100644 --- a/viewlog.php +++ b/viewlog.php @@ -74,10 +74,10 @@ if ($error != 1) } } -include ("$incpath/templates/header.tpl"); -include ("$incpath/templates/menu.tpl"); -include ("$incpath/templates/viewlog.tpl"); -include ("$incpath/templates/footer.tpl"); +include ("templates/header.tpl"); +include ("templates/menu.tpl"); +include ("templates/viewlog.tpl"); +include ("templates/footer.tpl"); /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ ?>