banananetwork
/
postfixadmin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- merge admin/edit-mailbox.php and edit-mailbox.php

Browse Source 
- merge identical parts of GET and POST code
- fix uninitalized variable (was only visible in case of validation errors)


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@42 a1433add-5e2c-0410-b055-b7f2511e0802
postfixadmin-2.3
Christian Boltz 18 years ago
parent a4410bfcaa
commit 0281911724
2 changed files with 40 additions and 160 deletions
Show Stats Download Patch File Download Diff File

133
admin/edit-mailbox.php
Unescape Escape View File

@ -25,138 +25,9 @@
// fQuota
// fActive
//
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session ();
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
$incpath = "..";
require("../edit-mailbox.php");
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
$result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fUsername' AND domain='$fDomain'");
if ($result['rows'] == 1)
{
$row = db_array ($result['result']);
$tName = $row['name'];
$tQuota = divide_quota ($row['quota']);
$tActive = $row['active'];
if ('pgsql'==$CONF['database_type'])
{
$tActive = ('t'==$row['active']) ? TRUE:FALSE;
}
$result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
if ($result['rows'] == 1)
{
$row = db_array ($result['result']);
$tMaxquota = $row['maxquota'];
}
}
else
{
$tMessage = $PALANG['pEdit_mailbox_login_error'];
}
$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/edit-mailbox.tpl");
include ("../templates/footer.tpl");
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
$fUsername = strtolower ($fUsername);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
if (isset ($_POST['fName'])) $fName = escape_string ($_POST['fName']);
if (isset ($_POST['fQuota'])) $fQuota = intval($_POST['fQuota']);
if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
if ($fPassword != $fPassword2)
{
$error = 1;
$tName = $fName;
$tQuota = $fQuota;
$tActive = $fActive;
$pEdit_mailbox_password_text = $PALANG['pEdit_mailbox_password_text_error'];
}
if ($CONF['quota'] == "YES")
{
if (!check_quota ($fQuota, $fDomain))
{
$error = 1;
$tName = $fName;
$tQuota = $fQuota;
$tActive = $fActive;
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text_error'];
}
}
if ($error != 1)
{
if (!empty ($fQuota))
{
$quota = multiply_quota ($fQuota);
}
else
{
$quota = 0;
}
if ($fActive == "on")
{
$fActive = 1;
}
else
{
$fActive = 0;
}
$sqlActive=$fActive;
if ('pgsql'==$CONF['database_type'])
{
$sqlActive = ($fActive) ? 'true' : 'false';
}
if (empty ($fPassword) and empty ($fPassword2))
{
$result = db_query ("UPDATE $table_mailbox SET name='$fName',quota=$quota,modified=NOW(),active='$sqlActive' WHERE username='$fUsername' AND domain='$fDomain'");
if ($result['rows'] == 1) $result = db_query ("UPDATE $table_alias SET modified=NOW(),active='$sqlActive' WHERE address='$fUsername' AND domain='$fDomain'");
}
else
{
$password = pacrypt ($fPassword);
$result = db_query ("UPDATE $table_mailbox SET password='$password',name='$fName',quota=$quota,modified=NOW(),active='$sqlActive' WHERE username='$fUsername' AND domain='$fDomain'");
if ($result['rows'] == 1) $result = db_query ("UPDATE $table_alias SET modified=NOW(),active='$sqlActive' WHERE address='$fUsername' AND domain='$fDomain'");
}
if ($result['rows'] != 1)
{
$tMessage = $PALANG['pEdit_mailbox_result_error'];
}
else
{
db_log ($CONF['admin_email'], $fDomain, "edit mailbox", $fUsername);
header ("Location: list-virtual.php?domain=$fDomain");
exit;
}
}
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/edit-mailbox.tpl");
include ("../templates/footer.tpl");
}
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>

67
edit-mailbox.php
Unescape Escape View File

@ -25,19 +25,26 @@
// fQuota
// fActive
//
require ("./variables.inc.php");
require ("./config.inc.php");
require ("./functions.inc.php");
include ("./languages/" . check_language () . ".lang");
if (!isset($incpath)) $incpath = '.';
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 ();
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
$fUsername = strtolower ($fUsername);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
if (check_owner ($SESSID_USERNAME, $fDomain))
if (check_owner ($SESSID_USERNAME, $fDomain) || check_admin($SESSID_USERNAME))
{
$result = db_query ("SELECT * FROM $table_mailbox WHERE username='$fUsername' AND domain='$fDomain'");
if ($result['rows'] == 1)
@ -46,7 +53,9 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
$tName = $row['name'];
$tQuota = divide_quota($row['quota']);
$tActive = $row['active'];
if ('pgsql'==$CONF['database_type']) $tActive = ('t'==$row['active']) ? 1 : 0;
if ('pgsql'==$CONF['database_type']) {
$tActive = ('t'==$row['active']) ? 1 : 0;
}
}
$result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
@ -60,29 +69,17 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
{
$tMessage = $PALANG['pEdit_mailbox_login_error'];
}
$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
include ("./templates/header.tpl");
include ("./templates/menu.tpl");
include ("./templates/edit-mailbox.tpl");
include ("./templates/footer.tpl");
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
$fUsername = strtolower ($fUsername);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
if (isset ($_POST['fName'])) $fName = escape_string ($_POST['fName']);
if (isset ($_POST['fQuota'])) $fQuota = escape_string ($_POST['fQuota']);
if (isset ($_POST['fQuota'])) $fQuota = intval ($_POST['fQuota']);
if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
if (!check_owner ($SESSID_USERNAME, $fDomain))
if (! (check_owner ($SESSID_USERNAME, $fDomain) || check_admin($SESSID_USERNAME)) )
{
$error = 1;
$tName = $fName;
@ -132,7 +129,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
$fActive = 0;
}
$sqlActive=$fActive;
if ('pgsql'==$CONF['database_type']) $sqlActive=($fActive) ? 'true':'false';
if ('pgsql'==$CONF['database_type']) {
$sqlActive=($fActive) ? 'true':'false';
}
if (empty ($fPassword) and empty ($fPassword2))
{
@ -154,15 +153,25 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
{
db_log ($SESSID_USERNAME, $fDomain, "edit mailbox", $fUsername);
header ("Location: overview.php?domain=$fDomain");
if (check_admin($SESSID_USERNAME)) {
header ("Location: list-virtual.php?domain=$fDomain");
} else {
header ("Location: overview.php?domain=$fDomain");
}
exit;
}
}
}
include ("$incpath/templates/header.tpl");
include ("./templates/header.tpl");
include ("./templates/menu.tpl");
include ("./templates/edit-mailbox.tpl");
include ("./templates/footer.tpl");
if (check_admin($SESSID_USERNAME)) {
include ("$incpath/templates/admin_menu.tpl");
} else {
include ("$incpath/templates/menu.tpl");
}
include ("$incpath/templates/edit-mailbox.tpl");
include ("$incpath/templates/footer.tpl");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>

Write Preview
Loading…
Cancel
Save