Skip to content
GitLab
Commit 31ed6c62 authored by tbrehm's avatar tbrehm
Browse files

Email catchall and forward

parent 3c11b08f
Hide whitespace changes
Inline Side-by-side
interface/lib/classes/listform.inc.php
View file @ 31ed6c62
......@@ -77,7 +77,7 @@ class listform {
if(is_array($i['value'])) {
$out = '<option value=""></option>';
foreach($i['value'] as $k => $v) {
$selected = ($k == $_SESSION["search"][$list_name][$search_prefix.$field])?' SELECTED':'';
$selected = ($k == $_SESSION["search"][$list_name][$search_prefix.$field] && $_SESSION["search"][$list_name][$search_prefix.$field] != '')?' SELECTED':'';
$out .= "<option value='$k'$selected>$v</option>\r\n";
}
}
......
interface/sql/ispconfig3db.sql
View file @ 31ed6c62
......@@ -3,7 +3,7 @@
# http://www.phpmyadmin.net/ (download page)
#
# Host: localhost
# Erstellungszeit: 24. November 2005 um 00:31
# Erstellungszeit: 24. November 2005 um 23:49
# Server Version: 4.0.23
# PHP-Version: 5.0.3
# Datenbank: `ispconfig3`
......@@ -104,11 +104,16 @@ INSERT INTO mail_domain VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'test2.de', 'ali
DROP TABLE IF EXISTS mail_domain_catchall;
CREATE TABLE mail_domain_catchall (
virtual_default_id int(11) NOT NULL auto_increment,
domain_catchall_id int(11) NOT NULL auto_increment,
sys_userid int(11) NOT NULL default '0',
sys_groupid int(11) NOT NULL default '0',
sys_perm_user varchar(5) NOT NULL default '',
sys_perm_group varchar(5) NOT NULL default '',
sys_perm_other varchar(5) NOT NULL default '',
server_id int(11) NOT NULL default '0',
domain varchar(255) NOT NULL default '',
dest varchar(255) NOT NULL default '',
PRIMARY KEY (virtual_default_id),
destination varchar(255) NOT NULL default '',
PRIMARY KEY (domain_catchall_id),
KEY server_id (server_id,domain)
) TYPE=MyISAM;
......@@ -168,7 +173,7 @@ CREATE TABLE mail_mailman_domain (
DROP TABLE IF EXISTS mail_redirect;
CREATE TABLE mail_redirect (
email_id int(11) NOT NULL auto_increment,
redirect_id int(11) NOT NULL auto_increment,
sys_userid int(11) NOT NULL default '0',
sys_groupid int(11) NOT NULL default '0',
sys_perm_user varchar(5) NOT NULL default '',
......@@ -178,8 +183,8 @@ CREATE TABLE mail_redirect (
email varchar(255) NOT NULL default '',
destination varchar(255) NOT NULL default '',
type enum('alias','forward') NOT NULL default 'alias',
enabled enum('yes','no') NOT NULL default 'yes',
PRIMARY KEY (email_id),
active enum('0','1') NOT NULL default '1',
PRIMARY KEY (redirect_id),
KEY server_id (server_id,email)
) TYPE=MyISAM;
......@@ -187,6 +192,8 @@ CREATE TABLE mail_redirect (
# Daten fr Tabelle `mail_redirect`
#
INSERT INTO mail_redirect VALUES (1, 1, 0, 'riud', 'riud', '', 1, 'tom@test.de', 'till@test.de', 'alias', '1');
INSERT INTO mail_redirect VALUES (2, 1, 0, 'riud', 'riud', '', 1, 'hallo@test.de', 't.brehm@ensign.de', 'forward', '1');
# --------------------------------------------------------
#
......@@ -332,6 +339,8 @@ INSERT INTO sys_datalog VALUES (25, 'mail_box', 'mailbox_id:1', 'u', 1132787761,
INSERT INTO sys_datalog VALUES (26, 'mail_box', 'mailbox_id:0', 'i', 1132787775, 'admin', 'a:3:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:12:"test@test.de";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
INSERT INTO sys_datalog VALUES (27, 'mail_box', 'mailbox_id:1', 'u', 1132788121, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
INSERT INTO sys_datalog VALUES (28, 'mail_box', 'mailbox_id:1', 'u', 1132788482, 'admin', 'a:1:{s:8:"cryptpwd";a:2:{s:3:"old";s:34:"$1$ye3.TQ1.$v/RvqbuU.Gh7UrLlA6HqX/";s:3:"new";s:0:"";}}');
INSERT INTO sys_datalog VALUES (29, 'mail_redirect', 'redirect_id:0', 'i', 1132859789, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:11:"tom@test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:12:"till@test.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:5:"alias";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
INSERT INTO sys_datalog VALUES (30, 'mail_redirect', 'redirect_id:0', 'i', 1132868928, 'admin', 'a:5:{s:9:"server_id";a:2:{s:3:"old";N;s:3:"new";i:1;}s:5:"email";a:2:{s:3:"old";N;s:3:"new";s:13:"hallo@test.de";}s:11:"destination";a:2:{s:3:"old";N;s:3:"new";s:17:"t.brehm@ensign.de";}s:4:"type";a:2:{s:3:"old";N;s:3:"new";s:7:"forward";}s:6:"active";a:2:{s:3:"old";N;s:3:"new";i:1;}}');
# --------------------------------------------------------
#
......
interface/web/sites/form/mail_alias.tform.php
View file @ 31ed6c62
......@@ -71,8 +71,6 @@ $form["tabs"]['alias'] = array (
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
1 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'email_error_unique'),
),
'default' => '',
'value' => '',
......
interface/web/sites/form/mail_domain_catchall.tform.php 0 → 100644
View file @ 31ed6c62
<?php
/*
Form Definition
Tabledefinition
Datatypes:
- INTEGER (Forces the input to Int)
- DOUBLE
- CURRENCY (Formats the values to currency notation)
- VARCHAR (no format check, maxlength: 255)
- TEXT (no format check)
- DATE (Dateformat, automatic conversion to timestamps)
Formtype:
- TEXT (Textfield)
- TEXTAREA (Textarea)
- PASSWORD (Password textfield, input is not shown when edited)
- SELECT (Select option field)
- RADIO
- CHECKBOX
- CHECKBOXARRAY
- FILE
VALUE:
- Wert oder Array
Hint:
The ID field of the database table is not part of the datafield definition.
The ID field must be always auto incement (int or bigint).
*/
$form["title"] = "Email Catchall";
$form["description"] = "";
$form["name"] = "mail_domain_catchall";
$form["action"] = "mail_domain_catchall_edit.php";
$form["db_table"] = "mail_domain_catchall";
$form["db_table_idx"] = "domain_catchall_id";
$form["db_history"] = "yes";
$form["tab_default"] = "catchall";
$form["list_default"] = "mail_domain_catchall_list.php";
$form["auth"] = 'yes'; // yes / no
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
$form["tabs"]['catchall'] = array (
'title' => "Domain Catchall",
'width' => 150,
'template' => "templates/mail_domain_catchall_edit.htm",
'fields' => array (
##################################
# Begin Datatable fields
##################################
'server_id' => array (
'datatype' => 'INTEGER',
'formtype' => 'VARCHAR',
'default' => '',
'value' => ''
),
'domain' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'validators' => array ( 0 => array ( 'type' => 'UNIQUE',
'errmsg'=> 'domain_error_unique'),
),
'datasource' => array ( 'type' => 'SQL',
'querystring' => "SELECT domain FROM mail_domain WHERE type = 'local' ORDER BY domain",
'keyfield'=> 'domain',
'valuefield'=> 'domain'
),
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
'active' => array (
'datatype' => 'INTEGER',
'formtype' => 'CHECKBOX',
'default' => '1',
'value' => '1'
),
##################################
# ENDE Datatable fields
##################################
)
);
?>
\ No newline at end of file
interface/web/sites/form/mail_forward.tform.php 0 → 100644
View file @ 31ed6c62
<?php
/*
Form Definition
Tabledefinition
Datatypes:
- INTEGER (Forces the input to Int)
- DOUBLE
- CURRENCY (Formats the values to currency notation)
- VARCHAR (no format check, maxlength: 255)
- TEXT (no format check)
- DATE (Dateformat, automatic conversion to timestamps)
Formtype:
- TEXT (Textfield)
- TEXTAREA (Textarea)
- PASSWORD (Password textfield, input is not shown when edited)
- SELECT (Select option field)
- RADIO
- CHECKBOX
- CHECKBOXARRAY
- FILE
VALUE:
- Wert oder Array
Hint:
The ID field of the database table is not part of the datafield definition.
The ID field must be always auto incement (int or bigint).
*/
$form["title"] = "Email Forward";
$form["description"] = "";
$form["name"] = "mail_forward";
$form["action"] = "mail_forward_edit.php";
$form["db_table"] = "mail_redirect";
$form["db_table_idx"] = "redirect_id";
$form["db_history"] = "yes";
$form["tab_default"] = "forward";
$form["list_default"] = "mail_forward_list.php";
$form["auth"] = 'yes'; // yes / no
$form["auth_preset"]["userid"] = 0; // 0 = id of the user, > 0 id must match with id of current user
$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user
$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
$form["tabs"]['forward'] = array (
'title' => "Email forward",
'width' => 100,
'template' => "templates/mail_forward_edit.htm",
'fields' => array (
##################################
# Begin Datatable fields
##################################
'server_id' => array (
'datatype' => 'INTEGER',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
'email' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'validators' => array ( 0 => array ( 'type' => 'ISEMAIL',
'errmsg'=> 'email_error_isemail'),
),
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
'destination' => array (
'datatype' => 'VARCHAR',
'formtype' => 'TEXT',
'default' => '',
'value' => '',
'width' => '30',
'maxlength' => '255'
),
'type' => array (
'datatype' => 'VARCHAR',
'formtype' => 'SELECT',
'default' => '',
'value' => array('forward'=>'Forward','alias' => 'Alias')
),
'active' => array (
'datatype' => 'INTEGER',
'formtype' => 'CHECKBOX',
'default' => '1',
'value' => '1'
),
##################################
# ENDE Datatable fields
##################################
)
);
?>
\ No newline at end of file
interface/web/sites/lib/lang/en_mail_alias.lng 0 → 100644
View file @ 31ed6c62
<?php
$wb["email_txt"] = 'Email';
$wb["destination_txt"] = 'Destination';
$wb["active_txt"] = 'Active';
$wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["email_error_isemail"] = 'Emailaddress is empty.';
$wb["email_error_unique"] = 'Duplicate Emailaddress.';
$wb["no_domain_perm"] = "You have no permission for this domain.";
?>
\ No newline at end of file
interface/web/sites/lib/lang/en_mail_alias_list.lng
View file @ 31ed6c62
<?php
$wb["list_head_txt"] = 'mail_alias';
$wb["email_txt"] = 'email';
$wb["destination_txt"] = 'destination';
$wb["list_head_txt"] = 'Email Alias';
$wb["email_txt"] = 'Email';
$wb["destination_txt"] = 'Destination';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
$wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
$wb["add_new_record_txt"] = 'Add new Email alias';
$wb["active_txt"] = 'Active';
?>
\ No newline at end of file
interface/web/sites/lib/lang/en_mail_domain_catchall.lng 0 → 100644
View file @ 31ed6c62
<?php
$wb["server_id_txt"] = 'server_id';
$wb["domain_txt"] = 'domain';
$wb["destination_txt"] = 'destination';
$wb["active_txt"] = 'active';
$wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
?>
\ No newline at end of file
interface/web/sites/lib/lang/en_mail_domain_catchall_list.lng 0 → 100644
View file @ 31ed6c62
<?php
$wb["list_head_txt"] = 'Email Catchall';
$wb["server_id_txt"] = 'Server';
$wb["domain_txt"] = 'Domain';
$wb["destination_txt"] = 'Destination email address';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
$wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
$wb["add_new_record_txt"] = 'Add new Catchall';
?>
\ No newline at end of file
interface/web/sites/lib/lang/en_mail_domain_list.lng
View file @ 31ed6c62
<?php
$wb["list_head_txt"] = 'Email Domains';
$wb["list_head_txt"] = 'Email Domain';
$wb["server_id_txt"] = 'Server';
$wb["domain_txt"] = 'Domain';
$wb["page_txt"] = 'Page';
......
interface/web/sites/lib/lang/en_mail_forward.lng 0 → 100644
View file @ 31ed6c62
<?php
$wb["email_txt"] = 'Email';
$wb["destination_txt"] = 'Destination Email';
$wb["active_txt"] = 'Active';
$wb["btn_save_txt"] = 'Save';
$wb["btn_cancel_txt"] = 'Cancel';
?>
\ No newline at end of file
interface/web/sites/lib/lang/en_mail_forward_list.lng 0 → 100644
View file @ 31ed6c62
<?php
$wb["list_head_txt"] = 'Mail Forward';
$wb["active_txt"] = 'Active';
$wb["email_txt"] = 'Email';
$wb["destination_txt"] = 'Destination';
$wb["page_txt"] = 'Page';
$wb["page_of_txt"] = 'of';
$wb["page_next_txt"] = 'Next';
$wb["page_back_txt"] = 'Back';
$wb["delete_txt"] = 'Delete';
$wb["filter_txt"] = 'Filter';
$wb["add_new_record_txt"] = 'Add new Email forward';
?>
\ No newline at end of file
interface/web/sites/lib/module.conf.php
View file @ 31ed6c62
......@@ -54,7 +54,7 @@ $module = array (
array (
'title' => 'Email Catchall',
'target' => 'content',
'link' => 'sites/mail_catchall_list.php',
'link' => 'sites/mail_domain_catchall_list.php',
),
),
),
......
interface/web/sites/list/mail_alias.list.php
View file @ 31ed6c62
......@@ -47,6 +47,15 @@ $liste["auth"] = "yes";
* Suchfelder
*****************************************************/
$liste["item"][] = array( 'field' => "active",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('1' => "Yes",'0' => "No"));
$liste["item"][] = array( 'field' => "email",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
......
interface/web/sites/list/mail_domain_catchall.list.php 0 → 100644
View file @ 31ed6c62
<?php
/*
Datatypes:
- INTEGER
- DOUBLE
- CURRENCY
- VARCHAR
- TEXT
- DATE
*/
// Name of the list
$liste["name"] = "mail_domain_catchall";
// Database table
$liste["table"] = "mail_domain_catchall";
// Index index field of the database table
$liste["table_idx"] = "domain_catchall_id";
// Search Field Prefix
$liste["search_prefix"] = "search_";
// Records per page
$liste["records_per_page"] = 15;
// Script File of the list
$liste["file"] = "mail_domain_catchall_list.php";
// Script file of the edit form
$liste["edit_file"] = "mail_domain_catchall_edit.php";
// Script File of the delete script
$liste["delete_file"] = "mail_domain_catchall_del.php";
// Paging Template
$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable auth
$liste["auth"] = "yes";
/*****************************************************
* Suchfelder
*****************************************************/
$liste["item"][] = array( 'field' => "server_id",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
'suffix' => "%",
'width' => "",
'value' => "");
$liste["item"][] = array( 'field' => "domain",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
'suffix' => "%",
'width' => "",
'value' => "");
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
'suffix' => "%",
'width' => "",
'value' => "");
?>
\ No newline at end of file
interface/web/sites/list/mail_forward.list.php 0 → 100644
View file @ 31ed6c62
<?php
/*
Datatypes:
- INTEGER
- DOUBLE
- CURRENCY
- VARCHAR
- TEXT
- DATE
*/
// Name of the list
$liste["name"] = "mail_forward";
// Database table
$liste["table"] = "mail_redirect";
// Index index field of the database table
$liste["table_idx"] = "redirect_id";
// Search Field Prefix
$liste["search_prefix"] = "search_";
// Records per page
$liste["records_per_page"] = 15;
// Script File of the list
$liste["file"] = "mail_forward_list.php";
// Script file of the edit form
$liste["edit_file"] = "mail_forward_edit.php";
// Script File of the delete script
$liste["delete_file"] = "mail_forward_del.php";
// Paging Template
$liste["paging_tpl"] = "templates/paging.tpl.htm";
// Enable auth
$liste["auth"] = "yes";
/*****************************************************
* Suchfelder
*****************************************************/
$liste["item"][] = array( 'field' => "active",
'datatype' => "VARCHAR",
'formtype' => "SELECT",
'op' => "=",
'prefix' => "",
'suffix' => "",
'width' => "",
'value' => array('1' => "Yes",'0' => "No"));
$liste["item"][] = array( 'field' => "email",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
'suffix' => "%",
'width' => "",
'value' => "");
$liste["item"][] = array( 'field' => "destination",
'datatype' => "VARCHAR",
'formtype' => "TEXT",
'op' => "like",
'prefix' => "%",
'suffix' => "%",
'width' => "",
'value' => "");
?>
\ No newline at end of file
interface/web/sites/mail_alias_list.php
View file @ 31ed6c62
......@@ -20,6 +20,9 @@ if(!stristr($_SESSION["s"]["user"]["modules"],$_SESSION["s"]["module"]["name"]))
$app->uses('listform_actions');
// Limit the results to alias domains
$app->listform_actions->SQLExtWhere = "type = 'alias'";
$app->listform_actions->onLoad();
......
interface/web/sites/mail_domain_catchall_del.php 0 → 100644
View file @ 31ed6c62
<?php
/*
Copyright (c) 2005, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.