[asterisk-commits] tilghman: branch 1.6.0 r138207 - in /branches/1.6.0: ./ configs/ main/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Aug 15 15:36:36 CDT 2008


Author: tilghman
Date: Fri Aug 15 15:36:35 2008
New Revision: 138207

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138207
Log:
Merged revisions 138206 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r138206 | tilghman | 2008-08-15 15:35:24 -0500 (Fri, 15 Aug 2008) | 4 lines

Remove deprecated syntax from sample config file
(closes issue #13314)
 Reported by: kue

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/extensions.conf.sample
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/extensions.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/extensions.conf.sample?view=diff&rev=138207&r1=138206&r2=138207
==============================================================================
--- branches/1.6.0/configs/extensions.conf.sample (original)
+++ branches/1.6.0/configs/extensions.conf.sample Fri Aug 15 15:36:35 2008
@@ -180,18 +180,17 @@
 ;
 ;[context]
 ;exten => someexten,{priority|label{+|-}offset}[(alias)],application(arg1,arg2,...)
-;exten => someexten,{priority|label{+|-}offset}[(alias)],application,arg1|arg2...
 ;
 ; Timing list for includes is 
 ;
-;   <time range>|<days of week>|<days of month>|<months>
+;   <time range>,<days of week>,<days of month>,<months>
 ;
 ; Note that ranges may be specified to wrap around the ends.  Also, minutes are
 ; fine-grained only down to the closest even minute.
 ;
-;include => daytime|9:00-17:00|mon-fri|*|*
-;include => weekend|*|sat-sun|*|*
-;include => weeknights|17:02-8:58|mon-fri|*|*
+;include => daytime,9:00-17:00,mon-fri,*,*
+;include => weekend,*,sat-sun,*,*
+;include => weeknights,17:02-8:58,mon-fri,*,*
 ;
 ; ignorepat can be used to instruct drivers to not cancel dialtone upon
 ; receipt of a particular pattern.  The most commonly used example is
@@ -437,7 +436,7 @@
 exten => s,n,Set(LOCAL(cntx)=${ARG5})
 
 exten => s,n,Set(LOCAL(mbx)="${ext}"$["${cntx}" ? "@${cntx}" :: ""])
-exten => s,n,Dial(${dev},20|p)			; Ring the interface, 20 seconds maximum, call screening 
+exten => s,n,Dial(${dev},20,p)			; Ring the interface, 20 seconds maximum, call screening 
 						; option (or use P for databased call screening)
 exten => s,n,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
 
@@ -466,12 +465,12 @@
 ;
 ;   ${ARG1} - Device to page
 
-exten => s,1,ChanIsAvail(${ARG1}|js)			; j is for Jump and s is for ANY call
+exten => s,1,ChanIsAvail(${ARG1},js)			; j is for Jump and s is for ANY call
 exten => s,n,GoToIf([${AVAILSTATUS} = "1"]?autoanswer:fail)
 exten => s,n(autoanswer),Set(_ALERT_INFO="RA")			; This is for the PolyComs
 exten => s,n,SIPAddHeader(Call-Info: Answer-After=0)	; This is for the Grandstream, Snoms, and Others
 exten => s,n,NoOp()					; Add others here and Post on the Wiki!!!!
-exten => s,n,Dial(${ARG1}||)
+exten => s,n,Dial(${ARG1})
 exten => s,n(fail),Hangup
 
 
@@ -547,7 +546,7 @@
 ; System Wide Page at extension 7999
 ;
 exten => 7999,1,Set(TIMEOUT(absolute)=60)
-exten => 7999,2,Page(Local/Grandstream1 at page&Local/Xlite1 at page&Local/1234 at page/n|d)
+exten => 7999,2,Page(Local/Grandstream1 at page&Local/Xlite1 at page&Local/1234 at page/n,d)
 
 ; Give voicemail at extension 8500
 ;
@@ -620,11 +619,11 @@
 ;exten => 6275,1,Gosub(stdexten,s,1(6275,${MARK}))
 						; assuming ${MARK} is something like DAHDI/2
 ;exten => 6275,n,Goto(default,s,1)		; exited Voicemail
-;exten => mark,1,Goto(6275|1)			; alias mark to 6275
+;exten => mark,1,Goto(6275,1)			; alias mark to 6275
 ;exten => 6536,1,Gosub(stdexten,s,1(6236,${WIL}))
 						; Ditto for wil
 ;exten => 6536,n,Goto(default,s,1)		; exited Voicemail
-;exten => wil,1,Goto(6236|1)
+;exten => wil,1,Goto(6236,1)
 
 ;If you want to subscribe to the status of a parking space, this is
 ;how you do it. Subscribe to extension 6600 in sip, and you will see

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=138207&r1=138206&r2=138207
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Fri Aug 15 15:36:35 2008
@@ -6166,7 +6166,7 @@
 	/* Strip off timing info, and process if it is there */
 	if ( (c = strchr(p, ',')) ) {
 		*c++ = '\0';
-	        new_include->hastime = ast_build_timing(&(new_include->timing), c);
+		new_include->hastime = ast_build_timing(&(new_include->timing), c);
 	}
 	new_include->next      = NULL;
 	new_include->registrar = registrar;




More information about the asterisk-commits mailing list