webinterface.git

@@ -145,7 +145,7 @@ echo '<p class="userinfo">Angemeldet als:<br />';

     echo '<br />'.$_SESSION['customerinfo']['name'];

     echo '<br />(Kunde)';

   }

-  elseif ($role & ROLE_MAILACCOUNT) {

+  elseif ($role & (ROLE_MAILACCOUNT | ROLE_VMAIL_ACCOUNT)) {

     echo '<strong>'.$_SESSION['mailaccount'].'</strong><br />(E-Mail-Account)';

   }

   echo '</p>';

@@ -18,6 +18,9 @@ switch ($_SESSION['role'])

 case ROLE_ANONYMOUS:

   login_screen('');

   break;

+case ROLE_VMAIL_ACCOUNT:

+  $role = "{$_SESSION['mailaccount']}, angemeldet als E-Mail-Account";

+  break;

 case ROLE_MAILACCOUNT:

   $role = "{$_SESSION['mailaccount']}, angemeldet als IMAP/POP3-Account";

   break;

@@ -19,11 +19,12 @@ function empty_account()

 }

-function get_account_details($id)

+function get_account_details($id, $checkuid = true)

 {

 	$id = (int) $id;

 	$uid = (int) $_SESSION['userinfo']['uid'];

-	$result = db_query("SELECT id, local, domain, password, spamfilter, forwards from mail.v_vmail_accounts WHERE useraccount='{$uid}' AND id={$id} LIMIT 1");

+	$uid_check = ($checkuid ? "useraccount='{$uid}' AND " : "");

+	$result = db_query("SELECT id, local, domain, password, spamfilter, forwards from mail.v_vmail_accounts WHERE {$uid_check}id={$id} LIMIT 1");

 	if (mysql_num_rows($result) == 0)

 		system_failure('Ungültige ID oder kein eigener Account');

 	$acc = empty_account();

@@ -70,6 +71,31 @@ function get_vmail_domains()

 }

+function find_account_id($accname)

+{

+  $accname = mysql_real_escape_string($accname);

+  DEBUG($accname);

+  $tmp = explode('@', $accname, 2);

+  DEBUG($tmp);

+  if (count($tmp) != 2)

+    system_failure("Der Account hat nicht die korrekte Syntax");

+  list( $local, $domainname) = $tmp;

+

+  $result = db_query("SELECT id FROM mail.v_vmail_accounts WHERE local='{$local}' AND domainname='{$domainname}' LIMIT 1");

+  if (mysql_num_rows($result) == 0)

+    system_failure("Der Account konnte nicht gefunden werden");

+  $tmp = mysql_fetch_array($result);

+  return $tmp[0];

+}

+

+

+function change_vmail_password($accname, $newpass)

+{

+  $accid = find_account_id($accname);

+  $encpw = mysql_real_escape_string(encrypt_mail_password($newpass));

+  db_query("UPDATE mail.vmail_accounts SET password='{$encpw}' WHERE id={$accid} LIMIT 1;");

+}

+

 function domainselect($selected = NULL, $selectattribute = '')

 {

@@ -203,6 +229,9 @@ function save_vmail_account($account)

   db_query($query); 

   if ($id)

     db_query("DELETE FROM mail.vmail_forward WHERE account={$id}");

+  else

+    $id = mysql_insert_id();

+

   if (count($account['forwards']) > 0)

   {

     $forward_query = "INSERT INTO mail.vmail_forward (account,spamfilter,destination) VALUES ";

@@ -8,5 +8,9 @@ if (($role & ROLE_SYSTEMUSER) && user_has_vmail_domain())

 {

   $menu["vmail_accounts"] = array("label" => "E-Mail", "file" => "accounts.php", "weight" => 10);

 }

+if ($role & ROLE_VMAIL_ACCOUNT)

+{

+  $menu['vmail_chpass'] = array("label" => "Passwort ändern", "file" => "chpass.php", "weight" => 15);

+}

 ?>

@@ -8,9 +8,10 @@ require_once('inc/db_connect.php');

 define('ROLE_ANONYMOUS', 0);

 define('ROLE_MAILACCOUNT', 1);

-define('ROLE_SYSTEMUSER', 2);

-define('ROLE_CUSTOMER', 4);

-define('ROLE_SYSADMIN', 8);

+define('ROLE_VMAIL_ACCOUNT', 2);

+define('ROLE_SYSTEMUSER', 4);

+define('ROLE_CUSTOMER', 8);

+define('ROLE_SYSADMIN', 16);

 // Gibt die Rolle aus, wenn das Passwort stimmt

@@ -68,6 +69,20 @@ function find_role($login, $password, $i_am_admin = False)

     }

   }

+  // virtueller Mail-Account

+  $account = $login;

+  $result = db_query("SELECT cryptpass FROM mail.courier_virtual_accounts WHERE account='{$account}' LIMIT 1;");

+  if (@mysql_num_rows($result) > 0)

+  {

+    $entry = mysql_fetch_object($result);

+    $db_password = $entry->cryptpass;

+    $hash = crypt($password, $db_password);

+    if ($hash == $db_password || $i_am_admin)

+    {

+      return ROLE_VMAIL_ACCOUNT;

+    }

+  }

+  

   // Nothing?

@@ -196,6 +211,12 @@ function setup_session($role, $useridentity)

     $_SESSION['mailaccount'] = $id;

     DEBUG("We are mailaccount: {$_SESSION['mailaccount']}");

   }

+  if ($role & ROLE_VMAIL_ACCOUNT)

+  {

+    $id = $useridentity;

+    $_SESSION['mailaccount'] = $id;

+    DEBUG("We are virtual mailaccount: {$_SESSION['mailaccount']}");

+  }

 }