Thread: SF.net SVN: postfixadmin:[499] trunk/edit-domain.php
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn
|
From: <Gin...@us...> - 2008-12-12 20:55:36
|
Revision: 499
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=499&view=rev
Author: GingerDog
Date: 2008-12-12 20:55:32 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
edit-domain.php: fix bug where editing a domain nukes the transport field (we actually were not checking the config field properly to see whether transport control was turned on or not; this fixes https://sourceforge.net/tracker/index.php?func=detail&aid=2378038&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2008-12-12 19:43:46 UTC (rev 498)
+++ trunk/edit-domain.php 2008-12-12 20:55:32 UTC (rev 499)
@@ -39,69 +39,74 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- if (isset ($_GET['domain']))
- {
- $domain = escape_string ($_GET['domain']);
- $domain_properties = get_domain_properties ($domain);
+ if (isset ($_GET['domain']))
+ {
+ $domain = escape_string ($_GET['domain']);
+ $domain_properties = get_domain_properties ($domain);
- $tDescription = $domain_properties['description'];
- $tAliases = $domain_properties['aliases'];
- $tMailboxes = $domain_properties['mailboxes'];
- $tMaxquota = $domain_properties['maxquota'];
- $tTransport = $domain_properties['transport'];
- $tBackupmx = $domain_properties['backupmx'];
- $tActive = $domain_properties['active'];
- }
+ $tDescription = $domain_properties['description'];
+ $tAliases = $domain_properties['aliases'];
+ $tMailboxes = $domain_properties['mailboxes'];
+ $tMaxquota = $domain_properties['maxquota'];
+ $tTransport = $domain_properties['transport'];
+ $tBackupmx = $domain_properties['backupmx'];
+ $tActive = $domain_properties['active'];
+ }
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_GET['domain'])) $domain = escape_string ($_GET['domain']);
+ if (isset ($_GET['domain'])) $domain = escape_string ($_GET['domain']);
- if (isset ($_POST['fDescription'])) $fDescription = escape_string ($_POST['fDescription']);
- if (isset ($_POST['fAliases'])) $fAliases = intval($_POST['fAliases']);
- if (isset ($_POST['fMailboxes'])) $fMailboxes = intval($_POST['fMailboxes']);
- if (isset ($_POST['fMaxquota'])) {
- $fMaxquota = intval($_POST['fMaxquota']);
- } else {
- $fMaxquota = 0;
- }
- if (isset ($_POST['fTransport'])) $fTransport = escape_string ($_POST['fTransport']);
- if (isset ($_POST['fBackupmx'])) $fBackupmx = escape_string ($_POST['fBackupmx']);
- if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
+ if (isset ($_POST['fDescription'])) $fDescription = escape_string ($_POST['fDescription']);
+ if (isset ($_POST['fAliases'])) $fAliases = intval($_POST['fAliases']);
+ if (isset ($_POST['fMailboxes'])) $fMailboxes = intval($_POST['fMailboxes']);
+ if (isset ($_POST['fMaxquota'])) {
+ $fMaxquota = intval($_POST['fMaxquota']);
+ } else {
+ $fMaxquota = 0;
+ }
- if ($fBackupmx == "on")
- {
- $fAliases = -1;
- $fMailboxes = -1;
- $fMaxquota = -1;
- $fBackupmx = 1;
- $sqlBackupmx = db_get_boolean(True);
- }
- else
- {
- $fBackupmx = 0;
- $sqlBackupmx = db_get_boolean(False);
- }
+ $fTransport = $CONF['transport_default'];
+ if($CONF['transport'] != 'NO' && isset ($_POST['fTransport'])) {
+ $fTransport = escape_string ($_POST['fTransport']);
+ }
- if ($fActive == "on") {
- $sqlActive = db_get_boolean(True);
- }
- else {
- $sqlActive = db_get_boolean(False);
- }
+ if (isset ($_POST['fBackupmx'])) $fBackupmx = escape_string ($_POST['fBackupmx']);
+ if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
-
- $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
- if ($result['rows'] == 1)
- {
- header ("Location: list-domain.php");
- exit;
- }
- else
- {
- $tMessage = $PALANG['pAdminEdit_domain_result_error'];
- }
+ if ($fBackupmx == "on")
+ {
+ $fAliases = -1;
+ $fMailboxes = -1;
+ $fMaxquota = -1;
+ $fBackupmx = 1;
+ $sqlBackupmx = db_get_boolean(True);
+ }
+ else
+ {
+ $fBackupmx = 0;
+ $sqlBackupmx = db_get_boolean(False);
+ }
+
+ if ($fActive == "on") {
+ $sqlActive = db_get_boolean(True);
+ }
+ else {
+ $sqlActive = db_get_boolean(False);
+ }
+
+
+ $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
+ if ($result['rows'] == 1)
+ {
+ header ("Location: list-domain.php");
+ exit;
+ }
+ else
+ {
+ $tMessage = $PALANG['pAdminEdit_domain_result_error'];
+ }
}
include ("templates/header.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-15 21:27:36
|
Revision: 501
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=501&view=rev
Author: GingerDog
Date: 2008-12-15 21:27:31 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
edit-domain.php: only allow valid transport definitions through
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2008-12-13 07:30:36 UTC (rev 500)
+++ trunk/edit-domain.php 2008-12-15 21:27:31 UTC (rev 501)
@@ -69,7 +69,10 @@
$fTransport = $CONF['transport_default'];
if($CONF['transport'] != 'NO' && isset ($_POST['fTransport'])) {
- $fTransport = escape_string ($_POST['fTransport']);
+ $fTransport = escape_string($_POST['fTransport']);
+ if(!in_array($fTransport, $CONF['transport_options'])) {
+ die("Invalid transport option given; check config.inc.php");
+ }
}
if (isset ($_POST['fBackupmx'])) $fBackupmx = escape_string ($_POST['fBackupmx']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-12-23 00:03:13
|
Revision: 504
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=504&view=rev
Author: christian_boltz
Date: 2008-12-23 00:03:08 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
edit-domain.php:
- only change transport if $CONF['transport'] is YES. Otherwise leave it
untouched (instead of changing it to $CONF['transport_default'])
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2008-12-15 21:29:08 UTC (rev 503)
+++ trunk/edit-domain.php 2008-12-23 00:03:08 UTC (rev 504)
@@ -99,8 +99,12 @@
$sqlActive = db_get_boolean(False);
}
+ $sqltransport = "";
+ if($CONF['transport'] != 'NO') { # only change transport if it is allowed in config. Otherwise, keep the old value.
+ $sqltransport = "transport='$fTransport',";
+ }
- $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
+ $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,$sqltransport backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
if ($result['rows'] == 1)
{
header ("Location: list-domain.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2011-05-31 21:47:08
|
Revision: 1064
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=1064&view=rev
Author: christian_boltz
Date: 2011-05-31 21:47:02 +0000 (Tue, 31 May 2011)
Log Message:
-----------
edit-domain.php:
- changed UPDATE query to db_update()
This should also fix
https://sourceforge.net/tracker/?func=detail&aid=3306933&group_id=191583&atid=937964
- replaced various isset($_POST[...]) with safepost() calls
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2011-05-25 22:07:40 UTC (rev 1063)
+++ trunk/edit-domain.php 2011-05-31 21:47:02 UTC (rev 1064)
@@ -59,19 +59,12 @@
{
if (isset ($_GET['domain'])) $domain = escape_string ($_GET['domain']);
- if (isset ($_POST['fDescription'])) $fDescription = escape_string ($_POST['fDescription']);
- if (isset ($_POST['fAliases'])) $fAliases = intval($_POST['fAliases']);
- if (isset ($_POST['fMailboxes'])) $fMailboxes = intval($_POST['fMailboxes']);
- if (isset ($_POST['fMaxquota'])) {
- $fMaxquota = intval($_POST['fMaxquota']);
- } else {
- $fMaxquota = 0;
- }
- if (isset ($_POST['fDomainquota'])) {
- $fDomainquota = intval($_POST['fDomainquota']);
- } else {
- $fDomainquota = $CONF['domain_quota_default'];
- }
+ $fDescription = safepost('fDescription');
+ $fAliases = (int) safepost('fAliases');
+ $fMailboxes = (int) safepost('fMailboxes');
+ $fMaxquota = (int) safepost('fMaxquota', 0);
+ $fDomainquota = (int) safepost('fDomainquota', $CONF['domain_quota_default']);
+ # TODO: check for / error out on values < -1
$fTransport = $CONF['transport_default'];
if($CONF['transport'] != 'NO' && isset ($_POST['fTransport'])) {
@@ -102,19 +95,26 @@
$sqlActive = db_get_boolean(False);
}
- $sqltransport = "";
+ $db_values = array(
+ 'description'=> $fDescription,
+ 'aliases' => $fAliases,
+ 'mailboxes' => $fMailboxes,
+ 'maxquota' => $fMaxquota,
+ 'quota' => $fDomainquota,
+ 'backupmx' => $sqlBackupmx,
+ 'active' => $sqlActive,
+ );
+
if($CONF['transport'] != 'NO') { # only change transport if it is allowed in config. Otherwise, keep the old value.
- $sqltransport = "transport='$fTransport',";
+ $db_values['transport'] =$fTransport;
}
- $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,quota=$fDomainquota,$sqltransport backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
- if ($result['rows'] == 1)
- {
+ $result = db_update('domain', 'domain', $domain, $db_values);
+
+ if ($result == 1) {
header ("Location: list-domain.php");
exit;
- }
- else
- {
+ } else {
$tMessage = $PALANG['pAdminEdit_domain_result_error'];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X