improvemend

1 files changed, 12 insertions, 13 deletions

diff --git a/bootstrap/bootstrap.php b/bootstrap/bootstrap.php
index 262113a..36c298e 100644
--- a/bootstrap/bootstrap.php
+++ b/bootstrap/bootstrap.php
@@ -4,11 +4,11 @@
 require_once( dirname(__FILE__) . '/config.php');
 
 # absolute path
-if ( ! defined(ABSPATH) )
+if ( ! defined('ABSPATH') )
 	define('ABSPATH', dirname(__FILE__) . '/');
 
 # scheme, set to https if set, otherwise plain http
-if ( ! defined(SCHEME) ){
+if ( ! defined('SCHEME') ){
 	if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
 		define('SCHEME', 'https://');
 	else
@@ -16,25 +16,25 @@ if ( ! defined(SCHEME) ){
 }
 
 # hostname
-if ( ! defined(HOST) )
+if ( ! defined('HOST') )
 	define('HOST', $_SERVER['HTTP_HOST']);
-if ( ! defined(DOMAIN) )
+if ( ! defined('DOMAIN') )
 	define('DOMAIN', SCHEME . HOST);
 
 # define session name
-if ( ! defined(SESSION) )
+if ( ! defined('SESSION') )
 	define('SESSION', 'JGSID');
 
-# define include path for vfs-class files
-if ( ! defined(INCLASS) )
+# define include path for class files
+if ( ! defined('INCLASS') )
 	define('INCLASS', 'class/');
 
 # redis access
-# if ( ! defined(USE_REDIS) )
+# if ( ! defined('USE_REDIS') )
 #	define('USE_REDIS', false);
-# if ( ! defined(REDIS_CONNECT) )
+# if ( ! defined('REDIS_CONNECT') )
 # 	define('REDIS_CONNECT', '/var/run/redis/redis.sock');
-# if ( ! defined(REDIS_DBNAME) )
+# if ( ! defined('REDIS_DBNAME') )
 #	define('REDIS_DBNAME', 1);
 
 # redirects to correct host
@@ -46,9 +46,8 @@ if ( $_SERVER['HTTP_HOST'] != HOST){
 
 require(ABSPATH . 'functions.php');
 require(ABSPATH . INCLASS . 'mysql.php');
-require(ABSPATH . INCLASS . 'vfsuser.php');
-require(ABSPATH . INCLASS . 'vfsdata.php');
+require(ABSPATH . INCLASS . 'user.php');
 
 # first install only
 if ( file_exists(ABSPATH . 'setup.php') )
-	require(ABSPATh . 'setup.php');
+	require(ABSPATH . 'setup.php');