[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.15,1.16
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.15,1.16 |
|
Date: |
Mon, 17 Jun 2002 21:13:45 -0400 |
Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv19940/inc
Modified Files:
class.uicategories.inc.php
Log Message:
formatting
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uicategories.inc.php 1 Jun 2002 14:40:30 -0000 1.15
--- class.uicategories.inc.php 18 Jun 2002 01:13:43 -0000 1.16
***************
*** 35,46 ****
function uicategories()
{
! $this->bo =
CreateObject('admin.bocategories');
! $this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
! $this->start = $this->bo->start;
! $this->query = $this->bo->query;
! $this->sort = $this->bo->sort;
! $this->order = $this->bo->order;
! $this->cat_id = $this->bo->cat_id;
if($this->debug) { $this->_debug_sqsof(); }
}
--- 35,46 ----
function uicategories()
{
! $this->bo = CreateObject('admin.bocategories');
! $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
! $this->start = $this->bo->start;
! $this->query = $this->bo->query;
! $this->sort = $this->bo->sort;
! $this->order = $this->bo->order;
! $this->cat_id = $this->bo->cat_id;
if($this->debug) { $this->_debug_sqsof(); }
}
***************
*** 107,113 ****
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
--- 107,113 ----
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
***************
*** 241,247 ****
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
--- 241,247 ----
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
***************
*** 250,258 ****
$this->set_langs();
! $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'];
$GLOBALS['phpgw']->template->set_file(array('cat_form'
=> 'category_form.tpl'));
--- 250,258 ----
$this->set_langs();
! $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'];
$GLOBALS['phpgw']->template->set_file(array('cat_form'
=> 'category_form.tpl'));
***************
*** 281,288 ****
$values = array
(
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => 'public'
);
--- 281,288 ----
$values = array
(
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => 'public'
);
***************
*** 302,307 ****
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select'
=> 'select','all' => 'all','cat_parent' => $cat_parent,
!
'global_cats' => $global_cats)));
$GLOBALS['phpgw']->template->set_var('cat_name',$cat_name);
--- 302,311 ----
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
!
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array(
! 'select' => 'select',
! 'all' => 'all',
! 'cat_parent' => $cat_parent,
! 'global_cats' => $global_cats
! )));
$GLOBALS['phpgw']->template->set_var('cat_name',$cat_name);
***************
*** 318,324 ****
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
--- 322,328 ----
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
***************
*** 332,340 ****
$this->set_langs();
! $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'];
$GLOBALS['phpgw']->template->set_file(array('cat_form'
=> 'category_form.tpl'));
--- 336,344 ----
$this->set_langs();
! $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'];
$GLOBALS['phpgw']->template->set_file(array('cat_form'
=> 'category_form.tpl'));
***************
*** 357,365 ****
$values = array
(
! 'id' => $this->cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => 'public'
);
--- 361,369 ----
$values = array
(
! 'id' => $this->cat_id,
! 'parent' => $cat_parent,
! 'descr' => $cat_description,
! 'name' => $cat_name,
! 'access' => 'public'
);
***************
*** 387,400 ****
}
! $link_data['menuaction'] =
'admin.uicategories.edit';
! $link_data['cat_id'] = $this->cat_id;
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $link_data['menuaction'] =
'admin.uicategories.delete';
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
$GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
!
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select'
=> 'select','all' => 'all','cat_parent' => $cats[0]['parent'],
!
'global_cats' => $global_cats)));
$GLOBALS['phpgw']->template->parse('buttons','edit');
--- 391,408 ----
}
! $link_data['menuaction'] = 'admin.uicategories.edit';
! $link_data['cat_id'] = $this->cat_id;
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
! $link_data['menuaction'] = 'admin.uicategories.delete';
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
$GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
!
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array(
! 'select' => 'select',
! 'all' => 'all',
! 'cat_parent' => $cats[0]['parent'],
! 'global_cats' => $global_cats
! )));
$GLOBALS['phpgw']->template->parse('buttons','edit');
***************
*** 408,414 ****
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
--- 416,422 ----
$link_data = array
(
! 'menuaction' => 'admin.uicategories.index',
! 'appname' => $GLOBALS['appname'],
! 'global_cats' => $global_cats
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.15,1.16,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: admin/setup setup.inc.php,1.14,1.15
- Next by Date:
[Phpgroupware-cvs] CVS: phpwebhosting/setup phpgw_pt.lang,NONE,1.1.2.1 phpgw_en.lang,1.1,1.1.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: admin/setup setup.inc.php,1.14,1.15
- Next by thread:
[Phpgroupware-cvs] CVS: phpwebhosting/setup phpgw_pt.lang,NONE,1.1.2.1 phpgw_en.lang,1.1,1.1.2.1
- Index(es):