webinterface.git

@@ -1,26 +0,0 @@

-<?php

-/*

-This file belongs to the Webinterface of schokokeks.org Hosting

-

-Written 2008-2014 by schokokeks.org Hosting, namely

-  Bernd Wurst <bernd@schokokeks.org>

-  Hanno Böck <hanno@schokokeks.org>

-

-To the extent possible under law, the author(s) have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty.

-

-You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see 

-http://creativecommons.org/publicdomain/zero/1.0/

-

-Nevertheless, in case you use a significant part of this code, we ask (but not require, see the license) that you keep the authors' names in place and return your changes to the public. We would be especially happy if you tell us what you're going to do with this code.

-*/

-

-require_once('vmail.php');

-

-$email = filter_var($_REQUEST['target'], FILTER_VALIDATE_EMAIL);

-$type = forward_type($email);

-

-header("Content-Type: application/json");

-echo ' { "target": "'.$email.'", "type": "'.$type.'" } ';

-die();

-

-

@@ -115,42 +115,6 @@ function hideUnchecked() {

 }

-function checkForwardCallback( result ) {

-  target = result.target;

-  type = result.type;

-  element = null;

-  $('div.vmail-forward input').each(function () {

-    if ($(this).val() == target) {

-      element = $(this).closest('div.vmail-forward');

-    }

-  });

-  if (! element) {

-    // Der User hat noch weiter getippt

-    return;

-  }

-  if (type == 'critical') {

-    element.find('select option[value="delete"]').prop('selected', true);

-    element.find('select option[value="none"]').prop('disabled', true);

-    element.find('select option[value="tag"]').prop('disabled', true);

-    element.find('select option[value="delete"]').prop('disabled', false);

-    element.find('.warning').text('Weiterleitungen zu einigen großen E-Mail-Providern dürfen nur mit aktiviertem Spamfilter eingerichtet werden.');

-    element.find('.warning').show()

-  } else if (type == 'local') {

-    //element.find('select option[value="none"]').prop('selected', true);

-    element.find('select option[value="none"]').prop('disabled', false);

-    element.find('select option[value="tag"]').prop('disabled', false);

-    element.find('select option[value="delete"]').prop('disabled', false);

-    element.find('.warning').hide()

-  } else {

-    //element.find('select option[value="delete"]').prop('selected', true);

-    element.find('select option[value="none"]').prop('disabled', false);

-    element.find('select option[value="tag"]').prop('disabled', false);

-    element.find('select option[value="delete"]').prop('disabled', false);

-    element.find('.warning').hide()

-  }

-  $('#submit').prop('disabled', false);

-}

-

 function checkForward( ) {

   input = $(this);

   val = input.val();

@@ -160,11 +124,6 @@ function checkForward( ) {

     return;

   }

   div = input.closest('div.vmail-forward');

-  $('#submit').prop('disabled', true);

-  $.getJSON("checkforward?target="+val, checkForwardCallback)

-    .fail( function () {

-      $('#submit').prop('disabled', false);

-      });

 }

@@ -62,9 +62,7 @@ $numforwards = max(count($account['forwards']), 1);

 $form = '';

-if ($accountlogin) {

-  $form.= "<p class=\"spamfilter_options\">Unerwünschte E-Mails (Spam, Viren) in diesem Postfach ".html_select('spamfilter_action', array("none" => 'nicht filtern', "folder" => 'in Unterordner »Spam« ablegen', "tag" => 'markieren und zustellen', "delete" => 'nicht zustellen (löschen)'), $account['spamfilter'])."</p>";

-} else {

+if (! $accountlogin) {

   if ($id != 0) {

     $domainlist = get_vmail_domains();

     $domain = NULL;

@@ -96,8 +94,6 @@ if ($accountlogin) {

     <div style=\"margin-left: 2em;\" id=\"mailbox_config\" class=\"option_group\">

     <p>Passwort für Abruf:&#160;<input style=\"color: #aaa;\" type=\"password\" id=\"password\" name=\"password\" value=\"{$password_value}\" />{$password_message}</p>";

-  $form.= "<p class=\"spamfilter_options\">Unerwünschte E-Mails (Spam, Viren) in diesem Postfach ".html_select('spamfilter_action', array("none" => 'nicht filtern', "folder" => 'in Unterordner »Spam« ablegen', "tag" => 'markieren und zustellen', "delete" => 'nicht zustellen (löschen)'), $account['spamfilter'])."</p>";

-

   $quota = config('vmail_basequota');

   if ($is_mailbox and $account['quota']) {

     $quota = $account['quota'];

@@ -204,11 +200,11 @@ $form .= "<div style=\"margin-left: 2em;\" id=\"forward_config\" class=\"option_

 $form .= '<div id="forward_entries">

 ';

 if (! isset($account['forwards'][0])) {

-  $account['forwards'][0] = array('destination' => '', 'spamfilter' => 'delete');

+  $account['forwards'][0] = array('destination' => '');

 }

 while (count($account['forwards']) < 10) {

   // Dummy-Einträge für Leute ohne JavaScript

-  $account['forwards'][] = array('destination' => '', 'spamfilter' => 'delete');

+  $account['forwards'][] = array('destination' => '');

 }

 for ($i = 0 ; $i < max($numforwards,10) ; $i++)

 {

@@ -216,9 +212,6 @@ for ($i = 0 ; $i < max($numforwards,10) ; $i++)

   $form .= "<div class=\"vmail-forward\" id=\"vmail_forward_{$num}\">

   <div style=\"float: right;\" class=\"delete_forward\">".icon_delete("Diese Weiterleitung entfernen")."</div>

   <p>Weiterleiten an <input type=\"text\" id=\"forward_to_{$num}\" name=\"forward_to_{$num}\" value=\"{$account['forwards'][$i]['destination']}\" /></p>

-  <p>Spam-Mails an diese Adresse ".html_select('spamfilter_action_'.$num, array("none" => 'nicht filtern', "tag" => 'markieren und zustellen', "delete" => 'nicht zustellen'), $account['forwards'][$i]['spamfilter'])."</p>

-  <p class=\"warning\" style=\"display: none;\"></p>

-  <p>Bitte beachten Sie unsere Hinweise zu <a href=\"https://wiki.schokokeks.org/E-Mail/Weiterleitungen\">Weiterleitungen und Spamfiltern</a>.</p>

   </div>\n";

 }

 $form .= '</div>';

@@ -22,21 +22,9 @@ require_once('hasdomain.php');

 require_once('common.php');

-$forced_spamfilter_domains = array(

-  't-online.de', 'gmx.de', 'gmx.net', 'web.de', 'gmail.com', 'googlemail.com',

-  'googlemail.de', 'freenet.de', 'aol.com', 'yahoo.com', 'gmx.at', 'ymail.com', 

-  'hotmail.com', 'mail.de', 'email.de', 'online.de', 'outlook.com', 'me.com', 'yahoo.de'

-  );

-

-

 function forward_type($target) {

-  global $forced_spamfilter_domains;

   list($l, $d) = explode('@', strtolower($target), 2);

   DEBUG('Weiterleitung an '.$l.' @ '.$d);

-  if (in_array($d, $forced_spamfilter_domains)) {

-    // Domain in der Liste => Spam darf nicht weiter geleitet werden

-    return 'critical';

-  }

   $result = db_query("SELECT id FROM kundendaten.domains WHERE CONCAT_WS('.', domainname, tld) = ?", array($d));

   if ($result->rowCount() > 0) {

     // Lokale Domain

@@ -56,8 +44,6 @@ function empty_account()

 		'domain' => NULL,

 		'password' => NULL,

     'smtpreply' => NULL,

-		'spamfilter' => 'folder',

-		'spamexpire' => 7,

     'quota' => config('vmail_basequota'),

     'quota_threshold' => 20,

 		'forwards' => array(),

@@ -102,7 +88,7 @@ function get_account_details($id, $checkuid = true)

     $uid_check = "useraccount=:uid AND ";

     $args[":uid"] = $uid;

   }

-  $result = db_query("SELECT id, local, domain, password, smtpreply, spamfilter, forwards, autoresponder, server, quota, COALESCE(quota_used, 0) AS quota_used, quota_threshold from mail.v_vmail_accounts WHERE {$uid_check}id=:id LIMIT 1", $args);

+  $result = db_query("SELECT id, local, domain, password, smtpreply, forwards, autoresponder, server, quota, COALESCE(quota_used, 0) AS quota_used, quota_threshold from mail.v_vmail_accounts WHERE {$uid_check}id=:id LIMIT 1", $args);

 	if ($result->rowCount() == 0)

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

 	$acc = empty_account();

@@ -113,9 +99,9 @@ function get_account_details($id, $checkuid = true)

 	  $acc[$key] = $value;

 	}

 	if ($acc['forwards'] > 0) {

-	  $result = db_query("SELECT id, spamfilter, destination FROM mail.vmail_forward WHERE account=?", array($acc['id']));

+	  $result = db_query("SELECT id, destination FROM mail.vmail_forward WHERE account=?", array($acc['id']));

 	  while ($item = $result->fetch()){

-	    array_push($acc['forwards'], array("id" => $item['id'], 'spamfilter' => $item['spamfilter'], 'destination' => $item['destination']));

+	    array_push($acc['forwards'], array("id" => $item['id'], 'destination' => $item['destination']));

 	  }

 	}

   if ($acc['autoresponder'] > 0) {

@@ -277,17 +263,11 @@ function save_vmail_account($account)

   $forwards = array();

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

   {

-    for ($i=0;$i < count($account['forwards']); $i++)

-    {

-      if ($account['forwards'][$i]['spamfilter'] != 'tag' && $account['forwards'][$i]['spamfilter'] != 'delete') {

-        $account['forwards'][$i]['spamfilter'] = NULL;

-      }

       $account['forwards'][$i]['destination'] = filter_input_general($account['forwards'][$i]['destination']);

       if (! check_emailaddr($account['forwards'][$i]['destination'])) {

         system_failure('Das Weiterleitungs-Ziel »'.$account['forwards'][$i]['destination'].'« ist keine E-Mail-Adresse!');

       }

   }

-  }

   if ($accountlogin) {

     $password = NULL; 

@@ -311,20 +291,6 @@ function save_vmail_account($account)

     }

   }  

-  $spam = NULL;

-  switch ($account['spamfilter'])

-  {

-    case 'folder':

-      $spam = "folder";

-      break;

-    case 'tag':

-      $spam = "tag";

-      break;

-    case 'delete':

-      $spam = "delete";

-      break;

-  }

-  

   if (!$accountlogin) {

     $free = config('vmail_basequota');

     if ($newaccount) {

@@ -351,7 +317,6 @@ function save_vmail_account($account)

   }

   $account['local'] = strtolower($account['local']);

-  $account['spamexpire'] = (int) $account['spamexpire'];

   # Leerstring wird zu NULL

   $account['smtpreply'] = ($account['smtpreply'] ? $account['smtpreply'] : NULL);

@@ -359,8 +324,6 @@ function save_vmail_account($account)

                 ":domain" => $account['domain'],

                 ":password" => $password,

                 ":smtpreply" => $account['smtpreply'],

-                ":spamfilter" => $spam,

-                ":spamexpire" => $account['spamexpire'],

                 ":quota" => $account['quota'], 

                 ":quota_threshold" => $account['quota_threshold'],

                 ":id" => $id

@@ -369,7 +332,7 @@ function save_vmail_account($account)

   if ($newaccount)

   {

     unset($args[":id"]);

-    $query = "INSERT INTO mail.vmail_accounts (local, domain, spamfilter, spamexpire, password, smtpreply, quota, quota_threshold) VALUES (:local, :domain, :spamfilter, :spamexpire, :password, :smtpreply, :quota, :quota_threshold)";

+    $query = "INSERT INTO mail.vmail_accounts (local, domain, password, smtpreply, quota, quota_threshold) VALUES (:local, :domain, :password, :smtpreply, :quota, :quota_threshold)";

   } else {

     if ($set_password)

       $pw=", password=:password";

@@ -377,7 +340,7 @@ function save_vmail_account($account)

       unset($args[":password"]);

       $pw='';

     }

-    $query = "UPDATE mail.vmail_accounts SET local=:local, domain=:domain{$pw}, smtpreply=:smtpreply, spamfilter=:spamfilter, spamexpire=:spamexpire, quota=:quota, quota_threshold=:quota_threshold WHERE id=:id";

+    $query = "UPDATE mail.vmail_accounts SET local=:local, domain=:domain{$pw}, smtpreply=:smtpreply, quota=:quota, quota_threshold=:quota_threshold WHERE id=:id";

   }

   db_query($query, $args); 

   if ($newaccount) {

@@ -412,19 +375,18 @@ function save_vmail_account($account)

-  if (! $newaccount)

+  if (! $newaccount) {

     db_query("DELETE FROM mail.vmail_forward WHERE account=?", array($id));

+   }

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

   {

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

-    for ($i=0;$i < count($account['forwards']); $i++)

-    { 

-      db_query($forward_query, array(":account" => $id, ":spamfilter" => $account['forwards'][$i]['spamfilter'], ":destination" => $account['forwards'][$i]['destination']));

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

+    for ($i=0;$i < count($account['forwards']); $i++) { 

+      db_query($forward_query, array(":account" => $id, ":destination" => $account['forwards'][$i]['destination']));

     }

   }

-  if ($newaccount && $password)

-  {

+  if ($newaccount && $password) {

     $servername = get_server_by_id($server);

     $emailaddr = 'vmail-'.$account['local'].'%'.$domainname.'@'.$servername;

     $username = $account['local'].'@'.$domainname;

@@ -60,7 +60,6 @@ if ($_GET['action'] == 'edit')

     if ($_POST['mailbox'] != 'yes')

     {

       $account['password'] = NULL;

-      $account['spamfilter'] = 'none';

     }

     if (isset($_POST['quota'])) {

       $account['quota'] = $_POST['quota'];

@@ -72,7 +71,6 @@ if ($_GET['action'] == 'edit')

     }

   }

-  $account['spamfilter'] = $_POST['spamfilter_action'];

   $ar = empty_autoresponder_config();

   $valid_from_date = time();

@@ -158,10 +156,10 @@ if ($_GET['action'] == 'edit')

     while (true)

     {

       // Die ersten 50 Einträge in jedem Fall prüfen, danach nur so lange zusätzliche Einträge vorhanden

-      if (! isset($_POST['forward_to_'.$num]) && ! isset($_POST['spamfilter_action_'.$num]) && $num > 50)

+      if (! isset($_POST['forward_to_'.$num])) && $num > 50)

         break;

       if (isset($_POST['forward_to_'.$num]) && chop($_POST['forward_to_'.$num]) != '') {

-        $fwd = array("spamfilter" => $_POST['spamfilter_action_'.$num], "destination" => chop($_POST['forward_to_'.$num]));

+        $fwd = array("destination" => chop($_POST['forward_to_'.$num]));

         array_push($account['forwards'], $fwd);

       }

       $num++;

@@ -89,17 +89,7 @@ if (count($domains) > 0)

                 $color = ( $percent > 95 ? 'red' : ($percent > 75 ? "yellow" : "green" ));

                 $width = 2 * min($percent, 100);

                 $quotachart = "<div style=\"margin: 2px 0; padding: 0; width: 200px; border: 1px solid black;\"><div style=\"font-size: 1px; background-color: {$color}; height: 10px; width: {$width}px; margin: 0; padding: 0;\">&#160;</div></div> {$acc['quota_used']} MB von {$acc['quota']} MB belegt";

-	      	$spam = 'ohne Spamfilter';

-	        switch ($acc['spamfilter'])

-	  	{

-		        case 'folder':  $spam = 'Spam in Unterordner';

-					break;

-			case 'tag':	$spam = 'Spam markieren';

-					break;

-			case 'delete':	$spam = 'Spam nicht zustellen';

-					break;

-	        }

-	        array_push($actions, "Ablegen in Mailbox ({$spam})<br />".$quotachart);

+	        array_push($actions, "Ablegen in Mailbox<br />".$quotachart);

 	      }

         if ($acc['autoresponder']) {

             $now = date( 'Y-m-d' );

@@ -122,16 +112,8 @@ if (count($domains) > 0)

         }

 	      foreach ($acc['forwards'] AS $fwd)

 	      {

-	      	$spam = 'ohne Spamfilter';

-	        switch ($fwd['spamfilter'])

-	  	{

-			case 'tag':	$spam = 'Spam markieren';

-					break;

-			case 'delete':	$spam = 'Spam nicht zustellen';

-					break;

-	        }

 		$fwd['destination'] = filter_input_general($fwd['destination']);

-	        array_push($actions, "Weiterleitung an <strong>{$fwd['destination']}</strong> ({$spam})");

+	        array_push($actions, "Weiterleitung an <strong>{$fwd['destination']}</strong>");

 	      }

 	      $dest = '';

 	      if (count($actions) > 0)

@@ -36,17 +36,7 @@ $content .= "<div><div style=\"margin: 2px 0; padding: 0; width: 200px; border:

 $content .= '<h3>Einstellungen</h3>

 <p>Eingehende E-Mails für Ihre Adresse werden wie folgt verarbeitet:</p>';

-$spam = 'ohne Spamfilter';

-switch ($acc['spamfilter'])

-{

-  case 'folder':  $spam = 'Spam in Unterordner';

-    break;

-	case 'tag':	$spam = 'Spam markieren';

-		break;

-	case 'delete':	$spam = 'Spam nicht zustellen';

-  	break;

-}

-$content .= '<p>'.other_icon('go.png')." Ablegen in Ihrer Mailbox ({$spam})</p>";

+$content .= '<p>'.other_icon('go.png')." Ablegen in Ihrer Mailbox</p>";

 if ($acc['autoresponder']) {

@@ -71,16 +61,8 @@ if ($acc['autoresponder']) {

 foreach ($acc['forwards'] AS $fwd)

 {

- 	$spam = 'ohne Spamfilter';

-  switch ($fwd['spamfilter'])

-	{

-	  case 'tag':	$spam = 'Spam markieren';

-			break;

-		case 'delete':	$spam = 'Spam nicht zustellen';

-			break;

-	}

 	$fwd['destination'] = filter_input_general($fwd['destination']);

-  $content .= '<p>'.other_icon('go.png')." Weiterleitung an <strong>{$fwd['destination']}</strong> ({$spam})</p>"; 

+  $content .= '<p>'.other_icon('go.png')." Weiterleitung an <strong>{$fwd['destination']}</strong></p>"; 

 }