mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-23 19:31:53 +02:00
Minor formatting
This commit is contained in:
parent
948dc70875
commit
a4eafadbcc
@ -16,7 +16,7 @@
|
|||||||
'enable_nextmatchs_class' => True,
|
'enable_nextmatchs_class' => True,
|
||||||
'noappheader' => True,
|
'noappheader' => True,
|
||||||
'noappfooter' => True
|
'noappfooter' => True
|
||||||
);
|
);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
// header from calendar-app resets $owner
|
// header from calendar-app resets $owner
|
||||||
@ -98,11 +98,11 @@
|
|||||||
unset($acct);
|
unset($acct);
|
||||||
$acl = CreateObject('phpgwapi.acl',intval($owner));
|
$acl = CreateObject('phpgwapi.acl',intval($owner));
|
||||||
$acl->read_repository();
|
$acl->read_repository();
|
||||||
|
|
||||||
if ($submit)
|
if ($submit)
|
||||||
{
|
{
|
||||||
$to_remove = unserialize(urldecode($processed));
|
$to_remove = unserialize(urldecode($processed));
|
||||||
|
|
||||||
for($i=0;$i<count($to_remove);$i++)
|
for($i=0;$i<count($to_remove);$i++)
|
||||||
{
|
{
|
||||||
$acl->delete($phpgw_info['flags']['currentapp'],$to_remove[$i]);
|
$acl->delete($phpgw_info['flags']['currentapp'],$to_remove[$i]);
|
||||||
@ -174,7 +174,7 @@
|
|||||||
$s_groups = 0;
|
$s_groups = 0;
|
||||||
$s_users = 0;
|
$s_users = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!isset($s_groups))
|
if(!isset($s_groups))
|
||||||
{
|
{
|
||||||
$s_groups = 0;
|
$s_groups = 0;
|
||||||
@ -206,9 +206,9 @@
|
|||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
$templates = Array (
|
$templates = Array (
|
||||||
'preferences' => 'preference_acl.tpl',
|
'preferences' => 'preference_acl.tpl',
|
||||||
'row_colspan' => 'preference_colspan.tpl',
|
'row_colspan' => 'preference_colspan.tpl',
|
||||||
'acl_row' => 'preference_acl_row.tpl'
|
'acl_row' => 'preference_acl_row.tpl'
|
||||||
);
|
);
|
||||||
|
|
||||||
$p->set_file($templates);
|
$p->set_file($templates);
|
||||||
@ -218,7 +218,8 @@
|
|||||||
$p->set_var('errors',lang('ACL grants have been updated'));
|
$p->set_var('errors',lang('ACL grants have been updated'));
|
||||||
}
|
}
|
||||||
|
|
||||||
$common_hidden_vars = ' <input type="hidden" name="s_groups" value="'.$s_groups.'">'."\n"
|
$common_hidden_vars =
|
||||||
|
' <input type="hidden" name="s_groups" value="'.$s_groups.'">'."\n"
|
||||||
. ' <input type="hidden" name="s_users" value="'.$s_users.'">'."\n"
|
. ' <input type="hidden" name="s_users" value="'.$s_users.'">'."\n"
|
||||||
. ' <input type="hidden" name="maxm" value="'.$maxm.'">'."\n"
|
. ' <input type="hidden" name="maxm" value="'.$maxm.'">'."\n"
|
||||||
. ' <input type="hidden" name="totalentries" value="'.$totalentries.'">'."\n"
|
. ' <input type="hidden" name="totalentries" value="'.$totalentries.'">'."\n"
|
||||||
@ -227,14 +228,14 @@
|
|||||||
. ' <input type="hidden" name="owner" value="'.$owner.'">'."\n";
|
. ' <input type="hidden" name="owner" value="'.$owner.'">'."\n";
|
||||||
|
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'errors' => '',
|
'errors' => '',
|
||||||
'title' => '<p><b>'.lang($phpgw_info['flags']['currentapp'].' preferences').' - '.lang('acl').': '.$owner_name.'</b><hr><p>',
|
'title' => '<p><b>'.lang($phpgw_info['flags']['currentapp'].' preferences').' - '.lang('acl').': '.$owner_name.'</b><hr><p>',
|
||||||
'action_url' => $phpgw->link('/preferences/acl_preferences.php','acl_app=' . $acl_app),
|
'action_url' => $phpgw->link('/preferences/acl_preferences.php','acl_app=' . $acl_app),
|
||||||
'bg_color' => $phpgw_info['theme']['th_bg'],
|
'bg_color' => $phpgw_info['theme']['th_bg'],
|
||||||
'submit_lang' => lang('submit'),
|
'submit_lang' => lang('submit'),
|
||||||
'common_hidden_vars_form' => $common_hidden_vars
|
'common_hidden_vars_form' => $common_hidden_vars
|
||||||
);
|
);
|
||||||
|
|
||||||
$p->set_var($var);
|
$p->set_var($var);
|
||||||
|
|
||||||
if(isset($query_result) && $query_result)
|
if(isset($query_result) && $query_result)
|
||||||
@ -245,12 +246,12 @@
|
|||||||
$p->set_var('common_hidden_vars',$common_hidden_vars);
|
$p->set_var('common_hidden_vars',$common_hidden_vars);
|
||||||
|
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'read_lang' => lang('Read'),
|
'read_lang' => lang('Read'),
|
||||||
'add_lang' => lang('Add'),
|
'add_lang' => lang('Add'),
|
||||||
'edit_lang' => lang('Edit'),
|
'edit_lang' => lang('Edit'),
|
||||||
'delete_lang' => lang('Delete')
|
'delete_lang' => lang('Delete')
|
||||||
);
|
);
|
||||||
|
|
||||||
$p->set_var($var);
|
$p->set_var($var);
|
||||||
$p->set_var('private_lang',lang('Private'));
|
$p->set_var('private_lang',lang('Private'));
|
||||||
|
|
||||||
@ -264,7 +265,7 @@
|
|||||||
{
|
{
|
||||||
$group = $groups[$k];
|
$group = $groups[$k];
|
||||||
$go = True;
|
$go = True;
|
||||||
|
|
||||||
if($query)
|
if($query)
|
||||||
{
|
{
|
||||||
if(!strpos(' '.$group['account_lid'].' ',$query))
|
if(!strpos(' '.$group['account_lid'].' ',$query))
|
||||||
@ -272,7 +273,7 @@
|
|||||||
$go = False;
|
$go = False;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($go)
|
if($go)
|
||||||
{
|
{
|
||||||
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
|
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
|
||||||
@ -316,8 +317,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($go && $user['account_id'] != $owner) // Need to be $owner not $phpgw_info['user']['account_id']
|
if($go && $user['account_id'] != $owner) // Need to be $owner not $phpgw_info['user']['account_id']
|
||||||
{ // or the admin can't get special grants from a group
|
{ // or the admin can't get special grants from a group
|
||||||
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
|
$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
|
||||||
display_row($tr_color,'u_',$user['account_id'],$phpgw->common->display_fullname($user['account_lid'],$user['account_firstname'],$user['account_lastname']),$is_group);
|
display_row($tr_color,'u_',$user['account_id'],$phpgw->common->display_fullname($user['account_lid'],$user['account_firstname'],$user['account_lastname']),$is_group);
|
||||||
$s_users++;
|
$s_users++;
|
||||||
@ -338,13 +339,13 @@
|
|||||||
. '&total=' . ($start + $total) . '&owner='.$owner;
|
. '&total=' . ($start + $total) . '&owner='.$owner;
|
||||||
|
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'nml' => $phpgw->nextmatchs->left('/preferences/acl_preferences.php',$start,$totalentries,$extra_parms),
|
'nml' => $phpgw->nextmatchs->left('/preferences/acl_preferences.php',$start,$totalentries,$extra_parms),
|
||||||
'nmr' => $phpgw->nextmatchs->right('/preferences/acl_preferences.php',$start,$totalentries,$extra_parms),
|
'nmr' => $phpgw->nextmatchs->right('/preferences/acl_preferences.php',$start,$totalentries,$extra_parms),
|
||||||
'search_value' => (isset($query) && $query?$query:''),
|
'search_value' => (isset($query) && $query?$query:''),
|
||||||
'search' => lang('search'),
|
'search' => lang('search'),
|
||||||
'processed' => urlencode(serialize($processed))
|
'processed' => urlencode(serialize($processed))
|
||||||
);
|
);
|
||||||
|
|
||||||
$p->set_var($var);
|
$p->set_var($var);
|
||||||
|
|
||||||
$p->pfp('out','preferences');
|
$p->pfp('out','preferences');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user