From 7866b847aa3fa7ea93e176d2b9a46d6c82ce6fa1 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 20 Sep 2013 15:11:32 -0400
Subject: [PATCH] - Replace gender with correct salutation in client messaging.
---
interface/web/client/lib/lang/de_client_message.lng | 2 ++
interface/web/client/lib/lang/en_client_message.lng | 2 ++
interface/web/client/client_message.php | 21 ++++++++++++++++-----
interface/lib/lang/en.lng | 2 ++
interface/lib/lang/de.lng | 2 ++
5 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index dfe2a43..8a1a971 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -134,4 +134,6 @@
$wb['no_domain_perm'] = 'Sie haben keine Berechtigung für diese Domain.';
$wb['no_destination_perm'] = 'Sie haben keine Berechtigung für dieses Ziel.';
$wb['client_you_are_locked'] = 'Sie haben keine Berechtigung, Einstellungen zu verändern.';
+$wb['gender_m_txt'] = 'Herr';
+$wb['gender_f_txt'] = 'Frau';
?>
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 22cd5ae..1d689f0 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -136,4 +136,6 @@
$wb["no_domain_perm"] = 'You have no permission for this domain.';
$wb["no_destination_perm"] = 'You have no permission for this destination.';
$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
+$wb['gender_m_txt'] = 'Mr.';
+$wb['gender_f_txt'] = 'Ms.';
?>
diff --git a/interface/web/client/client_message.php b/interface/web/client/client_message.php
index fc9de0b..73c43bb 100644
--- a/interface/web/client/client_message.php
+++ b/interface/web/client/client_message.php
@@ -91,10 +91,15 @@
//* Parse client details into message
$message = $_POST['message'];
foreach($client as $key => $val) {
- if($key != 'password'){
- $message = str_replace('{'.$key.'}', $val, $message);
- } else {
- $message = str_replace('{'.$key.'}', '---', $message);
+ switch ($key) {
+ case 'password':
+ $message = str_replace('{'.$key.'}', '---', $message);
+ break;
+ case 'gender':
+ $message = str_replace('{salutation}', $wb['gender_'.$val.'_txt'], $message);
+ break;
+ default:
+ $message = str_replace('{'.$key.'}', $val, $message);
}
}
@@ -145,7 +150,13 @@
$field_names = $app->db->queryAllRecords($sql);
if(!empty($field_names) && is_array($field_names)){
foreach($field_names as $field_name){
- if($field_name['Field'] != '') $message_variables .= '<a href="javascript:void(0);" class="addPlaceholder">{'.$field_name['Field'].'}</a> ';
+ if($field_name['Field'] != ''){
+ if($field_name['Field'] == 'gender'){
+ $message_variables .= '<a href="javascript:void(0);" class="addPlaceholder">{salutation}</a> ';
+ } else {
+ $message_variables .= '<a href="javascript:void(0);" class="addPlaceholder">{'.$field_name['Field'].'}</a> ';
+ }
+ }
}
}
$app->tpl->setVar('message_variables',trim($message_variables));
diff --git a/interface/web/client/lib/lang/de_client_message.lng b/interface/web/client/lib/lang/de_client_message.lng
index f4def30..1538136 100644
--- a/interface/web/client/lib/lang/de_client_message.lng
+++ b/interface/web/client/lib/lang/de_client_message.lng
@@ -15,4 +15,6 @@
$wb['all_clients_resellers_txt'] = 'Alle Kunden und Reseller';
$wb['all_clients_txt'] = 'Alle Kunden';
$wb['variables_txt'] = 'Variablen:';
+$wb['gender_m_txt'] = 'Herr';
+$wb['gender_f_txt'] = 'Frau';
?>
diff --git a/interface/web/client/lib/lang/en_client_message.lng b/interface/web/client/lib/lang/en_client_message.lng
index ab37d76..c04bd6c 100644
--- a/interface/web/client/lib/lang/en_client_message.lng
+++ b/interface/web/client/lib/lang/en_client_message.lng
@@ -15,4 +15,6 @@
$wb["all_clients_resellers_txt"] = 'All clients and resellers';
$wb["all_clients_txt"] = 'All clients';
$wb["variables_txt"] = 'Variables:';
+$wb['gender_m_txt'] = 'Mr.';
+$wb['gender_f_txt'] = 'Ms.';
?>
--
Gitblit v1.9.1