dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge 1.4 => 1.5

Browse Source
This commit is contained in:
vSchoener
2011-11-03 10:07:19 +00:00
parent f197b7e0db
commit 4f93a293f5
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gcheckout/.htaccess
+4
View File
@@ -2,4 +2,8 @@
RewriteEngine on RewriteEngine on
RewriteCond %{HTTP:Authorization} ^(.*) RewriteCond %{HTTP:Authorization} ^(.*)
RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1] RewriteRule ^(.*) - [E=HTTP_AUTHORIZATION:%1]
RewriteBase /modules/gcheckout/library
RewriteCond %{HTTP:Authorization} !^$
RewriteRule validation.php validation.php?HTTP_AUTHORIZATION=%{HTTP:Authorization} [QSA,L]
</IfModule> </IfModule>
modules/gcheckout/library/googleitem.php
+2 -2
View File
@@ -63,8 +63,8 @@
function GoogleItem($name, $desc, $qty, $price, $item_weight='', $numeric_weight='') { function GoogleItem($name, $desc, $qty, $price, $item_weight='', $numeric_weight='') {
$this->item_name = $name; $this->item_name = $name;
$this->item_description= $desc; $this->item_description= $desc;
$this->unit_price = $price; $this->unit_price = (float)$price;
$this->quantity = $qty; $this->quantity = (int)$qty;
if($item_weight != '' && $numeric_weight !== '') { if($item_weight != '' && $numeric_weight !== '') {
switch(strtoupper($item_weight)){ switch(strtoupper($item_weight)){
modules/gcheckout/library/googleresponse.php
+8 -3
View File
@@ -71,12 +71,17 @@
* @param string $headers the headers from the request * @param string $headers the headers from the request
*/ */
function HttpAuthentication($headers=null, $die=true) { function HttpAuthentication($headers=null, $die=true) {
if(!is_null($headers)) { if (!is_null($headers))
$_SERVER = $headers; $_SERVER = $headers;
}
if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) { list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode(substr($_GET['HTTP_AUTHORIZATIOIZATION'], 6)));
if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
$compare_mer_id = $_SERVER['PHP_AUTH_USER']; $compare_mer_id = $_SERVER['PHP_AUTH_USER'];
$compare_mer_key = $_SERVER['PHP_AUTH_PW']; $compare_mer_key = $_SERVER['PHP_AUTH_PW'];
unset($_SERVER['PHP_AUTH_USER']);
unset($_SERVER['PHP_AUTH_PW']);
} }
// IIS Note:: For HTTP Authentication to work with IIS, // IIS Note:: For HTTP Authentication to work with IIS,
// the PHP directive cgi.rfc2616_headers must be set to 0 (the default value). // the PHP directive cgi.rfc2616_headers must be set to 0 (the default value).