Merge pull request #29 from Peardian/setstore

Service URL Override

Author: carl689

amazon-config.default.php

@@ -21,6 +21,7 @@
 $store['YourAmazonStore']['marketplaceId'] = ''; //Marketplace ID for this store
 $store['YourAmazonStore']['keyId'] = ''; //Access Key ID
 $store['YourAmazonStore']['secretKey'] = ''; //Secret Access Key for this store
+$store['YourAmazonStore']['serviceUrl'] = ''; //optional override for Service URL
 
 //Service URL Base
 //Current setting is United States

includes/classes/AmazonCore.php

@@ -361,8 +361,9 @@ public function setConfig($path){
             include($path);
             $this->config = $path;
             $this->setLogPath($logpath);
-            if (isset($AMAZON_SERVICE_URL))
-            $this->urlbase = $AMAZON_SERVICE_URL;
+            if (isset($AMAZON_SERVICE_URL)) {
+                $this->urlbase = $AMAZON_SERVICE_URL;
+            }
         } else {
             throw new Exception("Config file does not exist or cannot be read! ($path)");
         }
@@ -427,6 +428,9 @@ public function setStore($s=null){
             if(!array_key_exists('secretKey', $store[$s])){
                 $this->log("Secret Key is missing!",'Warning');
             }
+            if (!empty($store[$s]['serviceUrl'])) {
+                $this->urlbase = $store[$s]['serviceUrl'];
+            }
 
         } else {
             $this->log("Store $s does not exist!",'Warning');

nbproject/project.properties

@@ -6,12 +6,9 @@ auxiliary.org-netbeans-modules-php-phpunit.customSuite_2e_path=
 auxiliary.org-netbeans-modules-php-phpunit.phpUnit_2e_path=
 auxiliary.org-netbeans-modules-php-phpunit.test_2e_groups_2e_ask=false
 auxiliary.org-netbeans-modules-php-phpunit.test_2e_run_2e_all=false
-file.reference.athena-includes=../../includes
-file.reference.athena-includes-1=../../../includes
 ignore.path=
 include.path=\
-    ${php.global.include.path}:\
-    ${file.reference.athena-includes-1}
+    ${php.global.include.path}
 php.version=PHP_54
 source.encoding=UTF-8
 src.dir=.