Katie Horn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51176
Change subject: Adding log error information to RapidHTML form selection process
......................................................................
Adding log error information to RapidHTML form selection process
Change-Id: I1c2fb6b3e2d82503329f4abc9319633a92194e7b
---
M gateway_forms/RapidHtml.php
1 file changed, 9 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/76/51176/1
diff --git a/gateway_forms/RapidHtml.php b/gateway_forms/RapidHtml.php
index 4d2e5ec..50603d4 100644
--- a/gateway_forms/RapidHtml.php
+++ b/gateway_forms/RapidHtml.php
@@ -427,25 +427,30 @@
$allowedForms = $g::getGlobal( 'AllowedHtmlForms' );
$problems = false;
+ $debug_message = '';
//make sure the requested form exists.
if ( !array_key_exists( $form_key, $allowedForms )
|| !array_key_exists( 'file', $allowedForms[$form_key]
)
|| ( !file_exists( $allowedForms[$form_key]['file'] ) )
) {
+ $debug_message = "Could not find form '$form_key'";
$problems = true;
}
if ( !$problems ){
//make sure the requested form is cleared for this
gateway
if ( !array_key_exists( 'gateway',
$allowedForms[$form_key] ) ){
+ $debug_message = "No defined gateways for
'$form_key'";
$problems = true;
} else {
$ident = $g->getIdentifier();
if ( is_array(
$allowedForms[$form_key]['gateway'] ) ){
if ( !in_array( $ident,
$allowedForms[$form_key]['gateway'] ) ){
+ $debug_message = "$ident is not
defined as an allowable gateway for '$form_key'";
$problems = true;
}
} else {
if (
$allowedForms[$form_key]['gateway'] != $ident ){
+ $debug_message = "$ident is not
defined as the allowable gateway for '$form_key'";
$problems = true;
}
}
@@ -467,12 +472,15 @@
}
if ( empty( $this->html_base_dir ) ){
+ $debug_message = "No valid html_base_dir for
'$form_key' - '$build' was not whitelisted.";
$problems = true;
}
}
if ( $problems ){
- throw new MWException( 'Requested an unavailable or
non-existent form.' ); # TODO: translate
+ $message = 'Requested an unavailable or non-existent
form.';
+ $this->adapter->log( $message . '' . $debug_message,
LOG_ERR );
+ throw new MWException( $message ); # TODO: translate
}
$this->html_file_path = $allowedForms[$form_key]['file'];
--
To view, visit https://gerrit.wikimedia.org/r/51176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c2fb6b3e2d82503329f4abc9319633a92194e7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Katie Horn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
