Skip to content

Commit

Permalink
LDEV-5030 - replace dynamic isDefined
Browse files Browse the repository at this point in the history
  • Loading branch information
michaeloffner committed Aug 21, 2024
1 parent b0f5e52 commit 1da8072
Show file tree
Hide file tree
Showing 22 changed files with 84 additions and 88 deletions.
10 changes: 8 additions & 2 deletions core/src/main/cfml/context/admin/admin.search.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,14 @@
<cfoutput query="q">
<cfset action = rereplace(q.page, '\.cfm$', '') />
<!--- try to create friendly name for current page --->
<cfif isDefined("variables.data.menu.#listfirst(action, '.')#.label") and isDefined("variables.data.menu.#action#")>
<cfset pagename = variables.data.menu[listfirst(action, '.')].label & " - " & evaluate("variables.data.menu.#action#") />
<cfif
isDefined("variables.data.menu") and
structKeyExists(variables.data.menu, listfirst(action, '.')) and
structKeyExists(variables.data.menu[listfirst(action, '.')], "label") and
isDefined("variables.data.menu") and
structKeyExists(variables.data.menu, action)>
<cfset pagename = variables.data.menu[listfirst(action, '.')].label & " - " & variables.data.menu[action] />
<cfelse>
<cfset pagename = rereplace(replace(action, ".", " - "), '.', '\U\0') />
</cfif>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<cfset data.rows=toArrayFromForm("row")>
<cfset data.ids=toArrayFromForm("id")>
<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
<cfadmin
action="removeDebugEntry"
type="#request.adminType#"
Expand Down
6 changes: 1 addition & 5 deletions core/src/main/cfml/context/admin/ext.applications.upload.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,7 @@
<cfif not structKeyExists(qData, key)>
<cfcontinue />
</cfif>
<cfif isDefined("configXml.config.info[key].xmlText")>
<cfset qData[key] = configXml.config.info[key].xmlText />
<cfelse>
<cfset qData[key] = "" />
</cfif>
<cfset qData[key] = configXml.config.info[key].xmlText?:"" />
</cfloop>


Expand Down
2 changes: 1 addition & 1 deletion core/src/main/cfml/context/admin/ext.functions.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
}
// sucessfull
if(http.status_code==200) { // if(isDefined("http.responseheader['Return-Format']"))
if(http.status_code==200) {
local.result=deserializeJson(http.fileContent,false);
result.lastModified=now();
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/cfml/context/admin/messaging.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ ACTIONS --->
<cfset data.ports=toArrayFromForm("port")>
<cfset data.rows=toArrayFromForm("row")>
<cfloop index="idx" from="1" to="#arrayLen(data.hosts)#">
<cfif isDefined("data.rows[#idx#]") and data.hosts[idx] NEQ "">
<cfparam name="data.ports[#idx#]" default="21">
<cfif trim(data.ports[idx]) EQ ""><cfset data.ports[idx]=21></cfif>
<cfif arrayIndexExists(data.rows, idx) and data.hosts[idx] NEQ "">
<cfif trim(data.ports[idx]?:"") EQ ""><cfset data.ports[idx]=21></cfif>
<cfset admin.updateMailServer(data.rows[idx]-1,data.hosts[idx],data.usernames[idx],data.passwords[idx],toInt(data.ports[idx]))>
</cfif>
</cfloop>
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/cfml/context/admin/remote.clients.list.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.urls)#">
<cfif isDefined("data.rows[#idx#]") and data.urls[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.urls[idx] NEQ "">
<cfadmin
action="removeRemoteClient"
type="#request.adminType#"
Expand All @@ -44,7 +44,7 @@
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.urls)#">
<cfif isDefined("data.rows[#idx#]") and data.urls[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.urls[idx] NEQ "">
<cfadmin
action="getRemoteClient"
type="#request.adminType#"
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/cfml/context/admin/resources.cfx_tags.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Defaults --->
<!--- update --->
<cfif form.subAction EQ "#stText.Buttons.save#">
<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cfset data.names[idx] = REReplaceNoCase(data.names[idx],"(<cfx_)|(<)|(>)","","ALL")>
<cfadmin
action="updateJavaCFX"
Expand All @@ -63,7 +63,7 @@ Defaults --->
<cfelseif form.subAction EQ "#stText.Buttons.verify#">
<cfset noRedirect=true>
<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cftry>
<cfadmin
action="verifyCFX"
Expand All @@ -85,7 +85,7 @@ Defaults --->
<cfelseif form.subAction EQ "#stText.Buttons.Delete#">

<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cfadmin
action="removeCFX"
type="#request.adminType#"
Expand Down
18 changes: 9 additions & 9 deletions core/src/main/cfml/context/admin/resources.component.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ Defaults --->
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.addNonCFMLFiles[idx]=isDefined("data.addNonCFMLFiles[#idx#]") and data.addNonCFMLFiles[idx]>
<cfset data.addCFMLFiles[idx]=isDefined("data.addCFMLFiles[#idx#]") and data.addCFMLFiles[idx]>
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.addNonCFMLFiles[idx]=data.addNonCFMLFiles[idx]?:false>
<cfset data.addCFMLFiles[idx]=data.addCFMLFiles[idx]?:false>

<cfset ext='lar'>
<cfset target=getTempDirectory() & Rand() & "."&ext>
Expand Down Expand Up @@ -120,9 +120,9 @@ Defaults --->
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.toplevels[idx]=isDefined("data.toplevels[#idx#]") and data.toplevels[idx]>
<cfset data.stoponerrors[idx]=isDefined("data.stoponerrors[#idx#]") and data.stoponerrors[idx]>
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
<cfset data.stoponerrors[idx]=data.stoponerrors[idx]?:false>

<cfadmin
action="compileComponentMapping"
Expand All @@ -149,7 +149,7 @@ Defaults --->

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">

<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfadmin
action="removeComponentMapping"
type="#request.adminType#"
Expand All @@ -174,8 +174,8 @@ Defaults --->
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.physicals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.inspects[idx]=data.inspects[idx]?:"">
<cfset name=data.names[idx]?:"">
<cfset virtual=trim(data.virtuals[idx])>
<cfif len(name)>
Expand Down
32 changes: 14 additions & 18 deletions core/src/main/cfml/context/admin/resources.customtags.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,13 @@
<cfset stText.CustomTags.PrimaryDesc="Defines where Lucee looks first for a requested custom tags">
<cfset stText.CustomTags.trustedDesc="When does Lucee checks for changes in the source file for an already loaded custom tags">


<!--- <cfif isDefined("form")>
<cfinclude template="act/resources.act_mapping.cfm">
</cfif> --->
<cfset error.message="">
<cfset error.detail="">
<cfparam name="url.action2" default="list">
<cfscript>
function arrayRemoveValue(arr,value){
function arrayRemoveValue(arr,value) {
var index=arrayFindNoCase(arr,value);
if(index GT 0)ArrayDeleteAt(arr,index);
if(index GT 0) ArrayDeleteAt(arr,index);
}
</cfscript>

Expand Down Expand Up @@ -58,9 +54,9 @@
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.addNonCFMLFiles[idx]=isDefined("data.addNonCFMLFiles[#idx#]") and data.addNonCFMLFiles[idx]>
<cfset data.addCFMLFiles[idx]=isDefined("data.addCFMLFiles[#idx#]") and data.addCFMLFiles[idx]>
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.addNonCFMLFiles[idx]=data.addNonCFMLFiles[idx]?:false>
<cfset data.addCFMLFiles[idx]=data.addCFMLFiles[idx]?:false>

<cfset ext='lar'>
<cfset target=getTempDirectory() & Rand() & "."&ext>
Expand Down Expand Up @@ -122,9 +118,9 @@

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">

<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.toplevels[idx]=isDefined("data.toplevels[#idx#]") and data.toplevels[idx]>
<cfset data.stoponerrors[idx]=isDefined("data.stoponerrors[#idx#]") and data.stoponerrors[idx]>
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
<cfset data.stoponerrors[idx]=data.stoponerrors[idx]?:false>

<cfadmin
action="compileCTMapping"
Expand Down Expand Up @@ -152,9 +148,9 @@
type="#request.adminType#"
password="#session["password"&request.adminType]#"

deepSearch="#isDefined('form.customTagDeepSearchDesc') and form.customTagDeepSearchDesc EQ true#"
localSearch="#isDefined('form.customTagLocalSearchDesc') and form.customTagLocalSearchDesc EQ true#"
customTagPathCache="#isDefined('form.customTagPathCache') and form.customTagPathCache EQ true#"
deepSearch="#form.customTagDeepSearchDesc?:false#"
localSearch="#form.customTagLocalSearchDesc?:false#"
customTagPathCache="#form.customTagPathCache?:false#"



Expand All @@ -172,8 +168,8 @@
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.physicals)#">
<cfif isDefined("data.rows[#idx#]")>
<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
<cfif arrayIndexExists(data.rows, idx)>
<cfset data.inspects[idx]=data.inspects[idx]?:"">

<cfset name=data.names[idx]?:"">
<cfset virtual=trim(data.virtuals[idx]?:"")>
Expand Down Expand Up @@ -204,7 +200,7 @@

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">

<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfadmin
action="removeCustomTag"
type="#request.adminType#"
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/cfml/context/admin/resources.customtags.old.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<cfscript>
function arrayRemoveValue(arr,value){
var index=arrayFindNoCase(arr,value);
if(index GT 0)ArrayDeleteAt(arr,index);
if(index GT 0) ArrayDeleteAt(arr,index);
}
</cfscript>

Expand Down Expand Up @@ -63,8 +63,8 @@
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.physicals)#">
<cfif isDefined("data.rows[#idx#]")>
<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
<cfif arrayIndexExists(data.rows, idx)>
<cfset data.inspects[idx]=data.inspects[idx]?:"">

<cfset name=data.names[idx]?:"">
<cfset virtual=trim(data.virtuals[idx]?:"")>
Expand Down Expand Up @@ -93,7 +93,7 @@

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">

<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfadmin
action="removeCustomTag"
type="#request.adminType#"
Expand Down
19 changes: 9 additions & 10 deletions core/src/main/cfml/context/admin/resources.mappings.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ Defaults --->
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.stoponerrors[idx]=isDefined("data.stoponerrors[#idx#]") and data.stoponerrors[idx]>

<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.stoponerrors[idx]=(data.stoponerrors[idx]?:false)>
<cfadmin
action="compileMapping"
type="#request.adminType#"
Expand All @@ -61,9 +60,9 @@ Defaults --->
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.addCFMLFiles[idx]=isDefined("data.addCFMLFiles[#idx#]") and data.addCFMLFiles[idx]>
<cfset data.addNonCFMLFiles[idx]=isDefined("data.addNonCFMLFiles[#idx#]") and data.addNonCFMLFiles[idx]>
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.addCFMLFiles[idx]=(data.addCFMLFiles[idx]?:false)>
<cfset data.addNonCFMLFiles[idx]=(data.addNonCFMLFiles[idx]?:false)>

<cfset ext="lar">
<cfset target=getTempDirectory() & Rand() & "."&ext>
Expand Down Expand Up @@ -121,9 +120,9 @@ Defaults --->
<cfset data.rows=toArrayFromForm("row")>

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfset data.inspects[idx]=isDefined("data.inspects[#idx#]")?data.inspects[idx]:"">
<cfset data.toplevels[idx]=isDefined("data.toplevels[#idx#]") and data.toplevels[idx]>
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfset data.inspects[idx]=data.inspects[idx]?:"">
<cfset data.toplevels[idx]=data.toplevels[idx]?:false>
<cfadmin
action="updateMapping"
type="#request.adminType#"
Expand All @@ -150,7 +149,7 @@ Defaults --->

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">

<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">
<cfif false && fileExists(mappings.archive[#idx#])>
<!--- TODO see LDEV-2379 --->
<cfset filedelete(mappings.archive[#idx#])>
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/cfml/context/admin/resources.rest.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfset _default=StructKeyExists(form,'default') and form.default EQ idx>
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">aaa
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">aaa
<cfadmin
action="updateRestMapping"
type="#request.adminType#"
Expand All @@ -63,7 +63,7 @@

<cfloop index="idx" from="1" to="#arrayLen(data.virtuals)#">
<cfset _default=StructKeyExists(form,'default') and form.default EQ idx>
<cfif isDefined("data.rows[#idx#]") and data.virtuals[idx] NEQ "">aaa
<cfif arrayIndexExists(data.rows, idx) and data.virtuals[idx] NEQ "">aaa
<cfadmin
action="removeRestMapping"
type="#request.adminType#"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/cfml/context/admin/server.logging.list.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<cfset data.names=toArrayFromForm("name")>
<cfset data.rows=toArrayFromForm("row")>
<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cfadmin
action="removeLogSetting"
type="#request.adminType#"
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/cfml/context/admin/services.cache.list.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<cfset data.rows=toArrayFromForm("row")>
<cfset data.names=toArrayFromForm("name")>
<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cfadmin
action="removeCacheConnection"
type="#request.adminType#"
Expand All @@ -48,7 +48,7 @@
<cfset data.names=toArrayFromForm("name")>

<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cftry>
<cfadmin
action="verifyCacheConnection"
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/cfml/context/admin/services.datasource.list.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<cfset data.names=toArrayFromForm("name")>

<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cfadmin
action="removeDatasource"
type="#request.adminType#"
Expand All @@ -27,7 +27,7 @@
<cfset data.usernames=toArrayFromForm("username")>

<cfloop index="idx" from="1" to="#arrayLen(data.names)#">
<cfif isDefined("data.rows[#idx#]") and data.names[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.names[idx] NEQ "">
<cftry>
<cfadmin
action="verifyDatasource"
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/cfml/context/admin/services.gateway.list.cfm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<cfset data.rows=toArrayFromForm("row")>
<cfset data.ids=toArrayFromForm("id")>
<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
<cfadmin
action="removeGatewayEntry"
type="#request.adminType#"
Expand All @@ -31,7 +31,7 @@
<cfset data.rows=toArrayFromForm("row")>
<cfset data.ids=toArrayFromForm("id")>
<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
<cfadmin
action="gateway"
type="#request.adminType#"
Expand All @@ -49,7 +49,7 @@
<cfset data.rows=toArrayFromForm("row")>
<cfset data.ids=toArrayFromForm("id")>
<cfloop index="idx" from="1" to="#arrayLen(data.ids)#">
<cfif isDefined("data.rows[#idx#]") and data.ids[idx] NEQ "">
<cfif arrayIndexExists(data.rows, idx) and data.ids[idx] NEQ "">
<cfadmin
action="getGatewayEntry"
type="#request.adminType#"
Expand Down
Loading

0 comments on commit 1da8072

Please sign in to comment.