Author: dustymc

Application.cfc

@@ -172,23 +172,6 @@
 		<cfset Application.InstitutionBlurb = "Collections Database, Museum of Comparative Zoology, Harvard University">
 		<cfset Application.DataProblemReportEmail = "[email protected]">
 		<cfset Application.PageProblemEmail = "[email protected]">
-	<cfelseif #cgi.HTTP_HOST# contains "berkeley.edu">
-		<cfset Application.svn = "/opt/csw/bin/svn">
-		<cfset Application.webDirectory = "/users/mvzarctos/tomcat/webapps/cfusion">
-		<cfset Application.SpecimenDownloadPath = "/users/mvzarctos/tomcat/webapps/cfusion/download/">
-		<cfset Application.bugReportEmail = "[email protected],[email protected],[email protected]">
-		<cfset Application.technicalEmail = "[email protected],[email protected]">
-		<cfset Application.mapHeaderUrl = "http://mvz.berkeley.edu/images/nada.gif">
-		<cfset Application.mapFooterUrl = "#Application.serverRootUrl#/images/Logos/bnhm_logo_small.gif">
-		<cfset Application.genBankPrid = "4537">
-		<cfset Application.genBankUsername="mvz">
-		<cfset Application.convertPath = "/opt/csw/bin/convert">
-		<cfset Application.genBankPwd=encrypt("Uln1OAzy","genbank")>
-		<cfset Application.BerkeleyMapperConfigFile = "/bnhmMaps/MvzConfig.xml">
-		<cfset Application.Google_uacct = "UA-936774-1">
-		<cfset Application.InstitutionBlurb = "<a href=""#Application.serverRootUrl#"">Collections Database, Museum of Vertebrate Zoology, UC Berkeley</a>">
-		<cfset Application.DataProblemReportEmail = "[email protected]">
-		<cfset Application.PageProblemEmail = "[email protected],[email protected],[email protected]">
 	</cfif>	
 	<cfreturn true>
 </cffunction>
@@ -228,7 +211,23 @@
 			#GetTemplatePath()# does not contain "/errors/dev_login.cfm" and
 			#GetTemplatePath()# does not contain "/login.cfm" and
 			len(session.username) is 0>
-		<cflocation url="/errors/dev_login.cfm">
+		<cflocation url="/errors/dev_login.cfm">	
+	<cfelseif cgi.HTTP_HOST is "mvzarctos.berkeley.edu">
+		<cfset rurl="http://arctos.database.museum">
+		<cfif isdefined("cgi.redirect_url") and len(cgi.redirect_url) gt 0>
+			<cfset rurl=rurl & cgi.redirect_url>
+		<cfelseif isdefined("cgi.script_name") and len(cgi.script_name) gt 0>
+			<cfif cgi.script_name is "/SpecimenSearch.cfm">
+				<cfset rurl=rurl & "/mvz_all">
+			<cfelse>
+				<cfset rurl=rurl & cgi.script_name>
+			</cfif>
+		</cfif>
+		<cfif len(cgi.query_string) gt 0>
+			<cfset rurl=rurl & "?" & cgi.query_string>
+		</cfif>
+		<cfheader statuscode="301" statustext="Moved permanently">
+		<cfoutput><cfheader name="Location" value="#rurl#"></cfoutput>
 	</cfif>
 	<cfreturn true>
 </cffunction>

ScheduledTasks/build_home.cfm

@@ -17,7 +17,7 @@
 			<!--- just rebuild guts --->
 			<cfset fc = '<cfinclude template="/includes/functionLib.cfm">
 				<cfset setDbUser(#cf_collection_id#)>
-				<cflocation url="/SpecimenSearch.cfm">'>
+				<cflocation url="/SpecimenSearch.cfm" addtoken="false">'>
 			<cffile action="write" file="#cDir#/index.cfm" nameconflict="overwrite" output="#fc#">
 		</cfif>
 	</cfloop>

SpecimenDetail.cfm

@@ -50,10 +50,13 @@
 	<cfif isdefined("c.collection_object_id") and len(c.collection_object_id) gt 0>
 		<cfset collection_object_id=c.collection_object_id>
 	<cfelse>
+		<!---
 		<p class="error">
 			Unable to resolve GUID. Aborting.....
 		</p>
-		<cfabort>	
+		--->
+		<cfinclude template="/errors/404.cfm">
+		<cfabort>
 	</cfif>
 <cfelse>
 	<p class="error">

go.cfm

@@ -3,5 +3,5 @@
 	select url from cf_canned_search where canned_id=#id#
 </cfquery>
 <cfif len(#d.url#) gt 0>
-	<cflocation addtoken="no" url="#d.url#">
+	<cflocation addtoken="false" url="#d.url#">
 </cfif>

includes/alwaysInclude.cfm

@@ -1,20 +1,6 @@
 <cfif not isdefined("action")>
 	<cfset action="nothing">
-</cfif>
-
-
-	<cfoutput>cgi.HTTP_HOST: #cgi.HTTP_HOST#</cfoutput>
-	
-	<!----
-	<cfif cgi.HTTP_HOST contains "berkeley.edu">
-	<.cfheader statuscode="301" statustext="Moved permanently">
-<.cfheader name="Location" value="http://www.new-url.com"> 
-
-	
-	---->
-		
-		
-		
+</cfif>		
 <link rel="stylesheet" type="text/css" href="/includes/style.css" >
 <script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js'></script>
 <script type='text/javascript' src='/ajax/core/engine.js'></script>

index.cfm

@@ -1,2 +1 @@
-<!--- Just dump them somewhere useful --->
-<cflocation url="SpecimenSearch.cfm" addtoken="no">
+<cflocation url="SpecimenSearch.cfm" addtoken="false">

login.cfm

@@ -1,6 +1,6 @@
 <cfinclude template = "includes/_header.cfm">
 <cfif isdefined("session.username") and len(#session.username#) gt 0 and #action# neq "signOut">
-	<cflocation url="myArctos.cfm">
+	<cflocation url="myArctos.cfm" addtoken="false">
 </cfif>
 <!------------------------------------------------------------>
 <!--- sign them out and start over --->
@@ -11,7 +11,7 @@
 <!--- Clear anything they might have had hang around 	--->
 	<cfset initSession()>
 	you are logged out.
-				<cflocation url="login.cfm">
+				<cflocation url="login.cfm" addtoken="false">
 				<!---
 
 <cfdump var="#session#">
@@ -41,7 +41,7 @@
 	</cfif>
 	<!--- create their account --->
 	<cfif len(err) gt 0>
-		<cflocation url="login.cfm?username=#username#&badPW=true&err=#err#" Addtoken="false">
+		<cflocation url="login.cfm?username=#username#&badPW=true&err=#err#" addtoken="false">
 	</cfif>
 	<cfquery name="nextUserID" datasource="user_login" username="#session.dbuser#" password="#decrypt(session.epw,cfid)#">
 		select max(user_id) + 1 as nextid from cf_users
@@ -107,7 +107,7 @@
 		<cfif isdefined("gotopage")>
 			<cfset u=u & '&gotopage=#gotopage#'>
 		</cfif>
-		<cflocation url="#u#">
+		<cflocation url="#u#" addtoken="false">
 	</cfif>
 	<!--- redirect to personal home --->
 	<cfif not isdefined("gotopage") or len(#gotopage#) is 0>
@@ -258,7 +258,7 @@
 </cfif>
 <!-------------------------------------------------------------------------------------->
 <cfif #action# is "lostPass">
-	<cflocation url="ChangePassword.cfm">
+	<cflocation url="ChangePassword.cfm" addtoken="false">
 </cfif>
 <!-------------------------------------------------------------------------------------->
 

myArctos.cfm

@@ -1,6 +1,6 @@
 <cfinclude template = "includes/_header.cfm">
 <cfif len(#session.username#) is 0>
-	<cflocation url="/login.cfm">
+	<cflocation url="/login.cfm" addtoken="false">
 </cfif>
 <script type='text/javascript' src='/includes/_myArctos.js'></script>
 <script>
@@ -118,7 +118,7 @@
 			<cfabort>
 		</cfcatch>	
 	</cftry>
-	<cflocation url="myArctos.cfm">
+	<cflocation url="myArctos.cfm" addtoken="false">
 </cfoutput>
 </cfif>
 <!------------------------------------------------------------------->
@@ -129,7 +129,7 @@
 		username = '#session.username#' order by cf_users.user_id
 	</cfquery>
 	<cfif getPrefs.recordcount is 0>
-		<cflocation url="login.cfm?action=signOut">
+		<cflocation url="login.cfm?action=signOut" addtoken="false">
 	</cfif>
 	<cfquery name="isInv" datasource="uam_god">
 		select allow from temp_allow_cf_user where user_id=#getPrefs.user_id#
@@ -143,7 +143,7 @@
 			<cfset pwage = Application.max_pw_age - pwtime>
 			<cfif pwage lte 0>
 				<cfset session.force_password_change = "yes">
-				<cflocation url="ChangePassword.cfm">
+				<cflocation url="ChangePassword.cfm" addtoken="false">
 			<cfelseif pwage lte 10>
 				<span style="color:red;font-weight:bold;">
 					Your password expires in #pwage# days.
@@ -333,7 +333,7 @@
 					)
 			</cfquery>
 		</cfif>
-	<cflocation url="/myArctos.cfm">
+	<cflocation url="/myArctos.cfm" addtoken="false">
 </cfif>
 <!---------------------------------------------------------------------->
 <cfif isdefined("redir") AND #redir# is "true">

searchAll.cfm

@@ -1 +1 @@
-<cflocation url="/all_all">
+<cflocation url="/all_all" addtoken="false">