stack-cvs

[Ben H. <bdv...@us...>]

Update of /cvsroot/stack/stack-dev/lib/XML
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv29766/lib/XML

Modified Files:
      Tag: question_reporting
	ImportStackTwoItem.php ImportStackOneItem.php 
	ExportStackTwoBatch.php ExportStackTwoItem.php 
Log Message:
Merging from the current HEAD into question_reporting. Apologies in advance if this all goes horribly wrong.

Index: ExportStackTwoBatch.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ExportStackTwoBatch.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** ExportStackTwoBatch.php	27 Aug 2009 16:23:00 -0000	1.5
--- ExportStackTwoBatch.php	22 Nov 2010 23:05:51 -0000	1.5.2.1
***************
*** 82,90 ****
  
              $path = $config->get('tmp');
!             if($filename == NULL)
!             {
!                 $title = get_string('stackExport_xmlFilename', 'stack', '');
!             }
!             $title = $title.'.xml';
              $this->title = $title;
  
--- 82,87 ----
  
              $path = $config->get('tmp');
!             $title = get_string('stackExport_xmlFilename', 'stack', '');
!             $title = $title.date('_Y_m_d_H-i-s',time()).'.xml';
              $this->title = $title;
  

Index: ImportStackTwoItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ImportStackTwoItem.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** ImportStackTwoItem.php	16 Oct 2009 10:28:43 -0000	1.23
--- ImportStackTwoItem.php	22 Nov 2010 23:05:50 -0000	1.23.2.1
***************
*** 93,97 ****
      public function importQuestion($filename=NULL, $itemOptions=NULL, $validate=true)
      {
-         //echo $filename;
          if($filename != NULL)
          {
--- 93,96 ----

Index: ImportStackOneItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ImportStackOneItem.php,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -d -r1.25 -r1.25.2.1
*** ImportStackOneItem.php	27 Aug 2009 16:23:00 -0000	1.25
--- ImportStackOneItem.php	22 Nov 2010 23:05:51 -0000	1.25.2.1
***************
*** 109,113 ****
          if($valid == true)
          {
-             //echo 'Correct';
              $this->setDesc();
              $this->setVars();
--- 109,112 ----

Index: ExportStackTwoItem.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/lib/XML/ExportStackTwoItem.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** ExportStackTwoItem.php	27 Aug 2009 16:23:00 -0000	1.11
--- ExportStackTwoItem.php	22 Nov 2010 23:05:51 -0000	1.11.2.1
***************
*** 208,212 ****
      {
          $node = $this->dom->createElement($title);
!         $nodeText = $this->dom->createTextNode($text);
          $node->appendChild($nodeText);
          return $node;
--- 208,212 ----
      {
          $node = $this->dom->createElement($title);
!         $nodeText = $this->dom->createTextNode(utf8_encode($text));
          $node->appendChild($nodeText);
          return $node;