5.0.0 version.

4.2.0 version.
2018-02-15 23:22:08 +01:00 · 2018-02-15 23:20:25 +01:00
70 changed files with 11485 additions and 11389 deletions
--- a/58015045-00-XML-API.pdf
+++ b/58015045-00-XML-API.pdf
--- a/PA-001011-05-00-XML-API.pdf
+++ b/PA-001011-05-00-XML-API.pdf
--- a/README.txt
+++ b/README.txt
@ -1,25 +1,24 @@
 MITEL
-July 2015
+July 2017


-PA-001011-04-02-XML-API.pdf - Mitel IP Phone XML API document.  For use with Mitel SIP Phones Release 4.1.0
+-58015045-00-XML-API.pdf - Mitel IP Phone XML API document.  For use with Mitel SIP Phones Release 5.0.0

-XMLSchema 4.1.0.xsd - XML Schema which can be used to validate XML development.  
- For use with Mitel SIP Phones Release 4.1.0
+-XMLSchema.xsd - XML Schema which can be used to validate XML development.  

-php_classes_4.1.0.zip - contains the directory php classes with all the XML classes.
+-php_classes.zip - contains the directory php classes with all the XML classes.
 The files are commented.

-xml-xampp_4.1.0.zip contains the source code of sample XML applications to be used with XAMPP as described in the XML API Document
+-xml-xampp.zip contains the source code of sample XML applications to be used with XAMPP as described in the XML API Document
  The files are commented

-csv_directory_4.1.0.zip contains the source code of a directory application using a csv file as the data source.
+-csv_directory.zip contains the source code of a directory application using a csv file as the data source.
  The files are commented

-ldap_directory_4.1.0.zip contains the source code of a directory application using LDAP.
+-ldap_directory.zip contains the source code of a directory application using LDAP.
  The files are commented

-pictureCallerID_4.1.0.zip contains the source code of an application providing formatted images for the 6739i for incoming and outgoing calls.
+-pictureCallerID.zip contains the source code of an application providing formatted images for the graphic phones for incoming and outgoing calls.
  The files are commented  

 For XML documents related to IP Phone SIP Release 1.3.0, see file PA-001004-00-00.zip
@ -48,4 +47,10 @@ For XML documents related to IP Phone SIP Release 3.3.0 see file PA-001011-03-00
 For XML documents related to IP Phone SIP Release 3.3.1 SP4 see file PA-001011-03-04.zip
 For XML documents related to IP Phone SIP Release 4.0.0 see file PA-001011-04-00.zip
 For XML documents related to IP Phone SIP Release 4.0.0 SP1 see file PA-001011-04-01.zip
-For XML documents related to IP Phone SIP Release 4.0.0 SP2 see file PA-001011-04-02.zip
+For XML documents related to IP Phone SIP Release 4.0.0 SP2 see file PA-001011-04-02.zip
+For XML documents related to IP Phone SIP Release 4.1.0 see file PA-001011-05-00.zip
+For XML documents related to IP Phone SIP Release 4.1.0-SP2 see file PA-001011-05-01.zip
+For XML documents related to IP Phone SIP Release 4.2.0 see file PA-001011-06-00.zip
+For XML documents related to IP Phone SIP Release 4.2.0-SP1 see file PA-001011-06-01.zip
+For XML documents related to IP Phone SIP Release 4.3.0 see file 58015044-00-XML_API.zip
+For XML documents related to IP Phone SIP Release 4.3.0-SP1 see file 58015044-01-XML_API.zip
--- a/XML-API.txt
+++ b/XML-API.txt
--- a/XMLSchema.xsd
+++ b/XMLSchema.xsd
--- a/csv_directory/License.txt
+++ b/csv_directory/License.txt
@ -1,4 +1,4 @@
-Copyright (c) 2007-2011 Aastra Telecom US, Inc.
+Copyright (c) 2005-2015 Mitel Networks
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@ -12,7 +12,7 @@ are met:
    3. The name of Aastra Telecom US, Inc. may not be used to endorse or promote
       products derived from this software without specific prior written permission.

-THIS SOFTWARE IS PROVIDED BY AASTRA TELECOM US, INC. ``AS IS'' AND ANY EXPRESS
+THIS SOFTWARE IS PROVIDED BY MITEL NETWORKS ``AS IS'' AND ANY EXPRESS
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
 IN NO EVENT SHALL AASTRA TELECOM US, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
--- a/csv_directory/config/server.conf
+++ b/csv_directory/config/server.conf
@ -1,12 +1,9 @@
 #############################################################################
 # server.conf
 #
-# Main Configuration file for Aastra XML scripts
-# Located in /etc
+# Main Configuration file for Mitel XML scripts
 #
-# Version: VERSION
-#
-# Copyright 2009 Aastra Telecom Ltd
+# Copyright 2005-2015 Mitel Networks
 #
 #############################################################################
 [General]
--- a/csv_directory/directory/directory.php
+++ b/csv_directory/directory/directory.php
@ -1,10 +1,10 @@
 <?php
 #############################################################################
 # Contact lookup
-# Aastra SIP Phones R1.4.2 or better
+# Mitel SIP Phones R1.4.2 or better
 #
 # php source code
-# Copyright Aastra Telecom Ltd 2007-2009
+# Copyright Mitel Networks 2005-2015
 #
 # Supported Aastra Phones
 #    All Phones but 9112i, 9133i
--- a/csv_directory/directory/speed.php
+++ b/csv_directory/directory/speed.php
@ -2,10 +2,10 @@
 #####################################################################
 # Server side speed dial
 #
-# Aastra SIP Phones R1.4.2 or better
-# Copyright 2007-2009 Aastra Telecom Ltd
+# Mitel SIP Phones R1.4.2 or better
+# Copyright 2005-2015 Mitel Networks
 #
-# Supported Aastra Phones
+# Supported Mitel Phones
 #    All Phones 
 #
 # Usage
--- a/ldap_directory/License.txt
+++ b/ldap_directory/License.txt
@ -1,4 +1,4 @@
-Copyright (c) 2007-2011 Aastra Telecom US, Inc.
+Copyright (c) 2005-2015 Mitel Networks
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@ -12,7 +12,7 @@ are met:
    3. The name of Aastra Telecom US, Inc. may not be used to endorse or promote
       products derived from this software without specific prior written permission.

-THIS SOFTWARE IS PROVIDED BY AASTRA TELECOM US, INC. ``AS IS'' AND ANY EXPRESS
+THIS SOFTWARE IS PROVIDED BY MITEL NETWORKS ``AS IS'' AND ANY EXPRESS
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
 IN NO EVENT SHALL AASTRA TELECOM US, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
--- a/ldap_directory/directory/directory.php
+++ b/ldap_directory/directory/directory.php
@ -1,12 +1,11 @@
 <?php
 ###################################################################################################
 # Example of an XML Directory using LDAP as data source for the Aastra IP Phones
-# Copyright Aastra Telecom 2009-2011
+# Copyright 2005-2015 Mitel Networks
 #
 # Script needs PHP5 or higher with LDAP extension
 #
 # Aastra SIP Phones Firmware 2.3.0 or higher. 
-# Supported phones: All 67xxi phones.
 #
 # Configuration:
 #   See file ../config/ldap_directory.conf
--- a/php_classes/AastraCommon.php
+++ b/php_classes/AastraCommon.php
@ -1,7 +1,7 @@
 <?php 
 ###################################################################################################
 # Aastra XML API - AastraCommon.php
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # This file includes functions specific for Aastra XML API
 #
--- a/php_classes/AastraIPPhone.class.php
+++ b/php_classes/AastraIPPhone.class.php
@ -1,7 +1,7 @@
 <?php
 ###################################################################################################
 # Aastra XML API Classes - AastraIPPhone
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhone is the root class for all the Aastra XML objects.
 #
@ -10,11 +10,11 @@
 #          @title		string
 #          @color		string, "red", "blue", ... (optional)
 #     setTitleWrap() to set the title to be wrapped on 2 lines (optional)
-#     setTopTitle(title,color,icon_index) to set the Top Title of the XML screen (6739i only)
+#     setTopTitle(title,color,icon_index) to set the Top Title of the XML screen
 #          @title		string
 #          @color		string, "red", "blue", ... (optional)
 #          @icon_index	integer, icon number
-#     setBackgroundColor(color) to change the XML object background color (optional 6739i only)
+#     setBackgroundColor(color) to change the XML object background color (optional)
 #          @color		string, "red", "blue", ...
 #     setCancelAction(uri) to set the cancel parameter with the URI to be called on Cancel (optional)
 #          @uri		string
@ -23,6 +23,8 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional only for non softkey phones)
@ -65,14 +67,15 @@ class AastraIPPhone {
 	var $_cancelAction='';
 	var $_refreshTimeout=0;
 	var $_refreshURL='';
-    var $_beep='';
+  var $_beep='';
 	var $_lockin='';
+	var $_callprotection='';
 	var $_timeout=0;
 	var $_allowAnswer='';
 	var $_allowDrop='';
 	var $_allowXfer='';
 	var $_allowConf='';
-	var $_bcolor='';
+	var $_background_color='';
 	var $_toptitle='';
 	var $_toptitle_icon='';
 	var $_toptitle_color='';
@ -88,7 +91,7 @@ class AastraIPPhone {
 		$this->_destroyOnExit='';
 		$this->_refreshTimeout=0;
 		$this->_refreshURL='';
-       	$this->_beep='';
+   	$this->_beep='';
 		$this->_lockin='';
 		$this->_lockin_uri='';
 		$this->_timeout=0;
@ -105,7 +108,7 @@ class AastraIPPhone {

 	function setBackgroundColor($color)
 	{
-		$this->_bcolor = $color;
+		$this->_background_color = $color;
 	}

 	function setTitle($title,$color='')
@ -159,6 +162,15 @@ class AastraIPPhone {
 		$this->_lockin='call';
 	}

+	function setCallProtection($notif=False) 
+	{
+	  if($notif==True) {
+			$this->_callprotection='notif';
+		} else {
+			$this->_callprotection='yes';
+		}
+	}
+
 	function setTimeout($timeout) 
 	{
 		$this->_timeout=$timeout;
@ -213,7 +225,8 @@ class AastraIPPhone {

 	function addIcon($index, $icon)
 	{
-		if(Aastra_is_icons_supported()) $this->_icons[$index] = new AastraIPPhoneIconEntry($index, $icon);
+#		if(Aastra_is_icons_supported()) $this->_icons[$index] = new AastraIPPhoneIconEntry($index, $icon);
+    $this->_icons[$index] = new AastraIPPhoneIconEntry($index, $icon);
 	}

 	function escape($string)
--- a/php_classes/AastraIPPhone.php
+++ b/php_classes/AastraIPPhone.php
--- a/php_classes/AastraIPPhoneCallLog.class.php
+++ b/php_classes/AastraIPPhoneCallLog.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneCallLog
-# Copyright Aastra Telecom 2005-2012
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneCallLog object.
 #
--- a/php_classes/AastraIPPhoneCallLogEntry.class.php
+++ b/php_classes/AastraIPPhoneCallLogEntry.class.php
@ -1,7 +1,7 @@
 <?php
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneCallLogEntry
-# Copyright Aastra Telecom 2005-2012
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneCallLog object.
 ################################################################################
--- a/php_classes/AastraIPPhoneConfiguration.class.php
+++ b/php_classes/AastraIPPhoneConfiguration.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneConfiguration
-# Copyright Aastra Telecom 2007-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneConfiguration object.
 #
--- a/php_classes/AastraIPPhoneConfigurationEntry.class.php
+++ b/php_classes/AastraIPPhoneConfigurationEntry.class.php
@ -2,7 +2,7 @@
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneConfigurationEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2007-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneConfiguration object.
 ################################################################################
--- a/php_classes/AastraIPPhoneExecute.class.php
+++ b/php_classes/AastraIPPhoneExecute.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneExecute
-# Copyright Aastra Telecom 2006-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneExecute object.
 #
@ -16,9 +16,10 @@
 #
 # Specific to the object
 #     setTriggerDestroyOnExit() to set the triggerDestroyOnExit tag to "yes" (optional)
-#     addEntry(url,interruptCall) to add an action to be executed.
+#     addEntry(url,interruptCall,title) to add an action to be executed.
 #          @url		string
 #          @interruptCall	string, optional, "yes" or "no"	
+#          @title string, optional, title to be used in Wav.Play screen
 #
 # Example
 #     require_once('AastraIPPhoneExecute.class.php');
@ -36,9 +37,9 @@ class AastraIPPhoneExecute extends AastraIPPhone {
 	var $_defaultIndex='';
 	var $_triggerDestroyOnExit='';

-	function addEntry($url,$interruptCall=NULL)
+	function addEntry($url,$interruptCall=NULL,$title='')
 	{
-		$this->_entries[] = new AastraIPPhoneExecuteEntry($url,$interruptCall);
+		$this->_entries[] = new AastraIPPhoneExecuteEntry($url,$interruptCall,$title);
 	}

 	function setTriggerDestroyOnExit() 
--- a/php_classes/AastraIPPhoneExecuteEntry.class.php
+++ b/php_classes/AastraIPPhoneExecuteEntry.class.php
@ -2,7 +2,7 @@
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneExecuteEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneExecute object.
 ################################################################################
@ -10,18 +10,22 @@
 class AastraIPPhoneExecuteEntry extends AastraIPPhone {
 	var $_url;
 	var $_interruptCall;
+	var $_title;

-	function AastraIPPhoneExecuteEntry($url,$interruptCall)
+	function AastraIPPhoneExecuteEntry($url,$interruptCall,$title)
 	{
 		$this->_url = $url;
 		$this->_interruptCall = $interruptCall;
+		$this->_title = $title;
 	}

 	function render()
 	{
 		$url = $this->escape($this->_url);
+		$title = $this->escape($this->_title);
 		$xml = "<ExecuteItem URI=\"".$url."\"";
 		if ($this->_interruptCall=='no') $xml .= " interruptCall=\"no\"";
+		if ($this->_title!='') $xml .= " title=\"".$title."\"";
 		$xml .= "/>\n";
 		return($xml);
 	}
--- a/php_classes/AastraIPPhoneFormattedTextScreen.class.php
+++ b/php_classes/AastraIPPhoneFormattedTextScreen.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPFormattedPhoneTextScreen
-# Copyright Aastra Telecom 2008-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneFormattedTextScreen object.
 #
@ -19,12 +19,16 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional only for non softkey phones)
 #     setAllowConf() to set the allowConf tag to 'yes' (optional only for non softkey phones)
 #     setTimeout(timeout) to define a specific timeout for the XML object (optional)
 #          @timeout		integer (seconds)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
 #     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
 #          @index		integer, softkey number
 #          @label		string
@ -42,16 +46,20 @@
 #          @flush		boolean optional, output buffer to be flushed out or not.
 #
 # Specific to the object
-#     addLine(text,size,align,color) to add a formatted line
+#     addLine(text,size,align,color,wrap,blink) to add a formatted line
 #          @text		string
 #          @size		string, optional, "small", "double"  or "large"
 #          @align		string, optional, "left", "right" or "center"
 #          @color		string, optional, "red", "black", ...
-#     addText(text,size,align,$color) to add a formatted text as formatted lines
+#          @wrap    boolean, optional, "yes", "no" (default)
+#          @blink   string, optional, "slow", "fast" or "no" (default)
+#     addText(text,size,align,$color,wrap,blink) to add a formatted text as formatted lines
 #          @text		string, can include carriage returns
 #          @size		string, optional, "double"
 #          @align		string, optional, "left", "right" or "center"
 #          @color		string, optional, "red", "black", ...
+#          @wrap    boolean, optional, "yes", "no" (default)
+#          @blink   string, optional, "slow", "fast" or "no" (default)
 #     setScrollStart(height) to define the beginning of the scrolling section and its height
 #          @height		integer
 #     setScrollEnd() to define the end of the scrolling section
@ -66,6 +74,7 @@
 #          @uri		string
 #     setScrollRight(uri) to set the URI to be called when the user presses the Right arrow (optional)
 #          @uri		string
+#     setNoFontMono() to allow the override of the monotype font with a proportional font (6867i. 6869i and 6873i only)
 #     setDial(number,line) to set the number to be dialed as well as the line to use when going off-hook or with the custom softkey Softkey::Dial2
 #          @number  string
 #          @line    integer (optional) 
@ -102,26 +111,27 @@ class AastraIPPhoneFormattedTextScreen extends AastraIPPhone {
 	var $_scrollRight='';
 	var $_dialNumber='';
 	var $_dialLine='';
+	var $_fontMono='';

-	function addLine($text, $size=NULL, $align=NULL, $color=NULL)
+	function addLine($text, $size=NULL, $align=NULL, $color=NULL, $wrap=NULL, $blink=NULL)
 	{
-		$this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry($text, $size, $align, $color, 'normal');
+		$this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry($text, $size, $align, $color, $wrap, $blink, 'normal');
 	}

-	function addText($text, $size=NULL, $align=NULL, $color=NULL)
+	function addText($text, $size=NULL, $align=NULL, $color=NULL, $wrap=NULL, $blink=NULL)
 	{
 		$pieces=explode("\n",wordwrap($text,$this->_display_size,"\n",True));
-		foreach($pieces as $value) $this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry($value, $size, $align, $color, 'normal');
+		foreach($pieces as $value) $this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry($value, $size, $align, $color, $wrap, $blink, 'normal');
 	}

 	function setScrollStart($height)
 	{
-		$this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry(NULL, $height, NULL, NULL, 'scrollstart');
+		$this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry(NULL, $height, NULL, NULL, NULL, NULL, 'scrollstart');
 	}

 	function setScrollEnd()
 	{
-		$this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry(NULL, NULL, NULL, NULL, 'scrollend');
+		$this->_entries[] = new AastraIPPhoneFormattedTextScreenEntry(NULL, NULL, NULL, NULL, NULL, NULL, 'scrollend');
 	}

 	function setDoneAction($uri)
@ -160,6 +170,11 @@ class AastraIPPhoneFormattedTextScreen extends AastraIPPhone {
 		$this->_dialLine = $dialLine;
 	}

+	function setNoFontMono()
+	{
+		$this->_fontMono = 'no';
+	}
+
 	function render()
 	{
 		# Beginning of root tag
@ -191,6 +206,11 @@ class AastraIPPhoneFormattedTextScreen extends AastraIPPhone {
   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
 		}

+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
 		# AllowAnswer
 		if($this->_allowAnswer == 'yes') $out .= " allowAnswer=\"yes\"";

@ -205,6 +225,9 @@ class AastraIPPhoneFormattedTextScreen extends AastraIPPhone {

 		# TimeOut
 		if($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";
+
+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
 	
 		# AllowDTMF
 		if($this->_allowDTMF=='yes') $out .= " allowDTMF=\"yes\"";
@ -214,6 +237,9 @@ class AastraIPPhoneFormattedTextScreen extends AastraIPPhone {
 		if($this->_scrollDown!='') $out .= " scrollDown=\"".$this->escape($this->_scrollDown)."\"";
 		if($this->_scrollLeft!='') $out .= " scrollLeft=\"".$this->escape($this->_scrollLeft)."\"";
 		if($this->_scrollRight!='') $out .= " scrollRight=\"".$this->escape($this->_scrollRight)."\"";
+
+		# Font Monotype
+		if ($this->_fontMono == 'no') $out .= " fontMono=\"no\"";
 	
 		# End of Root tag
 		$out .= ">\n";
@ -271,7 +297,5 @@ class AastraIPPhoneFormattedTextScreen extends AastraIPPhone {
 		# Return XML object
 		return $out;
 	}
-
-
 }
 ?>
--- a/php_classes/AastraIPPhoneFormattedTextScreenEntry.class.php
+++ b/php_classes/AastraIPPhoneFormattedTextScreenEntry.class.php
@ -2,7 +2,7 @@
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneFormattedTextScreenEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2008-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneFormattedTextScreen object.
 ################################################################################
@ -12,15 +12,19 @@ class AastraIPPhoneFormattedTextScreenEntry extends AastraIPPhone {
 	var $_size;
 	var $_align;
 	var $_color;
+	var $_wrap;
+	var $_blink;
 	var $_type;

-	function AastraIPPhoneFormattedTextScreenEntry($text, $size, $align, $color, $type)
+	function AastraIPPhoneFormattedTextScreenEntry($text, $size, $align, $color, $wrap, $blink, $type)
 	{
 		if($size=='double')$this->_text=$this->convert_high_ascii($text);
 		else $this->_text=$text;
 		$this->_size=$size;
 		$this->_align=$align;
-		$this->_color=$color;
+ 		$this->_color=$color;
+		$this->_wrap=$wrap;
+		$this->_blink=$blink;
 		$this->_type=$type;
 	}

@ -33,6 +37,8 @@ class AastraIPPhoneFormattedTextScreenEntry extends AastraIPPhone {
 				if($this->_size!=NULL) $xml .= " Size=\"{$this->_size}\"";
 				if($this->_align!=NULL) $xml .= " Align=\"{$this->_align}\"";
 				if($this->_color!=NULL) $xml .= " Color=\"{$this->_color}\"";
+				if($this->_wrap!=NULL) $xml .= " wrap=\"{$this->_wrap}\"";
+				if($this->_blink!=NULL) $xml .= " blink=\"{$this->_blink}\"";
 				$xml .= ">";
 				$xml .= $this->escape($this->_text)."</Line>\n";
 				break;
--- a/php_classes/AastraIPPhoneGDImage.class.php
+++ b/php_classes/AastraIPPhoneGDImage.class.php
@ -1,7 +1,7 @@
 <?php
 #########################################################################################################
 # Aastra XML API Classes - Aastra XML API Classes - AastraIPPhoneGDImage
-# Copyright Aastra Telecom 2007-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Firmware 2.0 or better
 #
--- a/php_classes/AastraIPPhoneIconEntry.class.php
+++ b/php_classes/AastraIPPhoneIconEntry.class.php
@ -1,8 +1,8 @@
 <?php
 ################################################################################
-# Aastra XML API Classes - AastraIPIconEntry
+# Aastra XML API Classes - AastraIPPhoneIconEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2007-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhone object.
 ################################################################################
--- a/php_classes/AastraIPPhoneIconMenu.class.php
+++ b/php_classes/AastraIPPhoneIconMenu.class.php
@ -0,0 +1,242 @@
+<?php
+########################################################################################################
+# Aastra XML API Classes - AastraIPPhoneTextMenu
+# Copyright Mitel Networks 2005-2015
+#
+# AastraIPPhoneTextMenu object.
+#
+# Public methods
+#
+# Inherited from AastraIPPhone
+#     setTitle(Title) to setup the title of an object (optional)
+#          @title		string
+#     setTitleWrap() to set the title to be wrapped on 2 lines (optional)
+#     setTopTitle(title,color,icon_index) to set the Top Title of the XML screen (6739i only)
+#          @title		string
+#          @color		string, "red", "blue", ... (optional)
+#          @icon_index	integer, icon number
+#     setDestroyOnExit() to set DestroyonExit parameter to 'yes', 'no' by default (optional)
+#     setBeep() to enable a notification beep with the object (optional)
+#     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
+#          @uri		string, GoodByeLockInURI
+#     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setTimeout(timeout) to define a specific timeout for the XML object (optional)
+#          @timeout		integer (seconds)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
+#     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
+#          @index		integer, softkey number
+#          @label		string
+#          @uri		string
+#          @icon_index	integer, icon number
+#     setRefresh(timeout,URL) to add Refresh parameters to the object (optional)
+#          @timeout		integer (seconds)
+#          @URL		string
+#     setEncodingUTF8() to change encoding from default ISO-8859-1 to UTF-8 (optional)
+#     addIcon(index,icon) to add custom icons to the object (optional)
+#          @index		integer, icon index
+#          @icon		string, icon name or definition
+#     generate() to return the generated XML for the object
+#     output(flush) to display the object
+#          @flush		boolean optional, output buffer to be flushed out or not.
+#
+# Specific to the object
+#			setLayout(layout) to set the desired layout
+#					 @layout		 1 or 2
+#			setMode(mode) to set the screen mode
+#          @mode			 'regular' or 'extended'
+#     setDefaultIndex(index) to set the default selection in the list (optional)
+#          @index		   index (1-24)
+#     setFontMono(fontMono) to decide the use of the monotype font
+#					 @fontMono   boolean ("yes"/"no")
+#     addEntry(url,selection,icon,iconScaled,fontMono,dial,line) to add an element in the list to be displayed
+#          @url		     string
+#          @selection	 string (optional)
+#          @icon		   string (optional)
+#          @iconScaled boolean (optional)
+#          @fontMono   boolean (optional)
+#          @dial		   string, phone number to dial (optional)
+#          @line		   integer, SIP line to use (optional)
+#     addLine(text,align,color) to add a line in the current item
+#          @text		   string
+#          @align		   string, optional, "left", "right" or "center"
+#          @color		   string, optional, "red", "black", ...
+#
+# Example
+#    require_once('AastraIPPhoneIconMenu.class.php');
+#    $menu = new AastraIPPhoneIconMenu();
+#    $menu->setDestroyOnExit();
+#    $menu->setDeFaultIndex('3');
+#		 $menu->setLayout('1');
+#		 $menu->setMode('regular');
+#		 $menu->setFontMono('yes');
+#		 $menu->addEntry('http://myserver.com/script.php?choice=1','Value=1','Icon:Alarm','yes');
+#		 $menu->addLine('Line 11','left','red');
+#		 $menu->addLine('Line 12','right','green');
+#		 $menu->addLine('Line 13','center','blue');
+#		 $menu->addEntry('http://myserver.com/script.php?choice=2','Value=2','Icon:AlarmFilled','no');
+#		 $menu->addLine('Line 21','left','red');
+#		 $menu->addLine('Line 22','right','green');
+#		 $menu->addLine('Line 23','center','blue');
+#    $menu->addSoftkey('1', 'My Select', 'http://myserver.com/script.php?action=1');
+#    $menu->addSoftkey('6', 'Exit', 'SoftKey:Exit');
+#    $menu->output();
+#
+########################################################################################################
+require_once('AastraIPPhone.class.php');
+require_once('AastraIPPhoneIconMenuEntry.class.php');
+
+class AastraIPPhoneIconMenu extends AastraIPPhone {
+	var $_layout='';
+	var $_mode='';
+	var $_defaultIndex='';
+	var $_style='';
+	var $_maxitems='24';
+	var $_fontMono='';
+
+	function setLayout($layout)
+	{
+		$this->_layout = $layout;
+	}
+
+	function setMode($mode)
+	{
+		$this->_mode = $mode;
+	}
+
+	function setFontMono($fontMono)
+	{
+		$this->_fontMono = $fontMono;
+	}
+    
+	function setDefaultIndex($defaultIndex)
+	{
+		$this->_defaultIndex = $defaultIndex;
+	}
+
+	function setStyle($style)
+	{
+		$this->_style = $style;
+	}
+
+	function addEntry($url, $selection=NULL, $icon=NULL, $iconScaled=NULL, $fontMono=NULL, $dial=NULL, $line=NULL)
+	{
+		$this->_entries[] = new AastraIPPhoneIconMenuEntry( $url,
+																												$selection,
+																												$icon,
+																												$iconScaled,
+																												$fontMono,
+																												$dial,
+																												$line
+																											);
+	}
+
+	function addLine($text, $align=NULL, $color=NULL)
+	{
+		$index=count($this->_entries);
+		if($index>0) {
+			$this->_entries[$index-1]->addLine($text, $align, $color);
+		}
+	}
+
+
+	function render()
+	{
+		# Beginning of root tag		
+		$out = "<AastraIPPhoneIconMenu";
+
+		# DestroyOnExit
+		if ($this->_destroyOnExit=='yes') $out .= " destroyOnExit=\"yes\"";
+
+		# DefaultIndex
+		if ($this->_defaultIndex!="") $out .= " defaultIndex=\"{$this->_defaultIndex}\"";
+
+		# Layout
+		if ($this->_layout!='') $out .= " layout=\"{$this->_layout}\"";
+
+		# Mode
+		if ($this->_mode!='') $out .= " mode=\"{$this->_mode}\"";
+
+		# FontMono
+		if ($this->_fontMono!='') $out .= " fontMono=\"{$this->_fontMono}\"";
+
+		# Beep
+		if ($this->_beep=='yes') $out .= " Beep=\"yes\"";
+
+		# Lockin
+		if($this->_lockin!='') {
+			$out .= " LockIn=\"{$this->_lockin}\"";
+   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
+		}
+
+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
+		# Timeout
+		if ($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";
+
+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
+
+		# Font Monotype
+		if ($this->_fontMono == 'no') $out .= " fontMono=\"no\"";
+
+		# End of root tag
+		$out .= ">\n";
+
+		# Top Title
+		if ($this->_toptitle!='')
+			{
+			$toptitle = $this->escape($this->_toptitle);
+		 	$out .= "<TopTitle";
+		 	if ($this->_toptitle_icon!='') $out .= " icon=\"{$this->_toptitle_icon}\"";
+		 	if ($this->_toptitle_color!='') $out .= " Color=\"{$this->_toptitle_color}\"";
+			$out .= ">".$toptitle."</TopTitle>\n";
+			}
+
+		# Menu items
+		if (isset($this->_entries) && is_array($this->_entries)) 
+			{
+			$index=0;
+			$is_softkeys=Aastra_is_softkeys_supported();
+			foreach ($this->_entries as $entry) 
+				{
+				if($index<$this->_maxitems) $out .= $entry->render();
+				$index++;
+				}
+			}
+
+		# Softkeys
+		if (isset($this->_softkeys) && is_array($this->_softkeys)) 
+			{
+		  	foreach ($this->_softkeys as $softkey) $out .= $softkey->render();
+			}
+
+		# Icons
+		if (isset($this->_icons) && is_array($this->_icons)) 
+			{
+  			$IconList=False;
+  			foreach ($this->_icons as $icon) 
+  				{
+	  			if(!$IconList) 
+  					{
+	  				$out .= "<IconList>\n";
+	  				$IconList=True;
+	  				}
+	  			$out .= $icon->render();
+  				}
+  			if($IconList) $out .= "</IconList>\n";
+			}
+
+		# End Tag
+		$out .= "</AastraIPPhoneIconMenu>\n";
+
+		# Return XML object
+		return($out);
+	}
+}
+?>
--- a/php_classes/AastraIPPhoneIconMenuEntry.class.php
+++ b/php_classes/AastraIPPhoneIconMenuEntry.class.php
@ -0,0 +1,87 @@
+<?php
+################################################################################
+# Aastra XML API Classes - AastraIPPhoneTextMenuEntry
+# Copyright Mitel Networks 2005-2015
+#
+# Internal class for AastraIPPhoneTextMenu object.
+################################################################################
+
+class AastraIPPhoneIconMenuEntry extends AastraIPPhone {
+	var $_url;
+	var $_selection;
+	var $_icon;
+	var $_iconScaled;
+	var $_fontMono;
+	var $_dial;
+	var $_line;
+	var $_lines=array();
+
+	function AastraIPPhoneIconMenuEntry($url, $selection, $icon, $iconScaled, $fontMono, $dial, $line)
+	{
+		$this->_url=$url;
+		$this->_selection=$selection;
+		$this->_icon=$icon;
+		$this->_iconScaled=$iconScaled;
+		$this->_dial=$dial;
+		$this->_line=$line;
+		$this->_fontMono=$fontMono;
+	}
+
+	function addLine($text, $align, $color)
+	{
+		$this->_lines[]=array('text'=>$text,'align'=>$align,'color'=>$color);
+	}
+
+	function render()
+	{
+		# Opening
+		$xml = '<MenuItem';
+		if($this->_fontMono!='') $xml .= " fontMono=\"{$this->_fontMono}\"";
+		$xml .= ">\n";
+
+		# Prompt
+		$icon = $this->escape($this->_icon);
+		$xml .= "<iconName";
+	  if($this->_iconScaled!='') $xml .= " scaled=\"{$this->_iconScaled}\"";
+		$xml .= ">{$icon}</iconName>\n";
+
+		# URI
+		$url = $this->escape($this->_url);
+		$xml .= "<URI>{$url}</URI>\n";
+
+		# Selection
+		$selection = $this->escape($this->_selection);
+		if($selection!=NULL) $xml .= "<Selection>{$selection}</Selection>\n";
+
+		# Dial
+		if($this->_dial!=NULL) 
+			{
+			if($this->_line!=NULL) $xml .= "<Dial line=\"{$this->_line}\">{$this->_dial}</Dial>\n";
+			else $xml .= "<Dial>{$this->_dial}</Dial>\n";
+			}
+
+	  # Lines
+		foreach($this->_lines as $value) {
+			$xml .= '<Line';
+			if($value['align']!='') {
+				$align = $this->escape($value['align']);
+				$xml .= " Align=\"{$align}\"";
+			}
+			if($value['color']!='') {
+				$color = $this->escape($value['color']);
+				$xml .= " Color=\"{$color}\"";
+			}
+			$xml .= ">";
+			$text = $this->escape($value['text']);
+			if($text!='') $xml .= $text;
+			$xml .= '</Line>'."\n";
+		}
+
+		# Close
+		$xml .= '</MenuItem>'."\n";
+	
+		# Return generated vaue
+		return($xml);
+	}
+}
+?>
--- a/php_classes/AastraIPPhoneImageMenu.class.php
+++ b/php_classes/AastraIPPhoneImageMenu.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneImageMenu
-# Copyright Aastra Telecom 2007-2012
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneImageMenu object.
 #
@ -19,12 +19,16 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional, only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional, only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional, only for non softkey phones)
 #     setAllowConf() to set the allowConf tag to 'yes' (optional, only for non softkey phones)
 #     setTimeout(timeout) to define a specific timeout for the XML object (optional)
 #          @timeout		integer (seconds)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
 #     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
 #          @index		integer, softkey number
 #          @label		string
@ -193,6 +197,11 @@ class AastraIPPhoneImageMenu extends AastraIPPhone {
   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
 		}

+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
 		# AllowAnswer
 		if ($this->_allowAnswer == 'yes') $out .= " allowAnswer=\"yes\"";

@ -208,6 +217,9 @@ class AastraIPPhoneImageMenu extends AastraIPPhone {
 		# Timeout
 		if($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";

+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
+
 		# ImageAction
 		if($this->_imageAction != '')
 			{ 
--- a/php_classes/AastraIPPhoneImageMenuEntry.class.php
+++ b/php_classes/AastraIPPhoneImageMenuEntry.class.php
@ -2,7 +2,7 @@
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneImageMenuEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2007-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneImageMenu object.
 ################################################################################
--- a/php_classes/AastraIPPhoneImageScreen.class.php
+++ b/php_classes/AastraIPPhoneImageScreen.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneImageScreen
-# Copyright Aastra Telecom 2008-2012
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneImageScreen object.
 #
@ -19,12 +19,16 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional, only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional, only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional, only for non softkey phones)
 #     setAllowConf() to set the allowConf tag to 'yes' (optional, only for non softkey phones)
 #     setTimeout(timeout) to define a specific timeout for the XML object (optional)
 #          @timeout		integer (seconds)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
 #     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
 #          @index		integer, softkey number
 #          @label		string
@ -42,8 +46,9 @@
 #          @flush		boolean optional, output buffer to be flushed out or not.
 #
 # Specific to the object
-#     setImage(image) to define the image to be displayed
+#     setImage(image,scaling) to define the image to be displayed
 #          @image		string
+#					 @scaling	scaling indicator "yes"/"no" optional
 #     setGDImage(GDImage) to use a GDImage for display, the size is forced to 40x144
 #          @GDImage		GDImage
 #     setSPImage(SPImage) to use a SPImage for display, the size is forced to 40x144
@ -51,6 +56,7 @@
 #     setAlignment(vertical,horizontal) to define image alignment
 #          @vertical		string, "top", "middle", "bottom"
 #          @horizontal	string, "left", "middle", "right"
+#			setScaling() to indicate if image must be scaled
 #     setSize(height,width) to define image size
 #          @height		integer (pixels)
 #          @width		integer (pixels)
@ -118,6 +124,7 @@ class AastraIPPhoneImageScreen extends AastraIPPhone {
 	var $_image;
 	var $_verticalAlign=NULL;
 	var $_horizontalAlign=NULL;
+	var $_scaled='';
 	var $_height=NULL;
 	var $_width=NULL;
 	var $_allowDTMF='';
@ -140,6 +147,11 @@ class AastraIPPhoneImageScreen extends AastraIPPhone {
 		$this->_horizontalAlign = $horizontal;
 	}

+	function setScaling()
+	{
+		$this->_scaled = 'yes';
+	}
+
 	function setSize($height,$width)
 	{
 		$this->_height = $height;
@ -249,9 +261,17 @@ class AastraIPPhoneImageScreen extends AastraIPPhone {
   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
 		}

+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
 		# Timeout
 		if($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";

+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
+
 		# AllowAnswer
 		if ($this->_allowAnswer == 'yes') $out .= " allowAnswer=\"yes\"";

@ -315,6 +335,9 @@ class AastraIPPhoneImageScreen extends AastraIPPhone {
 		# Width
 		if($this->_width!=NULL) $out .= " width=\"{$this->_width}\"";

+		# Scaling
+		if($this->_scaled!='') $out .= " scaled=\"{$this->_scaled}\"";
+
 		# Image and end of image tag
 		$out .= ">{$this->_image}</Image>\n";

--- a/php_classes/AastraIPPhoneInputScreen.class.php
+++ b/php_classes/AastraIPPhoneInputScreen.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneInputScreen
-# Copyright Aastra Telecom 2005-2011
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneInputScreen object.
 #
@ -22,12 +22,16 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional only for non softkey phones)
 #     setAllowConf() to set the allowConf tag to 'yes' (optional only for non softkey phones)
 #     setTimeout(timeout) to define a specific timeout for the XML object (optional)
 #          @timeout		integer (seconds)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
 #     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
 #          @index		integer, softkey number
 #          @label		string
@ -319,6 +323,11 @@ class AastraIPPhoneInputScreen extends AastraIPPhone {
   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
 		}

+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
 		# AllowAnswer
 		if($this->_allowAnswer == 'yes') $out .= " allowAnswer=\"yes\"";

@ -334,6 +343,9 @@ class AastraIPPhoneInputScreen extends AastraIPPhone {
 		# TimeOut
 		if($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";

+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
+
 		# End of the root tag
 		$out .= ">\n";

--- a/php_classes/AastraIPPhoneInputScreenEntry.class.php
+++ b/php_classes/AastraIPPhoneInputScreenEntry.class.php
@ -2,7 +2,7 @@
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneInputScreenEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneInputScreen object.
 ################################################################################
--- a/php_classes/AastraIPPhoneScrollHandler.php
+++ b/php_classes/AastraIPPhoneScrollHandler.php
@ -2,7 +2,7 @@
 #############################################################################
 # AastraIPPhoneScrollHandler
 #
-# Copyright 2009 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
 # Note
 #		This script is a helper script of the AastraIPPhoneScrollableTextMenu 
--- a/php_classes/AastraIPPhoneScrollableDirectory.class.php
+++ b/php_classes/AastraIPPhoneScrollableDirectory.class.php
@ -4,7 +4,7 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2009-2011 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
 # Supported Aastra Phones
 #   All IP phones except Aastra9112i and Aastra9133i
@ -69,7 +69,7 @@
 #			$records[99]['office'] = "+1 (0) 555-123-1234";
 #			$records[99]['officeDigits'] = "1234";
 #			$records[99]['home'] = "044 555 22 33";
-#			$records[99]['company'] = "Aastra Telecom Inc.";
+#			$records[99]['company'] = "Mitel";
 #			$directory = new AastraIPPhoneScrollableDirectory();
 #			$directory->setTitle('Directory');
 #			$directory->setBackURI($XML_SERVER."?action=start");
@ -167,12 +167,7 @@ class AastraIPPhoneScrollableDirectory extends AastraIPPhoneScrollableTextMenu
 	if (Aastra_is_style_textmenu_supported()) $menu->setStyle('none');			
 	if (Aastra_is_wrap_title_supported())$menu->setTitleWrap();			
 	if (Aastra_is_textmenu_wrapitem_supported()) $menu->setWrapList();	
-	if (Aastra_is_top_title_supported()) 
-		{
-		$menu->setTopTitle($myrecord['name']);
-		$menu->setTitle(' ');
-		}
-	else $menu->setTitle($myrecord['name']);
+	$menu->setTitle($myrecord['name']);

 	# Default Index
 	$defaultIndex = 1;
@ -265,22 +260,9 @@ class AastraIPPhoneScrollableDirectory extends AastraIPPhoneScrollableTextMenu
 		}	
 	
 	# Softkeys	
-	$nb_softkeys=Aastra_number_physical_softkeys_supported();
-	if ($nb_softkeys) 
+	if (Aastra_is_softkeys_supported()) 
 		{
-		if ($nb_softkeys==4) 
-			{
-			# 6867i
-			if (!Aastra_test_phone_version('2.0.1.',1)) $dialKeyType = 'SoftKey:Dial2'; 
-			else $dialKeyType = 'SoftKey:Dial';
-			$menu->addSoftkey(1, Aastra_get_label('Dial',$this->_language), $dialKeyType);
-			$menu->addSoftkey(3, Aastra_get_label('Back',$this->_language), $this->_scrollHandlerReference.'&listPage='.$recentPage.'&recentSelection='.$recentSelection);
-			$menu->addSoftkey(4, Aastra_get_label('Exit',$this->_language), 'SoftKey:Exit');
-			
-			# Check if speed dial URL is set
-			if (isset($myrecord['speedURL'])) $menu->addSoftkey(2, Aastra_get_label('Add to Speed Dial',$this->_language), $myrecord['speedURL']);
-			}
-		else if ($nb_softkeys==6) 
+		if (Aastra_number_softkeys_supported()!=10) 
 			{
 			# Regular phone with 6 softkeys
 			if (!Aastra_test_phone_version('2.0.1.',1)) $dialKeyType = 'SoftKey:Dial2'; 
--- a/php_classes/AastraIPPhoneScrollableTextMenu.class.php
+++ b/php_classes/AastraIPPhoneScrollableTextMenu.class.php
@ -4,7 +4,7 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2009-2011 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
 # Supported Aastra Phones
 #   All IP phones except Aastra9112i and Aastra9133i
--- a/php_classes/AastraIPPhoneSoftkey.class.php
+++ b/php_classes/AastraIPPhoneSoftkey.class.php
@ -0,0 +1,77 @@
+<?php
+########################################################################################################
+# Aastra XML API Classes - AastraIPPhoneConfiguration
+# Copyright Mitel Networks 2005-2016
+#
+# AastraIPPhoneConfiguration object.
+#
+# Public methods
+#
+# Inherited from AastraIPPhone
+#     setBeep() to enable a notification beep with the object (optional)
+#     setEncodingUTF8() to change encoding from default ISO-8859-1 to UTF-8 (optional)
+#     generate() to return the generated XML for the object
+#     output(flush) to display the object
+#          @flush		boolean optional, output buffer to be flushed out or not.
+#
+# Specific to the object
+#     addEntry(parameter,value,type) to add a configuration change
+#          @parameter	string, parameter name
+#          @value		string, parameter value
+#          @type		string, conmfiguration change type (optional)
+#     setTriggerDestroyOnExit() to set the triggerDestroyOnExit tag to 
+#     "yes" (optional)
+#
+# Example
+#     require_once('AastraIPPhoneConfiguration.class.php');
+#     $configuration = new AastraIPPhoneConfiguration();
+#     $configuration->addEntry('topsoftkey1 label','Test');
+#     $configuration->addEntry('topsoftkey1 background color','blue');
+#     $configuration->output();
+#
+########################################################################################################
+
+require_once('AastraIPPhone.class.php');
+require_once('AastraIPPhoneSoftkeyParam.class.php');
+
+class AastraIPPhoneSoftkey extends AastraIPPhone {
+	var $_triggerDestroyOnExit='';
+	
+	function addEntry($parameter, $value)
+	{
+		$this->_entries[] = new AastraIPPhoneSoftkeyParam($parameter, $value);
+	}
+
+	function setTriggerDestroyOnExit() 
+	{
+		$this->_triggerDestroyOnExit="yes";
+	}
+
+	function render()
+	{
+		# Beginning of root tag
+		$out = "<AastraIPPhoneSoftkey";
+
+		# Beep
+		if($this->_beep=='yes') $out .= " Beep=\"yes\"";
+
+		# TriggerDestroyOnExit
+		if($this->_triggerDestroyOnExit=='yes') $out .= " triggerDestroyOnExit=\"yes\"";
+
+		# End of root tag
+		$out .= ">\n";
+
+		# Configuration Items
+		if (isset($this->_entries) && is_array($this->_entries)) 
+			{
+			foreach ($this->_entries as $entry) $out .= $entry->render();
+			}
+
+		# End tag
+		$out .= "</AastraIPPhoneSoftkey>\n";
+
+		# Return XML object
+		return($out);
+	}
+}
+?>
--- a/php_classes/AastraIPPhoneSoftkeyEntry.class.php
+++ b/php_classes/AastraIPPhoneSoftkeyEntry.class.php
@ -2,7 +2,7 @@
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneSoftkeyEntry
 # Firmware 2.0 or better
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhone object.
 ################################################################################
--- a/php_classes/AastraIPPhoneSoftkeyParam.class.php
+++ b/php_classes/AastraIPPhoneSoftkeyParam.class.php
@ -0,0 +1,42 @@
+<?php
+################################################################################
+# Aastra XML API Classes - AastraIPPhoneSoftkeyParam
+# Firmware 2.0 or better
+# Copyright Mitel Networks 2005-2015
+#
+# Internal class for AastraIPPhoneConfiguration object.
+################################################################################
+
+class AastraIPPhoneSoftkeyParam extends AastraIPPhone {
+	var $_parameter;
+	var $_value;
+
+	function AastraIPPhoneSoftkeyParam($parameter, $value)
+	{
+		$this->setParameter($parameter);
+		$this->setValue($value);
+	}
+
+	function setParameter($parameter)
+	{
+		$this->_parameter = $parameter;
+	}
+
+	function setValue($value)
+	{
+		$this->_value = $value;
+	}
+
+
+	function render()
+	{
+		$parameter = $this->escape($this->_parameter);
+		$value = $this->escape($this->_value);
+		$xml = "<SoftkeyItem>\n";
+		$xml .= "<Parameter>".$parameter."</Parameter>\n";
+		$xml .= "<Value>".$value."</Value>\n";
+		$xml .= "</SoftkeyItem>\n";
+		return($xml);
+	}
+}
+?>
--- a/php_classes/AastraIPPhoneStatus.class.php
+++ b/php_classes/AastraIPPhoneStatus.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneStatus
-# Copyright Aastra Telecom 2006-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneStatus object.
 #
@ -60,6 +60,16 @@ class AastraIPPhoneStatus extends AastraIPPhone {
 		$this->_entries[] = new AastraIPPhoneStatusEntry($index, $message, $type, $timeout, $uri, $icon, $color);
 	}

+	function addMessage($index, $message, $timeout=NULL, $uri='', $icon=0, $color='')
+	{
+		$this->_entries[] = new AastraIPPhoneStatusEntry($index, $message, '', $timeout, $uri, $icon, $color);
+	}
+
+	function addToaster($message, $uri='', $icon=0)
+	{
+		$this->_entries[] = new AastraIPPhoneStatusEntry('0', $message, 'toaster', NULL, $uri, $icon, '');
+	}
+
 	function render()
 	{
 		# Beginning of root tag
--- a/php_classes/AastraIPPhoneStatusEntry.class.php
+++ b/php_classes/AastraIPPhoneStatusEntry.class.php
@ -1,7 +1,7 @@
 <?php
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneStatusEntry
-# Copyright Aastra Telecom 2007-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneStatus object.
 ################################################################################
--- a/php_classes/AastraIPPhoneTextMenu.class.php
+++ b/php_classes/AastraIPPhoneTextMenu.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneTextMenu
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneTextMenu object.
 #
@ -22,12 +22,16 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional only for non softkey phones)
 #     setAllowConf() to set the allowConf tag to 'yes' (optional only for non softkey phones)
 #     setTimeout(timeout) to define a specific timeout for the XML object (optional)
 #          @timeout		integer (seconds)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
 #     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
 #          @index		integer, softkey number
 #          @label		string
@ -52,10 +56,12 @@
 #     setWrapList() to allow 2 lines items (optional)
 #     setScrollConstrain() to avoid the list to wrap
 #     setNumberLaunch() to allow number selection
+#     setTouchLaunch() to allow item direct selection (6873i only)
+#     setNoFontMono() to allow the override of the monotype font with a proportional font (6867i. 6869i and 6873i only)
 #     setBase(base) to configure the menuItem base URI
 #          @base		string
 #     resetBase() to reset the menuItem base URI
-#     addEntry(name,url,selection,icon,dial,line,color,split) to add an element in the list to be displayed
+#     addEntry(name,url,selection,icon,dial,line,color,split,iconr1,iconr2,iconr3,iconr4) to add an element in the list to be displayed
 #          @name		string or array(0=>Line1,1=>Line2,2=>Offset,3=>Char,4=>Mode)
 #          @url		string
 #          @selection	string (optional)
@ -64,6 +70,10 @@
 #          @line		integer, SIP line to use (optional)
 #          @color		string, "red", "black", ... (optional)
 #          @split		integer, position of the split between line 1 and line 2 (optional)
+#          @iconr1	integer (optional)
+#          @iconr2	integer (optional)
+#          @iconr3	integer (optional)
+#          @iconr4	integer (optional)
 #     setScrollUp(uri) to set the URI to be called when the user presses the Up arrow (optional)
 #          @uri		string
 #     setScrollDown(uri) to set the URI to be called when the user presses the Down arrow (optional)
@ -113,9 +123,11 @@ class AastraIPPhoneTextMenu extends AastraIPPhone {
 	var $_maxitems='30';
 	var $_scrollConstrain='';
 	var $_numberLaunch='';
+	var $_touchLaunch='';
 	var $_scrollUp='';
 	var $_scrollDown='';
-       var $_unitScroll='';
+  var $_unitScroll='';
+	var $_fontMono='';
    
 	function setDefaultIndex($defaultIndex)
 	{
@ -127,10 +139,23 @@ class AastraIPPhoneTextMenu extends AastraIPPhone {
 		$this->_style = $style;
 	}

-	function addEntry($name, $url, $selection=NULL, $icon=NULL, $dial=NULL, $line=NULL, $color='', $split=NULL)
+	function addEntry($name, $url, $selection=NULL, $icon=NULL, $dial=NULL, $line=NULL, $color='', $split=NULL, $iconRight1=NULL, $iconRight2=NULL, $iconRight3=NULL, $iconRight4=NULL)
 	{
 		if(!Aastra_is_icons_supported()) $icon=NULL;
-		$this->_entries[] = new AastraIPPhoneTextMenuEntry($name, $url, $selection, $icon, $dial, $line, $color, $split, NULL);
+		$this->_entries[] = new AastraIPPhoneTextMenuEntry( $name, 
+																												$url,
+																												$selection,
+																												$icon,
+																												$dial,
+																												$line,
+																												$color,
+																												$split,
+																												NULL, 
+																												$iconRight1,
+																												$iconRight2,
+																												$iconRight3,
+																												$iconRight4
+																											);
 	}

 	function setBase($base)
@ -163,6 +188,16 @@ class AastraIPPhoneTextMenu extends AastraIPPhone {
 		$this->_numberLaunch = 'yes';
 	}

+	function setTouchLaunch()
+	{
+		$this->_touchLaunch = 'yes';
+	}
+
+	function setNoFontMono()
+	{
+		$this->_fontMono = 'no';
+	}
+
 	function setScrollUp($uri)
 	{
 		$this->_scrollUp = $uri;
@ -212,6 +247,11 @@ class AastraIPPhoneTextMenu extends AastraIPPhone {
   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
 		}

+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
 		# WrapList
 		if ($this->_wraplist=='yes') $out .= " wrapList=\"yes\"";

@ -230,12 +270,21 @@ class AastraIPPhoneTextMenu extends AastraIPPhone {
 		# Timeout
 		if ($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";

+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
+
 		# Prevent list wrap
 		if ($this->_scrollConstrain == 'yes') $out .= " scrollConstrain=\"yes\"";

 		# Number selection
 		if ($this->_numberLaunch == 'yes') $out .= " numberLaunch=\"yes\"";

+		# Number selection
+		if ($this->_touchLaunch == 'yes') $out .= " touchLaunch=\"yes\"";
+
+		# Font Monotype
+		if ($this->_fontMono == 'no') $out .= " fontMono=\"no\"";
+
 		# Scrolls up/down
 		if($this->_scrollUp!='') $out .= " scrollUp=\"".$this->escape($this->_scrollUp)."\"";
 		if($this->_scrollDown!='') $out .= " scrollDown=\"".$this->escape($this->_scrollDown)."\"";
@ -243,9 +292,6 @@ class AastraIPPhoneTextMenu extends AastraIPPhone {
 		# Unit scroll (6739i)
 		if ($this->_unitScroll == 'yes') $out .= " unitScroll=\"yes\"";

-		# Background color(6739i)
-		if ($this->_bcolor != '') $out .= " Bcolor=\"{$this->_bcolor}\"";
-
 		# End of root tag
 		$out .= ">\n";

--- a/php_classes/AastraIPPhoneTextMenuEntry.class.php
+++ b/php_classes/AastraIPPhoneTextMenuEntry.class.php
@ -1,7 +1,7 @@
 <?php
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneTextMenuEntry
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneTextMenu object.
 ################################################################################
@ -16,8 +16,12 @@ class AastraIPPhoneTextMenuEntry extends AastraIPPhone {
 	var $_base;
 	var $_split;
 	var $_color;
+	var $_iconRight1;
+	var $_iconRight2;
+	var $_iconRight3;
+	var $_iconRight4;

-	function AastraIPPhoneTextMenuEntry($name, $url, $selection, $icon, $dial, $line, $color, $split, $base)
+	function AastraIPPhoneTextMenuEntry($name, $url, $selection, $icon, $dial, $line, $color, $split, $base, $iconRight1=NULL, $iconRight2=NULL, $iconRight3=NULL, $iconRight4=NULL)
 	{
 		$this->_name=$name;
 		$this->_url=$url;
@ -28,6 +32,10 @@ class AastraIPPhoneTextMenuEntry extends AastraIPPhone {
 		$this->_split=$split;
 		$this->_color=$color;
 		$this->_base=$base;
+		$this->_iconRight1=$iconRight1;
+		$this->_iconRight2=$iconRight2;
+		$this->_iconRight3=$iconRight3;
+		$this->_iconRight4=$iconRight4;
 	}

 	function getName()
@ -121,6 +129,10 @@ class AastraIPPhoneTextMenuEntry extends AastraIPPhone {
 			else $xml .= " base=\"\"";
 			}
 		if($this->_icon!=NULL) $xml .= " icon=\"{$this->_icon}\"";
+		if($this->_iconRight1!=NULL) $xml .= " iconr1=\"{$this->_iconRight1}\"";
+		if($this->_iconRight2!=NULL) $xml .= " iconr2=\"{$this->_iconRight2}\"";
+		if($this->_iconRight3!=NULL) $xml .= " iconr3=\"{$this->_iconRight3}\"";
+		if($this->_iconRight4!=NULL) $xml .= " iconr4=\"{$this->_iconRight4}\"";
 		$xml .= ">\n";

 		# Prompt
--- a/php_classes/AastraIPPhoneTextScreen.class.php
+++ b/php_classes/AastraIPPhoneTextScreen.class.php
@ -1,7 +1,7 @@
 <?php
 ########################################################################################################
 # Aastra XML API Classes - AastraIPPhoneTextScreen
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 # AastraIPPhoneTextScreen object.
 #
@ -22,12 +22,16 @@
 #     setLockIn(uri) to set the Lock-in tag to 'yes' and the GoodbyeLockInURI(optional)
 #          @uri		string, GoodByeLockInURI
 #     setLockInCall() to set the Lock-in tag to 'call' (optional)
+#     setCallProtection(notif) to protect the XML object against incoming calls
+#          @notif to enable/disable (false by default) the display of an incoming call notification (optional)
 #     setAllowAnswer() to set the allowAnswer tag to 'yes' (optional only for non softkey phones)
 #     setAllowDrop() to set the allowDrop tag to 'yes' (optional only for non softkey phones)
 #     setAllowXfer() to set the allowXfer tag to 'yes' (optional only for non softkey phones)
 #     setAllowConf() to set the allowConf tag to 'yes' (optional only for non softkey phones)
 #     setTimeout(timeout) to define a specific timeout for the XML object (optional)
 #          @timeout		integer (seconds)
+#     setBackgroundColor(color) to change the XML object background color (optional)
+#          @color		string, "red", "blue", ...
 #     addSoftkey(index,label,uri,icon_index) to add custom soktkeys to the object (optional)
 #          @index		integer, softkey number
 #          @label		string
@ -167,12 +171,20 @@ class AastraIPPhoneTextScreen extends AastraIPPhone {
 		# TimeOut
 		if ($this->_timeout!=0) $out .= " Timeout=\"{$this->_timeout}\"";

+		# Background color
+		if ($this->_background_color!='') $out .= " bgColor=\"{$this->_background_color}\"";
+
 		# Lockin
 		if($this->_lockin!='') {
 			$out .= " LockIn=\"{$this->_lockin}\"";
   			if($this->_lockin_uri!='') $out .= " GoodbyeLockInURI=\"".$this->escape($this->_lockin_uri)."\"";
 		}

+		# Call Protection
+		if($this->_callprotection!='') {
+			$out .= " CallProtection=\"{$this->_callprotection}\"";
+		}
+
 		# AllowAnswer
 		if ($this->_allowAnswer == 'yes') $out .= " allowAnswer=\"yes\"";

--- a/php_classes/AastraIPPhoneTextScreenEntry.class.php
+++ b/php_classes/AastraIPPhoneTextScreenEntry.class.php
@ -1,7 +1,7 @@
 <?php
 ################################################################################
 # Aastra XML API Classes - AastraIPPhoneTextScreenEntry
-# Copyright Aastra Telecom 2007-2011
+# Copyright Mitel Networks 2005-2015
 #
 # Internal class for AastraIPPhoneTextScreen object.
 ################################################################################
--- a/php_classes/License.txt
+++ b/php_classes/License.txt
@ -1,4 +1,4 @@
-Copyright (c) 2008 Aastra Telecom US, Inc.
+Copyright (c) 2005-2017 Mitel Networks.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@ -9,10 +9,10 @@ are met:
    2. Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    3. The name of Aastra Telecom US, Inc. may not be used to endorse or promote
+    3. The name of Mitel Networks may not be used to endorse or promote
       products derived from this software without specific prior written permission.

-THIS SOFTWARE IS PROVIDED BY AASTRA TELECOM US, INC. ``AS IS'' AND ANY EXPRESS
+THIS SOFTWARE IS PROVIDED BY MITEL NETWORKS ``AS IS'' AND ANY EXPRESS
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
 IN NO EVENT SHALL AASTRA TELECOM US, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
--- a/php_classes/sample.php
+++ b/php_classes/sample.php
@ -3,7 +3,7 @@
 ###########################################################################
 # Sample php applications using the Aastra XML API Classes
 # Aastra 6739i Firmware 3.0.1 or better
-# Copyright Aastra Telecom 2005-2010
+# Copyright Mitel Networks 2005-2015
 #
 ###########################################################################

--- a/pictureCallerID/License.txt
+++ b/pictureCallerID/License.txt
@ -1,4 +1,4 @@
-Copyright (c) 2010 Aastra Telecom US, Inc.
+Copyright (c) 2005-2015 Mitel Networks
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@ -12,7 +12,7 @@ are met:
    3. The name of Aastra Telecom US, Inc. may not be used to endorse or promote
       products derived from this software without specific prior written permission.

-THIS SOFTWARE IS PROVIDED BY AASTRA TELECOM US, INC. ``AS IS'' AND ANY EXPRESS
+THIS SOFTWARE IS PROVIDED BY MITEL NETWORKS ``AS IS'' AND ANY EXPRESS
 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
 IN NO EVENT SHALL AASTRA TELECOM US, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, 
--- a/pictureCallerID/imageServer.php
+++ b/pictureCallerID/imageServer.php
@ -1,8 +1,8 @@
 <?php
 #############################################################################
-# Image Server for the 6739i Picture Caller ID Feature
+# Image Server for the Picture Caller ID Feature
 #
-# Copyright Aastra Telecom 2009-2011
+# Copyright Mitel Networks 2005-2015
 #
 # Configuration
 #    image server uri: http://<server>/<path-to-this-script>?
@ -29,6 +29,110 @@ error_reporting(E_ERROR | E_PARSE);
 # Private functions
 #############################################################################

+function getvar_safe($var_name,$default='',$method='GET')
+{
+eval('$return = (isset($_'.$method.'["'.$var_name.'"])) ? htmlentities(html_entity_decode(stripslashes((trim($_'.$method.'["'.$var_name.'"]))),ENT_QUOTES),ENT_QUOTES) : $default;');
+return $return;
+}
+
+function decode_HTTP_header()
+{
+Global $TEST;
+
+# Debug mode
+if($TEST)
+	{
+ 	# Calculate fake mac address suffix based on client's source address 
+ 	$fake_mac_suffix = strtoupper(substr(md5(getvar_safe('REMOTE_ADDR','','SERVER')),0,6));
+ 	$array=array(	'model'=>'Aastra57i',
+   			'mac'=>'00085D'.$fake_mac_suffix,
+   			'firmware'=>'2.5.3.26',
+			'ip'=>getvar_safe('REMOTE_ADDR','','SERVER'),
+			'language'=>'en',
+			'rp'=>False
+			);
+	return($array);
+	}
+
+# User Agent
+$user_agent=getvar_safe('HTTP_USER_AGENT','','SERVER');
+
+if(stristr($user_agent,'Aastra'))
+	{
+	$value=preg_split('/ MAC:/',$user_agent);
+	$fin=preg_split('/ /',$value[1]);
+	$value[1]=preg_replace('/\-/','',$fin[0]);
+	$value[2]=preg_replace('/V:/','',$fin[1]);
+	}
+else
+	{
+	$value[0]='MSIE';
+	$value[1]='NA';
+	$value[2]='NA';
+	}
+
+# Modification for RP phones
+$rp=False;
+if(strstr($value[0],'RP'))
+	{
+	$rp=True;
+	$value[0]=preg_replace(array('/67/','/ RP/'),array('',''),$value[0]);
+	}
+
+# Modules
+$module[1]=getvar_safe('HTTP_X_AASTRA_EXPMOD1','','SERVER');
+$module[2]=getvar_safe('HTTP_X_AASTRA_EXPMOD2','','SERVER');
+$module[3]=getvar_safe('HTTP_X_AASTRA_EXPMOD3','','SERVER');
+
+# Create array
+$array=array('model'=>$value[0],'mac'=>$value[1],'firmware'=>$value[2],'ip'=>getvar_safe('REMOTE_ADDR','','SERVER'),'module'=>$module,'language'=>getvar_safe('HTTP_ACCEPT_LANGUAGE','','SERVER'),'rp'=>$rp);
+return($array);
+}
+
+function is_square($header=NULL)
+{
+# True by default
+$return=False;
+
+# Get header info if needed
+if(!$header) $header=decode_HTTP_header();
+
+# Test the model
+switch($header['model'])
+	{
+	case 'Aastra6867i':
+	case 'Aastra6869i':
+	case 'Aastra6873i':
+		$return=True;
+		break;
+	}
+
+# Return Result
+return($return);
+}
+
+function is_white($header=NULL)
+{
+# True by default
+$return=False;
+
+# Get header info if needed
+if(!$header) $header=decode_HTTP_header();
+
+# Test the model
+switch($header['model'])
+	{
+	case 'Aastra6867i':
+	case 'Aastra6869i':
+	case 'Aastra6873i':
+		$return=True;
+		break;
+	}
+
+# Return Result
+return($return);
+}
+
 function readINIfile ($filename, $commentchar, $delim) 
 {
 # Get file content with a shared lock to avoid race conditions
@ -116,34 +220,75 @@ return null;

 function scaleImage($im, $blowup) 
 {
+Global $SQUARE;
+Global $WHITE;
+
+# Image size depends on the target
+if($SQUARE) 
+  {
+	$target_width=200;
+	$target_height=200;
+  }
+else
+  {
+	$target_width=150;
+	$target_height=200;
+  }
+
 # Create emtpy output image. use true color to avoid color palette problems
-$im_output = imagecreatetruecolor(150, 200);
+$im_output = imagecreatetruecolor($target_width, $target_height);
+
+# White background if needed
+if($WHITE)
+  {
+	$white = imagecolorallocate($im_output, 255, 255, 255); 
+	imagefill($im_output, 0, 0, $white); 
+  }

 # Get size of input image
 $im_width=imagesx($im);
 $im_height=imagesy($im);
 	
-# Check if image is smaller than 150x200 pixels and if "blow up" of images is disabled
-if(($im_width < 150) && ($im_height < 200) && !$blowup) 
+# Check if image is smaller than requested size and if "blow up" of images is disabled
+if(($im_width < $target_width) && ($im_height < $target_height) && !$blowup) 
 	{
 	# Simply copy the image in the center of the output image. no scaling.
-	imagecopy($im_output, $im, ((150-$im_width)/2)  ,((200-$im_height)/2), 0, 0, $im_width, $im_height);
+	imagecopy($im_output, $im, (($target_width-$im_width)/2)  ,(($target_width-$im_height)/2), 0, 0, $im_width, $im_height);
 	} 
 else 
 	{
-	# Check aspect ratio of source image
-	if ($im_width / $im_height <= 0.75) 
-		{
-		# "Portrait" image. scale to 200 pixel height and center horizontally
-		$new_im_width = $im_width * (200 / $im_height);
-		imagecopyresized($im_output, $im, ((150-$new_im_width)/2), 0, 0, 0, $new_im_width, 200, $im_width, $im_height);
-		} 
-	else 
-		{
-		# "Landscape" image. scale to 150 pixel width and center vertically
-		$new_im_height = $im_height * (150 / $im_width);
-		imagecopyresized($im_output, $im, 0, ((200-$new_im_height)/2), 0, 0, 150, $new_im_height, $im_width, $im_height);
-		}	
+	if($SQUARE) 
+    {
+		# Check aspect ratio of source image
+		if ($im_width / $im_height <= 1) 
+			{
+			# "Portrait" image. scale to 200 pixel height and center horizontally
+			$new_im_width = $im_width * ($target_height / $im_height);
+			imagecopyresized($im_output, $im, (($target_width-$new_im_width)/2), 0, 0, 0, $new_im_width, $target_height, $im_width, $im_height);
+			} 
+		else 
+			{
+			# "Landscape" image. scale to 200 pixel width and center vertically
+			$new_im_height = $im_height * ($target_width / $im_width);
+			imagecopyresized($im_output, $im, 0, (($target_width-$new_im_height)/2), 0, 0, $target_width, $new_im_height, $im_width, $im_height);
+			}	
+		}
+  else 
+ 		{
+		# Check aspect ratio of source image
+		if ($im_width / $im_height <= 0.75) 
+			{
+			# "Portrait" image. scale to 200 pixel height and center horizontally
+			$new_im_width = $im_width * ($target_height / $im_height);
+			imagecopyresized($im_output, $im, (($target_width-$new_im_width)/2), 0, 0, 0, $new_im_width, $target_height, $im_width, $im_height);
+			} 
+		else 
+			{
+			# "Landscape" image. scale to 150 pixel width and center vertically
+			$new_im_height = $im_height * ($target_width / $im_width);
+			imagecopyresized($im_output, $im, 0, (($target_height-$new_im_height)/2), 0, 0, $target_width, $new_im_height, $im_width, $im_height);
+			}	
+		}
 	}

 # Return new image
@ -152,6 +297,20 @@ return($im_output);

 function customImage($im,$complement)
 {
+Global $SQUARE;
+
+# Image size depends on the target
+if($SQUARE) 
+  {
+	$target_width=200;
+	$target_height=200;
+  }
+else
+  {
+	$target_width=150;
+	$target_height=200;
+  }
+
 # Define the font
 if(strpos(strtolower(PHP_OS), 'win') === false) $font='fonts/DejaVuSans-Bold';
 else $font=realpath('./fonts/').'\\DejaVuSans-Bold.ttf';
@ -179,12 +338,12 @@ switch($array_complement[2])
 	case 'right':
 		$array_text=imagettfbbox($size,0,$font,$array_complement[0]);
 		$width=$array_text[4]-$array_text[6];
-		$x=150-10-$width;
+		$x=$target_width-10-$width;
 		break;
 	default:
 		$array_text=imagettfbbox($size,0,$font,$array_complement[0]);
 		$width=$array_text[4]-$array_text[6];
-		$x=intval(75-($width/2));
+		$x=intval(($target_width-$width)/2);
 		break;
 	}

@ -301,7 +460,7 @@ if(!$return)
 		# Found
 		$return=True;

-		# Scale image to 150x200 pixel
+		# Scale image to the right size
 		$im=scaleImage($im,$BLOWUP);
 			
 		# Save image to cache directory. use same number in filename as in original file in the library.
@ -547,6 +706,10 @@ if(empty($number_original))
 	if(preg_match('/([0-9*#]+)\.png/',$_SERVER['QUERY_STRING'],$matches)) $number_original = $matches[1];
 	}

+# Retrieve image format and color
+$SQUARE=is_square();
+$WHITE=is_white();
+
 # No number
 if(empty($number_original)) 
 	{
@ -566,7 +729,7 @@ else $CACHE_DIR='cache';
 if($array_config['General']['pictures']!='') $PICTURES_DIR=$array_config['General']['pictures'];
 else $PICTURES_DIR='pictures';

-# Rescale image smaller than 150x200
+# Rescale image smaller than expected size
 $BLOWUP=False;
 if($array_config['General']['blowup']=='1') $BLOWUP=True;

--- a/pictureCallerID/pictureID.conf
+++ b/pictureCallerID/pictureID.conf
@ -1,125 +1,125 @@
-#############################################################################
-# pictureID.conf
-#
-# Configuration file for number translation map
-#
-# Copyright 2010 Aastra Telecom Ltd
-#
-# Description
-#   This configuration file is used for the picture CallerID to map a number 
-# with a number that already has an existing picture or the name of a picture.
-# Prefixes are processed in the order they are declared in the file, like for
-# a regular dialplan.
-#
-#############################################################################
-
-###############################################################################
-# Global parameters
-#
-# [General]
-# pictures  		Directory for the raw pictures
-#                    Default is ./pictures
-#			Must be r for HTTP Server user
-#
-# cache  		Directory for the cached pictures
-#                    Default is ./cache
-#			Must be r/w for HTTP Server user
-#
-# blowup		Enable (1) or disable (0) image scaling smaller than 150x200 pixels. 
-#			This may/will lead to grainy/pixelized images.
-#			Default is disable
-#
-# default		Provides a default image when the number does not match 
-# 			any picture. A 404 is sent if no number is provided though.
-#    			default=mapped_number or mappedname,LABEL|YPOSITION|ALIGNMENT|COLOR|FONTSIZE
-#                    See the [Numbers] section for the format of the line
-###############################################################################
-[General]
-pictures=
-cache=
-blowup=
-default=
-
-###############################################################################
-# Dialing profile
-#
-# [Dialplan]
-# country   		Country code
-#               	If phone number starts with "+<country>", this will be 
-#			removed
-#
-# long distance  	Long distance prefix
-#               	This prefix will be added to the number in case +<country> 
-#			has been stripped. 
-#               	Leave blank if not needed. 
-#
-# international 	International prefix 
-#               	The "+" sign will be replaced with this prefix 
-#
-# outgoing      	Outgoing prefix
-#               	Prefix that needs to be appended for outgoing calls 
-#               	(all call but local calls), e.g. 0 or 9
-#
-# local         	List of local PBX number prefixes separated by a comma 
-#			(in national format). Prefix will be removed, no outgoing 
-#			prefix will be added. 
-#               	Examples: local=905760,978262 
-#               	--> 9057602222 will be replaced by 2222 and 9782623333 will
-#			be replaced by 3333.
-###############################################################################
-[Dialplan]
-country=1
-long distance=1
-international=011
-outgoing=
-local=
-
-#############################################################################
-# Number mapping
-#
-# Line Format
-# [Numbers]
-#    number and/or patterns comma separated=mapped_number or mappedname,LABEL|YPOSITION|ALIGNMENT|COLOR|FONTSIZE
-#    Simple number matching 
-#        it can be used to map multiple phone numbers (cell, home , other) to a user
-#    Pattern matching
-#        it can be used to map open numbers
-#        Pattern format is P followed by 
-#             any digit including * or #
-#             X digit between 0 and 9
-#             Z digit between 1 and 9
-#             N digit between 2 and 9
-#             . indicates an open length number, must be positioned at the end of the pattern
-#    The entries in the [Numbers] section are processed based on the order in 
-#    the file, so it is recommended to put the open patterns at the end.
-#
-# Where
-#    LABEL is the label to be displayed on the picture
-#    YPOSITION is the vertical position of the label (between 1 and 200), default is 100
-#    ALIGNMENT is the horizontal alignment left|center|right, default is center
-#    COLOR is the label color yellow|orange|pink|purple|black|grey|red|brown|tan|magenta|blue|green|white (default is white)
-#    FONTSIZE is the font size in pixels (between 8 and 24) default is 10
-#
-# Example
-# [Numbers]
-# 0795551234=2299
-#  Will display the picture "2299" when 0795551234 is dialed or incoming
-# P972XXXXXXX,P469XXXXXXX,P214XXXXXXX=default,"DALLAS, TX"|187|center|blue|10
-#  Will display the picture "default" with a centered blue label "Dallas, TX" font size 10 at vertical position 187 when 10 digits numbers starting with 972 or 469 or 214 are dialed or incoming
-# P44.=UK
-#  Will display the picture "UK" when any number starting with 44 is dialed or is incoming
-#############################################################################
-[Numbers]
-0000=Aastra,"Picture Caller ID"|175|center|blue|10
-P613XXXXXXX,P416XXXXXXX,P905XXXXXXX,P289XXXXXXX,P306XXXXXXX,P403XXXXXXX,P418XXXXXXX,P438XXXXXXX,P450XXXXXXX,P506XXXXXXX,P514XXXXXXX,P519XXXXXXX,P600XXXXXXX,P604XXXXXXX,P613XXXXXXX,P647XXXXXXX,P705XXXXXXX,P778XXXXXXX,P780XXXXXXX,P807XXXXXXX,P819XXXXXXX,P867XXXXXXX,P902XXXXXXX,P1416XXXXXXX=CA
-PNXXXXXXXXX,P1NXXXXXXXXX=US
-P44.=UK
-P41.=CH
-P33.=FR
-P32.=BE
-P49.=DE
-P39.=IT
-P52.=MX
-P46.=SWE
-P34.=SP
-
+#############################################################################
+# pictureID.conf
+#
+# Configuration file for number translation map
+#
+# Copyright 2005-2015 Mitel Networks.
+#
+# Description
+#   This configuration file is used for the picture CallerID to map a number 
+# with a number that already has an existing picture or the name of a picture.
+# Prefixes are processed in the order they are declared in the file, like for
+# a regular dialplan.
+#
+#############################################################################
+
+###############################################################################
+# Global parameters
+#
+# [General]
+# pictures  		Directory for the raw pictures
+#                    Default is ./pictures
+#			Must be r for HTTP Server user
+#
+# cache  		Directory for the cached pictures
+#                    Default is ./cache
+#			Must be r/w for HTTP Server user
+#
+# blowup		Enable (1) or disable (0) image scaling smaller than 150x200 pixels. 
+#			This may/will lead to grainy/pixelized images.
+#			Default is disable
+#
+# default		Provides a default image when the number does not match 
+# 			any picture. A 404 is sent if no number is provided though.
+#    			default=mapped_number or mappedname,LABEL|YPOSITION|ALIGNMENT|COLOR|FONTSIZE
+#                    See the [Numbers] section for the format of the line
+###############################################################################
+[General]
+pictures=
+cache=
+blowup=
+default=
+
+###############################################################################
+# Dialing profile
+#
+# [Dialplan]
+# country   		Country code
+#               	If phone number starts with "+<country>", this will be 
+#			removed
+#
+# long distance  	Long distance prefix
+#               	This prefix will be added to the number in case +<country> 
+#			has been stripped. 
+#               	Leave blank if not needed. 
+#
+# international 	International prefix 
+#               	The "+" sign will be replaced with this prefix 
+#
+# outgoing      	Outgoing prefix
+#               	Prefix that needs to be appended for outgoing calls 
+#               	(all call but local calls), e.g. 0 or 9
+#
+# local         	List of local PBX number prefixes separated by a comma 
+#			(in national format). Prefix will be removed, no outgoing 
+#			prefix will be added. 
+#               	Examples: local=905760,978262 
+#               	--> 9057602222 will be replaced by 2222 and 9782623333 will
+#			be replaced by 3333.
+###############################################################################
+[Dialplan]
+country=1
+long distance=1
+international=011
+outgoing=
+local=
+
+#############################################################################
+# Number mapping
+#
+# Line Format
+# [Numbers]
+#    number and/or patterns comma separated=mapped_number or mappedname,LABEL|YPOSITION|ALIGNMENT|COLOR|FONTSIZE
+#    Simple number matching 
+#        it can be used to map multiple phone numbers (cell, home , other) to a user
+#    Pattern matching
+#        it can be used to map open numbers
+#        Pattern format is P followed by 
+#             any digit including * or #
+#             X digit between 0 and 9
+#             Z digit between 1 and 9
+#             N digit between 2 and 9
+#             . indicates an open length number, must be positioned at the end of the pattern
+#    The entries in the [Numbers] section are processed based on the order in 
+#    the file, so it is recommended to put the open patterns at the end.
+#
+# Where
+#    LABEL is the label to be displayed on the picture
+#    YPOSITION is the vertical position of the label (between 1 and 200), default is 100
+#    ALIGNMENT is the horizontal alignment left|center|right, default is center
+#    COLOR is the label color yellow|orange|pink|purple|black|grey|red|brown|tan|magenta|blue|green|white (default is white)
+#    FONTSIZE is the font size in pixels (between 8 and 24) default is 10
+#
+# Example
+# [Numbers]
+# 0795551234=2299
+#  Will display the picture "2299" when 0795551234 is dialed or incoming
+# P972XXXXXXX,P469XXXXXXX,P214XXXXXXX=default,"DALLAS, TX"|187|center|blue|10
+#  Will display the picture "default" with a centered blue label "Dallas, TX" font size 10 at vertical position 187 when 10 digits numbers starting with 972 or 469 or 214 are dialed or incoming
+# P44.=UK
+#  Will display the picture "UK" when any number starting with 44 is dialed or is incoming
+#############################################################################
+[Numbers]
+0000=logo,"Picture Caller ID"|175|center|blue|10
+P613XXXXXXX,P416XXXXXXX,P905XXXXXXX,P289XXXXXXX,P306XXXXXXX,P403XXXXXXX,P418XXXXXXX,P438XXXXXXX,P450XXXXXXX,P506XXXXXXX,P514XXXXXXX,P519XXXXXXX,P600XXXXXXX,P604XXXXXXX,P613XXXXXXX,P647XXXXXXX,P705XXXXXXX,P778XXXXXXX,P780XXXXXXX,P807XXXXXXX,P819XXXXXXX,P867XXXXXXX,P902XXXXXXX,P1416XXXXXXX=CA
+PNXXXXXXXXX,P1NXXXXXXXXX=US
+P44.=UK
+P41.=CH
+P33.=FR
+P32.=BE
+P49.=DE
+P39.=IT
+P52.=MX
+P46.=SWE
+P34.=SP
+
--- a/pictureCallerID/pictures/Aastra.gif
+++ b/pictureCallerID/pictures/Aastra.gif
--- a/pictureCallerID/pictures/logo.png
+++ b/pictureCallerID/pictures/logo.png
--- a/xml-xampp/License.txt
+++ b/xml-xampp/License.txt
@ -1,4 +1,4 @@
-Copyright (c) 2007-2009 Aastra Telecom US, Inc.
+Copyright (c) 2005-2015 Mitel Networks.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/xml-xampp/area/area.php
+++ b/xml-xampp/area/area.php
@ -4,7 +4,7 @@
 # Aastra SIP Phones R1.4.2 or better
 #
 # php source code
-# Copyright Aastra Telecom Ltd 2008
+# Copyright 2005-2015 Mitel Networks
 #############################################################################

 #############################################################################
--- a/xml-xampp/area/ip.php
+++ b/xml-xampp/area/ip.php
@ -9,7 +9,7 @@
 # script.php?ip=IP
 #    IP is the IP address to lookup or SELF to lookup for current public IP.
 #
-# Copyright Aastra Telecom Ltd 2008
+# Copyright 2005-2015 Mitel Networks
 #############################################################################

 #############################################################################
--- a/xml-xampp/clock/clock.php
+++ b/xml-xampp/clock/clock.php
@ -4,7 +4,7 @@
 # Aastra SIP Phones R1.4.2 or better
 #
 # php source code
-# Copyright (c) Aastra Telecom Ltd 2007-2009
+# Copyright (c) 2005-2015 Mitel Networks
 # Copyright (c) 2003 Jose Solorzano.  All rights reserved.
 #
 # Supported phones
--- a/xml-xampp/config/server.conf
+++ b/xml-xampp/config/server.conf
@ -1,12 +1,12 @@
 #############################################################################
 # server.conf
 #
-# Main Configuration file for Aastra XML scripts
+# Main Configuration file for Mitel XML scripts
 # Located in /etc
 #
 # Version: VERSION
 #
-# Copyright 2009 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
 #############################################################################
 [General]
--- a/xml-xampp/games/biorhythm.php
+++ b/xml-xampp/games/biorhythm.php
@ -4,7 +4,7 @@
 #
 # Mitel SIP Phones 2.2.0 or better
 #
-# Copyright 2008 Mitel Networks
+# Copyright Mitel Networks 2005-2015
 #
 # Based on Biorhythm by Till Gerken http://www.zend.com/zend/tut/dynamic.php
 #
--- a/xml-xampp/games/yahtzee.php
+++ b/xml-xampp/games/yahtzee.php
@ -2,9 +2,9 @@
 #############################################################################
 # Yahtzee
 #
-# Aastra SIP Phones 2.2.0 or better
+# Mitel SIP Phones 2.2.0 or better
 #
-# Copyright 2008 Aastra Telecom Ltd
+# Copyright 2005-2015 Mitel Networks
 #
 # Supported Aastra Phones
 #   55i, 57i and 57iCT
@ -14,7 +14,6 @@
 #
 # Note
 #      PHP-GD extension is needed for this script
-#
 #############################################################################

 #############################################################################
--- a/xml-xampp/menu/all.menu
+++ b/xml-xampp/menu/all.menu
@ -30,6 +30,11 @@
 #   Aastra480i=no
 #   Aastra480i Cordless=no
 #   param=user
+#
+#   [World Clock]
+#   title=World Clock
+#   info=Get the current date and time in the major cities in the world.
+#   uri=http://$$AA_XML_SERVER_AA$$/$$AA_XMLDIRECTORY_AA$$/clock/clock.php
 # 
 #######################################################################################################################################

@ -65,10 +70,6 @@ title=Today...
 title-fr=Aujourd'hui
 info=Daily information.
 uri=http://$$AA_XML_SERVER_AA$$/$$AA_XMLDIRECTORY_AA$$/rss/rss.php?feed=day
-[World Clock]
-title=World Clock
-info=Get the current date and time in the major cities in the world.
-uri=http://$$AA_XML_SERVER_AA$$/$$AA_XMLDIRECTORY_AA$$/clock/clock.php
 [Area Code]
 title=Area Code
 info=Get the list of the cities attached to a area code.
--- a/xml-xampp/menu/mymenu.php
+++ b/xml-xampp/menu/mymenu.php
@ -4,9 +4,9 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2008 Aastra Telecom Ltd
+# Copyright 2005-2015 Mitel Networks
 #
-# Supported Aastra Phones
+# Supported Mitel Phones
 #   All phones
 #
 # Usage
@ -123,7 +123,10 @@ Aastra_test_phone_version('1.4.2.',0);

 # Get global compatibility
 $nb_softkeys=Aastra_number_physical_softkeys_supported();
+$is_toptitle_supported=Aastra_is_top_title_supported();
 $is_style_textmenu=Aastra_is_style_textmenu_supported();
+$is_touch_launch=Aastra_is_touch_launch_supported();
+$is_font_mono=Aastra_is_font_mono_supported();

 # To handle non softkey phones
 if($nb_softkeys) $MaxLines=AASTRA_MAXLINES;
@ -187,6 +190,7 @@ switch($menu_action)
        if($is_toptitle_supported) $object->setTopTitle($title);
 				else $object->setTitle($title);
 				if($is_style_textmenu) $object->setStyle('none');
+				if($is_font_mono) $object->setNoFontMono();
 				$index=0;
 				$menu_pos=1;
 				if((!$nb_softkeys) and ($menu_page!=1)) $object->addEntry(Aastra_get_label('Previous Page',$language),$XML_SERVER.'&menu_page='.($menu_page-1));
--- a/xml-xampp/rss/cnn.rss
+++ b/xml-xampp/rss/cnn.rss
@ -23,7 +23,7 @@
 ###############################################################################################
 [RESERVED]
 title=CNN
-copyright= RSS feed provided by CNN.com and brought to you by Aastra Telecom.
+copyright= RSS feed provided by CNN.com and brought to you by Mitel Networks.
 search_before=
 replace_before=
 search_after=
--- a/xml-xampp/rss/day.rss
+++ b/xml-xampp/rss/day.rss
@ -23,7 +23,7 @@
 ###############################################################################################
 [RESERVED]
 title=Today
-copyright= RSS feed provided by answers.com and brought to you by Aastra Telecom.
+copyright= RSS feed provided by answers.com and brought to you by Mitel Networks.
 search_before=/Quote of the Day: /,/Word of the Day: /,/\&m/
 replace_before=,, 
 search_after=
--- a/xml-xampp/rss/espn.rss
+++ b/xml-xampp/rss/espn.rss
@ -23,7 +23,7 @@
 ###############################################################################################
 [RESERVED]
 title=ESPN News
-copyright= RSS feed provided by ESPN.com and brought to you by Aastra Telecom.
+copyright= RSS feed provided by ESPN.com and brought to you by Mitel Networks.
 search_before=/<!\\[CDATA\\[/,/]]>/
 replace_before=, 
 search_after=
--- a/xml-xampp/rss/fox.rss
+++ b/xml-xampp/rss/fox.rss
@ -23,7 +23,7 @@
 ###############################################################################################
 [RESERVED]
 title=FOX News
-copyright= RSS feed provided by Foxnews.com and brought to you by Aastra Telecom.
+copyright= RSS feed provided by Foxnews.com and brought to you by Mitel Networks.
 search_before=/<!\\[CDATA\\[/,/]]>/
 replace_before=,
 search_after=
--- a/xml-xampp/rss/horoscope.rss
+++ b/xml-xampp/rss/horoscope.rss
@ -24,9 +24,9 @@

 [RESERVED]
 title=Daily Horoscope
-copyright= RSS feed provided by www.astrosage.com and brought to you by Aastra Telecom.
-copyright-en= RSS feed provided by www.astrosage.com and brought to you by Aastra Telecom.
-copyright-fr= Fil RSS fourni par www.astrosage.com et mise en forme pour vous par Aastra Telecom.
+copyright= RSS feed provided by www.astrosage.com and brought to you by Mitel Networks.
+copyright-en= RSS feed provided by www.astrosage.com and brought to you by Mitel Networks.
+copyright-fr= Fil RSS fourni par www.astrosage.com et mise en forme pour vous par Mitel Networks.
 search_before=
 replace_before=
 search_after=
--- a/xml-xampp/rss/movies.rss
+++ b/xml-xampp/rss/movies.rss
@ -23,7 +23,7 @@
 ###############################################################################################
 [RESERVED]
 title=Movies and DVD
-copyright= RSS feed provided by fandango.com and brought to you by Aastra Telecom.
+copyright= RSS feed provided by fandango.com and brought to you by Mitel Networks.
 search_before=
 replace_before=
 search_after=
--- a/xml-xampp/rss/netflix.rss
+++ b/xml-xampp/rss/netflix.rss
@ -24,9 +24,9 @@

 [RESERVED]
 title=Netflix
-copyright= RSS feed provided by Netflix.com and brought to you by Aastra Telecom.
-copyright-en= RSS feed provided by Netflix.com and brought to you by Aastra Telecom.
-copyright-fr= Fil RSS fourni par Le Netflix.com et mise en forme pour vous par Aastra Telecom.
+copyright= RSS feed provided by Netflix.com and brought to you by Mitel Networks.
+copyright-en= RSS feed provided by Netflix.com and brought to you by Mitel Networks.
+copyright-fr= Fil RSS fourni par Le Netflix.com et mise en forme pour vous par Mitel Networks.
 search_before=
 replace_before=
 search_after=
--- a/xml-xampp/rss/rss.php
+++ b/xml-xampp/rss/rss.php
@ -4,9 +4,9 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2007-2009 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
-# Supported Aastra Phones
+# Supported Phones
 #   All phones but
 #       9112i
 #       9133i
@ -114,10 +114,20 @@ $string=preg_replace('/\n/',' ', $string);
 # Process after
 if($pattern[1]==1) $string=preg_replace($after_s, $after_r, $string);

+$string=escape_decode($string);
+
 # Return processed string
 return($string);
 }

+function escape_decode($string)
+{
+return(str_replace(
+	array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
+	array('&', '<', '>', '"', "'"),
+	$string));
+}
+
 #############################################################################
 # Beginning of the active code
 #############################################################################
@ -149,6 +159,8 @@ $language=Aastra_get_language();
 # Global compatibility
 $nb_softkeys=Aastra_number_physical_softkeys_supported();
 $is_toptitle_supported=Aastra_is_top_title_supported();
+$is_touch_launch=Aastra_is_touch_launch_supported();
+$is_font_mono=Aastra_is_font_mono_supported();

 # IF RSS config exists
 if(file_exists($file))
@ -225,7 +237,7 @@ else
 # Process request
 if(empty($index))
 	{
-	if(($nb_rss>1) and (Aastra_number_softkeys_supported()<=6))
+	if(($nb_rss>1) and ($nb_softkeys<=6))
 		{
 		# Display list of topics
 		$object=new AastraIPPhoneTextMenu();
@ -233,6 +245,7 @@ if(empty($index))
 		if($last_index!='') $object->setDefaultIndex($last_index);
 		if(Aastra_is_style_textmenu_supported()) $object->setStyle('radio');
 		if(Aastra_is_textmenu_wrapitem_supported()) $object->setWrapList();
+		if($is_font_mono) $object->setNoFontMono();

 		# Title
 		if($is_toptitle_supported) $object->setTopTitle($Main);
@ -408,6 +421,7 @@ else
 			if(Aastra_is_style_textmenu_supported()) $object->setStyle('radio');
 			if(Aastra_is_textmenu_wrapitem_supported()) $object->setWrapList();
 			if(Aastra_is_wrap_title_supported()) $object->setTitleWrap();
+			if($is_font_mono) $object->setNoFontMono();
 			if((!Aastra_is_softkeys_supported()) and ($page!=1)) $object->addEntry(Aastra_get_label('Previous Page',$language),$XML_SERVER.'&index='.($index+1).'&page='.($page-1));
 			$i=1;
 			foreach ($array_rss as $key=>$value) 
@ -442,6 +456,31 @@ else
 						$object->addSoftkey('4', Aastra_get_label('Exit',$language), 'SoftKey:Exit');
 						}
 					}
+				else if($nb_softkeys==5)
+					{
+					if(($page!=1) or ($page!=$last))
+						{
+						$object->addSoftkey('1', Aastra_get_label('Select',$language), 'SoftKey:Select');
+						if($page!=1) $object->addSoftkey('2', Aastra_get_label('Previous',$language), $XML_SERVER.'&index='.($index+1).'&page='.($page-1));
+						if($page!=$last) $object->addSoftkey('3', Aastra_get_label('Next',$language), $XML_SERVER.'&index='.($index+1).'&page='.($page+1));
+						if($nb_rss>1)
+							{
+							$object->addSoftkey('4', Aastra_get_label('Back',$language), $XML_SERVER.'&last_index='.($index+1));
+							$object->setCancelAction($XML_SERVER.'&last_index='.($index+1));
+							}
+						$object->addSoftkey('5', Aastra_get_label('Exit',$language), 'SoftKey:Exit');
+						}
+					else
+						{
+						$object->addSoftkey('1', Aastra_get_label('Select',$language), 'SoftKey:Select');
+						if($nb_rss>1)
+							{
+							$object->addSoftkey('4', Aastra_get_label('Back',$language), $XML_SERVER.'&last_index='.($index+1));
+							$object->setCancelAction($XML_SERVER.'&last_index='.($index+1));
+							}
+						$object->addSoftkey('5', Aastra_get_label('Exit',$language), 'SoftKey:Exit');
+						}
+					}
 				else if($nb_softkeys==6)
 					{
 					$object->addSoftkey('1', Aastra_get_label('Select',$language), 'SoftKey:Select');
@ -498,7 +537,7 @@ else
 		$object->setDestroyOnExit();
 		if(Aastra_is_wrap_title_supported())$object->setTitleWrap();
 		if($is_toptitle_supported) $object->setTopTitle($Title[$index]);
-		if(($nb_softkeys==4) || ($nb_softkeys==6)) $object->setTitle($array_rss[$rank]['title']);
+		if(($nb_softkeys>=4) and ($nb_softkeys<=6)) $object->setTitle($array_rss[$rank]['title']);
 		else 
 			{
 			if(count($array_rss)>1) $object->setTitle($Title[$index].' ('.($rank+1).'/'.count($array_rss).') - '.$array_rss[$rank]['title']);
@ -509,12 +548,12 @@ else
 		else $back=$XML_SERVER.'&last_index='.($index+1);
 		if(Aastra_is_softkeys_supported())
 			{
-			if($nb_softkeys==4)
+			if(($nb_softkeys==4) or ($nb_softkeys==5))
 				{
 				if($rank!=0) $object->addSoftkey('1',Aastra_get_label('Previous',$language), $XML_SERVER.'&index='.($index+1).'&rank='.$rank);
 				if($rank!=(count($array_rss)-1))$object->addSoftkey('2',Aastra_get_label('Next',$language),$XML_SERVER.'&index='.($index+1).'&rank='.($rank+2));
-				$object->addSoftkey('3',Aastra_get_label('Back',$language),$back);
-				$object->addSoftkey('4',Aastra_get_label('Exit',$language),'SoftKey:Exit');
+				$object->addSoftkey($nb_softkeys-1,Aastra_get_label('Back',$language),$back);
+				$object->addSoftkey($nb_softkeys,Aastra_get_label('Exit',$language),'SoftKey:Exit');
 				}
 			else if($nb_softkeys==6)
 				{
--- a/xml-xampp/stock/currency.php
+++ b/xml-xampp/stock/currency.php
@ -4,17 +4,9 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2008 Aastra Telecom Ltd
-#
-# Supported Aastra Phones
-#   55i
-#   57i
-#   57iCT
-#   9480i
-#   9480iCT
+# Copyright 2005-2015 Mitel Networks
 #
 # script.php
-#
 #############################################################################

 #############################################################################
@ -191,7 +183,7 @@ Aastra_trace_call('currency','user='.$user.', action='.$action.', selection='.$s

 # Test User Agent
 Aastra_test_phone_version('2.1.1.',0);
-Aastra_test_phone_model(array('Aastra9480i','Aastra9480iCT','Aastra55i','Aastra57i','Aastra57iCT','Aastra35i','Aastra37i','Aastra6867i','Aastra6739i'),True,0);
+Aastra_test_phone_model(array('Aastra9480i','Aastra9480iCT','Aastra55i','Aastra57i','Aastra57iCT','Aastra35i','Aastra37i','Aastra6867i','Aastra6869i','Aastra6873i','Aastra6739i'),True,0);

 # Get Language
 $language=Aastra_get_language();
--- a/xml-xampp/stock/stock.php
+++ b/xml-xampp/stock/stock.php
@ -4,7 +4,7 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2007-2009 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
 # Supported Aastra Phones
 #   All phones but best on large display phones
@ -218,7 +218,7 @@ switch($action)
 		if($action=='input')
 			{
 			if($data['last']!=NULL) $default=$data['last'];
-			else $default='AAH.TO';
+			else $default='MITL';
 			}
 		else $default=$data['favorites'][$selection];
 		$object->setDefault($default);
--- a/xml-xampp/weather/weather_us.php
+++ b/xml-xampp/weather/weather_us.php
@ -4,18 +4,10 @@
 #
 # Aastra SIP Phones 1.4.2 or better
 #
-# Copyright 2007-2009 Aastra Telecom Ltd
+# Copyright Mitel Networks 2005-2015
 #
 # Supported Aastra Phones
-#   All phones but best on
-#       480i
-#       480iCT
-#       35i
-#       35i CT
-#       55i
-#       57i
-#       57i CT
-#       6739i
+#   All phones
 #
 # script.php?zip=XXXXX
 #    where XXXXX is the US ZIP code of the city (optional)
@ -141,6 +133,7 @@ $language=Aastra_get_language();
 # Global compatibility
 $nb_softkeys=Aastra_number_physical_softkeys_supported();
 $is_toptitle_supported=Aastra_is_top_title_supported();
+$is_font_mono=Aastra_is_font_mono_supported();

 # Callback
 $XML_SERVER.='?user='.$user;
@ -239,7 +232,7 @@ else
 					fputs($handle,'title='.$allItems[$y]['title']."\n");
 					$description=filter_format($allItems[$y]['description']);
 					if(trim($description,' ')=='') $description=Aastra_get_label('No data provided',$language);
-					$allItems[$y]['description']= $description.' '.Aastra_get_label('RSS feed provided by rssweather.com and brought to you by Aastra Telecom.',$language);
+					$allItems[$y]['description']= $description.' '.Aastra_get_label('RSS feed provided by rssweather.com and brought to you by Mitel.',$language);
 					fputs($handle,'description='.$allItems[$y]['description']."\n");
 					fputs($handle,'uri='.$XML_SERVER.'&zip='.$zip.'&index='.($y+1)."\n");
 					}
@ -281,6 +274,7 @@ else
 			$object=new AastraIPPhoneTextMenu();
 			$object->setDestroyOnExit();
 			if(Aastra_is_style_textmenu_supported()) $object->setStyle('radio');
+	 		if($is_font_mono) $object->setNoFontMono();

 			# Title
 			if($is_toptitle_supported) $object->setTopTitle($array_rss[99]['title']);
Author	SHA1	Message	Date
Markus Birth	8273ee8749	5.0.0 version.	2018-02-15 23:22:08 +01:00
Markus Birth	071529b1e8	4.2.0 version.	2018-02-15 23:20:25 +01:00