[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.bocategories.inc.php class.uica...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] admin/inc class.bocategories.inc.php class.uica... |
|
Date: |
Tue, 18 Apr 2006 10:59:01 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: admin
Branch:
Changes by: Dave Hall <address@hidden> 06/04/18 10:59:01
Modified files:
inc : class.bocategories.inc.php
class.uicategories.inc.php
Log message:
make cats admin work properly and add the ability to call new style
hooks when adding, editing and deleting cats, via admin or other metods,
example in tts soon
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.bocategories.inc.php.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uicategories.inc.php.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
Patches:
Index: admin/inc/class.bocategories.inc.php
diff -u admin/inc/class.bocategories.inc.php:1.20
admin/inc/class.bocategories.inc.php:1.21
--- admin/inc/class.bocategories.inc.php:1.20 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.bocategories.inc.php Tue Apr 18 10:59:01 2006
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.bocategories.inc.php,v 1.20 2006/02/14 08:48:21 skwashd
Exp $ */
+ /* $Id: class.bocategories.inc.php,v 1.21 2006/04/18 10:59:01 skwashd
Exp $ */
/* $Source:
/cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v $ */
class bocategories
@@ -28,9 +28,9 @@
function bocategories()
{
- if ($GLOBALS['appname'])
+ if ($_REQUEST['appname'])
{
- $this->cats =
CreateObject('phpgwapi.categories',-1,$GLOBALS['appname']);
+ $this->cats =
CreateObject('phpgwapi.categories',-1,$_REQUEST['appname']);
}
else
{
@@ -41,11 +41,11 @@
/* _debug_array($GLOBALS['HTTP_POST_VARS']); */
- $start = intval(get_var('start',array('POST','GET')));
- $query = get_var('query',array('POST','GET'));
- $sort = get_var('sort',array('POST','GET'));
- $order = get_var('order',array('POST','GET'));
- $cat_id = intval(get_var('cat_id',
array('POST','GET')));
+ $start = (int) $_REQUEST['start'];
+ $query = $_REQUEST['query'];
+ $sort = $_REQUEST['sort'];
+ $order = $_REQUEST['order'];
+ $cat_id = (int) $_REQUEST['cat_id'];
if(!empty($start) || $start == 0)
{
Index: admin/inc/class.uicategories.inc.php
diff -u admin/inc/class.uicategories.inc.php:1.42
admin/inc/class.uicategories.inc.php:1.43
--- admin/inc/class.uicategories.inc.php:1.42 Tue Feb 14 08:48:21 2006
+++ admin/inc/class.uicategories.inc.php Tue Apr 18 10:59:01 2006
@@ -9,7 +9,7 @@
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\**************************************************************************/
- /* $Id: class.uicategories.inc.php,v 1.42 2006/02/14 08:48:21 skwashd
Exp $ */
+ /* $Id: class.uicategories.inc.php,v 1.43 2006/04/18 10:59:01 skwashd
Exp $ */
/* $Source:
/cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v $ */
class uicategories
@@ -86,24 +86,24 @@
$link_data = array
(
'menuaction' => 'admin.uicategories.index',
- 'appname' => $GLOBALS['appname'],
+ 'appname' => $_REQUEST['appname'],
'global_cats' => $global_cats
);
- if ($_POST['add'])
+ if ( isset($_POST['add']) && $_POST['add'] )
{
$link_data['menuaction'] =
'admin.uicategories.edit';
-
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+ $GLOBALS['phpgw']->redirect_link('/index.php',
$link_data);
}
- if ($_POST['done'])
+ if ( isset($_POST['done']) && $_POST['done'] )
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=admin.uimainscreen.mainscreen');
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'admin.uimainscreen.mainscreen') );
}
- if ($GLOBALS['appname'])
+ if ( isset($_REQUEST['appname']) &&
$_REQUEST['appname'])
{
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($GLOBALS['appname']) . ' ' . lang('global categories') . ': ' .
lang('category list');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($_REQUEST['appname']) . ' ' . lang('global categories') . ': ' .
lang('category list');
}
else
{
@@ -149,7 +149,7 @@
$main = 'yes';
if ($level > 0)
{
- $space = ' . ';
+ $space = ' . ';
$spaceset = str_repeat($space,$level);
$cat_name = $spaceset . $cat_name;
$main = 'no';
@@ -157,20 +157,20 @@
$descr =
$GLOBALS['phpgw']->strip_html($cat['descr']);
- if ($GLOBALS['appname'] && $cat['app_name'] ==
'phpgw')
+ if ($_REQUEST['appname'] && $cat['app_name'] ==
'phpgw')
{
- $appendix = ' <' .
lang('Global') . '>';
+ $appendix = ' [' . lang('Global')
. ']';
}
else
{
$appendix = '';
}
- if ($GLOBALS['appname'] && $cat['app_name'] ==
$GLOBALS['appname'])
+ if ($_REQUEST['appname'] && $cat['app_name'] ==
$_REQUEST['appname'])
{
$show_edit_del = True;
}
- elseif(!$GLOBALS['appname'] && $cat['app_name']
== 'phpgw')
+ elseif(!$_REQUEST['appname'] &&
$cat['app_name'] == 'phpgw')
{
$show_edit_del = True;
}
@@ -181,14 +181,14 @@
if ($show_edit_del)
{
- $link_data['cat_id'] =
$cat['cat_id'];
+ $link_data['cat_id'] =
$cat['id'];
$link_data['menuaction'] =
'admin.uicategories.edit';
- $edit_url
= $GLOBALS['phpgw']->link('/index.php',$link_data);
- $lang_edit
= lang('edit');
+ $edit_url =
$GLOBALS['phpgw']->link('/index.php',$link_data);
+ $lang_edit =
lang('edit');
$link_data['menuaction'] =
'admin.uicategories.delete';
- $delete_url
= $GLOBALS['phpgw']->link('/index.php',$link_data);
- $lang_delete
= lang('delete');
+ $delete_url =
$GLOBALS['phpgw']->link('/index.php',$link_data);
+ $lang_delete =
lang('delete');
}
else
{
@@ -265,7 +265,7 @@
$link_data = array
(
'menuaction' => 'admin.uicategories.index',
- 'appname' => $GLOBALS['appname'],
+ 'appname' => $_REQUEST['appname'],
'global_cats' => $global_cats
);
@@ -304,9 +304,9 @@
$parent = $cats['parent'];
}
- if ($GLOBALS['appname'])
+ if ($_REQUEST['appname'])
{
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($GLOBALS['appname']) . ' ' . lang('global categories') . ': ' .
($this->cat_id?lang('edit category'):lang('add category'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($_REQUEST['appname']) . ' ' . lang('global categories') . ': ' .
($this->cat_id?lang('edit category'):lang('add category'));
}
else
{
@@ -315,9 +315,9 @@
$GLOBALS['phpgw']->xslttpl->add_file('cats');
- if ($GLOBALS['appname'])
+ if ($_REQUEST['appname'])
{
-
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit global
category for %1',lang($GLOBALS['appname'])));
+
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit global
category for %1',lang($_REQUEST['appname'])));
}
else
{
@@ -326,7 +326,10 @@
$data = array
(
+ 'img_color_selector' =>
$GLOBALS['phpgw']->common->image('phpgwapi', 'color_selector'),
'lang_name'
=> lang('name'),
+ 'lang_color' =>
lang('color'),
+ 'lang_color_selector' => lang('color
selector'),
'lang_descr' =>
lang('description'),
'lang_parent' =>
lang('parent category'),
'old_parent' =>
$cats['parent'],
@@ -360,7 +363,7 @@
$link_data = array
(
'menuaction' => 'admin.uicategories.index',
- 'appname' => $GLOBALS['appname'],
+ 'appname' => $_REQUEST['appname'],
'global_cats' => $global_cats
);
@@ -396,11 +399,11 @@
}
}
-
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_delete'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
- $GLOBALS['phpgw_info']['flags']['app_header'] =
($GLOBALS['appname']?lang($GLOBALS['appname']) . ' ':'') . lang('global
categories') . ': ' . lang('delete category');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
($_REQUEST['appname']?lang($_REQUEST['appname']) . ' ':'') . lang('global
categories') . ': ' . lang('delete category');
- $type = ($GLOBALS['appname']?'noglobalapp':'noglobal');
+ $type = ($_REQUEST['appname']?'noglobalapp':'noglobal');
$apps_cats = $this->bo->exists(array('type'
=> $type,
'cat_name' => '',
- [Phpgroupware-cvs] admin/inc class.bocategories.inc.php class.uica...,
Dave Hall <=