Adding constant for composer vendor directory. Renovating API methods…

… to remove use of depricated constant.
jmturner · Mar 22, 2020 · 3cbfaa7 · 3cbfaa7
1 parent 1e25c14
commit 3cbfaa7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/owa_coreAPI.php b/owa_coreAPI.php
@@ -61,7 +61,7 @@ public static function setupStorageEngine($type) {
 		$connection_class = "owa_db_" . $type;
 
 			if (!class_exists($connection_class)) {
-				$connection_class_path = OWA_PLUGINS_DIR.'/db/' . $connection_class . ".php";
+				$connection_class_path = OWA_PLUGIN_DIR.'db/' . $connection_class . ".php";
 
 			 	if (!require_once($connection_class_path)) {
 			 		owa_coreAPI::error(sprintf('Cannot locate proper db class at %s.', $connection_class_path));
@@ -1043,7 +1043,7 @@ public static function validationFactory($class_file) {
 			require_once(OWA_BASE_CLASS_DIR.'validation.php');
 		endif;
 
-		return owa_lib::factory(OWA_PLUGINS_DIR.'/validations', 'owa_', $class_file, array(), 'Validation');
+		return owa_lib::factory(OWA_PLUGIN_DIR.'validations', 'owa_', $class_file, array(), 'Validation');
 
 	}
 

diff --git a/owa_env.php b/owa_env.php
@@ -38,14 +38,12 @@
 define('OWA_BASE_CLASS_DIR', OWA_BASE_MODULE_DIR.'classes/');
 define('OWA_INCLUDE_DIR', OWA_DIR.'includes/');
 define('OWA_PEARLOG_DIR', OWA_INCLUDE_DIR.'Log-1.13.1');
-define('OWA_UAPARSER_DIR', OWA_INCLUDE_DIR.'ua-parser-2.1.1');
-define('OWA_UAPARSER_LIB', OWA_UAPARSER_DIR.'/uaparser.php');
 define('OWA_PHPMAILER_DIR', OWA_INCLUDE_DIR.'PHPMailer-6.1.4/src/');
 define('OWA_HTTPCLIENT_DIR', OWA_INCLUDE_DIR.'httpclient-2016-05-02/');
-define('OWA_PLUGINS_DIR', OWA_DIR.'plugins'); //depricated
 define('OWA_PLUGIN_DIR', OWA_DIR.'plugins/');
 define('OWA_CONF_DIR', OWA_DIR.'conf/');
 define('OWA_THEMES_DIR', OWA_DIR.'themes/');
 define('OWA_VERSION', 'master');
+define('OWA_VENDOR_DIR', OWA_DIR.'vendor/');
 
 ?>