Forums / General Questions / xss fix vs google checkout - how do I do this?

xss fix vs google checkout - how do I do this?

Locked

Views: 2,018

Results 1 to 1 of 1
This thread is locked. New replies are disabled.
5 Jul 2007, 4:04 PM
#1
fats1964 avatar

fats1964

New Zenner

Join Date:
Jan 2007
Posts:
34
Plugin Contributions:
0

xss fix vs google checkout - how do I do this?

hi
i am tryi ng to use winmerge to do changes for the fix but winmerge is showing something (google) on orders php i dont want to lose

"// ** GOOGLE CHECKOUT **
           chdir("./..");
           require_once(DIR_WS_LANGUAGES . $_SESSION['language'] . '/modules/payment/googlecheckout.php');
           $payment_value= MODULE_PAYMENT_GOOGLECHECKOUT_TEXT_TITLE;
           $result = $db->Execute("select google_order_number from google_orders where orders_id= ". (int)$oID);
           $num_rows = $result->RecordCount();
       if($num_rows == 0) {
   //send emails, not a google order
         $message = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" .
         EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n\n" .
         EMAIL_TEXT_INVOICE_URL . ' ' . zen_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') . "\n\n" .
         EMAIL_TEXT_DATE_ORDERED . ' ' . zen_date_long($check_status->fields['date_purchased']) . "\n\n" .
         strip_tags($notify_comments) .
         EMAIL_TEXT_STATUS_UPDATED . sprintf(EMAIL_TEXT_STATUS_LABEL, $orders_status_array[$status] ) .
         EMAIL_TEXT_STATUS_PLEASE_REPLY;
   
         $html_msg['EMAIL_CUSTOMERS_NAME']    = $check_status->fields['customers_name'];
         $html_msg['EMAIL_TEXT_ORDER_NUMBER'] = EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID;
         $html_msg['EMAIL_TEXT_INVOICE_URL']  = '<a href="' . zen_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') .'">'.str_replace(':','',EMAIL_TEXT_INVOICE_URL).'</a>';
         $html_msg['EMAIL_TEXT_DATE_ORDERED'] = EMAIL_TEXT_DATE_ORDERED . ' ' . zen_date_long($check_status->fields['date_purchased']);
         $html_msg['EMAIL_TEXT_STATUS_COMMENTS'] = nl2br($notify_comments);
         $html_msg['EMAIL_TEXT_STATUS_UPDATED'] = str_replace('\n','', EMAIL_TEXT_STATUS_UPDATED);
         $html_msg['EMAIL_TEXT_STATUS_LABEL'] = str_replace('\n','', sprintf(EMAIL_TEXT_STATUS_LABEL, $orders_status_array[$status] ));
         $html_msg['EMAIL_TEXT_NEW_STATUS'] = $orders_status_array[$status];
         $html_msg['EMAIL_TEXT_STATUS_PLEASE_REPLY'] = str_replace('\n','', EMAIL_TEXT_STATUS_PLEASE_REPLY);

            zen_mail($check_status->fields['customers_name'], $check_status->fields['customers_email_address'], EMAIL_TEXT_SUBJECT . ' #' . $oID, $message, STORE_NAME, EMAIL_FROM, $html_msg, 'order_status');

            $customer_notified = '1';
//send extra emails
            if (SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO_STATUS == '1' and SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO != '') {
              zen_mail('', SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO, SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO_SUBJECT . ' ' . EMAIL_TEXT_SUBJECT . ' #' . $oID, $message, STORE_NAME, EMAIL_FROM, $html_msg, 'order_status_extra');
            }
          }
         else {
//         is a google order
          if (!isset($_POST['notify_comments']) || ($_POST['notify_comments'] != 'on')){
            unset($notify_comments);
          }
          else {
           $customer_notified = '1';
          }
         
          google_checkout_state_change($check_status, $status, $oID, $customer_notified, $notify_comments);
         }
       }
// ** END GOOGLE CHECKOUT **"

to replace with

"
//send emails
     $message = STORE_NAME . "\n" . EMAIL_SEPARATOR . "\n" .
     EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID . "\n\n" .
     EMAIL_TEXT_INVOICE_URL . ' ' . zen_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') . "\n\n" .
     EMAIL_TEXT_DATE_ORDERED . ' ' . zen_date_long($check_status->fields['date_purchased']) . "\n\n" .
     strip_tags($notify_comments) .
     EMAIL_TEXT_STATUS_UPDATED . sprintf(EMAIL_TEXT_STATUS_LABEL, $orders_status_array[$status] ) .
     EMAIL_TEXT_STATUS_PLEASE_REPLY;
     $html_msg['EMAIL_CUSTOMERS_NAME']    = $check_status->fields['customers_name'];
     $html_msg['EMAIL_TEXT_ORDER_NUMBER'] = EMAIL_TEXT_ORDER_NUMBER . ' ' . $oID;
     $html_msg['EMAIL_TEXT_INVOICE_URL']  = '<a href="' . zen_catalog_href_link(FILENAME_CATALOG_ACCOUNT_HISTORY_INFO, 'order_id=' . $oID, 'SSL') .'">'.str_replace(':','',EMAIL_TEXT_INVOICE_URL).'</a>';
     $html_msg['EMAIL_TEXT_DATE_ORDERED'] = EMAIL_TEXT_DATE_ORDERED . ' ' . zen_date_long($check_status->fields['date_purchased']);
     $html_msg['EMAIL_TEXT_STATUS_COMMENTS'] = nl2br($notify_comments);
     $html_msg['EMAIL_TEXT_STATUS_UPDATED'] = str_replace('\n','', EMAIL_TEXT_STATUS_UPDATED);
     $html_msg['EMAIL_TEXT_STATUS_LABEL'] = str_replace('\n','', sprintf(EMAIL_TEXT_STATUS_LABEL, $orders_status_array[$status] ));
     $html_msg['EMAIL_TEXT_NEW_STATUS'] = $orders_status_array[$status];
     $html_msg['EMAIL_TEXT_STATUS_PLEASE_REPLY'] = str_replace('\n','', EMAIL_TEXT_STATUS_PLEASE_REPLY);
           zen_mail($check_status->fields['customers_name'], $check_status->fields['customers_email_address'], EMAIL_TEXT_SUBJECT . ' #' . $oID, $message, STORE_NAME, EMAIL_FROM, $html_msg, 'order_status');
           $customer_notified = '1';
//send extra emails
           if (SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO_STATUS == '1' and SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO != '') {
             zen_mail('', SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO, SEND_EXTRA_ORDERS_STATUS_ADMIN_EMAILS_TO_SUBJECT . ' ' . EMAIL_TEXT_SUBJECT . ' #' . $oID, $message, STORE_NAME, EMAIL_FROM, $html_msg, 'order_status_extra');
           }
         }









"

i am not sure what to do any ideas?