postfixadmin-svn Mailing List for PostfixAdmin (Page 115)
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
(63) |
Nov
(79) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(15) |
Feb
(8) |
Mar
(8) |
Apr
(44) |
May
(18) |
Jun
(20) |
Jul
(35) |
Aug
(21) |
Sep
(8) |
Oct
(9) |
Nov
(21) |
Dec
(14) |
| 2009 |
Jan
(53) |
Feb
(13) |
Mar
(36) |
Apr
(40) |
May
(22) |
Jun
(10) |
Jul
(18) |
Aug
(18) |
Sep
(7) |
Oct
(26) |
Nov
(32) |
Dec
(13) |
| 2010 |
Jan
(6) |
Feb
(7) |
Mar
(12) |
Apr
(2) |
May
(12) |
Jun
(8) |
Jul
(9) |
Aug
(12) |
Sep
(12) |
Oct
(7) |
Nov
(9) |
Dec
(42) |
| 2011 |
Jan
(10) |
Feb
(35) |
Mar
(43) |
Apr
(39) |
May
(8) |
Jun
(8) |
Jul
(83) |
Aug
(20) |
Sep
(20) |
Oct
(63) |
Nov
(33) |
Dec
(20) |
| 2012 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
(37) |
May
(16) |
Jun
(7) |
Jul
(3) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(4) |
| 2013 |
Jan
(6) |
Feb
(16) |
Mar
(9) |
Apr
(11) |
May
(9) |
Jun
(30) |
Jul
(17) |
Aug
(6) |
Sep
(2) |
Oct
(30) |
Nov
(41) |
Dec
(26) |
| 2014 |
Jan
(16) |
Feb
(20) |
Mar
(5) |
Apr
(4) |
May
(14) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(18) |
Nov
(26) |
Dec
|
| 2015 |
Jan
(4) |
Feb
(9) |
Mar
(12) |
Apr
(26) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(15) |
Oct
(13) |
Nov
|
Dec
(1) |
| 2016 |
Jan
(1) |
Feb
(5) |
Mar
(4) |
Apr
(3) |
May
(19) |
Jun
|
Jul
|
Aug
(3) |
Sep
(16) |
Oct
(4) |
Nov
(5) |
Dec
(5) |
| 2017 |
Jan
(1) |
Feb
(8) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(16) |
Jul
(13) |
Aug
(16) |
Sep
(6) |
Oct
(4) |
Nov
(10) |
Dec
(7) |
| 2018 |
Jan
(16) |
Feb
(17) |
Mar
(11) |
Apr
(13) |
May
(20) |
Jun
(3) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(1) |
Nov
(6) |
Dec
(18) |
| 2019 |
Jan
(18) |
Feb
(31) |
Mar
(4) |
Apr
(4) |
May
(1) |
Jun
(8) |
Jul
(7) |
Aug
(10) |
Sep
(23) |
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2020 |
Jan
(10) |
Feb
(18) |
Mar
(34) |
Apr
(19) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(10) |
Sep
(16) |
Oct
(6) |
Nov
(3) |
Dec
(11) |
| 2021 |
Jan
(118) |
Feb
(22) |
Mar
(13) |
Apr
(12) |
May
(48) |
Jun
(21) |
Jul
(17) |
Aug
(12) |
Sep
(19) |
Oct
(25) |
Nov
(16) |
Dec
(7) |
| 2022 |
Jan
(6) |
Feb
(7) |
Mar
(14) |
Apr
(4) |
May
|
Jun
(16) |
Jul
(18) |
Aug
(5) |
Sep
(12) |
Oct
(8) |
Nov
(10) |
Dec
(13) |
| 2023 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(6) |
Jul
(3) |
Aug
(3) |
Sep
(3) |
Oct
(2) |
Nov
(7) |
Dec
(13) |
| 2024 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(10) |
May
(8) |
Jun
(6) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(4) |
Nov
(15) |
Dec
(10) |
| 2025 |
Jan
(3) |
Feb
(12) |
Mar
(3) |
Apr
(7) |
May
(18) |
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <Gin...@us...> - 2007-10-02 13:41:19
|
Revision: 118
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=118&view=rev
Author: GingerDog
Date: 2007-10-02 06:41:23 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
reformatting; should be ignorable
Modified Paths:
--------------
trunk/admin/list-admin.php
trunk/admin/list-domain.php
Modified: trunk/admin/list-admin.php
===================================================================
--- trunk/admin/list-admin.php 2007-10-02 13:37:42 UTC (rev 117)
+++ trunk/admin/list-admin.php 2007-10-02 13:41:23 UTC (rev 118)
@@ -25,11 +25,9 @@
authentication_require_role('global-admin');
-$list_admins = list_admins ();
-if ((is_array ($list_admins) and sizeof ($list_admins) > 0))
-{
- for ($i = 0; $i < sizeof ($list_admins); $i++)
- {
+$list_admins = list_admins();
+if ((is_array ($list_admins) and sizeof ($list_admins) > 0)) {
+ for ($i = 0; $i < sizeof ($list_admins); $i++) {
$admin_properties[$i] = get_admin_properties ($list_admins[$i]);
}
}
Modified: trunk/admin/list-domain.php
===================================================================
--- trunk/admin/list-domain.php 2007-10-02 13:37:42 UTC (rev 117)
+++ trunk/admin/list-domain.php 2007-10-02 13:41:23 UTC (rev 118)
@@ -31,12 +31,9 @@
$list_admins = list_admins ();
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
- if (isset ($_GET['username']))
- {
+if ($_SERVER['REQUEST_METHOD'] == "GET") {
+ if (isset ($_GET['username'])) {
$fUsername = escape_string ($_GET['username']);
-
$list_domains = list_domains_for_admin ($fUsername);
if ($list_domains != 0)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 13:37:39
|
Revision: 117
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=117&view=rev
Author: GingerDog
Date: 2007-10-02 06:37:42 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
edit-mailbox.php; try and make it work properly
Modified Paths:
--------------
trunk/edit-mailbox.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2007-10-02 12:49:56 UTC (rev 116)
+++ trunk/edit-mailbox.php 2007-10-02 13:37:42 UTC (rev 117)
@@ -38,6 +38,10 @@
authentication_require_role('admin');
$SESSID_USERNAME = authentication_get_username();
+$fUsername = 'x';
+$fDomain = 'y';
+$error = 0;
+
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
$fUsername = strtolower ($fUsername);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
@@ -45,33 +49,40 @@
$pEdit_mailbox_name_text = $PALANG['pEdit_mailbox_name_text'];
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text'];
+$result = db_query("SELECT * FROM $table_mailbox WHERE username = '$fUsername' AND domain = '$fDomain'");
+if($result['rows'] != 1) {
+ die("Invalid username chosen; user does not exist in mailbox table");
+}
+
+if (!(check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
+{
+ $error = 1;
+ $tName = $fName;
+ $tQuota = $fQuota;
+ $tActive = $fActive;
+ $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "$fDomain</font>"; // XXX ergh; why is a closing font tag here?
+}
+
+$user_details = db_array($result['result']);
+
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- if (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin'))
+ if (check_owner($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin'))
{
- $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']) ? 1 : 0;
- }
+ $tName = $user_details['name'];
+ $tQuota = divide_quota($user_details['quota']);
+ $tActive = $user_details['active'];
+ if ('pgsql'==$CONF['database_type']) {
+ $tActive = ('t'==$user_details['active']) ? 1 : 0;
}
$result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
if ($result['rows'] == 1)
{
- $row = db_array ($result['result']);
- $tMaxquota = $row['maxquota'];
+ $row = db_array ($result['result']);
+ $tMaxquota = $row['maxquota'];
}
}
- else
- {
- $tMessage = $PALANG['pEdit_mailbox_login_error'];
- }
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
@@ -82,22 +93,15 @@
if (isset ($_POST['fQuota'])) $fQuota = intval ($_POST['fQuota']);
if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
- if (! (check_owner ($SESSID_USERNAME, $fDomain) || authentication_has_role('global-admin')) )
- {
- $error = 1;
- $tName = $fName;
- $tQuota = $fQuota;
- $tActive = $fActive;
- $tMessage = $PALANG['pEdit_mailbox_domain_error'] . "$fDomain</font>";
- }
- if ($fPassword != $fPassword2)
- {
- $error = 1;
- $tName = $fName;
- $tQuota = $fQuota;
- $tActive = $fActive;
- $pEdit_mailbox_password_text = $PALANG['pEdit_mailbox_password_text_error'];
+ if($fPassword != $user_details['password']){
+ if($fPassword == $fPassword2) {
+ $fPassword = pacrypt($fPassword);
+ }
+ else {
+ flash_error($PALANG['pEdit_mailbox_password_text_error']);
+ $error = 1;
+ }
}
if ($CONF['quota'] == "YES")
@@ -111,7 +115,6 @@
$pEdit_mailbox_quota_text = $PALANG['pEdit_mailbox_quota_text_error'];
}
}
-
if ($error != 1)
{
if (!empty ($fQuota))
@@ -125,35 +128,20 @@
if ($fActive == "on")
{
+ $sqlActive = db_get_boolean(True);
$fActive = 1;
}
else
{
+ $sqlActive = db_get_boolean(False);
$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)
- {
+ $result = db_query ("UPDATE $table_mailbox SET name='$fName',password='$fPassword',quota=$quota,modified=NOW(),active=$sqlActive WHERE username='$fUsername' AND domain='$fDomain'");
+ if ($result['rows'] != 1) {
$tMessage = $PALANG['pEdit_mailbox_result_error'];
}
- else
- {
+ else {
db_log ($SESSID_USERNAME, $fDomain, 'edit_mailbox', $fUsername);
if (authentication_has_role('global-admin')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:49:54
|
Revision: 116
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=116&view=rev
Author: GingerDog
Date: 2007-10-02 05:49:56 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
templates/edit-vacation.tpl: explicit action url
Modified Paths:
--------------
trunk/templates/edit-vacation.tpl
Modified: trunk/templates/edit-vacation.tpl
===================================================================
--- trunk/templates/edit-vacation.tpl 2007-10-02 12:49:00 UTC (rev 115)
+++ trunk/templates/edit-vacation.tpl 2007-10-02 12:49:56 UTC (rev 116)
@@ -7,7 +7,7 @@
</script>
<div id="edit_form">
-<form name="edit-vacation" method="post">
+<form name="edit-vacation" method="post" action=''>
<table>
<tr>
<td colspan="3"><h3><?php print $PALANG['pUsersVacation_welcome']; ?></h3></td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:49:00
|
Revision: 115
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=115&view=rev
Author: GingerDog
Date: 2007-10-02 05:49:00 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
edit-vacation.php: fix handling of empty goto field; fix handling of vacation editing if done by "someone else"
Modified Paths:
--------------
trunk/edit-vacation.php
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2007-10-02 12:48:21 UTC (rev 114)
+++ trunk/edit-vacation.php 2007-10-02 12:49:00 UTC (rev 115)
@@ -37,23 +37,29 @@
require_once('common.php');
-$SESSID_USERNAME = authentication_get_username();
-
if($CONF['vacation'] == 'NO') {
header("Location: " . $CONF['postfix_admin_url'] . "/main.php");
exit(0);
}
-$vacation_domain = $CONF['vacation_domain'];
-$vacation_goto = preg_replace('/@/', '#', $SESSID_USERNAME);
-$vacation_goto = $vacation_goto . '@' . $vacation_domain;
-
+$SESSID_USERNAME = authentication_get_username();
$tmp = preg_split ('/@/', $SESSID_USERNAME);
$USERID_DOMAIN = $tmp[1];
-if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
-if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
+// only allow admins to change someone else's 'stuff'
+if(authentication_has_role('admin')) {
+ if (isset($_GET['username'])) $fUsername = escape_string ($_GET['username']);
+ if (isset($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
+}
+else {
+ $fUsername = $SESSID_USERNAME;
+ $fDomain = $USERID_DOMAIN;
+}
+$vacation_domain = $CONF['vacation_domain'];
+$vacation_goto = preg_replace('/@/', '#', $fUsername);
+$vacation_goto = $vacation_goto . '@' . $vacation_domain;
+
$fCanceltarget = $CONF['postfix_admin_url'] . '/main.php';
if ($_SERVER['REQUEST_METHOD'] == "GET")
@@ -69,6 +75,7 @@
}
$tUseremail = $fUsername;
+ $tDomain = $fDomain;
if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
@@ -82,14 +89,14 @@
if (isset ($_POST['fChange'])) $fChange = escape_string ($_POST['fChange']);
if (isset ($_POST['fBack'])) $fBack = escape_string ($_POST['fBack']);
- if (isset ($_GET['domain'])) {
+ if(authentication_has_role('admin') && isset($_GET['domain'])) {
$fDomain = escape_string ($_GET['domain']);
}
else {
$fDomain = $USERID_DOMAIN;
}
- if (isset ($_GET['username'])) {
- $fUsername = escape_string ($_GET['username']);
+ if(authentication_has_role('admin') && isset ($_GET['username'])) {
+ $fUsername = escape_string($_GET['username']);
}
else {
$fUsername = authentication_get_username();
@@ -117,12 +124,17 @@
{
$row = db_array ($result['result']);
$goto = $row['goto'];
-
//only one of these will do something, first handles address at beginning and middle, second at end
$goto= preg_replace ( "/$vacation_goto,/", '', $goto);
$goto= preg_replace ( "/,$vacation_goto/", '', $goto);
-
- $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fUsername'");
+ $goto= preg_replace ( "/$vacation_goto/", '', $goto);
+ if($goto == '') {
+ $sql = "DELETE FROM $table_alias WHERE address = '$fUsername'";
+ }
+ else {
+ $sql = "UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fUsername'";
+ }
+ $result = db_query($sql);
if ($result['rows'] != 1)
{
$error = 1;
@@ -142,18 +154,22 @@
$row = db_array ($result['result']);
$goto = $row['goto'];
}
-
- ($CONF['database_type']=='pgsql') ? $Active='true' : $Active=1;
+ $Active = db_get_boolean(True);
$result = db_query ("INSERT INTO $table_vacation (email,subject,body,domain,created,active) VALUES ('$fUsername','$fSubject','$fBody','$fDomain',NOW(),$Active)");
if ($result['rows'] != 1)
{
$error = 1;
}
-
- $goto = $goto . "," . $vacation_goto;
-
- $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fUsername'");
+ if($goto == '') {
+ $goto = $vacation_goto;
+ $sql = "INSERT INTO $table_alias (goto, address, domain, modified) VALUES ('$goto', '$fUsername', '$fDomain', NOW())";
+ }
+ else {
+ $goto = $goto . "," . $vacation_goto;
+ $sql = "UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$fUsername'";
+ }
+ $result = db_query ($sql);
if ($result['rows'] != 1)
{
$error = 1;
@@ -173,7 +189,6 @@
$tMessage = $PALANG['pVacation_result_error'];
}
-$tUseremail = $SESSID_USERNAME;
include ("$incpath/templates/header.tpl");
if (authentication_has_role('global-admin')) {
include ("$incpath/templates/admin_menu.tpl");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:48:27
|
Revision: 114
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=114&view=rev
Author: GingerDog
Date: 2007-10-02 05:48:21 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
functions.inc.php: reduce global usage
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-10-02 12:22:38 UTC (rev 113)
+++ trunk/functions.inc.php 2007-10-02 12:48:21 UTC (rev 114)
@@ -1064,12 +1064,10 @@
// Action: Creates MD5 encrypted password
// Call: md5crypt (string cleartextpassword)
//
-$MAGIC = "$1$";
-$ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
function md5crypt ($pw, $salt="", $magic="")
{
- global $MAGIC;
+ $MAGIC = "$1$";
if ($magic == "") $magic = $MAGIC;
if ($salt == "") $salt = create_salt ();
@@ -1155,7 +1153,7 @@
function to64 ($v, $n)
{
- global $ITOA64;
+ $ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
$ret = "";
while (($n - 1) >= 0)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:22:38
|
Revision: 113
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=113&view=rev
Author: GingerDog
Date: 2007-10-02 05:22:38 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
fix broken MySQL Schema (thanks to cytdevel - http://sourceforge.net/forum/forum.php?thread_id=1836415&forum_id=676076)
Modified Paths:
--------------
trunk/DATABASE_MYSQL.TXT
Modified: trunk/DATABASE_MYSQL.TXT
===================================================================
--- trunk/DATABASE_MYSQL.TXT 2007-10-02 12:06:10 UTC (rev 112)
+++ trunk/DATABASE_MYSQL.TXT 2007-10-02 12:22:38 UTC (rev 113)
@@ -1,8 +1,6 @@
#
# Postfix Admin
-# by Mischa Peters <mischa at high5 dot net>
-# Copyright (c) 2002 - 2005 High5!
-# Licensed under GPL for more info check GPL-LICENSE.TXT
+# Licensed under GPL for more info check LICENSE.TXT
#
# This is the complete MySQL database structure for Postfix Admin.
@@ -25,19 +23,21 @@
#
# Postfix / MySQL
#
+
USE mysql;
+CREATE DATABASE IF NOT EXISTS postfix;
# Postfix user & password
-INSERT INTO user (Host, User, Password) VALUES ('localhost','postfix',password('postfix'));
-INSERT INTO db (Host, Db, User, Select_priv) VALUES ('localhost','postfix','postfix','Y');
+#INSERT INTO user (Host, User, Password) VALUES ('localhost','postfix',password('postfix'));
# Postfix Admin user & password
-INSERT INTO user (Host, User, Password) VALUES ('localhost','postfixadmin',password('postfixadmin'));
-INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv) VALUES ('localhost', 'postfix', 'postfixadmin', 'Y', 'Y', 'Y', 'Y');
+#INSERT INTO user (Host, User, Password) VALUES ('localhost','postfixadmin',password('postfixadmin'));
+# Priviledges
+#INSERT INTO db (Host, Db, User, Select_priv) VALUES ('localhost','postfix','postfix','Y');
+#INSERT INTO db (Host, Db, User, Select_priv, Insert_priv, Update_priv, Delete_priv) VALUES ('localhost', 'postfix', 'postfixadmin', 'Y', 'Y', 'Y', 'Y');
FLUSH PRIVILEGES;
GRANT USAGE ON postfix.* TO postfix@localhost;
GRANT SELECT, INSERT, DELETE, UPDATE ON postfix.* TO postfix@localhost;
GRANT USAGE ON postfix.* TO postfixadmin@localhost;
GRANT SELECT, INSERT, DELETE, UPDATE ON postfix.* TO postfixadmin@localhost;
-CREATE DATABASE postfix;
USE postfix;
#
@@ -49,7 +49,7 @@
`created` datetime NOT NULL default '0000-00-00 00:00:00',
`modified` datetime NOT NULL default '0000-00-00 00:00:00',
`active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`username`),
+ PRIMARY KEY (`username`)
) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Admins';
#
@@ -62,7 +62,7 @@
`created` datetime NOT NULL default '0000-00-00 00:00:00',
`modified` datetime NOT NULL default '0000-00-00 00:00:00',
`active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`address`),
+ PRIMARY KEY (`address`)
) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Aliases';
#
@@ -80,7 +80,7 @@
`created` datetime NOT NULL default '0000-00-00 00:00:00',
`modified` datetime NOT NULL default '0000-00-00 00:00:00',
`active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`domain`),
+ PRIMARY KEY (`domain`)
) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Domains';
#
@@ -119,7 +119,7 @@
`created` datetime NOT NULL default '0000-00-00 00:00:00',
`modified` datetime NOT NULL default '0000-00-00 00:00:00',
`active` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`username`),
+ PRIMARY KEY (`username`)
) TYPE=MyISAM COMMENT='Postfix Admin - Virtual Mailboxes';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:10:50
|
Revision: 108
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=108&view=rev
Author: GingerDog
Date: 2007-10-02 04:55:46 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
create-alias.php: syntax error fix
Modified Paths:
--------------
trunk/create-alias.php
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2007-09-30 15:53:54 UTC (rev 107)
+++ trunk/create-alias.php 2007-10-02 11:55:46 UTC (rev 108)
@@ -65,7 +65,7 @@
$fGoto = strtolower ($fGoto);
}
if(isset($_POST['fActive'])) {
- $fActive = escape_string ($_POST['fActive'])
+ $fActive = escape_string ($_POST['fActive']);
}
else {
$fActive = "1";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:10:43
|
Revision: 110
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=110&view=rev
Author: GingerDog
Date: 2007-10-02 04:58:11 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
ensure domain name is in a list of valid domain names; set for use within the template so the right one is selected if ?domain=XXX was in the url
Modified Paths:
--------------
trunk/create-mailbox.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2007-10-02 11:57:28 UTC (rev 109)
+++ trunk/create-mailbox.php 2007-10-02 11:58:11 UTC (rev 110)
@@ -46,7 +46,7 @@
$list_domains = list_domains ();
}
else {
- $list_domains = list_domains_for_admin ($SESSID_USERNAME);
+ $list_domains = list_domains_for_admin($SESSID_USERNAME);
}
@@ -56,14 +56,18 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
+ $fDomain = $list_domains[0];
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
+ if(!in_array($fDomain, $list_domains)) {
+ die("Invalid domain name selected, or you tried to select a domain you are not an admin for");
+ }
+ $tDomain = $fDomain;
$result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
if ($result['rows'] == 1)
{
$row = db_array ($result['result']);
$tQuota = $row['maxquota'];
-
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:10:41
|
Revision: 111
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=111&view=rev
Author: GingerDog
Date: 2007-10-02 04:58:46 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
make links for adding mailbox and adding alias dependant on controller logic
Modified Paths:
--------------
trunk/templates/admin_list-virtual.tpl
Modified: trunk/templates/admin_list-virtual.tpl
===================================================================
--- trunk/templates/admin_list-virtual.tpl 2007-10-02 11:58:11 UTC (rev 110)
+++ trunk/templates/admin_list-virtual.tpl 2007-10-02 11:58:46 UTC (rev 111)
@@ -102,7 +102,9 @@
}
print "</table>\n";
}
-print "<p><a href=\"create-alias.php?domain=$fDomain\">" . $PALANG['pMenu_create_alias'] . "</a>\n";
+if($tCanAddAlias) {
+ print "<p><a href=\"create-alias.php?domain=$fDomain\">" . $PALANG['pMenu_create_alias'] . "</a>\n";
+}
print "<div id=\"nav_bar\"><a name=\"MidArrow\" /a>\n<table width=730><colgroup span=\"1\"> <col width=\"550\"></col></colgroup> <tr><td align=left >";
if ( $limit['mbox_pgindex_count'] ) print "<b>".$PALANG['pOverview_mailbox_title']."</b>  ";
@@ -224,6 +226,8 @@
}
print "</div>\n";
+}
+if($tCanAddMailbox) {
print "<p><a href=\"create-mailbox.php?domain=$fDomain\">" . $PALANG['pMenu_create_mailbox'] . "</a>\n";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 12:10:19
|
Revision: 112
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=112&view=rev
Author: GingerDog
Date: 2007-10-02 05:06:10 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
functions.inc.php: mysqli is a valid database_type as well!
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-10-02 11:58:46 UTC (rev 111)
+++ trunk/functions.inc.php 2007-10-02 12:06:10 UTC (rev 112)
@@ -1330,7 +1330,7 @@
}
return 'false';
}
- elseif($CONF['database_type'] == 'mysql') {
+ elseif($CONF['database_type'] == 'mysql' || $CONF['database_type'] == 'mysqli') {
if($bool) {
return 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-10-02 11:57:26
|
Revision: 109
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=109&view=rev
Author: GingerDog
Date: 2007-10-02 04:57:28 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
admin/list-virtual.php: correctly display add mailbox or add alias links for a domain as appropriate (not if it is a backup mx or inactive or alias/mailbox limit has been reached
Modified Paths:
--------------
trunk/admin/list-virtual.php
Modified: trunk/admin/list-virtual.php
===================================================================
--- trunk/admin/list-virtual.php 2007-10-02 11:55:46 UTC (rev 108)
+++ trunk/admin/list-virtual.php 2007-10-02 11:57:28 UTC (rev 109)
@@ -55,7 +55,6 @@
if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) if (empty ($fDomain)) $fDomain = $list_domains[0];
-$limit = get_domain_properties ($fDomain);
if ((is_array ($list_domains) and sizeof ($list_domains) > 0)) if (empty ($fDomain)) $fDomain = $list_domains[1];
@@ -116,22 +115,46 @@
}
}
-if (isset ($limit))
-{
- if ($fDisplay >= $page_size)
- {
+$tCanAddAlias = false;
+$tCanAddMailbox = false;
+
+$limit = get_domain_properties($fDomain);
+if (isset ($limit)) {
+ if ($fDisplay >= $page_size) {
$tDisplay_back_show = 1;
$tDisplay_back = $fDisplay - $page_size;
}
- if (($limit['alias_count'] > $page_size) or ($limit['mailbox_count'] > $page_size))
- {
+ if (($limit['alias_count'] > $page_size) or ($limit['mailbox_count'] > $page_size)) {
$tDisplay_up_show = 1;
}
- if ((($fDisplay + $page_size) < $limit['alias_count']) or (($fDisplay + $page_size) < $limit['mailbox_count']))
+ if ((($fDisplay + $page_size) < $limit['alias_count']) or
+ (($fDisplay + $page_size) < $limit['mailbox_count']))
{
$tDisplay_next_show = 1;
$tDisplay_next = $fDisplay + $page_size;
}
+
+ $active = $limit['active'];
+ if($active == 't' || $active == 1) {
+ $backup_mx = $limit['backupmx'];
+ if($backup_mx == 'f' || $backup_mx == 0) {
+ if($limit['aliases'] == -1) {
+ $tCanAddAlias = true;
+ }
+ elseif($limit['alias_count'] < $limit['aliases']) {
+ $tCanAddAlias = true;
+ echo 'xxx2';
+ }
+ if($limit['mailboxes'] == -1) {
+ $tCanAddMailbox = true;
+ echo 'xxx3';
+ }
+ elseif($limit['mailbox_count'] < $limit['mailboxes']) {
+ $tCanAddMailbox = true;
+ echo 'xxx4';
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-30 15:53:54
|
Revision: 107
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=107&view=rev
Author: GingerDog
Date: 2007-09-30 08:53:54 -0700 (Sun, 30 Sep 2007)
Log Message:
-----------
update license headers
Modified Paths:
--------------
trunk/admin/backup.php
trunk/admin/broadcast-message.php
trunk/admin/create-admin.php
trunk/admin/create-alias.php
trunk/admin/create-domain.php
trunk/admin/create-mailbox.php
trunk/admin/delete.php
trunk/admin/edit-active-admin.php
trunk/admin/edit-active-domain.php
trunk/admin/edit-active.php
trunk/admin/edit-admin.php
trunk/admin/edit-alias.php
trunk/admin/edit-domain.php
trunk/admin/edit-mailbox.php
trunk/admin/edit-vacation.php
trunk/admin/index.php
trunk/admin/list-admin.php
trunk/admin/list-domain.php
trunk/admin/list-virtual.php
trunk/admin/main.php
trunk/admin/search.php
trunk/admin/viewlog.php
trunk/common.php
trunk/config.inc.php.sample
trunk/create-alias.php
trunk/create-mailbox.php
trunk/delete.php
trunk/edit-active.php
trunk/edit-alias.php
trunk/edit-mailbox.php
trunk/edit-vacation.php
trunk/functions.inc.php
trunk/index.php
trunk/login.php
trunk/logout.php
trunk/main.php
trunk/overview.php
trunk/password.php
trunk/search.php
trunk/sendmail.php
trunk/setup.php
trunk/users/edit-alias.php
trunk/users/index.php
trunk/users/login.php
trunk/users/logout.php
trunk/users/main.php
trunk/users/password.php
trunk/users/vacation.php
trunk/variables.inc.php
trunk/viewlog.php
Modified: trunk/admin/backup.php
===================================================================
--- trunk/admin/backup.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/backup.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,25 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: backup.php
-//
-// Template File: -none-
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: backup.php
+ * Used to save all settings - but only works for MySQL databases.
+ * Template File: -none-
+ *
+ * Template Variables: -none-
+ *
+ * Form POST \ GET Variables: -none-
+ */
require_once('../common.php');
Modified: trunk/admin/broadcast-message.php
===================================================================
--- trunk/admin/broadcast-message.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/broadcast-message.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,30 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: broadcast-message.php
-//
-// Template File: broadcast-message.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// name
-// subject
-// message
-//
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: broadcast-message.php
+ * Used to send a message to _ALL_ users with mailboxes on this server.
+ *
+ * Template File: broadcast-message.tpl
+ *
+ * Template Variables: -none-
+ *
+ * Form POST \ GET Variables:
+ *
+ * name
+ * subject
+ * message
+ */
require_once('../common.php');
Modified: trunk/admin/create-admin.php
===================================================================
--- trunk/admin/create-admin.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/create-admin.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,28 +1,35 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: create-admin.php
-//
-// Template File: admin_create-admin.tpl
-//
-//
-// Template Variables:
-//
-// tMessage
-// tUsername
-// tDomains
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fPassword
-// fPassword2
-// fDomains
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: create-admin.php
+ * Used to create new administrators.
+ * Template File: admin_create-admin.tpl
+ *
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tUsername
+ * tDomains
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fPassword
+ * fPassword2
+ * fDomains
+ */
require_once('../common.php');
Modified: trunk/admin/create-alias.php
===================================================================
--- trunk/admin/create-alias.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/create-alias.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,28 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: create-alias.php
-//
-// Template File: create-alias.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tAddress
-// tGoto
-// tDomain
-//
-// Form POST \ GET Variables:
-//
-// fAddress
-// fGoto
-// fDomain
-//
-
require ("../create-alias.php");
-
?>
Modified: trunk/admin/create-domain.php
===================================================================
--- trunk/admin/create-domain.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/create-domain.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,33 +1,40 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: create-domain.php
-//
-// Template File: admin_create-domain.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tDomain
-// tDescription
-// tAliases
-// tMailboxes
-// tMaxquota
-// tDefaultaliases
-//
-// Form POST \ GET Variables:
-//
-// fDomain
-// fDescription
-// fAliases
-// fMailboxes
-// fMaxquota
-// fDefaultaliases
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: create-domain.php
+ * Allows administrators to create new domains.
+ * Template File: admin_create-domain.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tDomain
+ * tDescription
+ * tAliases
+ * tMailboxes
+ * tMaxquota
+ * tDefaultaliases
+ *
+ * Form POST \ GET Variables:
+ *
+ * fDomain
+ * fDescription
+ * fAliases
+ * fMailboxes
+ * fMaxquota
+ * fDefaultaliases
+ */
require_once('../common.php');
Modified: trunk/admin/create-mailbox.php
===================================================================
--- trunk/admin/create-mailbox.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/create-mailbox.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,35 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: create-mailbox.php
-//
-// Template File: create-mailbox.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tUsername
-// tName
-// tQuota
-// tDomain
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fPassword
-// fPassword2
-// fName
-// fQuota
-// fDomain
-// fActive
-// fMail
-//
-
require ("../create-mailbox.php");
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/admin/delete.php
===================================================================
--- trunk/admin/delete.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/delete.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,33 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: delete.php
-//
-// Template File: message.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fTable
-// fWhere
-// fDelete
-// fDomain
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: delete.php
+ * Used to delete a domain, mailbox or alias.
+ *
+ * Template File: message.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fTable
+ * fWhere
+ * fDelete
+ * fDomain
+ */
require_once('../common.php');
Modified: trunk/admin/edit-active-admin.php
===================================================================
--- trunk/admin/edit-active-admin.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-active-admin.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,30 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-active.php
-//
-// Template File: message.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-active-admin.php
+ * Edit an active administrator. This is used as a 'toggle' page from list-admin.
+ *
+ * Template File: message.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ */
require_once('../common.php');
Modified: trunk/admin/edit-active-domain.php
===================================================================
--- trunk/admin/edit-active-domain.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-active-domain.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,29 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-active.php
-//
-// Template File: message.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fDomain
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-active-domain.php
+ * Responsible for toggling the status of a domain
+ * Template File: message.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fDomain
+ */
require_once('../common.php');
Modified: trunk/admin/edit-active.php
===================================================================
--- trunk/admin/edit-active.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-active.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-active.php
-//
-// Template File: message.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fDomain
-//
-
require("../edit-active.php");
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/admin/edit-admin.php
===================================================================
--- trunk/admin/edit-admin.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-admin.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,29 +1,37 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-admin.php
-//
-// Template File: admin_edit-admin.tpl
-//
-// Template Variables:
-//
-// tAllDomains
-// tDomains
-// tActive
-// tSadmin
-//
-// Form POST \ GET Variables:
-//
-// fDescription
-// fAliases
-// fMailboxes
-// fMaxquota
-// fActive
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-admin.php
+ * Edits a normal administrator's details.
+ *
+ * Template File: admin_edit-admin.tpl
+ *
+ * Template Variables:
+ *
+ * tAllDomains
+ * tDomains
+ * tActive
+ * tSadmin
+ *
+ * Form POST \ GET Variables:
+ *
+ * fDescription
+ * fAliases
+ * fMailboxes
+ * fMaxquota
+ * fActive
+ */
require_once('../common.php');
Modified: trunk/admin/edit-alias.php
===================================================================
--- trunk/admin/edit-alias.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-alias.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,26 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-alias.php
-//
-// Template File: edit-alias.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tGoto
-//
-// Form POST \ GET Variables:
-//
-// fAddress
-// fDomain
-// fGoto
-//
-
require("../edit-alias.php");
-
?>
Modified: trunk/admin/edit-domain.php
===================================================================
--- trunk/admin/edit-domain.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-domain.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,30 +1,37 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-domain.php
-//
-// Template File: admin_edit-domain.tpl
-//
-// Template Variables:
-//
-// tDescription
-// tAliases
-// tMailboxes
-// tMaxquota
-// tActive
-//
-// Form POST \ GET Variables:
-//
-// fDescription
-// fAliases
-// fMailboxes
-// fMaxquota
-// fActive
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-domain.php
+ * Updates the properties of a domain.
+ * Template File: admin_edit-domain.tpl
+ *
+ * Template Variables:
+ *
+ * tDescription
+ * tAliases
+ * tMailboxes
+ * tMaxquota
+ * tActive
+ *
+ * Form POST \ GET Variables:
+ *
+ * fDescription
+ * fAliases
+ * fMailboxes
+ * fMaxquota
+ * fActive
+ */
require_once('../common.php');
Modified: trunk/admin/edit-mailbox.php
===================================================================
--- trunk/admin/edit-mailbox.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-mailbox.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,32 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-mailbox.php
-//
-// Template File: edit-mailbox.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tName
-// tQuota
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fDomain
-// fPassword
-// fPassword2
-// fName
-// fQuota
-// fActive
-//
-
require("../edit-mailbox.php");
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/admin/edit-vacation.php
===================================================================
--- trunk/admin/edit-vacation.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/edit-vacation.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,32 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2007 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-vacation.php
-//
-// Template File: edit-vacation.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tSubject
-// tBody
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fDomain
-// fCanceltarget
-// fChange
-// fBack
-// fQuota
-// fActive
-//
-//
-
require ("../edit-vacation.php");
-
?>
Modified: trunk/admin/index.php
===================================================================
--- trunk/admin/index.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/index.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,4 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: index.php
-//
-// Template File: -none-
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
header ("Location: list-admin.php");
exit(0);
?>
Modified: trunk/admin/list-admin.php
===================================================================
--- trunk/admin/list-admin.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/list-admin.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,25 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: list-admin.php
-//
-// Template File: list-admin.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: list-admin.php
+ * Lists all administrators
+ * Template File: list-admin.tpl
+ *
+ * Template Variables: -none-
+ *
+ * Form POST \ GET Variables: -none-
+ */
require_once("../common.php");
Modified: trunk/admin/list-domain.php
===================================================================
--- trunk/admin/list-domain.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/list-domain.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,29 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: list-domain.php
-//
-// Template File: admin_list-domain.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: list-domain.php
+ * List all domains as a quick overview.
+ * Template File: admin_list-domain.tpl
+ *
+ * Template Variables:
+ *
+ * -none-
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ */
require_once('../common.php');
Modified: trunk/admin/list-virtual.php
===================================================================
--- trunk/admin/list-virtual.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/list-virtual.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,33 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: list-virtual.php
-//
-// Template File: admin_list-virtual.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tAlias
-// tMailbox
-//
-// Form POST \ GET Variables:
-//
-// fDomain
-// fDisplay
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: list-virtual.php
+ * List virtual users for a domain.
+ *
+ * Template File: admin_list-virtual.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tAlias
+ * tMailbox
+ *
+ * Form POST \ GET Variables:
+ *
+ * fDomain
+ * fDisplay
+ */
require_once('../common.php');
Modified: trunk/admin/main.php
===================================================================
--- trunk/admin/main.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/main.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,4 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: main.php
-//
-// Template File: -none-
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
header ("Location: list-admin.php");
exit;
?>
Modified: trunk/admin/search.php
===================================================================
--- trunk/admin/search.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/search.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,32 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: search.php
-//
-// Template File: search.tpl
-//
-// Template Variables:
-//
-// tAlias
-// tMailbox
-//
-// Form POST \ GET Variables:
-//
-// search
-// fDomain
-// fGo
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: search.php
+ * Allows for search by e.g. name, mailbox name etc.
+ * Template File: search.tpl
+ *
+ * Template Variables:
+ *
+ * tAlias
+ * tMailbox
+ *
+ * Form POST \ GET Variables:
+ *
+ * search
+ * fDomain
+ * fGo
+ */
require_once('../common.php');
Modified: trunk/admin/viewlog.php
===================================================================
--- trunk/admin/viewlog.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/admin/viewlog.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,3 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: viewlog.php
-//
-// Template File: viewlog.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tLog
-//
-// Form POST \ GET Variables:
-//
-// fDomain
-//
-
require("../viewlog.php");
-
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/common.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,18 +1,21 @@
<?php
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: common.php.php
-//
-// Template File: -none-
-//
-// Template Variables: -none-
-//
-// Form POST \ GET Variables: -none-
-//
-
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: common.php
+ * All pages should include this file - which itself sets up the necessary
+ * environment and ensures other functions are loaded.
+ */
$incpath = dirname(__FILE__);
(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');
(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1');
Modified: trunk/config.inc.php.sample
===================================================================
--- trunk/config.inc.php.sample 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/config.inc.php.sample 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,12 +1,21 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: config.inc.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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: config.inc.php
+ * Contains configuration options.
+ */
+
if (ereg ("config.inc.php", $_SERVER['PHP_SELF']))
{
header ("Location: login.php");
Modified: trunk/create-alias.php
===================================================================
--- trunk/create-alias.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/create-alias.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,27 +1,36 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: create-alias.php
-//
-// Template File: create-alias.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tAddress
-// tGoto
-// tDomain
-//
-// Form POST \ GET Variables:
-//
-// fAddress
-// fGoto
-// fDomain
-//
+/**
+ * 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:
+ *
+ * tMessage
+ * tAddress
+ * tGoto
+ * tDomain
+ *
+ * Form POST \ GET Variables:
+ *
+ * fAddress
+ * fGoto
+ * fDomain
+ *
+ */
require_once('common.php');
@@ -39,110 +48,116 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
-
- if (isset ($_GET['domain'])) $tDomain = escape_string ($_GET['domain']);
-
+ 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['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 (isset ($_POST['fGoto'])) {
+ $fGoto = escape_string ($_POST['fGoto']);
+ $fGoto = strtolower ($fGoto);
+ }
+ if(isset($_POST['fActive'])) {
+ $fActive = escape_string ($_POST['fActive'])
+ }
+ else {
+ $fActive = "1";
+ }
- 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 = $PALANG['pCreate_alias_address_text_error1'];
- }
+ if(isset($_POST['fDomain'])) {
+ $fDomain = 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(!preg_match ('/@/',$fGoto)) {
+ $fGoto = $fGoto . "@" . escape_string ($_POST['fDomain']);
+ }
- 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(!(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 = $PALANG['pCreate_alias_address_text_error1'];
+ }
- if (escape_string ($_POST['fAddress']) == "*") $fAddress = "@" . 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'];
+ }
- $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(empty ($fAddress) || !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 ($fActive == "on")
- {
- $sqlActive = db_get_boolean(True);
- }
- else
- {
- $sqlActive = db_get_boolean(False);
- }
+ if (empty($fGoto) || !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 ($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 />\n";
- }
- else
- {
- db_log ($SESSID_USERNAME, $fDomain, 'create_alias', "$fAddress -> $fGoto");
+ if (escape_string($_POST['fAddress']) == "*") {
+ $fAddress = "@" . escape_string ($_POST['fDomain']);
+ }
- $tDomain = $fDomain;
- $tMessage = $PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n";
- }
- }
+ $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") {
+ $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;
+ $tMessage = $PALANG['pCreate_alias_result_error'] . "<br />($fAddress -> $fGoto)<br />\n";
+ }
+ else {
+ db_log ($SESSID_USERNAME, $fDomain, 'create_alias', "$fAddress -> $fGoto");
+
+ $tDomain = $fDomain;
+ $tMessage = $PALANG['pCreate_alias_result_success'] . "<br />($fAddress -> $fGoto)<br />\n";
+ }
+ }
}
include ("$incpath/templates/header.tpl");
if (authentication_has_role('global-admin')) {
- include ("$incpath/templates/admin_menu.tpl");
+ include ("$incpath/templates/admin_menu.tpl");
} else {
- include ("$incpath/templates/menu.tpl");
+ include ("$incpath/templates/menu.tpl");
}
include ("$incpath/templates/create-alias.tpl");
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/create-mailbox.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,33 +1,42 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: create-mailbox.php
-//
-// Template File: create-mailbox.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tUsername
-// tName
-// tQuota
-// tDomain
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fPassword
-// fPassword2
-// fName
-// fQuota
-// fDomain
-// fActive
-// fMail
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: create-mailbox.php
+ * Responsible for allowing for the creation of mail boxes
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tUsername
+ * tName
+ * tQuota
+ * tDomain
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fPassword
+ * fPassword2
+ * fName
+ * fQuota
+ * fDomain
+ * fActive
+ * fMail
+ */
require_once('common.php');
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/delete.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,23 +1,38 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: delete.php
-//
-// Template File: message.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fDelete
-// fDomain
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: delete.php
+ * Responsible for allowing for the deletion of domains; note if
+ * a domain is deleted, all mailboxes and aliases belonging to the
+ * domain are also removed.
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * Template Variables:
+ *
+ * Template File: message.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fDelete
+ * fDomain
+ */
require_once('common.php');
Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/edit-active.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,32 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-active.php
-//
-// Template File: message.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fDomain
-// fReturn
-//
-
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-active.php
+ * Responsible for toggling the active status of a mailbox.
+ *
+ * Template File: message.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fDomain
+ * fReturn
+ */
require_once('common.php');
authentication_require_role('admin');
Modified: trunk/edit-alias.php
===================================================================
--- trunk/edit-alias.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/edit-alias.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,25 +1,33 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-alias.php
-//
-// Template File: edit-alias.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tGoto
-//
-// Form POST \ GET Variables:
-//
-// fAddress
-// fDomain
-// fGoto
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-alias.php
+ * Used to update an alias.
+ *
+ * Template File: edit-alias.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tGoto
+ *
+ * Form POST \ GET Variables:
+ *
+ * fAddress
+ * fDomain
+ * fGoto
+ */
require_once('common.php');
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/edit-mailbox.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,30 +1,37 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-mailbox.php
-//
-// Template File: edit-mailbox.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tName
-// tQuota
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fDomain
-// fPassword
-// fPassword2
-// fName
-// fQuota
-// fActive
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-mailbox.php
+ * Used to update an existing mailboxes settings.
+ * Template File: edit-mailbox.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tName
+ * tQuota
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fDomain
+ * fPassword
+ * fPassword2
+ * fName
+ * fQuota
+ * fActive
+ */
require_once('common.php');
Modified: trunk/edit-vacation.php
===================================================================
--- trunk/edit-vacation.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/edit-vacation.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,33 +1,39 @@
<?php
-// XXX TODO - Remove the code duplication between this file (for admins) and users/vacation.php
-// - too much of the code is identical for there not to be some refactoring possible.
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2007 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: edit-vacation.php
-//
-// Template File: edit-vacation.tpl
-//
-// Template Variables:
-//
-// tUseremail
-// tMessage
-// tSubject
-// tBody
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fDomain
-// fCanceltarget
-// fChange
-// fBack
-// fQuota
-// fActive
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: edit-vacation.php
+ * Responsible for allowing users to update their vacation status.
+ *
+ * Template File: edit-vacation.tpl
+ *
+ * Template Variables:
+ *
+ * tUseremail
+ * tMessage
+ * tSubject
+ * tBody
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fDomain
+ * fCanceltarget
+ * fChange
+ * fBack
+ * fQuota
+ * fActive
+ */
require_once('common.php');
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/functions.inc.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,13 +1,20 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: functions.inc.php
-//
-//error_reporting (E_NOTICE | E_ERROR | E_WARNING | E_PARSE);
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: functions.inc.php
+ * Contains re-usable code.
+ */
if (ereg ("functions.inc.php", $_SERVER['PHP_SELF']))
{
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/index.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,26 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: index.php
-//
-// Template File: -none-
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: index.php
+ * Shows a sort-of welcome page.
+ * Template File: -none-
+ *
+ * Template Variables: -none-
+ *
+ * Form POST \ GET Variables: -none-
+ */
+
if (!file_exists (realpath ("./setup.php")))
{
header ("Location: login.php");
Modified: trunk/login.php
===================================================================
--- trunk/login.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/login.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,24 +1,31 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: login.php
-//
-// Template File: login.tpl
-//
-// Template Variables:
-//
-// tMessage
-// tUsername
-//
-// Form POST \ GET Variables:
-//
-// fUsername
-// fPassword
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: login.php
+ * Authenticates a user, and populates their $_SESSION as appropriate.
+ * Template File: login.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ * tUsername
+ *
+ * Form POST \ GET Variables:
+ *
+ * fUsername
+ * fPassword
+ */
require_once('common.php');
if ($_SERVER['REQUEST_METHOD'] == "GET")
Modified: trunk/logout.php
===================================================================
--- trunk/logout.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/logout.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,25 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: logout.php
-//
-// Template File: -none-
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: logout.php
+ * De-authenticates a user.
+ * Template File: -none-
+ *
+ * Template Variables: -none-
+ *
+ * Form POST \ GET Variables: -none-
+ */
require_once('common.php');
Modified: trunk/main.php
===================================================================
--- trunk/main.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/main.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,22 +1,25 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: main.php
-//
-// Template File: main.tpl
-//
-// Template Variables:
-//
-// -none-
-//
-// Form POST \ GET Variables:
-//
-// -none-
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: main.php
+ * Displays a menu/home page.
+ * Template File: main.tpl
+ *
+ * Template Variables: -none-
+ *
+ * Form POST \ GET Variables: -none-
+ */
require_once('common.php');
@@ -24,19 +27,8 @@
authentication_require_role('admin');
-if ($_SERVER["REQUEST_METHOD"] == "GET")
-{
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/main.tpl");
- include ("./templates/footer.tpl");
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST")
-{
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/main.tpl");
- include ("./templates/footer.tpl");
-}
+include ("./templates/header.tpl");
+include ("./templates/menu.tpl");
+include ("./templates/main.tpl");
+include ("./templates/footer.tpl");
?>
Modified: trunk/overview.php
===================================================================
--- trunk/overview.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/overview.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,28 +1,36 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: overview.php
-//
-// Template File: overview.tpl
-//
-// Template Variables:
-//
-// tAlias
-// tDomain
-// tMailbox
-// tDisplay_back
-// tDisplay_next
-//
-// Form POST \ GET Variables:
-//
-// domain
-// fDomain
-// limit
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: overview.php
+ * Shows an overview for admins.
+ *
+ * Template File: overview.tpl
+ *
+ * Template Variables:
+ *
+ * tAlias
+ * tDomain
+ * tMailbox
+ * tDisplay_back
+ * tDisplay_next
+ *
+ * Form POST \ GET Variables:
+ *
+ * domain
+ * fDomain
+ * limit
+ */
require_once('common.php');
Modified: trunk/password.php
===================================================================
--- trunk/password.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/password.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,24 +1,31 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: password.php
-//
-// Template File: password.tpl
-//
-// Template Variables:
-//
-// tMessage
-//
-// Form POST \ GET Variables:
-//
-// fPassword_current
-// fPassword
-// fPassword2
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: password.php
+ * Allows admins to change their own password.
+ * Template File: password.tpl
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fPassword_current
+ * fPassword
+ * fPassword2
+ */
require_once('common.php');
Modified: trunk/search.php
===================================================================
--- trunk/search.php 2007-09-28 20:35:43 UTC (rev 106)
+++ trunk/search.php 2007-09-30 15:53:54 UTC (rev 107)
@@ -1,35 +1,42 @@
<?php
-//
-// Postfix Admin
-// by Mischa Peters <mischa at high5 dot net>
-// Copyright (c) 2002 - 2005 High5!
-// Licensed under GPL for more info check GPL-LICENSE.TXT
-//
-// File: search.php
-//
-// Template File: search.tpl
-//
-// Template Variables:
-//
-// tAlias
-// tMailbox
-//
-// Form POST \ GET Variables:
-//
-// fSearch
-// fGo
-// fDomain
-//
+/**
+ * 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
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * File: search.php
+ * Provides a method for searching for a user/mailbox
+ * Template File: search.tpl
+ *
+ * Template Variables:
+ *
+ * tAlias
+ * tMailbox
+ *
+ * Form POST \ GET Variables:
+ *
+ * fSearch
+ * fGo
+ * fDomain
+ */
require_once('common.php');
authentication_require_role('admin');
$SESSID_USERNAME = authentication_get_username();
if(authentication_has_role('global-admin')) {
- $list_domains = list_domains ();
+ $list_domains = list_domains ();
}
else {
- $list_domains = list_domains_for_admin ($SESSID_USERNAME);
+ $list_domains = list_domains_for_admin ($SESSID_USERNAME);
}
@@ -38,140 +45,140 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- if (isset ($_GET['search'])) $fSearch = escape_string ($_GET['search']);
+ if (isset ($_GET['search'])) $fSearch = escape_string ($_GET['search']);
- if ($CONF['alias_control_admin'] == "YES")
- {
- $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
- }
- else
- {
- $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
- }
+ if ($CONF['alias_control_admin'] == "YES")
+ {
+ $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
+ }
+ else
+ {
+ $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
+ }
- $result = db_query ($query);
- if ($result['rows'] > 0)
- {
- while ($row = db_array ($result['result']))
- {
- if (check_owner ($SESSID_USERNAME, $row['domain']))
- {
- if ('pgsql'==$CONF['database_type'])
+ $result = db_query ($query);
+ if ($result['rows'] > 0)
+ {
+ while ($row = db_array ($result['result']))
+ {
+ if (check_owner ($SESSID_USERNAME, $row['domain']))
{
- $row['modified']=gmstrftime('%c %Z',$row['modified']);
- $row['active']=('t'==$row['active']) ? 1 : 0;
- }
- $tAlias[] = $row;
- }
- }
- }
+ if ('pgsql'==$CONF['database_type'])
+ {
+ $row['modified']=gmstrftime('%c %Z',$row['modified']);
+ $row['active']=('t'==$row['active']) ? 1 : 0;
+ }
+ $tAlias[] = $row;
+ }
+ }
+ }
- if ($CONF['vacation_control_admin'] == 'YES')
- {
- $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
- }
- else
- {
- $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
- }
+ if ($CONF['vacation_control_admin'] == 'YES')
+ {
+ $query = ("SELECT $table_mailbox.*, $table_vacation.active AS v_active FROM $table_mailbox LEFT JOIN $table_vacation ON $table_mailbox.username=$table_vacation.email WHERE $table_mailbox.username LIKE '%$fSearch%' OR $table_mailbox.name LIKE '%$fSearch%' ORDER BY $table_mailbox.username");
+ }
+ else
+ {
+ $query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
+ }
- $result = db_query ($query);
- if ($result['rows'] > 0)
- {
- while ($row = db_array ($result['result']))
- {
- if (check_owner ($SESSID_USERNAME, $row['domain']))
- {
- if ('pgsql'==$CONF['database_type'])
+ $result = db_query ($query);
+ if ($result['rows'] > 0)
+ {
+ while ($row = db_array ($result['result']))
+ {
+ if (check_owner ($SESSID_USERNAME, $row['domain']))
{
- $row['modified']=gmstrftime('%c %Z',$row['modified']);
- $row['active']=('t'==$row['active']) ? 1 : 0;
- }
- $tMailbox[] = $row;
- }
- }
- }
+ if ('pgsql'==$CONF['database_type'])
+ {
+ $row['modified']=gmstrftime('%c %Z',$row['modified']);
+ $row['active']=('t'==$row['active']) ? 1 : 0;
+ }
+ $tMailbox[] = $row;
+ }
+ }
+ }
- include ("./templates/header.tpl");
- include ("./templates/menu.tpl");
- include ("./templates/search.tpl");
- include ("./templates/footer.tpl");
+ include ("./templates/header.tpl");
+ include ("./templates/menu.tpl");
+ include ("./templates/search.tpl");
+ include ("./templates/footer.tpl");
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_POST['search'])) $fSearch = escape_string ($_POST['search']);
- if (isset ($_POST['fGo'])) $fGo = escape_string ($_POST['fGo']);
- if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
+ if (isset ($_POST['search'])) $fSearch = escape_string ($_POST['search']);
+ if (isset ($_POST['fGo'])) $fGo = escape_string ($_POST['fGo']);
+ if (isset ($_POST['fDomain'])) $fDomain = escape_string ($_POST['fDomain']);
- if (empty ($fSearch) && !empty ($fGo))
- {
- if (authentication_has_role('global-admin'))
- {
- header("Location: list-virtual.php?domain=" . $fDomain ) && exit;
- }
- else
- {
- header("Location: overview.php?domain=" . $fDomain ) && exit;
- }
- }
+ if (empty ($fSearch) && !empty ($fGo))
+ {
+ if (authentication_has_role('global-admin'))
+ {
+ header("Location: list-virtual.php?domain=" . $fDomain ) && exit;
+ }
+ else
+ {
+ header("Location: overview.php?domain=" . $fDomain ) && exit;
+ }
+ }
- if ($CONF['alias_control_admin'] == "YES")
- {
- $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias WHERE $table_alias.address LIKE '%$fSearch%' OR $table_alias.goto LIKE '%$fSearch%' ORDER BY $table_alias.address";
- }
- else
- {
- $query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.domain,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.address LIKE '%$fSearch%' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address";
- }
+ if ($CONF['alias_control_admin'] == "YES")
+ {
+...
[truncated message content] |
|
From: <Gin...@us...> - 2007-09-28 20:35:41
|
Revision: 106
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=106&view=rev
Author: GingerDog
Date: 2007-09-28 13:35:43 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
fix template for edit-admin
Modified Paths:
--------------
trunk/templates/admin_edit-admin.tpl
Modified: trunk/templates/admin_edit-admin.tpl
===================================================================
--- trunk/templates/admin_edit-admin.tpl 2007-09-28 20:35:19 UTC (rev 105)
+++ trunk/templates/admin_edit-admin.tpl 2007-09-28 20:35:43 UTC (rev 106)
@@ -10,7 +10,7 @@
</tr>
<tr>
<td><?php print $PALANG['pAdminEdit_admin_password'] . ":"; ?></td>
- <td><input class="flat" type="password" name="fPassword" /></td>
+ <td><input class="flat" type="password" name="fPassword" value="<?= $fPassword; ?>"/></td>
<td><?php print $pAdminEdit_admin_password_text; ?></td>
</tr>
<tr>
@@ -32,16 +32,13 @@
<td colspan=3 align=center>
<select name="fDomains[]" size="10" multiple="multiple">
<?php
- for ($i = 0; $i < sizeof ($list_domains); $i++)
- {
- if (in_array ($list_domains[$i], $tDomains))
- {
- print "<option value=\"" . $list_domains[$i] . "\" selected=\"selected\">" . $list_domains[$i] . "</option>\n";
+ foreach($tAllDomains as $domain) {
+ // should escape $domain here to stop xss etc.
+ $selected = '';
+ if (in_array ($domain, $tDomains)) {
+ $selected = "selected='selected'";
}
- else
- {
- print "<option value=\"" . $list_domains[$i] . "\">" . $list_domains[$i] . "</option>\n";
- }
+ print "<option value='$domain' $selected>$domain</option>\n";
}
?>
</select>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-28 20:35:22
|
Revision: 105
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=105&view=rev
Author: GingerDog
Date: 2007-09-28 13:35:19 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
edit-admin.php: it should work now - if you are a super admin, the domain list is unhighlighted; note domains that are inactive or backupmx records will appear unhighlighted all the time
Modified Paths:
--------------
trunk/admin/edit-admin.php
Modified: trunk/admin/edit-admin.php
===================================================================
--- trunk/admin/edit-admin.php 2007-09-28 20:28:18 UTC (rev 104)
+++ trunk/admin/edit-admin.php 2007-09-28 20:35:19 UTC (rev 105)
@@ -11,11 +11,10 @@
//
// Template Variables:
//
-// tDescription
-// tAliases
-// tMailboxes
-// tMaxquota
+// tAllDomains
+// tDomains
// tActive
+// tSadmin
//
// Form POST \ GET Variables:
//
@@ -30,115 +29,98 @@
authentication_require_role('global-admin');
-if ($_SERVER['REQUEST_METHOD'] == "GET")
-{
- if (isset ($_GET['username'])) $username = escape_string ($_GET['username']);
- $list_domains = list_domains ();
- isset ($_GET['username']) ? $tDomains = list_domains_for_admin ($username) : $tDomains = "";
-
- $result = db_query ("SELECT * FROM $table_domain_admins WHERE username='$username'");
- if ($result['rows'] == 1)
- {
- $row = db_array ($result['result']);
- if ($row['domain'] == 'ALL') $tSadmin = '1';
- }
-
- $result = db_query ("SELECT * FROM $table_admin WHERE username='$username'");
- if ($result['rows'] == 1)
- {
- $row = db_array ($result['result']);
- $tActive = $row['active'];
- if ('pgsql'==$CONF['database_type']) $tActive=('t'==$tActive) ? TRUE:FALSE;
- }
-
- include ("../templates/header.tpl");
- include ("../templates/admin_menu.tpl");
- include ("../templates/admin_edit-admin.tpl");
- include ("../templates/footer.tpl");
-}
-
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_GET['username'])) $username = escape_string ($_GET['username']);
-
- if (isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
- if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
+ $fPassword = 'x';
+ $fPassword = 'y';
+ if(isset ($_GET['username'])) $username = escape_string ($_GET['username']);
+ if(isset ($_POST['fPassword'])) $fPassword = escape_string ($_POST['fPassword']);
+ if(isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
+
$fActive=(isset($_POST['fActive'])) ? escape_string ($_POST['fActive']) : FALSE;
$fSadmin=(isset($_POST['fSadmin'])) ? escape_string ($_POST['fSadmin']) : FALSE;
+ $fDomains = false;
if (isset ($_POST['fDomains'])) $fDomains = $_POST['fDomains'];
- $list_domains = list_domains ();
-
- if ($fPassword != $fPassword2)
- {
- $error = 1;
- $tActive = $fActive;
- $tDomains = escape_string ($_POST['fDomains']);
- $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
+ $tAllDomains = list_domains ();
+
+ $result = db_query("SELECT * FROM $table_admin WHERE username = '$username'");
+ if($result['rows'] != 1) {
+ die("Invalid username for admin user");
}
+ $admin_details = db_array($result['result']);
+ $originalPassword = $admin_details['password'];
+ // has the password changed?
+ if($fPassword != $originalPassword) {
+ if(!empty($_POST['fPassword2'])) {
+ if ($fPassword != $fPassword2)
+ {
+ $error = 1;
+ $pAdminEdit_admin_password_text = $PALANG['pAdminEdit_admin_password_text_error'];
+ }
+ else {
+ $fPassword = pacrypt($fPassword);
+ }
+ }
+ }
+ $tActive = $fActive;
+ $tDomains = escape_string ($_POST['fDomains']);
if ($error != 1)
{
- if ($fActive == "on") $fActive = 1;
- $sqlActive=$fActive;
- if ('pgsql'==$CONF['database_type']) $sqlActive=($fActive) ? 'true' : 'false';
+ if ($fActive == "on") {
+ $sqlActive = db_get_boolean(True);
+ }
+ else {
+ $sqlActive = db_get_boolean(False);
+ }
+
+ $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive', password='$fPassword' WHERE username='$username'");
+
if ($fSadmin == "on") $fSadmin = 'ALL';
- if (empty ($fPassword) and empty ($fPassword2))
- {
- $result = db_query ("UPDATE $table_admin SET modified=NOW(),active='$sqlActive' WHERE username='$username'");
+ // delete everything, and put it back later on..
+ db_query("DELETE FROM $table_domain_admins WHERE username = '$username'");
+ if($fSadmin == 'ALL') {
+ $fDomains = array('ALL');
}
- else
+
+ foreach($fDomains as $domain)
{
- $password = pacrypt ($fPassword);
- $result = db_query ("UPDATE $table_admin SET password='$password',modified=NOW(),active='$sqlActive' WHERE username='$username'");
+ $result = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$username','$domain',NOW())");
}
+ flash_info($PALANG['pAdminEdit_admin_result_success']);
+ }
+ else {
+ flash_error($PALANG['pAdminEdit_admin_result_error']);
+ }
+ header("Location: list-admin.php");
+}
+else { // GET request.
+ if (isset($_GET['username'])) $username = escape_string ($_GET['username']);
- if (sizeof ($fDomains) > 0)
- {
- for ($i = 0; $i < sizeof ($fDomains); $i++)
- {
- $domain = $fDomains[$i];
- $result_domains = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$username','$domain',NOW())");
- }
+ $tAllDomains = list_domains();
+ $tDomains = list_domains_for_admin ($username);
+
+ $tSadmin = '0';
+ $result = db_query ("SELECT * FROM $table_domain_admins WHERE username='$username'");
+ // could/should be multiple matches to query;
+ if ($result['rows'] >= 1) {
+ $result = $result['result'];
+ while($row = db_array($result)) {
+ if ($row['domain'] == 'ALL') {
+ $tSadmin = '1';
+ $tDomains = array(); /* empty the list, they're an admin */
+ }
}
+ }
- if ($result['rows'] == 1)
- {
- if (isset ($fDomains[0]))
- {
- $result = db_query ("DELETE FROM $table_domain_admins WHERE username='$username'");
- if ($fSadmin == 'ALL')
- {
- $result = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$username','ALL',NOW())");
- }
- else
- {
- if ($fDomains[0] != '')
- for ($i = 0; $i < sizeof ($fDomains); $i++)
- {
- $domain = $fDomains[$i];
- $result = db_query ("INSERT INTO $table_domain_admins (username,domain,created) VALUES ('$username','$domain',NOW())");
- }
- }
- }
- header ("Location: list-admin.php");
- exit;
- }
- else
- {
- $tMessage = $PALANG['pAdminEdit_admin_result_error'];
- }
- }
-
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/admin_edit-admin.tpl");
include ("../templates/footer.tpl");
}
-/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
-?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-28 20:28:25
|
Revision: 104
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=104&view=rev
Author: GingerDog
Date: 2007-09-28 13:28:18 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
functions.inc.php: remove optional parameter for get_domains_for_admin()
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-09-28 19:29:10 UTC (rev 103)
+++ trunk/functions.inc.php 2007-09-28 20:28:18 UTC (rev 104)
@@ -663,9 +663,7 @@
/**
- * List domains for an admin user. If $username is empty, it returns all
- * available damains for a user.
- * Otherwise, it returns only those domains for a particular user.
+ * List domains for an admin user.
* @param String $username
* @return array of domain names.
*/
@@ -674,25 +672,15 @@
global $CONF;
global $table_domain, $table_domain_admins;
$list = array ();
-
- $username_sql = '';
+ // does $username need escaping here?
$active_sql = db_get_boolean(True);
$backupmx_sql = db_get_boolean(False);
- if($username != '') {
- $query = "SELECT $table_domain.domain, $table_domain_admins.username FROM $table_domain
- LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain
- WHERE $table_domain_admins.username='$username'
- AND $table_domain.active=$active_sql
- AND $table_domain.backupmx=$backupmx_sql
- ORDER BY $table_domain_admins.domain";
- }
- else {
- $query = "SELECT $table_domain.domain FROM $table_domain
- LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain
- WHERE $table_domain.active=$active_sql
- AND $table_domain.backupmx=$backupmx_sql
- ORDER BY $table_domain_admins.domain";
- }
+ $query = "SELECT $table_domain.domain, $table_domain_admins.username FROM $table_domain
+ LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain
+ WHERE $table_domain_admins.username='$username'
+ AND $table_domain.active=$active_sql
+ AND $table_domain.backupmx=$backupmx_sql
+ ORDER BY $table_domain_admins.domain";
$result = db_query ($query);
if ($result['rows'] > 0)
@@ -1474,7 +1462,7 @@
'edit_mailbox_state'
'edit_password'
-*/
+ */
function db_log ($username,$domain,$action,$data)
{
global $CONF;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-28 19:29:07
|
Revision: 103
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=103&view=rev
Author: GingerDog
Date: 2007-09-28 12:29:10 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
templates/header.tpl: basic flash messaging, basic capability for info and error messages; needs css styling
Modified Paths:
--------------
trunk/templates/header.tpl
Modified: trunk/templates/header.tpl
===================================================================
--- trunk/templates/header.tpl 2007-09-28 19:28:24 UTC (rev 102)
+++ trunk/templates/header.tpl 2007-09-28 19:29:10 UTC (rev 103)
@@ -38,3 +38,23 @@
}
?>
</div>
+
+<?php
+if(isset($_SESSION['flash'])) {
+ if(isset($_SESSION['flash']['info'])) {
+ echo '<ul class="flash-info">';
+ foreach($_SESSION['flash']['info'] as $msg) {
+ echo "<li>$msg</li>";
+ }
+ echo '</ul>';
+ }
+ if(isset($_SESSION['flash']['error'])) {
+ echo '<ul class="flash-error">';
+ foreach($_SESSION['flash']['error'] as $msg) {
+ echo "<li>$msg</li>";
+ }
+ echo '</ul>';
+ }
+ /* nuke it from orbit. It's the only way to be sure. */
+ $_SESSION['flash'] = array();
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-28 19:28:20
|
Revision: 102
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=102&view=rev
Author: GingerDog
Date: 2007-09-28 12:28:24 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
common.php: magic quotes stuff
Modified Paths:
--------------
trunk/common.php
Modified: trunk/common.php
===================================================================
--- trunk/common.php 2007-09-28 19:27:51 UTC (rev 101)
+++ trunk/common.php 2007-09-28 19:28:24 UTC (rev 102)
@@ -14,6 +14,8 @@
//
$incpath = dirname(__FILE__);
+(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');
+(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1');
require_once("$incpath/variables.inc.php");
if(!is_file("$incpath/config.inc.php")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-28 19:27:48
|
Revision: 101
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=101&view=rev
Author: GingerDog
Date: 2007-09-28 12:27:51 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
functions.inc.php: fix escape_string to handle arrays, move magic_quotes stuff to common.php; add flash message stuff (See also header.php)
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-09-27 23:46:59 UTC (rev 100)
+++ trunk/functions.inc.php 2007-09-28 19:27:51 UTC (rev 101)
@@ -98,6 +98,39 @@
}
+/**
+ * Add an error message for display on the next page that is rendered.
+ * @param String message to show.
+ *
+ * Stores string in session. Flushed through header template.
+ * @see _flash_string()
+ */
+function flash_error($string) {
+ _flash_string('error', $string);
+}
+
+/**
+ * Used to display an info message on successful update.
+ * @param String $string
+ * Stores data in sessio.
+ * @see _flash_string()
+ */
+function flash_info($string) {
+ _flash_string('info', $string);
+}
+/**
+ * 'Private' method used for flash_info() and flash_error().
+ */
+function _flash_string($type, $string) {
+ if(!isset($_SESSION['flash'])) {
+ $_SESSION['flash'] = array();
+ }
+ if(!isset($_SESSION['flash'][$type])) {
+ $_SESSION['flash'][$type] = array();
+ }
+ $_SESSION['flash'][$type][] = $string;
+}
+
//
// check_language
// Action: checks what language the browser uses
@@ -232,16 +265,26 @@
-//
-// escape_string
-// Action: Escape a string
-// Call: escape_string (string string)
-//
-(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');
-(ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_sybase', '0') : '1');
+/**
+ * Clean a string, escaping any meta characters that could be
+ * used to disrupt an SQL string. i.e. "'" => "\'" etc.
+ *
+ * @param String (or Array)
+ * @return String (or Array) of cleaned data, suitable for use within an SQL
+ * statement.
+ */
function escape_string ($string)
{
global $CONF;
+ // if the string is actually an array, do a recursive cleaning.
+ // Note, the array keys are not cleaned.
+ if(is_array($string)) {
+ $clean = array();
+ foreach($string as $row) {
+ $clean[] = escape_string($row);
+ }
+ return $clean;
+ }
if (get_magic_quotes_gpc ())
{
$string = stripslashes($string);
@@ -619,23 +662,38 @@
}
-
-//
-// list_domains_for_admin
-// Action: Lists all the domains for an admin.
-// Call: list_domains_for_admin (string admin)
-//
+/**
+ * List domains for an admin user. If $username is empty, it returns all
+ * available damains for a user.
+ * Otherwise, it returns only those domains for a particular user.
+ * @param String $username
+ * @return array of domain names.
+ */
function list_domains_for_admin ($username)
{
global $CONF;
global $table_domain, $table_domain_admins;
$list = array ();
- $query = "SELECT $table_domain.domain FROM $table_domain LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain WHERE $table_domain_admins.username='$username' AND $table_domain.active='1' AND $table_domain.backupmx='0' ORDER BY $table_domain_admins.domain";
- if ('pgsql'==$CONF['database_type'])
- {
- $query = "SELECT $table_domain.domain FROM $table_domain LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain WHERE $table_domain_admins.username='$username' AND $table_domain.active=true AND $table_domain.backupmx=false ORDER BY $table_domain_admins.domain";
+ $username_sql = '';
+ $active_sql = db_get_boolean(True);
+ $backupmx_sql = db_get_boolean(False);
+ if($username != '') {
+ $query = "SELECT $table_domain.domain, $table_domain_admins.username FROM $table_domain
+ LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain
+ WHERE $table_domain_admins.username='$username'
+ AND $table_domain.active=$active_sql
+ AND $table_domain.backupmx=$backupmx_sql
+ ORDER BY $table_domain_admins.domain";
}
+ else {
+ $query = "SELECT $table_domain.domain FROM $table_domain
+ LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain
+ WHERE $table_domain.active=$active_sql
+ AND $table_domain.backupmx=$backupmx_sql
+ ORDER BY $table_domain_admins.domain";
+ }
+
$result = db_query ($query);
if ($result['rows'] > 0)
{
@@ -1233,7 +1291,7 @@
if (function_exists ("pg_pconnect"))
{
$connect_string = "host=" . $CONF['database_host'] . " dbname=" . $CONF['database_name'] . " user=" . $CONF['database_user'] . " password=" . $CONF['database_password'];
- $link = @pg_pconnect ($connect_string) or die ("<p />DEBUG INFORMATION:<br />Connect: " . pg_last_error($link) . "$DEBUG_TEXT");
+ $link = @pg_pconnect ($connect_string) or die ("<p />DEBUG INFORMATION:<br />Connect: failed to connect to database. $DEBUG_TEXT");
pg_set_client_encoding($link, 'UNICODE');
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-27 23:47:01
|
Revision: 100
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=100&view=rev
Author: christian_boltz
Date: 2007-09-27 16:46:59 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
- fix: edit links contained <span ...>...</span> from search highlighting.
(see forum post: https://sourceforge.net/forum/message.php?msg_id=4540915)
Now using separate variables for highlighting in strings that end up in links.
Modified Paths:
--------------
trunk/templates/search.tpl
Modified: trunk/templates/search.tpl
===================================================================
--- trunk/templates/search.tpl 2007-09-27 23:24:48 UTC (rev 99)
+++ trunk/templates/search.tpl 2007-09-27 23:46:59 UTC (rev 100)
@@ -61,13 +61,14 @@
{
print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
//highlight search string
- if (stristr($tAlias[$i]['address'],$fSearch))
+ $tAlias[$i]['display_address'] = $tAlias[$i]['address'];
+ if (stristr($tAlias[$i]['display_address'],$fSearch))
{
$new_address = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
- $fSearch . "</span>", $tAlias[$i]['address']);
- $tAlias[$i]['address'] = $new_address;
+ $fSearch . "</span>", $tAlias[$i]['display_address']);
+ $tAlias[$i]['display_address'] = $new_address;
}
- print " <td>" . $tAlias[$i]['address'] . "</td>\n";
+ print " <td>" . $tAlias[$i]['display_address'] . "</td>\n";
if (stristr($tAlias[$i]['goto'],$fSearch))
{
$new_goto = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
@@ -137,13 +138,14 @@
if ((is_array ($tMailbox) and sizeof ($tMailbox) > 0))
{
print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
- if (stristr($tMailbox[$i]['username'],$fSearch))
+ $tMailbox[$i]['display_username'] = $tMailbox[$i]['username'];
+ if (stristr($tMailbox[$i]['display_username'],$fSearch))
{
$new_name = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
- $fSearch . "</span>", $tMailbox[$i]['username']);
- $tMailbox[$i]['username'] = $new_name;
+ $fSearch . "</span>", $tMailbox[$i]['display_username']);
+ $tMailbox[$i]['display_username'] = $new_name;
}
- print " <td>" . $tMailbox[$i]['username'] . "</td>\n";
+ print " <td>" . $tMailbox[$i]['display_username'] . "</td>\n";
if (stristr($tMailbox[$i]['name'],$fSearch))
{
$new_name = str_ireplace($fSearch, "<span style='background-color: lightgreen'>" .
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-27 23:24:57
|
Revision: 99
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=99&view=rev
Author: christian_boltz
Date: 2007-09-27 16:24:48 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
- fix: added edit_mailbox as allowed log action
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2007-09-25 20:07:00 UTC (rev 98)
+++ trunk/functions.inc.php 2007-09-27 23:24:48 UTC (rev 99)
@@ -1423,7 +1423,7 @@
global $table_log;
$REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
- $action_list = array('create_alias', 'delete_alias', 'edit_alias', 'create_mailbox', 'delete_mailbox', 'edit_alias_state', 'edit_mailbox_state', 'edit_password');
+ $action_list = array('create_alias', 'delete_alias', 'edit_alias', 'create_mailbox', 'delete_mailbox', 'edit_mailbox', 'edit_alias_state', 'edit_mailbox_state', 'edit_password');
if(!in_array($action, $action_list)) {
die("Invalid log action : $action"); // could do with something better?
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-25 20:07:02
|
Revision: 98
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=98&view=rev
Author: GingerDog
Date: 2007-09-25 13:07:00 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
admin/edit-domain.php: sql refactoring
Modified Paths:
--------------
trunk/admin/edit-domain.php
Modified: trunk/admin/edit-domain.php
===================================================================
--- trunk/admin/edit-domain.php 2007-09-25 20:06:28 UTC (rev 97)
+++ trunk/admin/edit-domain.php 2007-09-25 20:07:00 UTC (rev 98)
@@ -74,17 +74,21 @@
$fMailboxes = -1;
$fMaxquota = -1;
$fBackupmx = 1;
- $sqlBackupmx = ('pgsql'==$CONF['database_type']) ? 'true' : 1;
+ $sqlBackupmx = db_get_boolean(True);
}
else
{
$fBackupmx = 0;
- $sqlBackupmx = ('pgsql'==$CONF['database_type']) ? 'false' : 0;
+ $sqlBackupmx = db_get_boolean(False);
}
- if ($fActive == "on") { $fActive = 1; }
- $sqlActive=$fActive;
- if ('pgsql'==$CONF['database_type']) $sqlActive = $fActive ? 'true':'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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-25 20:06:25
|
Revision: 97
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=97&view=rev
Author: GingerDog
Date: 2007-09-25 13:06:28 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
users/login.php: sql refactoring
Modified Paths:
--------------
trunk/users/login.php
Modified: trunk/users/login.php
===================================================================
--- trunk/users/login.php 2007-09-25 19:54:03 UTC (rev 96)
+++ trunk/users/login.php 2007-09-25 20:06:28 UTC (rev 97)
@@ -35,22 +35,17 @@
$fUsername = escape_string ($_POST['fUsername']);
$fPassword = escape_string ($_POST['fPassword']);
- $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active='1'";
- if ('pgsql'==$CONF['database_type'])
- {
- $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active=true";
- }
+ $active = db_get_boolean(True);
+ $query = "SELECT password FROM $table_mailbox WHERE username='$fUsername' AND active=$active";
+
$result = db_query ($query);
if ($result['rows'] == 1)
{
$row = db_array ($result['result']);
$password = pacrypt ($fPassword, $row['password']);
- $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active='1'";
- if ('pgsql'==$CONF['database_type'])
- {
- $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active=true";
- }
+ $query = "SELECT * FROM $table_mailbox WHERE username='$fUsername' AND password='$password' AND active=$active";
+
$result = db_query ($query);
if ($result['rows'] != 1)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2007-09-25 19:53:59
|
Revision: 96
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=96&view=rev
Author: GingerDog
Date: 2007-09-25 12:54:03 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
screenshots: adding
Added Paths:
-----------
trunk/DOCUMENTS/screenshots/
trunk/DOCUMENTS/screenshots/README.txt
trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-alias.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-domain.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-mailbox.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-admin-domain-list.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-admin-virtual-list.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-inital-welcome.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-mail-admin-login.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-user-change-forward.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-user-overview.jpg
trunk/DOCUMENTS/screenshots/postfixadmin-user-vacation.jpg
Added: trunk/DOCUMENTS/screenshots/README.txt
===================================================================
--- trunk/DOCUMENTS/screenshots/README.txt (rev 0)
+++ trunk/DOCUMENTS/screenshots/README.txt 2007-09-25 19:54:03 UTC (rev 96)
@@ -0,0 +1,2 @@
+Random Screenshots taken on 2007/09/25, using a version of Postfixadmin from subversion.
+
Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-alias.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-alias.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-domain.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-domain.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-mailbox.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-create-mailbox.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-domain-list.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-domain-list.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-admin-virtual-list.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-admin-virtual-list.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-inital-welcome.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-inital-welcome.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-mail-admin-login.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-mail-admin-login.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-user-change-forward.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-user-change-forward.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-user-overview.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-user-overview.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/DOCUMENTS/screenshots/postfixadmin-user-vacation.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/DOCUMENTS/screenshots/postfixadmin-user-vacation.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-24 23:24:14
|
Revision: 95
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=95&view=rev
Author: christian_boltz
Date: 2007-09-24 16:24:18 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
- removed forgotten TODO
Modified Paths:
--------------
trunk/templates/search.tpl
Modified: trunk/templates/search.tpl
===================================================================
--- trunk/templates/search.tpl 2007-09-24 22:01:09 UTC (rev 94)
+++ trunk/templates/search.tpl 2007-09-24 23:24:18 UTC (rev 95)
@@ -26,7 +26,6 @@
</select>
<?php
if (authentication_has_role('global-admin')) {
- # TODO: make "Return to" translatable
?>
<input class="button" type="submit" name="fGo" value="<?php print $PALANG['pReturn_to'] . ' ' . $PALANG['pAdminMenu_list_virtual']; ?>" /></td>
<?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
