mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
- merge create-alias.php and admin/create-alias.php
- merge identical parts of GET and POST code git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@39 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
ae315a3312
commit
9c5c053fab
@ -22,119 +22,8 @@
|
|||||||
// fGoto
|
// fGoto
|
||||||
// fDomain
|
// fDomain
|
||||||
//
|
//
|
||||||
require ("../variables.inc.php");
|
|
||||||
require ("../config.inc.php");
|
|
||||||
require ("../functions.inc.php");
|
|
||||||
include ("../languages/" . check_language () . ".lang");
|
|
||||||
|
|
||||||
$SESSID_USERNAME = check_session ();
|
$incpath = '..';
|
||||||
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
|
require ("../create-alias.php");
|
||||||
|
|
||||||
$list_domains = list_domains ();
|
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == "GET")
|
|
||||||
{
|
|
||||||
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
|
|
||||||
|
|
||||||
if (isset ($_GET['domain'])) $tDomain = escape_string ($_GET['domain']);
|
|
||||||
|
|
||||||
include ("../templates/header.tpl");
|
|
||||||
include ("../templates/admin_menu.tpl");
|
|
||||||
include ("../templates/create-alias.tpl");
|
|
||||||
include ("../templates/footer.tpl");
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == "POST")
|
|
||||||
{
|
|
||||||
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
|
|
||||||
|
|
||||||
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);
|
|
||||||
isset ($_POST['fActive']) ? $fActive = escape_string ($_POST['fActive']) : $fActive = "1";
|
|
||||||
if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
|
|
||||||
|
|
||||||
if (!preg_match ('/@/',$fGoto))
|
|
||||||
{
|
|
||||||
$fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!check_alias ($fDomain))
|
|
||||||
{
|
|
||||||
$error = 1;
|
|
||||||
$tAddress = escape_string ($_POST['fAddress']);
|
|
||||||
$tGoto = $fGoto;
|
|
||||||
$tDomain = $fDomain;
|
|
||||||
$pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error3'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (empty ($fAddress) or !check_email ($fAddress))
|
|
||||||
{
|
|
||||||
$error = 1;
|
|
||||||
$tAddress = escape_string ($_POST['fAddress']);
|
|
||||||
$tGoto = $fGoto;
|
|
||||||
$tDomain = $fDomain;
|
|
||||||
$pCreate_alias_address_text = $PALANG['pCreate_alias_address_text_error1'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (empty ($fGoto) or !check_email ($fGoto))
|
|
||||||
{
|
|
||||||
$error = 1;
|
|
||||||
$tAddress = escape_string ($_POST['fAddress']);
|
|
||||||
$tGoto = $fGoto;
|
|
||||||
$tDomain = $fDomain;
|
|
||||||
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text_error'];
|
|
||||||
}
|
|
||||||
|
|
||||||
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 = $PALANG['pCreate_alias_address_text_error2'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($fActive == "on")
|
|
||||||
{
|
|
||||||
$fActive = 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$fActive = 0;
|
|
||||||
}
|
|
||||||
$sqlActive=$fActive;
|
|
||||||
if ('pgsql'==$CONF['database_type'])
|
|
||||||
{
|
|
||||||
$sqlActive=($fActive) ? 'true' : '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;
|
|
||||||
$tMessage = $PALANG['pCreate_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
db_log ($CONF['admin_email'], $fDomain, "create alias", "$fAddress -> $fGoto");
|
|
||||||
|
|
||||||
$tDomain = $fDomain;
|
|
||||||
$tMessage = $PALANG['pCreate_alias_result_succes'] . "<br />($fAddress -> $fGoto)</br />";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
include ("../templates/header.tpl");
|
|
||||||
include ("../templates/admin_menu.tpl");
|
|
||||||
include ("../templates/create-alias.tpl");
|
|
||||||
include ("../templates/footer.tpl");
|
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
|
@ -22,10 +22,13 @@
|
|||||||
// fGoto
|
// fGoto
|
||||||
// fDomain
|
// fDomain
|
||||||
//
|
//
|
||||||
require ("./variables.inc.php");
|
|
||||||
require ("./config.inc.php");
|
if (!isset($incpath)) $incpath = '.';
|
||||||
require ("./functions.inc.php");
|
|
||||||
include ("./languages/" . check_language () . ".lang");
|
require ("$incpath/variables.inc.php");
|
||||||
|
require ("$incpath/config.inc.php");
|
||||||
|
require ("$incpath/functions.inc.php");
|
||||||
|
include ("$incpath/languages/" . check_language () . ".lang");
|
||||||
|
|
||||||
$SESSID_USERNAME = check_session ();
|
$SESSID_USERNAME = check_session ();
|
||||||
if (!check_admin($SESSID_USERNAME))
|
if (!check_admin($SESSID_USERNAME))
|
||||||
@ -37,21 +40,17 @@ else
|
|||||||
$list_domains = list_domains ();
|
$list_domains = list_domains ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == "GET")
|
if ($_SERVER['REQUEST_METHOD'] == "GET")
|
||||||
{
|
{
|
||||||
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
|
|
||||||
|
|
||||||
if (isset ($_GET['domain'])) $tDomain = escape_string ($_GET['domain']);
|
if (isset ($_GET['domain'])) $tDomain = escape_string ($_GET['domain']);
|
||||||
|
|
||||||
include ("./templates/header.tpl");
|
|
||||||
include ("./templates/menu.tpl");
|
|
||||||
include ("./templates/create-alias.tpl");
|
|
||||||
include ("./templates/footer.tpl");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($_SERVER['REQUEST_METHOD'] == "POST")
|
if ($_SERVER['REQUEST_METHOD'] == "POST")
|
||||||
{
|
{
|
||||||
$pCreate_alias_goto_text = $PALANG['pCreate_alias_goto_text'];
|
|
||||||
|
|
||||||
if (isset ($_POST['fAddress']) && isset ($_POST['fDomain'])) $fAddress = escape_string ($_POST['fAddress']) . "@" . escape_string ($_POST['fDomain']);
|
if (isset ($_POST['fAddress']) && isset ($_POST['fDomain'])) $fAddress = escape_string ($_POST['fAddress']) . "@" . escape_string ($_POST['fDomain']);
|
||||||
$fAddress = strtolower ($fAddress);
|
$fAddress = strtolower ($fAddress);
|
||||||
@ -65,7 +64,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
|
|||||||
$fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']);
|
$fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!check_owner ($SESSID_USERNAME, $fDomain))
|
if (! (check_admin($SESSID_USERNAME) || check_owner ($SESSID_USERNAME, $fDomain) ))
|
||||||
{
|
{
|
||||||
$error = 1;
|
$error = 1;
|
||||||
$tAddress = escape_string ($_POST['fAddress']);
|
$tAddress = escape_string ($_POST['fAddress']);
|
||||||
@ -146,9 +145,16 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
include ("./templates/header.tpl");
|
|
||||||
include ("./templates/menu.tpl");
|
|
||||||
include ("./templates/create-alias.tpl");
|
|
||||||
include ("./templates/footer.tpl");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include ("$incpath/templates/header.tpl");
|
||||||
|
|
||||||
|
if (check_admin($SESSID_USERNAME)) {
|
||||||
|
include ("$incpath/templates/admin_menu.tpl");
|
||||||
|
} else {
|
||||||
|
include ("$incpath/templates/menu.tpl");
|
||||||
|
}
|
||||||
|
|
||||||
|
include ("$incpath/templates/create-alias.tpl");
|
||||||
|
include ("$incpath/templates/footer.tpl");
|
||||||
?>
|
?>
|
||||||
|
Loading…
Reference in New Issue
Block a user