[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.29,1.30 cl
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.29,1.30 class.uiinfolog.inc.php,1.59,1.60 |
Date: |
Thu, 20 Mar 2003 12:31:04 -0500 |
Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv22343
Modified Files:
class.boinfolog.inc.php class.uiinfolog.inc.php
Log Message:
fixed writeing of temp. alphanumerical info_link_id to the db, as pgSql
complains about the wrong type
Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.boinfolog.inc.php 20 Mar 2003 17:22:53 -0000 1.29
--- class.boinfolog.inc.php 20 Mar 2003 17:31:01 -0000 1.30
***************
*** 132,136 ****
function link_id2from(&$info,$not_app='',$not_id='')
{
! //echo
"<p>boinfolog::link_id2title(subject='$info[info_subject]',
link_id='$info[info_link_id], from='$info[info_from]')";
if ($info['info_link_id'] > 0 &&
($link =
$this->link->get_link($info['info_link_id'])) !== False)
--- 132,136 ----
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]')";
if ($info['info_link_id'] > 0 &&
($link =
$this->link->get_link($info['info_link_id'])) !== False)
***************
*** 166,170 ****
$data['info_subject'] = '';
}
! $data['info_link_title'] =
$this->link_id2title($data,$data['info_link_view']);
if ($data['info_link_title'] == $data['info_from'])
{
--- 166,170 ----
$data['info_subject'] = '';
}
! $this->link_id2from($data);
if ($data['info_link_title'] == $data['info_from'])
{
***************
*** 206,212 ****
$values['info_subject'] =
substr($values['info_des'],0,60).' ...';
}
! if ($values['info_link_id'] &&
$values['info_from'] == '')
{
! $values['info_from'] =
$this->link_id2title($values);
}
}
--- 206,212 ----
$values['info_subject'] =
substr($values['info_des'],0,60).' ...';
}
! if ($values['info_link_id'] &&
empty($values['info_from']))
{
! $this->link_id2from($values);
}
}
Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** class.uiinfolog.inc.php 20 Mar 2003 17:22:53 -0000 1.59
--- class.uiinfolog.inc.php 20 Mar 2003 17:31:01 -0000 1.60
***************
*** 97,101 ****
$info['info_des'] = nl2br($info['info_des']);
$info['info_anz_subs'] = $this->bo->anzSubs($id);
! $this->bo->link_id2from($info,$action,$action_id);
$readonlys["edit[$id]"] =
!$this->bo->check_access($id,PHPGW_ACL_EDIT);
--- 97,101 ----
$info['info_des'] = nl2br($info['info_des']);
$info['info_anz_subs'] = $this->bo->anzSubs($id);
! $this->bo->link_id2from($info,$action,$action_id);
// unset from for $action:$action_id
$readonlys["edit[$id]"] =
!$this->bo->check_access($id,PHPGW_ACL_EDIT);
***************
*** 287,294 ****
$content['info_link_id'] = 0; // as field has to be int
}
- if ($content['info_link_id'] &&
empty($content['info_from']))
- {
-
$this->bo->link_id2from($content);
- }
$this->bo->write($content);
--- 287,290 ----
***************
*** 303,310 ****
$content['info_link_id'] = $link['link_id'];
- if
(empty($content['info_from']))
- {
-
$this->bo->link_id2from($content);
- }
$this->bo->write(array(
'info_id' => $content['info_id'],
--- 299,302 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.29,1.30 class.uiinfolog.inc.php,1.59,1.60,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.28,1.29 class.uiinfolog.inc.php,1.58,1.59
- Next by Date:
[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19.2.6,1.19.2.7
- Previous by thread:
[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.28,1.29 class.uiinfolog.inc.php,1.58,1.59
- Next by thread:
[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19.2.6,1.19.2.7
- Index(es):