From cb19fcf9495e0ff5c6bf848c1f7c410dbafdf7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CNaeel=E2=80=9D?= <tazet@narod.ru>
Date: Thu, 18 Jun 2026 14:05:58 +0400
Subject: [PATCH] =?UTF-8?q?Application.cfc:=20=D0=BC=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20+=20getDS=20pg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application.cfc | 163 +++++++++---------------------------------------
 1 file changed, 29 insertions(+), 134 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index b6a486c..2508f03 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -1,144 +1,39 @@
-<cfcomponent
-    displayname="Application"
-    output="true"
-    hint="Handle the application.">
-	
+<cfcomponent displayname="Application" output="true" hint="Handle the application.">
 
-    <!--- Set up the application. --->
-    <cfset this.Name = "contractor" />
-	<cfset this.applicationTimeout = createTimeSpan( 0, 0, 3, 0 ) />
-  	<cfset this.sessionmanagement="Yes"/>
-  	<cfset this.clientmanagement="No"/>
-  	<cfset this.sessiontimeout=CreateTimeSpan(0, 0, 120, 0)/>
-  	<cfset this.setclientcookies="No"/>
-  
-	<cfset this.datasource = "baza"/><!--- default datasource name --->
-	<cfset getDS(this.datasource,"pg")/><!--- datasource name, environment variable prefix without "_" --->
-		
-    <!--- Define the page request properties. --->
-    <cfsetting
-        requesttimeout="20"
-        showdebugoutput="false"
-        enablecfoutputonly="false"
-     />
+    <cfset this.Name = "contractor"/>
+    <cfset this.applicationTimeout = createTimeSpan(0, 0, 3, 0)/>
+    <cfset this.sessionmanagement = "Yes"/>
+    <cfset this.clientmanagement = "No"/>
+    <cfset this.sessiontimeout = CreateTimeSpan(0, 0, 120, 0)/>
+    <cfset this.setclientcookies = "No"/>
 
-    <cffunction
-        name="OnApplicationStart"
-        access="public"
-        returntype="boolean"
-        output="false"
-        hint="Fires when the application is first created.">
+    <cfset this.datasource = "baza"/>
+    <cfset getDS(this.datasource, "pg")/>
 
-        <cfreturn true />
+    <cfsetting requesttimeout="20" showdebugoutput="false" enablecfoutputonly="false"/>
+
+    <cffunction name="OnApplicationStart" access="public" returntype="boolean" output="false">
+        <cfreturn true/>
     </cffunction>
 
-
-    <cffunction
-        name="OnRequest"
-        access="public"
-        returntype="void"
-        output="true"
-        hint="Fires after pre page processing is complete.">
-		
-        <cfargument name="template" type="string" required="true"/>
-		
-		<cfset request.startTickCount=getTickCount()/>
-        
-		<cfset setEncoding("FORM", "UTF-8")>
-		<cfset setEncoding("URL", "UTF-8")>
-	
-		<!--- global settings --->
-		<cfset request.APP_VERSION="0.00.000"/><!---2024-10-13 15:26:10--->		
-		<cflock scope="application" type="readonly" timeout=3>
-			<cfset request.DS=this.datasource/>
-			<cfset request.APP_NAME=this.Name/>
-		</cflock>		
-
-		<cfset local = {} />
-
-        <cfset local.basePath = getDirectoryFromPath(
-            getCurrentTemplatePath()
-            ) />
-
-        <cfset local.targetPath = getDirectoryFromPath(
-            expandPath( arguments.template )
-            ) />
-
-        <cfset local.requestDepth = (
-            listLen( local.targetPath, "\/" ) -
-            listLen( local.basePath, "\/" )
-            ) />
-
-        <cfset request.webRoot = repeatString(
-            "../",
-            local.requestDepth
-            ) />
-
-        <!---
-            While we wouldn't normally do this for every page
-            request (it would normally be cached in the
-            application initialization), I'm going to calculate
-            the site URL based on the web root.
-        --->
-        <cfset request.siteUrl = (
-			IIF(
-				(CGI.server_port_secure <!--- CGI.https EQ "On" does not work with apache+tomcat and nginx+tomcat --->),
-				DE( "https://" ),
-				DE( "http://" )
-				) &
-            cgi.http_host &
-            reReplace(
-                getDirectoryFromPath( arguments.template ),                "([^\\/]+[\\/]){#local.requestDepth#}$",
-                "",
-                "one"
-                )
-            ) />
-
-		<cfset request.thisPage=Replace(ReplaceNoCase(expandPath(ARGUMENTS.template), local.basePath, ""), "\", "/")/>		
-		
-		<cfcookie name="CFID" value="#session.CFID#">
-		<cfcookie name="CFTOKEN" value="#session.CFTOKEN#">
-		
-		<cfinclude template="#ARGUMENTS.template#"/>
-
-        <cfreturn />
-    </cffunction>
-	
-	<cffunction
-        name="getDS"
-        access="private"
-        returntype="void"
-        output="false"
-        hint="Configure data source from environment variables. Convention: data source name is an environment varialble prefix">
-		
-		<cfargument name="dsname" type="string" required="true"/>
-		<cfargument name="prefix" type="string" default=#dsname#/>
-		
-		<cfset system = createObject("java", "java.lang.System")/>
-		<cfset var ds={}/>
-		
-		<cfloop list="class,connectionString,database,driver,host,port,type,url,username,password,bundleName,bundleVersion,connectionLimit,liveTimeout,validate" item="field">
-			<cfset var value=system.getEnv("#arguments.prefix#_#field#")/>
-			<cfif isDefined("value") AND len(value)>
-				<cfset structInsert(ds,field,value)/>
-			</cfif>			
-		</cfloop>		
-		
-		<cfset THIS.datasources[dsname] = ds> 
-        <cfreturn />
+    <cffunction name="OnRequestStart" access="public" returntype="boolean">
+        <cfif structKeyExists(url, "reload")><cfset applicationStop()/></cfif>
+        <cfreturn true/>
     </cffunction>
 
-
-    <cffunction
-        name="OnRequestEnd"
-        access="public"
-        returntype="void"
-        output="true"
-        hint="Fires after the page processing is complete.">
-		<!--- Attention! Before CF9, OnrequestEnd is not executed in case of redirect. That is why we use session.save_login --->
-
-        <cfreturn />
+    <cffunction name="getDS" access="private" returntype="void" output="false">
+        <cfargument name="dsname" type="string" required="true"/>
+        <cfargument name="prefix" type="string" default="#dsname#"/>
+        <cfset system = createObject("java", "java.lang.System")/>
+        <cfset var ds = {}/>
+        <cfloop list="class,connectionString,database,driver,host,port,type,url,username,password,bundleName,bundleVersion,connectionLimit,liveTimeout,validate" item="field">
+            <cfset var value = system.getEnv("#arguments.prefix#_#field#")/>
+            <cfif isDefined("value") AND len(value)>
+                <cfset structInsert(ds, field, value)/>
+            </cfif>
+        </cfloop>
+        <cfset THIS.datasources[dsname] = ds/>
+        <cfreturn/>
     </cffunction>
 
-
 </cfcomponent>