[Phpgroupware-cvs] CVS: etemplate/inc class.soetemplate.inc.php,1.4,1.5

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.soetemplate.inc.php 
Log Message:
changed init to be used to set complete template data, has to be as array in 
$name

Index: class.soetemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.soetemplate.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soetemplate.inc.php   19 Feb 2002 18:04:46 -0000      1.4
--- class.soetemplate.inc.php   9 Jun 2002 21:31:01 -0000       1.5
***************
*** 108,112 ****
                @function init
                @abstract initialises all internal data-structures of the 
eTemplate and sets the keys
!               @param $name name of the eTemplate or array with the keys
                @param $template,$lang,$group,$version see class
                @param $rows,$cols initial size of the template
--- 108,112 ----
                @function init
                @abstract initialises all internal data-structures of the 
eTemplate and sets the keys
!               @param $name name of the eTemplate or array with the keys or 
all data
                @param $template,$lang,$group,$version see class
                @param $rows,$cols initial size of the template
***************
*** 114,119 ****
                function 
init($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
                {
!                       reset($this->db_key_cols);
!                       while (list($db_col,$col) = each($this->db_key_cols))
                        {
                                $this->$col = is_array($name) ? $name[$col] : 
$$col;
--- 114,119 ----
                function 
init($name='',$template='',$lang='',$group=0,$version='',$rows=1,$cols=1)
                {
!                       reset($this->db_cols);
!                       while (list($db_col,$col) = each($this->db_cols))
                        {
                                $this->$col = is_array($name) ? $name[$col] : 
$$col;
***************
*** 126,129 ****
--- 126,133 ----
                        {
                                $this->lang = '';
+                       }
+                       if (is_array($name) && isset($name['data']))
+                       {
+                               return; // data already set
                        }
                        $this->size = $this->style = '';