← All changes | includes/loader.php +12 -6 1.1.1 → 2.9.1 View file →

		@@ -1,22 +1,28 @@
1	1	<?php
2	2
3	3	namespace BitCode\BitForm;
4	4
	5	+$scheme = parse_url(home_url())['scheme'];
5	6	$uploadDirInfo = wp_upload_dir();
6	7	$wpUploadbaseDir = $uploadDirInfo['basedir'];
7		-$wpUploadBaseURL = $uploadDirInfo['baseurl'];
8		-$bitformsUploadBaseDir = $wpUploadbaseDir . DIRECTORY_SEPARATOR . 'bitforms';
	8	+$wpUploadBaseURL = set_url_scheme($uploadDirInfo['baseurl'], $scheme);
	9	+$bitformsUploadBaseDir = $wpUploadbaseDir . DIRECTORY_SEPARATOR . 'bitforms';
9	10	// Define global constants.
10		-
	11	+// define DEV=true|false in wp-config.php
	12	+define('BIT_DEV_URL', defined('BITAPPS_DEV') && BITAPPS_DEV ? 'http://localhost:3000' : false);
11	13	define('BITFORMS_PLUGIN_BASENAME', plugin_basename(BITFORMS_PLUGIN_MAIN_FILE));
12	14	define('BITFORMS_PLUGIN_DIR_PATH', plugin_dir_path(BITFORMS_PLUGIN_MAIN_FILE));
13		-define('BITFORMS_UPLOAD_DIR', $bitformsUploadBaseDir . DIRECTORY_SEPARATOR . 'uploads');
	15	+define('BITFORMS_UPLOAD_DIR', $bitformsUploadBaseDir . DIRECTORY_SEPARATOR . 'uploads');
14	16	define('BITFORMS_CONTENT_DIR', $bitformsUploadBaseDir);
15		-define('BITFORMS_ROOT_URI', plugins_url('', BITFORMS_PLUGIN_MAIN_FILE));
	17	+define('BITFORMS_ROOT_URI', set_url_scheme(plugins_url('', BITFORMS_PLUGIN_MAIN_FILE), $scheme));
16	18	define('BITFORMS_ASSET_URI', BITFORMS_ROOT_URI . '/assets');
	19	+define('BITFORMS_ASSET_JS_URI', BIT_DEV_URL ? BIT_DEV_URL : BITFORMS_ROOT_URI . '/assets');
	20	+define('BITFORMS_ASSET_FRNT_JS_URI', BITFORMS_ROOT_URI . '/assets');
17	21	define('BITFORMS_UPLOAD_BASE_URL', $wpUploadBaseURL . '/bitforms');
	22	+define('BITFORMS_BF_SEPARATOR', '__bf__');
	23	+define('BITFORMS_PREFIX', 'bitforms_');
	24	+
18	25	// Autoload vendor files.
19	26	require_once BITFORMS_PLUGIN_DIR_PATH . 'vendor/autoload.php';
20		-
21	27	// Initialize the plugin.
22	28	Plugin::load(BITFORMS_PLUGIN_MAIN_FILE);