[Phpgroupware-cvs] etemplate/inc class.editor.inc.php

[Caeies]

CVSROOT:        /cvsroot/phpgroupware
Module name:    etemplate
Changes by:     Caeies <Caeies> 06/09/03 17:01:15

Modified files:
        inc            : class.editor.inc.php 

Log message:
        E_ALL fix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/etemplate/inc/class.editor.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39

Patches:
Index: class.editor.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.editor.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- class.editor.inc.php        5 May 2005 14:31:55 -0000       1.38
+++ class.editor.inc.php        3 Sep 2006 17:01:15 -0000       1.39
@@ -10,7 +10,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: class.editor.inc.php,v 1.38 2005/05/05 14:31:55 powerstat Exp $ 
*/
+       /* $Id: class.editor.inc.php,v 1.39 2006/09/03 17:01:15 Caeies Exp $ */
 
        class editor
        {
@@ -96,15 +96,12 @@
                        reset($this->options);
                        while (list($n,$opt) = each($this->options))
                        {
-                               $content['options'][$opt] = $options[$n];
+                               $content['options'][$opt] = $this->options[$n];
                        }
                        $cols_spanned = array();
-                       reset($this->etemplate->data);
+                       $no_button = array();
                        if (isset($this->etemplate->data[0]))
                        {
-                               each($this->etemplate->data);
-                       }
-                       $no_button = array();
                        while (list($row,$cols) = each($this->etemplate->data))
                        {
                                if ($this->etemplate->rows <= 1)
@@ -135,7 +132,14 @@
                                        }
                                        else
                                        {
+                                               if(isset($cell['span']))
+                                               {
                                                $spanned = $cell['span'] == 
'all' ? $this->etemplate->cols-$c : 0+$cell['span'];
+                                               }
+                                               else
+                                               {
+                                                       $spanned = 0;
+                                               }
                                                
                                                switch($cell['type'])   // load 
a cell-type-specific tpl
                                                {
@@ -161,6 +165,7 @@
                                        }
                                }
                        }
+                       }
                        $no_button['ColA']['exchange_col[1]'] = 
$no_button['Row1']['exchange_row[1]'] = True;
 
                        if ($this->debug)