From 602f4228576d80ac34ae40c156ab2f0d3f163c6f Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Wed, 26 Sep 2007 12:40:19 -0400 Subject: [PATCH] Changing the way we include framework files. Instead of modifying the include_path we just define the constant ISSO as the path to ISSO. --- App.php | 6 +++--- Db.php | 2 +- DbMySql.php | 2 +- DbMySqlI.php | 2 +- DbPostgreSql.php | 2 +- GraphLine.php | 2 +- GraphPie.php | 2 +- Mail.php | 4 ++-- Pagination.php | 2 +- Printer.php | 16 ++++++++-------- PrinterBaseElement.php | 2 +- PrinterCss.php | 2 +- PrinterLabelElement.php | 2 +- PrinterRootElement.php | 2 +- PrinterRootElementForm.php | 2 +- PrinterRootElementPage.php | 2 +- PrinterRootElementTable.php | 2 +- PrinterTableElement.php | 4 ++-- Template.php | 2 +- UnitTest/AllTests.php | 2 +- UnitTest/AppTest.php | 2 +- UnitTest/DatabaseMySQLTest.php | 2 +- UnitTest/DatabaseMySQLiTest.php | 2 +- UnitTest/DateTest.php | 2 +- UnitTest/FunctionsTest.php | 2 +- UnitTest/InputTest.php | 2 +- UnitTest/InstallerTest.php | 2 +- UnitTest/TemplateTest.php | 2 +- UnitTest/XmlTest.php | 2 +- docs/tools/create_schema.php | 2 +- 30 files changed, 41 insertions(+), 41 deletions(-) diff --git a/App.php b/App.php index b9a20fe..54215d5 100644 --- a/App.php +++ b/App.php @@ -51,7 +51,7 @@ if ((bool)ini_get('register_globals') === true) } } -require_once('ISSO/Functions.php'); +require_once(ISSO . '/Functions.php'); /** * Application Class @@ -308,11 +308,11 @@ class BSApp { if (self::GetDebug()) { - include_once("ISSO/$name.php"); + include_once(ISSO . "/$name.php"); } else { - @include_once("ISSO/$name.php"); + @include_once(ISSO . "/$name.php"); } $class = "BS$name"; diff --git a/Db.php b/Db.php index bc78fcc..549b8a2 100644 --- a/Db.php +++ b/Db.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Functions.php'); +require_once(ISSO . '/Functions.php'); /** * Abstract Database Layer diff --git a/DbMySql.php b/DbMySql.php index 814ae8d..e3e93d4 100644 --- a/DbMySql.php +++ b/DbMySql.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Db.php'); +require_once(ISSO . '/Db.php'); /** * MySQL Database Layer diff --git a/DbMySqlI.php b/DbMySqlI.php index 9d5ff31..df03726 100644 --- a/DbMySqlI.php +++ b/DbMySqlI.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Db.php'); +require_once(ISSO . '/Db.php'); /** * MySQLi Database Layer diff --git a/DbPostgreSql.php b/DbPostgreSql.php index 6ce94b6..124cfd3 100644 --- a/DbPostgreSql.php +++ b/DbPostgreSql.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Db.php'); +require_once(ISSO . '/Db.php'); /** * PostgreSQL Database Layer diff --git a/GraphLine.php b/GraphLine.php index b8816e9..fc52aaf 100644 --- a/GraphLine.php +++ b/GraphLine.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Graph.php'); +require_once(ISSO . '/Graph.php'); /** * Graphing System: Line Graph diff --git a/GraphPie.php b/GraphPie.php index a1eb6b8..148fa85 100644 --- a/GraphPie.php +++ b/GraphPie.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Graph.php'); +require_once(ISSO . '/Graph.php'); /** * Graphing System: Pie Chart diff --git a/Mail.php b/Mail.php index 27190bc..a21b3d3 100644 --- a/Mail.php +++ b/Mail.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Functions.php'); +require_once(ISSO . '/Functions.php'); /** * Mail Sender @@ -189,7 +189,7 @@ class BSMail $input = BSApp::Registry()->getType('Input'); if ($input == null) { - BSApp::Debug('ISSO/Input not loaded, so manually doing so'); + BSApp::Debug(ISSO . '/Input not loaded, so manually doing so'); $input = BSApp::LoadModule('Input'); } diff --git a/Pagination.php b/Pagination.php index 3cacb85..6a970ce 100644 --- a/Pagination.php +++ b/Pagination.php @@ -241,7 +241,7 @@ class BSPagination $input = BSApp::GetType('Input'); if ($input == null) { - BSApp::Debug('ISSO/Input not loaded, so manually doing so'); + BSApp::Debug(ISSO . '/Input not loaded, so manually doing so'); $input = BSApp::LoadModule('Input'); } diff --git a/Printer.php b/Printer.php index ed299b1..9aafdbd 100644 --- a/Printer.php +++ b/Printer.php @@ -25,14 +25,14 @@ * @package ISSO */ -require_once('ISSO/PrinterElement.php'); -require_once('ISSO/PrinterBaseElement.php'); -require_once('ISSO/PrinterLabelElement.php'); -require_once('ISSO/PrinterRootElement.php'); -require_once('ISSO/PrinterRootElementPage.php'); -require_once('ISSO/PrinterRootElementTable.php'); -require_once('ISSO/PrinterRootElementForm.php'); -require_once('ISSO/PrinterTableElement.php'); +require_once(ISSO . '/PrinterElement.php'); +require_once(ISSO . '/PrinterBaseElement.php'); +require_once(ISSO . '/PrinterLabelElement.php'); +require_once(ISSO . '/PrinterRootElement.php'); +require_once(ISSO . '/PrinterRootElementPage.php'); +require_once(ISSO . '/PrinterRootElementTable.php'); +require_once(ISSO . '/PrinterRootElementForm.php'); +require_once(ISSO . '/PrinterTableElement.php'); /** * Printer System diff --git a/PrinterBaseElement.php b/PrinterBaseElement.php index bee816b..fde5033 100644 --- a/PrinterBaseElement.php +++ b/PrinterBaseElement.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/PrinterElement.php'); +require_once(ISSO . '/PrinterElement.php'); /** * Base Printer Element diff --git a/PrinterCss.php b/PrinterCss.php index 5f67e67..db4317a 100644 --- a/PrinterCss.php +++ b/PrinterCss.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Functions.php'); +require_once(ISSO . '/Functions.php'); /** * Printer: CSS Editor diff --git a/PrinterLabelElement.php b/PrinterLabelElement.php index 877c1b7..607f4a9 100644 --- a/PrinterLabelElement.php +++ b/PrinterLabelElement.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/PrinterElement.php'); +require_once(ISSO . '/PrinterElement.php'); /** * Printer Label Element diff --git a/PrinterRootElement.php b/PrinterRootElement.php index d020761..cbed774 100644 --- a/PrinterRootElement.php +++ b/PrinterRootElement.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/PrinterElement.php'); +require_once(ISSO . '/PrinterElement.php'); /** * Printer Root Element diff --git a/PrinterRootElementForm.php b/PrinterRootElementForm.php index b2daaa9..8a6207c 100644 --- a/PrinterRootElementForm.php +++ b/PrinterRootElementForm.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/PrinterRootElement.php'); +require_once(ISSO . '/PrinterRootElement.php'); /** * Printer Root Element: Form diff --git a/PrinterRootElementPage.php b/PrinterRootElementPage.php index 4af1ad5..9bfe8b7 100644 --- a/PrinterRootElementPage.php +++ b/PrinterRootElementPage.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/PrinterRootElement.php'); +require_once(ISSO . '/PrinterRootElement.php'); /** * Printer Root Element: Page diff --git a/PrinterRootElementTable.php b/PrinterRootElementTable.php index abfd890..2465e1c 100644 --- a/PrinterRootElementTable.php +++ b/PrinterRootElementTable.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/PrinterRootElement.php'); +require_once(ISSO . '/PrinterRootElement.php'); /** * Printer Root Element: Table diff --git a/PrinterTableElement.php b/PrinterTableElement.php index f047660..e504351 100644 --- a/PrinterTableElement.php +++ b/PrinterTableElement.php @@ -25,8 +25,8 @@ * @package ISSO */ -require_once('ISSO/PrinterRootElementTable.php'); -require_once('ISSO/PrinterBaseElement.php'); +require_once(ISSO . '/PrinterRootElementTable.php'); +require_once(ISSO . '/PrinterBaseElement.php'); /** * Printer Table Element diff --git a/Template.php b/Template.php index 554e9bb..880e97c 100644 --- a/Template.php +++ b/Template.php @@ -25,7 +25,7 @@ * @package ISSO */ -require_once('ISSO/Functions.php'); +require_once(ISSO . '/Functions.php'); /** * File-Based Template System diff --git a/UnitTest/AllTests.php b/UnitTest/AllTests.php index 1b2ffa5..93c201a 100644 --- a/UnitTest/AllTests.php +++ b/UnitTest/AllTests.php @@ -1,7 +1,7 @@ fixture = BSApp::LoadModule('DbMySql'); $this->fixture->connect(TEST_DB_MYSQL_HOST, TEST_DB_MYSQL_USER, TEST_DB_MYSQL_PASSWORD, TEST_DB_MYSQL_DATABASE); diff --git a/UnitTest/DatabaseMySQLiTest.php b/UnitTest/DatabaseMySQLiTest.php index 1e803a9..84c6c53 100644 --- a/UnitTest/DatabaseMySQLiTest.php +++ b/UnitTest/DatabaseMySQLiTest.php @@ -8,7 +8,7 @@ class DatabaseMySQLiTest extends DatabaseTestAbstract public function setUp() { require_once 'tests.config.php'; - require_once 'ISSO/App.php'; + require_once ISSO . '/App.php'; $this->fixture = BSApp::LoadModule('DbMySqlI'); $this->fixture->connect(TEST_DB_MYSQL_HOST, TEST_DB_MYSQL_USER, TEST_DB_MYSQL_PASSWORD, TEST_DB_MYSQL_DATABASE); diff --git a/UnitTest/DateTest.php b/UnitTest/DateTest.php index 257b479..9b36be2 100644 --- a/UnitTest/DateTest.php +++ b/UnitTest/DateTest.php @@ -18,7 +18,7 @@ class DateTest extends PHPUnit_Framework_TestCase public function setUp() { - require_once 'ISSO/App.php'; + require_once ISSO . '/App.php'; $this->fixture = BSApp::LoadModule('Date'); } diff --git a/UnitTest/FunctionsTest.php b/UnitTest/FunctionsTest.php index 5ec257e..56b55a7 100644 --- a/UnitTest/FunctionsTest.php +++ b/UnitTest/FunctionsTest.php @@ -14,7 +14,7 @@ class FunctionsTest extends PHPUnit_Framework_TestCase { public function setUp() { - require_once('ISSO/App.php'); + require_once(ISSO . '/App.php'); } public function testSwapCssClasses() diff --git a/UnitTest/InputTest.php b/UnitTest/InputTest.php index 374d48d..af8ae98 100644 --- a/UnitTest/InputTest.php +++ b/UnitTest/InputTest.php @@ -45,7 +45,7 @@ class InputTest extends PHPUnit_Framework_TestCase } }*/ - require_once 'ISSO/App.php'; + require_once ISSO . '/App.php'; $this->fixture = BSApp::LoadModule('Input'); } diff --git a/UnitTest/InstallerTest.php b/UnitTest/InstallerTest.php index b64d116..92e06e8 100644 --- a/UnitTest/InstallerTest.php +++ b/UnitTest/InstallerTest.php @@ -1,7 +1,7 @@ fixture = BSApp::LoadModule('Template'); $this->fixture->setTemplateDirectory(TEST_TEMPLATE_PATH); diff --git a/UnitTest/XmlTest.php b/UnitTest/XmlTest.php index 0413831..3226a50 100644 --- a/UnitTest/XmlTest.php +++ b/UnitTest/XmlTest.php @@ -14,7 +14,7 @@ class XmlTest extends PHPUnit_Framework_TestCase { public function setUp() { - require_once('ISSO/Xml.php'); + require_once(ISSO . '/Xml.php'); } public function testSimpleXmlFile() diff --git a/docs/tools/create_schema.php b/docs/tools/create_schema.php index 2eec01b..d49ffd6 100644 --- a/docs/tools/create_schema.php +++ b/docs/tools/create_schema.php @@ -4,7 +4,7 @@ // $Id$ ini_set('include_path', ini_get('include_path') . ':/Server/htdocs'); -require_once('ISSO/App.php'); +require_once(ISSO . '/App.php'); $db = BSApp::LoadModule('DbMySQL'); $input = BSApp::LoadModule('Input'); -- 2.22.5