Skip to content

Commit

Permalink
Working with cfformat
Browse files Browse the repository at this point in the history
  • Loading branch information
donbellamy committed Sep 26, 2020
1 parent f78d1d0 commit 6e6f3b0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .cfformat.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"array.multiline.element_count":4,
"array.multiline.leading_comma":false,
"array.multiline.leading_comma.padding":false,
"array.multiline.min_length":40,
"array.multiline.min_length":50,
"array.padding":false,
"binary_operators.padding":true,
"brackets.padding":false,
Expand All @@ -17,46 +17,46 @@
"function_anonymous.multiline.element_count":4,
"function_anonymous.multiline.leading_comma":false,
"function_anonymous.multiline.leading_comma.padding":false,
"function_anonymous.multiline.min_length":40,
"function_anonymous.multiline.min_length":50,
"function_anonymous.padding":true,
"function_call.casing.builtin":"cfdocs",
"function_call.casing.userdefined":"ignored",
"function_call.empty_padding":false,
"function_call.multiline.element_count":4,
"function_call.multiline.element_count":5,
"function_call.multiline.leading_comma":false,
"function_call.multiline.leading_comma.padding":false,
"function_call.multiline.min_length":40,
"function_call.multiline.min_length":50,
"function_call.padding":true,
"function_declaration.empty_padding":false,
"function_declaration.group_to_block_spacing":"spaced",
"function_declaration.multiline.element_count":4,
"function_declaration.multiline.leading_comma":false,
"function_declaration.multiline.leading_comma.padding":false,
"function_declaration.multiline.min_length":40,
"function_declaration.multiline.min_length":50,
"function_declaration.padding":true,
"indent_size":4,
"keywords.block_to_keyword_spacing":"spaced",
"keywords.empty_group_spacing":false,
"keywords.group_to_block_spacing":"spaced",
"keywords.padding_inside_group":false,
"keywords.padding_inside_group":true,
"keywords.spacing_to_block":"spaced",
"keywords.spacing_to_group":true,
"max_columns":120,
"metadata.multiline.element_count":4,
"metadata.multiline.min_length":40,
"metadata.multiline.min_length":50,
"method_call.chain.multiline":3,
"newline":"os",
"parentheses.padding":false,
"parentheses.padding":true,
"property.multiline.element_count":4,
"property.multiline.min_length":40,
"property.multiline.min_length":30,
"strings.attributes.quote":"double",
"strings.quote":"double",
"strings.convertNestedQuotes":true,
"struct.empty_padding":false,
"struct.multiline.element_count":4,
"struct.multiline.leading_comma":false,
"struct.multiline.leading_comma.padding":false,
"struct.multiline.min_length":40,
"struct.multiline.min_length":60,
"struct.padding":false,
"struct.quote_keys":false,
"struct.separator":": ",
Expand Down
4 changes: 1 addition & 3 deletions handlers/baseHandler.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ component extends="contentbox.modules.contentbox-admin.handlers.baseHandler" {
* Pre handler
*/
function preHandler( event, rc, prc, action, eventArguments ) {

// Make sure call is coming from admin
if ( reFindNoCase( "^contentbox-aggregator", event.getCurrentEvent() ) ) {
setNextEvent(
event = "cbadmin/module/aggregator/#event.getCurrentHandler()#",
ssl = getRequestContext().isSSL()
);
}

}

}
}

0 comments on commit 6e6f3b0

Please sign in to comment.