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

admin/*, users/* - code refactoring

Browse Source 
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@67 a1433add-5e2c-0410-b055-b7f2511e0802
postfixadmin-2.3
David Goodwin 17 years ago
parent 68511080ff
commit cf5b117aa5
27 changed files with 334 additions and 360 deletions
Show Stats Download Patch File Download Diff File

9
admin/backup.php
Unescape Escape View File

@ -17,12 +17,11 @@
// //
// -none- // -none-
// //
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
(($CONF['backup'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1'); (($CONF['backup'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
// TODO: make backup supported for postgres // TODO: make backup supported for postgres

11
admin/broadcast-message.php
Unescape Escape View File

@ -20,13 +20,12 @@
// b_message // b_message
// //
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
$SESSID_USERNAME = authentication_get_username();
if ($_SERVER['REQUEST_METHOD'] == "POST") if ($_SERVER['REQUEST_METHOD'] == "POST")
{ {

9
admin/create-admin.php
Unescape Escape View File

@ -23,13 +23,10 @@
// fPassword2 // fPassword2
// fDomains // fDomains
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
$list_domains = list_domains (); $list_domains = list_domains ();
$tDomains = array(); $tDomains = array();

1
admin/create-alias.php
Unescape Escape View File

@ -23,7 +23,6 @@
// fDomain // fDomain
// //
$incpath = '..';
require ("../create-alias.php"); require ("../create-alias.php");
?> ?>

10
admin/create-domain.php
Unescape Escape View File

@ -28,13 +28,11 @@
// fMaxquota // fMaxquota
// fDefaultaliases // fDefaultaliases
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {

1
admin/create-mailbox.php
Unescape Escape View File

@ -29,7 +29,6 @@
// fMail // fMail
// //
$incpath = '..';
require ("../create-mailbox.php"); require ("../create-mailbox.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */

9
admin/delete.php
Unescape Escape View File

@ -20,13 +20,10 @@
// fDelete // fDelete
// fDomain // fDomain
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {

9
admin/edit-active-admin.php
Unescape Escape View File

@ -17,13 +17,10 @@
// //
// fUsername // fUsername
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {

9
admin/edit-active-domain.php
Unescape Escape View File

@ -17,13 +17,10 @@
// //
// fDomain // fDomain
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {

1
admin/edit-active.php
Unescape Escape View File

@ -19,7 +19,6 @@
// fDomain // fDomain
// //
$incpath = "..";
require("../edit-active.php"); require("../edit-active.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */

9
admin/edit-admin.php
Unescape Escape View File

@ -25,13 +25,10 @@
// fMaxquota // fMaxquota
// fActive // fActive
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {

1
admin/edit-alias.php
Unescape Escape View File

@ -21,7 +21,6 @@
// fGoto // fGoto
// //
$incpath = "..";
require("../edit-alias.php"); require("../edit-alias.php");
?> ?>

9
admin/edit-domain.php
Unescape Escape View File

@ -25,13 +25,10 @@
// fMaxquota // fMaxquota
// fActive // fActive
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {

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

@ -26,7 +26,6 @@
// fActive // fActive
// //
$incpath = "..";
require("../edit-mailbox.php"); require("../edit-mailbox.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */

1
admin/edit-vacation.php
Unescape Escape View File

@ -27,7 +27,6 @@
// //
// //
$incpath = '..';
require ("../edit-vacation.php"); require ("../edit-vacation.php");
?> ?>

2
admin/index.php
Unescape Escape View File

@ -18,5 +18,5 @@
// -none- // -none-
// //
header ("Location: list-admin.php"); header ("Location: list-admin.php");
exit; exit(0);
?> ?>

9
admin/list-admin.php
Unescape Escape View File

@ -17,13 +17,10 @@
// //
// -none- // -none-
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once("../common.php");
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
$list_admins = list_admins (); $list_admins = list_admins ();
if ((is_array ($list_admins) and sizeof ($list_admins) > 0)) if ((is_array ($list_admins) and sizeof ($list_admins) > 0))

9
admin/list-domain.php
Unescape Escape View File

@ -17,13 +17,10 @@
// //
// fUsername // fUsername
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
$list_admins = list_admins (); $list_admins = list_admins ();

10
admin/list-virtual.php
Unescape Escape View File

@ -20,13 +20,10 @@
// fDomain // fDomain
// fDisplay // fDisplay
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
$list_domains = list_domains (); $list_domains = list_domains ();
@ -79,7 +76,6 @@ 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.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $fDisplay, $page_size"); $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.domain='$fDomain' ORDER BY $table_mailbox.username LIMIT $fDisplay, $page_size");
if ('pgsql'==$CONF['database_type']) if ('pgsql'==$CONF['database_type'])
{ {
//FIXME: postgres query needs to be rewrited
$query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE domain='$fDomain' ORDER BY username LIMIT $page_size OFFSET $fDisplay"; $query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified FROM $table_mailbox WHERE domain='$fDomain' ORDER BY username LIMIT $page_size OFFSET $fDisplay";
} }
} }

9
admin/search.php
Unescape Escape View File

@ -20,13 +20,10 @@
// fDomain // fDomain
// fGo // fGo
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$SESSID_USERNAME = check_session (); require_once('../common.php');
(!check_admin($SESSID_USERNAME) ? header("Location: " . $CONF['postfix_admin_url'] . "/main.php") && exit : '1');
authentication_require_role('global-admin');
$tAlias = array(); $tAlias = array();
$tMailbox = array(); $tMailbox = array();

1
admin/viewlog.php
Unescape Escape View File

@ -19,7 +19,6 @@
// fDomain // fDomain
// //
$incpath = "..";
require("../viewlog.php"); require("../viewlog.php");
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */ /* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */

26
users/edit-alias.php
Unescape Escape View File

@ -20,15 +20,18 @@
// fDomain // fDomain
// fGoto // fGoto
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$USERID_USERNAME = check_user_session (); require_once('../common.php');
authentication_require_role('user');
$USERID_USERNAME = authentication_get_username();
$tmp = preg_split ('/@/', $USERID_USERNAME); $tmp = preg_split ('/@/', $USERID_USERNAME);
$USERID_DOMAIN = $tmp[1]; $USERID_DOMAIN = $tmp[1];
$vacation_domain = $CONF['vacation_domain'];
$vacation_goto = preg_replace('/@/', '#', $USERID_USERNAME) . '@' . $vacation_domain;
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {
$vacation_domain = $CONF['vacation_domain']; $vacation_domain = $CONF['vacation_domain'];
@ -52,7 +55,11 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
if ($_SERVER['REQUEST_METHOD'] == "POST") if ($_SERVER['REQUEST_METHOD'] == "POST")
{ {
$vacation_domain = $CONF['vacation_domain']; // user clicked on cancel button
if(isset($_POST['fCancel'])) {
header("Location: main.php");
exit(0);
}
$pEdit_alias_goto = $PALANG['pEdit_alias_goto']; $pEdit_alias_goto = $PALANG['pEdit_alias_goto'];
@ -95,13 +102,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
{ {
$goto = $USERID_USERNAME; $goto = $USERID_USERNAME;
} }
/* else
{
$goto = $USERID_USERNAME . "," . $goto;
}*/
if ($fVacation == "YES") if ($fVacation == "YES")
{ {
$goto .= "," . $USERID_USERNAME . "@" . $vacation_domain; $goto .= "," . $vacation_goto;
} }
$result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'"); $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'");

16
users/login.php
Unescape Escape View File

@ -19,10 +19,9 @@
// fUsername // fUsername
// fPassword // fPassword
// //
require ("../variables.inc.php");
require ("../config.inc.php"); require_once("../common.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {
@ -68,10 +67,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
if ($error != 1) if ($error != 1)
{ {
session_start(); session_regenerate_id();
session_register("userid"); $_SESSION['sessid'] = array();
$_SESSION['userid']['username'] = $fUsername; $_SESSION['sessid']['roles'] = array();
$_SESSION['sessid']['roles'][] = 'user';
$_SESSION['sessid']['username'] = $fUsername;
header("Location: main.php"); header("Location: main.php");
exit; exit;
} }

4
users/logout.php
Unescape Escape View File

@ -17,10 +17,8 @@
// //
// -none- // -none-
// //
require ("../config.inc.php");
require ("../functions.inc.php");
$USERID_USERNAME = check_user_session (); require_once('../common.php');
session_unset (); session_unset ();
session_destroy (); session_destroy ();

8
users/main.php
Unescape Escape View File

@ -17,11 +17,11 @@
// //
// -none- // -none-
// //
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$USERID_USERNAME = check_user_session (); require_once('../common.php');
authentication_require_role('user');
$USERID_USERNAME = authentication_get_username();
$result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME'"); $result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME'");
if ($result['rows'] == 1) if ($result['rows'] == 1)
{ {

10
users/password.php
Unescape Escape View File

@ -19,12 +19,12 @@
// fPassword // fPassword
// fPassword2 // fPassword2
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$USERID_USERNAME = check_user_session (); require_once('../common.php');
authentication_require_role('user');
$USERID_USERNAME = authentication_get_username();
$tmp = preg_split ('/@/', $USERID_USERNAME); $tmp = preg_split ('/@/', $USERID_USERNAME);
$USERID_DOMAIN = $tmp[1]; $USERID_DOMAIN = $tmp[1];

38
users/vacation.php
Unescape Escape View File

@ -22,19 +22,23 @@
// fAway // fAway
// fBack // fBack
// //
require ("../variables.inc.php");
require ("../config.inc.php");
require ("../functions.inc.php");
include ("../languages/" . check_language () . ".lang");
$USERID_USERNAME = check_user_session (); require_once('../common.php');
(($CONF['vacation'] == 'NO') ? header("Location: " . $CONF['postfix_admin_url'] . "/users/main.php") && exit : '1');
authentication_require_role('user');
$USERID_USERNAME = authentication_get_username();
// is vacation support enabled in $CONF ?
if($CONF['vacation'] == 'NO') {
header("Location: " . $CONF['postfix_admin_url'] . "/users/main.php");
exit(0);
}
$tmp = preg_split ('/@/', $USERID_USERNAME); $tmp = preg_split ('/@/', $USERID_USERNAME);
$USERID_DOMAIN = $tmp[1]; $USERID_DOMAIN = $tmp[1];
if ($_SERVER['REQUEST_METHOD'] == "GET") if ($_SERVER['REQUEST_METHOD'] == "GET")
{ {
$result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME'"); $result = db_query("SELECT * FROM $table_vacation WHERE email='$USERID_USERNAME'");
if ($result['rows'] == 1) if ($result['rows'] == 1)
{ {
@ -42,7 +46,6 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
$tMessage = $PALANG['pUsersVacation_welcome_text']; $tMessage = $PALANG['pUsersVacation_welcome_text'];
$tSubject = $row['subject']; $tSubject = $row['subject'];
$tBody = $row['body']; $tBody = $row['body'];
} }
if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; } if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
@ -58,7 +61,15 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
if ($_SERVER['REQUEST_METHOD'] == "POST") if ($_SERVER['REQUEST_METHOD'] == "POST")
{ {
if(isset($_POST['fCancel'])) {
header("Location: main.php");
exit(0);
}
// We store goto addresses in the form of roger#example.com@autoreply.example.com
$vacation_domain = $CONF['vacation_domain']; $vacation_domain = $CONF['vacation_domain'];
$vacation_goto = preg_replace('/@/', '#', $USERID_USERNAME);
$vacation_goto = "{$vacation_goto}@{$vacation_domain}";
if (isset ($_POST['fSubject'])) $fSubject = escape_string ($_POST['fSubject']); if (isset ($_POST['fSubject'])) $fSubject = escape_string ($_POST['fSubject']);
if (isset ($_POST['fBody'])) $fBody = escape_string ($_POST['fBody']); if (isset ($_POST['fBody'])) $fBody = escape_string ($_POST['fBody']);
@ -69,6 +80,7 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; } if ($tSubject == '') { $tSubject = $PALANG['pUsersVacation_subject_text']; }
if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; } if ($tBody == '') { $tBody = $PALANG['pUsersVacation_body_text']; }
// if they've set themselves away OR back, delete any record of vacation emails etc
if (!empty ($fBack) || !empty ($fAway)) if (!empty ($fBack) || !empty ($fAway))
{ {
$result = db_query ("DELETE FROM $table_vacation WHERE email='$USERID_USERNAME'"); $result = db_query ("DELETE FROM $table_vacation WHERE email='$USERID_USERNAME'");
@ -89,8 +101,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
$tGoto = $row['goto']; $tGoto = $row['goto'];
//only one of these will do something, first handles address at beginning and middle, second at end //only one of these will do something, first handles address at beginning and middle, second at end
$goto= preg_replace ( "/$USERID_USERNAME@$vacation_domain,/", '', $tGoto); $goto= preg_replace ( "/$vacation_goto,/", '', $tGoto);
$goto= preg_replace ( "/,$USERID_USERNAME@$vacation_domain/", '', $goto); $goto= preg_replace ( "/,$vacation_goto/", '', $tGoto);
} }
@ -107,8 +119,10 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
} }
// the user is going away - set the goto alias and vacation table as necessary.
if (!empty ($fAway)) if (!empty ($fAway))
{ {
// Can we ever have no alias records for a user?
$result = db_query ("SELECT * FROM $table_alias WHERE address='$USERID_USERNAME'"); $result = db_query ("SELECT * FROM $table_alias WHERE address='$USERID_USERNAME'");
if ($result['rows'] == 1) if ($result['rows'] == 1)
{ {
@ -123,8 +137,8 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
$error = 1; $error = 1;
$tMessage = $PALANG['pUsersVacation_result_error']; $tMessage = $PALANG['pUsersVacation_result_error'];
} }
// add the goto record back in...
$goto = $tGoto . "," . "$USERID_USERNAME@$vacation_domain"; $goto = $tGoto . "," . $vacation_goto;
$result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'"); $result = db_query ("UPDATE $table_alias SET goto='$goto',modified=NOW() WHERE address='$USERID_USERNAME'");
if ($result['rows'] != 1) if ($result['rows'] != 1)

Write Preview
Loading…
Cancel
Save