Changeset 5197
- Timestamp:
- 11/03/07 13:14:12 (6 years ago)
- Files:
-
- modules/branches/2.4 (modified) (1 prop)
- modules/branches/2.4/blacklist/module.xml (modified) (2 diffs)
- modules/branches/2.4/blacklist/page.blacklist.php (modified) (2 diffs)
- modules/branches/2.4/conferences/functions.inc.php (modified) (2 diffs)
- modules/branches/2.4/conferences/module.xml (modified) (1 diff)
- modules/branches/2.4/core/bin/fax-process.pl (modified) (1 diff)
- modules/branches/2.4/core/etc/extensions.conf (modified) (1 diff)
- modules/branches/2.4/core/functions.inc.php (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.4
- Property svnmerge-integrated changed from /modules/branches/2.3:1-5080,5111,5128,5130,5155,5157,5159,5163,5165 to /modules/branches/2.3:1-5080,5111,5128,5130,5155,5157,5159,5163,5165,5186-5188,5190,5192,5194-5196
modules/branches/2.4/blacklist/module.xml
r4941 r5197 2 2 <rawname>blacklist</rawname> 3 3 <name>Blacklist</name> 4 <version>1.1.3. 5</version>4 <version>1.1.3.6</version> 5 5 <type>setup</type> 6 6 <category>Inbound Call Control</category> … … 9 9 </menuitems> 10 10 <changelog> 11 *1.1.3.6* #2455 allow + and other valid dial digits 11 12 *1.1.3.5* changed categories 12 13 *1.1.3.4* bump for rc1 modules/branches/2.4/blacklist/page.blacklist.php
r4592 r5197 106 106 </tr> 107 107 </table> 108 109 108 <script language="javascript"> 110 109 <!-- … … 113 112 theForm.number.focus(); 114 113 114 function isDialDigitsPlus(s) 115 { 116 var i; 117 118 if (isEmpty(s)) { 119 return false; 120 } 121 122 for (i = 0; i < s.length; i++) { 123 var c = s.charAt(i); 124 125 if (!isDialDigitChar(c) && (c != "+")) return false; 126 } 127 return true; 128 } 129 130 115 131 function edit_onsubmit() { 116 132 defaultEmptyOK = false; 117 if (!is Integer(theForm.number.value))133 if (!isDialDigitsPlus(theForm.number.value)) 118 134 return warnInvalid(theForm.number, "Please enter a valid Number"); 119 135 return true; modules/branches/2.4/conferences/functions.inc.php
r5167 r5197 53 53 54 54 // Start the conference 55 $ext->add($contextname, 'STARTMEETME', '', new ext_macro('user-callerid'));56 55 $ext->add($contextname, 'STARTMEETME', '', new ext_meetme('${MEETME_ROOMNUM}','${MEETME_OPTS}','${PIN}')); 57 56 $ext->add($contextname, 'STARTMEETME', '', new ext_hangup('')); … … 70 69 71 70 // entry point 71 $ext->add($contextname, $roomnum, '', new ext_macro('user-callerid')); 72 72 $ext->add($contextname, $roomnum, '', new ext_setvar('MEETME_ROOMNUM',$roomnum)); 73 73 $ext->add($contextname, $roomnum, '', new ext_gotoif('$["${DIALSTATUS}" = "ANSWER"]',($roomuserpin == '' && $roomadminpin == '' ? 'USER' : 'READPIN'))); modules/branches/2.4/conferences/module.xml
r5168 r5197 2 2 <rawname>conferences</rawname> 3 3 <name>Conferences</name> 4 <version>1.2.1. 2</version>4 <version>1.2.1.3</version> 5 5 <type>setup</type> 6 6 <category>Internal Options & Configuration</category> 7 7 <description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description> 8 8 <changelog> 9 *1.2.1.3* move Macro(user-callerid) to be called with each conf to accomodate future language settings 9 10 *1.2.1.2* add call to Macro(user-callerid) to get proper CID in Meetme Conference 10 11 *1.2.1.1* bump for rc1 modules/branches/2.4/core/bin/fax-process.pl
r4110 r5197 53 53 $subject = $tmp; 54 54 } 55 # Convert %2 0 to spaces, leave anythignelse alone.55 # Convert %2x to proper characters, leave anything else alone. 56 56 $subject =~ s/\%20/ /g; 57 $subject =~ s/\%21/\!/g; 58 $subject =~ s/\%22/\"/g; 59 $subject =~ s/\%23/\#/g; 60 $subject =~ s/\%24/\$/g; 61 $subject =~ s/\%25/\%/g; 62 $subject =~ s/\%26/\&/g; 63 $subject =~ s/\%27/\'/g; 64 $subject =~ s/\%28/\(/g; 65 $subject =~ s/\%29/\)/g; 66 $subject =~ s/\%2a/\*/g; 67 $subject =~ s/\%2A/\*/g; 68 $subject =~ s/\%2b/\+/g; 69 $subject =~ s/\%2B/\+/g; 70 $subject =~ s/\%2c/\,/g; 71 $subject =~ s/\%2C/\,/g; 72 $subject =~ s/\%2d/\-/g; 73 $subject =~ s/\%2D/\-/g; 74 $subject =~ s/\%2e/\./g; 75 $subject =~ s/\%2E/\./g; 76 $subject =~ s/\%2f/\//g; 77 $subject =~ s/\%2F/\//g; 57 78 } elsif ($cmd eq "--type") { 58 79 my $tmp = shift @ARGV; modules/branches/2.4/core/etc/extensions.conf
r5156 r5197 899 899 exten => s,7,Set(DB(AMPUSER/${DEVAMPUSER}/device)=${AMPUSERDEVICES}) 900 900 ; reset device -> user mapping 901 exten => s,8,Set(DB(DEVICE/${CALLERID(number)}/user)=none) 902 exten => s,9,Playback(vm-goodbye) 901 exten => s,8,Set(DEFAULTUSER=${DB(DEVICE/${CALLERID(number)}/default_user)}) 902 exten => s,9,Set(DB(DEVICE/${CALLERID(number)}/user)=${IF($["${DEFAULTUSER}"=""]?none:${DEFAULTUSER})}) 903 exten => s,10,Playback(vm-goodbye) 903 904 904 905 exten => s-FIXED,1,NoOp(Device is FIXED and cannot be logged out of) modules/branches/2.4/core/functions.inc.php
r5169 r5197 750 750 751 751 752 function core_devices_add($id,$tech,$dial,$devicetype,$user,$description,$emergency_cid=null ){752 function core_devices_add($id,$tech,$dial,$devicetype,$user,$description,$emergency_cid=null,$editmode=false){ 753 753 global $amp_conf; 754 754 global $currentFile; … … 756 756 757 757 $display = isset($_REQUEST['display'])?$_REQUEST['display']:''; 758 759 if (trim($id) == '' ) { 760 if ($display != 'extensions') { 761 echo "<script>javascript:alert('"._("You must put in a device id")."');</script>"; 762 } 763 return false; 764 } 758 765 759 766 //ensure this id is not already in use … … 801 808 //add details to astdb 802 809 if ($astman) { 810 // if adding or editting a fixed device, user property should always be set 811 if ($devicetype == 'fixed' || !$editmode) { 812 $astman->database_put("DEVICE",$id."/user",$user); 813 } 814 // If changing from a fixed to an adhoc, the user property should be intialized 815 // to the new default, not remain as the previous fixed user 816 if ($editmode) { 817 $previous_type = $astman->database_get("DEVICE",$id."/type"); 818 if ($previous_type == 'fixed' && $devicetype == 'adhoc') { 819 $astman->database_put("DEVICE",$id."/user",$user); 820 } 821 } 803 822 $astman->database_put("DEVICE",$id."/dial",$dial); 804 823 $astman->database_put("DEVICE",$id."/type",$devicetype); 805 $astman->database_put("DEVICE",$id."/ user",$user);824 $astman->database_put("DEVICE",$id."/default_user",$user); 806 825 if(!empty($emergency_cid)) 807 826 $astman->database_put("DEVICE",$id."/emergency_cid","\"".$emergency_cid."\""); … … 851 870 } 852 871 853 function core_devices_del($account ){872 function core_devices_del($account,$editmode=false){ 854 873 global $amp_conf; 855 874 global $currentFile; … … 882 901 } 883 902 } 884 $astman->database_del("DEVICE",$account."/dial"); 885 $astman->database_del("DEVICE",$account."/type"); 886 $astman->database_del("DEVICE",$account."/user"); 887 $astman->database_del("DEVICE",$account."/emergency_cid"); 903 if (! $editmode) { 904 $astman->database_del("DEVICE",$account."/dial"); 905 $astman->database_del("DEVICE",$account."/type"); 906 $astman->database_del("DEVICE",$account."/user"); 907 $astman->database_del("DEVICE",$account."/default_user"); 908 $astman->database_del("DEVICE",$account."/emergency_cid"); 909 } 888 910 889 911 //delete from devices table … … 1315 1337 1316 1338 $thisexten = isset($thisexten) ? $thisexten : ''; 1339 1340 if (trim($thisexten) == '' ) { 1341 echo "<script>javascript:alert('"._("You must put in an extension (or user) number")."');</script>"; 1342 return false; 1343 } 1317 1344 1318 1345 //ensure this id is not already in use … … 3188 3215 // really bad hack - but if core_users_edit fails, want to stop core_devices_edit 3189 3216 if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) { 3190 core_devices_del($extdisplay );3191 core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid );3217 core_devices_del($extdisplay,true); 3218 core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid,true); 3192 3219 needreload(); 3193 3220 redirect_standard_continue('extdisplay');
