Merge branch 'master' into Events-feature

geometr · Jul 17, 2014 · 4aee797 · 4aee797
2 parents 404e3cb + 46f466d
commit 4aee797
Show file tree

Hide file tree

Showing 77 changed files with 150 additions and 187 deletions.
diff --git a/upload/admin/controller/catalog/attribute.php b/upload/admin/controller/catalog/attribute.php
@@ -423,7 +423,7 @@ public function autocomplete() {
 
  array_multisort($sort_order, SORT_ASC, $json);
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/catalog/category.php b/upload/admin/controller/catalog/category.php
@@ -582,7 +582,7 @@ public function autocomplete() {
 
  array_multisort($sort_order, SORT_ASC, $json);
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/catalog/download.php b/upload/admin/controller/catalog/download.php
@@ -498,7 +498,7 @@ public function upload() {
  $json['success'] = $this->language->get('text_upload');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -532,7 +532,7 @@ public function autocomplete() {
 
  array_multisort($sort_order, SORT_ASC, $json);
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/catalog/filter.php b/upload/admin/controller/catalog/filter.php
@@ -425,7 +425,7 @@ public function autocomplete() {
 
  array_multisort($sort_order, SORT_ASC, $json);
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/catalog/manufacturer.php b/upload/admin/controller/catalog/manufacturer.php
@@ -452,7 +452,7 @@ public function autocomplete() {
 
  array_multisort($sort_order, SORT_ASC, $json);
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/catalog/option.php b/upload/admin/controller/catalog/option.php
@@ -535,7 +535,7 @@ public function autocomplete() {
 
  array_multisort($sort_order, SORT_ASC, $json);
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/catalog/product.php b/upload/admin/controller/catalog/product.php
@@ -1434,7 +1434,7 @@ public function autocomplete() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/common/dashboard.php b/upload/admin/controller/common/dashboard.php
@@ -261,7 +261,7 @@ public function sale() {
  break;
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -285,7 +285,7 @@ public function online() {
  $json['xaxis'][] = array($time, date('H:i', $time));
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/common/filemanager.php b/upload/admin/controller/common/filemanager.php
@@ -299,7 +299,7 @@ public function upload() {
  $json['success'] = $this->language->get('text_uploaded');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -346,7 +346,7 @@ public function folder() {
  $json['success'] = $this->language->get('text_directory');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -428,7 +428,7 @@ public function delete() {
  $json['success'] = $this->language->get('text_delete');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/extension/installer.php b/upload/admin/controller/extension/installer.php
@@ -208,7 +208,7 @@ public function upload() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -243,7 +243,7 @@ public function unzip() {
  unlink($file);
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -327,7 +327,7 @@ public function ftp() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -372,7 +372,7 @@ public function sql() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -450,7 +450,7 @@ public function xml() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -477,7 +477,7 @@ public function php() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -533,7 +533,7 @@ public function remove() {
  $json['success'] = $this->language->get('text_success');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -587,7 +587,7 @@ public function clear() {
  $json['success'] = $this->language->get('text_clear');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/marketing/affiliate.php b/upload/admin/controller/marketing/affiliate.php
@@ -1029,7 +1029,7 @@ public function country() {
  );
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -1131,7 +1131,7 @@ public function autocomplete() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($affiliate_data));
  }
 }
diff --git a/upload/admin/controller/marketing/contact.php b/upload/admin/controller/marketing/contact.php
@@ -245,7 +245,7 @@ public function send() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 }
diff --git a/upload/admin/controller/payment/amazon_checkout.php b/upload/admin/controller/payment/amazon_checkout.php
@@ -335,7 +335,7 @@ public function uploadOrderAdjustment() {
  }
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 

diff --git a/upload/admin/controller/payment/bluepay_hosted_form.php b/upload/admin/controller/payment/bluepay_hosted_form.php
@@ -291,7 +291,7 @@ public function void() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -346,7 +346,7 @@ public function release() {
  $json['msg'] = $this->language->get('error_data_missing');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -403,7 +403,7 @@ public function rebate() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -428,7 +428,7 @@ protected function validate() {
  }
 
  public function callback() {
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($this->request->get));
  }
 

diff --git a/upload/admin/controller/payment/bluepay_redirect.php b/upload/admin/controller/payment/bluepay_redirect.php
@@ -267,7 +267,7 @@ public function void() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -322,7 +322,7 @@ public function release() {
  $json['msg'] = $this->language->get('error_data_missing');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -379,7 +379,7 @@ public function rebate() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -400,7 +400,7 @@ protected function validate() {
  }
 
  public function callback() {
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($this->request->get));
  }
 

diff --git a/upload/admin/controller/payment/firstdata_remote.php b/upload/admin/controller/payment/firstdata_remote.php
@@ -372,7 +372,7 @@ public function void() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -423,7 +423,7 @@ public function capture() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -480,7 +480,7 @@ public function refund() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 

diff --git a/upload/admin/controller/payment/pp_express.php b/upload/admin/controller/payment/pp_express.php
@@ -236,18 +236,6 @@ public function index() {
  $data['pp_express_logo'] = $this->config->get('pp_express_logo');
  }
 
- if (isset($this->request->post['pp_express_border_colour'])) {
- $data['pp_express_border_colour'] = str_replace('#', '', $this->request->post['pp_express_border_colour'] );
- } else {
- $data['pp_express_border_colour'] = $this->config->get('pp_express_border_colour');
- }
-
- if (isset($this->request->post['pp_express_header_colour'])) {
- $data['pp_express_header_colour'] = str_replace('#', '', $this->request->post['pp_express_header_colour'] );
- } else {
- $data['pp_express_header_colour'] = $this->config->get('pp_express_header_colour');
- }
-
  if (isset($this->request->post['pp_express_page_colour'])) {
  $data['pp_express_page_colour'] = str_replace('#', '', $this->request->post['pp_express_page_colour'] );
  } else {
@@ -400,7 +388,7 @@ public function resend() {
  $json['error'] = $this->language->get('error_data');
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -520,7 +508,7 @@ public function capture() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -573,7 +561,7 @@ public function void() {
  $json['msg'] = 'Missing data';
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($json));
  }
 
@@ -1002,12 +990,12 @@ public function doSearch() {
  $response['error_msg'] = $result['L_LONGMESSAGE0'];
  }
 
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($response));
  } else {
  $response['error'] = true;
  $response['error_msg'] = 'Enter a start date';
- $this->response->setContentType('Content-Type: application/json');
+ $this->response->addHeader('Content-Type: application/json');
  $this->response->setOutput(json_encode($response));
  }
  }