Fixed the upload urls and fixed the https value in $_SERVER

admin/upload-dir.php

@@ -0,0 +1,22 @@
+<?php
+
+class Brizy_Admin_UploadDir {
+
+	static public function getUploadDir( $time = null, $create_dir = true, $refresh_cache = false ) {
+		add_filter('upload_dir',array('Brizy_Admin_UploadDir','fixUrlSchema'));
+		$dir = wp_upload_dir( $time, $create_dir, $refresh_cache );
+		remove_filter('upload_dir',array('Brizy_Admin_UploadDir','fixUrlSchema'));
+
+		return $dir;
+	}
+
+	static public function fixUrlSchema( $uploadDir ) {
+
+		$uploadDir['url'] = set_url_scheme($uploadDir['url']);
+		$uploadDir['baseurl'] = set_url_scheme($uploadDir['baseurl']);
+
+		return $uploadDir;
+
+	}
+
+}

brizy.php

@@ -11,6 +11,13 @@
  * Domain Path: /languages
  */
 
+/**
+ * This will fix the url protocol for websites that are working behind a load balancer
+ */
+if ( isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) && stripos( $_SERVER['HTTP_X_FORWARDED_PROTO'], 'https' ) !== false ) {
+	$_SERVER['HTTPS'] = 'on';
+}
+
 define( 'BRIZY_DEVELOPMENT', false );
 define( 'BRIZY_LOG', false );
 define( 'BRIZY_VERSION', '1.0.18' );

editor/helper/post-static.php

@@ -17,7 +17,7 @@ public function save_path() {
 	}
 
 	private function uploads_dir() {
-		$upload_dir = wp_upload_dir();
+		$upload_dir = Brizy_Admin_UploadDir::getUploadDir();
 
 		return $upload_dir['baseurl'];
 	}

editor/uploads-dir.php

@@ -30,7 +30,7 @@ private static function get_uploads_url() {
 		static $uri;
 
 		if ( ! $uri ) {
-			$uploads = wp_upload_dir();
+			$uploads = Brizy_Admin_UploadDir::getUploadDir();
 			$uri     = $uploads['baseurl'];
 		}
 
@@ -41,7 +41,7 @@ private static function get_uploads_path() {
 		static $uri;
 
 		if ( ! $uri ) {
-			$uploads = wp_upload_dir();
+			$uploads = Brizy_Admin_UploadDir::getUploadDir();
 			$uri     = $uploads['basedir'];
 		}
 

editor/url-builder.php

@@ -27,7 +27,7 @@ public function __construct( $project = null, $post = null ) {
 
 		$this->project    = $project;
 		$this->post       = $post;
-		$this->upload_dir = wp_upload_dir( null, true );
+		$this->upload_dir = Brizy_Admin_UploadDir::getUploadDir(null,true);
 	}
 
 	public function application_form_url() {

editor/user.php

@@ -331,18 +331,7 @@ public function compile_page( $project, $post ) {
 		$page_html = $this->get_client()->compile_page( $project, $editor_data, $config );
 
 		return $page_html;
-//
-//		$asset_storage = new Brizy_Editor_Asset_AssetProxyStorage( $project, $post, $config );
-//		$media_storage = new Brizy_Editor_Asset_MediaProxyStorage( $project, $post, $config );
-//
-//		$asset_processors   = array();
-//		$asset_processors[] = new Brizy_Editor_Asset_AssetProxyProcessor( $asset_storage );
-//		$asset_processors[] = new Brizy_Editor_Asset_MediaAssetProcessor( $media_storage );
-//
-//		$brizy_editor_compiled_html = new Brizy_Editor_CompiledHtml( $page_html );
-//		$brizy_editor_compiled_html->setProcessors( $asset_processors );
-//
-//		return $brizy_editor_compiled_html;
+
 	}
 
 	/**