Make sure traditional include-path-style class loading does not interfere with a working class autoloader

Spreadsheet/Excel/Writer.php

@@ -31,8 +31,9 @@
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-require_once 'PEAR.php';
+if (!class_exists('Spreadsheet_Excel_Writer_Workbook')) {
     require_once 'Spreadsheet/Excel/Writer/Workbook.php';
+}
 
 /**
 * Class for writing Excel Spreadsheets. This class should change COMPLETELY.

Spreadsheet/Excel/Writer/BIFFwriter.php

@@ -32,7 +32,9 @@
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+if (!class_exists('PEAR')) {
     require_once 'PEAR.php';
+}
 
 /**
 * Class for writing Excel BIFF records.

Spreadsheet/Excel/Writer/Format.php

@@ -32,7 +32,9 @@
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+if (!class_exists('PEAR')) {
     require_once 'PEAR.php';
+}
 
 /**
 * Class for generating Excel XF records (formats)

Spreadsheet/Excel/Writer/Parser.php

@@ -97,7 +97,9 @@ define('SPREADSHEET_EXCEL_WRITER_NE', "<>");
 */
 define('SPREADSHEET_EXCEL_WRITER_CONCAT', "&");
 
+if (!class_exists('PEAR')) {
     require_once 'PEAR.php';
+}
 
 /**
 * Class for parsing Excel formulas

Spreadsheet/Excel/Writer/Workbook.php

@@ -32,12 +32,20 @@
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+if (!class_exists('Spreadsheet_Excel_Writer_BIFFwriter')) {
     require_once 'Spreadsheet/Excel/Writer/Format.php';
     require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
     require_once 'Spreadsheet/Excel/Writer/Worksheet.php';
     require_once 'Spreadsheet/Excel/Writer/Parser.php';
+}
+
+if (!class_exists('OLE_PPS_Root')) {
     require_once 'OLE/PPS/Root.php';
+}
+
+if (!class_exists('OLE_PPS_File')) {
     require_once 'OLE/PPS/File.php';
+}
 
 /**
 * Class for generating Excel Spreadsheets
@@ -378,7 +386,9 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
      */
     public function &addValidator()
     {
+        if (!class_exists('Spreadsheet_Excel_Writer_Validator')) {
             include_once 'Spreadsheet/Excel/Writer/Validator.php';
+        }
         /* FIXME: check for successful inclusion*/
         $valid = new Spreadsheet_Excel_Writer_Validator($this->_parser);
         return $valid;

Spreadsheet/Excel/Writer/Worksheet.php

@@ -32,8 +32,10 @@
 *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+if (!class_exists('Spreadsheet_Excel_Writer_BIFFwriter')) {
     require_once 'Spreadsheet/Excel/Writer/Parser.php';
     require_once 'Spreadsheet/Excel/Writer/BIFFwriter.php';
+}
 
 /**
 * Class for generating Excel Spreadsheets