don't pass image through cloudinary if there aren't crops

Author: Blair McKenzie

packages/formtools/image.cfc

@@ -350,7 +350,10 @@
 		</cfif>
 		
 		<!--- Copy the source into the new field --->
-		<cfif len(sourcefilename) and refindnocase("//res.cloudinary.com/",sourcefilename)>
+		<cfif len(sourcefilename) and (application.fapi.getConfig("cloudinary", "uploadVia", "post") neq "post" or refindnocase("//res.cloudinary.com/",sourcefilename))>
+			<!--- source=xxx => original file for this image; _source=xxx => temporary variable used for dependant cuts --->
+			<cfset sourcefilename = replace(sourcefilename,"?source=","?_source=") />
+		<cfelseif len(sourcefilename) and refindnocase("//res.cloudinary.com/",sourcefilename)>
 			<!--- source=xxx => original file for this image; _source=xxx => temporary variable used for dependant cuts --->
 			<cfset sourcefilename = replace(sourcefilename,"?source=","?_source=") />
 		<cfelseif len(sourcefilename) and application.fc.lib.cdn.ioFileExists(location="images",file=sourcefilename)>
@@ -389,7 +392,7 @@
 		
 		<cfsetting requesttimeout="120" />
 		
-		<cfif len(arguments.source) and not refindnocase("//res.cloudinary.com/",arguments.source)>
+		<cfif len(arguments.source) and application.fapi.getConfig("cloudinary", "uploadVia", "post") eq "post" and not refindnocase("//res.cloudinary.com/",arguments.source)>
 			<cfreturn super.GenerateImage(argumentCollection=arguments) />
 		</cfif>
 		
@@ -418,7 +421,7 @@
 				<cfreturn application.fc.lib.cloudinary.upload(file=arguments.file, publicID=arguments.publicID, transformation=arguments.transformation).urlWithSource />
 			</cfcase>
 			<cfcase value="fetch">
-				<cfreturn application.fc.lib.cloudinary.fetch(file=arguments.file) />
+				<cfreturn application.fc.lib.cloudinary.fetch(file=arguments.file, cropParams={}) />
 			</cfcase>
 			<cfcase value="auto">
 				<cfreturn application.fc.lib.cloudinary.autoUpload(file=arguments.file) />

packages/lib/cloudinary.cfc

@@ -436,7 +436,7 @@
 	</cffunction>
 
 	<cffunction name="fetch" output="false" returntype="string" hint="Return cloudinary url of cropped image.">
-		<cfargument name="sourceURL" required="true" type="string">
+		<cfargument name="file" required="true" type="string">
 		<cfargument name="cropParams" required="true" type="struct" hint="width,height,crop,format">
 
 		<cfset var stResult = structNew() />
@@ -445,13 +445,19 @@
 		<cfset var transform = getTransform(argumentCollection=arguments.cropParams)>
 
 		<cfset var fetchURL = "#endpoint#/#method#/#transform#/">
-		<cfset var fileURL =arguments.sourceURL>
+		<cfset var fileURL =arguments.file>
 
-		<cfif (len(fileURL) gt 2 && left(fileURL, 2) == "//")>
-			<cfset fileURL = "http:" & fileURL>
-		</cfif>
+		<cfif (not structKeyExists(arguments.cropParams, "width") or arguments.cropParams.width eq 0)
+			AND (not structKeyExists(arguments.cropParams, "height") or arguments.cropParams.height eq 0)>
+			
+			<!--- Don't modify file --->
+		<cfelse>
+			<cfif (len(fileURL) gt 2 && left(fileURL, 2) == "//")>
+				<cfset fileURL = "http:" & fileURL>
+			</cfif>
 
-		<cfset fileURL = fetchURL & urlEncode(fileURL)>
+			<cfset fileURL = fetchURL & urlEncode(fileURL)>
+		</cfif>
 
 		<cfreturn fileURL />
 	</cffunction>