Finally got rid of admin/ :-)
- moved admin-only scripts from admin/ to /
- removed all merged files ("require('../$file')") from admin/
- changed include paths - no more admin/superadmin switching needed
- admin_menu.tpl is also gone
- removed all menu.tpl / admin_menu.tpl switches - no more needed
- admin/index.php still exists and redirects to /
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@168 a1433add-5e2c-0410-b055-b7f2511e0802
postfixadmin-2.3
Christian Boltz
17 years ago
parent
eb7d2d5a9b
commit
1132b958e5
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require ("../create-alias.php");
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require ("../create-mailbox.php");
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require('../delete.php');
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require("../edit-active.php");
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require("../edit-alias.php");
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require("../edit-mailbox.php");
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require ("../edit-vacation.php");
|
||||
?>
|
||||
@ -1,4 +1,4 @@
|
||||
<?php
|
||||
header ("Location: list-admin.php");
|
||||
header ("Location: ../login.php");
|
||||
exit(0);
|
||||
?>
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
<?php
|
||||
header ("Location: list-admin.php");
|
||||
exit;
|
||||
?>
|
||||
@ -1,180 +0,0 @@
|
||||
<?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: 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');
|
||||
|
||||
require_once('../search.php');
|
||||
|
||||
/*
|
||||
authentication_require_role('global-admin');
|
||||
|
||||
$tAlias = array();
|
||||
$tMailbox = array();
|
||||
$list_domains = list_domains ();
|
||||
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] == "GET")
|
||||
{
|
||||
if (isset ($_GET['search'])) $fSearch = escape_string ($_GET['search']);
|
||||
|
||||
if ($CONF['alias_control'] == "YES")
|
||||
{
|
||||
$query = "SELECT address,goto,modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
|
||||
if ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$query = "SELECT address,goto,extract (epoch from modified) as modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY 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 ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$query = "SELECT address,goto,extract(epoch from modified) as modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) ORDER BY address";
|
||||
}
|
||||
}
|
||||
|
||||
$result = db_query ("$query");
|
||||
|
||||
if ($result['rows'] > 0)
|
||||
{
|
||||
while ($row = db_array ($result['result']))
|
||||
{
|
||||
if ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$row['modified'] = gmstrftime('%c %Z',$row['modified']);
|
||||
$row['active']=('t'==$row['active']) ? 1 : 0;
|
||||
}
|
||||
$tAlias[] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
$query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
|
||||
if ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified 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 ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$row['created']=gmstrftime('%c %Z',$row['uts_created']);
|
||||
$row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
|
||||
$row['active']=('t'==$row['active']) ? 1 : 0;
|
||||
unset($row['uts_created']);
|
||||
unset($row['uts_modified']);
|
||||
}
|
||||
$tMailbox[] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
include ("../templates/header.tpl");
|
||||
include ("../templates/admin_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 (empty ($fSearch) && !empty ($fGo))
|
||||
{
|
||||
header("Location: list-virtual.php?domain=" . $fDomain ) && exit;
|
||||
}
|
||||
|
||||
|
||||
if ($CONF['alias_control'] == "YES")
|
||||
{
|
||||
$query = "SELECT address,goto,modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY address";
|
||||
if ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$query = "SELECT address,goto,extract (epoch from modified) as modified,domain,active FROM $table_alias WHERE address LIKE '%$fSearch%' OR goto LIKE '%$fSearch%' ORDER BY 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 ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$query = "SELECT $table_alias.address,$table_alias.goto,extract(epoch from $table_alias.modified) as $table_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 ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$row['modified'] = gmstrftime('%c %Z',$row['modified']);
|
||||
$row['active']=('t'==$row['active']) ? 1 : 0;
|
||||
}
|
||||
$tAlias[] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
$query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
|
||||
if ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$query = "SELECT *,extract(epoch from created) as uts_created,extract(epoch from modified) as uts_modified 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 ('pgsql'==$CONF['database_type'])
|
||||
{
|
||||
$row['created']=gmstrftime('%c %Z',$row['uts_created']);
|
||||
$row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
|
||||
$row['active']=('t'==$row['active']) ? 1 : 0;
|
||||
unset($row['uts_created']);
|
||||
unset($row['uts_modified']);
|
||||
}
|
||||
$tMailbox[] = $row;
|
||||
}
|
||||
}
|
||||
|
||||
include ("../templates/header.tpl");
|
||||
include ("../templates/admin_menu.tpl");
|
||||
include ("../templates/search.tpl");
|
||||
include ("../templates/footer.tpl");
|
||||
}
|
||||
*/
|
||||
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
|
||||
?>
|
||||
@ -1,3 +0,0 @@
|
||||
<?php
|
||||
require("../viewlog.php");
|
||||
?>
|
||||
@ -1,27 +0,0 @@
|
||||
<div id="menu">
|
||||
<ul>
|
||||
<li><a target="_top" href="list-admin.php"><?php print $PALANG['pAdminMenu_list_admin']; ?></a></li>
|
||||
<li><a target="_top" href="list-domain.php"><?php print $PALANG['pAdminMenu_list_domain']; ?></a></li>
|
||||
<li><a target="_top" href="list-virtual.php"><?php print $PALANG['pAdminMenu_list_virtual']; ?></a></li>
|
||||
<li><a target="_top" href="viewlog.php"><?php print $PALANG['pAdminMenu_viewlog']; ?></a></li>
|
||||
<?php if ('pgsql'!=$CONF['database_type'] and $CONF['backup'] == 'YES') { ?>
|
||||
<li><a target="_top" href="backup.php"><?php print $PALANG['pAdminMenu_backup']; ?></a></li>
|
||||
<?php } ?>
|
||||
<li><a target="_top" href="create-domain.php"><?php print $PALANG['pAdminMenu_create_domain']; ?></a></li>
|
||||
<li><a target="_top" href="create-admin.php"><?php print $PALANG['pAdminMenu_create_admin']; ?></a></li>
|
||||
<?php $url = "create-alias.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain']; ?>
|
||||
<li><a target="_top" href="<?php print $url; ?>"><?php print $PALANG['pAdminMenu_create_alias']; ?></a></li>
|
||||
<li><a target="_top" href="broadcast-message.php"><?php print $PALANG['pAdminMenu_broadcast_message']; ?></a></li>
|
||||
<li><a target="_top" href="../logout.php"><?php print $PALANG['pMenu_logout']; ?></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
if (file_exists (realpath ("../motd-admin.txt")))
|
||||
{
|
||||
print "<div id=\"motd\">\n";
|
||||
include ("../motd-admin.txt");
|
||||
print "</div>";
|
||||
}
|
||||
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
|
||||
?>
|
||||
Loading…
Reference in New Issue