webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-06 06:42:37 +03:00
Code Activity

model/DomainHandler.php:

Browse Source 
- set $domain_field to enable domain permission handling

list-domain.php:
- use permission handling of DomainHandler. This means:
  - no need to call list_domains_for_admin() 
  - no longer hand over SQL sniplets
  - much easier handling for superadmins and "simulate admin" mode
  - 14 lines less code for permission handling etc.
- remove superfluous/outdated header comments
- move $smarty_assign('select_options') to global section (it's the
  same code for domain admins and superadmins)

Note: don't try to read the diff of list-domain.php.
Read the complete file instead ;-)



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1267 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
Christian Boltz
2011-11-12 22:01:45 +00:00
parent 68c79b9013
commit a0e59f82b9
2 changed files with 19 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
list-domain.php
View File

@@ -13,53 +13,31 @@
* *
* File: list-domain.php * File: list-domain.php
* List all domains as a quick overview. * List all domains as a quick overview.
* Template File: adminlistdomain.tpl
* *
* Template Variables:
*
* -none-
*
* Form POST \ GET Variables:
*
* fUsername
*/ */
require_once('common.php'); require_once('common.php');
authentication_require_role('admin'); authentication_require_role('admin');
if (authentication_has_role('global-admin')) { # default: domain admin restrictions
//if (authentication_has_role('admin')) { $admin_username = authentication_get_username();
$list_admins = array(authentication_get_username());
$is_superadmin = 0;
$fUsername = "";
if (authentication_has_role('global-admin')) { # more permissions? Fine!
$list_admins = list_admins (); $list_admins = list_admins ();
$is_superadmin = 1; $is_superadmin = 1;
$fUsername = escape_string(safepost('fUsername', safeget('username', authentication_get_username()))); # prefer POST over GET variable
if ($fUsername != "") $admin_properties = get_admin_properties($fUsername); $fUsername = safepost('fUsername', safeget('username', authentication_get_username())); # prefer POST over GET variable
} else { if ($fUsername != "") {
$list_admins = array(authentication_get_username()); $admin_username = $fUsername;
$is_superadmin = 0; }
$fUsername = "";
} }
$list_all_domains = 0; $handler = new DomainHandler(0, $admin_username);
if (isset($admin_properties) && $admin_properties['domain_count'] == 'ALL') { # list all domains for superadmins if ($handler->getList()) {
$list_all_domains = 1;
} elseif (!empty($fUsername)) {
$list_domains = list_domains_for_admin ($fUsername);
} elseif ($is_superadmin) {
$list_all_domains = 1;
} else {
$list_domains = list_domains_for_admin(authentication_get_username());
}
if ($list_all_domains == 1) {
$where = " domain != 'ALL' "; # TODO: the ALL dummy domain is annoying...
} else {
$list_domains = escape_string($list_domains);
$where = db_in_clause('domain', $list_domains);
}
$handler = new DomainHandler();
if ($handler->getList($where)) {
$domain_properties = $handler->result(); $domain_properties = $handler->result();
} else { } else {
$domain_properties = array(); $domain_properties = array();
@@ -68,14 +46,10 @@ if ($handler->getList($where)) {
$smarty->assign ('domain_properties', $domain_properties); $smarty->assign ('domain_properties', $domain_properties);
if ($is_superadmin) $smarty->assign ('select_options', select_options($list_admins, array ($fUsername)), false);
{ if ($is_superadmin) {
$smarty->assign('select_options', select_options($list_admins, array ($fUsername)), false);
$smarty->assign('smarty_template', 'adminlistdomain'); $smarty->assign('smarty_template', 'adminlistdomain');
} } else {
else
{
$smarty->assign ('select_options', select_options($list_admins, array ($fUsername)), false);
$smarty->assign ('smarty_template', 'overview-get'); $smarty->assign ('smarty_template', 'overview-get');
} }

2
model/DomainHandler.php
View File

@@ -6,6 +6,8 @@
*/ */
class DomainHandler extends PFAHandler { class DomainHandler extends PFAHandler {
protected $domain_field = 'domain';
protected function validate_new_id() { protected function validate_new_id() {
$valid = check_domain($this->id); $valid = check_domain($this->id);