BUGFIX: Dispatch attempt WedgeCoop#2 using backtrace to determine whe…

…re it's called
jdpurdyvi · Oct 14, 2013 · bbfdc58 · bbfdc58
1 parent 82dba51
commit bbfdc58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/fannie/admin/GenericBilling/GenericBillingPage.php b/fannie/admin/GenericBilling/GenericBillingPage.php
@@ -48,7 +48,7 @@ function getMemInfo(){
 }
 function postBilling(){
 	var data = 'id='+$('#form_memnum').val();
-	data += '&amount='+$('#amt').val();
+	data += '&amount='+$('#amount').val();
 	data += '&desc='+$('#desc').val();
 	$.ajax({
 		url: 'GenericBillingPage.php',
@@ -198,7 +198,7 @@ function post_id_handler(){
 		$sql->exec_statement($prep, $param['arguments']);
 
 		printf("Member <b>%d</b> billed <b>$%.2f</b>.<br />
-			Receipt is %d-%d-%d.",$cardno,$amt*-1,
+			Receipt is %d-%d-%d.",$this->id,$amount,
 			$EMP_NO,$LANE_NO,$t_no);
 		return False;
 	}

diff --git a/fannie/classlib2.0/FannieDispatch.php b/fannie/classlib2.0/FannieDispatch.php
@@ -73,8 +73,9 @@ static public function catch_fatal(){
 	}
 
 	static public function go(){
-		if (basename(__FILE__) == basename($_SERVER['PHP_SELF'])){
-
+		$bt = debug_backtrace();
+		if (count($bt) == 1){
+
 			set_error_handler(array('FannieDispatch','error_handler'));
 			set_exception_handler(array('FannieDispatch','exception_handler'));
 			register_shutdown_function(array('FannieDispatch','catch_fatal'));