diff -urN --exclude=CVS mailadmin-1.5.1/add_user.php mailadmin/add_user.php
--- mailadmin-1.5.1/add_user.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/add_user.php	2003-12-24 15:25:31.000000000 -0600
@@ -32,27 +32,38 @@
   }
 
   /* Attempting to create a new mailbox. */
-  $newmailbox = "{".$mail_server_name.":".$mail_server_port."}user.".$account_name;
-  $sent_mail_folder = $newmailbox.".sent-mail";
+  $newmailbox = "{".$mail_server_name.":".$mail_server_port."}user".$mail_server_seperator.$account_name;
+  $Folders = array ("sent-mail", "SPAM", "SPAM".$mail_server_seperator."HAM", "SPAM".$mail_server_seperator."MissedSPAM", "Drafts", "Templates", "Trash");
+  $createdFolders = 0;
 
   if(@imap_createmailbox($mbox,imap_utf7_encode($newmailbox))) {
-   if(@imap_createmailbox($mbox,imap_utf7_encode($sent_mail_folder))) {
-    system("./scripts/setpassword.pl ".$account_name." '".$temp_password."'");
-    system("./scripts/setquota.pl ".$account_name." ".$username." ".$mail_server_name." ".$password." ".($quota * 1024));
-    system("./scripts/setrights.pl ".$account_name." ".$username." ".$mail_server_name." ".$password);
+   for ($n=0; $n < count($Folders); $n++)
+   {
+     $Folder = each($Folders);
+     $folder = $newmailbox . $mail_server_seperator . $Folder[value];
+     if(@imap_createmailbox($mbox,imap_utf7_encode($folder))) {
+       $createdFolders++;
+     } else {
+       $result = "Could not create mailbox user".$mail_server_seperator.$account_name." - ".imap_last_error();
+     }
+   }
+   
+   if ($createdFolders == count($Folders))
+   {
+    system("./scripts/setpassword.pl '".$account_name."' '".$temp_password."' c");
+    system("./scripts/setquota.pl '".$account_name."' '".$username."' '".$mail_server_name."' '".$password."' '".($quota * 1024)."' '".$mail_server_seperator."'");
+    system("./scripts/setrights.pl '".$account_name."' '".$username."' '".$mail_server_name."' '".$password."' '".$mail_server_seperator."'");
 
     if (strcmp($enable_dbase, "Yes") == 0) {
-     $transaction = new transaction_log;
-     $transaction->submit($username, "Created new account '$account_name'");
-     unset($transaction);
+      $transaction = new transaction_log;
+      $transaction->submit($username, "Created new account '$account_name'");
+      unset($transaction);
     }
-   } else {
-    $result = "Could not create mailbox user.".$account_name." - ".imap_last_error();
-   }
 
-   $result = "Created new mail account '".$account_name."'";
+    $result = "Created new mail account '".$account_name."'";
+   }
   } else {
-   $result = "Could not create mailbox user.".$account_name." - ".imap_last_error();
+   $result = "Could not create mailbox user".$mail_server_seperator.$account_name." - ".imap_last_error();
   }
  }
 ?>
@@ -62,17 +73,38 @@
   <TITLE>Mail Server Administration - Add New Email Account</TITLE>
   <SCRIPT LANGUAGE="JavaScript">
    <!--
-    function add_email() {
+    function check_add_email() {
      if (document.add_email.account_name.value.length <= 0) {
       alert("You must supply a valid Account Name before you can continue.");
-      return;
+      document.add_email.account_name.focus();
+      return false;
      }
 
      if (document.add_email.temp_password.value.length <= 0) {
       alert("You must supply a valid password before you can continue.");
-      return;
+      document.add_email.temp_password.focus();
+      return false;
+     }
+
+     if (document.add_email.quota.value.length <= 0) {
+      alert("You must supply a valid quota before you can continue.");
+      document.add_email.quota.focus();
+      return false;
+     }
+
+     var numbers = /^(\d+)$/;
+     var result = document.add_email.quota.value.match(numbers);
+     if (result == null)
+     {
+       alert("'"+document.add_email.quota.value+"' is an invalid quota!");
+       document.add_email.quota.focus();
+       return false;
      }
 
+     return true;
+    }
+
+    function add_email() {
      document.add_email.submit();
     }
 
@@ -82,7 +114,7 @@
    // -->
   </SCRIPT>
  </HEAD>
- <BODY BGCOLOR="#EEEEEE">
+ <BODY BGCOLOR="#EEEEEE" onLoad="document.add_email.account_name.focus();">
   <?php include('includes/header.inc'); ?>
   <HR>
   <?php include('includes/menu.inc'); ?>
@@ -96,7 +128,7 @@
     }
   ?>
 
-  <FORM NAME="add_email" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
+  <FORM NAME="add_email" ACTION="<?php print $PHP_SELF; ?>" METHOD="post" onSubmit="return check_add_email();">
    <INPUT TYPE="hidden" NAME="submitted" VALUE="1">
    <CENTER>
     <TABLE BGCOLOR="#000000" CELLPADDING="0" CELLSPACING="0" BORDER="0">
@@ -107,7 +139,7 @@
          <TBODY>
           <TR>
            <TH ALIGN="left" VALIGN="center">Account Name:</TH>
-           <TD ALIGN="left" VALIGN="center"><INPUT NAME="account_name" TYPE="text" MAXLENGTH="16" SIZE="17"></TD>
+           <TD ALIGN="left" VALIGN="center"><INPUT NAME="account_name" TYPE="text" MAXLENGTH="100" SIZE="25"></TD>
           </TR>
           <TR>
            <TH ALIGN="left" VALIGN="center">Password:</TH>
@@ -124,16 +156,24 @@
       </TR>
      </TBODY>
     </TABLE>
+  <?php if ($submit_buttons) { ?>
+    <br>
+    <hr>
+    <input type="submit" name="add_button" value="Add"> <input type="reset" value="Reset">
+    <hr>
+  <?php } ?>
    </CENTER>
   </FORM>
 
+  <?php if (!$submit_buttons) { ?>
   <HR>
   <CENTER>
-   [<A HREF="javascript:add_email();">Add</A>]
+   [<A HREF="javascript:add_email();" onClick="return check_add_email();">Add</A>]
    [<A HREF="javascript:reset_email();">Reset</A>]
   </CENTER>
 
   <HR>
+  <?php } ?>
   <?php include('includes/footer.inc'); ?>
  </BODY>
 </HTML>
diff -urN --exclude=CVS mailadmin-1.5.1/change_password.php mailadmin/change_password.php
--- mailadmin-1.5.1/change_password.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/change_password.php	2003-12-24 14:08:20.000000000 -0600
@@ -16,11 +16,12 @@
  if ($submitted) {
   /* If the account can not connect, we can not verify the validity of the account or the password. */
   if (!user_login($username, $current_password)) {
+   set_cookie("MAILADMIN_EXPIRED", 0);
    header("Location: error/error_current.php");
    exit;
   }
 
-  system("./scripts/setpassword.pl ".$username." '".$newpassword1."'");
+  system("./scripts/setpassword.pl ".$username." '".$newpassword1."' u");
 
   if (strcmp($enable_dbase, "Yes") == 0) {
    $account = new account_information;
@@ -46,24 +47,31 @@
   <TITLE>Mail Server Administration - Change Password</TITLE>
   <SCRIPT LANGUAGE="JavaScript">
    <!--
-    function expired_password() {
+    function check_expired_password() {
      if (document.expired_password.current_password.value.length <= 0) {
       alert("You must enter your current password.");
-      return;
+      document.expired_password.current_password.focus();
+      return false;
      }
 
      if (document.expired_password.newpassword1.value.length <= 0) {
       alert("You must enter a valid new password.");
-      return;
+      document.expired_password.newpassword1.focus();
+      return false;
      }
 
      var reg = new RegExp("^" + document.expired_password.newpassword1.value + "$");
 
      if (!reg.test(document.expired_password.newpassword2.value)) {
       alert("The validation password does not match your new password, please try again.");
-      return;
+      document.expired_password.newpassword2.focus();
+      return false;
      }
 
+     return true;
+    }
+
+    function expired_password() {
      document.expired_password.submit();
     }
 
@@ -73,7 +81,7 @@
    // -->
   </SCRIPT>
  </HEAD>
- <BODY BGCOLOR="#EEEEEE">
+ <BODY BGCOLOR="#EEEEEE" onLoad="document.expired_password.current_password.focus();">
   <?php include('includes/header.inc'); ?>
   <HR>
   <?php include('includes/menu.inc'); ?>
@@ -81,7 +89,7 @@
   <CENTER><B><FONT COLOR="#0000FF">Change Password</FONT></B></CENTER>
   <BR>
 
-  <FORM NAME="expired_password" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
+  <FORM NAME="expired_password" ACTION="<?php print $PHP_SELF; ?>" METHOD="post" onSubmit="return check_expired_password();">
    <INPUT TYPE="hidden" NAME="submitted" VALUE="1">
    <TABLE>
     <TBODY>
@@ -99,15 +107,19 @@
      </TR>
     </TBODY>
    </TABLE>
-  </FORM>
-
+  <br>
   <HR>
   <B><FONT COLOR="#FF0000">Note: You will be logged off, and will need to log back in.</FONT></B>
   <BR>
-  [<A HREF="javascript:expired_password();">Change</A>]
+  <?php if ($submit_buttons) { ?>
+  <input type="submit" name="expired_password_button" value="Change"> <input type="reset" value="Reset">
+  <?php } else { ?>
+  [<A HREF="javascript:expired_password();" onClick="return check_expired_password();">Change</A>]
   [<A HREF="javascript:reset_password();">Reset</A>]
+  <?php } ?>
 
   <HR>
+  </FORM>
   <?php include('includes/footer.inc'); ?>
  </BODY>
 </HTML>
diff -urN --exclude=CVS mailadmin-1.5.1/docs/mailadmin Installation Notes.html mailadmin/docs/mailadmin Installation Notes.html
--- mailadmin-1.5.1/docs/mailadmin Installation Notes.html	1969-12-31 18:00:00.000000000 -0600
+++ mailadmin/docs/mailadmin Installation Notes.html	2003-12-24 16:21:03.000000000 -0600
@@ -0,0 +1,46 @@
+<html>
+  <head>
+  <title>mailadmin Installation Notes</title>
+  <style type="text/css">
+    body { color: black; background: white; }
+  </style>
+  </head>
+  <body>
+    <p>
+      <center><h1>mailadmin Installation Notes</h1></center>
+      <h1>Prerequisities:</h1>
+      <ul>
+        <li>IMAP::Admin</li>
+        <li>Cyrus Sasl2 (saslpasswd2, etc.)</li>
+        <li>PHP capable web server (apache, etc.)</li>
+        <li>PostgreSQL 7.1+ for database support</li>
+      </ul>
+      <h1>Installation:</h1>
+      <ul>
+        <li>Make saslpasswd2 suid: <b>chmod +s /usr/sbin/saslpasswd2</b></li>
+        <li>Make an entry in sasldb2 for the cyrus user: <b>saslpasswd2 -c cyrus</b></li>
+        <li>Create the PostgreSQL User: <b>createuser -U postgres <i>mail</i></b><br>Say <b>yes</b> to create databases,
+        <b>no</b> to create other users.</li>
+        <li>Now set the password for this user: <b>psql -U postgres template1</b><br>
+        Inside psql: <b>ALTER USER <i>mail</i> PASSWORD '<i>password</i>';</b> - If using PostgreSQL 7.2 you can use ENCRYPTED before PASSWORD to md5 encrypt the password.<br>
+        Exit psql. &nbsp;Now make sure PostgreSQL is asking for a password for all connections from the web server:<br>
+        <b>vi /var/lib/pgsql/data/pg_hba.conf</b><br>
+        Add a line at the bottom: <b>host all <i>Server IP Address</i> 255.255.255.255 password</b> - If using md5 ENCRYPTED passwords, use <b>md5</b> instead of <b>password</b>.</li>
+        <li>Make sure PostgreSQL is answering network connections. &nbsp;<b>vi /var/lib/pgsql/data/postgresql.conf</b><br>
+        uncomment <b>tcpip_socket = false</b> - remove the leading # sign.<br>
+        Then change the <i>false</i> to <i>true</i>.<br>
+        Restart PostgreSQL: <b>service postgresql restart</b></li>
+        <li>Now create the database that <i>mailadmin</i> will use: <b>createdb -U <i>mail</i> <i>mailadmin</i></b></li>
+        <li>Now populate the database with the tables needed: <b>psql -U <i>mail</i> <i>mailadmin</i> -f mailadmin-pg.sql</b></li>
+        <li>Point the <i>config.inc</i> file to the database server and use the user you created, etc.</li>
+      </ul>
+      <h1>Usage:</h1>
+      <ul>
+        <li>You log into the application as user <b>cyrus</b> using the password you setup in the Installation process.</li>
+      </ul>
+    </p>
+    <p>
+    <b>Note</b>:  The above steps and locations were pretty much specific to RedHat.  Debian, for example, puts postgresql in slightly different locations.  The actual values being worked with should still be valid.  - 2003/12/24
+    </p>
+  </body>
+</html>
diff -urN --exclude=CVS mailadmin-1.5.1/edit/changepassword.php mailadmin/edit/changepassword.php
--- mailadmin-1.5.1/edit/changepassword.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/edit/changepassword.php	2003-12-24 14:09:01.000000000 -0600
@@ -22,7 +22,7 @@
 
  /* Testing operation, the form submits a request change an email account password. */
  if ($submitted) {
-  system("../scripts/setpassword.pl ".$user." ".$pass1);
+  system("../scripts/setpassword.pl '".$user."' '".$pass1."' u");
 
   if (strcmp($enable_dbase, "Yes") == 0) {
    $account = new account_information;
@@ -49,12 +49,17 @@
   <TITLE>Mail Server Administration - Change Password</TITLE>
   <SCRIPT LANGUAGE="JavaScript">
    <!--
-    function change_password() {
+    function check_change_password() {
      if (document.change_password.pass1.value.length <= 0) {
       alert("You must enter a valid password before continuing.");
-      exit;
+      document.change_password.pass1.focus();
+      return false;
      }
 
+     return true;
+    }
+
+    function change_password() {
      document.change_password.submit();
     }
 
@@ -64,7 +69,7 @@
    // -->
   </SCRIPT>
  </HEAD>
- <BODY BGCOLOR="#EEEEEE">
+ <BODY BGCOLOR="#EEEEEE" onLoad="document.change_password.pass1.focus();">
   <?php include('../includes/header.inc'); ?>
   <HR>
   <?php include('../includes/menu.inc'); ?>
@@ -72,7 +77,7 @@
   <CENTER><B><FONT COLOR="#0000FF">Change Account Password</FONT></B></CENTER>
   <BR>
 
-  <FORM NAME="change_password" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
+  <FORM NAME="change_password" ACTION="<?php print $PHP_SELF; ?>" METHOD="post" onSubmit="return check_change_password();">
    <INPUT NAME="submitted" TYPE="hidden" VALUE="1">
    <INPUT NAME="source_page" TYPE="hidden" VALUE="<?php print $source_page; ?>">
    <INPUT NAME="user" TYPE="hidden" VALUE="<?php print $user; ?>">
@@ -94,16 +99,24 @@
       </TR>
      </TBODY>
     </TABLE>
+   <?php if ($submit_buttons) { ?>
+    <br>
+    <hr>
+    <input type="submit" name="change_password_button" value="Change"> <input type="reset" value="Reset">
+    <hr>
+   <?php } ?>
    </CENTER>
   </FORM>
 
+  <?php if (!$submit_buttons) { ?>
   <HR>
   <CENTER>
-   [<A HREF="javascript:change_password();">Change</A>]
+   [<A HREF="javascript:change_password();" onClick="return check_change_password();">Change</A>]
    [<A HREF="javascript:reset_password();">Reset</A>]
   </CENTER>
 
   <HR>
+  <?php } ?>
   <?php include('../includes/footer.inc'); ?>
  </BODY>
 </HTML>
diff -urN --exclude=CVS mailadmin-1.5.1/edit/getrights.php mailadmin/edit/getrights.php
--- mailadmin-1.5.1/edit/getrights.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/edit/getrights.php	2003-12-24 15:35:55.000000000 -0600
@@ -20,7 +20,7 @@
  $account = new account_information;
  $password = $account->get_password($username);
 
- system("../scripts/setrights.pl ".$user." ".$username." ".$mail_server_name." ".$password);
+ system("../scripts/setrights.pl '".$user."' '".$username."' '".$mail_server_name."' '".$password."' '".$mail_server_seperator."'");
 
  if (strcmp($enable_dbase, "Yes") == 0) {
   $transaction = new transaction_log;
diff -urN --exclude=CVS mailadmin-1.5.1/edit/removequota.php mailadmin/edit/removequota.php
--- mailadmin-1.5.1/edit/removequota.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/edit/removequota.php	2003-12-24 15:30:25.000000000 -0600
@@ -20,7 +20,7 @@
  $account = new account_information;
  $password = $account->get_password($username);
 
- system("../scripts/removequota.pl ".$user." ".$username." ".$mail_server_name." ".$password);
+ system("../scripts/removequota.pl '".$user."' '".$username."' '".$mail_server_name."' '".$password."' '".$mail_server_seperator."'");
 
  if (strcmp($enable_dbase, "Yes") == 0) {
   $transaction = new transaction_log;
diff -urN --exclude=CVS mailadmin-1.5.1/edit/setquota.php mailadmin/edit/setquota.php
--- mailadmin-1.5.1/edit/setquota.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/edit/setquota.php	2003-12-24 15:28:40.000000000 -0600
@@ -22,7 +22,7 @@
 
  /* Testing operation, the form submits a request change an email account password. */
  if ($submitted) {
-  system("../scripts/setquota.pl ".$user." ".$username." ".$mail_server_name." ".$password." ".($newquota * 1024));
+  system("../scripts/setquota.pl '".$user."' '".$username."' '".$mail_server_name."' '".$password."' '".($newquota * 1024)."' '".$mail_server_seperator."'");
 
   if (strcmp($enable_dbase, "Yes") == 0) {
    $transaction = new transaction_log;
@@ -42,12 +42,26 @@
   <TITLE>Mail Server Administration - Set Quota</TITLE>
   <SCRIPT LANGUAGE="JavaScript">
    <!--
-    function set_quota() {
+    function check_set_quota() {
      if (document.set_quota.newquota.value.length <= 0) {
       alert("You must specify a valid quota before you can continue.");
-      return;
+      document.set_quota.newquota.focus();
+      return false;
+     }
+
+     // make sure we only have numbers
+     var numbers = /^(\d+)$/;
+     var result = document.set_quota.newquota.value.match(numbers);
+     if (result == null) {
+       alert("'"+document.set_quota.newquota.value+"' is invalid!");
+       document.set_quota.newquota.focus();
+       return false;
      }
 
+     return true;
+    }
+
+    function set_quota() {
      document.set_quota.submit();
     }
 
@@ -57,7 +71,7 @@
    // -->
   </SCRIPT>
  </HEAD>
- <BODY BGCOLOR="#EEEEEE">
+ <BODY BGCOLOR="#EEEEEE" onLoad="document.set_quota.newquota.focus();">
   <?php include('../includes/header.inc'); ?>
   <HR>
   <?php include('../includes/menu.inc'); ?>
@@ -65,7 +79,7 @@
   <CENTER><B><FONT COLOR="#0000FF">Change Account Quota</FONT></B></CENTER>
   <BR>
 
-  <FORM NAME="set_quota" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
+  <FORM NAME="set_quota" ACTION="<?php print $PHP_SELF; ?>" METHOD="post" onSubmit="return check_set_quota();">
    <INPUT NAME="submitted" TYPE="hidden" VALUE="1">
    <INPUT NAME="source_page" TYPE="hidden" VALUE="<?php print $source_page; ?>">
    <INPUT NAME="user" TYPE="hidden" VALUE="<?php print $user; ?>">
@@ -87,16 +101,24 @@
       </TR>
      </TBODY>
     </TABLE>
+   <?php if ($submit_buttons) { ?>
+     <br>
+     <hr>
+     <input type="submit" name="set_quota_button" value="Change"> <input type="reset" value="Reset">
+     <hr>
+   <?php } ?>
    </CENTER>
   </FORM>
 
+  <?php if (!$submit_buttons) { ?>
   <HR>
   <CENTER>
-   [<A HREF="javascript:set_quota();">Change</A>]
+   [<A HREF="javascript:set_quota();" onClick="return check_set_quota();">Change</A>]
    [<A HREF="javascript:reset_quota();">Reset</A>]
   </CENTER>
 
   <HR>
+  <?php } ?>
   <?php include('../includes/footer.inc'); ?>
  </BODY>
 </HTML>
diff -urN --exclude=CVS mailadmin-1.5.1/error/error_current.php mailadmin/error/error_current.php
--- mailadmin-1.5.1/error/error_current.php	2001-07-03 21:17:40.000000000 -0500
+++ mailadmin/error/error_current.php	2003-05-28 13:53:09.000000000 -0500
@@ -11,7 +11,7 @@
   <P>
    <CENTER>
     We are sorry, but the password you entered was not correct and we could not complete the change, please 
-    <A HREF="../expired_password.php">try again</A>.
+    <A HREF="<?php if (isset($MAILADMIN_EXPIRED) && $MAILADMIN_EXPIRED) { print "../expired_password.php"; } else { print "../change_password.php"; } ?>">try again</A>.
    </CENTER>
   </P>
   <?php include('../includes/footer.inc'); ?>
diff -urN --exclude=CVS mailadmin-1.5.1/expired_password.php mailadmin/expired_password.php
--- mailadmin-1.5.1/expired_password.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/expired_password.php	2003-12-24 14:09:41.000000000 -0600
@@ -16,11 +16,12 @@
  if ($submitted) {
   /* If the account can not connect, we can not verify the validity of the account or the password. */
   if (!user_login($username, $current_password)) {
+   set_cookie("MAILADMIN_EXPIRED", 1);
    header("Location: error/error_current.php");
    exit;
   }
 
-  system("./scripts/setpassword.pl ".$username." '".$newpassword1."'");
+  system("./scripts/setpassword.pl '".$username."' '".$newpassword1."' u");
 
   if (strcmp($enable_dbase, "Yes") == 0) {
    $account = new account_information;
@@ -50,24 +51,30 @@
   <TITLE>Mail Server Administration - Expired Password</TITLE>
   <SCRIPT LANGUAGE="JavaScript">
    <!--
-    function expired_password() {
+    function check_expired_password() {
      if (document.expired_password.current_password.value.length <= 0) {
       alert("You must enter your current password.");
-      return;
+      document.expired_password.current_password.focus();
+      return false;
      }
 
      if (document.expired_password.newpassword1.value.length <= 0) {
       alert("You must enter a valid new password.");
-      return;
+      document.expired_password.newpassword1.focus();
+      return false;
      }
 
      var reg = new RegExp("^" + document.expired_password.newpassword1.value + "$");
 
      if (!reg.test(document.expired_password.newpassword2.value)) {
       alert("The validation password does not match your new password, please try again.");
-      return;
+      document.expired_password.newpassword2.focus();
+      return false;
      }
+     return true;
+    }
 
+    function expired_password() {
      document.expired_password.submit();
     }
 
@@ -77,7 +84,7 @@
    // -->
   </SCRIPT>
  </HEAD>
- <BODY BGCOLOR="#EEEEEE">
+ <BODY BGCOLOR="#EEEEEE" onLoad="document.expired_password.current_password.focus();">
   <?php include('includes/header.inc'); ?>
   <HR>
 
@@ -88,7 +95,7 @@
    </B>
   </FONT>
 
-  <FORM NAME="expired_password" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
+  <FORM NAME="expired_password" ACTION="<?php print $PHP_SELF; ?>" METHOD="post" onSubmit="return check_expired_password();">
    <INPUT TYPE="hidden" NAME="submitted" VALUE="1">
    <TABLE>
     <TBODY>
@@ -106,14 +113,18 @@
      </TR>
     </TBODY>
    </TABLE>
-  </FORM>
 
   <HR>
 
-  [<A HREF="javascript:expired_password();">Change</A>]
+  <?php if ($submit_buttons) { ?>
+  <input type="submit" name="expired_password_button" value="Change"> <input type="reset" value="Reset">
+  <?php } else { ?>
+  [<A HREF="javascript:expired_password();" onClick="return check_expired_password();">Change</A>]
   [<A HREF="javascript:reset_password();">Reset</A>]
+  <?php } ?>
 
   <HR>
+  </FORM>
   <?php include('includes/footer.inc'); ?>
  </BODY>
 </HTML>
diff -urN --exclude=CVS mailadmin-1.5.1/help/index.php mailadmin/help/index.php
--- mailadmin-1.5.1/help/index.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/help/index.php	2003-05-28 13:52:17.000000000 -0500
@@ -30,17 +30,21 @@
    Email Accounts. The interface has evolved into an easy to use simple to understand collection of features, some of the features 
    of mailadmin are:<BR><BR>
    <UL>
-    <LI>Administrator:<BR>
-     <UL>
-      <LI>Adding/Deleting Email accounts.</LI>
-      <LI>Setting Account Quotas.</LI>
-      <LI>Obtaining Administrative Access Over Older Accounts.</LI>
-      <LI>Changing An Accounts Password.</LI>
-      <LI>Interfaces with the Cyrus IMAP/POP3 server.</LI>
-      <LI>Transaction Log system, allowing you to track changes or to help debug issues.</LI>
-      <LI>Account Tracking System, allowing to track changes as well as debug issues with accounts.</LI>
-     </UL>
-    </LI><BR>
+    <?php
+      if (strcmp($username, $mail_server_admin) == 0) {
+        print "    <LI>Administrator:<BR>";
+        print "      <UL>";
+        print "        <LI>Adding/Deleting Email accounts.</LI>";
+        print "        <LI>Setting Account Quotas.</LI>";
+        print "        <LI>Obtaining Administrative Access Over Older Accounts.</LI>";
+        print "        <LI>Changing An Accounts Password.</LI>";
+        print "        <LI>Interfaces with the Cyrus IMAP/POP3 server.</LI>";
+        print "        <LI>Transaction Log system, allowing you to track changes or to help debug issues.</LI>";
+        print "        <LI>Account Tracking System, allowing to track changes as well as debug issues with accounts.</LI>";
+        print "      </UL>";
+        print "    </LI><BR>";
+      }
+    ?>
     <LI>Standard User:<BR>
      <UL>
       <LI>Changing The Accounts Password.</LI>
@@ -58,8 +62,12 @@
 
    <OL>
     <LI><A HREF="changepassword.php">Changing Your Password</A></LI>
-    <LI><A HREF="addmailaccount.php">Adding New Email Accounts</A></LI>
-    <LI><A HREF="listcurrentusers.php">Manipulation Of Current User Accounts</A></LI>
+    <?php
+      if (strcmp($username, $mail_server_admin) == 0) {
+        print "    <LI><A HREF=\"addmailaccount.php\">Adding New Email Accounts</A></LI>";
+        print "    <LI><A HREF=\"listcurrentusers.php\">Manipulation Of Current User Accounts</A></LI>";
+      }
+    ?>
    </OL>
   </P>
   <HR>
diff -urN --exclude=CVS mailadmin-1.5.1/includes/config.inc.dist mailadmin/includes/config.inc.dist
--- mailadmin-1.5.1/includes/config.inc.dist	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/includes/config.inc.dist	2003-12-24 15:45:54.000000000 -0600
@@ -5,10 +5,16 @@
  $cookie_domain = ".your.domain.here";	// The preceeding period must exist if you want it to match to all machines in the domain.
  $cookie_path = "full index path";
 
+ /* If you are installing mailadmin under a subdirectory, specify it here. 
+    Specify the leading slash and leave off the trailing slash. 
+ */
+ $url_prefix = "";   // ex.  $url_prefix = "/mail";  if you had /mail/mailadmin.
+
  /* Mail Server Configuration Information */
  $mail_server_name = "your.mailserver.here";
  $mail_server_port = "143";
  $mail_server_admin = "cyrus";
+ $mail_server_seperator = ".";  // change to / for unix hierachy seperator
 
  $globalserver = "your.mailserver.here";
  $imapdfile = "/etc/imapd.conf";
@@ -23,9 +29,13 @@
  $dbase_password = "";
  $dbase_port = "5432";
 
+ /* If you want submit buttons on forms, say 1 next. */
+ $submit_buttons = 1;
+
  /* Nothing below this point needs to be changed. */
- $project_version = "1.5.1";
+ $project_version = "1.5.2";
  $coordinator = "morthoron@users.sourceforge.net";
+ $modified_by = "pcxuser@users.sourceforge.net";
 
  /* Table definitions */
  $transaction_log_table_name = "transaction_log";
diff -urN --exclude=CVS mailadmin-1.5.1/includes/footer.inc mailadmin/includes/footer.inc
--- mailadmin-1.5.1/includes/footer.inc	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/includes/footer.inc	2003-12-24 15:52:34.000000000 -0600
@@ -1,8 +1,21 @@
 <CENTER>
  <FONT COLOR="#0000FF">Mail Administration <?php print $project_version; ?></FONT>
  <BR>
- Comments and Suggestions to: 
- <ADDRESS>
-  <A HREF="mailto:<?php print $coordinator; ?>"><?php print $coordinator; ?></A>
- </ADDRESS>
+ <table border="0" width="90%" cellpadding="0" cellspacing="0">
+   <tr>
+     <td align="left" width="50%">
+       Comments and Suggestions to: 
+       <ADDRESS>
+        <A HREF="mailto:<?php print $coordinator; ?>"><?php print $coordinator; ?></A>
+       </ADDRESS>
+     </td>
+     <td align="right" width="50%">
+       Additional changes made by:
+       <ADDRESS>
+        <A HREF="mailto:<?php print $modified_by; ?>"><?php print $modified_by; ?></A><br>
+        hosted at <a href="http://www.pcxperience.org/mailadmin/" target="pcx.org">www.pcxperience.org/mailadmin/</a>
+       </ADDRESS>
+     </td>
+   </tr>
+ </table>
 </CENTER>
diff -urN --exclude=CVS mailadmin-1.5.1/includes/menu.inc mailadmin/includes/menu.inc
--- mailadmin-1.5.1/includes/menu.inc	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/includes/menu.inc	2003-12-24 14:19:12.000000000 -0600
@@ -4,16 +4,22 @@
  /* If an administrator is logged in, display administrator menus. */
  if (strcmp($username, $mail_server_admin) == 0) {
 ?>
- [<A HREF="/mailadmin/list_users.php">List Current Users</A>]
- [<A HREF="/mailadmin/add_user.php">Add User Mail Account</A>]
- [<A HREF="/mailadmin/transaction_log.php">View Transaction Log</A>]
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/list_users.php">List Current Users</A>]
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/add_user.php">Add User Mail Account</A>]
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/transaction_log.php">View Transaction Log</A>]
 <?php
  }
 ?>
  
- [<A HREF="/mailadmin/change_password.php">Change Your Password</A>]
- [<A HREF="/mailadmin/whatsnew.php">Whats New</A>]
- [<A HREF="/mailadmin/help/">Online Help</A>]
- [<A HREF="/mailadmin/logout.php">Logout</A>]
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/change_password.php">Change Your Password</A>]
+<?php
+ if (strcmp($username, $mail_server_admin) == 0) {
+?>
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/whatsnew.php">Whats New</A>]
+<?php
+ }
+?>
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/help/">Online Help</A>]
+ [<A HREF="<?php echo $url_prefix ?>/mailadmin/logout.php">Logout</A>]
  </FONT>
 </CENTER>
diff -urN --exclude=CVS mailadmin-1.5.1/includes/notes.inc mailadmin/includes/notes.inc
--- mailadmin-1.5.1/includes/notes.inc	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/includes/notes.inc	2003-12-24 16:17:17.000000000 -0600
@@ -1,5 +1,24 @@
 
 <TR>
+ <TH WIDTH="15%" VALIGN="top">12/24/2003</TH>
+ <TH WIDTH="5%" VALIGN="top">v1.5.2</TH>
+ <TD WIDTH="80%" VALIGN="top" ALIGN="left">
+ Changes by James A. Pattie (<a href="http://www.xperienceinc.com/" target="pcx">Xperience, Inc.</a>) &lt;pcxuser@users.sourceforge.net&gt;:<br>
+ <ul>
+   <li>Added the ability to specify you want buttons instead of links for making changes, etc.</li>
+   <li>Added javascript error handling to make user input and validation cleaner.</li>
+   <li>Made sure that there is a pretty good distinction of admin and user help when you view the help topics.</li>
+   <li>Added the ability to specify a prefix url.  This allows you to install mailadmin in a subdirectory of your website and have the urls all work correctly.</li>
+   <li>Added support for different imap seperators.  It defaults to '.'.</li>
+   <li>Updated the scripts to work with sasl2.  There is currently no way to use sasl1 unless you re-edit the scripts.  You would just have to remove the 2 from the salspasswd2 instances.</li>
+   <li>Quoted all arguments to the perl scripts so that special characters are hidden from the shell.</li>
+   <li>Made the username edit field larger so you can try and use user@domain style usernames.  Cyrus 2.2+</li>
+   <li>Made the setcookie code hopefully work with the different versions of php since it changed to require just the unix timestamp and not the ISO format date value.</li>
+ </ul>
+ This version (1.5.2) is basically 1.5.1 with the above mentioned changes and is being hosted on our <a href="http://www.pcxperience.org/mailadmin/" target="pcxorg">.org</a> website until active work is resumed on the sourceforge project.
+ </td>
+</tr>
+<TR>
  <TH WIDTH="15%" VALIGN="top">06/09/2001</TH>
  <TH WIDTH="5%" VALIGN="top">v1.5.1</TH>
  <TD WIDTH="80%" VALIGN="top" ALIGN="left">
diff -urN --exclude=CVS mailadmin-1.5.1/index.php mailadmin/index.php
--- mailadmin-1.5.1/index.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/index.php	2003-05-28 13:53:30.000000000 -0500
@@ -40,29 +40,35 @@
   <TITLE>Mail Administration Login</TITLE>
   <SCRIPT LANGUAGE="JavaScript">
    <!--
-    function login() {
+    function check_login() {
      if (document.login.username.value.length <= 0) {
       alert("You must enter a valid username before you can continue.");
-      return;
+      document.login.username.focus();
+      return false;
      }
 
      if (document.login.password.value.length <= 0) {
       alert("You must enter a valid password before you can continue.");
-      return;
+      document.login.password.focus();
+      return false;
      }
 
-     document.login.submit();
+     return true;
     }
+  
+   function login_submit() {
+     document.login.submit();
+   }
    // -->
   </SCRIPT>
  </HEAD>
- <BODY BGCOLOR="#EEEEEE">
+ <BODY BGCOLOR="#EEEEEE" onLoad="document.login.username.focus();">
   <CENTER>
    <H2>Mail Administrator <?php print $project_version; ?> Login</H2>
    <FONT COLOR="#FF5555">
     (You must have cookies and javascript support enabled or you will not be able to log into the system)
    </FONT>
-   <FORM NAME="login" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
+   <FORM NAME="login" ACTION="<?php print $PHP_SELF; ?>" METHOD="post" onSubmit="return check_login();">
     <INPUT TYPE="hidden" NAME="submitted" VALUE="1">
     <TABLE>
      <TBODY>
@@ -76,7 +82,11 @@
       </TR>
      </TBODY>
     </TABLE>
-    <A HREF="javascript:login();">Login</A>
+    <?php if ($submit_buttons) { ?>
+    <input type="submit" name="login_button" value="Login">
+    <?php } else { ?>
+    <A HREF="javascript:login_submit();" onClick="return check_login();">Login</A>
+    <?php } ?>
    </FORM>
   </CENTER>
   <?php include('includes/footer.inc'); ?>
diff -urN --exclude=CVS mailadmin-1.5.1/list_users.php mailadmin/list_users.php
--- mailadmin-1.5.1/list_users.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/list_users.php	2003-12-24 16:59:43.000000000 -0600
@@ -27,37 +27,37 @@
   <SCRIPT LANGUAGE="JavaScript">
    <!--
     function delete_user($user) {
-     document.listuser.action = "/mailadmin/scripts/deleteuser.php";
+     document.listuser.action = "<?php echo $url_prefix ?>/mailadmin/scripts/deleteuser.php";
      document.listuser.user.value = $user;
      document.listuser.submit();
     }
 
     function view_user($user) {
-     document.listuser.action = "/mailadmin/viewuser.php";
+     document.listuser.action = "<?php echo $url_prefix ?>/mailadmin/viewuser.php";
      document.listuser.user.value = $user;
      document.listuser.submit();
     }
 
     function set_quota($user) {
-     document.listuser.action = "/mailadmin/edit/setquota.php";
+     document.listuser.action = "<?php echo $url_prefix ?>/mailadmin/edit/setquota.php";
      document.listuser.user.value = $user;
      document.listuser.submit();
     }
 
     function remove_quota($user) {
-     document.listuser.action = "/mailadmin/edit/removequota.php";
+     document.listuser.action = "<?php echo $url_prefix ?>/mailadmin/edit/removequota.php";
      document.listuser.user.value = $user;
      document.listuser.submit();
     }
 
     function change_password($user) {
-     document.listuser.action = "/mailadmin/edit/changepassword.php";
+     document.listuser.action = "<?php echo $url_prefix ?>/mailadmin/edit/changepassword.php";
      document.listuser.user.value = $user;
      document.listuser.submit();
     }
 
     function gain_ownership($user) {
-     document.listuser.action = "/mailadmin/edit/getrights.php";
+     document.listuser.action = "<?php echo $url_prefix ?>/mailadmin/edit/getrights.php";
      document.listuser.user.value = $user;
      document.listuser.submit();
     }
@@ -86,7 +86,7 @@
   ?>
   <FORM NAME="listuser" ACTION="<?php print $PHP_SELF; ?>" METHOD="post">
    <INPUT NAME="user" TYPE="hidden" VALUE="">
-   <INPUT NAME="source_page" TYPE="hidden" VALUE="/mailadmin/list_users.php">
+   <INPUT NAME="source_page" TYPE="hidden" VALUE="<?php echo $url_prefix ?>/mailadmin/list_users.php">
    <CENTER>
     <TABLE WIDTH="860" BGCOLOR="#000000" CELLPADDING="0" CELLSPACING="0" BORDER="0">
      <TBODY>
@@ -106,14 +106,14 @@
            <TH BGCOLOR="#DDDDDD">Options</TH>
           </TR>
           <?php
-           $userlist = imap_listmailbox($mbox, "{".$mail_server_name.":".$mail_server_port."}","user.*");
+           $userlist = imap_listmailbox($mbox, "{".$mail_server_name.":".$mail_server_port."}","user".$mail_server_seperator."*");
     
            if(is_array($userlist)) {
             reset($userlist);
             while (list($key, $val) = each($userlist)) {
-             $length = strlen("{".$mail_server_name.":".$mail_server_port."}user.");
+             $length = strlen("{".$mail_server_name.":".$mail_server_port."}user".$mail_server_seperator);
              $mailbox = substr($val, $length);
-             $user = strtok($mailbox, ".");
+             $user = strtok($mailbox, $mail_server_seperator);
 
              if (!isset($users[$user])) {
               $users[$user] = $user;
@@ -125,7 +125,7 @@
              if (isset($quota)) {
               unset($quota);
              }
-             exec("./scripts/getquota.pl ".$val." ".$username." ".$mail_server_name." ".$password, $quota);
+             exec("./scripts/getquota.pl '".$val."' '".$username."' '".$mail_server_name."' '".$password."' '".$mail_server_seperator."'", $quota);
              if (strlen($quota[1]) == 0) {
               $quota[1] = "unlimited";
              } else {
diff -urN --exclude=CVS mailadmin-1.5.1/objects/cookie.inc mailadmin/objects/cookie.inc
--- mailadmin-1.5.1/objects/cookie.inc	2001-07-03 21:17:40.000000000 -0500
+++ mailadmin/objects/cookie.inc	2003-12-24 16:45:50.000000000 -0600
@@ -5,11 +5,25 @@
   }
 
   function set($name, $value, $path, $domain) {
-   setcookie($name, $value, date("l, d-M-y H:i:s", (time() + 3600)), "$path", "$domain");
+   if (version_compare(phpversion(), "4.1.2", ">"))
+   {
+     eval('setcookie($name, $value, (time() + 3600), "$path", "$domain");');
+   }
+   else
+   {
+     eval('setcookie($name, $value, date("l, d-M-y H:i:s", (time() + 3600)), "$path", "$domain");');
+   }
   }
 
   function delete($name) {
-   setcookie($name, "", date("l, d-M-y H:i:s", (time() - 3600)));
+   if (version_compare(phpversion(), "4.1.2", ">"))
+   {
+     eval('setcookie($name, "", (time() - 3600));');
+   }
+   else
+   {
+     eval('setcookie($name, "", date("l, d-M-y H:i:s", (time() - 3600)));');
+   }
   }
  }
 ?>
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/deleteuser.php mailadmin/scripts/deleteuser.php
--- mailadmin-1.5.1/scripts/deleteuser.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/scripts/deleteuser.php	2003-12-24 17:01:46.000000000 -0600
@@ -29,20 +29,20 @@
   $mbox = @imap_open("{".$mail_server_name.":".$mail_server_port."}", $username, $password, OP_HALFOPEN);
 
   if ($mbox == NULL) {
-   $error = "Warning: ".imap_last_error()."<BR><BR> Please <A HREF=\"/mailadmin/list_users.php\">try again</A> later.";
+   $error = "Warning: ".imap_last_error()."<BR><BR> Please <A HREF=\"<?php echo $url_prefix ?>/mailadmin/list_users.php\">try again</A> later.";
    die($error);
   }
-  $mailbox_list = imap_listmailbox($mbox, "{".$mail_server_name.":".$mail_server_port."}","user.$user.*");
+  $mailbox_list = imap_listmailbox($mbox, "{".$mail_server_name.":".$mail_server_port."}","user".$mail_server_seperator.$user.$mail_server_seperator."*");
 
   if (is_array($mailbox_list)) {
    foreach ($mailbox_list as $mailbox) {
-    $box = preg_replace("/\{.*\}user\./", "", $mailbox);
-    system("./setrights.pl ".$box." ".$username." ".$mail_server_name." ".$password);
+    $box = preg_replace("/\{.*\}user\$mail_server_seperator/", "", $mailbox);
+    system("./setrights.pl '".$box."' '".$username."' '".$mail_server_name."' '".$password."' '".$mail_server_seperator."'");
    }
   }
   /* Attempting to delete a mailbox. */
   /* Because PHP does not yet support administration of mailboxes, we need to use perl */
-  system("./deleteuser.pl ".$user." ".$username." ".$mail_server_name." ".$password);
+  system("./deleteuser.pl '".$user."' '".$username."' ".$mail_server_name." '".$password."' '".$mail_server_seperator."'");
 
   $result = "Deleted $user"; 
 
@@ -57,7 +57,7 @@
    unset($transaction);
   }
 
-  header("Location:  /mailadmin/list_users.php?result=$result");
+  header("Location:  ".$url_prefix."/mailadmin/list_users.php?result=$result");
   exit;
  }
 ?>
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/deleteuser.pl mailadmin/scripts/deleteuser.pl
--- mailadmin-1.5.1/scripts/deleteuser.pl	2001-03-07 16:07:42.000000000 -0600
+++ mailadmin/scripts/deleteuser.pl	2003-12-24 15:12:30.000000000 -0600
@@ -4,8 +4,8 @@
 
 use IMAP::Admin;
 
-if(@ARGV != 4) {
-  print "usage: deleteuser.pl <user> <admin> <server> <adminpassword>\n";
+if(@ARGV != 5) {
+  print "usage: deleteuser.pl <user> <admin> <server> <adminpassword> <seperator>\n";
   exit;
 }
 
@@ -13,12 +13,21 @@
 $admin = $ARGV[1];
 $server = $ARGV[2];
 $adminpass = $ARGV[3];
+$seperator = $ARGV[4];
 
 $imap = IMAP::Admin->new('Server' => $server,
                            'Port' => 143,
                           'Login' => $admin,
+		      'Seperator' => $seperator,
                        'Password' => $adminpass);
 
-$imap->h_delete("user.".$user);
+$err = $imap->h_delete("user".$seperator.$user);
+if ($err != 0)
+{
+  #print "Error! " . $imap->{Error};
+}
 
 $imap->close;
+
+# now we need to remove them from the sasldb database
+system "saslpasswd2 -d $user";
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/getquota.pl mailadmin/scripts/getquota.pl
--- mailadmin-1.5.1/scripts/getquota.pl	2001-03-07 16:07:42.000000000 -0600
+++ mailadmin/scripts/getquota.pl	2003-12-24 15:13:41.000000000 -0600
@@ -2,8 +2,8 @@
 
 use IMAP::Admin;
 
-if(@ARGV != 4) {
-  print "usage: getquota.pl <user> <admin> <server> <adminpassword>\n";
+if(@ARGV != 5) {
+  print "usage: getquota.pl <user> <admin> <server> <adminpassword> <seperator>\n";
   exit;
 }
 
@@ -11,13 +11,15 @@
 $admin = $ARGV[1];
 $server = $ARGV[2];
 $adminpass = $ARGV[3];
+$seperator = $ARGV[4];
 
 $imap = IMAP::Admin->new('Server' => $server,
                            'Port' => 143,
                           'Login' => $admin,
+		      'Seperator' => $seperator,
                        'Password' => $adminpass);
 
-@quota = $imap->get_quota("user.".$user);
+@quota = $imap->get_quota("user".$seperator.$user);
 
 foreach $item (@quota) {
  print $item."\n";
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/removequota.pl mailadmin/scripts/removequota.pl
--- mailadmin-1.5.1/scripts/removequota.pl	2001-04-07 22:18:39.000000000 -0500
+++ mailadmin/scripts/removequota.pl	2003-12-24 16:45:32.000000000 -0600
@@ -2,8 +2,8 @@
 
 use IMAP::Admin;
 
-if(@ARGV != 4) {
-  print "usage: setquota.pl <user> <admin> <server> <adminpassword>\n";
+if(@ARGV != 5) {
+  print "usage: removequota.pl <user> <admin> <server> <adminpassword> <seperator>\n";
   exit;
 }
 
@@ -11,13 +11,14 @@
 $admin = $ARGV[1];
 $server = $ARGV[2];
 $adminpass = $ARGV[3];
-$quota = $ARGV[4];
+$seperator = $ARGV[4];
 
 $imap = IMAP::Admin->new('Server' => $server,
                            'Port' => 143,
                           'Login' => $admin,
+		      'Seperator' => $seperator,
                        'Password' => $adminpass);
 
-$err = $imap->set_quota("user.".$user, "none");
+$err = $imap->set_quota("user".$seperator.$user, "none");
 
 $imap->close;
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/setpassword.pl mailadmin/scripts/setpassword.pl
--- mailadmin-1.5.1/scripts/setpassword.pl	2001-03-13 11:11:58.000000000 -0600
+++ mailadmin/scripts/setpassword.pl	2003-12-24 14:05:25.000000000 -0600
@@ -3,15 +3,17 @@
 # This script is used to set a new password for a new account and
 # also set up the administrators rights to be able to modify the
 # account.
+# The 3rd argument is either c (create) or u (update)
 
 use IMAP::Admin;
 
-if(@ARGV != 2) {
-  print "usage: setpassword.pl <user> <password>\n";
+if(@ARGV != 3) {
+  print "usage: setpassword.pl <user> <password> <create>\n";
   exit;
 }
 
 $user = $ARGV[0];
 $newpassword = $ARGV[1];
+$flag = ($ARGV[2] eq 'c' ? "-c" : "");
 
-system "echo ".$newpassword." |saslpasswd -p ".$user;
+system "echo '".$newpassword."' |saslpasswd2 -p $flag ".$user;
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/setquota.pl mailadmin/scripts/setquota.pl
--- mailadmin-1.5.1/scripts/setquota.pl	2001-03-07 16:07:42.000000000 -0600
+++ mailadmin/scripts/setquota.pl	2003-12-24 15:16:33.000000000 -0600
@@ -2,8 +2,8 @@
 
 use IMAP::Admin;
 
-if(@ARGV != 5) {
-  print "usage: setquota.pl <user> <admin> <server> <adminpassword> <quota>\n";
+if(@ARGV != 6) {
+  print "usage: setquota.pl <user> <admin> <server> <adminpassword> <quota> <seperator>\n";
   exit;
 }
 
@@ -12,12 +12,14 @@
 $server = $ARGV[2];
 $adminpass = $ARGV[3];
 $quota = $ARGV[4];
+$seperator = $ARGV[5];
 
 $imap = IMAP::Admin->new('Server' => $server,
                            'Port' => 143,
                           'Login' => $admin,
+		      'Seperator' => $seperator,
                        'Password' => $adminpass);
 
-$err = $imap->set_quota("user.".$user, $quota);
+$err = $imap->set_quota("user".$seperator.$user, $quota);
 
 $imap->close;
diff -urN --exclude=CVS mailadmin-1.5.1/scripts/setrights.pl mailadmin/scripts/setrights.pl
--- mailadmin-1.5.1/scripts/setrights.pl	2001-03-13 10:44:35.000000000 -0600
+++ mailadmin/scripts/setrights.pl	2003-12-24 15:18:15.000000000 -0600
@@ -1,13 +1,12 @@
 #!/usr/bin/perl
 
-# This script is used to set a new password for a new account and
-# also set up the administrators rights to be able to modify the
+# This script is used to set up the administrators rights to be able to modify the
 # account.
 
 use IMAP::Admin;
 
-if(@ARGV != 4) {
-  print "usage: setpassword.pl <user> <admin> <server> <adminpassword>\n";
+if(@ARGV != 5) {
+  print "usage: setpassword.pl <user> <admin> <server> <adminpassword> <seperator>\n";
   exit;
 }
 
@@ -15,12 +14,14 @@
 $admin = $ARGV[1];
 $server = $ARGV[2];
 $adminpass = $ARGV[3];
+$seperator = $ARGV[4];
 
 $imap = IMAP::Admin->new('Server' => $server,
                            'Port' => 143,
                           'Login' => $admin,
+		      'Seperator' => $seperator,
                        'Password' => $adminpass);
 
-$imap->set_acl("user.".$user, $admin, "lrswipdca");
+$imap->set_acl("user".$seperator.$user, $admin, "lrswipdca");
 
 $imap->close;
diff -urN --exclude=CVS mailadmin-1.5.1/transaction_log.php mailadmin/transaction_log.php
--- mailadmin-1.5.1/transaction_log.php	2001-07-03 21:17:40.000000000 -0500
+++ mailadmin/transaction_log.php	2003-05-28 13:54:29.000000000 -0500
@@ -99,12 +99,6 @@
   </CENTER>
 
   <HR>
-  <CENTER>
-   [<A HREF="javascript:add_email();">Add</A>]
-   [<A HREF="javascript:reset_email();">Reset</A>]
-  </CENTER>
-
-  <HR>
   <?php include('includes/footer.inc'); ?>
  </BODY>
 </HTML>
diff -urN --exclude=CVS mailadmin-1.5.1/viewuser.php mailadmin/viewuser.php
--- mailadmin-1.5.1/viewuser.php	2001-07-03 20:57:39.000000000 -0500
+++ mailadmin/viewuser.php	2003-12-24 17:00:01.000000000 -0600
@@ -24,7 +24,7 @@
   unset($quota);
  }
 
- exec("./scripts/getquota.pl ".$user." ".$username." ".$mail_server_name." ".$password, $quota);
+ exec("./scripts/getquota.pl '".$user."' '".$username."' '".$mail_server_name."' '".$password."' '".$mail_server_seperator."'", $quota);
 
  if (strlen($quota[1]) == 0) {
   $quota[1] = "unlimited";
@@ -71,7 +71,7 @@
          </TR>
          <TR>
           <TH ALIGN="left" VALIGN="center">Mailbox Name:</TH>
-          <TD ALIGN="left" VALIGN="center">user.<?php print $user; ?></TD>
+          <TD ALIGN="left" VALIGN="center">user<?php print $mail_server_seperator.$user; ?></TD>
          </TR>
          <TR>
           <TH ALIGN="left" VALIGN="center">Maximum Quota:</TH>
@@ -93,22 +93,22 @@
             <TR>
              <TD  BGCOLOR="#DDDDDD" ALIGN="left" VALIGN="top">INBOX</TD>
              <?php
-              $status = imap_status($mbox, "{".$mail_server_name.":".$mail_server_port."}user.$user", SA_ALL);
+              $status = imap_status($mbox, "{".$mail_server_name.":".$mail_server_port."}user".$mail_server_seperator."$user", SA_ALL);
 
               print "<TD  BGCOLOR=\"#DDDDDD\" ALIGN=\"center\" VALIGN=\"top\">$status->messages</TD>\n";
               print "<TD  BGCOLOR=\"#DDDDDD\" ALIGN=\"center\" VALIGN=\"top\">$status->recent</TD>\n";
              ?>
             </TR>
            <?php
-            $userlist = imap_listmailbox($mbox, "{".$mail_server_name.":".$mail_server_port."}","user.$user.*");
+            $userlist = imap_listmailbox($mbox, "{".$mail_server_name.":".$mail_server_port."}","user".$mail_server_seperator.$user.$mail_server_seperator."*");
 
             if(is_array($userlist)) {
              reset($userlist);
              while (list($key, $val) = each($userlist)) {
-              $length = strlen("{".$mail_server_name.":".$mail_server_port."}user.$user.");
+              $length = strlen("{".$mail_server_name.":".$mail_server_port."}user".$mail_server_seperator.$user.$mail_server_seperator);
               $mailbox = substr($val, $length);
 
-              $status = imap_status($mbox, "{".$mail_server_name.":".$mail_server_port."}user.$user.$mailbox", SA_ALL);
+              $status = imap_status($mbox, "{".$mail_server_name.":".$mail_server_port."}user"$mail_server_seperator.$user.$mail_server_seperator.$mailbox, SA_ALL);
 
               print "<TR>\n";
               print "<TD  BGCOLOR=\"#DDDDDD\" ALIGN=\"left\" VALIGN=\"top\">$mailbox</TD>";