[Phpgroupware-cvs] CVS: infolog/inc class.boinfolog.inc.php, 1.14.2.3.2.7, 1.14.2.3.2.8 class.uiinfolog.inc.php, 1.30.2.12.2.4, 1.30.2.12.2.5

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.boinfolog.inc.php class.uiinfolog.inc.php 
Log Message:
1) used blurText for the info_from field
2) fixed display of info_from, to show a custom value in the list
3) changed info_startdate to a date+time field

Index: class.boinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.boinfolog.inc.php,v
retrieving revision 1.14.2.3.2.7
retrieving revision 1.14.2.3.2.8
diff -C2 -r1.14.2.3.2.7 -r1.14.2.3.2.8
*** class.boinfolog.inc.php     11 Aug 2003 22:32:55 -0000      1.14.2.3.2.7
--- class.boinfolog.inc.php     20 Aug 2003 00:43:19 -0000      1.14.2.3.2.8
***************
*** 101,105 ****
                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)
--- 101,105 ----
                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 &&
                                 ($link = 
$this->link->get_link($info['info_link_id'])) !== False)
***************
*** 107,128 ****
                                $nr = $link['link_app1'] == 'infolog' && 
$link['link_id1'] == $info['info_id'] ? '2' : '1';
                                $title = 
$this->link->title($link['link_app'.$nr],$link['link_id'.$nr]);
!                               
!                               if (htmlentities($title) == $info['info_from'])
                                {
!                                       $info['info_from'] = $title;    // 
correct old entries
                                }
                                if ($link['link_app'.$nr] == $not_app && 
$link['link_id'.$nr] == $not_id)
                                {
-                                       if ($title == $info['info_from'])
-                                       {
-                                               $info['info_from'] = '';
-                                       }
                                        return False;
                                }
                                $info['info_link_view'] = 
$this->link->view($link['link_app'.$nr],$link['link_id'.$nr]);
!                               $info['info_link_title'] = $title;
!                               
                                //echo " title='$title'</p>\n";
!                               return $title;
                        }
                        else
--- 107,124 ----
                                $nr = $link['link_app1'] == 'infolog' && 
$link['link_id1'] == $info['info_id'] ? '2' : '1';
                                $title = 
$this->link->title($link['link_app'.$nr],$link['link_id'.$nr]);
! 
!                               if ($title == $info['info_from'] || 
htmlentities($title) == $info['info_from'])
                                {
!                                       $info['info_from'] = '';
                                }
                                if ($link['link_app'.$nr] == $not_app && 
$link['link_id'.$nr] == $not_id)
                                {
                                        return False;
                                }
                                $info['info_link_view'] = 
$this->link->view($link['link_app'.$nr],$link['link_id'.$nr]);
!                               $info['info_link_title'] = 
!empty($info['info_from']) ? $info['info_from'] : $title;
! 
                                //echo " title='$title'</p>\n";
!                               return $info['blur_title'] = $title;
                        }
                        else

Index: class.uiinfolog.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/inc/class.uiinfolog.inc.php,v
retrieving revision 1.30.2.12.2.4
retrieving revision 1.30.2.12.2.5
diff -C2 -r1.30.2.12.2.4 -r1.30.2.12.2.5
*** class.uiinfolog.inc.php     11 Aug 2003 22:32:55 -0000      1.30.2.12.2.4
--- class.uiinfolog.inc.php     20 Aug 2003 00:43:19 -0000      1.30.2.12.2.5
***************
*** 296,304 ****
                                        $content['info_link_id'] = 
$content['link_to']['primary'];
                                }
-                               if ($content['set_today'])
-                               {
-                                       $content['info_startdate'] = time();
-                                       unset($content['set_today']);
-                               }
                                if ($content['save'] || $content['delete'] || 
$content['cancel'])
                                {
--- 296,299 ----
***************
*** 387,390 ****
--- 382,389 ----
                                        {
                                                $content['info_startdate'] = 
time();
+                                       }
+                                       if ($content['info_enddate'] < time())  
        // parent-enddate is in the past => empty
+                                       {
+                                               $content['info_enddate'] = '';
                                        }
                                }