Prerelease 06.10.2017

Rename Label.
This commit is contained in:
PhantomVl 2017-10-07 17:52:05 +03:00
parent 40674c3937
commit 14d6ffc298
4 changed files with 23 additions and 16 deletions

View file

@ -20,3 +20,5 @@ PlacedCalls
Which does show numbers you can redial, but also include their current device state, so you know when they are currently busy. Note that the other phonebook entries will now also monitor the remove device state and show the current device state. Which does show numbers you can redial, but also include their current device state, so you know when they are currently busy. Note that the other phonebook entries will now also monitor the remove device state and show the current device state.
Note: the hints for the extension need to be in the same context as the device/global context, for callLogBlfEnabled to work Note: the hints for the extension need to be in the same context as the device/global context, for callLogBlfEnabled to work
# This does not apply to phones 7940. Be careful with these keys the phone may not boot !!!

View file

@ -39,6 +39,8 @@
* - support kv-store ????? * - support kv-store ?????
* + Shared Line * + Shared Line
* - bug Fix ...(K no w bug? no fix) * - bug Fix ...(K no w bug? no fix)
* - restore default Value on page
* - restore default Value on sccp.class
* *
* * I think this file should be split in 3 parts (as in Model-View-Controller(MVC)) * * I think this file should be split in 3 parts (as in Model-View-Controller(MVC))
* * XML/Database Parts -> Model directory * * XML/Database Parts -> Model directory

View file

@ -170,7 +170,8 @@ class Sccp extends \FreePBX\modules\Core\Driver {
$category = "general"; $category = "general";
$tmparr = array(); $tmparr = array();
$tt = _("The maximum number of incoming calls to this line."); $tt = _("The maximum number of incoming calls to this line.");
$tmparr['incominglimit'] = array('prompttext' => _('Line incoming limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel); // $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel);
$tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 1);
$tt = _("Asterisk context this line will use send calls to/from (Note: Only change this is you know what you are doing)."); $tt = _("Asterisk context this line will use send calls to/from (Note: Only change this is you know what you are doing).");
$tmparr['context'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1); $tmparr['context'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1);
@ -253,7 +254,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
$select[] = array('value' => 'no', 'text' => 'No'); $select[] = array('value' => 'no', 'text' => 'No');
$tt = _("Outside dialtone frequency (defaul 0x22)"); $tt = _("Outside dialtone frequency (defaul 0x22)");
$tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone tone'), 'value' => '', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select'); $tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone'), 'value' => '0x22', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select');
# ??? is there no easier way to specify a boolean radio group ? # ??? is there no easier way to specify a boolean radio group ?
unset($select); unset($select);
@ -298,8 +299,8 @@ class Sccp extends \FreePBX\modules\Core\Driver {
$select[] = array('value' => $value, 'text' => _($value)); $select[] = array('value' => $value, 'text' => _($value));
} }
$tt = _("Music On Hold"); $tt = _("Music on hold");
$tmparr['musicclass'] = array('prompttext' => _('Music On Hold'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1); $tmparr['musicclass'] = array('prompttext' => _('Music on hold'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1);
$devopts = $tmparr; $devopts = $tmparr;
return $devopts; return $devopts;

View file

@ -56,6 +56,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
switch ($key) { switch ($key) {
case 'secondary_dialtone_digits': case 'secondary_dialtone_digits':
case 'secondary_dialtone_tone': case 'secondary_dialtone_tone':
case 'incominglimit':
case 'dnd': case 'dnd':
$sql .= ', '.$key; $sql .= ', '.$key;
if (!empty($settings[$val]['value'])){ if (!empty($settings[$val]['value'])){
@ -116,7 +117,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
"flag" => $flag++ "flag" => $flag++
), ),
"incominglimit" => array( "incominglimit" => array(
"value" => "", "value" => "2",
"flag" => $flag++ "flag" => $flag++
), ),
"context" => array( "context" => array(
@ -182,20 +183,19 @@ class Sccp extends \FreePBX\modules\Core\Driver {
$section = _("Settings"); $section = _("Settings");
$category = "general"; $category = "general";
$tmparr = array(); $tmparr = array();
$tt = _("The SCCP channel number for this port."); $tt = _("The SCCP channel number for this port. If you plaining to use this line as 'Shared' or use on several devices - leave this field blank or set limit to 10 calls.");
$tmparr['incominglimit'] = array('prompttext' => _('Line incoming limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel); // $tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '2', 'tt' => $tt, 'level' => 0, 'jsvalidation' => 'isEmpty()', 'failvalidationmsg' => $msgInvalidChannel);
$tmparr['incominglimit'] = array('prompttext' => _('Incoming Call Limit'), 'value' => '', 'tt' => $tt, 'level' => 1);
$tt = _("Asterisk context this device will send calls to. Only change this is you know what you are doing."); $tt = _("Asterisk context this device will send calls to. Only change this is you know what you are doing.");
$tmparr['context'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1); $tmparr['context'] = array('prompttext' => _('Line context'), 'value' => 'from-internal', 'tt' => $tt, 'level' => 1);
$tt = _("Phone call group callgroup=1,3-4"); $tt = _("Phone call group callgroup=1,3-4");
$tmparr['callgroup'] = array('prompttext' => _('Call group id'),'value' => '', 'tt' => $tt, 'level' => 1); $tmparr['callgroup'] = array('prompttext' => _('Call group id'),'value' => '', 'tt' => $tt, 'level' => 1);
$tt = _("Phone pickup group pickupgroup=1,3-4"); $tt = _("Phone pickup group pickupgroup=1,3-4");
$tmparr['namedcallgroup'] = array('prompttext' => _('Call group name'),'value' => '', 'tt' => $tt, 'level' => 1); $tmparr['namedcallgroup'] = array('prompttext' => _('Named Call Group'),'value' => '', 'tt' => $tt, 'level' => 1);
$tt = _("sets the named caller groups this line is a member of (ast111)"); $tt = _("sets the named caller groups this line is a member of (ast111)");
$tmparr['pickupgroup'] = array('prompttext' => _('Pickup group id'),'value' => '', 'tt' => $tt, 'level' => 1); $tmparr['pickupgroup'] = array('prompttext' => _('Pickup group id'),'value' => '', 'tt' => $tt, 'level' => 1);
$tt = _("Phone pincode"); $tt = _("Phone pincode");
$tmparr['namedpickupgroup'] = array('prompttext' => _('Pickup group name'),'value' => '', 'tt' => $tt, 'level' => 1); $tmparr['namedpickupgroup'] = array('prompttext' => _('Named Pickup Group'),'value' => '', 'tt' => $tt, 'level' => 1);
$tt = _("Sets the named pickup groups this line is a member of (this phone can pickup calls from remote phones which are in this caller group (ast111)");
$tmparr['pin'] = array('value' => '', 'tt' => $tt, 'level' => 1);
$tt = _("Digits to indicate an external line to user (secondary dialtone) Sample 9 or 8 (max 9 digits)"); $tt = _("Digits to indicate an external line to user (secondary dialtone) Sample 9 or 8 (max 9 digits)");
$tmparr['secondary_dialtone_digits'] = array('prompttext' => _('Secondary dialtone digits'), 'value' => '', 'tt' => $tt, 'level' => 1); $tmparr['secondary_dialtone_digits'] = array('prompttext' => _('Secondary dialtone digits'), 'value' => '', 'tt' => $tt, 'level' => 1);
@ -257,7 +257,7 @@ class Sccp extends \FreePBX\modules\Core\Driver {
$select[] = array('value' => 'no', 'text' => 'No'); $select[] = array('value' => 'no', 'text' => 'No');
$tt = _("Outside dialtone frequency (defaul 0x22)"); $tt = _("Outside dialtone frequency (defaul 0x22)");
$tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone tone'), 'value' => '', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select'); $tmparr['secondary_dialtone_tone'] = array('prompttext' => _('Secondary dialtone'), 'value' => '0x22', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'select');
@ -270,8 +270,8 @@ class Sccp extends \FreePBX\modules\Core\Driver {
unset($select); unset($select);
$select[] = array('value' => 'yes', 'text' => 'Yes'); $select[] = array('value' => 'yes', 'text' => 'Yes');
$select[] = array('value' => 'no', 'text' => 'No'); $select[] = array('value' => 'no', 'text' => 'No');
$tt = _("Echo calcel"); $tt = _("Echo cancel");
$tmparr['echocancel'] = array('prompttext' => _('Echo calcel'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio'); $tmparr['echocancel'] = array('prompttext' => _('Echo cancel'), 'value' => 'yes', 'tt' => $tt, 'select' => $select, 'level' => 1, 'type' => 'radio');
unset($select); unset($select);
$select[] = array('value' => 'off', 'text' => 'Off'); $select[] = array('value' => 'off', 'text' => 'Off');
@ -301,9 +301,11 @@ class Sccp extends \FreePBX\modules\Core\Driver {
$select[] = array('value' => $value, 'text' => _($value)); $select[] = array('value' => $value, 'text' => _($value));
} }
$tt = _("Musik On Hold "); $tt = _("Music on hold");
$tmparr['musicclass'] = array('prompttext' => _('Musik On Hold'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1); $tmparr['musicclass'] = array('prompttext' => _('Music on hold'), 'value' => 'no', 'tt' => $tt, 'select' => $select, 'level' => 1);
$tt = _("Sets the named pickup groups this line is a member of (this phone can pickup calls from remote phones which are in this caller group (ast111)");
$tmparr['pin'] = array('value' => '', 'tt' => $tt, 'level' => 1);
$devopts = $tmparr; $devopts = $tmparr;