diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index 597f661..16e2332 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -421,41 +421,33 @@ and open the template in the editor. Base Version before all crash :-)
This needs to be enabled to allow the server to push background or ringtones to the phone in the SEPXXXXXXXXXX.cnf.xml of each phone:
-
+
-
- autoanswer_tone
- 0x32
- sccp-custom
-
- Autoanswer Tone: The tone the phone plays back when it picks up the phone in autoanswer mode. Default is '0x32'. Silence is '0x00'. There are lots of tones, all expressed as '0XNN' where 'NN' is a hexadecimal number.
+ autoanswer_tone
+ 0x32
+ form-control
+ Autoanswer Tone: The tone the phone plays back when it picks up the phone in autoanswer mode. Default is 'Zip'.
-
+
-
- remotehangup_tone
- 0x32
- sccp-custom
-
- Remote Hangup Tone: The tone played by the phone when it received a remote hang-up signal. Use '0' to disable the tone.
+ remotehangup_tone
+ 0x32
+ form-control
+ Remote Hangup Tone: The tone played by the phone when it received a remote hang-up signal. Default is 'Zip'. Use 'Silence' to disable the tone.
-
+
-
- transfer_tone
- 0x32
- sccp-custom
-
- Transfer Tone: The tone played when a call is transferred. Use '0' to disable the tone.
+ transfer_tone
+ 0x32
+ form-control
+ Transfer Tone: The tone played when a call is transferred. Default is 'Zip'. Use 'Silence' to disable the tone.
-
+
-
- callwaiting_tone
- 0x2D
- sccp-custom
-
- Call Waiting Tone: The tone played when a call is waiting. If you set this one to '0', you will not get a tone in your current call if a new call comes in, so you might want to disable call waiting for this line instead.
+ callwaiting_tone
+ 0x2D
+ form-control
+ Call Waiting Tone: The tone played when a call is waiting. Default is 'Call Waiting'. If you set this one to 'Silence', you will not get a tone in your current call if a new call comes in, so you might want to disable call waiting for this line instead.
diff --git a/sccpManClasses/dbinterface.class.php b/sccpManClasses/dbinterface.class.php
index 2a8d890..5321598 100644
--- a/sccpManClasses/dbinterface.class.php
+++ b/sccpManClasses/dbinterface.class.php
@@ -453,7 +453,6 @@ class dbinterface
$tech[$callGroup][] = $val[0];
}
} catch(\Exception $e) {}
- dbug($tech);
return $tech;
}
}
diff --git a/sccpManClasses/formcreate.class.php b/sccpManClasses/formcreate.class.php
index dd9d357..eda3dc5 100644
--- a/sccpManClasses/formcreate.class.php
+++ b/sccpManClasses/formcreate.class.php
@@ -534,7 +534,7 @@ class formcreate
$select_opt[$key]= $key;
}
}
-
+ break;
case 'SLM':
if (function_exists('music_list')) {
$moh_list = music_list();
@@ -545,9 +545,55 @@ class formcreate
$select_opt= $moh_list;
break;
case 'SLD':
- $day_format = array("D.M.Y", "D.M.YA", "Y.M.D", "YA.M.D", "M-D-Y", "M-D-YA", "D-M-Y", "D-M-YA", "Y-M-D", "YA-M-D", "M/D/Y", "M/D/YA",
+ $select_opt = array("D.M.Y", "D.M.YA", "Y.M.D", "YA.M.D", "M-D-Y", "M-D-YA", "D-M-Y", "D-M-YA", "Y-M-D", "YA-M-D", "M/D/Y", "M/D/YA",
"D/M/Y", "D/M/YA", "Y/M/D", "YA/M/D", "M/D/Y", "M/D/YA");
- $select_opt= $day_format;
+ break;
+ case 'SLDT':
+ $select_opt = array(
+ '0x00' => 'Silence',
+ '0x21' => 'Inside Dial Tone',
+ '0x22' => 'Outside Dial Tone',
+ '0x23' => 'Line Busy Tone',
+ '0x24' => 'Alerting Tone',
+ '0x25' => 'Reorder Tone',
+ '0x26' => 'Recorder Warning Tone',
+ '0x27' => 'Recorder Detected Tone',
+ '0x28' => 'Reverting Tone',
+ '0x29' => 'Receiver OffHook Tone',
+ '0x2A' => 'Partial Dial Tone',
+ '0x2B' => 'No Such Number Tone',
+ '0x2C' => 'Busy Verification Tone',
+ '0x2D' => 'Call Waiting Tone',
+ '0x2E' => 'Confirmation Tone',
+ '0x2F' => 'Camp On Indication Tone',
+ '0x30' => 'Recall Dial Tone',
+ '0x31' => 'Zip Zip',
+ '0x32' => 'Zip',
+ '0x33' => 'Beep Bonk',
+ '0x34' => 'Music Tone',
+ '0x35' => 'Hold Tone',
+ '0x36' => 'Test Tone',
+ '0x37' => 'DT Monitor Warning Tone',
+ '0x40' => 'Add Call Waiting',
+ '0x41' => 'Priority Call Wait',
+ '0x42' => 'Recall Dial',
+ '0x43' => 'Barg In',
+ '0x44' => 'Distinct Alert',
+ '0x45' => 'Priority Alert',
+ '0x46' => 'Reminder Ring',
+ '0x47' => 'Precedence RingBank',
+ '0x48' => 'Pre-EmptionTone',
+ '0x67' => '2105 HZ',
+ '0x68' => '2600 HZ',
+ '0x69' => '440 HZ',
+ '0x6A' => '300 HZ',
+ '0x77' => 'MLPP Pala',
+ '0x78' => 'MLPP Ica',
+ '0x79' => 'MLPP Vca',
+ '0x7A' => 'MLPP Bpa',
+ '0x7B' => 'MLPP Bnea',
+ '0x7C' => 'MLPP Upa'
+ );
break;
case 'SLK':
$softKeyList = array();
diff --git a/sccpManTraits/ajaxHelper.php b/sccpManTraits/ajaxHelper.php
index d135f85..18c317d 100644
--- a/sccpManTraits/ajaxHelper.php
+++ b/sccpManTraits/ajaxHelper.php
@@ -640,7 +640,6 @@ trait ajaxHelper {
$save_settings[$key] = $value;
}
}
- dbug($save_settings);
// Save this device.
$this->dbinterface->write('sccpdevice', $save_settings, 'replace');
// Retrieve the phone buttons from $_REQUEST ($get_settings) and write back to
diff --git a/sccpManTraits/helperFunctions.php b/sccpManTraits/helperFunctions.php
index 616f1f1..096b1bf 100644
--- a/sccpManTraits/helperFunctions.php
+++ b/sccpManTraits/helperFunctions.php
@@ -345,7 +345,6 @@ trait helperfunctions {
// This is a utility function for debug only, and is not used by core code
foreach (array('general','line', 'device') as $section) {
$sysConfig = $this->aminterface->getSCCPConfigMetaData($section);
- dbug($sysConfig);
}
unset($sysConfig);
}
@@ -455,7 +454,6 @@ trait helperfunctions {
} else {
$datav = (string) $child->value;
}
- dbug($child->name);
if (empty($this->sccpvalues[(string) $child->name])) {
$this->sccpvalues[(string) $child->name] = array('keyword' => (string) $child->name, 'data' => $datav, 'type' => '2', 'seq' => $seq, 'systemdefault' => '');
}
@@ -474,7 +472,6 @@ trait helperfunctions {
}
}
}
- dbug($this->sccpvalues['earlyrtp']);
}
public function getSipConfig() {
diff --git a/views/formShowSysDefs.php b/views/formShowSysDefs.php
index a6f6dd5..055edaa 100644
--- a/views/formShowSysDefs.php
+++ b/views/formShowSysDefs.php
@@ -83,6 +83,7 @@ foreach ($items as $child) {
case 'SLA':
case 'SLZ':
case 'SL':
+ case 'SLDT':
$sccpManager->formcreate->addElementSL($child, $fvalues, $sccp_defaults,$npref, $installedLangs);
break;
case 'SLDA':