[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.7,1
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.7,1.8 class.uiaclprefs.inc.php,1.7,1.8 class.uicategories.inc.php,1.11,1.12 |
|
Date: |
Mon, 17 Jun 2002 21:09:23 -0400 |
Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv19759
Modified Files:
class.bocategories.inc.php class.uiaclprefs.inc.php
class.uicategories.inc.php
Log Message:
formatting
Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.bocategories.inc.php 29 Apr 2002 22:25:02 -0000 1.7
--- class.bocategories.inc.php 18 Jun 2002 01:09:20 -0000 1.8
***************
*** 23,28 ****
function bocategories($cats_app)
{
! $this->cats =
CreateObject('phpgwapi.categories');
! $this->cats->app_name = $cats_app;
$this->read_sessiondata($cats_app);
--- 23,28 ----
function bocategories($cats_app)
{
! $this->cats = CreateObject('phpgwapi.categories');
! $this->cats->app_name = $cats_app;
$this->read_sessiondata($cats_app);
***************
*** 97,102 ****
function exists($data)
{
! $data['type'] = $data['type'] ? $data['type'] : '';
! $data['cat_id'] = $data['cat_id'] ? $data['cat_id'] :
'';
return
$this->cats->exists($data['type'],$data['cat_name'],$data['cat_id']);
}
--- 97,102 ----
function exists($data)
{
! $data['type'] = $data['type'] ? $data['type'] : '';
! $data['cat_id'] = $data['cat_id'] ? $data['cat_id'] :
'';
return
$this->cats->exists($data['type'],$data['cat_name'],$data['cat_id']);
}
Index: class.uiaclprefs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uiaclprefs.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiaclprefs.inc.php 27 May 2002 22:52:39 -0000 1.7
--- class.uiaclprefs.inc.php 18 Jun 2002 01:09:20 -0000 1.8
***************
*** 26,40 ****
function index()
{
! $acl_app =
get_var('acl_app',Array('GET','POST'));
! $start =
get_var('start',Array('GET','POST'));
! $query =
get_var('query',Array('GET','POST'));
! $s_groups =
get_var('s_groups',Array('GET','POST'));
! $s_users =
get_var('s_users',Array('GET','POST'));
! $owner = $GLOBALS['owner'];
if (! $acl_app)
{
! $acl_app = 'preferences';
! $acl_app_not_passed = True;
}
--- 26,40 ----
function index()
{
! $acl_app = get_var('acl_app',Array('GET','POST'));
! $start = get_var('start',Array('GET','POST'));
! $query = get_var('query',Array('GET','POST'));
! $s_groups = get_var('s_groups',Array('GET','POST'));
! $s_users = get_var('s_users',Array('GET','POST'));
! $owner = $GLOBALS['owner'];
if (! $acl_app)
{
! $acl_app = 'preferences';
! $acl_app_not_passed = True;
}
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uicategories.inc.php 1 Jun 2002 14:15:41 -0000 1.11
--- class.uicategories.inc.php 18 Jun 2002 01:09:20 -0000 1.12
***************
*** 33,45 ****
function uicategories()
{
! $this->bo =
CreateObject('preferences.bocategories',$cats_app);
! $this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->user =
$GLOBALS['phpgw_info']['user']['fullname'];
!
! $this->start = $this->bo->start;
! $this->query = $this->bo->query;
! $this->sort = $this->bo->sort;
! $this->order = $this->bo->order;
}
--- 33,45 ----
function uicategories()
{
! $this->bo =
CreateObject('preferences.bocategories',$cats_app);
! $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
! $this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
! $this->user =
$GLOBALS['phpgw_info']['user']['fullname'];
!
! $this->start = $this->bo->start;
! $this->query = $this->bo->query;
! $this->sort = $this->bo->sort;
! $this->order = $this->bo->order;
}
***************
*** 90,98 ****
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
--- 90,98 ----
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
***************
*** 104,108 ****
$GLOBALS['phpgw']->common->phpgw_header();
!
$GLOBALS['phpgw']->template->set_file(array('cat_list_t' =>
'listcats.tpl'));
$GLOBALS['phpgw']->template->set_block('cat_list_t','cat_list');
$GLOBALS['phpgw']->template->set_block('cat_list_t','cat_row');
--- 104,108 ----
$GLOBALS['phpgw']->common->phpgw_header();
!
$GLOBALS['phpgw']->template->set_file(array('cat_list_t' => 'listcats.tpl'));
$GLOBALS['phpgw']->template->set_block('cat_list_t','cat_list');
$GLOBALS['phpgw']->template->set_block('cat_list_t','cat_row');
***************
*** 206,211 ****
}
!
$GLOBALS['phpgw']->template->set_var(array('name' => $name,
!
'descr' => $descr));
$GLOBALS['phpgw']->template->set_var('app_url',$GLOBALS['phpgw']->link('/' .
$cats_app . '/index.php','cat_id=' . $cats[$i]['id']));
--- 206,213 ----
}
! $GLOBALS['phpgw']->template->set_var(array(
! 'name' => $name,
! 'descr' => $descr
! ));
$GLOBALS['phpgw']->template->set_var('app_url',$GLOBALS['phpgw']->link('/' .
$cats_app . '/index.php','cat_id=' . $cats[$i]['id']));
***************
*** 215,220 ****
if ($cats[$i]['owner'] ==
$this->account || $cats[$i]['app_name'] == 'phpgw')
{
! $link_data['menuaction']
= 'preferences.uicategories.add';
! $link_data['cat_parent']
= $cats[$i]['id'];
$GLOBALS['phpgw']->template->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_sub_entry',lang('Add sub'));
--- 217,222 ----
if ($cats[$i]['owner'] ==
$this->account || $cats[$i]['app_name'] == 'phpgw')
{
! $link_data['menuaction'] =
'preferences.uicategories.add';
! $link_data['cat_parent'] =
$cats[$i]['id'];
$GLOBALS['phpgw']->template->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_sub_entry',lang('Add sub'));
***************
*** 261,269 ****
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.add',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
--- 263,271 ----
$link_data = array
(
! 'menuaction' => 'preferences.uicategories.add',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
***************
*** 304,312 ****
$values = array
(
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
--- 306,314 ----
$values = array
(
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
***************
*** 341,345 ****
$GLOBALS['phpgw']->template->set_var('access','<input
type="checkbox" name="cat_access" value="True"'
!
. ($cat_access == True ?' checked':'') . '>');
if ($extra)
--- 343,347 ----
$GLOBALS['phpgw']->template->set_var('access','<input
type="checkbox" name="cat_access" value="True"'
! . ($cat_access == True ?' checked':'') . '>');
if ($extra)
***************
*** 354,358 ****
}
! $link_data['menuaction'] =
'preferences.uicategories.index';
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 356,360 ----
}
! $link_data['menuaction'] =
'preferences.uicategories.index';
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
***************
*** 367,376 ****
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
--- 369,378 ----
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
***************
*** 416,425 ****
$values = array
(
! 'id' => $cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
--- 418,427 ----
$values = array
(
! 'id' => $cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
***************
*** 440,444 ****
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit x category
for',lang($cats_app)));
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
! $link_data['menuaction'] =
'preferences.uicategories.edit';
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
--- 442,446 ----
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit x category
for',lang($cats_app)));
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
! $link_data['menuaction'] =
'preferences.uicategories.edit';
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
***************
*** 458,462 ****
$GLOBALS['phpgw']->template->set_var('access','<input
type="checkbox" name="cat_access" value="True"'
!
. ($cats[0]['access'] == private ?' checked':'') . '>');
if ($extra)
--- 460,464 ----
$GLOBALS['phpgw']->template->set_var('access','<input
type="checkbox" name="cat_access" value="True"'
! . ($cats[0]['access'] == private ?'
checked':'') . '>');
if ($extra)
***************
*** 475,481 ****
if ($cats[0]['owner'] == $this->account)
{
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$GLOBALS['phpgw']->template->set_var('delete','<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data)
!
. '"><input type="submit" value="' . lang('Delete') .'"></form>');
}
else
--- 477,483 ----
if ($cats[0]['owner'] == $this->account)
{
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$GLOBALS['phpgw']->template->set_var('delete','<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data)
! . '"><input type="submit" value="' .
lang('Delete') .'"></form>');
}
else
***************
*** 494,503 ****
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
--- 496,505 ----
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
***************
*** 551,555 ****
$GLOBALS['phpgw']->template->set_var('nolink',$nolink);
$GLOBALS['phpgw']->template->set_var('lang_no',lang('No'));
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
--- 553,557 ----
$GLOBALS['phpgw']->template->set_var('nolink',$nolink);
$GLOBALS['phpgw']->template->set_var('lang_no',lang('No'));
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.7,1.8 class.uiaclprefs.inc.php,1.7,1.8 class.uicategories.inc.php,1.11,1.12,
Miles Lott <address@hidden> <=