Author: dustymc

Application.cfc

@@ -211,19 +211,11 @@
 			<cfdump var=#cgi# label="cgi">
 		</cfmail>
 	</cfif>
-	
-	
 	<cfmail subject="good app start" to="[email protected]" from="badAppStart@#application.fromEmail#" type="html">
-			just started
-			serverName=<cfdump var="#serverName#">
-			<cfdump var=#cgi# label="cgi">
-		</cfmail>
-		
-		
-		
-		
-		
-		
+		just started
+		serverName=<cfdump var="#serverName#">
+		<cfdump var=#cgi# label="cgi">
+	</cfmail>
 	<cftry>
 		<cfquery name="d" datasource="uam_god">
 			select ip from uam.blacklist where sysdate-LISTDATE<180
@@ -314,10 +306,7 @@
 </cffunction>
 <!-------------------------------------------------------------->
 <cffunction name="onRequestStart" returnType="boolean" output="true">
-	
-	<cfset request.rdurl=replacenocase(cgi.query_string,"path=","","all")>
-	
-	
+	<cfset request.rdurl=replacenocase(cgi.query_string,"path=","","all")>	
 	<cfset temp=getIpAddress()>
 	<cfif cgi.script_name is not "/errors/missing.cfm">
 		<cfset request.rdurl=cgi.script_name & "?" & request.rdurl>

CustomTags/logError.cfm

@@ -156,15 +156,6 @@
 	<cfset logdata=logdata & "<#key#>#replace(replace(exception[key],'=','[EQUALS]','all'),'&','[AND]','all')#</#key#>">
 </cfloop>
 <cfset logdata=logdata & "</logEntry>">
-
-
-
-		<cfset Application.webDirectory = "/usr/local/httpd/htdocs/wwwarctos">
-
-
-
-
-
 <cffile action="append" file="#Application.webDirectory#/log/#theLogFile#" output="#logdata#">
 <cfmail subject="#exception.subject#" to="#Application.LogEmail#" from="logs@#application.fromEmail#" type="html">
 	<a href="http://network-tools.com/default.asp?prog=network&host=#exception.ipaddress#">[ lookup #exception.ipaddress# ]</a>

Encumbrances.cfm

@@ -245,7 +245,11 @@
 					[ Modify This Encumbrance ]
 				</span>
 				<a href="/SpecimenResults.cfm?encumbrance_id=#encumbrance_id#">[ See Specimens ]</a>
-				<a href="/Admin/deleteSpecByEncumbrance.cfm?encumbrance_id=#encumbrance_id#">[ Delete Encumbered Specimens ]</a>
+				<cfif listfindnocase(session.roles, "MANAGE_COLLECTION")>
+					<a href="/Admin/deleteSpecByEncumbrance.cfm?encumbrance_id=#encumbrance_id#">[ Delete Encumbered Specimens ]</a>
+				<cfelse>
+					Manage_collection access is required to delete.
+				</cfif>
 				<span class="likeLink" onclick="confirmRemoveSpecs('#encumbrance_id#')">
 					[ Remove all specimens from this encumbrance ]
 				</span>

errors/404.cfm

@@ -33,16 +33,11 @@
 		</cfif>
 		<cfabort>
 	</cfif>
-	
 	<cfset f = CreateObject("component","component.utilities")>
-
 	<!--- pass in the URL to ensure the error side of the checker fires ---->
 	<cfset x=f.checkRequest(request.rdurl)>
-
-
 	<cfset fourohthree="dll,png,crossdomain,xml">
 	<cfset browsergarbage="apple-touch-icon,browserconfig">
-	
 	<cfloop list="#request.rdurl#" delimiters="./&+()" index="i">
 		<cfloop list="#browsergarbage#" index="bg">
 			<cfif i contains bg>
@@ -52,7 +47,6 @@
 		<cfif listfindnocase(fourohthree,i)>
 			<cfthrow detail="You've requested a form which isn't available. This may be an indication of unwanted or malicious software on your computer." message="403: Forbidden" errorcode="403">
 		</cfif>
-		
 	</cfloop>
 	<!--- we don't have a redirect, and it's not on our hitlist, so 404 --->
 	<cfheader statuscode="404" statustext="Not found">

errors/autoblacklist.cfm

@@ -54,13 +54,13 @@
 <!--- sometimes already-banned IPs end up here due to click-flooding etc. ---->
 <cfif listcontains(application.blacklist,request.ipaddress)>
 	<!--- they're already actively blacklisted - do nothing here---->
-	<cf_logError subject="#pa#existing active IP autoblacklisted">
+	<cf_logError subject="#pa#existing active IP autoblacklisted"  message="#bl_reason#">
 	<cfinclude template="/errors/gtfo.cfm">
 	<cfabort>
 </cfif>
 <cfif listcontains(application.subnet_blacklist,request.requestingSubnet,",")>
 	<!--- they're already actively blacklisted - do nothing here---->
-	<cf_logError subject="#pa#existing active subnet autoblacklisted">
+	<cf_logError subject="#pa#existing active subnet autoblacklisted"  message="#bl_reason#">
 	<cfinclude template="/errors/gtfo.cfm">
 	<cfabort>
 </cfif>
@@ -73,15 +73,15 @@
 		update uam.blacklist set LISTDATE=sysdate where ip='#trim(request.ipaddress)#'
 	</cfquery>
 	<cfset application.blacklist=listappend(application.blacklist,trim(request.ipaddress))>
-	<cf_logError subject="#pa#updated autoblacklist">
+	<cf_logError subject="#pa#updated autoblacklist" message="#bl_reason#">
 	<cfinclude template="/errors/gtfo.cfm">
 	<cfabort>
 <cfelse>
 	<cfquery name="d" datasource="uam_god">
 		insert into uam.blacklist (ip) values ('#trim(request.ipaddress)#')
 	</cfquery>
 	<cfset application.blacklist=listappend(application.blacklist,trim(request.ipaddress))>
-	<cf_logError subject="#pa#new autoblacklist"  message="#bl_reason#">
+	<cf_logError subject="#pa#new autoblacklist" message="#bl_reason#">
 	<cfinclude template="/errors/gtfo.cfm">
 	<cfabort>
 </cfif>