[Phpgroupware-cvs] CVS: etemplate/inc class.link_widget.inc.php,1.3,1.4 class.uietemplate.inc.php,1.47,1.48

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv715

Modified Files:
        class.link_widget.inc.php class.uietemplate.inc.php 
Log Message:
some fixes to get the links working in case the entry is not yet created

Index: class.link_widget.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.link_widget.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.link_widget.inc.php   17 Oct 2002 22:08:24 -0000      1.3
--- class.link_widget.inc.php   18 Oct 2002 20:19:57 -0000      1.4
***************
*** 141,149 ****
                                        if ($value['to_app'])                   
                        // make the link
                                        {
!                                               
$this->link->link($value['to_app'],$value['to_id'],$value['app'],$value['id'],$value['remark']);
                                                //echo 
"<p>link($value[to_app],$value[to_id],$value[app],$value[id],'$value[remark]')</p>\n";
                                                if (isset($value['primary']) && 
!$value['anz_links'] )
                                                {
!                                                       $value['primary'] = 
$value['app'].'/'.$value['id'];
                                                }
                                        }
--- 141,149 ----
                                        if ($value['to_app'])                   
                        // make the link
                                        {
!                                               $link_id = 
$this->link->link($value['to_app'],$value['to_id'],$value['app'],$value['id'],$value['remark']);
                                                //echo 
"<p>link($value[to_app],$value[to_id],$value[app],$value[id],'$value[remark]')</p>\n";
                                                if (isset($value['primary']) && 
!$value['anz_links'] )
                                                {
!                                                       $value['primary'] = 
$link_id;
                                                }
                                        }

Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** class.uietemplate.inc.php   17 Oct 2002 23:34:28 -0000      1.47
--- class.uietemplate.inc.php   18 Oct 2002 20:19:58 -0000      1.48
***************
*** 209,213 ****
                        else
                        {
!                               
ExecMethod($session_data['method'],$this->complete_array_merge($content,$session_data['preserv']));
                        }
                }
--- 209,213 ----
                        else
                        {
!                               
ExecMethod($session_data['method'],$this->complete_array_merge($session_data['preserv'],$content));
                        }
                }
***************
*** 359,366 ****
                                                }
                                        }
!                                       elseif ($opts[$col])    // width only 
once for a non colspan cell
                                        {
!                                               $row_data[".$col"] .= ' 
WIDTH='.$opts[$col];
!                                               $opts[$col] = 0;
                                        }
                                        $row_data[".$col"] .= 
$this->html->formatOptions($cell['align'],'ALIGN');
--- 359,370 ----
                                                }
                                        }
!                                       else
                                        {
!                                               list($width,$disable) = 
explode(',',$opts[$col]);
!                                               if ($width)             // 
width only once for a non colspan cell
!                                               {
!                                                       $row_data[".$col"] .= " 
WIDTH=\"$width\"";
!                                                       $opts[$col] = 
"0,$disable";
!                                               }
                                        }
                                        $row_data[".$col"] .= 
$this->html->formatOptions($cell['align'],'ALIGN');