[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[315] includes

[<big...@us...>]

Revision: 315
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=315&view=rev
Author:   bigmichi1
Date:     2009-09-02 15:48:31 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
remove errorsAsHTML()
fix "Undefined variable" and "undefined constant" in class.Error.inc.php

Modified Paths:
--------------
    includes/autoloader.inc.php
    includes/error/class.Error.inc.php
    includes/output/class.Output.inc.php
    includes/output/class.WebpageXML.inc.php

Modified: includes/autoloader.inc.php
===================================================================
--- includes/autoloader.inc.php	2009-08-22 14:55:22 UTC (rev 314)
+++ includes/autoloader.inc.php	2009-09-02 15:48:31 UTC (rev 315)
@@ -37,8 +37,7 @@
     $error = Error::singleton();
     
     $error->addError("_autoload(\"".$class_name."\")", "autoloading of class file (class.".$class_name.".inc.php) failed!");
-    echo $error->errorsAsHTML();
-    die();
+    $error->errorsAsXML();
 }
 
 /**

Modified: includes/error/class.Error.inc.php
===================================================================
--- includes/error/class.Error.inc.php	2009-08-22 14:55:22 UTC (rev 314)
+++ includes/error/class.Error.inc.php	2009-09-02 15:48:31 UTC (rev 315)
@@ -124,53 +124,28 @@
     }
     
     /**
-     * converts the internal error and warning list in a html table
-     *
-     * @return string contains a HTML table which can be used to echo out the errors
-     */
-    public function errorsAsHTML()
-    {
-        $strHTMLString = "";
-        $strWARNString = "";
-        $strHTMLhead = "<table width=\"100%\" border=\"0\">\n"."\t<tr>\n"."\t\t<td><font size=\"-1\"><b>Command</b></font></td>\n"."\t\t<td><font size=\"-1\"><b>Message</b></font></td>\n"."\t</tr>\n";
-        $strHTMLfoot = "</table>\n";
-        if ($this->_errors > 0) {
-            foreach ($this->_arrErrorList as $arrLine) {
-                if ($arrLine['command'] == "WARN") {
-                    $strWARNString .= "<font size=\"-1\"><b>WARNING: ".str_replace("\n", "<br/>", htmlspecialchars($arrLine['message']))."</b></font><br/>\n";
-                } else {
-                    $strHTMLString .= "\t<tr>\n"."\t\t<td><font size=\"-1\">".htmlspecialchars($arrLine['command'])."</font></td>\n"."\t\t<td><font size=\"-1\">".str_replace("\n", "<br/>", $arrLine['message'])."</font></td>\n"."\t</tr>\n";
-                }
-            }
-        }
-        if (! empty($strHTMLString)) {
-            $strHTMLString = $strWARNString.$strHTMLhead.$strHTMLString.$strHTMLfoot;
-        } else {
-            $strHTMLString = $strWARNString;
-        }
-        return $strHTMLString;
-    }
-    
-    /**
      * converts the internal error and warning list to a XML file
      *
-     * @return string XML data containing the errors
+     * @return void
      */
     public function errorsAsXML()
     {
-        $dom = new DOMDocument();
+        $dom = new DOMDocument('1.0', 'UTF-8');
         $root = $dom->createElement("phpsysinfo");
         $dom->appendChild($root);
-        $xml = new SimpleXMLExtended(simplexml_import_dom($dom), $encoding);
+        $xml = new SimpleXMLExtended(simplexml_import_dom($dom), 'UTF-8');
         $generation = $xml->addChild('Generation');
-        $generation->addAttribute('version', PSI_VERSION);
+        $generation->addAttribute('version', CommonFunctions::PSI_VERSION);
         $generation->addAttribute('timestamp', time());
         $xmlerr = $xml->addChild("Errors");
         foreach ($this->_arrErrorList as $arrLine) {
             $error = $xmlerr->addCData('Error', $arrLine['message']);
             $error->addAttribute('Function', $arrLine['command']);
         }
-        return $xml->getSimpleXmlElement()->asXML();
+        header("Cache-Control: no-cache, must-revalidate\n");
+        header("Content-Type: text/xml\n\n");
+        echo $xml->getSimpleXmlElement()->asXML();
+        exit();
     }
     /**
      * add the errors to an existing xml document

Modified: includes/output/class.Output.inc.php
===================================================================
--- includes/output/class.Output.inc.php	2009-08-22 14:55:22 UTC (rev 314)
+++ includes/output/class.Output.inc.php	2009-09-02 15:48:31 UTC (rev 315)
@@ -55,8 +55,7 @@
             include_once APP_ROOT.'/config.php';
         }
         if ($this->error->errorsExist()) {
-            echo $this->error->errorsAsHTML();
-            exit;
+            $this->error->errorsAsXML();
         }
     }
 }

Modified: includes/output/class.WebpageXML.inc.php
===================================================================
--- includes/output/class.WebpageXML.inc.php	2009-08-22 14:55:22 UTC (rev 314)
+++ includes/output/class.WebpageXML.inc.php	2009-09-02 15:48:31 UTC (rev 315)
@@ -114,9 +114,7 @@
             
             // if there are errors stop executing the script until they are fixed
             if ($this->error->errorsExist()) {
-                header("Content-Type: text/xml\n\n");
-                echo $this->error->errorsAsXML();
-                exit;
+                $this->error->errorsAsXML();
             }
         }
         


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.