*** ./config/config.php3	Sun May 30 21:54:48 1999
--- settings/config/config.php3	Sat Jan 15 17:02:19 2000
***************
*** 24,41 ****
    Language settings
   */
! $default->lang = "de";		/* default language (de/en) */
  
  /*
    GD support in php_module
   */
! $default->gd_support  = true;   /* is the libdg compiled in in my mod_php  */
  
  /*
     Network definitions
   */
! $default->mail_domain = "sbox.tu-graz.ac.at";		/* maildomain  */
  $default->imap_host   = "localhost";			/* imap-host   */
  $default->imap_port   = 143;				/* imap-port   */
! $default->ldap_host   = "nfsgate.tu-graz.ac.at";	/* ldap-host   */
  $default->ldap_port   = 389;				/* ldap-port   */
  
--- 24,41 ----
    Language settings
   */
! $default->lang = "en";		/* default language (de/en) */
  
  /*
    GD support in php_module
   */
! $default->gd_support  = false;   /* is the libdg compiled in in my mod_php  */
  
  /*
     Network definitions
   */
! $default->mail_domain = "<domain>";		/* maildomain  */
  $default->imap_host   = "localhost";			/* imap-host   */
  $default->imap_port   = 143;	/* or other port set */			/* imap-port   */
! $default->ldap_host   = "<domain>";	/* ldap-host   */
  $default->ldap_port   = 389;				/* ldap-port   */
  
***************
*** 43,47 ****
    Authentication - type (ldap/imap)
   */
! $default->auth_type = "ldap";                       /* authenticate through ldap or imap */
  
  /*
--- 43,47 ----
    Authentication - type (ldap/imap)
   */
! $default->auth_type = "imap";                       /* authenticate through ldap or imap */
  
  /*
***************
*** 53,66 ****
     System files
   */
! $default->aliases_file = "/etc/mail/aliases/users";			/* aliases file  */
! $default->new_aliases  = "/var/imap/newaliases";			/* newaliases programm */
! $default->status_dir   = "/var/forward/status";				/* forward status directory */
  $default->status_file  = "$default->status_dir/$username";		/* forward status file of the current user */
! $default->tmp_dir      = "/var/forward/tmp";				/* temporary directory for authentication status */
  $default->auth_ok_file = "$default->tmp_dir/$username";			/* authentication status file */
! $default->vac_template = "/etc/mail/vacation.templ";			/* vacation message template-file*/
! $default->vac_dir      = "/var/vacation";				/* vacation stuff directory  */
! $default->vac_prog     = "/usr/local/bin/vacation.pl"; 			/* vacation program  */
! $default->logfile      = "/var/log/mailsettings.log";			/* logfile where the actions are logged */
  
  /* 
--- 53,66 ----
     System files
   */
! $default->aliases_file = "/usr/local/etc/virtual/virtual-aliases-<domain>";			/* aliases file  */
! $default->new_aliases  = "/usr/local/bin/newaliases";			/* newaliases programm */
! $default->status_dir   = "/usr/local/spool/vacation/<domain>/forward/status";		/* forward status directory */
  $default->status_file  = "$default->status_dir/$username";		/* forward status file of the current user */
! $default->tmp_dir      = "/usr/local/spool/vacation/<domain>/forward/tmp";		/* temporary directory for authentication status */
  $default->auth_ok_file = "$default->tmp_dir/$username";			/* authentication status file */
! $default->vac_template = "/usr/local/etc/virtual/vacation.templ";			/* vacation message template-file*/
! $default->vac_dir      = "/usr/local/spool/vacation/<domain>/";				/* vacation stuff directory  */
! $default->vac_prog     = "/usr/local/etc/virtual/vacation<domain>.pl"; 			/* vacation program  */
! $default->logfile      = "/usr/local/spool/vacation/<domain>/mailsettings.log";	/* logfile where the actions are logged */
  
  /* 
***************
*** 78,82 ****
    Dircetory & includes
   */
! $default->base_dir        = "settings"	;		/* base dir of forward relative to the apache-htdoc base */
  $default->login           = "login.html";		/* html file for the login dialog */
  $default->include_dir     = "includes";			/* directory containing the include files */
--- 78,82 ----
    Dircetory & includes
   */
! $default->base_dir        = "vacation"	;		/* base dir of forward relative to the apache-htdoc base */
  $default->login           = "login.html";		/* html file for the login dialog */
  $default->include_dir     = "includes";			/* directory containing the include files */
***************
*** 104,109 ****
    Mailbox settings
   */
! $default->mbox_name       = "INBOX";		/* name of the imap-mailbox to check   */
! $default->mbox_quota      = 15000;		/* qouta of the user mailbox in kbytes */
  $default->qouta_warn      = 90;			/* percentage of quota above which users will be warned */
  
--- 104,109 ----
    Mailbox settings
   */
! $default->mbox_name       = "INBOX.";		/* name of the imap-mailbox to check   */
! $default->mbox_quota      = 2048;		/* qouta of the user mailbox in kbytes */
  $default->qouta_warn      = 90;			/* percentage of quota above which users will be warned */
  
***************
*** 116,118 ****
  
  /* Don't insert anything below this line  */
! ?>
\ No newline at end of file
--- 116,118 ----
  
  /* Don't insert anything below this line  */
! ?>
*** ./lib/mailsettings-php.lib	Sun May 30 21:34:05 1999
--- settings/lib/mailsettings-php.lib	Sun Jan 16 02:19:55 2000
***************
*** 243,251 ****
  
      if ((isset($forward[0])) && 
  	(strstr($forward[0], "@"))) {
        $status["FWD_ADDR"] = chop($forward[0]);
      }
      if ((isset($forward[1])) &&
! 	(!(strstr($forward[1], "|")))){
        $status["LOCAL_COPY"] = true; 
      }
--- 243,253 ----
  
      if ((isset($forward[0])) && 
+         (!(strstr($forward[0], "@$default->mail_domain"))) &&
  	(strstr($forward[0], "@"))) {
        $status["FWD_ADDR"] = chop($forward[0]);
      }
      if ((isset($forward[1])) &&
! 	(!(strstr($forward[1], "|"))) &&
!         (strstr($forward[1], "@$default->mail_domain"))){
        $status["LOCAL_COPY"] = true; 
      }
***************
*** 389,393 ****
  
    if (($vacation == "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
--- 391,395 ----
  
    if (($vacation == "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username@$default->mail_domain\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
***************
*** 397,401 ****
    }
    if (($vacation != "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
--- 399,403 ----
    }
    if (($vacation != "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username@$default->mail_domain, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
***************
*** 439,443 ****
      if (!($fp = fopen($default->status_file, "w"))) { return false; }
      flock($fp, $LOCK_EX);
!     $entry = "$username: $username, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
      flock($fp, $LOCK_UN);
--- 441,445 ----
      if (!($fp = fopen($default->status_file, "w"))) { return false; }
      flock($fp, $LOCK_EX);
!     $entry = "$username: $username@$default->mail_domain, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
      flock($fp, $LOCK_UN);
***************
*** 473,477 ****
  
    if (($vacation == "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
--- 475,479 ----
  
    if (($vacation == "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username@$default->mail_domain\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
***************
*** 481,485 ****
    }
    if (($vacation != "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
--- 483,487 ----
    }
    if (($vacation != "NULL") && ($local_copy == "YES")) {
!     $entry = "$username: $new_addr, $username@$default->mail_domain, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
***************
*** 568,576 ****
  
    if ($fwd_addr == "NULL") {
!     $entry = "$username: $username, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
    if (($fwd_addr != "NULL") && ($local_copy != "NULL")) {
!     $entry = "$username: $fwd_addr, $username, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
--- 570,578 ----
  
    if ($fwd_addr == "NULL") {
!     $entry = "$username: $username@$default->mail_domain, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
    if (($fwd_addr != "NULL") && ($local_copy != "NULL")) {
!     $entry = "$username: $fwd_addr, $username@$default->mail_domain, \"|$default->vac_prog $username\"\n";
      if (!(fwrite($fp, $entry))) { return false; }
    }
***************
*** 631,635 ****
      if (!($fp = fopen($default->status_file, "w"))) { return false; }
        flock($fp, $LOCK_EX);
!       $entry = "$username: $fwd_addr, $username\n";
        if (!(fwrite($fp, $entry))) { return false; }
        flock($fp, $LOCK_UN);
--- 633,637 ----
      if (!($fp = fopen($default->status_file, "w"))) { return false; }
        flock($fp, $LOCK_EX);
!       $entry = "$username: $fwd_addr, $username@$default->mail_domain\n";
        if (!(fwrite($fp, $entry))) { return false; }
        flock($fp, $LOCK_UN);