[Phpgroupware-cvs] CVS: phpgwapi/inc class.listbox.inc.php,1.11,1.12 class.portalbox.inc.php,1.19,1.20 class.xslttemplates.inc.php,1.7,1.8

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5797/inc

Modified Files:
        class.listbox.inc.php class.portalbox.inc.php 
        class.xslttemplates.inc.php 
Log Message:
update xslt

Index: class.listbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.listbox.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.listbox.inc.php       25 Oct 2002 03:04:28 -0000      1.11
--- class.listbox.inc.php       25 Oct 2002 16:43:00 -0000      1.12
***************
*** 24,31 ****
        /* $Id$ */
  
!       CreateObject('phpgwapi.portalbox');
  
        class listbox extends portalbox
        {
                /*
                 Set up the Object. You will notice, we have not reserved
--- 24,33 ----
        /* $Id$ */
  
!       require_once('class.portalbox.inc.php');
  
        class listbox extends portalbox
        {
+               var $param;
+ 
                /*
                 Set up the Object. You will notice, we have not reserved
***************
*** 42,46 ****
                 if I then wanted to override any of the values, I could easily 
do so.
                */
!               function listbox($param)
                {
                        @reset($param);
--- 44,52 ----
                 if I then wanted to override any of the values, I could easily 
do so.
                */
!               function listbox()
!               {
!               }
! 
!               function set_params($param)
                {
                        @reset($param);
***************
*** 53,57 ****
                                }
                        }
!                       $this->portalbox($param['title']);
  
                        if($param['app_id'])
--- 59,63 ----
                                }
                        }
!                       $this->title = $param['title'];
  
                        if($param['app_id'])
***************
*** 94,98 ****
                                        );
                                }
!                               $this->output[]['listbox'] = $var;
                        }
                        $this->set_internal($extra_data);
--- 100,104 ----
                                        );
                                }
!                               $this->listbox = $var;
                        }
                        $this->set_internal($extra_data);
***************
*** 122,126 ****
                                        );
                                }
!                               $this->output[]['listbox'] = $var;
                        }
                        $this->set_xinternal($extra_data);
--- 128,132 ----
                                        );
                                }
!                               $this->listbox = $var;
                        }
                        $this->set_xinternal($extra_data);

Index: class.portalbox.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.portalbox.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.portalbox.inc.php     25 Oct 2002 03:04:28 -0000      1.19
--- class.portalbox.inc.php     25 Oct 2002 16:43:00 -0000      1.20
***************
*** 36,41 ****
                var $edit;
  
                var $output;
!               var $data = array();
  
                // Textual variables
--- 36,45 ----
                var $edit;
  
+               var $extrabox;
+               var $xextrabox;
+               var $listbox;
+ 
                var $output;
!               var $data;
  
                // Textual variables
***************
*** 44,51 ****
                /* This is the constructor for the object. */
  
!               function portalbox($title = '')
                {
!                       $this->setvar('title',$title);
!             // echo 'After SetVar Title = '.$this->getvar('title')."<br>\n";
                }
  
--- 48,69 ----
                /* This is the constructor for the object. */
  
!               function portalbox()
                {
!                       $this->title = '';
!                       $this->app_name = '';
!                       $this->app_id = 0;
! 
!                       $this->up = '';
!                       $this->down = '';
!                       $this->close = '';
!                       $this->question = '';
!                       $this->edit = '';
! 
!                       $this->extrabox = '';
!                       $this->xextrabox = '';
!                       $this->listbox = '';
! 
!                       $this->output;
!                       $this->data = array();
                }
  
***************
*** 81,87 ****
                function start_template($extra = '')
                {
!                       if ($extra && $this->getvar('app_name'))
                        {
!                               
$GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->getvar('app_name'),'default')
 . SEP . 'extrabox'));
                        }
                        else
--- 99,107 ----
                function start_template($extra = '')
                {
!                       echo 'APPNAME: ' . $this->app_name;
! 
!                       if ($extra && $this->app_name)
                        {
!                               
$GLOBALS['phpgw']->xslttpl->add_file(array('portal',$GLOBALS['phpgw']->common->get_tpl_dir($this->app_name,'default')
 . SEP . 'extrabox'));
                        }
                        else
***************
*** 89,95 ****
                                $GLOBALS['phpgw']->xslttpl->add_file('portal');
                        }
- 
-                       $this->output[]['title'] = $this->getvar('title');
-                       $this->output[]['space'] = '&nbsp;';
                }
  
--- 109,112 ----
***************
*** 108,112 ****
                        if($extra_data !='')
                        {
!                               $this->output[]['extrabox'] = $extra_data;
                        }
                }
--- 125,129 ----
                        if($extra_data !='')
                        {
!                               $this->extrabox = $extra_data;
                        }
                }
***************
*** 116,120 ****
                        if($extra_data !='')
                        {
!                               $this->output[]['xextrabox'] = $extra_data;
                        }
                }
--- 133,137 ----
                        if($extra_data !='')
                        {
!                               $this->xextrabox = $extra_data;
                        }
                }
***************
*** 154,161 ****
                                }
  
!                               $this->output[]['control_link'] = $control_link;
                        }
-                       
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('portal_data' => 
$this->output),True);
-                       //return $GLOBALS['phpgw']->xslttpl->parse();
                }
        }
--- 171,200 ----
                                }
  
!                               $this->output['portal_data'][] = array
!                               (
!                                       'title'                 => $this->title,
!                                       'control_link'  => $control_link,
!                                       'listbox'               => 
$this->listbox,
!                                       'extrabox'              => 
$this->extrabox,
!                                       'xextrabox'             => 
$this->xextrabox
!                               );
! 
!                               for 
($i=0;$i<count($this->output['portal_data']);$i++)
!                               {
!                                       if 
($this->output['portal_data'][$i]['listbox'] == '')
!                                       {
!                                               
unset($this->output['portal_data'][$i]['listbox']);
!                                       }
!                                       if 
($this->output['portal_data'][$i]['extrabox'] == '')
!                                       {
!                                               
unset($this->output['portal_data'][$i]['extrabox']);
!                                       }
!                                       if 
($this->output['portal_data'][$i]['xextrabox'] == '')
!                                       {
!                                               
unset($this->output['portal_data'][$i]['xextrabox']);
!                                       }
!                               }
                        }
                }
        }
+ ?>

Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.xslttemplates.inc.php 25 Oct 2002 03:04:28 -0000      1.7
--- class.xslttemplates.inc.php 25 Oct 2002 16:43:00 -0000      1.8
***************
*** 136,140 ****
                        if($append)
                        {
-                               //_debug_array($value);
                                if (is_array($value))
                                {
--- 136,139 ----
***************
*** 144,147 ****
--- 143,147 ----
                                        }
                                }
+                               _debug_array($this->vars);
                        }
                        else