[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] infolog/inc class.boinfolog.inc.php class.soinf...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] infolog/inc class.boinfolog.inc.php class.soinf... |
|
Date: |
Thu, 08 Feb 2007 14:07:39 +0000 |
CVSROOT: /sources/phpgroupware
Module name: infolog
Changes by: Sigurd Nes <sigurdne> 07/02/08 14:07:39
Modified files:
inc : class.boinfolog.inc.php class.soinfolog.inc.php
class.uiinfolog.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/class.boinfolog.inc.php?cvsroot=phpgroupware&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/class.soinfolog.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/infolog/inc/class.uiinfolog.inc.php?cvsroot=phpgroupware&r1=1.78&r2=1.79
Patches:
Index: class.boinfolog.inc.php
===================================================================
RCS file: /sources/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- class.boinfolog.inc.php 4 May 2005 14:19:07 -0000 1.42
+++ class.boinfolog.inc.php 8 Feb 2007 14:07:38 -0000 1.43
@@ -14,7 +14,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* at your option) any later version. *
\**********************************************************************/
- /* $Id: class.boinfolog.inc.php,v 1.42 2005/05/04 14:19:07 powerstat Exp $ */
+ /* $Id: class.boinfolog.inc.php,v 1.43 2007/02/08 14:07:38 sigurdne Exp $ */
class boinfolog // BO: buiseness objects:
internal logic
{
@@ -143,7 +143,7 @@
function link_id2from(&$info,$not_app='',$not_id='')
{
//echo
"<p>boinfolog::link_id2from(subject='$info[info_subject]',
link_id='$info[info_link_id], from='$info[info_from]', not_app='$not_app',
not_id='$not_id')";
- if ($info['info_link_id'] > 0 &&
+ if (isset($info['info_link_id']) &&
$info['info_link_id'] > 0 &&
($link =
$this->link->get_link($info['info_link_id'])) !== False)
{
$nr = $link['link_app1'] == 'infolog' &&
$link['link_id1'] == $info['info_id'] ? '2' : '1';
@@ -165,7 +165,7 @@
}
else
{
- $info['info_link_title'] = $info['info_from'];
+ $info['info_link_title'] =
isset($info['info_from']) ? $info['info_from'] : '';
$info['info_link_id'] = 0; // link might
have been deleted
}
return False;
@@ -176,7 +176,7 @@
$err = $this->so->read($info_id) === False;
$data = &$this->so->data;
- if ($data['info_subject'] ==
(substr($data['info_des'],0,60).' ...'))
+ if (isset($data['info_subject']) &&
isset($data['info_des']) && $data['info_subject'] ==
(substr($data['info_des'],0,60).' ...'))
{
$data['info_subject'] = '';
}
Index: class.soinfolog.inc.php
===================================================================
RCS file: /sources/phpgroupware/infolog/inc/class.soinfolog.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- class.soinfolog.inc.php 4 May 2005 14:19:07 -0000 1.25
+++ class.soinfolog.inc.php 8 Feb 2007 14:07:38 -0000 1.26
@@ -14,7 +14,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* at your option) any later version. *
\**********************************************************************/
- /* $Id: class.soinfolog.inc.php,v 1.25 2005/05/04 14:19:07 powerstat Exp $ */
+ /* $Id: class.soinfolog.inc.php,v 1.26 2007/02/08 14:07:38 sigurdne Exp $ */
/*!
@class soinfolog
@@ -485,6 +485,7 @@
{
$action = $action2app[$action];
}
+ $link_extra = '';
if ($action != '')
{
$links =
$this->links->get_links($action=='sp'?'infolog':$action,$action_id,'infolog');
@@ -512,6 +513,7 @@
$filtermethod .= ' AND info_cat='.intval($cat_id).' ';
}
$join = '';
+ $sql_query = '';
if ($query) // we search in
_from, _subject, _des and _extra_value for $query
{
$query = $this->db->db_addslashes($query);
@@ -521,7 +523,7 @@
}
$pid = 'AND info_id_parent='.($action == 'sp' ?
$action_id : 0);
- if
(!$phpgw_info['user']['preferences']['infolog']['listNoSubs'] &&
+ if
((!isset($phpgw_info['user']['preferences']['infolog']['listNoSubs']) ||
!$phpgw_info['user']['preferences']['infolog']['listNoSubs']) &&
$action != 'sp')
{
$pid = '';
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /sources/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- class.uiinfolog.inc.php 4 May 2005 14:19:07 -0000 1.78
+++ class.uiinfolog.inc.php 8 Feb 2007 14:07:38 -0000 1.79
@@ -14,7 +14,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* at your option) any later version. *
\**********************************************************************/
- /* $Id: class.uiinfolog.inc.php,v 1.78 2005/05/04 14:19:07 powerstat Exp $ */
+ /* $Id: class.uiinfolog.inc.php,v 1.79 2007/02/08 14:07:38 sigurdne Exp $ */
class uiinfolog // UI - User Interface - HTML
{
@@ -151,9 +151,14 @@
'filter' => $query['filter'],
'cat_id' => $query['cat_id']
));
- $ids =
$this->bo->search($query['order'],$query['sort'],$query['filter'],$query['cat_id'],
-
$query['search'],$query['action'],$query['action_id'],$query['ordermethod'],
- $query['start'],$total);
+ $ids = $this->bo->search(isset($query['order']) ?
$query['order'] : '',
+ isset($query['sort']) ? $query['sort'] : '',
+ $query['filter'],$query['cat_id'],
+ $query['search'],$query['action'],
+ $query['action_id'],
+ isset($query['ordermethod']) ?
$query['ordermethod'] : '',
+ $query['start'],
+ $total);
if (!is_array($ids))
{
@@ -176,7 +181,7 @@
$referer = is_array($values) ? $values['referer'] :
$referer;
//echo
"<p>uiinfolog::index(action='$action/$action_id',referer='$referer/$values[referer]')</p>\n";
- if(!$_GET['filter'])
+ if(!isset($_GET['filter']) || !$_GET['filter'])
{
$_GET['filter'] = 'own';
}
@@ -200,15 +205,15 @@
}
if ($action == '')
{
- $action = $values['action'] ? $values['action']
: get_var('action',array('POST','GET'));
- $action_id = $values['action_id'] ?
$values['action_id'] : get_var('action_id',array('POST','GET'));
+ $action = isset($values['action']) &&
$values['action'] ? $values['action'] : get_var('action',array('POST','GET'));
+ $action_id = isset($values['action_id']) &&
$values['action_id'] ? $values['action_id'] :
get_var('action_id',array('POST','GET'));
}
- if ($values['nm']['add'])
+ if (isset($values['nm']['add']) && $values['nm']['add'])
{
$values['add'] = $values['nm']['add'];
unset($values['nm']['add']);
}
- if ($values['add'] || $values['cancel'] ||
isset($values['nm']['rows']) || isset($values['main']))
+ if ((isset($values['add']) && $values['add']) ||
(isset($values['cancel']) && $values['cancel']) || isset($values['nm']['rows'])
|| isset($values['main']))
{
if ($values['add'])
{
@@ -348,9 +353,9 @@
{
$content['info_link_id'] =
$content['link_to']['primary'];
}
- if ($content['save'] || $content['delete'] ||
$content['cancel'])
+ if ((isset($content['save']) &&
$content['save']) || (isset($content['delete']) && $content['delete']) ||
(isset($content['cancel']) && $content['cancel']))
{
- if ($content['save'] && (!$info_id ||
$this->bo->check_access($info_id,PHPGW_ACL_EDIT)))
+ if (isset($content['save']) &&
$content['save'] && (!$info_id ||
$this->bo->check_access($info_id,PHPGW_ACL_EDIT)))
{
$content['old_responsible'] =
$this->bo->so->data['info_responsible'];
@@ -394,7 +399,7 @@
}
}
}
- elseif ($content['delete'] && $info_id
> 0)
+ elseif (isset($content['delete']) &&
$content['delete'] && $info_id > 0)
{
if (!$referer && $action)
$referer = array(
'menuaction' =>
'infolog.uiinfolog.index',
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] infolog/inc class.boinfolog.inc.php class.soinf...,
Sigurd Nes <=