Merge pull request #1 from jayhybrid/minor-changes-in-wording-and-code

Minor changes in wording and code

Author: php-schubser

new_files/interface/fs_cleverreach_interface.php

@@ -1,17 +1,17 @@
 <?php
 
-require_once('fs_cleverreach_interface_rest_client.php');
-require("../includes/application_top_export.php");
-require("../inc/xtc_not_null.inc.php");
-require("../inc/xtc_get_country_name.inc.php");
+require_once 'fs_cleverreach_interface_rest_client.php';
+require '../includes/application_top_export.php';
+require '../inc/xtc_not_null.inc.php';
+require '../inc/xtc_get_country_name.inc.php';
 
-if(!defined('MODULE_FS_CLEVERREACH_INTERFACE_STATUS') || MODULE_FS_CLEVERREACH_INTERFACE_STATUS != 'true') 
+if(!defined('MODULE_FS_CLEVERREACH_INTERFACE_STATUS') || MODULE_FS_CLEVERREACH_INTERFACE_STATUS != 'true')
 {
 	header('Location: ' . preg_replace("/[\r\n]+(.*)$/i", "", html_entity_decode($_SERVER['HTTP_REFERER'])));
 	exit();
 }
 
-if(!defined('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID') || !defined('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME') || !defined('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD')) 
+if(!defined('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID') || !defined('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME') || !defined('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD'))
 {
 	header('Location: ' . preg_replace("/[\r\n]+(.*)$/i", "", html_entity_decode($_SERVER['HTTP_REFERER'])));
 	exit();
@@ -51,9 +51,9 @@
 
 	$manual_registered_customers = xtc_db_query("SELECT
 										customers_id,
-										customers_email_address as email, 
+										customers_email_address as email,
 										date_added as registered,
-										customers_firstname as firstname, 
+										customers_firstname as firstname,
 										customers_lastname as lastname
 									FROM " . TABLE_NEWSLETTER_RECIPIENTS . " WHERE mail_status = '1' ");
 
@@ -113,9 +113,9 @@
 	}
 	$order_rows = xtc_db_query("SELECT DISTINCT o.orders_id, o.customers_id, o.customers_email_address as email, o.customers_firstname as firstname, o.customers_lastname as lastname, o.customers_gender as gender, o.customers_street_address as street, o.customers_city as city, o.customers_postcode as zip, o.customers_country as country, o.date_purchased, op.products_id, op.products_name, op.products_price, op.products_quantity from " . TABLE_ORDERS . " o JOIN " . TABLE_ORDERS_PRODUCTS . " op ON o.orders_id = op.orders_id GROUP BY o.customers_id ORDER BY o.date_purchased ");
 	while ($order_row = xtc_db_fetch_array($order_rows)) {
-		
+
 		$orders = array();
-		
+
 		$orders[] = array(
 				"order_id"   => $order_row["orders_id"],      //required
 				"product_id" => $order_row["products_id"],    //optional
@@ -125,7 +125,7 @@
 				"amount"     => $order_row["products_quantity"], //optional
 				"source"     => STORE_NAME          //optional
 			);
-		
+
 		$flagged_customers = xtc_db_query("	SELECT c.customers_date_added as registered, c.customers_gender as gender, c.customers_dob as dob FROM " . TABLE_CUSTOMERS . " c WHERE c.customers_id = '" . $order_row["customers_id"] . "' " . $where_clause);
 		$receivers = array('postdata' =>  array());
 
@@ -153,7 +153,7 @@
 				if ($update_receivers) {
 					$rest->delete("/groups.json/".$group_id."/receivers/".$order_row["email"]);
 				}
-				
+
 				if (count($receivers) > 1000) {
 					$rest->post("/groups.json/".$group_id."/receivers", $receivers);
 					$receivers = array();

new_files/lang/english/modules/system/fs_cleverreach_interface.php

@@ -1,20 +1,20 @@
 <?php
-define('MODULE_FS_CLEVERREACH_INTERFACE_TITLE', 'Cleverreach Interface © by © by <a href="https://www.shopbetreuung.com/" target="_blank" style="color: #007bff; font-size:12px; font-weight: bold;">FishnetServices</a>');
-define('MODULE_FS_CLEVERREACH_INTERFACE_LONG_DESCRIPTION', 'This module adds an interface to the newsletter provider <a href="http://www.cleverreach.com/?rk=xcetomni" target="_blank"><strong>Cleverreach</strong></a>. You can then enter your data in the admin under "Additional modules". The export to ONE customer group is possible');
-define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_TITLE', 'Modul active?');
+define('MODULE_FS_CLEVERREACH_INTERFACE_TITLE', 'CleverReach Interface © by <a href="https://www.shopbetreuung.com/" target="_blank" style="color: #007bff; font-size: inherit; font-weight: inherit;">FishnetServices</a>');
+define('MODULE_FS_CLEVERREACH_INTERFACE_LONG_DESCRIPTION', 'This module adds an interface to the newsletter provider <a href="http://www.cleverreach.com/?rk=xcetomni" target="_blank"><strong>CleverReach</strong></a>. You can then enter your data in the admin area under <strong>Modules</strong> -> <strong>System Modules</strong>. It\'s possible to export to one customer group.');
+define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_TITLE', 'Modul enabled');
 define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_DESC', 'Modul status');
 
-define('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID_TITLE', 'Cleverreach Client ID');
+define('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID_TITLE', 'CleverReach client ID');
 define('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME_TITLE', 'Cleverreach Username');
+define('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME_TITLE', 'CleverReach username');
 define('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD_TITLE', 'Cleverreach Password');
+define('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD_TITLE', 'CleverReach password');
 define('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS_TITLE', 'Cleverreach Import newsletter subscribers');
+define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS_TITLE', 'CleverReach import newsletter subscribers');
 define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_TITLE', 'Cleverreach Import buyers');
+define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_TITLE', 'CleverReach import buyers');
 define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_TITLE', 'Cleverreach Group ID');
+define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_TITLE', 'CleverReach Group ID');
 define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_DESC', '');
 
 define('BUTTON_EXPORT_FILTER_AMAZON', 'Filter Amazon customers');

new_files/lang/german/modules/system/fs_cleverreach_interface.php

@@ -1,23 +1,21 @@
 <?php
-define('MODULE_FS_CLEVERREACH_INTERFACE_TITLE', 'Cleverreach Interface © by <a href="https://www.shopbetreuung.com/" target="_blank" style="color: #007bff; font-size:12px; font-weight: bold;">FishnetServices</a>');
-define('MODULE_FS_CLEVERREACH_INTERFACE_LONG_DESCRIPTION', 'Dieses Modul f&uuml;gt eine Schnittstelle zum Newsletteranbieter <a href="http://www.cleverreach.de/?rk=xcetomni" target="_blank"><strong>Cleverreach</strong></a>  hinzu. Im Admin k&ouml;nnen Sie dann unter "Zusatzmodule" Ihre Daten eintragen. Es ist der Export in EINE Kundengruppe m&oouml;glich.');
+define('MODULE_FS_CLEVERREACH_INTERFACE_TITLE', 'CleverReach Interface © by <a href="https://www.shopbetreuung.com/" target="_blank" style="color: #007bff; font-size: inherit; font-weight: inherit;">FishnetServices</a>');
+define('MODULE_FS_CLEVERREACH_INTERFACE_LONG_DESCRIPTION', 'Dieses Modul f&uuml;gt eine Schnittstelle zum Newsletteranbieter <a href="http://www.cleverreach.de/?rk=xcetomni" target="_blank"><strong>CleverReach</strong></a> hinzu. Im Admin k&ouml;nnen Sie dann unter <strong>Module</strong> -> <strong>System Module</strong> Ihre Daten eintragen. Es ist der Export in eine Kundengruppe m&oouml;glich.');
 define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_TITLE', 'Modul aktivieren?');
 define('MODULE_FS_CLEVERREACH_INTERFACE_STATUS_DESC', 'Modul status');
 
-
-
-define('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID_TITLE', 'Cleverreach Client ID');
+define('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID_TITLE', 'CleverReach Client ID');
 define('MODULE_FS_CLEVERREACH_INTERFACE_CLIENT_ID_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME_TITLE', 'Cleverreach Username');
+define('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME_TITLE', 'CleverReach Benutzername');
 define('MODULE_FS_CLEVERREACH_INTERFACE_USERNAME_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD_TITLE', 'Cleverreach Password');
+define('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD_TITLE', 'CleverReach Passwort');
 define('MODULE_FS_CLEVERREACH_INTERFACE_PASSWORD_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS_TITLE', 'Cleverreach Importiere Newsletterabonnenten');
+define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS_TITLE', 'CleverReach importiere Newsletterabonnenten');
 define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_SUBSCRIBERS_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_TITLE', 'Cleverreach Importiere K&auml;ufer');
+define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_TITLE', 'CleverReach importiere K&auml;ufer');
 define('MODULE_FS_CLEVERREACH_INTERFACE_IMPORT_BUYERS_DESC', '');
-define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_TITLE', 'Cleverreach Gruppen-ID');
+define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_TITLE', 'CleverReach Gruppen-ID');
 define('MODULE_FS_CLEVERREACH_INTERFACE_GROUP_ID_DESC', '');
 
 define('BUTTON_EXPORT_FILTER_AMAZON', 'Amazon Kunden ausfiltern');
-define('BUTTON_UPDATE_RECEIVERS', 'Update Empf&auml;ger');
+define('BUTTON_UPDATE_RECEIVERS', 'Update Empf&auml;ger');