Improved URL validation

Author: gdarko

src/Optimizer.php

@@ -39,7 +39,7 @@ class Optimizer {
 	const RESOURCE_FILES = 'files';
 	const MAX_ALLOWED_RESOURCES = 5;
 
-	const VERSION = '1.0.4';
+	const VERSION = '1.0.5';
 	/**
 	 * @var string
 	 */
@@ -166,6 +166,7 @@ public function run( $resource, $args = array(), $local_wait = false ) {
 
 	/**
 	 * Returns the results of the process
+	 *
 	 * @param $process_id
 	 * @param int $max_wait_seconds
 	 *
@@ -211,17 +212,19 @@ public static function prepare_data( $resource, $args ) {
 			$is_url  = 0;
 			$is_file = 0;
 			foreach ( $resource as $file ) {
-				if ( URL::validate( $file ) ) {
-					$is_url  = 1;
+
+				if ( file_exists( $file ) && is_file( $file ) ) {
+					$is_file = 1;
+					$is_url  = 0;
+				} else if ( file_exists( $file ) && is_dir( $file ) ) {
+					$is_file = 0;
+					$is_url  = 0;
+				} else if ( URL::validate( $file ) ) {
 					$is_file = 0;
+					$is_url  = 1;
 				} else {
-					if ( file_exists( $file ) ) {
-						$is_url  = 0;
-						$is_file = 1;
-					} else {
-						$is_url  = 0;
-						$is_file = 0;
-					}
+					$is_file = 0;
+					$is_url  = 0;
 				}
 			}
 			if ( $is_url ) {
@@ -313,11 +316,11 @@ public function get_user_info() {
 	 *
 	 * @return bool
 	 */
-	public static function valid_compression_level($level) {
-		return in_array($level, array(
+	public static function valid_compression_level( $level ) {
+		return in_array( $level, array(
 			self::COMPRESSION_LOSSLESS,
 			self::COMPRESSION_INTELLIGENT,
 			self::COMPRESSION_ULTRA,
-		));
+		) );
 	}
 }

src/Tools/URL.php

@@ -1,16 +1,14 @@
-<?php
-namespace MegaOptim\Tools;
-
-class URL {
-	/**
-	 * Validates url
-	 * @param $resource
-	 *
-	 * @return bool
-	 */
-	public static function validate($resource) {
-		$pattern = "#(?i)\b((?:[a-z][\w-]+:(?:/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'\".,<>?«»“”‘’]))#iS";
-		preg_match( $pattern, $resource, $matches );
-		return !empty($matches);
-	}
+<?php
+namespace MegaOptim\Tools;
+
+class URL {
+	/**
+	 * Validates url
+	 * @param $resource
+	 *
+	 * @return bool
+	 */
+	public static function validate($resource) {
+		return (bool) preg_match('_^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.(?:[a-z\x{00a1}-\x{ffff}0-9]+-?)*[a-z\x{00a1}-\x{ffff}0-9]+)*(?:\.(?:[a-z\x{00a1}-\x{ffff}]{2,})))(?::\d{2,5})?(?:/[^\s]*)?$_iuS',$resource);
+	}
 }