More directory re-arrangement
@ -27,7 +27,8 @@ error_reporting(-1 & ~(E_STRICT));
|
|||||||
date_default_timezone_set('GMT');
|
date_default_timezone_set('GMT');
|
||||||
|
|
||||||
// Set the current directory as the base for included files
|
// Set the current directory as the base for included files
|
||||||
define('BASE_DIR', dirname(__FILE__));
|
define('BASE_DIR', dirname(__FILE__).'/sys');
|
||||||
|
define('SETTINGS_DIR', dirname(__FILE__));
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -38,7 +38,7 @@ class Settings {
|
|||||||
*/
|
*/
|
||||||
protected function __construct()
|
protected function __construct()
|
||||||
{
|
{
|
||||||
$path = BASE_DIR.'/settings.json';
|
$path = SETTINGS_DIR.'/settings.json';
|
||||||
|
|
||||||
if( ! is_file($path))
|
if( ! is_file($path))
|
||||||
{
|
{
|
||||||
@ -64,7 +64,7 @@ class Settings {
|
|||||||
*/
|
*/
|
||||||
public function __destruct()
|
public function __destruct()
|
||||||
{
|
{
|
||||||
file_put_contents(BASE_DIR . '/settings.json', json_encode($this->current));
|
file_put_contents(SETTINGS_DIR . '/settings.json', json_encode($this->current));
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 946 B After Width: | Height: | Size: 946 B |
@ -31,11 +31,11 @@ function do_include($path)
|
|||||||
|
|
||||||
// Include core tests
|
// Include core tests
|
||||||
require_once("core.php");
|
require_once("core.php");
|
||||||
require_once("../common/db_pdo.php");
|
require_once("../sys/common/db_pdo.php");
|
||||||
|
|
||||||
// Include db tests
|
// Include db tests
|
||||||
// Load db classes based on capability
|
// Load db classes based on capability
|
||||||
$src_path = "../databases/";
|
$src_path = "../sys/databases/";
|
||||||
$test_path = "./databases/";
|
$test_path = "./databases/";
|
||||||
|
|
||||||
foreach(pdo_drivers() as $d)
|
foreach(pdo_drivers() as $d)
|
||||||
|