Merge pull request #2 from glomex/feature/11062021_ingest_main_plugin…

…_updates Feature/11062021 ingest main plugin updates
glomex · Jun 11, 2021 · 2677494 · 2677494
2 parents 86e2731 + a3aa09b
commit 2677494
Show file tree

Hide file tree

Showing 1,748 changed files with 72,860 additions and 4,674 deletions.
diff --git a/CdnEngine_CloudFront.php b/CdnEngine_CloudFront.php
@@ -2,7 +2,7 @@
 namespace W3TC;
 
 if ( !defined( 'W3TC_SKIPLIB_AWS' ) ) {
-	require_once W3TC_LIB_DIR . '/Aws/aws-autoloader.php';
+	require_once W3TC_DIR . '/vendor/autoload.php';
 }
 
 /**

diff --git a/CdnEngine_Mirror_CloudFront.php b/CdnEngine_Mirror_CloudFront.php
@@ -2,7 +2,7 @@
 namespace W3TC;
 
 if ( !defined( 'W3TC_SKIPLIB_AWS' ) ) {
-	require_once W3TC_LIB_DIR . '/Aws/aws-autoloader.php';
+	require_once W3TC_DIR . '/vendor/autoload.php';
 }
 
 /**

diff --git a/CdnEngine_S3.php b/CdnEngine_S3.php
@@ -2,7 +2,7 @@
 namespace W3TC;
 
 if ( !defined( 'W3TC_SKIPLIB_AWS' ) ) {
-	require_once W3TC_LIB_DIR . '/Aws/aws-autoloader.php';
+	require_once W3TC_DIR . '/vendor/autoload.php';
 }
 
 /**
@@ -164,13 +164,14 @@ public function upload( $files, &$results, $force_rewrite = false,
 	 * @return array
 	 */
 	private function _upload( $file, $force_rewrite = false ) {
+		$local_path = $file['local_path'];
+		$remote_path = $file['remote_path'];
+
 		if(!isset($file['local_path']) || empty($file['local_path'])) {
 			return $this->_get_result( $local_path, $remote_path,
 				W3TC_CDN_RESULT_ERROR, 'Source file not found.', $file );
 		}
 
-		$local_path = $file['local_path'];
-		$remote_path = $file['remote_path'];
 
 		if ( !file_exists( $local_path ) ) {
 			return $this->_get_result( $local_path, $remote_path,

diff --git a/Cdnfsd_CloudFront_Engine.php b/Cdnfsd_CloudFront_Engine.php
@@ -2,7 +2,7 @@
 namespace W3TC;
 
 if ( !defined( 'W3TC_SKIPLIB_AWS' ) ) {
-	require_once W3TC_LIB_DIR . '/Aws/aws-autoloader.php';
+	require_once W3TC_DIR . '/vendor/autoload.php';
 }
 
 

diff --git a/Cdnfsd_CloudFront_Popup.php b/Cdnfsd_CloudFront_Popup.php
@@ -2,7 +2,7 @@
 namespace W3TC;
 
 if ( !defined( 'W3TC_SKIPLIB_AWS' ) ) {
-	require_once W3TC_LIB_DIR . '/Aws/aws-autoloader.php';
+	require_once W3TC_DIR . '/vendor/autoload.php';
 }
 
 

diff --git a/Enterprise_SnsBase.php b/Enterprise_SnsBase.php
@@ -2,7 +2,7 @@
 namespace W3TC;
 
 if ( !defined( 'W3TC_SKIPLIB_AWS' ) ) {
-	require_once W3TC_LIB_DIR . '/Aws/aws-autoloader.php';
+	require_once W3TC_DIR . '/vendor/autoload.php';
 }
 
 

diff --git a/Generic_AdminActions_Default.php b/Generic_AdminActions_Default.php
@@ -367,7 +367,7 @@ private function _w3tc_save_options_process() {
 			$cdn_domains = array();
 
 			foreach ( $cdn_cnames as $cdn_cname ) {
-				$cdn_cname = trim( $cdn_cname );
+				$cdn_cname = preg_replace( '~[^0-9a-zA-Z.:\-]~', '', strip_tags( $cdn_cname ) );
 
 				/**
 				 * Auto expand wildcard domain to 10 subdomains

diff --git a/composer.json b/composer.json
@@ -2,8 +2,24 @@
     "name": "glomex/w3-total-cache",
     "description": "Altered version of W3TC plugin with support for internal Glomex infrastructure",
     "type": "wordpress-plugin",
-    "version": "2.1.2.4",
+    "version": "2.1.3",
     "require-dev": {
-        "roave/security-advisories": "dev-master"
+		"roave/security-advisories": "dev-master"
+	},
+    "require": {
+        "aws/aws-sdk-php": "^3.180",
+        "guzzlehttp/guzzle": "6.*",
+        "symfony/polyfill-intl-idn" : "1.20.*",
+        "symfony/polyfill-intl-normalizer" : "1.20.*",
+        "symfony/polyfill-mbstring" : "1.20.*"
+    },
+    "replace": {
+        "symfony/polyfill-php56": "*",
+        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php72": "*",
+        "symfony/polyfill-php73": "*",
+        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-mbstring": "*"
     }
 }