aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2019-01-04 15:30:01 -0800
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2019-01-04 15:30:01 -0800
commit93a00391140f342d8a86c5b4c07c28b46f5e49fa (patch)
tree4e2fcbb0fba5054d2766ce6a293cd3ae52325f49
parent08b9ee7415cbe9a029d2c2256d8d38bc6292fadf (diff)
downloadasterisk-aastra-93a00391140f342d8a86c5b4c07c28b46f5e49fa.tar.gz
Aastra classes: let 6739i use icons
It is supported in the phone, so don't let the classes forbid it. Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--include/AastraIPPhone.php1
-rw-r--r--include/TextScreen.class.php8
2 files changed, 8 insertions, 1 deletions
diff --git a/include/AastraIPPhone.php b/include/AastraIPPhone.php
index bf632d2..bff45f4 100644
--- a/include/AastraIPPhone.php
+++ b/include/AastraIPPhone.php
@@ -519,6 +519,7 @@ switch($header['model'])
case 'Aastra55i':
case 'Aastra57i':
case 'Aastra57iCT':
+ case 'Aastra6739i':
case 'Aastra9480i':
case 'Aastra9480iCT':
if(Aastra_test_phone_version('2.0.2.',1,$header)==0) $return=True;
diff --git a/include/TextScreen.class.php b/include/TextScreen.class.php
index 74b212f..d5f12fa 100644
--- a/include/TextScreen.class.php
+++ b/include/TextScreen.class.php
@@ -132,11 +132,17 @@ class TextScreen {
$icon = $e['icon'];
$o->addEntry($name, $url, $selection, $icon);
}
+ $icons=1;
foreach($this->_softkeys as $k=>$e) {
$label = $e['label'];
$url = $e['url'];
$icon = $e['icon'];
- $o->addSoftKey($k, $label, $url, $icon);
+ if ($icon) {
+ $o->addSoftkey($k, $label, $url, $icons);
+ $o->addIcon($icons++, $icon);
+ } else {
+ $o->addSoftkey($k, $label, $url, NULL);
+ }
}
$o->setTitle($this->_title);
if (count($this->_entries) != 0) {