[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: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] admin/inc class.bocategories.inc.php class.uica... |
Date: |
Mon, 27 Nov 2006 21:37:14 +0000 |
CVSROOT: /sources/phpgroupware
Module name: admin
Changes by: Sigurd Nes <sigurdne> 06/11/27 21:37:14
Modified files:
inc : class.bocategories.inc.php
class.uicategories.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.bocategories.inc.php?cvsroot=phpgroupware&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uicategories.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
Patches:
Index: class.bocategories.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- class.bocategories.inc.php 18 Apr 2006 11:35:11 -0000 1.22
+++ class.bocategories.inc.php 27 Nov 2006 21:37:14 -0000 1.23
@@ -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.22 2006/04/18 11:35:11 skwashd
Exp $ */
+ /* $Id: class.bocategories.inc.php,v 1.23 2006/11/27 21:37:14 sigurdne
Exp $ */
/* $Source:
/sources/phpgroupware/admin/inc/class.bocategories.inc.php,v $ */
class bocategories
@@ -28,7 +28,7 @@
function bocategories()
{
- if ($_REQUEST['appname'])
+ if (isset($_REQUEST['appname']) && $_REQUEST['appname'])
{
$this->cats =
CreateObject('phpgwapi.categories',-1,$_REQUEST['appname']);
}
@@ -41,11 +41,11 @@
/* _debug_array($GLOBALS['HTTP_POST_VARS']); */
- $start = (int) $_REQUEST['start'];
- $query = $_REQUEST['query'];
- $sort = $_REQUEST['sort'];
- $order = $_REQUEST['order'];
- $cat_id = (int) $_REQUEST['cat_id'];
+ $start = (isset($_REQUEST['start'])?(int)
$_REQUEST['start']:0);
+ $query =
(isset($_REQUEST['query'])?$_REQUEST['query']:'');
+ $sort =
(isset($_REQUEST['sort'])?$_REQUEST['sort']:'');
+ $order =
(isset($_REQUEST['order'])?$_REQUEST['order']:'');
+ $cat_id = (isset($_REQUEST['cat_id'])?(int)
$_REQUEST['cat_id']:'');
if(!empty($start) || $start == 0)
{
@@ -63,14 +63,15 @@
$this->query = $query;
}
- if(isset($cat_id))
+ if(isset($cat_id)&& !empty($cat_id))
{
$this->cat_id = $cat_id;
}
if($cat_id == 0)
{
- unset($this->cat_id);
+// unset($this->cat_id);
+ $this->cat_id ='';
}
if(isset($sort) && !empty($sort))
@@ -184,7 +185,7 @@
}
}
- if (is_array($error))
+ if (isset($error) && is_array($error))
{
return $error;
}
Index: class.uicategories.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- class.uicategories.inc.php 4 Oct 2006 01:31:08 -0000 1.46
+++ class.uicategories.inc.php 27 Nov 2006 21:37:14 -0000 1.47
@@ -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.46 2006/10/04 01:31:08 skwashd
Exp $ */
+ /* $Id: class.uicategories.inc.php,v 1.47 2006/11/27 21:37:14 sigurdne
Exp $ */
/* $Source:
/sources/phpgroupware/admin/inc/class.uicategories.inc.php,v $ */
class uicategories
@@ -86,7 +86,7 @@
$link_data = array
(
'menuaction' => 'admin.uicategories.index',
- 'appname' => $_REQUEST['appname'],
+ 'appname' =>
(isset($_REQUEST['appname'])?$_REQUEST['appname']:''),
'global_cats' => $global_cats
);
@@ -322,7 +322,7 @@
}
else
{
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('global categories') . ': ' . $function;
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('global categories') . ': ' . (isset($function)?$function:'');
}
$GLOBALS['phpgw']->xslttpl->add_file('cats');
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.bocategories.inc.php class.uica...,
Sigurd Nes <=