[Bug 61391] could not parse diff output
Aaron D.Campbell
kdebugs at ezdispatch.com
Wed Jul 9 20:44:00 CEST 2008
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
http://bugs.kde.org/show_bug.cgi?id=61391
------- Additional Comments From kdebugs ezdispatch com 2008-07-09 20:43 -------
I'm having the same problem not matter what two files I use. Here is the diff output from one such example. Could this be a problem similar to http://bugs.kde.org/show_bug.cgi?id=131717
diff ~/meqharvard_www/wp-content/plugins/mequoda_registration/order_update_process.php ~/Desktop/mequoda-old/wp-content/plugins/mequoda_registrtion/order_update_process-2008-07-09.php
24c24
<
---
>
26c26
<
---
>
29,31c29,34
<
< $post_values = stripslashes_deep($_POST );
<
---
>
> $post_values = array();
> foreach($_POST as $key => $value) {
> $post_values[$key] = get_magic_quotes_gpc() ? stripslashes($value) : $value;
> }
>
39c42
<
---
>
41c44
<
---
>
49c52
<
---
>
51c54
< $address = strip_tags($_POST['address']);
---
> $address = get_magic_quotes_gpc() ? strip_tags($_POST['address']) : strip_tags(addslashes($_POST['address']));
54c57
< $address2 = strip_tags($_POST['address2']);
---
> $address2 = get_magic_quotes_gpc() ? strip_tags($_POST['address2']) : strip_tags(addslashes($_POST['address2']));
57c60
< $city = strip_tags($_POST['city']);
---
> $city = get_magic_quotes_gpc() ? strip_tags($_POST['city']) : strip_tags(addslashes($_POST['city']));
60c63
< $state = strip_tags($_POST['state']);
---
> $state = get_magic_quotes_gpc() ? strip_tags($_POST['state']) : strip_tags(addslashes($_POST['state']));
63c66
< $zip_code = strip_tags($_POST['zip_code']);
---
> $zip_code = get_magic_quotes_gpc() ? strip_tags($_POST['zip_code']) : strip_tags(addslashes($_POST['zip_code']));
66c69
< $country = strip_tags($_POST['country']);
---
> $country = get_magic_quotes_gpc() ? strip_tags($_POST['country']) : strip_tags(addslashes($_POST['country']));
69c72
< $phone = strip_tags($_POST['phone']);
---
> $phone = get_magic_quotes_gpc() ? strip_tags($_POST['phone']) : strip_tags(addslashes($_POST['phone']));
71c74
<
---
>
81c84
<
---
>
88c91
<
---
>
98c101
<
---
>
108c111
<
---
>
113c116
<
---
>
118c121
<
---
>
123c126
<
---
>
128,132c131,138
<
<
< // Should happen no matter what payment method
< $price = strip_tags($_POST['price']);
<
---
>
> if( isset($_POST['pay_method']) ) {
> if( $_POST['pay_method'] == "3" ) {
> // bill-me only order
> $price = get_magic_quotes_gpc() ? strip_tags($_POST['price']) : strip_tags(mysql_real_escape_string($_POST['price']));
> }
> }
>
137a144
> $price = get_magic_quotes_gpc() ? strip_tags($_POST['price']) : strip_tags(mysql_real_escape_string($_POST['price']));
140,144c147,151
< $card_type = strip_tags($_POST['card_type']);
< $card_number = strip_tags($_POST['card_number']);
< $exp_month = strip_tags($_POST['exp_month']);
< $exp_year = strip_tags($_POST['exp_year']);
< $cvv = strip_tags($_POST['cvv']);
---
> $card_type = get_magic_quotes_gpc() ? strip_tags($_POST['card_type']) : strip_tags(mysql_real_escape_string($_POST['card_type']));
> $card_number = get_magic_quotes_gpc() ? strip_tags($_POST['card_number']) : strip_tags(mysql_real_escape_string($_POST['card_number']));
> $exp_month = get_magic_quotes_gpc() ? strip_tags($_POST['exp_month']) : strip_tags(mysql_real_escape_string($_POST['exp_month']));
> $exp_year = get_magic_quotes_gpc() ? strip_tags($_POST['exp_year']) : strip_tags(mysql_real_escape_string($_POST['exp_year']));
> $cvv = get_magic_quotes_gpc() ? strip_tags($_POST['cvv']) : strip_tags(mysql_real_escape_string($_POST['cvv']));
146c153
<
---
>
151c158
<
---
>
157c164,167
< $card_number_x = str_repeat('X', strlen($card_number) - 4) . substr($card_number, -4);
---
> $card_number_x = substr($card_number, -4, 4);
> for($x = 0; $x < strlen($card_number) - 4; $x++) {
> $card_number_x = "X".$card_number_x;
> }
164c174
<
---
>
169,171c179,183
<
< if ( $exp_month != '' && $exp_year != '' && mktime(0, 0, 0, $exp_month, date('d'), $exp_year) < mktime() ) {
< $errors[] = '<strong>ERROR</strong>: Credit card has expired.';
---
>
> if ( $exp_month != '' && $exp_year != '' ) {
> if ( mktime(0, 0, 0, $exp_month, date('d'), $exp_year) < mktime() ) {
> $errors[] = '<strong>ERROR</strong>: Credit card has expired.';
> }
173c185
<
---
>
219c231
<
---
>
223c235
<
---
>
251c263
<
---
>
287c299
<
---
>
292c304
<
---
>
299,301c311,313
< $product_id = strip_tags($_POST['product_id']);
< $product_name = strip_tags($_POST['product_name']);
< $file_name = strip_tags($_POST['file_name']);
---
> $product_id = get_magic_quotes_gpc() ? strip_tags($_POST['product_id']) : strip_tags(mysql_real_escape_string($_POST['product_id']));
> $product_name = get_magic_quotes_gpc() ? strip_tags($_POST['product_name']) : strip_tags(mysql_real_escape_string($_POST['product_name']));
> $file_name = get_magic_quotes_gpc() ? strip_tags($_POST['file_name']) : strip_tags(mysql_real_escape_string($_POST['file_name']));
303c315
< $file_name2 = strip_tags($_POST['file_name2']);
---
> $file_name2 = get_magic_quotes_gpc() ? strip_tags($_POST['file_name2']) : strip_tags(mysql_real_escape_string($_POST['file_name2']));
305c317
<
---
>
308c320
<
---
>
329,331c341
< // We need this for the fulfillment center
< $_SESSION['post_values']['order_type'] = $order_type;
<
---
>
333c343
<
---
>
347c357
<
---
>
351,353c361
< // We need this to send to the fulfillment center
< $_SESSION['post_values']['invoice_number'] = $invoice_number;
<
---
>
359c367
<
---
>
363c371
<
---
>
369c377
< "&EXPDATE=".$exp_month.$exp_year.
---
> "&EXPDATE=".$exp_month.$exp_year.
376c384
< "&STATE=".$state.
---
> "&STATE=".$state.
384c392
<
---
>
389c397
<
---
>
392,395c400,403
< "ACK" => "Success",
< "TRANSACTIONID" => "Test",
< "AVSCODE" => "Test",
< "CVV2MATCH" => "Test",
---
> "ACK" => "Success",
> "TRANSACTIONID" => "Test",
> "AVSCODE" => "Test",
> "CVV2MATCH" => "Test",
402c410
<
---
>
404c412
<
---
>
415c423
<
---
>
477c485
<
---
>
490c498
<
---
>
More information about the Kompare-devel
mailing list