From 6738b6c0a293e3645f0d3f6fed17b5364196a6e9 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 13:58:13 +0400
Subject: [PATCH] =?UTF-8?q?Application.cfc:=20=D0=B2=D1=81=D1=91=20=D1=85?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B4=D0=BA=D0=BE=D0=B4,=20=D1=82=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20DB=5FUSER/DB=5FPASS=20=D0=B8=D0=B7=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application.cfc | 179 ++++++++----------------------------------------
 1 file changed, 30 insertions(+), 149 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index 39549ca..caa4626 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -1,153 +1,34 @@
-<cfcomponent
-    displayname="Application"
-    output="true"
-    hint="Handle the application.">
-	
+component {
+    this.name = "contractor";
+    this.applicationTimeout = createTimeSpan(0, 0, 3, 0);
+    this.sessionmanagement = true;
+    this.datasource = "baza";
+    this.restEnabled = true;
+    this.restSettings = {skipCFCWithError: true};
 
-    <!--- 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"/>
-	<cfset this.datasources["baza"] = {
-		class: "org.postgresql.Driver",
-		bundleName: "org.postgresql.jdbc",
-		bundleVersion: "42.6.0",
-		connectionString: "jdbc:postgresql://postgresqlk8s-master.418f9960-2eb7-4429-b2ec-ac64319d7268.svc.cluster.local:5432/baza",
-		username: "super",
-		password: "hoHdkA23yxlD9oMUlZ1bIbNyc6DE2mNJmyHMNkEpVD1F4suQs7O2lyN4t0qITyzt"
-	}/>
-	
-	<!--- REST API --->
-	<cfset this.restEnabled = true/>
-	<cfset this.restSettings = {skipCFCWithError: true}/>
-		
-    <!--- Define the page request properties. --->
-    <cfsetting requesttimeout="20" showdebugoutput="false" enablecfoutputonly="false"/>
+    // defaults
+    var dbHost = "postgresqlk8s-master.418f9960-2eb7-4429-b2ec-ac64319d7268.svc.cluster.local";
+    var dbPort = "5432";
+    var dbName = "baza";
 
-    <cffunction name="OnApplicationStart" access="public" returntype="boolean" output="false">
-		<cfset this.datasources["baza"] = {
-			class: "org.postgresql.Driver",
-			bundleName: "org.postgresql.jdbc",
-			bundleVersion: "42.6.0",
-			connectionString: "jdbc:postgresql://postgresqlk8s-master.418f9960-2eb7-4429-b2ec-ac64319d7268.svc.cluster.local:5432/baza",
-			username: "super",
-			password: "hoHdkA23yxlD9oMUlZ1bIbNyc6DE2mNJmyHMNkEpVD1F4suQs7O2lyN4t0qITyzt"
-		}/>
-        <cfreturn true/>
-    </cffunction>
+    // из env или дефолт
+    var sys = createObject("java", "java.lang.System");
+    var user = sys.getenv("DB_USER");
+    if (isNull(user) || !len(user)) user = "super";
+    var pass = sys.getenv("DB_PASS");
+    if (isNull(pass) || !len(pass)) pass = "hoHdkA23yxlD9oMUlZ1bIbNyc6DE2mNJmyHMNkEpVD1F4suQs7O2lyN4t0qITyzt";
 
+    this.datasources["baza"] = {
+        class: "org.postgresql.Driver",
+        bundleName: "org.postgresql.jdbc",
+        bundleVersion: "42.6.0",
+        connectionString: "jdbc:postgresql://#dbHost#:#dbPort#/#dbName#",
+        username: user,
+        password: pass
+    };
 
-    <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>
-
-
-    <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>
-
-
-</cfcomponent>
+    function onRequestStart(targetPage) {
+        if (structKeyExists(url, "reload")) applicationStop();
+        return true;
+    }
+}