create-alias.php:
- deleted, obsoleted by edit.php?table=alias
functions.inc.php:
- drop function check_alias() - it was only used by create-alias.php
(AliasHandler has a similar function create_allowed(), which is a
copy of check_alias() with superfluous {...} removed)
configs/menu.conf
- replace create-alias.php with edit.php?table=alias
- append "?" to url_create_mailbox to avoid temporary change in menu.tpl
(create-mailbox is the only one which still needs ? instead of &)
templates/list-virtual.tpl:
- use {#url_create_alias#} instead of hardcoded create-alias.php
templates/menu.tpl:
- $url_domain: url-escape domain, use & instead of ?
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1317 a1433add-5e2c-0410-b055-b7f2511e0802
pull/2/head
Christian Boltz
13 years ago
parent
088fef9bdb
commit
e719c6c4dd
@ -1,203 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* Postfix Admin
|
||||
*
|
||||
* LICENSE
|
||||
*
|
||||
* This source file is subject to the GPL license that is bundled with
|
||||
* this package in the file LICENSE.TXT.
|
||||
*
|
||||
* Further details on the project are available at :
|
||||
* http://www.postfixadmin.com or http://postfixadmin.sf.net
|
||||
*
|
||||
* File: create-alias.php
|
||||
* Template File: create-alias.tpl
|
||||
* Responsible for allowing for the creation of mail aliases.
|
||||
*
|
||||
* @version $Id$
|
||||
* @license GNU GPL v2 or later.
|
||||
*
|
||||
* Template Variables:
|
||||
*
|
||||
* tAddress
|
||||
* tGoto
|
||||
* tDomain
|
||||
*
|
||||
* Form POST \ GET Variables:
|
||||
*
|
||||
* fAddress
|
||||
* fGoto
|
||||
* fDomain
|
||||
*
|
||||
*/
|
||||
|
||||
require_once('common.php');
|
||||
|
||||
authentication_require_role('admin');
|
||||
$username = authentication_get_username();
|
||||
$SESSID_USERNAME = $username;
|
||||
if(authentication_has_role('global-admin')) {
|
||||
$list_domains = list_domains ();
|
||||
}
|
||||
else {
|
||||
$list_domains = list_domains_for_admin ($username);
|
||||
}
|
||||
|
||||
$pCreate_alias_address_text_error = "";
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] == "GET")
|
||||
{
|
||||
if (isset ($_GET['domain'])) {
|
||||
$tDomain = escape_string ($_GET['domain']);
|
||||
}
|
||||
}
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] == "POST")
|
||||
{
|
||||
if (isset ($_POST['fAddress']) && isset ($_POST['fDomain'])) {
|
||||
$fAddress = escape_string($_POST['fAddress']) . "@" . escape_string ($_POST['fDomain']);
|
||||
$fAddress = strtolower ($fAddress);
|
||||
}
|
||||
|
||||
if (isset ($_POST['fGoto'])) {
|
||||
$fGoto = escape_string ($_POST['fGoto']);
|
||||
$fGoto = strtolower ($fGoto);
|
||||
}
|
||||
if(isset($_POST['fActive'])) {
|
||||
$fActive = escape_string ($_POST['fActive']);
|
||||
}
|
||||
else {
|
||||
$fActive = "1";
|
||||
}
|
||||
|
||||
if(isset($_POST['fDomain'])) {
|
||||
$fDomain = escape_string ($_POST['fDomain']);
|
||||
}
|
||||
|
||||
# TODO: Doesn't work with multiple aliases - fix or discard...
|
||||
# if(!preg_match ('/@/',$fGoto)) {
|
||||
# $fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']);
|
||||
# }
|
||||
|
||||
if(!(authentication_has_role('global-admin') ||
|
||||
check_owner ($SESSID_USERNAME, $fDomain) ))
|
||||
{
|
||||
$error = 1;
|
||||
$tAddress = escape_string ($_POST['fAddress']);
|
||||
$tGoto = $fGoto;
|
||||
$tDomain = $fDomain;
|
||||
$pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error1'];
|
||||
}
|
||||
|
||||
if(!check_alias($fDomain)) {
|
||||
$error = 1;
|
||||
$tAddress = escape_string ($_POST['fAddress']);
|
||||
$tGoto = $fGoto;
|
||||
$tDomain = $fDomain;
|
||||
$pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error3'];
|
||||
}
|
||||
|
||||
if(empty ($fAddress) || !check_email ($fAddress)) {
|
||||
$error = 1;
|
||||
$tAddress = escape_string ($_POST['fAddress']);
|
||||
$tGoto = $fGoto;
|
||||
$tDomain = $fDomain;
|
||||
$pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error1'];
|
||||
}
|
||||
|
||||
// Begin check alias email
|
||||
$goto = preg_replace ('/\\\r\\\n/', ',', $fGoto);
|
||||
$goto = preg_replace ('/\r\n/', ',', $goto);
|
||||
$goto = preg_replace ('/,[\s]+/i', ',', $goto);
|
||||
$goto = preg_replace ('/[\s]+,/i', ',', $goto);
|
||||
$goto = preg_replace ('/,*$|^,*/', '', $goto);
|
||||
$goto = preg_replace ('/,,*/', ',', $goto);
|
||||
|
||||
if (empty ($goto) && !authentication_has_role('global-admin')) {
|
||||
$error = 1;
|
||||
$tGoto = $_POST['fGoto'];
|
||||
flash_error($PALANG['pEdit_alias_goto_text_error1']);
|
||||
}
|
||||
|
||||
$new_aliases = array();
|
||||
if ($error != 1) {
|
||||
$new_aliases = explode(',', $goto);
|
||||
}
|
||||
$new_aliases = array_unique($new_aliases);
|
||||
|
||||
foreach($new_aliases as $address) {
|
||||
if (in_array($address, $CONF['default_aliases'])) continue;
|
||||
if (empty($address)) continue; # TODO: should never happen - remove after 2.2 release
|
||||
if (!check_email($address)) {
|
||||
$error = 1;
|
||||
$tGoto = $goto;
|
||||
flash_error($PALANG['pEdit_alias_goto_text_error2'] . "$address");
|
||||
}
|
||||
}
|
||||
|
||||
$goto = implode(',', $new_aliases);
|
||||
$fGoto = escape_string($goto);
|
||||
// End check alias mail
|
||||
|
||||
if (empty($fGoto)) {
|
||||
$error = 1;
|
||||
$tAddress = escape_string ($_POST['fAddress']);
|
||||
$tGoto = $fGoto;
|
||||
$tDomain = $fDomain;
|
||||
flash_error($PALANG['pCreate_alias_address_text_error1']);
|
||||
}
|
||||
|
||||
if (escape_string($_POST['fAddress']) == "*") {
|
||||
$fAddress = "@" . escape_string ($_POST['fDomain']);
|
||||
}
|
||||
|
||||
$result = db_query ("SELECT * FROM $table_alias WHERE address='$fAddress'");
|
||||
if ($result['rows'] == 1)
|
||||
{
|
||||
$error = 1;
|
||||
$tAddress = escape_string ($_POST['fAddress']);
|
||||
$tGoto = $fGoto;
|
||||
$tDomain = $fDomain;
|
||||
$pCreate_alias_address_text_error = $PALANG['pCreate_alias_address_text_error2'];
|
||||
}
|
||||
|
||||
if ($fActive == "on") {
|
||||
$sqlActive = db_get_boolean(True);
|
||||
}
|
||||
else {
|
||||
$sqlActive = db_get_boolean(False);
|
||||
}
|
||||
|
||||
if ($error != 1) {
|
||||
if (preg_match('/^\*@(.*)$/', $fGoto, $match)) {
|
||||
$fGoto = "@" . $match[1];
|
||||
}
|
||||
|
||||
$result = db_query ("INSERT INTO $table_alias (address,goto,domain,created,modified,active) VALUES ('$fAddress','$fGoto','$fDomain',NOW(),NOW(),'$sqlActive')");
|
||||
if ($result['rows'] != 1) {
|
||||
$tDomain = $fDomain;
|
||||
flash_error($PALANG['pCreate_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />\n");
|
||||
}
|
||||
else {
|
||||
db_log ($fDomain, 'create_alias', "$fAddress -> $fGoto");
|
||||
|
||||
$tDomain = $fDomain;
|
||||
flash_info($PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n");
|
||||
}
|
||||
} else { # on error
|
||||
$tAddress = htmlentities($_POST['fAddress']);
|
||||
$tGoto = htmlentities($_POST['fGoto']);
|
||||
$tDomain = htmlentities($_POST['fDomain']);
|
||||
}
|
||||
}
|
||||
|
||||
$smarty->assign ('mode', 'create');
|
||||
$smarty->assign ('tAddress', $tAddress);
|
||||
$smarty->assign ('select_options', select_options ($list_domains, array ($tDomain)), false);
|
||||
$smarty->assign ('pCreate_alias_address_text_error', $pCreate_alias_address_text_error, false);
|
||||
$smarty->assign ('tGoto', $tGoto, false);
|
||||
$smarty->assign ('smarty_template', 'edit-alias');
|
||||
$smarty->display ('index.tpl');
|
||||
|
||||
/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
|
||||
?>
|
||||
Loading…
Reference in New Issue