[Fmsystem-commits] [6805] Changed so that xml can be injected directly in

[Petur Bjorn Thorsteinsson]

Revision: 6805
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6805
Author:   peturbjorn
Date:     2011-01-19 08:40:11 +0000 (Wed, 19 Jan 2011)
Log Message:
-----------
Changed so that xml can be injected directly in

Modified Paths:
--------------
    branches/dev-bim2/phpgwapi/inc/class.xslttemplates.inc.php

Modified: branches/dev-bim2/phpgwapi/inc/class.xslttemplates.inc.php
===================================================================
--- branches/dev-bim2/phpgwapi/inc/class.xslttemplates.inc.php  2011-01-19 
08:38:26 UTC (rev 6804)
+++ branches/dev-bim2/phpgwapi/inc/class.xslttemplates.inc.php  2011-01-19 
08:40:11 UTC (rev 6805)
@@ -221,6 +221,11 @@
                                $this->xmlvars .= $xml;
                        }
                }
+               
+               function set_xml_data($xml)
+               {
+                       $this->xmldata = $xml;
+               }
 
                function get_var($name)
                {
@@ -294,22 +299,23 @@
 
                function xml_parse()
                {
-                       $this->xmldata = '';
-
-                       $xmldata = $this->vars;
-
-                       /* auto generate xml based on vars */
-                       foreach ( $this->xmlvars as $key => $value )
-                       {
-                               $xmldata[$key] = $value;
+                       //$this->xmldata = '';
+                       if(strlen($this->xmldata)== 0) {
+                               $xmldata = $this->vars;
+       
+                               /* auto generate xml based on vars */
+                               foreach ( $this->xmlvars as $key => $value )
+                               {
+                                       $xmldata[$key] = $value;
+                               }
+       
+                       //      $this->xmldata = var2xml('PHPGW', $xmldata);
+                               //use simplexml - it's faster.
+                               $this->xmldata = 
phpgwapi_xmlhelper::toXML($xmldata, 'PHPGW');
                        }
 
-               //      $this->xmldata = var2xml('PHPGW', $xmldata);
-                       //use simplexml - it's faster.
-                       $this->xmldata = phpgwapi_xmlhelper::toXML($xmldata, 
'PHPGW');
-
                        $debug = false;
-               //      $debug = true;                  
+                       //$debug = true;                        
                        if ($debug)
                        {
                                //$this->xmldata = str_replace("\n",'' 
,$this->xmldata);
@@ -401,11 +407,13 @@
 
                function pparse()
                {
+                       
                        print $this->parse();
                        return false;
                }
                function pp()
                {
+                       
                        return $this->pparse();
                }
        }