[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.1.2.4
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.1.2.4.2.1,1.1.2.4.2.2 class.uicategories.inc.php,1.2.2.8,1.2.2.8.2.1 |
|
Date: |
Sat, 19 Apr 2003 14:42:42 -0400 |
Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv11274/inc
Modified Files:
Tag: Version-0_9_16-branch
class.uiaclprefs.inc.php class.uicategories.inc.php
Log Message:
updated app-header
Index: class.uiaclprefs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uiaclprefs.inc.php,v
retrieving revision 1.1.2.4.2.1
retrieving revision 1.1.2.4.2.2
diff -C2 -r1.1.2.4.2.1 -r1.1.2.4.2.2
*** class.uiaclprefs.inc.php 26 Mar 2003 22:53:04 -0000 1.1.2.4.2.1
--- class.uiaclprefs.inc.php 19 Apr 2003 18:42:40 -0000 1.1.2.4.2.2
***************
*** 26,43 ****
function index()
{
! $acl_app = $GLOBALS['HTTP_POST_VARS']['acl_app']
? $GLOBALS['HTTP_POST_VARS']['acl_app'] : $GLOBALS['HTTP_GET_VARS']['acl_app'];
! $start = $GLOBALS['HTTP_POST_VARS']['start'] ?
$GLOBALS['HTTP_POST_VARS']['start'] : $GLOBALS['HTTP_GET_VARS']['start'];
! $query = $GLOBALS['HTTP_POST_VARS']['query'] ?
$GLOBALS['HTTP_POST_VARS']['query'] : $GLOBALS['HTTP_GET_VARS']['query'];
! $s_groups =
$GLOBALS['HTTP_POST_VARS']['s_groups'] ? $GLOBALS['HTTP_POST_VARS']['s_groups']
: $GLOBALS['HTTP_GET_VARS']['s_groups'];
! $s_users = $GLOBALS['HTTP_POST_VARS']['s_users']
? $GLOBALS['HTTP_POST_VARS']['s_users'] : $GLOBALS['HTTP_GET_VARS']['s_users'];
!
! if(isset($GLOBALS['HTTP_POST_VARS']['owner']))
! {
! $owner = $GLOBALS['HTTP_POST_VARS']['owner'];
! }
! else
! {
! $owner = $GLOBALS['HTTP_GET_VARS']['owner'];
! }
if (! $acl_app)
--- 26,35 ----
function index()
{
! $acl_app =
get_var('acl_app',array('POST','GET'));
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $s_groups =
get_var('s_groups',array('POST','GET'));
! $s_users =
get_var('s_users',array('POST','GET'));
! $owner = get_var('owner',array('POST','GET'));
if (! $acl_app)
***************
*** 46,49 ****
--- 38,45 ----
$acl_app_not_passed = True;
}
+ else
+ {
+
$GLOBALS['phpgw']->translation->add_app($acl_app);
+ }
$GLOBALS['phpgw_info']['flags']['currentapp'] =
$acl_app;
***************
*** 98,104 ****
$this->acl->read_repository();
! if ($GLOBALS['HTTP_POST_VARS']['submit'])
{
! $processed =
$GLOBALS['HTTP_POST_VARS']['processed'];
$to_remove = unserialize(urldecode($processed));
--- 94,100 ----
$this->acl->read_repository();
! if ($_POST['submit'])
{
! $processed = $_POST['processed'];
$to_remove = unserialize(urldecode($processed));
***************
*** 109,113 ****
/* Group records */
! $group_variable =
$GLOBALS['HTTP_POST_VARS']['g_'.$GLOBALS['phpgw_info']['flags']['currentapp']];
if (!$group_variable)
--- 105,109 ----
/* Group records */
! $group_variable =
$_POST['g_'.$GLOBALS['phpgw_info']['flags']['currentapp']];
if (!$group_variable)
***************
*** 135,139 ****
/* User records */
! $user_variable =
$GLOBALS['HTTP_POST_VARS']['u_'.$GLOBALS['phpgw_info']['flags']['currentapp']];
if (!$user_variable)
--- 131,135 ----
/* User records */
! $user_variable =
$_POST['u_'.$GLOBALS['phpgw_info']['flags']['currentapp']];
if (!$user_variable)
***************
*** 206,209 ****
--- 202,206 ----
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('%1 - Preferences',$GLOBALS['phpgw_info']['apps'][$acl_app]['title']).' -
'.lang('acl').': '.$owner_name;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 235,242 ****
$var = Array(
'errors' => '',
! 'title' =>
'<p><b>'.lang($GLOBALS['phpgw_info']['flags']['currentapp'].' preferences').' -
'.lang('acl').': '.$owner_name.'</b><hr><p>',
'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='
. $acl_app),
'bg_color' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
! 'submit_lang' => lang('submit'),
'common_hidden_vars_form' => $common_hidden_vars
);
--- 232,239 ----
$var = Array(
'errors' => '',
! 'title' => '<br>',
'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='
. $acl_app),
'bg_color' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
! 'submit_lang' => lang('Save'),
'common_hidden_vars_form' => $common_hidden_vars
);
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.8.2.1
diff -C2 -r1.2.2.8 -r1.2.2.8.2.1
*** class.uicategories.inc.php 3 Mar 2003 22:27:10 -0000 1.2.2.8
--- class.uicategories.inc.php 19 Apr 2003 18:42:40 -0000 1.2.2.8.2.1
***************
*** 61,69 ****
{
$this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$this->t->set_var('lang_access',lang('Private'));
$this->t->set_var('lang_save',lang('Save'));
$this->t->set_var('user_name',$this->user);
$this->t->set_var('lang_search',lang('Search'));
! $this->t->set_var('lang_done',lang('Done'));
$this->t->set_var('lang_sub',lang('Add sub'));
$this->t->set_var('lang_edit',lang('Edit'));
--- 61,71 ----
{
$this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
+
$this->t->set_var('row_on',$GLOBALS['phpgw_info']['theme']['row_on']);
+
$this->t->set_var('row_off',$GLOBALS['phpgw_info']['theme']['row_off']);
$this->t->set_var('lang_access',lang('Private'));
$this->t->set_var('lang_save',lang('Save'));
$this->t->set_var('user_name',$this->user);
$this->t->set_var('lang_search',lang('Search'));
! $this->t->set_var('lang_done',lang('Cancel'));
$this->t->set_var('lang_sub',lang('Add sub'));
$this->t->set_var('lang_edit',lang('Edit'));
***************
*** 88,95 ****
function index()
{
! $cats_app = $GLOBALS['HTTP_GET_VARS']['cats_app'] ?
$GLOBALS['HTTP_GET_VARS']['cats_app'] : $GLOBALS['HTTP_POST_VARS']['cats_app'];
! $extra = $GLOBALS['HTTP_GET_VARS']['extra'] ?
$GLOBALS['HTTP_GET_VARS']['extra'] : $GLOBALS['HTTP_POST_VARS']['extra'];
! $global_cats = $GLOBALS['HTTP_GET_VARS']['global_cats']
? $GLOBALS['HTTP_GET_VARS']['global_cats'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cats_level = $GLOBALS['HTTP_GET_VARS']['cats_level']
? $GLOBALS['HTTP_GET_VARS']['cats_level'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
$link_data = array
--- 90,97 ----
function index()
{
! $cats_app = get_var('cats_app',array('GET','POST'));
! $extra = get_var('extra',array('GET','POST'));
! $global_cats =
get_var('global_cats',array('GET','POST'));
! $cats_level =
get_var('cats_level',array('GET','POST'));
$link_data = array
***************
*** 106,110 ****
$edata = explode(',',$extra);
}
!
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 108,113 ----
$edata = explode(',',$extra);
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw_info']['apps'][$cats_app]['title'].
! ' '.lang('categories
for').': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 271,278 ****
function add()
{
! $cats_app = $GLOBALS['HTTP_GET_VARS']['cats_app'] ?
$GLOBALS['HTTP_GET_VARS']['cats_app'] : $GLOBALS['HTTP_POST_VARS']['cats_app'];
! $extra = $GLOBALS['HTTP_GET_VARS']['extra'] ?
$GLOBALS['HTTP_GET_VARS']['extra'] : $GLOBALS['HTTP_POST_VARS']['extra'];
! $global_cats = $GLOBALS['HTTP_GET_VARS']['global_cats']
? $GLOBALS['HTTP_GET_VARS']['global_cats'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cats_level = $GLOBALS['HTTP_GET_VARS']['cats_level']
? $GLOBALS['HTTP_GET_VARS']['cats_level'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
$link_data = array
--- 274,281 ----
function add()
{
! $cats_app = get_var('cats_app',array('GET','POST'));
! $extra = get_var('extra',array('GET','POST'));
! $global_cats =
get_var('global_cats',array('GET','POST'));
! $cats_level =
get_var('cats_level',array('GET','POST'));
$link_data = array
***************
*** 285,298 ****
);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $new_parent =
$GLOBALS['HTTP_POST_VARS']['new_parent'];
! $submit = $GLOBALS['HTTP_POST_VARS']['submit'];
! $cat_parent =
$GLOBALS['HTTP_POST_VARS']['cat_parent'] ?
$GLOBALS['HTTP_POST_VARS']['cat_parent'] :
$GLOBALS['HTTP_GET_VARS']['cat_parent'];
! $cat_name =
$GLOBALS['HTTP_POST_VARS']['cat_name'];
! $cat_description =
$GLOBALS['HTTP_POST_VARS']['cat_description'];
! $cat_data =
$GLOBALS['HTTP_POST_VARS']['cat_data'];
! $cat_access =
$GLOBALS['HTTP_POST_VARS']['cat_access'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
--- 288,303 ----
);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Add %1 category for',
+
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $new_parent = $_POST['new_parent'];
! $submit = $_POST['submit'];
! $cat_parent =
get_var('cat_parent',array('POST','GET'));
! $cat_name = $_POST['cat_name'];
! $cat_description = $_POST['cat_description'];
! $cat_data = $_POST['cat_data'];
! $cat_access = $_POST['cat_access'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
***************
*** 340,345 ****
}
- $this->t->set_var('title_categories',lang('Add %1
category for',lang($cats_app)));
- $this->t->set_var('lang_app',lang($cats_app));
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 345,348 ----
***************
*** 365,368 ****
--- 368,372 ----
for($i=0;$i<count($edata);$i++)
{
+
$this->t->set_var('tr_color',$GLOBALS['phpgw']->nextmatchs->alternate_row_color());
$this->t->set_var('td_data','<input
name="cat_data[' . $edata[$i] . ']" size="50" value="' . $cat_data[$edata[$i]]
. '">');
$this->t->set_var('lang_data',lang($edata[$i]));
***************
*** 381,389 ****
function edit()
{
! $cats_app =
$GLOBALS['HTTP_GET_VARS']['cats_app'] ? $GLOBALS['HTTP_GET_VARS']['cats_app'] :
$GLOBALS['HTTP_POST_VARS']['cats_app'];
! $extra =
$GLOBALS['HTTP_GET_VARS']['extra'] ? $GLOBALS['HTTP_GET_VARS']['extra'] :
$GLOBALS['HTTP_POST_VARS']['extra'];
! $global_cats =
$GLOBALS['HTTP_GET_VARS']['global_cats'] ?
$GLOBALS['HTTP_GET_VARS']['global_cats'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cats_level =
$GLOBALS['HTTP_GET_VARS']['cats_level'] ?
$GLOBALS['HTTP_GET_VARS']['cats_level'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cat_id =
$GLOBALS['HTTP_GET_VARS']['cat_id'] ? $GLOBALS['HTTP_GET_VARS']['cat_id'] :
$GLOBALS['HTTP_POST_VARS']['cat_id'];
$link_data = array
--- 385,393 ----
function edit()
{
! $cats_app = get_var('cats_app',array('GET','POST'));
! $extra = get_var('extra',array('GET','POST'));
! $global_cats =
get_var('global_cats',array('GET','POST'));
! $cats_level =
get_var('cats_level',array('GET','POST'));
! $cat_id = get_var('cat_id',array('GET','POST'));
$link_data = array
***************
*** 399,416 ****
if (!$cat_id)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $new_parent =
$GLOBALS['HTTP_POST_VARS']['new_parent'];
! $submit =
$GLOBALS['HTTP_POST_VARS']['submit'];
! $cat_parent =
$GLOBALS['HTTP_POST_VARS']['cat_parent'];
! $cat_name =
$GLOBALS['HTTP_POST_VARS']['cat_name'];
! $cat_description =
$GLOBALS['HTTP_POST_VARS']['cat_description'];
! $cat_data =
$GLOBALS['HTTP_POST_VARS']['cat_data'];
! $cat_access =
$GLOBALS['HTTP_POST_VARS']['cat_access'];
! $old_parent =
$GLOBALS['HTTP_POST_VARS']['old_parent'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
--- 403,422 ----
if (!$cat_id)
{
!
$GLOBALS['phpgw']->link_redirect('/index.php',$link_data);
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Edit %1 category for',
+
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $new_parent = $_POST['new_parent'];
! $submit = $_POST['submit'];
! $cat_parent = $_POST['cat_parent'];
! $cat_name = $_POST['cat_name'];
! $cat_description = $_POST['cat_description'];
! $cat_data = $_POST['cat_data'];
! $cat_access = $_POST['cat_access'];
! $old_parent = $_POST['old_parent'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
***************
*** 462,467 ****
$cats = $this->bo->cats->return_single($cat_id);
- $this->t->set_var('title_categories',lang('Edit %1
category for',lang($cats_app)));
- $this->t->set_var('lang_app',lang($cats_app));
$link_data['menuaction'] =
'preferences.uicategories.edit';
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 468,471 ----
***************
*** 518,526 ****
function delete()
{
! $cats_app = $GLOBALS['HTTP_GET_VARS']['cats_app'] ?
$GLOBALS['HTTP_GET_VARS']['cats_app'] : $GLOBALS['HTTP_POST_VARS']['cats_app'];
! $extra = $GLOBALS['HTTP_GET_VARS']['extra'] ?
$GLOBALS['HTTP_GET_VARS']['extra'] : $GLOBALS['HTTP_POST_VARS']['extra'];
! $global_cats = $GLOBALS['HTTP_GET_VARS']['global_cats']
? $GLOBALS['HTTP_GET_VARS']['global_cats'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cats_level = $GLOBALS['HTTP_GET_VARS']['cats_level']
? $GLOBALS['HTTP_GET_VARS']['cats_level'] :
$GLOBALS['HTTP_POST_VARS']['global_cats'];
! $cat_id = $GLOBALS['HTTP_GET_VARS']['cat_id'] ?
$GLOBALS['HTTP_GET_VARS']['cat_id'] : $GLOBALS['HTTP_POST_VARS']['cat_id'];
$link_data = array
--- 522,530 ----
function delete()
{
! $cats_app = get_var('cats_app',array('GET','POST'));
! $extra = get_var('extra',array('GET','POST'));
! $global_cats =
get_var('global_cats',array('GET','POST'));
! $cats_level =
get_var('cats_level',array('GET','POST'));
! $cat_id = get_var('cat_id',array('GET','POST'));
$link_data = array
***************
*** 534,547 ****
);
! if (!$cat_id)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
$this->bo->cats->app_name = $cats_app;
! if ($GLOBALS['HTTP_POST_VARS']['confirm'])
{
! if ($GLOBALS['HTTP_POST_VARS']['subs'])
{
$this->bo->delete($cat_id,True);
--- 538,551 ----
);
! if (!$cat_id || $_POST['cancel'])
{
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
$this->bo->cats->app_name = $cats_app;
! if ($_POST['confirm'])
{
! if ($_POST['subs'])
{
$this->bo->delete($cat_id,True);
***************
*** 551,555 ****
$this->bo->delete($cat_id,False);
}
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
else
--- 555,559 ----
$this->bo->delete($cat_id,False);
}
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
else
***************
*** 557,562 ****
$this->t->set_file(array('category_delete' =>
'delete.tpl'));
! $nolink =
$GLOBALS['phpgw']->link('/index.php',$link_data);
!
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 561,565 ----
$this->t->set_file(array('category_delete' =>
'delete.tpl'));
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Delete Categories');
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 582,586 ****
}
- $this->t->set_var('nolink',$nolink);
$this->t->set_var('lang_no',lang('No'));
$link_data['menuaction'] =
'preferences.uicategories.delete';
--- 585,588 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.1.2.4.2.1,1.1.2.4.2.2 class.uicategories.inc.php,1.2.2.8,1.2.2.8.2.1,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: developer_tools/inc class.solangfile.inc.php,1.9.2.4.2.5,1.9.2.4.2.6 class.uilangfile.inc.php,1.10.2.1.2.5,1.10.2.1.2.6 header.inc.php,1.7.2.1.2.1,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: preferences/setup phpgw_de.lang,1.6.2.7.2.2,1.6.2.7.2.3 phpgw_en.lang,1.7.2.9.2.2,1.7.2.9.2.3
- Previous by thread:
[Phpgroupware-cvs] CVS: developer_tools/inc class.solangfile.inc.php,1.9.2.4.2.5,1.9.2.4.2.6 class.uilangfile.inc.php,1.10.2.1.2.5,1.10.2.1.2.6 header.inc.php,1.7.2.1.2.1,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: preferences/setup phpgw_de.lang,1.6.2.7.2.2,1.6.2.7.2.3 phpgw_en.lang,1.7.2.9.2.2,1.7.2.9.2.3
- Index(es):