[Phpgroupware-cvs] etemplate/inc class.link_widget.inc.php, 1.8 class.uietemplate_gtk.inc.php, 1.13 class.editor.inc.php, 1.38 class.xul_io.inc.php, 1.24 class.soetemplate.inc.php, 1.29

[powerstat]

Update of etemplate/inc

Modified Files:
     Branch: MAIN
            class.link_widget.inc.php lines: +2 -2
            class.uietemplate_gtk.inc.php lines: +2 -2
            class.editor.inc.php lines: +3 -3
            class.xul_io.inc.php lines: +12 -12
            class.soetemplate.inc.php lines: +2 -2

Log Message:
Fixes deprecated (since 2003) call by reference functions calls. Some function 
declarations have been changed for call by reference

====================================================
Index: etemplate/inc/class.link_widget.inc.php
diff -u etemplate/inc/class.link_widget.inc.php:1.7 
etemplate/inc/class.link_widget.inc.php:1.8
--- etemplate/inc/class.link_widget.inc.php:1.7 Sun Jun 29 16:59:14 2003
+++ etemplate/inc/class.link_widget.inc.php     Thu May  5 14:31:55 2005
@@ -222,7 +222,7 @@
                                                echo 
"<p>unlink(link-id=$unlink,$value[to_app],$value[to_id])</p>\n";
                                                if (is_array($value['to_id'])) 
_debug_array($value['to_id']);
                                        }
-                                       
$this->link->unlink($unlink,$value['to_app'],&$value['to_id']);
+                                       
$this->link->unlink($unlink,$value['to_app'],$value['to_id']);
                                        if (is_array($value['to_id']))
                                        {
                                                $extension_data['to_id'] = 
$value['to_id'];     // else changes from unlink get lost

====================================================
Index: etemplate/inc/class.uietemplate_gtk.inc.php
diff -u etemplate/inc/class.uietemplate_gtk.inc.php:1.12 
etemplate/inc/class.uietemplate_gtk.inc.php:1.13
--- etemplate/inc/class.uietemplate_gtk.inc.php:1.12    Sun Sep 29 08:50:18 2002
+++ etemplate/inc/class.uietemplate_gtk.inc.php Thu May  5 14:31:55 2005
@@ -599,7 +599,7 @@
                                case 'button':
                                        //$html .= 
$this->html->submit_button($form_name,$cell['label'],'',strlen($cell['label']) 
<= 1 || $cell['no_lang'],$options);
                                        $widget = &new 
GtkButton(strlen($cell['label']) > 1 ? lang($cell['label']) : $cell['label']);
-                                       $widget->connect_object('clicked', 
array('etemplate', 'button_clicked'),&$var,$form_name);
+                                       $widget->connect_object('clicked', 
array('etemplate', 'button_clicked'),$var,$form_name);
                                        break;
                                case 'hrule':
                                        //$html .= 
$this->html->hr($cell['size']);

====================================================
Index: etemplate/inc/class.editor.inc.php
diff -u etemplate/inc/class.editor.inc.php:1.37 
etemplate/inc/class.editor.inc.php:1.38
--- etemplate/inc/class.editor.inc.php:1.37     Fri Aug  8 16:18:30 2003
+++ etemplate/inc/class.editor.inc.php  Thu May  5 14:31:55 2005
@@ -524,7 +524,7 @@
                        {
                                $this->etemplate->xul_io = 
CreateObject('etemplate.xul_io');
                        }
-                       $xul = 
$this->etemplate->xul_io->export(&$this->etemplate);
+                       $xul = 
$this->etemplate->xul_io->export($this->etemplate);

                        fwrite($f,$xul);
                        fclose($f);
@@ -545,7 +545,7 @@
                        {
                                $this->etemplate->xul_io = 
CreateObject('etemplate.xul_io');
                        }
-                       $imported = 
$this->etemplate->xul_io->import(&$this->etemplate,$xul);
+                       $imported = 
$this->etemplate->xul_io->import($this->etemplate,$xul);
                        $this->etemplate->modified = @filemtime($f);
                        $this->etemplate->modified_set = 'xul-import';


====================================================
Index: etemplate/inc/class.xul_io.inc.php
diff -u etemplate/inc/class.xul_io.inc.php:1.23 
etemplate/inc/class.xul_io.inc.php:1.24
--- etemplate/inc/class.xul_io.inc.php:1.23     Thu Oct 17 22:13:18 2002
+++ etemplate/inc/class.xul_io.inc.php  Thu May  5 14:31:55 2005
@@ -96,7 +96,7 @@
                        );
                }

-               function set_attributes(&$widget,$attr,$val,$spanned='')
+               function set_attributes(&$widget,$attr,$val,&$spanned='')
                {
                        if ($attr != '')
                        {
@@ -162,7 +162,7 @@
                                $embeded = new 
etemplate($tpl,$etempl->as_array());
                                if ($embeded_too)
                                {
-                                       
$this->etempl2grid($embeded,&$root,$embeded_too);
+                                       
$this->etempl2grid($embeded,$root,$embeded_too);
                                }
                                $cell['size'] = $embeded->name;
                                unset($embeded);
@@ -181,7 +181,7 @@
                                        $embeded = new 
etemplate($names[$n],$etempl->as_array());
                                        if ($embeded_too)
                                        {
-                                               
$this->etempl2grid($embeded,&$root,$embeded_too);
+                                               
$this->etempl2grid($embeded,$root,$embeded_too);
                                        }
                                        $grid = new xmlnode('grid');
                                        
$grid->set_attribute('id',$embeded->name);
@@ -219,7 +219,7 @@
                                        $embeded = new etemplate();
                                        if 
($embeded->read($name=$embeded->expand_name($cell['name'],0,0),'default','default',0,'',$etempl->as_array()))
                                        {
-                                               
$this->etempl2grid($embeded,&$root,$embeded_too);
+                                               
$this->etempl2grid($embeded,$root,$embeded_too);
                                        }
                                        $cell['name'] = $embeded->name;
                                        unset($embeded);
@@ -240,7 +240,7 @@
                                {
                                        $attr = $this->attr2xul[$attr];
                                }
-                               
$this->set_attributes($attr_widget,$attr,$val,&$spanned);
+                               
$this->set_attributes($attr_widget,$attr,$val,$spanned);
                        }
                        if ($child)
                        {
@@ -319,7 +319,7 @@
                        return '';
                }

-               function export($etempl)
+               function export(&$etempl)
                {
                        if ($this->debug)
                        {
@@ -331,7 +331,7 @@
                        $xul_overlay = new xmlnode('overlay');

                        $embeded_too = True;
-                       $this->etempl2grid($etempl,&$xul_overlay,$embeded_too);
+                       $this->etempl2grid($etempl,$xul_overlay,$embeded_too);

                        $doc->add_root($xul_overlay);
                        $xml = $doc->export_xml();
@@ -492,7 +492,7 @@
                                                        $tab_attr['span'] .= 
$tab_attr['class'] ? ','.$tab_attr['class'] : '';
                                                        
unset($tab_attr['class']);

-                                                       
$this->add_cell($etempl,$tab_attr,&$box,&$col,$node['level']);
+                                                       
$this->add_cell($etempl,$tab_attr,$box,$col,$node['level']);
                                                        unset($tab_attr);
                                                }
                                                break;
@@ -521,7 +521,7 @@
                                                }
                                                else
                                                {
-                                                       
$this->add_cell($etempl,$menulist_attr,&$box,&$col,$node['level']);
+                                                       
$this->add_cell($etempl,$menulist_attr,$box,$col,$node['level']);
                                                        unset($menulist_attr);
                                                }
                                                break;
@@ -536,7 +536,7 @@
                                                        $cell = 
&$box[$node['level']];
                                                        $cell['size'] = 
$cell['anz'] . ($cell['size'] != '' ? ','.$cell['size'] : '');
                                                        unset($cell['anz']);
-                                                       
$this->add_cell($etempl,$cell,&$box,&$col,$node['level']);
+                                                       
$this->add_cell($etempl,$cell,$box,$col,$node['level']);
                                                        
unset($box[$node['level']]);
                                                }
                                                break;
@@ -595,7 +595,7 @@
                                                {
                                                        break;
                                                }
-                                               
$this->add_cell($etempl,$attr,&$box,&$col,$node['level']);
+                                               
$this->add_cell($etempl,$attr,$box,$col,$node['level']);
                                                break;
                                }
                        }

====================================================
Index: etemplate/inc/class.soetemplate.inc.php
diff -u etemplate/inc/class.soetemplate.inc.php:1.28 
etemplate/inc/class.soetemplate.inc.php:1.29
--- etemplate/inc/class.soetemplate.inc.php:1.28        Fri Aug  8 16:18:30 2003
+++ etemplate/inc/class.soetemplate.inc.php     Thu May  5 14:31:54 2005
@@ -311,7 +311,7 @@
                                {
                                        $this->xul_io = 
CreateObject('etemplate.xul_io');
                                }
-                               $loaded = $this->xul_io->import(&$this,$xml);
+                               $loaded = $this->xul_io->import($this,$xml);

                                if (!is_array($loaded))
                                {