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

@@ -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");
 ?>

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: */
 ?>

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: */
 ?>

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: */
 ?>

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");
 ?>

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: */
 ?>

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: */
 ?>

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");
 
 ?>

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: */
 ?>