diff -r astrad010/files/asterisk/extensions.conf astrad011/files/asterisk/extensions.conf
70,71c70,71
< exten => _[*0-9]!,n,ExecIf($[ ${XTOT} < 1 ],Gosub,check_ua,${EXTEN},1)
< exten => _[*0-9]!,n,GotoIf($[ ${XTOT} < 1 & "${multipleUA}" = "0" ]?telephone-number-temp-disconnected,${EXTEN},1)
---
> ;exten => _[*0-9]!,n,ExecIf($[ ${XTOT} < 1 ],Gosub,check_ua,${EXTEN},1)
> ;exten => _[*0-9]!,n,GotoIf($[ ${XTOT} < 1 & "${multipleUA}" = "0" ]?telephone-number-temp-disconnected,${EXTEN},1)
92d91
< exten => _[*0-9]!,n,Set(multipleUA=0)
94,95c93,94
< exten => _[*0-9]!,n,MYSQL(Query resultid ${connid} CALL\ set_route(\'${PBCLD}\'\,\'${SIPCHANINFO(recvip)}\'))
< exten => _[*0-9]!,n,MYSQL(Query resultid ${connid} SELECT\ get_route(\'${PBCLD}\'))
---
> exten => _[*0-9]!,n,MYSQL(Query resultid ${connid} CALL\ set_route(\'${VDNID}\'\,\'${SIPCHANINFO(recvip)}\'\,${multipleUA}))
> exten => _[*0-9]!,n,MYSQL(Query resultid ${connid} SELECT\ get_route(\'${VDNID}\'))
100,101c99,101
< exten => _[*0-9]!,n,Set(VDNID=${PBCLD})
< exten => _[*0-9]!,n,Dial(${myROUTE},30,${CALL_LIMIT})
---
> exten => _[*0-9]!,n,ExecIf($[ "${TARGET_EXPIRE}" = "" ],Set,TARGET_EXPIRE=30)
> exten => _[*0-9]!,n,Dial(${myROUTE},${TARGET_EXPIRE},${CALL_LIMIT})
> exten => _[*0-9]!,n,Goto(routing,${EXTEN},failed)
115c115,123
< exten => _[*0-9]!,n,MYSQL(Query resultid ${connid} SELECT\ 1\ FROM\ multiple_ua\ WHERE\ username=\'${PBCLD}\' LIMIT\ 1)
---
> exten => _[*0-9]!,n,GotoIf($["${CDR(CustomerType)}" = "PeerAuth"]?localmua:allmua)
> exten => _[*0-9]!,n(localmua),MYSQL(Query resultid ${connid} SELECT\ IF\ \(\(SELECT\ count(*)\ FROM\ multiple_ua\ WHERE\ username=\'${VDNID}\'\ AND\ domain=\'${NAS_IP_Address}\'\)>1\,2\,0\)\as\ a)
> exten => _[*0-9]!,n,MYSQL(Fetch fetchid ${resultid} multipleUA)
> exten => _[*0-9]!,n,Goto(setvar)
> exten => _[*0-9]!,n(allmua),GotoIf($["${connid}" = ""]?allmua1:allmua2)
> exten => _[*0-9]!,n(allmua1),MYSQL(Query resultid ${connid} SELECT\ IF\ \(\(SELECT\ count(*)\ FROM\ multiple_ua\ WHERE\ username=\'${VDNID}\'\)>1\,1\,0\)\as\ a)
> exten => _[*0-9]!,n,MYSQL(Fetch fetchid ${resultid} multipleUA)
> exten => _[*0-9]!,n,Goto(setvar)
> exten => _[*0-9]!,n(allmua2),MYSQL(Query resultid ${connid} SELECT\ 1\ FROM\ multiple_ua\ WHERE\ username=\'${VDNID}\' LIMIT\ 1)
117c125
< exten => _[*0-9]!,n,ExecIf($[ "${multipleUA}"="NULL" | "${multipleUA}"="" ],Set,multipleUA=0)
---
> exten => _[*0-9]!,n(setvar),ExecIf($[ "${multipleUA}"="NULL" | "${multipleUA}"="" ],Set,multipleUA=0)
125,126d132
< exten => _[*0-9]!,n,ExecIf($[ ${multipleUA} = 0 ],Gosub,check_ua,${EXTEN},1)
< exten => _[*0-9]!,n,GotoIf($[ ${multipleUA} = 1 ]?MyRoute,${EXTEN},1)
134c140,145
< exten => _[*0-9]!,n,Set(TARGET_EXPIRE=${XEXP_${II}_${KK}})
---
> exten => _[*0-9]!,n,GotoIf($[ "${TARGET_ROUTE}"="" ]?defaultroute:varroute)
> exten => _[*0-9]!,n(defaultroute),Set(TARGET_ROUTE=SIP/${DNID}@${NAS_IP_Address})
> exten => _[*0-9]!,n,Set(TARGET_EXPIRE=30)
> exten => _[*0-9]!,n,Set(TARGET_CLI=${CALLERID(num)})
> exten => _[*0-9]!,n,Goto(routeset)
> exten => _[*0-9]!,n(varroute),Set(TARGET_EXPIRE=${XEXP_${II}_${KK}})
136,137c147,148
< exten => _[*0-9]!,n,Set(CALLERID(all)=${TARGET_CLI} <${TARGET_CLI}>)
< exten => _[*0-9]!,n,Set(MYDNID=${CUT(TARGET_ROUTE,@,1)})
---
> exten => _[*0-9]!,n,Set(CALLERID(all)=${XCLI_${II}_${KK}} <${XCLI_${II}_${KK}}>)
> exten => _[*0-9]!,n(routeset),Set(MYDNID=${CUT(TARGET_ROUTE,@,1)})
139a151,153
> exten => _[*0-9]!,n,ExecIf($[ ${multipleUA} = 0 ],Gosub,check_ua,${EXTEN},1)
> exten => _[*0-9]!,n,GotoIf($[ ${XTOT} < 1 & "${multipleUA}" = "0" ]?telephone-number-temp-disconnected,${EXTEN},1)
> exten => _[*0-9]!,n,GotoIf($[ "${multipleUA}" = "1"  | "${multipleUA}" = "2" ]?MyRoute,${EXTEN},1)
147c161,163
< exten => _[*0-9]!,n,Dial(${IF($[ "${CUT(TARGET_ROUTE,@,2)}" = "${NAS_IP_Address}"]?${MYDNID}:${TARGET_ROUTE})},${TARGET_EXPIRE},${CALL_LIMIT})
---
> ;Possible problem with Follow me in next line: Verify
> exten => _[*0-9]!,n,Dial(${IF($[ "${ROUTEIP}" = "${NAS_IP_Address}" | $[ "${CDR(CustomerType)}" = "PeerAuth"] ]?${MYDNID}:${TARGET_ROUTE})},${TARGET_EXPIRE},${CALL_LIMIT})
> exten => _[*0-9]!,n(failed),Set(multipleUA=0)