diff --git a/README.md b/README.md index a679e56..6324847 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Make sure you have the following installed on your system: - Creating mysql DB from sorce ```mysql -u root asterisk < mysql-v5_enum.sql``` -- TFTP Server running under (recomended) /tftpboot/ [See our WIKI](https://github.com/chan-sccp/chan-sccp/wiki/setup-tftp-service) +- TFTP Server running under (recommended) /tftpboot/ [See our WIKI] (https://github.com/chan-sccp/chan-sccp/wiki/setup-tftp-service) - You will need the phone settings templates. You can use the templates taken from the distribution "chan-sccp" ```cp /usr/src/chan-sccp/conf/tftp/\*.xml\* /tftpboot/templates/``` diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index a6a0e1d..a25d692 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -997,17 +997,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { if (empty($dev_schema)) { $dev_schema[0]['model'] = "ERROR in Model Schema"; } - $result[] = array( - 'name' => $id_name, - 'mac' => $id_name, - 'button' => '---', - 'type' => $dev_schema[0]['model'], - 'new_hw' => 'Y', - 'description' => '*NEW* ' . $dev_ids['descr'], - 'status' => '*NEW* ' . $dev_ids['status'], - 'address' => $dev_ids['address'], - 'addon' => $dev_addon - ); + $result[] = array('name' => $id_name, 'mac' => $id_name, 'button' => '---', 'type' => $dev_schema[0]['model'], 'new_hw' => 'Y', + 'description' => '*NEW* ' . $dev_ids['descr'], 'status' => '*NEW* ' . $dev_ids['status'], 'address' => $dev_ids['address'], + 'addon' => $dev_addon); } } } diff --git a/Sccp_manager.inc/dbinterface.class.php b/Sccp_manager.inc/dbinterface.class.php index f5e7ce7..07c4ea4 100644 --- a/Sccp_manager.inc/dbinterface.class.php +++ b/Sccp_manager.inc/dbinterface.class.php @@ -205,13 +205,15 @@ class dbinterface case 'byciscoid': if (!empty($filter)) { if (!empty($filter['model'])) { - if (!strpos($filter['model'], 'loadInformation')) { - $filter['model'] = 'loadInformation' . $filter['model']; + if (strpos($filter['model'], 'loadInformation')) { + $stmt = $dbh->prepare('SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (loadinformationid =' . $filter['model'] . ') ORDER BY model'); + } else { + $stmt = $dbh->prepare('SELECT ' . $sel_inf . ' FROM sccpdevmodel WHERE (loadinformationid = loadInformation' . $filter['model'] . ') ORDER BY model'); } $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (loadinformationid = :model ) ORDER BY model"); $stmt->bindParam(':model', $filter['model'], \PDO::PARAM_STR); } else { - $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel ORDER BY model"); + $stmt = $dbh->prepare('SELECT ' . $sel_inf . ' FROM sccpdevmodel ORDER BY model'); } break; } @@ -403,6 +405,7 @@ class dbinterface } } } + return $result; } } diff --git a/Sccp_manager.inc/extconfigs.class.php b/Sccp_manager.inc/extconfigs.class.php index 0945132..08ffad2 100644 --- a/Sccp_manager.inc/extconfigs.class.php +++ b/Sccp_manager.inc/extconfigs.class.php @@ -153,7 +153,8 @@ class extconfigs 'onstealable' => 'redial,newcall,barge,intrcpt,cfwdall,pickup,gpickup,dnd', 'holdconf' => 'resume,newcall,endcall,join', 'uriaction' => 'default'); -// Cisco Language Code / Directory +// Cisco Language Code / Directory +// private $cisco_language = array('ar_SA' => array('code' => 'ar', 'language' => 'Arabic', 'locale' => 'Arabic_Saudi_Arabia', 'codepage' => 'ISO8859-1'), 'bg_BG' => array('code' => 'bg', 'language' => 'Bulgarian', 'locale' => 'Bulgarian_Bulgaria', 'codepage' => 'ISO8859-1'), 'cz_CZ' => array('code' => 'cz', 'language' => 'Czech', 'locale' => 'Czech_Czech_Republic', 'codepage' => 'ISO8859-1'), diff --git a/Sccp_manager.inc/srvinterface.class.php b/Sccp_manager.inc/srvinterface.class.php index 88b4e56..982ecb1 100644 --- a/Sccp_manager.inc/srvinterface.class.php +++ b/Sccp_manager.inc/srvinterface.class.php @@ -14,8 +14,8 @@ class srvinterface { var $error; var $_info; - var $ami_mode; - var $useAmiForSoftKeys = true; + var $ami_mode = false; + var $useAmiInterface = true; public function __construct($parent_class = null) { $this->paren_class = $parent_class; @@ -231,11 +231,11 @@ class srvinterface { default: $retval = 430; } - if ($res['RevisionNum'] < 11048) { - $this->useAmiForSoftKeys = false; + if ($res['RevisionNum'] < 11063) { + $this->useAmiInterface = false; } if ($revNumComp) { - return array($retval, $this->useAmiForSoftKeys); + return array($retval, $this->useAmiInterface); } return $retval; } @@ -249,11 +249,12 @@ class srvinterface { } public function sccp_list_keysets() { - if (($this->ami_mode) && ($this->useAmiForSoftKeys)){ + if ($this->ami_mode) { return $this->aminterface->sccp_list_keysets(); } else { return $this->oldinterface->sccp_list_keysets(); } + } public function sccp_get_active_device() { diff --git a/Technical.notes/Conferencing.txt b/Technical.notes/Conferencing.txt index ced8269..d3cfee8 100644 --- a/Technical.notes/Conferencing.txt +++ b/Technical.notes/Conferencing.txt @@ -12,7 +12,7 @@ param default description conf_allow yes Allow the use of conference conf_play_general_announce yes Playback General Announcements (like: 'You are Entering/Leaving the conference') conf_play_part_announce yes Playback Personal/Participant Announcements, (like: 'You have been muted / You have been kicked') -conf_mute_on_entry no Mute new participants from the start, when they enter the conference (Preventing them to talk amongst one another). The Moderator will have to UnMute a participant manually to allow them to speak. Usefull in a classroom setting. +conf_mute_on_entry no Mute new participants from the start, when they enter the conference (Preventing them to talk amongst one another). The Moderator will have to UnMute a participant manually to allow them to speak. Useful in a classroom setting. conf_music_on_hold_class 'default' Play music on hold of this class when no moderator is listening on the conference. If set to an empty string, no music on hold will be played. conf_show_conflist yes Automatically show conference list to the moderator Creating a New Conference (Conf Softkey) diff --git a/Technical.notes/SEP0000000000.cnf.xml_annotated b/Technical.notes/SEP0000000000.cnf.xml_annotated index 4637976..fa5a73f 100644 --- a/Technical.notes/SEP0000000000.cnf.xml_annotated +++ b/Technical.notes/SEP0000000000.cnf.xml_annotated @@ -308,7 +308,7 @@ For example, if you want to enter 411, 511, and 911 as special numbers, enter 411,511,911 in the field without spaces. string length = 16 - comma seperated + comma separated --> + - -

@@ -136,7 +135,7 @@ if (!empty($_REQUEST['id'])) {
- +
@@ -169,10 +168,72 @@ if (!empty($_REQUEST['id'])) {
-
+
+ +
+

+
+
+ + +
+

+
+
+ +
+
+
+
+
+
+ + +
+
+
+ +
+ '; + foreach ($video_codecs as $codec => $codec_state) { + $codec_trans = _($codec); + $codec_checked = $codec_state ? 'checked' : ''; + echo '
  • ' + . 'move ' + . '' + . '  
    • \n"; + } + echo ''; + ?> +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    + +
    + + diff --git a/views/server.info.php b/views/server.info.php index b5c1fb0..5a74bd8 100644 --- a/views/server.info.php +++ b/views/server.info.php @@ -36,7 +36,8 @@ $info['aminterface'] = $this->aminterface->info(); $info['XML'] = $this->xmlinterface->info(); $info['sccp_class'] = $driver['sccp']; $info['Core_sccp'] = array('Version' => $core['Version'], 'about' => 'Sccp ver.' . $core['Version'] . ' r' . $core['vCode'] . ' Revision :' . $core['RevisionNum'] . ' Hash :' . $core['RevisionHash']); -if (!$this->srvinterface->useAmiForSoftKeys) { +if (!$this->srvinterface->useAmiInterface) { + $info['aminterface']['about'] .= ' -- Disabled'; $info['Core_sccp'] = array('Version' => $core['Version'], 'about' => 'Sccp ver.' . $core['Version'] . ' r' . $core['vCode'] . ' Revision :' . $core['RevisionNum'] . ' Hash :' . $core['RevisionHash'] . ' ----Warning: Upgrade chan_sccp to use full ami functionality'); } $info['Asterisk'] = array('Version' => FreePBX::Config()->get('ASTVERSION'), 'about' => 'Asterisk.');