From 5818a79e67b205b76f4681c2832a8c8c35d43680 Mon Sep 17 00:00:00 2001 From: Maarten Balliauw Date: Wed, 10 Jul 2013 11:18:43 +0200 Subject: [PATCH 1/3] Update bootstrap.php --- unitTests/bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/unitTests/bootstrap.php b/unitTests/bootstrap.php index d963cc7..19b31a8 100644 --- a/unitTests/bootstrap.php +++ b/unitTests/bootstrap.php @@ -30,6 +30,7 @@ defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'ci'); set_include_path(implode(PATH_SEPARATOR, array( realpath(APPLICATION_PATH . '/../Classes'), './', + dirname(__FILE__), get_include_path(), ))); From 8057604241836132c7bef5e5d0371f07a184ff8a Mon Sep 17 00:00:00 2001 From: Maarten Balliauw Date: Wed, 10 Jul 2013 13:33:04 +0200 Subject: [PATCH 2/3] Updated include paths for examples --- Examples/01simple-download-pdf.php | 2 +- Examples/01simple-download-xls.php | 2 +- Examples/01simple-download-xlsx.php | 2 +- Examples/01simple.php | 2 +- Examples/02types-xls.php | 2 +- Examples/02types.php | 2 +- Examples/03formulas.php | 2 +- Examples/04printing.php | 2 +- Examples/05featuredemo.php | 2 +- Examples/06largescale-with-cellcaching-sqlite.php | 2 +- Examples/06largescale-with-cellcaching-sqlite3.php | 2 +- Examples/06largescale-with-cellcaching.php | 2 +- Examples/06largescale-xls.php | 2 +- Examples/06largescale.php | 2 +- Examples/07reader.php | 2 +- Examples/08conditionalformatting.php | 2 +- Examples/08conditionalformatting2.php | 2 +- Examples/09pagebreaks.php | 2 +- Examples/10autofilter-selection-1.php | 2 +- Examples/10autofilter-selection-2.php | 2 +- Examples/10autofilter-selection-display.php | 2 +- Examples/10autofilter.php | 2 +- Examples/11documentsecurity-xls.php | 2 +- Examples/11documentsecurity.php | 2 +- Examples/12cellProtection.php | 2 +- Examples/13calculation.php | 2 +- Examples/14excel5.php | 2 +- Examples/15datavalidation-xls.php | 2 +- Examples/15datavalidation.php | 2 +- Examples/16csv.php | 2 +- Examples/17html.php | 2 +- Examples/18extendedcalculation.php | 2 +- Examples/19namedrange.php | 2 +- Examples/20readexcel5.php | 2 +- Examples/21pdf.php | 2 +- Examples/22heavilyformatted.php | 2 +- Examples/23sharedstyles.php | 2 +- Examples/24readfilter.php | 2 +- Examples/25inmemoryimage.php | 2 +- Examples/26utf8.php | 2 +- Examples/27imagesexcel5.php | 2 +- Examples/28iterator.php | 2 +- Examples/29advancedvaluebinder.php | 2 +- Examples/30template.php | 2 +- Examples/31docproperties_write-xls.php | 2 +- Examples/31docproperties_write.php | 2 +- Examples/32chartreadwrite.php | 2 +- Examples/33chartcreate-area.php | 2 +- Examples/33chartcreate-bar-stacked.php | 2 +- Examples/33chartcreate-bar.php | 2 +- Examples/33chartcreate-column-2.php | 2 +- Examples/33chartcreate-column.php | 2 +- Examples/33chartcreate-composite.php | 2 +- Examples/33chartcreate-line.php | 2 +- Examples/33chartcreate-multiple-charts.php | 2 +- Examples/33chartcreate-pie.php | 2 +- Examples/33chartcreate-radar.php | 2 +- Examples/33chartcreate-scatter.php | 2 +- Examples/35chartrender.php | 2 +- Examples/36chartreadwriteHTML.php | 2 +- Examples/36chartreadwritePDF.php | 2 +- Examples/37page_layout_view.php | 2 +- Examples/38cloneWorksheet.php | 2 +- Examples/40duplicateStyle.php | 2 +- Examples/Excel2003XMLReader.php | 2 +- Examples/GnumericReader.php | 2 +- Examples/OOCalcReader.php | 2 +- Examples/Quadratic.php | 2 +- Examples/Quadratic2.php | 2 +- Examples/SylkReader.php | 2 +- Examples/XMLReader.php | 2 +- 71 files changed, 71 insertions(+), 71 deletions(-) diff --git a/Examples/01simple-download-pdf.php b/Examples/01simple-download-pdf.php index d3dcdfc..4de0347 100644 --- a/Examples/01simple-download-pdf.php +++ b/Examples/01simple-download-pdf.php @@ -35,7 +35,7 @@ if (PHP_SAPI == 'cli') die('This example should only be run from a Web Browser'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Change these values to select the Rendering library that you wish to use diff --git a/Examples/01simple-download-xls.php b/Examples/01simple-download-xls.php index f7f7aed..ddbfc44 100644 --- a/Examples/01simple-download-xls.php +++ b/Examples/01simple-download-xls.php @@ -35,7 +35,7 @@ if (PHP_SAPI == 'cli') die('This example should only be run from a Web Browser'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/01simple-download-xlsx.php b/Examples/01simple-download-xlsx.php index 7e040b3..a2b927b 100644 --- a/Examples/01simple-download-xlsx.php +++ b/Examples/01simple-download-xlsx.php @@ -35,7 +35,7 @@ if (PHP_SAPI == 'cli') die('This example should only be run from a Web Browser'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/01simple.php b/Examples/01simple.php index 5dbf743..baeb4cc 100644 --- a/Examples/01simple.php +++ b/Examples/01simple.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/02types-xls.php b/Examples/02types-xls.php index 005d2ff..1e9025d 100644 --- a/Examples/02types-xls.php +++ b/Examples/02types-xls.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/02types.php b/Examples/02types.php index 914c82d..4fc4114 100644 --- a/Examples/02types.php +++ b/Examples/02types.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/03formulas.php b/Examples/03formulas.php index 4f464d4..04e56d2 100644 --- a/Examples/03formulas.php +++ b/Examples/03formulas.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/04printing.php b/Examples/04printing.php index de6aa49..6a90eed 100644 --- a/Examples/04printing.php +++ b/Examples/04printing.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/05featuredemo.php b/Examples/05featuredemo.php index 83e36c5..3bfb998 100644 --- a/Examples/05featuredemo.php +++ b/Examples/05featuredemo.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); include "05featuredemo.inc.php"; /** Include PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; // Save Excel 2007 file diff --git a/Examples/06largescale-with-cellcaching-sqlite.php b/Examples/06largescale-with-cellcaching-sqlite.php index b3bdcac..80a9e43 100644 --- a/Examples/06largescale-with-cellcaching-sqlite.php +++ b/Examples/06largescale-with-cellcaching-sqlite.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_sqlite; PHPExcel_Settings::setCacheStorageMethod($cacheMethod); diff --git a/Examples/06largescale-with-cellcaching-sqlite3.php b/Examples/06largescale-with-cellcaching-sqlite3.php index 768f7d1..678e2ec 100644 --- a/Examples/06largescale-with-cellcaching-sqlite3.php +++ b/Examples/06largescale-with-cellcaching-sqlite3.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_sqlite3; PHPExcel_Settings::setCacheStorageMethod($cacheMethod); diff --git a/Examples/06largescale-with-cellcaching.php b/Examples/06largescale-with-cellcaching.php index ff6e7b2..adb93c4 100644 --- a/Examples/06largescale-with-cellcaching.php +++ b/Examples/06largescale-with-cellcaching.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_in_memory_gzip; if (!PHPExcel_Settings::setCacheStorageMethod($cacheMethod)) { diff --git a/Examples/06largescale-xls.php b/Examples/06largescale-xls.php index b5b8069..d1fde89 100644 --- a/Examples/06largescale-xls.php +++ b/Examples/06largescale-xls.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; /* diff --git a/Examples/06largescale.php b/Examples/06largescale.php index 3eb4312..2e597d3 100644 --- a/Examples/06largescale.php +++ b/Examples/06largescale.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; /* diff --git a/Examples/07reader.php b/Examples/07reader.php index 93456ce..482a375 100644 --- a/Examples/07reader.php +++ b/Examples/07reader.php @@ -34,7 +34,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; if (!file_exists("05featuredemo.xlsx")) { diff --git a/Examples/08conditionalformatting.php b/Examples/08conditionalformatting.php index 89a77a7..6f384d2 100644 --- a/Examples/08conditionalformatting.php +++ b/Examples/08conditionalformatting.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/08conditionalformatting2.php b/Examples/08conditionalformatting2.php index b59c66d..630eb6b 100644 --- a/Examples/08conditionalformatting2.php +++ b/Examples/08conditionalformatting2.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/09pagebreaks.php b/Examples/09pagebreaks.php index f37f763..5b2da24 100644 --- a/Examples/09pagebreaks.php +++ b/Examples/09pagebreaks.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/10autofilter-selection-1.php b/Examples/10autofilter-selection-1.php index 98f46ba..ef41cf1 100644 --- a/Examples/10autofilter-selection-1.php +++ b/Examples/10autofilter-selection-1.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/10autofilter-selection-2.php b/Examples/10autofilter-selection-2.php index 82bd8b5..c662811 100644 --- a/Examples/10autofilter-selection-2.php +++ b/Examples/10autofilter-selection-2.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/10autofilter-selection-display.php b/Examples/10autofilter-selection-display.php index 26eefec..0e60e37 100644 --- a/Examples/10autofilter-selection-display.php +++ b/Examples/10autofilter-selection-display.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/10autofilter.php b/Examples/10autofilter.php index d9cb540..3f7975c 100644 --- a/Examples/10autofilter.php +++ b/Examples/10autofilter.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object echo date('H:i:s').' Create new PHPExcel object'.EOL; diff --git a/Examples/11documentsecurity-xls.php b/Examples/11documentsecurity-xls.php index 6ad1300..071b4ae 100644 --- a/Examples/11documentsecurity-xls.php +++ b/Examples/11documentsecurity-xls.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/11documentsecurity.php b/Examples/11documentsecurity.php index 7a5135c..94378a9 100644 --- a/Examples/11documentsecurity.php +++ b/Examples/11documentsecurity.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/12cellProtection.php b/Examples/12cellProtection.php index 77ad5c2..f6507b1 100644 --- a/Examples/12cellProtection.php +++ b/Examples/12cellProtection.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/13calculation.php b/Examples/13calculation.php index bfbd51d..c1c0de8 100644 --- a/Examples/13calculation.php +++ b/Examples/13calculation.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // List functions diff --git a/Examples/14excel5.php b/Examples/14excel5.php index f56c5d4..62a9fe4 100644 --- a/Examples/14excel5.php +++ b/Examples/14excel5.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); include "05featuredemo.inc.php"; /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; // Save Excel 95 file diff --git a/Examples/15datavalidation-xls.php b/Examples/15datavalidation-xls.php index df99bdc..9652546 100644 --- a/Examples/15datavalidation-xls.php +++ b/Examples/15datavalidation-xls.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/15datavalidation.php b/Examples/15datavalidation.php index faabdde..af49c6a 100644 --- a/Examples/15datavalidation.php +++ b/Examples/15datavalidation.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/16csv.php b/Examples/16csv.php index b456c9c..9f94051 100644 --- a/Examples/16csv.php +++ b/Examples/16csv.php @@ -38,7 +38,7 @@ date_default_timezone_set('Europe/London'); include "05featuredemo.inc.php"; /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Write to CSV format" , EOL; diff --git a/Examples/17html.php b/Examples/17html.php index c08e902..3ad968d 100644 --- a/Examples/17html.php +++ b/Examples/17html.php @@ -38,7 +38,7 @@ date_default_timezone_set('Europe/London'); include "05featuredemo.inc.php"; /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Write to HTML format" , EOL; diff --git a/Examples/18extendedcalculation.php b/Examples/18extendedcalculation.php index fb80dc0..b037106 100644 --- a/Examples/18extendedcalculation.php +++ b/Examples/18extendedcalculation.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // List functions diff --git a/Examples/19namedrange.php b/Examples/19namedrange.php index 8a86bf7..444ca07 100644 --- a/Examples/19namedrange.php +++ b/Examples/19namedrange.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/20readexcel5.php b/Examples/20readexcel5.php index 2aeefb2..d09c052 100644 --- a/Examples/20readexcel5.php +++ b/Examples/20readexcel5.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; if (!file_exists("14excel5.xls")) { diff --git a/Examples/21pdf.php b/Examples/21pdf.php index cae16a0..70aa792 100644 --- a/Examples/21pdf.php +++ b/Examples/21pdf.php @@ -38,7 +38,7 @@ date_default_timezone_set('Europe/London'); include "05featuredemo.inc.php"; /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; // Change these values to select the Rendering library that you wish to use diff --git a/Examples/22heavilyformatted.php b/Examples/22heavilyformatted.php index e4025c1..188857d 100644 --- a/Examples/22heavilyformatted.php +++ b/Examples/22heavilyformatted.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/23sharedstyles.php b/Examples/23sharedstyles.php index 744ccd2..1a07cd4 100644 --- a/Examples/23sharedstyles.php +++ b/Examples/23sharedstyles.php @@ -36,7 +36,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/24readfilter.php b/Examples/24readfilter.php index d5de002..b51cc59 100644 --- a/Examples/24readfilter.php +++ b/Examples/24readfilter.php @@ -34,7 +34,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; // Check prerequisites diff --git a/Examples/25inmemoryimage.php b/Examples/25inmemoryimage.php index 5c36380..8d99e18 100644 --- a/Examples/25inmemoryimage.php +++ b/Examples/25inmemoryimage.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/26utf8.php b/Examples/26utf8.php index 67651ff..08fd851 100644 --- a/Examples/26utf8.php +++ b/Examples/26utf8.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Change these values to select the PDF Rendering library that you wish to use diff --git a/Examples/27imagesexcel5.php b/Examples/27imagesexcel5.php index a2f5547..e839961 100644 --- a/Examples/27imagesexcel5.php +++ b/Examples/27imagesexcel5.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Read from Excel5 (.xls) template diff --git a/Examples/28iterator.php b/Examples/28iterator.php index f6783af..d86e020 100644 --- a/Examples/28iterator.php +++ b/Examples/28iterator.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; if (!file_exists("05featuredemo.xlsx")) { diff --git a/Examples/29advancedvaluebinder.php b/Examples/29advancedvaluebinder.php index 60831c0..5c3bd2c 100644 --- a/Examples/29advancedvaluebinder.php +++ b/Examples/29advancedvaluebinder.php @@ -33,7 +33,7 @@ ini_set('display_startup_errors', TRUE); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Set timezone diff --git a/Examples/30template.php b/Examples/30template.php index 9480735..62802ba 100644 --- a/Examples/30template.php +++ b/Examples/30template.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; diff --git a/Examples/31docproperties_write-xls.php b/Examples/31docproperties_write-xls.php index 1cdfbf5..f68dff5 100644 --- a/Examples/31docproperties_write-xls.php +++ b/Examples/31docproperties_write-xls.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $inputFileType = 'Excel5'; diff --git a/Examples/31docproperties_write.php b/Examples/31docproperties_write.php index 1e3d87d..6ca7631 100644 --- a/Examples/31docproperties_write.php +++ b/Examples/31docproperties_write.php @@ -35,7 +35,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $inputFileType = 'Excel2007'; diff --git a/Examples/32chartreadwrite.php b/Examples/32chartreadwrite.php index 3a4ee03..0ecab8e 100644 --- a/Examples/32chartreadwrite.php +++ b/Examples/32chartreadwrite.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** Include path **/ -set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/'); +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../Classes/'); /** PHPExcel_IOFactory */ include 'PHPExcel/IOFactory.php'; diff --git a/Examples/33chartcreate-area.php b/Examples/33chartcreate-area.php index cb57240..9a1e9c7 100644 --- a/Examples/33chartcreate-area.php +++ b/Examples/33chartcreate-area.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-bar-stacked.php b/Examples/33chartcreate-bar-stacked.php index f4ad142..cca6f68 100644 --- a/Examples/33chartcreate-bar-stacked.php +++ b/Examples/33chartcreate-bar-stacked.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-bar.php b/Examples/33chartcreate-bar.php index 3b86def..d7344ee 100644 --- a/Examples/33chartcreate-bar.php +++ b/Examples/33chartcreate-bar.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-column-2.php b/Examples/33chartcreate-column-2.php index 424a8f6..18f90bf 100644 --- a/Examples/33chartcreate-column-2.php +++ b/Examples/33chartcreate-column-2.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-column.php b/Examples/33chartcreate-column.php index 4d6c885..caa5b81 100644 --- a/Examples/33chartcreate-column.php +++ b/Examples/33chartcreate-column.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-composite.php b/Examples/33chartcreate-composite.php index 70d3f30..497e2b9 100644 --- a/Examples/33chartcreate-composite.php +++ b/Examples/33chartcreate-composite.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-line.php b/Examples/33chartcreate-line.php index 5a41afc..3e9ec76 100644 --- a/Examples/33chartcreate-line.php +++ b/Examples/33chartcreate-line.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-multiple-charts.php b/Examples/33chartcreate-multiple-charts.php index 545d479..ee45f0a 100644 --- a/Examples/33chartcreate-multiple-charts.php +++ b/Examples/33chartcreate-multiple-charts.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-pie.php b/Examples/33chartcreate-pie.php index 6b62249..62360c4 100644 --- a/Examples/33chartcreate-pie.php +++ b/Examples/33chartcreate-pie.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-radar.php b/Examples/33chartcreate-radar.php index 1e044e9..179dec0 100644 --- a/Examples/33chartcreate-radar.php +++ b/Examples/33chartcreate-radar.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/33chartcreate-scatter.php b/Examples/33chartcreate-scatter.php index eab9b4c..467d601 100644 --- a/Examples/33chartcreate-scatter.php +++ b/Examples/33chartcreate-scatter.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; $objPHPExcel = new PHPExcel(); diff --git a/Examples/35chartrender.php b/Examples/35chartrender.php index 7660da8..7d6e3ca 100644 --- a/Examples/35chartrender.php +++ b/Examples/35chartrender.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** Include path **/ -set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/'); +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../Classes/'); /** PHPExcel_IOFactory */ include 'PHPExcel/IOFactory.php'; diff --git a/Examples/36chartreadwriteHTML.php b/Examples/36chartreadwriteHTML.php index afb00d0..6811c27 100644 --- a/Examples/36chartreadwriteHTML.php +++ b/Examples/36chartreadwriteHTML.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** Include path **/ -set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/'); +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../Classes/'); /** PHPExcel_IOFactory */ include 'PHPExcel/IOFactory.php'; diff --git a/Examples/36chartreadwritePDF.php b/Examples/36chartreadwritePDF.php index 554c5b1..a3517f3 100644 --- a/Examples/36chartreadwritePDF.php +++ b/Examples/36chartreadwritePDF.php @@ -37,7 +37,7 @@ date_default_timezone_set('Europe/London'); */ /** Include path **/ -set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/'); +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../Classes/'); /** PHPExcel_IOFactory */ include 'PHPExcel/IOFactory.php'; diff --git a/Examples/37page_layout_view.php b/Examples/37page_layout_view.php index 4db30a0..042e8e8 100644 --- a/Examples/37page_layout_view.php +++ b/Examples/37page_layout_view.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/38cloneWorksheet.php b/Examples/38cloneWorksheet.php index d8e141c..d2f9a6d 100644 --- a/Examples/38cloneWorksheet.php +++ b/Examples/38cloneWorksheet.php @@ -34,7 +34,7 @@ date_default_timezone_set('Europe/London'); define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; // Create new PHPExcel object diff --git a/Examples/40duplicateStyle.php b/Examples/40duplicateStyle.php index 52891ad..be31951 100644 --- a/Examples/40duplicateStyle.php +++ b/Examples/40duplicateStyle.php @@ -10,7 +10,7 @@ define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); date_default_timezone_set('Europe/London'); /** Include PHPExcel */ -require_once '../Classes/PHPExcel.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel.php'; echo date('H:i:s') , " Create new PHPExcel object" , EOL; $objPHPExcel = new PHPExcel(); diff --git a/Examples/Excel2003XMLReader.php b/Examples/Excel2003XMLReader.php index 0955c6f..96ee5a3 100644 --- a/Examples/Excel2003XMLReader.php +++ b/Examples/Excel2003XMLReader.php @@ -31,7 +31,7 @@ error_reporting(E_ALL); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Load from Excel2003XML file" , PHP_EOL; diff --git a/Examples/GnumericReader.php b/Examples/GnumericReader.php index c79f189..4304ccc 100644 --- a/Examples/GnumericReader.php +++ b/Examples/GnumericReader.php @@ -31,7 +31,7 @@ error_reporting(E_ALL); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Load from Gnumeric file" , PHP_EOL; $callStartTime = microtime(true); diff --git a/Examples/OOCalcReader.php b/Examples/OOCalcReader.php index a5e6d35..237d124 100644 --- a/Examples/OOCalcReader.php +++ b/Examples/OOCalcReader.php @@ -31,7 +31,7 @@ error_reporting(E_ALL); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Load from OOCalc file" , PHP_EOL; $callStartTime = microtime(true); diff --git a/Examples/Quadratic.php b/Examples/Quadratic.php index ce4191a..11a712e 100644 --- a/Examples/Quadratic.php +++ b/Examples/Quadratic.php @@ -9,7 +9,7 @@ error_reporting(E_ALL); /** Include path **/ -set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/'); +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../Classes/'); ?>

Quadratic Equation Solver

diff --git a/Examples/Quadratic2.php b/Examples/Quadratic2.php index 93f2859..5f6013e 100644 --- a/Examples/Quadratic2.php +++ b/Examples/Quadratic2.php @@ -9,7 +9,7 @@ error_reporting(E_ALL); /** Include path **/ -set_include_path(get_include_path() . PATH_SEPARATOR . '../Classes/'); +set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../Classes/'); ?>

Quadratic Equation Solver

diff --git a/Examples/SylkReader.php b/Examples/SylkReader.php index 7389bd6..9c7a5be 100644 --- a/Examples/SylkReader.php +++ b/Examples/SylkReader.php @@ -31,7 +31,7 @@ error_reporting(E_ALL); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Load from SYLK file" , PHP_EOL; diff --git a/Examples/XMLReader.php b/Examples/XMLReader.php index b403707..ca5e4bc 100644 --- a/Examples/XMLReader.php +++ b/Examples/XMLReader.php @@ -31,7 +31,7 @@ error_reporting(E_ALL); date_default_timezone_set('Europe/London'); /** PHPExcel_IOFactory */ -require_once '../Classes/PHPExcel/IOFactory.php'; +require_once dirname(__FILE__) . '/../Classes/PHPExcel/IOFactory.php'; echo date('H:i:s') , " Load from XML file" , PHP_EOL; From a4e6355ef553741f134f01682bcf82bd7fe10dfe Mon Sep 17 00:00:00 2001 From: Maarten Balliauw Date: Wed, 10 Jul 2013 14:41:23 +0200 Subject: [PATCH 3/3] Update build.xml --- Build/build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/build.xml b/Build/build.xml index 761e648..241cfc2 100644 --- a/Build/build.xml +++ b/Build/build.xml @@ -1,7 +1,5 @@ - - @@ -152,6 +150,8 @@ + + @@ -213,4 +213,4 @@ - \ No newline at end of file +