SF.net SVN: postfixadmin: [250] trunk

[<Gin...@us...>]

Revision: 250
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=250&view=rev
Author:   GingerDog
Date:     2007-12-02 05:59:33 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
rename templates to .php instead of .tpl

Modified Paths:
--------------
    trunk/backup.php
    trunk/broadcast-message.php
    trunk/create-admin.php
    trunk/create-alias.php
    trunk/create-domain.php
    trunk/create-mailbox.php
    trunk/delete.php
    trunk/edit-active-admin.php
    trunk/edit-active-domain.php
    trunk/edit-active.php
    trunk/edit-admin.php
    trunk/edit-alias.php
    trunk/edit-domain.php
    trunk/edit-mailbox.php
    trunk/edit-vacation.php
    trunk/fetchmail.php
    trunk/list-admin.php
    trunk/list-domain.php
    trunk/list-virtual.php
    trunk/login.php
    trunk/main.php
    trunk/password.php
    trunk/search.php
    trunk/sendmail.php
    trunk/setup.php
    trunk/users/edit-alias.php
    trunk/users/login.php
    trunk/users/main.php
    trunk/users/password.php
    trunk/users/vacation.php
    trunk/viewlog.php

Added Paths:
-----------
    trunk/templates/admin_create-admin.php
    trunk/templates/admin_create-domain.php
    trunk/templates/admin_edit-admin.php
    trunk/templates/admin_edit-domain.php
    trunk/templates/admin_list-admin.php
    trunk/templates/admin_list-domain.php
    trunk/templates/admin_search.php
    trunk/templates/broadcast-message.php
    trunk/templates/create-alias.php
    trunk/templates/create-mailbox.php
    trunk/templates/edit-alias.php
    trunk/templates/edit-mailbox.php
    trunk/templates/edit-vacation.php
    trunk/templates/fetchmail.php
    trunk/templates/footer.php
    trunk/templates/header.php
    trunk/templates/list-virtual.php
    trunk/templates/login.php
    trunk/templates/main.php
    trunk/templates/menu.php
    trunk/templates/message.php
    trunk/templates/overview-get.php
    trunk/templates/password.php
    trunk/templates/search.php
    trunk/templates/sendmail.php
    trunk/templates/users_edit-alias.php
    trunk/templates/users_login.php
    trunk/templates/users_main.php
    trunk/templates/users_menu.php
    trunk/templates/users_password.php
    trunk/templates/users_vacation.php
    trunk/templates/viewlog.php

Removed Paths:
-------------
    trunk/templates/admin_create-admin.tpl
    trunk/templates/admin_create-domain.tpl
    trunk/templates/admin_edit-admin.tpl
    trunk/templates/admin_edit-domain.tpl
    trunk/templates/admin_list-admin.tpl
    trunk/templates/admin_list-domain.tpl
    trunk/templates/admin_search.tpl
    trunk/templates/broadcast-message.tpl
    trunk/templates/create-alias.tpl
    trunk/templates/create-mailbox.tpl
    trunk/templates/edit-alias.tpl
    trunk/templates/edit-mailbox.tpl
    trunk/templates/edit-vacation.tpl
    trunk/templates/fetchmail.tpl
    trunk/templates/footer.tpl
    trunk/templates/header.tpl
    trunk/templates/list-virtual.tpl
    trunk/templates/login.tpl
    trunk/templates/main.tpl
    trunk/templates/menu.tpl
    trunk/templates/message.tpl
    trunk/templates/overview-get.tpl
    trunk/templates/password.tpl
    trunk/templates/search.tpl
    trunk/templates/sendmail.tpl
    trunk/templates/users_edit-alias.tpl
    trunk/templates/users_login.tpl
    trunk/templates/users_main.tpl
    trunk/templates/users_menu.tpl
    trunk/templates/users_password.tpl
    trunk/templates/users_vacation.tpl
    trunk/templates/viewlog.tpl

Modified: trunk/backup.php
===================================================================
--- trunk/backup.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/backup.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -63,10 +63,10 @@
    if (!$fh = fopen ($backup, 'w'))
    {
       $tMessage = "<div class=\"error_msg\">Cannot open file ($backup)</div>";
-      include ("templates/header.tpl");
-      include ("templates/menu.tpl");
-      include ("templates/message.tpl");
-      include ("templates/footer.tpl");
+      include ("templates/header.php");
+      include ("templates/menu.php");
+      include ("templates/message.php");
+      include ("templates/footer.php");
    } 
    else
    {

Modified: trunk/broadcast-message.php
===================================================================
--- trunk/broadcast-message.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/broadcast-message.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: broadcast-message.php
  * Used to send a message to _ALL_ users with mailboxes on this server.
  *
- * Template File: broadcast-message.tpl
+ * Template File: broadcast-message.php
  *
  * Template Variables: -none-
  *
@@ -78,19 +78,19 @@
             }
          }
       }
-      include ("templates/header.tpl");
-      include ("templates/menu.tpl");
+      include ("templates/header.php");
+      include ("templates/menu.php");
       echo '<p>'.$PALANG['pBroadcast_success'].'</p>';
-      include ("templates/footer.tpl");
+      include ("templates/footer.php");
    }
 }
 
 if ($_SERVER['REQUEST_METHOD'] == "GET" || $error == 1)
 {
-   include ("templates/header.tpl");
-   include ("templates/menu.tpl");
-   include ("templates/broadcast-message.tpl");
-   include ("templates/footer.tpl");
+   include ("templates/header.php");
+   include ("templates/menu.php");
+   include ("templates/broadcast-message.php");
+   include ("templates/footer.php");
 }
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */

Modified: trunk/create-admin.php
===================================================================
--- trunk/create-admin.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: create-admin.php
  * Used to create new administrators.
- * Template File: admin_create-admin.tpl
+ * Template File: admin_create-admin.php
  *
  *
  * Template Variables:
@@ -60,10 +60,10 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_create-admin.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_create-admin.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-alias.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -11,7 +11,7 @@
  *     http://www.postfixadmin.com or http://postfixadmin.sf.net
  *
  * File: create-alias.php
- * Template File: create-alias.tpl
+ * Template File: create-alias.php
  * Responsible for allowing for the creation of mail aliases.
  *
  * @version $Id$
@@ -152,8 +152,8 @@
     }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/create-alias.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/create-alias.php");
+include ("templates/footer.php");
 ?>

Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: create-domain.php
  * Allows administrators to create new domains.
- * Template File: admin_create-domain.tpl
+ * Template File: admin_create-domain.php
  *
  * Template Variables:
  *
@@ -120,10 +120,10 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_create-domain.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_create-domain.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/create-mailbox.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -330,10 +330,10 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/create-mailbox.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/create-mailbox.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/delete.php
===================================================================
--- trunk/delete.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/delete.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -17,7 +17,7 @@
  * Note: if a domain is deleted, all mailboxes and aliases belonging 
  * to the domain are also removed.
  *
- * Template File: message.tpl
+ * Template File: message.php
  *
  * Template Variables:
  *
@@ -164,10 +164,10 @@
 }
 
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-active-admin.php
===================================================================
--- trunk/edit-active-admin.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-active-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: edit-active-admin.php 
  * Edit an active administrator. This is used as a 'toggle' page from list-admin.
  *
- * Template File: message.tpl
+ * Template File: message.php
  *
  * Template Variables:
  *
@@ -51,10 +51,10 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 

Modified: trunk/edit-active-domain.php
===================================================================
--- trunk/edit-active-domain.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-active-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: edit-active-domain.php 
  * Responsible for toggling the status of a domain
- * Template File: message.tpl
+ * Template File: message.php
  *
  * Template Variables:
  *
@@ -50,10 +50,10 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-active.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: edit-active.php 
  * Responsible for toggling the active status of a mailbox. 
  *
- * Template File: message.tpl
+ * Template File: message.php
  *
  * Template Variables:
  *
@@ -91,9 +91,9 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/message.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/message.php");
+include ("templates/footer.php");
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-admin.php
===================================================================
--- trunk/edit-admin.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: edit-admin.php
  * Edits a normal administrator's details.
  *
- * Template File: admin_edit-admin.tpl
+ * Template File: admin_edit-admin.php
  *
  * Template Variables:
  *
@@ -150,10 +150,10 @@
     }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_edit-admin.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_edit-admin.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-alias.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: edit-alias.php 
  * Used to update an alias.
  *
- * Template File: edit-alias.tpl
+ * Template File: edit-alias.php
  *
  * Template Variables:
  *
@@ -127,10 +127,10 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/edit-alias.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/edit-alias.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: edit-domain.php 
  * Updates the properties of a domain.
- * Template File: admin_edit-domain.tpl
+ * Template File: admin_edit-domain.php
  *
  * Template Variables:
  *
@@ -104,10 +104,10 @@
 	}
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_edit-domain.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_edit-domain.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-mailbox.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: edit-mailbox.php 
  * Used to update an existing mailboxes settings.
- * Template File: edit-mailbox.tpl
+ * Template File: edit-mailbox.php
  *
  * Template Variables:
  *
@@ -157,9 +157,9 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/edit-mailbox.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/edit-mailbox.php");
+include ("templates/footer.php");
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/edit-vacation.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: edit-vacation.php 
  * Responsible for allowing users to update their vacation status.
  *
- * Template File: edit-vacation.tpl
+ * Template File: edit-vacation.php
  *
  * Template Variables:
  *
@@ -191,9 +191,9 @@
    $tMessage = $PALANG['pVacation_result_error'];
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/edit-vacation.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/edit-vacation.php");
+include ("templates/footer.php");
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/fetchmail.php
===================================================================
--- trunk/fetchmail.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/fetchmail.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -250,10 +250,10 @@
    return base64_encode($val);
 }
 
-include ("./templates/header.tpl");
-include ("./templates/menu.tpl");
-include ("./templates/fetchmail.tpl");
-include ("./templates/footer.tpl");
+include ("./templates/header.php");
+include ("./templates/menu.php");
+include ("./templates/fetchmail.php");
+include ("./templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/list-admin.php
===================================================================
--- trunk/list-admin.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/list-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: list-admin.php
  * Lists all administrators
- * Template File: list-admin.tpl
+ * Template File: list-admin.php
  *
  * Template Variables: -none-
  *
@@ -32,9 +32,9 @@
    }
 }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/admin_list-admin.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/admin_list-admin.php");
+include ("templates/footer.php");
 
 ?>

Modified: trunk/list-domain.php
===================================================================
--- trunk/list-domain.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/list-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: list-domain.php
  * List all domains as a quick overview.
- * Template File: admin_list-domain.tpl
+ * Template File: admin_list-domain.php
  *
  * Template Variables:
  *
@@ -59,15 +59,15 @@
    }
 #}
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
 
 if ($is_superadmin) {
-   include ("templates/admin_list-domain.tpl");
+   include ("templates/admin_list-domain.php");
 } else {
-   include ("templates/overview-get.tpl");
+   include ("templates/overview-get.php");
 }
-include ("templates/footer.tpl");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/list-virtual.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -15,7 +15,7 @@
  * File: list-virtual.php
  * List virtual users for a domain.
  *
- * Template File: list-virtual.tpl
+ * Template File: list-virtual.php
  *
  * Template Variables:
  *
@@ -165,10 +165,10 @@
 }
 
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/list-virtual.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/list-virtual.php");
+include ("templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/login.php
===================================================================
--- trunk/login.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/login.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: login.php
  * Authenticates a user, and populates their $_SESSION as appropriate.
- * Template File: login.tpl
+ * Template File: login.php
  *
  * Template Variables:
  *
@@ -43,9 +43,9 @@
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
-    include ("./templates/header.tpl");
-    include ("./templates/login.tpl");
-    include ("./templates/footer.tpl");
+    include ("./templates/header.php");
+    include ("./templates/login.php");
+    include ("./templates/footer.php");
 }
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
@@ -94,8 +94,8 @@
         exit(0);
     }
 
-    include ("./templates/header.tpl");
-    include ("./templates/login.tpl");
-    include ("./templates/footer.tpl");
+    include ("./templates/header.php");
+    include ("./templates/login.php");
+    include ("./templates/footer.php");
 }
 ?>

Modified: trunk/main.php
===================================================================
--- trunk/main.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/main.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: main.php
  * Displays a menu/home page.
- * Template File: main.tpl
+ * Template File: main.php
  *
  * Template Variables: -none-
  *
@@ -27,8 +27,8 @@
 
 authentication_require_role('admin');
 
-include ("./templates/header.tpl");
-include ("./templates/menu.tpl");
-include ("./templates/main.tpl");
-include ("./templates/footer.tpl");
+include ("./templates/header.php");
+include ("./templates/menu.php");
+include ("./templates/main.php");
+include ("./templates/footer.php");
 ?>

Modified: trunk/password.php
===================================================================
--- trunk/password.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/password.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: password.php
  * Allows admins to change their own password.
- * Template File: password.tpl
+ * Template File: password.php
  *
  * Template Variables:
  *
@@ -35,10 +35,10 @@
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {
-    include ("./templates/header.tpl");
-    include ("./templates/menu.tpl");
-    include ("./templates/password.tpl");
-    include ("./templates/footer.tpl");
+    include ("./templates/header.php");
+    include ("./templates/menu.php");
+    include ("./templates/password.php");
+    include ("./templates/footer.php");
 }
 
 if ($_SERVER['REQUEST_METHOD'] == "POST")
@@ -88,9 +88,9 @@
         }
     }
 
-    include ("./templates/header.tpl");
-    include ("./templates/menu.tpl");
-    include ("./templates/password.tpl");
-    include ("./templates/footer.tpl");
+    include ("./templates/header.php");
+    include ("./templates/menu.php");
+    include ("./templates/password.php");
+    include ("./templates/footer.php");
 }
 ?>

Modified: trunk/search.php
===================================================================
--- trunk/search.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/search.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: search.php
  * Provides a method for searching for a user/mailbox
- * Template File: search.tpl
+ * Template File: search.php
  *
  * Template Variables:
  *
@@ -116,9 +116,9 @@
         }
     }
 
-include ("templates/header.tpl");
-include ("templates/menu.tpl");
-include ("templates/search.tpl");
-include ("templates/footer.tpl");
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/search.php");
+include ("templates/footer.php");
 
 ?>

Modified: trunk/sendmail.php
===================================================================
--- trunk/sendmail.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/sendmail.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -14,7 +14,7 @@
  * 
  * File: sendmail.php
  * Used to send an email to a user.
- * Template File: sendmail.tpl
+ * Template File: sendmail.php
  *
  * Template Variables:
  *
@@ -74,10 +74,10 @@
    }
 }
 
-include ("./templates/header.tpl");
-include ("./templates/menu.tpl");
-include ("./templates/sendmail.tpl");
-include ("./templates/footer.tpl");
+include ("./templates/header.php");
+include ("./templates/menu.php");
+include ("./templates/sendmail.php");
+include ("./templates/footer.php");
 
 /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
 ?>

Modified: trunk/setup.php
===================================================================
--- trunk/setup.php	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/setup.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -27,7 +27,7 @@
 require_once("functions.inc.php");
 
 $CONF['show_header_text'] = 'NO';
-require('templates/header.tpl');
+require('templates/header.php');
 ?>
 
 <div class='setup'>

Added: trunk/templates/admin_create-admin.php
===================================================================
--- trunk/templates/admin_create-admin.php	                        (rev 0)
+++ trunk/templates/admin_create-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,51 @@
+<div id="edit_form">
+<form name="create_admin" method="post">
+<table>
+   <tr>
+      <td colspan="3"><h3><?php print $PALANG['pAdminCreate_admin_welcome']; ?></h3></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_admin_username'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
+      <td><?php print $pAdminCreate_admin_username_text; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_admin_password'] . ":"; ?></td>
+      <td><input class="flat" type="password" name="fPassword" /></td>
+      <td><?php print $pAdminCreate_admin_password_text; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_admin_password2'] . ":"; ?></td>
+      <td><input class="flat" type="password" name="fPassword2" /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_admin_address'] . ":"; ?></td>
+      <td>
+      <select name="fDomains[]" size="10" multiple="multiple">
+      <?php
+      for ($i = 0; $i < sizeof ($list_domains); $i++)
+      {  
+         if (in_array ($list_domains[$i], $tDomains))
+         {
+            print "<option value=\"" . $list_domains[$i] . "\" selected=\"selected\">" . $list_domains[$i] . "</option>\n";
+         }
+         else
+         {
+            print "<option value=\"" . $list_domains[$i] . "\">" . $list_domains[$i] . "</option>\n";
+         }
+      }
+      ?>
+      </select>
+      </td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_admin_button']; ?>" /></td>
+   </tr>
+   <tr>
+      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+   </tr>
+</table>
+</form>
+</div>

Deleted: trunk/templates/admin_create-admin.tpl
===================================================================
--- trunk/templates/admin_create-admin.tpl	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_create-admin.tpl	2007-12-02 13:59:33 UTC (rev 250)
@@ -1,51 +0,0 @@
-<div id="edit_form">
-<form name="create_admin" method="post">
-<table>
-   <tr>
-      <td colspan="3"><h3><?php print $PALANG['pAdminCreate_admin_welcome']; ?></h3></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_admin_username'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" /></td>
-      <td><?php print $pAdminCreate_admin_username_text; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_admin_password'] . ":"; ?></td>
-      <td><input class="flat" type="password" name="fPassword" /></td>
-      <td><?php print $pAdminCreate_admin_password_text; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_admin_password2'] . ":"; ?></td>
-      <td><input class="flat" type="password" name="fPassword2" /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_admin_address'] . ":"; ?></td>
-      <td>
-      <select name="fDomains[]" size="10" multiple="multiple">
-      <?php
-      for ($i = 0; $i < sizeof ($list_domains); $i++)
-      {  
-         if (in_array ($list_domains[$i], $tDomains))
-         {
-            print "<option value=\"" . $list_domains[$i] . "\" selected=\"selected\">" . $list_domains[$i] . "</option>\n";
-         }
-         else
-         {
-            print "<option value=\"" . $list_domains[$i] . "\">" . $list_domains[$i] . "</option>\n";
-         }
-      }
-      ?>
-      </select>
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_admin_button']; ?>" /></td>
-   </tr>
-   <tr>
-      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
-   </tr>
-</table>
-</form>
-</div>

Added: trunk/templates/admin_create-domain.php
===================================================================
--- trunk/templates/admin_create-domain.php	                        (rev 0)
+++ trunk/templates/admin_create-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,77 @@
+<div id="edit_form">
+<form name="create_domain" method="post">
+<table>
+   <tr>
+      <td colspan="3"><h3><?php print $PALANG['pAdminCreate_domain_welcome']; ?></h3></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_domain'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fDomain" value="<?php print $tDomain; ?>" /></td>
+      <td><?php print $pAdminCreate_domain_domain_text; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_description'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fDescription" value="<?php print $tDescription; ?>" /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_aliases'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
+      <td><?php print $PALANG['pAdminCreate_domain_aliases_text']; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_mailboxes'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
+      <td><?php print $PALANG['pAdminCreate_domain_mailboxes_text']; ?></td>
+   </tr>
+   <?php if ($CONF['quota'] == 'YES') { ?>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_maxquota'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
+      <td><?php print $PALANG['pAdminCreate_domain_maxquota_text']; ?></td>
+   </tr>
+   <?php } if ($CONF['transport'] == 'YES') { ?>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_transport'] . ":"; ?></td>
+      <td><select class="flat" name="fTransport">
+      <?php
+      for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
+      {
+         if ($CONF['transport_options'][$i] == $tTransport)
+         {
+            print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
+         }
+         else
+         {
+            print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
+         }
+      }
+      ?>
+      </select>
+      </td>
+      <td><?php print $PALANG['pAdminCreate_domain_transport_text']; ?></td>
+   </tr>
+   <?php } ?>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_defaultaliases'] . ":"; ?></td>
+      <td><?php $checked = (!empty ($tDefaultaliases)) ? 'checked' : ''; ?>
+      <input class="flat" type="checkbox" name="fDefaultaliases" <?php print $checked; ?> />
+      </td>
+      <td><?php print $PALANG['pAdminCreate_domain_defaultaliases_text']; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td>
+      <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
+      <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> />
+      </td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_domain_button']; ?>" /></td>
+   </tr>
+   <tr>
+      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+   </tr>
+</table>
+</form>
+</div>

Deleted: trunk/templates/admin_create-domain.tpl
===================================================================
--- trunk/templates/admin_create-domain.tpl	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_create-domain.tpl	2007-12-02 13:59:33 UTC (rev 250)
@@ -1,77 +0,0 @@
-<div id="edit_form">
-<form name="create_domain" method="post">
-<table>
-   <tr>
-      <td colspan="3"><h3><?php print $PALANG['pAdminCreate_domain_welcome']; ?></h3></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_domain'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fDomain" value="<?php print $tDomain; ?>" /></td>
-      <td><?php print $pAdminCreate_domain_domain_text; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_description'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fDescription" value="<?php print $tDescription; ?>" /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_aliases'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
-      <td><?php print $PALANG['pAdminCreate_domain_aliases_text']; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_mailboxes'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
-      <td><?php print $PALANG['pAdminCreate_domain_mailboxes_text']; ?></td>
-   </tr>
-   <?php if ($CONF['quota'] == 'YES') { ?>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_maxquota'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
-      <td><?php print $PALANG['pAdminCreate_domain_maxquota_text']; ?></td>
-   </tr>
-   <?php } if ($CONF['transport'] == 'YES') { ?>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_transport'] . ":"; ?></td>
-      <td><select class="flat" name="fTransport">
-      <?php
-      for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
-      {
-         if ($CONF['transport_options'][$i] == $tTransport)
-         {
-            print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
-         }
-         else
-         {
-            print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
-         }
-      }
-      ?>
-      </select>
-      </td>
-      <td><?php print $PALANG['pAdminCreate_domain_transport_text']; ?></td>
-   </tr>
-   <?php } ?>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_defaultaliases'] . ":"; ?></td>
-      <td><?php $checked = (!empty ($tDefaultaliases)) ? 'checked' : ''; ?>
-      <input class="flat" type="checkbox" name="fDefaultaliases" <?php print $checked; ?> />
-      </td>
-      <td><?php print $PALANG['pAdminCreate_domain_defaultaliases_text']; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td>
-      <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
-      <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> />
-      </td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminCreate_domain_button']; ?>" /></td>
-   </tr>
-   <tr>
-      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
-   </tr>
-</table>
-</form>
-</div>

Added: trunk/templates/admin_edit-admin.php
===================================================================
--- trunk/templates/admin_edit-admin.php	                        (rev 0)
+++ trunk/templates/admin_edit-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,55 @@
+<div id="edit_form">
+<form name="alias" method="post">
+<table>
+   <tr>
+      <td colspan="3"><h3><?php print $PALANG['pAdminEdit_admin_welcome']; ?></h3></td></tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_admin_username']; ?>:</td>
+      <td><?php print $username; ?></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</td>
+      <td><input class="flat" type="password" autocomplete="off" name="fPassword" value=""/></td>
+      <td><?php print $pAdminEdit_admin_password_text; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</td>
+      <td><input class="flat" type="password" name="fPassword2" value="" /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_admin_active']; ?>:</td>
+      <td><input class="flat" type="checkbox" name="fActive" <?php print (!empty ($tActive)) ? 'checked' : ''; ?> /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_admin_super_admin']; ?>:</td>
+      <td><input class="flat" type="checkbox" name="fSadmin" <?php print (!empty ($tSadmin)) ? 'checked' : ''; ?> /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td colspan=3 align=center>
+      <select name="fDomains[]" size="10" multiple="multiple">
+      <?php
+      foreach($tAllDomains as $domain) {
+         // should escape $domain here to stop xss etc.
+         $selected = '';
+         if (in_array ($domain, $tDomains))  {
+            $selected = "selected='selected'";
+         }
+         print "<option value='$domain' $selected>$domain</option>\n";
+      }
+      ?>
+      </select>
+      </td>
+   </tr>
+   <tr>
+      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminEdit_admin_button']; ?>" /></td>
+   </tr>
+   <tr>
+      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+   </tr>
+</table>
+</form>
+</div>

Deleted: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_edit-admin.tpl	2007-12-02 13:59:33 UTC (rev 250)
@@ -1,55 +0,0 @@
-<div id="edit_form">
-<form name="alias" method="post">
-<table>
-   <tr>
-      <td colspan="3"><h3><?php print $PALANG['pAdminEdit_admin_welcome']; ?></h3></td></tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_username']; ?>:</td>
-      <td><?php print $username; ?></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_password']; ?>:</td>
-      <td><input class="flat" type="password" autocomplete="off" name="fPassword" value=""/></td>
-      <td><?php print $pAdminEdit_admin_password_text; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_password2']; ?>:</td>
-      <td><input class="flat" type="password" name="fPassword2" value="" /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_active']; ?>:</td>
-      <td><input class="flat" type="checkbox" name="fActive" <?php print (!empty ($tActive)) ? 'checked' : ''; ?> /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_admin_super_admin']; ?>:</td>
-      <td><input class="flat" type="checkbox" name="fSadmin" <?php print (!empty ($tSadmin)) ? 'checked' : ''; ?> /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td colspan=3 align=center>
-      <select name="fDomains[]" size="10" multiple="multiple">
-      <?php
-      foreach($tAllDomains as $domain) {
-         // should escape $domain here to stop xss etc.
-         $selected = '';
-         if (in_array ($domain, $tDomains))  {
-            $selected = "selected='selected'";
-         }
-         print "<option value='$domain' $selected>$domain</option>\n";
-      }
-      ?>
-      </select>
-      </td>
-   </tr>
-   <tr>
-      <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pAdminEdit_admin_button']; ?>" /></td>
-   </tr>
-   <tr>
-      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
-   </tr>
-</table>
-</form>
-</div>

Added: trunk/templates/admin_edit-domain.php
===================================================================
--- trunk/templates/admin_edit-domain.php	                        (rev 0)
+++ trunk/templates/admin_edit-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,75 @@
+<div id="edit_form">
+<form name="edit_domain" method="post">
+<table>
+   <tr>
+      <td colspan="3"><h3><?php print $PALANG['pAdminEdit_domain_welcome']; ?></h3></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_domain'] . ":"; ?></td>
+      <td><?php print $domain; ?></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_description'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fDescription" value="<?php print htmlspecialchars($tDescription, ENT_QUOTES); ?>" /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_aliases'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
+      <td><?php print $PALANG['pAdminEdit_domain_aliases_text']; ?></td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_mailboxes'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
+      <td><?php print $PALANG['pAdminEdit_domain_mailboxes_text']; ?></td>
+   </tr>
+   <?php if ($CONF['quota'] == 'YES') { ?>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_maxquota'] . ":"; ?></td>
+      <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
+      <td><?php print $PALANG['pAdminEdit_domain_maxquota_text']; ?></td>
+   </tr>
+   <?php } if ($CONF['transport'] == 'YES') { ?>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_transport'] . ":"; ?></td>
+      <td><select class="flat" name="fTransport">
+      <?php
+      for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
+      {
+         if ($CONF['transport_options'][$i] == $tTransport)
+         {
+            print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
+         }
+         else
+         {
+            print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
+         }
+      }
+      ?>
+      </select>
+      </td>
+      <td><?php print $PALANG['pAdminEdit_domain_transport_text']; ?></td>
+   </tr>
+   <?php } ?>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_backupmx'] . ":"; ?></td>
+      <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
+      <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td><?php print $PALANG['pAdminEdit_domain_active'] . ":"; ?></td>
+      <td><?php $checked = (!empty ($tActive)) ? 'checked' : ''; ?>
+      <input class="flat" type="checkbox" name="fActive" <?php print $checked; ?> /></td>
+      <td>&nbsp;</td>
+   </tr>
+   <tr>
+      <td colspan="3" class="hlp_center"><input type="submit" class="button" name="submit" value="<?php print $PALANG['pAdminEdit_domain_button']; ?>" /></td>
+   </tr>
+   <tr>
+      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
+   </tr>
+</table>
+</form>
+</div>

Deleted: trunk/templates/admin_edit-domain.tpl
===================================================================
--- trunk/templates/admin_edit-domain.tpl	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_edit-domain.tpl	2007-12-02 13:59:33 UTC (rev 250)
@@ -1,75 +0,0 @@
-<div id="edit_form">
-<form name="edit_domain" method="post">
-<table>
-   <tr>
-      <td colspan="3"><h3><?php print $PALANG['pAdminEdit_domain_welcome']; ?></h3></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_domain'] . ":"; ?></td>
-      <td><?php print $domain; ?></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_description'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fDescription" value="<?php print htmlspecialchars($tDescription, ENT_QUOTES); ?>" /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_aliases'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fAliases" value="<?php print $tAliases; ?>" /></td>
-      <td><?php print $PALANG['pAdminEdit_domain_aliases_text']; ?></td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_mailboxes'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fMailboxes" value="<?php print $tMailboxes; ?>" /></td>
-      <td><?php print $PALANG['pAdminEdit_domain_mailboxes_text']; ?></td>
-   </tr>
-   <?php if ($CONF['quota'] == 'YES') { ?>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_maxquota'] . ":"; ?></td>
-      <td><input class="flat" type="text" name="fMaxquota" value="<?php print $tMaxquota; ?>" /></td>
-      <td><?php print $PALANG['pAdminEdit_domain_maxquota_text']; ?></td>
-   </tr>
-   <?php } if ($CONF['transport'] == 'YES') { ?>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_transport'] . ":"; ?></td>
-      <td><select class="flat" name="fTransport">
-      <?php
-      for ($i = 0; $i < sizeof ($CONF['transport_options']); $i++)
-      {
-         if ($CONF['transport_options'][$i] == $tTransport)
-         {
-            print "<option value=\"" . $CONF['transport_options'][$i] . "\" selected>" . $CONF['transport_options'][$i] . "</option>\n";
-         }
-         else
-         {
-            print "<option value=\"" . $CONF['transport_options'][$i] . "\">" . $CONF['transport_options'][$i] . "</option>\n";
-         }
-      }
-      ?>
-      </select>
-      </td>
-      <td><?php print $PALANG['pAdminEdit_domain_transport_text']; ?></td>
-   </tr>
-   <?php } ?>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_backupmx'] . ":"; ?></td>
-      <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
-      <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td><?php print $PALANG['pAdminEdit_domain_active'] . ":"; ?></td>
-      <td><?php $checked = (!empty ($tActive)) ? 'checked' : ''; ?>
-      <input class="flat" type="checkbox" name="fActive" <?php print $checked; ?> /></td>
-      <td>&nbsp;</td>
-   </tr>
-   <tr>
-      <td colspan="3" class="hlp_center"><input type="submit" class="button" name="submit" value="<?php print $PALANG['pAdminEdit_domain_button']; ?>" /></td>
-   </tr>
-   <tr>
-      <td colspan="3" class="standout"><?php print $tMessage; ?></td>
-   </tr>
-</table>
-</form>
-</div>

Added: trunk/templates/admin_list-admin.php
===================================================================
--- trunk/templates/admin_list-admin.php	                        (rev 0)
+++ trunk/templates/admin_list-admin.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,35 @@
+<?php 
+if (sizeof ($list_admins) > 0)
+{
+   print "<table id=\"admin_table\">\n";
+   print "   <tr class=\"header\">\n";
+   print "      <td>" . $PALANG['pAdminList_admin_username'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_admin_count'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_admin_modified'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_admin_active'] . "</td>\n";
+   print "      <td colspan=\"2\">&nbsp;</td>\n";
+   print "   </tr>\n";
+
+   for ($i = 0; $i < sizeof ($list_admins); $i++)
+   {
+      if ((is_array ($list_admins) and sizeof ($list_admins) > 0))
+      {
+         print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+      	print "      <td><a href=\"list-domain.php?username=" . $list_admins[$i] . "\">" . $list_admins[$i] . "</a></td>";
+         if ($admin_properties[$i]['domain_count'] == 'ALL') $admin_properties[$i]['domain_count'] = $PALANG['pAdminEdit_admin_super_admin'];
+      	print "      <td>" . $admin_properties[$i]['domain_count'] . "</td>";
+   		print "      <td>" . $admin_properties[$i]['modified'] . "</td>";
+         $active = ($admin_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+   		print "      <td><a href=\"edit-active-admin.php?username=" . $list_admins[$i] . "\">" . $active . "</a></td>";
+   		print "      <td><a href=\"edit-admin.php?username=" . $list_admins[$i] . "\">" . $PALANG['edit'] . "</a></td>";
+   		print "      <td><a href=\"delete.php?table=admin&delete=" . $list_admins[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pAdminList_admin_username'] . ": " . $list_admins[$i] . "')\">" . $PALANG['del'] . "</a></td>";
+   		print "   </tr>\n";
+		}
+   }
+
+   print "</table>\n";
+   print "<p><a href=\"create-admin.php\">" . $PALANG['pAdminMenu_create_admin'] . "</a>\n";
+}
+
+/* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
+?>

Deleted: trunk/templates/admin_list-admin.tpl
===================================================================
--- trunk/templates/admin_list-admin.tpl	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_list-admin.tpl	2007-12-02 13:59:33 UTC (rev 250)
@@ -1,35 +0,0 @@
-<?php 
-if (sizeof ($list_admins) > 0)
-{
-   print "<table id=\"admin_table\">\n";
-   print "   <tr class=\"header\">\n";
-   print "      <td>" . $PALANG['pAdminList_admin_username'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_admin_count'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_admin_modified'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_admin_active'] . "</td>\n";
-   print "      <td colspan=\"2\">&nbsp;</td>\n";
-   print "   </tr>\n";
-
-   for ($i = 0; $i < sizeof ($list_admins); $i++)
-   {
-      if ((is_array ($list_admins) and sizeof ($list_admins) > 0))
-      {
-         print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
-      	print "      <td><a href=\"list-domain.php?username=" . $list_admins[$i] . "\">" . $list_admins[$i] . "</a></td>";
-         if ($admin_properties[$i]['domain_count'] == 'ALL') $admin_properties[$i]['domain_count'] = $PALANG['pAdminEdit_admin_super_admin'];
-      	print "      <td>" . $admin_properties[$i]['domain_count'] . "</td>";
-   		print "      <td>" . $admin_properties[$i]['modified'] . "</td>";
-         $active = ($admin_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
-   		print "      <td><a href=\"edit-active-admin.php?username=" . $list_admins[$i] . "\">" . $active . "</a></td>";
-   		print "      <td><a href=\"edit-admin.php?username=" . $list_admins[$i] . "\">" . $PALANG['edit'] . "</a></td>";
-   		print "      <td><a href=\"delete.php?table=admin&delete=" . $list_admins[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pAdminList_admin_username'] . ": " . $list_admins[$i] . "')\">" . $PALANG['del'] . "</a></td>";
-   		print "   </tr>\n";
-		}
-   }
-
-   print "</table>\n";
-   print "<p><a href=\"create-admin.php\">" . $PALANG['pAdminMenu_create_admin'] . "</a>\n";
-}
-
-/* vim: set ft=php expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>

Added: trunk/templates/admin_list-domain.php
===================================================================
--- trunk/templates/admin_list-domain.php	                        (rev 0)
+++ trunk/templates/admin_list-domain.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,86 @@
+<div id="overview">
+<form name="overview" method="post">
+<select name="fUsername" onChange="this.form.submit();">
+<?php
+if (!empty ($list_admins))
+{
+   for ($i = 0; $i < sizeof ($list_admins); $i++)
+   {
+      if ($fUsername == $list_admins[$i])
+      {
+         print "<option value=\"" . $list_admins[$i] . "\" selected>" . $list_admins[$i] . "</option>\n";
+      }
+      else
+      {
+         print "<option value=\"" . $list_admins[$i] . "\">" . $list_admins[$i] . "</option>\n";
+      }
+   }
+}
+?>
+</select>
+<input class="button" type="submit" name="go" value="<?php print $PALANG['pOverview_button']; ?>" />
+</form>
+<form name="search" method="post" action="search.php">
+<input type="textbox" name="search" size="10" />
+</form>
+</div>
+
+<?php 
+if (sizeof ($list_domains) > 0)
+{
+   print "<table id=\"admin_table\">\n";
+   print "   <tr class=\"header\">\n";
+   print "      <td>" . $PALANG['pAdminList_domain_domain'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_domain_description'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_domain_aliases'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_domain_mailboxes'] . "</td>\n";
+   if ($CONF['quota'] == 'YES') print "      <td>" . $PALANG['pAdminList_domain_maxquota'] . "</td>\n";
+   if ($CONF['transport'] == 'YES') print "      <td>" . $PALANG['pAdminList_domain_transport'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_domain_backupmx'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_domain_modified'] . "</td>\n";
+   print "      <td>" . $PALANG['pAdminList_domain_active'] . "</td>\n";
+   print "      <td colspan=\"2\">&nbsp;</td>\n";
+   print "   </tr>\n";
+
+   for ($i = 0; $i < sizeof ($list_domains); $i++)
+   {
+      if ((is_array ($list_domains) and sizeof ($list_domains) > 0))
+      {
+         print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+         print "<td><a href=\"list-virtual.php?domain=" . $list_domains[$i] . "\">" . $list_domains[$i] . "</a></td>";
+         print "<td>" . $domain_properties[$i]['description'] . "</td>";
+         print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
+         print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
+         if ($CONF['quota'] == 'YES')
+         {
+            print "      <td>";
+            if ($domain_properties[$i]['maxquota'] == 0)
+            {
+               print $PALANG['pOverview_unlimited'];
+            }
+            elseif ($domain_properties[$i]['maxquota'] < 0)
+            {
+               print $PALANG['pOverview_disabled'];
+            }
+            else
+            {
+               print $domain_properties[$i]['maxquota'];
+            }
+            print "</td>\n";
+         }
+         if ($CONF['transport'] == 'YES') print "<td>" . $domain_properties[$i]['transport'] . "</td>";
+         $backupmx = ($domain_properties[$i]['backupmx'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+         print "<td>$backupmx</td>";
+         print "<td>" . $domain_properties[$i]['modified'] . "</td>";
+         $active = ($domain_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+         print "<td><a href=\"edit-active-domain.php?domain=" . $list_domains[$i] . "\">" . $active . "</a></td>";
+         print "<td><a href=\"edit-domain.php?domain=" . $list_domains[$i] . "\">" . $PALANG['edit'] . "</a></td>";
+         print "<td><a href=\"delete.php?table=domain&delete=" . $list_domains[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm_domain'] . $PALANG['pAdminList_admin_domain'] . ": " . $list_domains[$i] . "')\">" . $PALANG['del'] . "</a></td>";
+         print "</tr>\n";
+		}
+   }
+
+   print "</table>\n";
+}
+echo "<p><a href='create-domain.php'>{$PALANG['pAdminMenu_create_domain']}</a>";
+?>

Deleted: trunk/templates/admin_list-domain.tpl
===================================================================
--- trunk/templates/admin_list-domain.tpl	2007-11-27 23:24:37 UTC (rev 249)
+++ trunk/templates/admin_list-domain.tpl	2007-12-02 13:59:33 UTC (rev 250)
@@ -1,86 +0,0 @@
-<div id="overview">
-<form name="overview" method="post">
-<select name="fUsername" onChange="this.form.submit();">
-<?php
-if (!empty ($list_admins))
-{
-   for ($i = 0; $i < sizeof ($list_admins); $i++)
-   {
-      if ($fUsername == $list_admins[$i])
-      {
-         print "<option value=\"" . $list_admins[$i] . "\" selected>" . $list_admins[$i] . "</option>\n";
-      }
-      else
-      {
-         print "<option value=\"" . $list_admins[$i] . "\">" . $list_admins[$i] . "</option>\n";
-      }
-   }
-}
-?>
-</select>
-<input class="button" type="submit" name="go" value="<?php print $PALANG['pOverview_button']; ?>" />
-</form>
-<form name="search" method="post" action="search.php">
-<input type="textbox" name="search" size="10" />
-</form>
-</div>
-
-<?php 
-if (sizeof ($list_domains) > 0)
-{
-   print "<table id=\"admin_table\">\n";
-   print "   <tr class=\"header\">\n";
-   print "      <td>" . $PALANG['pAdminList_domain_domain'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_domain_description'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_domain_aliases'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_domain_mailboxes'] . "</td>\n";
-   if ($CONF['quota'] == 'YES') print "      <td>" . $PALANG['pAdminList_domain_maxquota'] . "</td>\n";
-   if ($CONF['transport'] == 'YES') print "      <td>" . $PALANG['pAdminList_domain_transport'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_domain_backupmx'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_domain_modified'] . "</td>\n";
-   print "      <td>" . $PALANG['pAdminList_domain_active'] . "</td>\n";
-   print "      <td colspan=\"2\">&nbsp;</td>\n";
-   print "   </tr>\n";
-
-   for ($i = 0; $i < sizeof ($list_domains); $i++)
-   {
-      if ((is_array ($list_domains) and sizeof ($list_domains) > 0))
-      {
-         print "   <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
-         print "<td><a href=\"list-virtual.php?domain=" . $list_domains[$i] . "\">" . $list_domains[$i] . "</a></td>";
-         print "<td>" . $domain_properties[$i]['description'] . "</td>";
-         print "<td>" . $domain_properties[$i]['alias_count'] . " / " . $domain_properties[$i]['aliases'] . "</td>";
-         print "<td>" . $domain_properties[$i]['mailbox_count'] . " / " . $domain_properties[$i]['mailboxes'] . "</td>";
-         if ($CONF['quota'] == 'YES')
-         {
-            print "      <td>";
-            if ($domain_properties[$i]['maxquota'] == 0)
-            {
-               print $PALANG['pOverview_unlimited'];
-            }
-            elseif ($domain_properties[$i]['maxquota'] < 0)
-            {
-               print $PALANG['pOverview_disabled'];
-            }
-            else
-            {
-               print $domain_properties[$i]['maxquota'];
-            }
-            print "</td>\n";
-         }
-         if ($CONF['transport'] == 'YES') print "<td>" . $domain_properties[$i]['transport'] . "</td>";
-         $backupmx = ($domain_properties[$i]['backupmx'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
-         print "<td>$backupmx</td>";
-         print "<td>" . $domain_properties[$i]['modified'] . "</td>";
-         $active = ($domain_properties[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
-         print "<td><a href=\"edit-active-domain.php?domain=" . $list_domains[$i] . "\">" . $active . "</a></td>";
-         print "<td><a href=\"edit-domain.php?domain=" . $list_domains[$i] . "\">" . $PALANG['edit'] . "</a></td>";
-         print "<td><a href=\"delete.php?table=domain&delete=" . $list_domains[$i] . "\" onclick=\"return confirm ('" . $PALANG['confirm_domain'] . $PALANG['pAdminList_admin_domain'] . ": " . $list_domains[$i] . "')\">" . $PALANG['del'] . "</a></td>";
-         print "</tr>\n";
-		}
-   }
-
-   print "</table>\n";
-}
-echo "<p><a href='create-domain.php'>{$PALANG['pAdminMenu_create_domain']}</a>";
-?>

Added: trunk/templates/admin_search.php
===================================================================
--- trunk/templates/admin_search.php	                        (rev 0)
+++ trunk/templates/admin_search.php	2007-12-02 13:59:33 UTC (rev 250)
@@ -0,0 +1,110 @@
+<?php
+require(dirname(__FILE__) . '/search.tpl');
+
+/* old code, should be deleted after testing the merge with templates/search.php
+?>
+
+<div id="overview">
+<form name="search" method="post" action="search.php">
+<table width=750><tr>
+<td>
+  <h4><?php print $PALANG['pSearch_welcome'] . $fSearch; ?></h4>
+</td>
+<td>
+    <?php print $PALANG['pSearch']; ?>:<input type="textbox" name="search">
+</td>
+<td align=right><select class="flat" name...
 
[truncated message content]