webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-09 05:02:44 +03:00
Code Activity

functions.inc.php: remove optional parameter for get_domains_for_admin()

Browse Source 
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@104 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
David Goodwin
2007-09-28 20:28:18 +00:00
parent cb66e25ba4
commit f2bf3cdf97
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
functions.inc.php
View File

@@ -663,9 +663,7 @@ function check_alias_owner ($username, $alias)
/** /**
* List domains for an admin user. If $username is empty, it returns all * List domains for an admin user.
* available damains for a user.
* Otherwise, it returns only those domains for a particular user.
* @param String $username * @param String $username
* @return array of domain names. * @return array of domain names.
*/ */
@@ -674,25 +672,15 @@ function list_domains_for_admin ($username)
global $CONF; global $CONF;
global $table_domain, $table_domain_admins; global $table_domain, $table_domain_admins;
$list = array (); $list = array ();
// does $username need escaping here?
$username_sql = '';
$active_sql = db_get_boolean(True); $active_sql = db_get_boolean(True);
$backupmx_sql = db_get_boolean(False); $backupmx_sql = db_get_boolean(False);
if($username != '') {
$query = "SELECT $table_domain.domain, $table_domain_admins.username FROM $table_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 LEFT JOIN $table_domain_admins ON $table_domain.domain=$table_domain_admins.domain
WHERE $table_domain_admins.username='$username' WHERE $table_domain_admins.username='$username'
AND $table_domain.active=$active_sql AND $table_domain.active=$active_sql
AND $table_domain.backupmx=$backupmx_sql AND $table_domain.backupmx=$backupmx_sql
ORDER BY $table_domain_admins.domain"; 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); $result = db_query ($query);
if ($result['rows'] > 0) if ($result['rows'] > 0)
@@ -1474,7 +1462,7 @@ Possible actions are:
'edit_mailbox_state' 'edit_mailbox_state'
'edit_password' 'edit_password'
*/ */
function db_log ($username,$domain,$action,$data) function db_log ($username,$domain,$action,$data)
{ {
global $CONF; global $CONF;