diff --git a/htdocs/config.sample.php b/htdocs/config.sample.php index a6e33d2..8f82bbb 100644 --- a/htdocs/config.sample.php +++ b/htdocs/config.sample.php @@ -3,12 +3,12 @@ /** * 資料庫類型 */ - define('DB_TYPE', "mysql"); // or mysql + define('DB_TYPE', 'mysql'); // or mysql /** * 資料庫位址 */ - define('DB_HOST', "localhost"); + define('DB_HOST', 'localhost'); /** * 資料庫連結埠 @@ -20,24 +20,24 @@ /** * 資料庫連結帳號 */ - define('DB_USER', "user"); + define('DB_USER', 'user'); /** * 資料庫連結密碼 */ - define('DB_PASS', "passwd123"); + define('DB_PASS', 'passwd123'); /** * 資料庫名稱 */ - define('DB_NAME', "chu_elearning"); + define('DB_NAME', 'UElearning'); /** * 資料庫內資料表前綴字串 - * + * 每一張表格名稱的起始字串,為了避開一些網頁空間只允許建立一個資料庫的限制。 */ - define('DB_PREFIX', "chu_"); + define('DB_PREFIX', 'uel__'); // 網站設定 =================================================================== /** @@ -91,15 +91,14 @@ /** * 網站根目錄 */ - define('UELEARNING_ROOT', __DIR__.'/'); + define('UELEARNING_ROOT', __DIR__); /** * 內部函式庫根目錄 */ - define('UELEARNING_LIB_ROOT', UELEARNING_ROOT.'lib/'); + define('UELEARNING_LIB_ROOT', __DIR__.'/lib'); /** * 這份設定檔的路徑 */ define('UELEARNING_CONFIG_PATH', __FILE__); - diff --git a/htdocs/lib/Database/DBAdmin.php b/htdocs/lib/Database/DBAdmin.php index 1f7de8c..ca5bf50 100644 --- a/htdocs/lib/Database/DBAdmin.php +++ b/htdocs/lib/Database/DBAdmin.php @@ -7,8 +7,8 @@ namespace UElearning\Database; -require_once UELEARNING_LIB_ROOT.'Database/Database.php'; -require_once UELEARNING_LIB_ROOT.'Database/Exceptions.php'; +require_once UELEARNING_LIB_ROOT.'/Database/Database.php'; +require_once UELEARNING_LIB_ROOT.'/Database/Exceptions.php'; /** * 資料庫整體管理 diff --git a/htdocs/lib/Database/DBUser.php b/htdocs/lib/Database/DBUser.php index 9c1def8..1cfa80a 100644 --- a/htdocs/lib/Database/DBUser.php +++ b/htdocs/lib/Database/DBUser.php @@ -7,8 +7,8 @@ namespace UElearning\Database; -require_once UELEARNING_LIB_ROOT.'Database/Database.php'; -require_once UELEARNING_LIB_ROOT.'Database/Exceptions.php'; +require_once UELEARNING_LIB_ROOT.'/Database/Database.php'; +require_once UELEARNING_LIB_ROOT.'/Database/Exceptions.php'; /** * 使用者帳號資料表 diff --git a/htdocs/lib/Database/Database.php b/htdocs/lib/Database/Database.php index 6eff00c..f1bb2c7 100644 --- a/htdocs/lib/Database/Database.php +++ b/htdocs/lib/Database/Database.php @@ -8,8 +8,8 @@ namespace UElearning\Database; -require_once UELEARNING_LIB_ROOT.'Database/MySQLDB.php'; -require_once UELEARNING_LIB_ROOT.'Database/Exceptions.php'; +require_once UELEARNING_LIB_ROOT.'/Database/MySQLDB.php'; +require_once UELEARNING_LIB_ROOT.'/Database/Exceptions.php'; use UElearning\Database\Exception; /** diff --git a/tests/InstallTest.php b/tests/InstallTest.php index 383899d..e0baafa 100644 --- a/tests/InstallTest.php +++ b/tests/InstallTest.php @@ -8,7 +8,7 @@ namespace UElearning; require_once __DIR__.'/../htdocs/config.php'; -require_once UELEARNING_LIB_ROOT.'Database/DBAdmin.php'; +require_once UELEARNING_LIB_ROOT.'/Database/DBAdmin.php'; class InstallTest extends \PHPUnit_Framework_TestCase {