[phpwebapp-commits] CVS: web_app/append wbDebug.html,1.3,1.4 wbDbgStatevars.php,1.5,1.6

[Dashamir H. <das...@us...>]

Update of /cvsroot/phpwebapp/web_app/append
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4377/append

Modified Files:
	wbDebug.html wbDbgStatevars.php 
Log Message:
xml parser


Index: wbDebug.html
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/append/wbDebug.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wbDebug.html	15 Aug 2003 07:05:07 -0000	1.3
--- wbDebug.html	13 Jul 2004 13:18:08 -0000	1.4
***************
*** 2,6 ****
  <If condition="SHOW_EXTERNAL_LINK">
    <Var name="extern_link">WebApp::get_external_link()</Var>
!   <br>
    <table bgcolor="#aaaaaa" border="0" cellspacing="1" cellpadding="2">
      <tr>
--- 2,6 ----
  <If condition="SHOW_EXTERNAL_LINK">
    <Var name="extern_link">WebApp::get_external_link()</Var>
!   <br/>
    <table bgcolor="#aaaaaa" border="0" cellspacing="1" cellpadding="2">
      <tr>
***************
*** 13,17 ****
      </tr>
    </table>
!   <br>
  </If>
  <WebBox ID="wbDbgStatevars">
--- 13,17 ----
      </tr>
    </table>
!   <br/>
  </If>
  <WebBox ID="wbDbgStatevars">

Index: wbDbgStatevars.php
===================================================================
RCS file: /cvsroot/phpwebapp/web_app/append/wbDbgStatevars.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wbDbgStatevars.php	25 Aug 2003 13:18:39 -0000	1.5
--- wbDbgStatevars.php	13 Jul 2004 13:18:08 -0000	1.6
***************
*** 47,73 ****
        $tree .= $indent."+--><a href='#session'>".$id."</a>\n";
  
!       $i = 0;
!       while ($i < sizeof($tpl->content))
          {
!           $line = $tpl->content[$i++];
!           if (trim($line)=="##")
!             {
!               $line = $tpl->content[$i++];
!               $tpl_id = trim($line);
! 
!               //don't display the webobjects of append
!               if (ereg("append\.html", $tpl_id))
!                 {
!                   $tree .= "</pre>\n";
!                   return $tree;
!                 }
  
!               $subtpl = $webPage->getTemplate($tpl_id);
!               //increase the indentation if the template is a webobject
!               $indent_1 = ($subtpl->type=="WebObjectTpl") 
!                 ? $indent . "|   " 
!                 : $indent;
!               $tree .= $this->webobj_to_tree($subtpl, $indent_1);
              }
          }
        $tree .= "</pre>\n";
--- 47,68 ----
        $tree .= $indent."+--><a href='#session'>".$id."</a>\n";
  
!       $arr_tpl_id = $tpl->get_subtemplates();
!       for ($i=0; $i < sizeof($arr_tpl_id); $i++)
          {
!           $tpl_id = $arr_tpl_id[$i];
  
!           //don't display the webobjects of append
!           if (strpos('append.html', $tpl_id))
!             {
!               $tree .= "</pre>\n";
!               return $tree;
              }
+ 
+           $subtpl = $webPage->getTemplate($tpl_id);
+           //increase the indentation if the template is a webobject
+           $indent_1 = ($subtpl->type=="WebObjectTpl") 
+             ? $indent . "|   " 
+             : $indent;
+           $tree .= $this->webobj_to_tree($subtpl, $indent_1);
          }
        $tree .= "</pre>\n";
***************
*** 87,105 ****
          }
  
!       $i = 0;
!       while ($i < sizeof($tpl->content))
          {
!           $line = $tpl->content[$i++];
!           if (trim($line)=="##")
!             {
!               $line = $tpl->content[$i++];
!               $tpl_id = trim($line);
!               $subtpl = $webPage->getTemplate($tpl_id);
!               //increase the indentation if the template is a webobject
!               $indent_1 = ( ($subtpl->type=="WebObjectTpl") ? 
!                             $indent . "|   " 
!                             : $indent );
!               $tree .= $this->webobj_to_tree($subtpl, $indent_1);
!             }
          }
        return $tree;
--- 82,95 ----
          }
  
!       $arr_tpl_id = $tpl->get_subtemplates();
!       for ($i=0; $i < sizeof($arr_tpl_id); $i++)
          {
!           $tpl_id = $arr_tpl_id[$i];
!           $subtpl = $webPage->getTemplate($tpl_id);
!           //increase the indentation if the template is a webobject
!           $indent_1 = ( ($subtpl->type=="WebObjectTpl") ? 
!                         $indent . "|   " 
!                         : $indent );
!           $tree .= $this->webobj_to_tree($subtpl, $indent_1);
          }
        return $tree;