FILE COMPARISON
Produced: 14/03/2006 14:30:54
Mode: Differences with Context
Left Side: CubeCart_3.0.9
Right Side: CubeCart_3.0.10
File: admin\includes\rte\editor\filemanager\browser\default\connectors\php\connector.php

22 | include('config.php') ; | = | 22 | include('config.php') ;
23 | include('util.php') ; |  | 23 | include('util.php') ;
24 | include('io.php') ; |  | 24 | include('io.php') ;
25 | include('basexml.php') ; |  | 25 | include('basexml.php') ;
26 | include('commands.php') ; |  | 26 | include('commands.php') ;
27 |  |  | 27 |
|  | <> | 28 | // Make sure admin session is present
|  |  | 29 | include("../../../../../../../../../includes/ini.inc.php");
|  |  | 30 | include("../../../../../../../../../includes/global.inc.php");
|  |  | 31 | require_once("../../../../../../../../../classes/db.inc.php");
|  |  | 32 | $db = new db();
|  |  | 33 | include("../../../../../../../../../includes/functions.inc.php");
|  |  | 34 | $config = fetchDbConfig("config");
|  |  | 35 |
|  |  | 36 | include_once("../../../../../../../../../language/".$config['defaultLang']."/lang.inc.php");
|  |  | 37 | $enableSSl = 1;
|  |  | 38 | include_once("../../../../../../../../../includes/sslSwitch.inc.php");
|  |  | 39 |
|  |  | 40 | include("../../../../../../../../includes/auth.inc.php");
|  |  | 41 |
28 | // Get the "UserFiles" path. | = | 42 | // Get the "UserFiles" path.
29 | $GLOBALS["UserFilesPath"] = '' ; |  | 43 | $GLOBALS["UserFilesPath"] = '' ;
30 | $GLOBALS["UserFilesPath"] = $Config['UserFilesPath']; |  | 44 | $GLOBALS["UserFilesPath"] = $Config['UserFilesPath'];
31 |  |  | 45 |
32 |  |  | 46 |
33 | // Map the "UserFiles" path to a local directory. |  | 47 | // Map the "UserFiles" path to a local directory.

File: includes\ini.inc.php

1 | <?php | = | 1 | <?php
2 | error_reporting(E_ALL ^ E_NOTICE); |  | 2 | error_reporting(E_ALL ^ E_NOTICE);
3 | @ini_set("display_errors", "1"); |  | 3 | @ini_set("display_errors", "1");
4 | @ini_set("arg_separator.output","&amp;"); |  | 4 | @ini_set("arg_separator.output","&amp;");
5 | $ini['ver'] = '3.0.9'; | <> | 5 | $ini['ver'] = '3.0.1 0';
6 | $ini['CCver'] = '30014'; |  | 6 | $ini['CCver'] = '30015';
7 | $sslPages = array("unsubscribe" => 1,"login" => 1,"logout" => 1,"forgotPass" => 1,"account" => 1,"profile" => 1,"changePass" => 1,"newsletter" => 1,"cart" => 1,"step1" => 1,"step2" => 1,"step3" => 1,"step4" => 1,"step5" => 1,"reg" => 1,"viewOrders" => 1,"viewOrder" => 1,"confirmed" => 1); | = | 7 | $sslPages = array("unsubscribe" => 1,"login" => 1,"logout" => 1,"forgotPass" => 1,"account" => 1,"profile" => 1,"changePass" => 1,"newsletter" => 1,"cart" => 1,"step1" => 1,"step2" => 1,"step3" => 1,"step4" => 1,"step5" => 1,"reg" => 1,"viewOrders" => 1,"viewOrder" => 1,"confirmed" => 1);
8 | ?> |  | 8 | ?>

File: modules\gateway\DirectPayment\form.inc.php

119 | $shippingTotal =& Services_PayPal::getType('BasicAmountType'); | = | 119 | $shippingTotal =& Services_PayPal::getType('BasicAmountType');
120 | $shippingTotal->setval(number_format($shippingAmount, 2)); |  | 120 | $shippingTotal->setval(number_format($shippingAmount, 2));
121 | $shippingTotal->setattr('currencyID', $currencyID); // USD |  | 121 | $shippingTotal->setattr('currencyID', $currencyID); // USD
122 | $pdt->setShippingTotal($shippingTotal); |  | 122 | $pdt->setShippingTotal($shippingTotal);
123 | } |  | 123 | }
124 |  |  | 124 |
|  | <> | 125 | // START - adding info for shipping address
|  |  | 126 | $shipAddress =& Services_PayPal::getType('AddressType');
|  |  | 127 | $shipAddress->setName($basket['delInf']['firstName']."
|  |  | 128 | ".$basket['delInf']['lastName']);
|  |  | 129 | $shipAddress->setStreet1($basket['delInf']['add_1']);
|  |  | 130 | $shipAddress->setStreet2($basket['delInf']['add_2']);
|  |  | 131 | $shipAddress->setCityName($basket['delInf']['town']);
|  |  | 132 | $shipAddress->setStateOrProvince($basket['delInf']['county']);
|  |  | 133 | $shipAddress->setCountry(countryIso($basket['delInf']['country']));
|  |  | 134 | $shipAddress->setPostalCode($basket['delInf']['postcode']);
|  |  | 135 | $pdt->setShipToAddress($shipAddress);
|  |  | 136 | // END - adding info for shipping address
|  |  | 137 |
125 | //$pdt->setOrderDescription($productName); | = | 138 | //$pdt->setOrderDescription($productName);
126 | $pdt->setInvoiceID($orderID); |  | 139 | $pdt->setInvoiceID($orderID);
127 |  |  | 140 |
128 | $details =& Services_PayPal::getType('DoDirectPaymentRequestDetailsType'); |  | 141 | $details =& Services_PayPal::getType('DoDirectPaymentRequestDetailsType');
129 | $details->setPaymentAction("Sale"); |  | 142 | $details->setPaymentAction("Sale");
130 | $details->setPaymentDetails($pdt); |  | 143 | $details->setPaymentDetails($pdt);

File: modules\gateway\PayJunction\transfer.inc.php

81 | $basket['grandTotal'] - Basket total which has to be paid (inc Tax and Shipping). | = | 81 | $basket['grandTotal'] - Basket total which has to be paid (inc Tax and Shipping).
82 | $basket['tax'] - Total tax to pay |  | 82 | $basket['tax'] - Total tax to pay
83 | $basket['shipCost'] - Shipping price |  | 83 | $basket['shipCost'] - Shipping price
84 | //////////////////////////////////////////////////////// |  | 84 | ////////////////////////////////////////////////////////
85 | */ |  | 85 | */
86 |  |  | 86 |
87 | $module = fetchDbConfig("e Way"); | <> | 87 | $module = fetchDbConfig("PayJunction");
88 |  | = | 88 |
89 | function repeatVars(){ |  | 89 | function repeatVars(){
90 |  |  | 90 |
91 | return FALSE; |  | 91 | return FALSE;
92 |  |  | 92 |
93 | } |  | 93 | }

File: extra\prodImages.php

41 | // get session data |  | 41 | // get session data
|  | -+ | 42 | include_once("../includes/sessionStart.inc.php");
42 | include_once("../includes/session.inc.php"); | = | 43 | include_once("../includes/session.inc.php");
43 |  |  | 44 |
44 | $lang_folder = ""; |  | 45 | $lang_folder = "";