diff --git a/README.md b/README.md index 010a499..216c039 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Make sure you have the following installed on your system: - clang >= 3.6 (note: older not supported, higher advised) - gnu make - pbx: - - asterisk >= 1.8 (absolute minimum & not recomended) + - asterisk >= 1.8 (absolute minimum & not recommended) - asterisk >= 13.7 or asterisk >= 14.0 recommended - gui: - freepbx >= 13.0.192 @@ -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/README.ru.md b/README.ru.md index ec09cdf..f2a671b 100644 --- a/README.ru.md +++ b/README.ru.md @@ -48,7 +48,7 @@ Make sure you have the following installed on your system: - clang >= 3.6 (note: older not supported, higher advised) - gnu make - pbx: - - asterisk >= 1.8 (absolute minimum & not recomended) + - asterisk >= 1.8 (absolute minimum & not recommended) - asterisk >= 13.7 or asterisk >= 14.0 or asterisk >= 15.0 (Тестировалось на стендах) - gui: - freepbx >= 13.0.192 (http://wiki.freepbx.org/display/FOP/Install+FreePBX) diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index b3fba99..95612ec 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -152,7 +152,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $this->sccpvalues['sccp_compatible']['data'] = $this->sccpvalues['SccpDBmodel']['data']; } } - // Load Advanced Form Constuctor Data + // Load Advanced Form Constructor Data if (empty($this->sccpvalues['displayconfig'])) { $xml_vars = __DIR__ . '/conf/sccpgeneral.xml.v' . $this->sccpvalues['sccp_compatible']['data']; } else { @@ -701,7 +701,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { return array('status' => false, 'message' => print_r($res)); break; /* !TODO!: -TODO-: dialplan templates should be removed (only required for very old devices (like ATA) */ -// ------------------------------- Old + Sip deviece suport - In the development--- +// ------------------------------- Old + Sip deviece support - In the development--- case 'save_dialplan_template': $res = $this->save_DialPlan($request); //public @@ -723,7 +723,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { return array('status' => false, 'message' => print_r($res)); } break; -// ------------------------------- Old deviece suport - In the development--- +// ------------------------------- Old deviece support - In the development--- case 'delete_hardware': if (!empty($request['idn'])) { foreach ($request['idn'] as $idv) { @@ -762,7 +762,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { $ver_id = $this->sccp_create_device_XML($data['name']); }; - if ($this->sccpvalues['siptftp']['data'] == 'on') { // Check SIP Suport Enabled + if ($this->sccpvalues['siptftp']['data'] == 'on') { // Check SIP Support Enabled $this->sccp_create_xmlSoftkey(); // Create Softkey Sets for SIP } @@ -919,7 +919,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } $this->sccp_create_sccp_init(); -// !TODO!: -TODO-: Check SIP Suport Enabled +// !TODO!: -TODO-: Check SIP Support Enabled $this->sccp_create_xmlSoftkey(); $msg = print_r($this->srvinterface->sccp_reload(), 1); // $msg = print_r($this->srvinterface->sccp_core_commands(array('cmd' => 'sccp_reload')), 1); @@ -1021,7 +1021,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } return $result; break; -// ------------------------------- Old deviece suport - In the development--- +// ------------------------------- Old deviece support - In the development--- case 'getDialTemplate': $result = $this->get_DialPlanList(); if (empty($result)) { @@ -1029,7 +1029,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { } return $result; break; -// ------------------------------- Old deviece suport - In the development--- +// ------------------------------- Old deviece support - In the development--- case 'backupsettings': $filename = $this->sccp_create_sccp_backup(); $file_name = basename($filename); @@ -1560,7 +1560,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO { public function getCodecs($type, $showDefaults = false) { $allSupported = array(); -// $Sccp_Codec = array('gsm','slin16','alow','ulaw','g722','g723','g726','g728','g729','ilibc','isac','opus','h224','aac','h264','h263','h265','h261'); +// $Sccp_Codec = array('gsm','slin16','allow','ulaw','g722','g723','g726','g728','g729','ilibc','isac','opus','h224','aac','h264','h263','h265','h261'); $Sccp_Codec = array('gsm', 'slin16', 'alaw', 'ulaw', 'g722', 'g723', 'g726', 'g728', 'g729', 'ilibc', 'opus', 'h264', 'h263', 'h265', 'h261'); switch ($type) { case 'audio': diff --git a/Sccp_manager.inc/aminterface/aminterface.class.php b/Sccp_manager.inc/aminterface/aminterface.class.php index 71b9683..d41fe50 100644 --- a/Sccp_manager.inc/aminterface/aminterface.class.php +++ b/Sccp_manager.inc/aminterface/aminterface.class.php @@ -233,15 +233,15 @@ class aminterface { } else if ($evePos !== false) { $event = $this->_messageToEvent($aMsg); // Event Ok - $this->_msgToDebug(99,'--- Responce Type 2 --- '); + $this->_msgToDebug(99,'--- Response Type 2 --- '); $this->_msgToDebug(99,$aMsg); - $this->_msgToDebug(99,'--- Event Responce Type 2 --- '); + $this->_msgToDebug(99,'--- Event Response Type 2 --- '); $this->_msgToDebug(99,$event); if ($event != null) { $response = $this->findResponse($event); // print_r($response); -// print_r('
--- E2 Responce Type 2 ----------
'); +// print_r('
--- E2 Response Type 2 ----------
'); if ($response === false || $response->isComplete()) { $this->dispatch($event); // не работает @@ -493,7 +493,7 @@ class aminterface { $result = array(); if ($this->_connect_state) { $_action = new \FreePBX\modules\Sccp_manager\aminterface\ReloadAction('chan_sccp'); -// $_action = new \FreePBX\modules\Sccp_manager\aminterface\CommandAction('sccp reload force'); // No Responce Result !! +// $_action = new \FreePBX\modules\Sccp_manager\aminterface\CommandAction('sccp reload force'); // No Response Result !! $_response = $this->send($_action); $result = $_response->getMessage(); } diff --git a/Sccp_manager.inc/aminterface/oldinterface.class.php b/Sccp_manager.inc/aminterface/oldinterface.class.php index 894594d..54a9f22 100644 --- a/Sccp_manager.inc/aminterface/oldinterface.class.php +++ b/Sccp_manager.inc/aminterface/oldinterface.class.php @@ -392,20 +392,20 @@ class oldinterface { $it++; } while ((count($line_arr) > 3) and ( $it < count($line_arr))); explode(";|", implode(";|", $line_arr)); - list ($descr, $adress, $devname, $status, $token, $junk) = explode(";|", implode(";|", $line_arr)); + list ($descr, $address, $devname, $status, $token, $junk) = explode(";|", implode(";|", $line_arr)); -// list ($descr, $adress, $devname, $status, $junk) = $line_arr; +// list ($descr, $address, $devname, $status, $junk) = $line_arr; // if (strlen($ast_key[$devname]) < 1) { if (strlen($devname) > 1) { - $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $token); + $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $address, 'descr' => $descr, 'token' => $token); } /* if (isset($ast_key[$devname])) { if (strlen($ast_key[$devname]) < 1) { - $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $descr); + $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $address, 'descr' => $descr, 'token' => $descr); } } else { - $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $adress, 'descr' => $descr, 'token' => $token); + $ast_key[$devname] = Array('name' => $devname, 'status' => $status, 'address' => $address, 'descr' => $descr, 'token' => $token); } * */ diff --git a/Sccp_manager.inc/extconfigs.class.php b/Sccp_manager.inc/extconfigs.class.php index 44182ee..9570b7e 100644 --- a/Sccp_manager.inc/extconfigs.class.php +++ b/Sccp_manager.inc/extconfigs.class.php @@ -223,7 +223,7 @@ class extconfigs { 'South Africa' => array('offset' => '120', 'daylight' => ''), 'Jerusalem' => array('offset' => '120', 'daylight' => 'Daylight'), 'Saudi Arabia' => array('offset' => '180', 'daylight' => ''), - /* Russion Regions */ + /* Russian Regions */ 'Russian/Kaliningrad' => array('offset' => '120', 'daylight' => '', 'cisco_code' => 'South Africa Standard Time'), 'Russian/Moscow' => array('offset' => '180', 'daylight' => '', 'cisco_code' => 'Russian Standard Time'), 'Russian/St.Peterburg' => array('offset' => '180', 'daylight' => '', 'cisco_code' => 'Russian Standard Time'), @@ -237,7 +237,7 @@ class extconfigs { 'Russian/Sakhalin' => array('offset' => '660', 'daylight' => '', 'cisco_code' => 'Central Pacific Standard Time'), 'Russian/Magadan' => array('offset' => '660', 'daylight' => '', 'cisco_code' => 'Central Pacific Standard Time'), 'Russian/Kamchatka' => array('offset' => '720', 'daylight' => '', 'cisco_code' => 'Fiji Standard Time'), - /* EnD - Russion Regions */ + /* EnD - Russian Regions */ 'Iran' => array('offset' => '210', 'daylight' => 'Daylight'), 'Caucasus' => array('offset' => '240', 'daylight' => 'Daylight'), 'Arabian' => array('offset' => '240', 'daylight' => ''), @@ -309,9 +309,9 @@ class extconfigs { } if (!is_writeable($base_config["tftp_path"])) { if (!empty($this->paren_class)) { - $this->paren_class->class_error['tftp_path'] = 'No write permision on tftp DIR'; + $this->paren_class->class_error['tftp_path'] = 'No write permission on tftp DIR'; } - return array('error' => 'No write permision on tftp DIR'); + return array('error' => 'No write permission on tftp DIR'); } // END Test Base dir (/tftproot) diff --git a/Sccp_manager.inc/srvinterface.class.php b/Sccp_manager.inc/srvinterface.class.php index 11a0e8d..33eb96b 100644 --- a/Sccp_manager.inc/srvinterface.class.php +++ b/Sccp_manager.inc/srvinterface.class.php @@ -383,7 +383,7 @@ class srvinterface { $resp .= fgets($fp); } $time_resp = microtime_float(); - $resp .= "\r\n\r\n Connect :".($time_send - $time_connect). " Logoff :".($time_logoff- $time_send). " Responce :".($time_resp-$time_logoff)."\r\n\r\n "; + $resp .= "\r\n\r\n Connect :".($time_send - $time_connect). " Logoff :".($time_logoff- $time_send). " Response :".($time_resp-$time_logoff)."\r\n\r\n "; // print_r(fgets($fp)); // print_r('
'); // echo fgets($fp, 128); diff --git a/Technical.note/Conferencing.txt b/Technical.note/Conferencing.txt index ced8269..d3cfee8 100644 --- a/Technical.note/Conferencing.txt +++ b/Technical.note/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.note/SEP0000000000.cnf.xml_annotated b/Technical.note/SEP0000000000.cnf.xml_annotated index 4637976..fa5a73f 100644 --- a/Technical.note/SEP0000000000.cnf.xml_annotated +++ b/Technical.note/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 -->