Changeset 7124
- Timestamp:
- 10/24/08 11:12:54 (3 years ago)
- Files:
-
- modules/branches/2.6/core/functions.inc.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.6/core/functions.inc.php
r7101 r7124 2841 2841 } 2842 2842 2843 if (trim($pinless) == 'enabled') { 2844 $astman->database_put("AMPUSER",$extension."/pinless","\"NOPASSWD\""); 2845 } else if (trim($pinless) == 'disabled') { 2846 $astman->database_del("AMPUSER",$extension."/pinless"); 2847 } else { 2848 echo "ERROR: this state should not exist<br>"; 2849 } 2850 2843 2851 // Moved VmX setup to voicemail module since it is part of voicemail 2844 2852 // … … 2908 2916 $call_screen=$astman->database_get("AMPUSER",$extension."/screen"); 2909 2917 $results['call_screen'] = (trim($call_screen) != "")?$call_screen:'0'; 2918 2919 $pinless=$astman->database_get("AMPUSER",$extension."/pinless"); 2920 $results['pinless'] = (trim($pinless) == 'NOPASSWD') ? 'enabled' : 'disabled'; 2910 2921 } else { 2911 2922 fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]); … … 4238 4249 $currentcomponent->setoptlistopts('callwaiting', 'sort', false); 4239 4250 4251 $currentcomponent->addoptlistitem('pinless', 'disabled', _("Disable")); 4252 $currentcomponent->addoptlistitem('pinless', 'enabled', _("Enable")); 4253 $currentcomponent->setoptlistopts('pinless', 'sort', false); 4254 4240 4255 $currentcomponent->addoptlistitem('call_screen', '0', _("Disable")); 4241 4256 $currentcomponent->addoptlistitem('call_screen', 'nomemory', _("Screen Caller: No Memory")); … … 4416 4431 $currentcomponent->addguielem($section, new gui_selectbox('callwaiting', $currentcomponent->getoptlist('callwaiting'), $callwaiting, _("Call Waiting"), _("Set the initial/current Call Waiting state for this user's extension"), false)); 4417 4432 $currentcomponent->addguielem($section, new gui_selectbox('call_screen', $currentcomponent->getoptlist('call_screen'), $call_screen, _("Call Screening"),_("Call Screening requires external callers to say their name, which will be played back to the user and allow the user to accept or reject the call. Screening with memory only verifies a caller for their caller-id once. Screening without memory always requires a caller to say their name. Either mode will always announce the caller based on the last introduction saved with that callerid. If any user on the system uses the memory option, when that user is called, the caller will be required to re-introduce themselves and all users on the system will have that new introduction associated with the caller's CallerId."), false)); 4433 $currentcomponent->addguielem($section, new gui_selectbox('pinless', $currentcomponent->getoptlist('pinless'), $pinless, _("Pinless Dialing"), _("Enabling Pinless Dialing will allow this extension to bypass any pin codes normally required on outbound calls"), false)); 4418 4434 4419 4435 $section = _("Assigned DID/CID");
