[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php,1.28,1.29 class.uiinfolog.inc.php,1.58,1.59

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/infolog/inc
In directory subversions:/tmp/cvs-serv19114

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.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.boinfolog.inc.php     5 Nov 2002 16:00:01 -0000       1.28
--- class.boinfolog.inc.php     20 Mar 2003 17:22:53 -0000      1.29
***************
*** 38,42 ****
                        'link_title'     => True,
                        'link_query'     => True,
!                       'link_id2title'  => True
                );
                var $enums;
--- 38,42 ----
                        'link_title'     => True,
                        'link_query'     => True,
!                       'link_id2from'   => True
                );
                var $enums;
***************
*** 130,135 ****
                }
  
!               function link_id2title(&$info,$not_app='',$not_id='')
                {
                        if ($info['info_link_id'] > 0 &&
                                 ($link = 
$this->link->get_link($info['info_link_id'])) !== False)
--- 130,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)
***************
*** 150,153 ****
--- 151,155 ----
                                        $info['info_from'] = 
$info['info_link_title'] = $title;
                                }
+                               //echo " title='$title'</p>\n";
                                return $title;
                        }

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** class.uiinfolog.inc.php     4 Mar 2003 17:13:19 -0000       1.58
--- class.uiinfolog.inc.php     20 Mar 2003 17:22:53 -0000      1.59
***************
*** 97,101 ****
                        $info['info_des'] = nl2br($info['info_des']);
                        $info['info_anz_subs'] = $this->bo->anzSubs($id);
!                       $this->bo->link_id2title(&$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);
                        
                        $readonlys["edit[$id]"] = 
!$this->bo->check_access($id,PHPGW_ACL_EDIT);
***************
*** 282,285 ****
--- 282,294 ----
                                        if ($content['save'] && (!$info_id || 
$this->bo->check_access($info_id,PHPGW_ACL_EDIT)))
                                        {
+                                               if 
(strstr($content['info_link_id'],':') !== False)
+                                               {
+                                                       $info_link_id = 
$content['info_link_id'];
+                                                       
$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);
  
***************
*** 288,300 ****
                                                        $content['info_id'] = 
$this->bo->so->data['info_id'];
                                                        
$this->link->link('infolog',$content['info_id'],$content['link_to']['to_id']);
!                                                       if 
(strstr($content['info_link_id'],':') !== False)
                                                        {
!                                                               list($app,$id) 
= explode(':',$content['info_link_id']);
                                                                $link = 
$this->link->get_link('infolog',$content['info_id'],$app,$id);
                                                                
$content['info_link_id'] = $link['link_id'];
  
!                                                               if 
($content['info_from'] == '')
                                                                {
!                                                                       
$content['info_from'] = $this->bo->link_id2title($content);
                                                                }
                                                                
$this->bo->write(array(
--- 297,309 ----
                                                        $content['info_id'] = 
$this->bo->so->data['info_id'];
                                                        
$this->link->link('infolog',$content['info_id'],$content['link_to']['to_id']);
!                                                       if ($info_link_id)
                                                        {
!                                                               list($app,$id) 
= explode(':',$info_link_id);
                                                                $link = 
$this->link->get_link('infolog',$content['info_id'],$app,$id);
                                                                
$content['info_link_id'] = $link['link_id'];
  
!                                                               if 
(empty($content['info_from']))
                                                                {
!                                                                       
$this->bo->link_id2from($content);
                                                                }
                                                                
$this->bo->write(array(