Mirrors
/
postfixadmin
mirror of https://github.com/postfixadmin/postfixadmin.git
3
0
Fork 0
Code Releases Activity
Browse Source

- merge admin/search.php into search.php 

- merge GET and POST code
- admin/search.php still has the old code commented out

@pgsql users: please test the search - I can't promise that everything works. 
There are several TODOs / open questions regarding pgsql in search.php currently...


git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@126 a1433add-5e2c-0410-b055-b7f2511e0802
postfixadmin-2.3
Christian Boltz 19 years ago
parent
57df6f53ea
commit
809c1ec42c
2 changed files with 43 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      admin/search.php
  2. 105
      search.php

8
admin/search.php
View File

@ -30,6 +30,9 @@
require_once('../common.php');
require_once('../search.php');
/*
authentication_require_role('global-admin');
$tAlias = array();
@ -97,7 +100,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET")
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/admin_search.tpl");
include ("../templates/search.tpl");
include ("../templates/footer.tpl");
}
@ -169,8 +172,9 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
include ("../templates/header.tpl");
include ("../templates/admin_menu.tpl");
include ("../templates/admin_search.tpl");
include ("../templates/search.tpl");
include ("../templates/footer.tpl");
}
*/
/* vim: set expandtab softtabstop=3 tabstop=3 shiftwidth=3: */
?>

105
search.php
View File

@ -46,63 +46,8 @@ $tMailbox = array();
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
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";
}
$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'])
{
$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";
}
$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'])
{
$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");
if (isset ($_GET['fGo'])) $fGo = escape_string ($_GET['fGo']);
if (isset ($_GET['fDomain'])) $fDomain = escape_string ($_GET['domain']);
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
@ -110,8 +55,9 @@ 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))
if (empty ($fSearch) /* && !empty ($fGo) */)
{
if (authentication_has_role('global-admin'))
{
@ -123,7 +69,6 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
}
}
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";
@ -138,47 +83,71 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
{
while ($row = db_array ($result['result']))
{
if (check_owner ($SESSID_USERNAME, $row['domain']))
if (check_owner ($SESSID_USERNAME, $row['domain']) || authentication_has_role('global-admin'))
{
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");
# TODO: special query for pgsql needed?
}
else
{
$query = "SELECT * FROM $table_mailbox WHERE username LIKE '%$fSearch%' OR name LIKE '%$fSearch%' ORDER BY username";
/* TODO: special query for pgsql really needed?
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");
$result = db_query ($query);
if ($result['rows'] > 0)
{
while ($row = db_array ($result['result']))
{
if (check_owner ($SESSID_USERNAME, $row['domain']))
if (check_owner ($SESSID_USERNAME, $row['domain']) || authentication_has_role('global-admin'))
{
if ('pgsql'==$CONF['database_type'])
{
$row['created']=gmstrftime('%c %Z',$row['created']);
$row['modified']=gmstrftime('%c %Z',$row['modified']);
# TODO: code from admin/search.php
# $row['created']=gmstrftime('%c %Z',$row['uts_created']);
# $row['modified']=gmstrftime('%c %Z',$row['uts_modified']);
$row['active']=('t'==$row['active']) ? 1 : 0;
}
# TODO: code from admin/search.php
# unset($row['uts_created']);
# unset($row['uts_modified']);
}
$tMailbox[] = $row;
}
}
}
include ("./templates/header.tpl");
include ("./templates/menu.tpl");
include ("./templates/search.tpl");
include ("./templates/footer.tpl");
include ("$incpath/templates/header.tpl");
if (authentication_has_role('global-admin')) {
include ("$incpath/templates/admin_menu.tpl");
} else {
include ("$incpath/templates/menu.tpl");
}
include ("$incpath/templates/search.tpl");
include ("$incpath/templates/footer.tpl");
?>
Write Preview
Loading…
Cancel
Save