[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.4,1.2.2.5 class.bocategories.inc.php,1.2.2.1,1.2.2.2 |
|
Date: |
Wed, 24 Apr 2002 03:54:29 -0400 |
Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv2556
Modified Files:
Tag: Version-0_9_14-branch
class.uicategories.inc.php class.bocategories.inc.php
Log Message:
clear up php3 error, formatting
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -C2 -r1.2.2.4 -r1.2.2.5
*** class.uicategories.inc.php 13 Mar 2002 21:31:59 -0000 1.2.2.4
--- class.uicategories.inc.php 24 Apr 2002 07:54:27 -0000 1.2.2.5
***************
*** 33,46 ****
function uicategories()
{
! $this->bo =
CreateObject('preferences.bocategories',$cats_app);
! $this->t =
$GLOBALS['phpgw']->template;
! $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,47 ----
function uicategories()
{
! //$this->bo =
CreateObject('preferences.bocategories',$cats_app);
! $this->bo =
CreateObject('preferences.bocategories');
! $this->t = $GLOBALS['phpgw']->template;
! $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;
}
***************
*** 87,102 ****
function index()
{
! global $cats_app, $extra, $global_cats, $cats_level;
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
! if ($extra)
{
$edata = explode(',',$extra);
--- 88,106 ----
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
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
! if($extra)
{
$edata = explode(',',$extra);
***************
*** 106,111 ****
echo parse_navbar();
! $this->t->set_file(array('cat_list_t' =>
'listcats.tpl',
!
'data_column' => 'listcats.tpl'));
$this->t->set_block('cat_list_t','data_column','column');
$this->t->set_block('cat_list_t','cat_list','list');
--- 110,117 ----
echo parse_navbar();
! $this->t->set_file(array(
! 'cat_list_t' => 'listcats.tpl',
! 'data_column' => 'listcats.tpl'
! ));
$this->t->set_block('cat_list_t','data_column','column');
$this->t->set_block('cat_list_t','cat_list','list');
***************
*** 123,127 ****
}
! if (!$global_cats)
{
$global_cats = False;
--- 129,133 ----
}
! if(!$global_cats)
{
$global_cats = False;
***************
*** 212,217 ****
}
! $this->t->set_var(array('name' => $name,
!
'descr' => $descr));
$this->t->set_var('app_url',$GLOBALS['phpgw']->link('/' . $cats_app .
'/index.php','cat_id=' . $cats[$i]['id']));
--- 218,225 ----
}
! $this->t->set_var(array(
! 'name' => $name,
! 'descr' => $descr
! ));
$this->t->set_var('app_url',$GLOBALS['phpgw']->link('/' . $cats_app .
'/index.php','cat_id=' . $cats[$i]['id']));
***************
*** 221,226 ****
if ($cats[$i]['owner'] ==
$this->account || $cats[$i]['app_name'] == 'phpgw')
{
! $link_data['menuaction']
= 'preferences.uicategories.add';
! $link_data['cat_parent']
= $cats[$i]['id'];
$this->t->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
$this->t->set_var('lang_sub_entry',lang('Add sub'));
--- 229,234 ----
if ($cats[$i]['owner'] ==
$this->account || $cats[$i]['app_name'] == 'phpgw')
{
! $link_data['menuaction'] =
'preferences.uicategories.add';
! $link_data['cat_parent'] =
$cats[$i]['id'];
$this->t->set_var('add_sub',$GLOBALS['phpgw']->link('/index.php',$link_data));
$this->t->set_var('lang_sub_entry',lang('Add sub'));
***************
*** 263,275 ****
function add()
{
! global $cats_app, $extra, $global_cats, $cats_level;
$link_data = array
(
! 'menuaction' =>
'preferences.uicategories.add',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
--- 271,286 ----
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
(
! 'menuaction' => 'preferences.uicategories.add',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level
);
***************
*** 277,287 ****
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,298 ----
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'));
***************
*** 310,318 ****
$values = array
(
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
--- 321,329 ----
$values = array
(
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
***************
*** 347,351 ****
$this->t->set_var('access','<input type="checkbox"
name="cat_access" value="True"'
!
. ($cat_access == True ?' checked':'') . '>');
if ($extra)
--- 358,362 ----
$this->t->set_var('access','<input type="checkbox"
name="cat_access" value="True"'
! . ($cat_access == True ?' checked':'') . '>');
if ($extra)
***************
*** 360,364 ****
}
! $link_data['menuaction'] =
'preferences.uicategories.index';
$this->t->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
$this->t->set_var('edithandle','');
--- 371,375 ----
}
! $link_data['menuaction'] =
'preferences.uicategories.index';
$this->t->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
$this->t->set_var('edithandle','');
***************
*** 370,383 ****
function edit()
{
! global $cats_app, $extra, $global_cats, $cats_level,
$cat_id;
$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
);
--- 381,398 ----
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
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
***************
*** 390,400 ****
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'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
--- 405,415 ----
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'];
$this->t->set_file(array('form' =>
'category_form.tpl'));
***************
*** 423,432 ****
$values = array
(
! 'id' => $cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
--- 438,447 ----
$values = array
(
! 'id' => $cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => $cat_access,
! 'data' => $data
);
***************
*** 447,451 ****
$this->t->set_var('title_categories',lang('Edit x
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));
--- 462,466 ----
$this->t->set_var('title_categories',lang('Edit x
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));
***************
*** 465,469 ****
$this->t->set_var('access','<input type="checkbox"
name="cat_access" value="True"'
!
. ($cats[0]['access'] == private ?' checked':'') . '>');
if ($extra)
--- 480,484 ----
$this->t->set_var('access','<input type="checkbox"
name="cat_access" value="True"'
! . ($cats[0]['access'] == private ?'
checked':'') . '>');
if ($extra)
***************
*** 482,488 ****
if ($cats[0]['owner'] == $this->account)
{
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$this->t->set_var('delete','<form method="POST"
action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
!
. '"><input type="submit" value="' . lang('Delete') .'"></form>');
}
else
--- 497,503 ----
if ($cats[0]['owner'] == $this->account)
{
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$this->t->set_var('delete','<form method="POST"
action="' . $GLOBALS['phpgw']->link('/index.php',$link_data)
! . '"><input type="submit" value="' .
lang('Delete') .'"></form>');
}
else
***************
*** 499,512 ****
function delete()
{
! global $cats_app, $extra, $global_cats, $cats_level,
$cat_id;
$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
);
--- 514,531 ----
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
(
! 'menuaction' =>
'preferences.uicategories.index',
! 'cats_app' => $cats_app,
! 'extra' => $extra,
! 'global_cats' => $global_cats,
! 'cats_level' => $cats_level,
! 'cat_id' => $cat_id
);
***************
*** 561,565 ****
$this->t->set_var('nolink',$nolink);
$this->t->set_var('lang_no',lang('No'));
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$this->t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$this->t->set_var('lang_yes',lang('Yes'));
--- 580,584 ----
$this->t->set_var('nolink',$nolink);
$this->t->set_var('lang_no',lang('No'));
! $link_data['menuaction'] =
'preferences.uicategories.delete';
$this->t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
$this->t->set_var('lang_yes',lang('Yes'));
Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** class.bocategories.inc.php 13 Jan 2002 23:57:06 -0000 1.2.2.1
--- class.bocategories.inc.php 24 Apr 2002 07:54:27 -0000 1.2.2.2
***************
*** 21,28 ****
var $order;
! function bocategories($cats_app)
{
! $this->cats =
CreateObject('phpgwapi.categories');
! $this->cats->app_name = $cats_app;
$this->read_sessiondata($cats_app);
--- 21,28 ----
var $order;
! 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']);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.4,1.2.2.5 class.bocategories.inc.php,1.2.2.1,1.2.2.2,
Miles Lott <address@hidden> <=