From 3a5eb27579e440f86356683fb54919f2f32dd256 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 15 Aug 2008 20:35:24 +0000
Subject: [PATCH] Remove deprecated syntax from sample config file (closes
 issue #13314)  Reported by: kue

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configs/extensions.conf.sample | 21 ++++++++++-----------
 main/pbx.c                     |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index 2fe4db3f38..4f54c3c0ff 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -180,18 +180,17 @@ TRUNKMSD=1					; MSD digits to strip (usually 1 or 0)
 ;
 ;[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(tortcntx)=${ARG4})
 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 @@ exten => a,1,VoicemailMain(${mbx})		; If they press *, send the user into Voicem
 ;
 ;   ${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 @@ exten => _7XXX,1,Macro(page,SIP/${EXTEN})
 ; System Wide Page at extension 7999
 ;
 exten => 7999,1,Set(TIMEOUT(absolute)=60)
-exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n|d)
+exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n,d)
 
 ; Give voicemail at extension 8500
 ;
@@ -620,11 +619,11 @@ include => demo
 ;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
diff --git a/main/pbx.c b/main/pbx.c
index cb9a5bf5fb..3bf360ad70 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6272,7 +6272,7 @@ int ast_context_add_include2(struct ast_context *con, const char *value,
 	/* 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;