From 890cff53148ab30bb477939e9ca45c4e40fa96ba Mon Sep 17 00:00:00 2001
From: koldoa <koldo@aingeru.com>
Date: Mon, 17 Aug 2015 16:27:37 +0200
Subject: [PATCH] New key type for aastra devices

---
 app/devices/app_languages.php | 26 ++++++++++++++++++++++++++
 app/devices/device_edit.php   |  7 ++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index caa5dc1b5c..97e94503b8 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -1689,6 +1689,32 @@ $text['label-blf']['de-at'] = "BLF";
 $text['label-blf']['ar-eg'] = "";
 $text['label-blf']['he'] = "";
 
+$text['label-callers']['en-us'] = "Callers";
+$text['label-callers']['es-cl'] = "Llaamadas";
+$text['label-callers']['pt-pt'] = "";
+$text['label-callers']['fr-fr'] = "";
+$text['label-callers']['pt-br'] = "";
+$text['label-callers']['pl'] = "BLF Xfer ";
+$text['label-callers']['uk'] = "";
+$text['label-callers']['sv-se'] = "";
+$text['label-callers']['ro'] = "";
+$text['label-callers']['de-at'] = "";
+$text['label-callers']['ar-eg'] = "";
+$text['label-callers']['he'] = "";
+
+$text['label-xfer']['en-us'] = "Xfer";
+$text['label-xfer']['es-cl'] = "Xfer";
+$text['label-xfer']['pt-pt'] = "";
+$text['label-xfer']['fr-fr'] = "";
+$text['label-xfer']['pt-br'] = "";
+$text['label-xfer']['pl'] = "Xfer ";
+$text['label-xfer']['uk'] = "";
+$text['label-xfer']['sv-se'] = "";
+$text['label-xfer']['ro'] = "";
+$text['label-xfer']['de-at'] = "";
+$text['label-xfer']['ar-eg'] = "";
+$text['label-xfer']['he'] = "";
+
 $text['label-automata']['en-us'] = "automata";
 $text['label-automata']['es-cl'] = "automata";
 $text['label-automata']['pt-pt'] = "automata";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 7b363d6013..f484d7494a 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -880,16 +880,21 @@ require_once "resources/require.php";
 				if (strtolower($device_vendor) == "aastra" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
 					echo "<optgroup label='Aastra'>";
 					?>
-					<option value='blf' <?php if ($row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
+<option value='blf' <?php if ($row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
 					<option value='blfxfer' <?php if ($row['device_key_type'] == "blfxfer") { echo $selected;$found=true; } ?>><?php echo $text['label-blf_xfer'] ?></option>
+					<option value='callers' <?php if ($row['device_key_type'] == "callers") { echo $selected;$found=true; } ?>><?php echo $text['label-callers'] ?></option>
+
 					<option value='dnd' <?php if ($row['device_key_type'] == "dnd") { echo $selected;$found=true; } ?>><?php echo $text['label-dnd'] ?></option>
 					<option value='speeddial' <?php if ($row['device_key_type'] == "speeddial") { echo $selected;$found=true; } ?>><?php echo $text['label-speed_dial'] ?></option>
+					<option value='xfer' <?php if ($row['device_key_type'] == "xfer") { echo $selected;$found=true; } ?>><?php echo $text['label-xfer'] ?></option>
+
 					<?php
 					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
 				}
 				if (strtolower($device_vendor) == "cisco" || strlen($device_vendor) == 0 || strlen($device_username) > 0) {
 					echo "<optgroup label='Cisco'>";
 					?>
+					<option value='blf' <?php if ($row['device_key_type'] == "blf") { echo $selected;$found=true; } ?>><?php echo $text['label-blf'] ?></option>
 					<option value='line' <?php if ($row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
 					<option value='disabled' <?php if ($row['device_key_type'] == "disabled") { echo $selected;$found=true; } ?>><?php echo $text['label-disabled'] ?></option>
 					<?php