git-svn-id: https://svn.code.sf.net/p/freetel/code@903 01035d8c-6547-0410-b346-abe4f9...

diff --git a/mini-asterisk-gui2/etc/asterisk/sip.conf b/mini-asterisk-gui2/etc/asterisk/sip.conf
index 36645fb19e440c0e8e984011b7fa98bd00262b33..f29e3b151310249489a417080bdfbea241c59097 100644 (file)
--- a/mini-asterisk-gui2/etc/asterisk/sip.conf
+++ b/mini-asterisk-gui2/etc/asterisk/sip.conf
@@ -234,7 +234,7 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 ;
 ; Examples:
 ;
-;dregister => 9876:password@mysipprovider.com  ; register-mini-asterisk do not remove this comment
+;register => 9876:password@mysipprovider.com   ; register-mini-asterisk do not remove this comment
 ;
 ;register => 1234:password@mysipprovider.com   
 ;

diff --git a/mini-asterisk-gui2/voiplines.js b/mini-asterisk-gui2/voiplines.js
index b3d2063296f4973f508e4ef6f7005dd71a3ea2c5..d6f5312591be4fb0f2e7b3f49792922de89958dd 100644 (file)
--- a/mini-asterisk-gui2/voiplines.js
+++ b/mini-asterisk-gui2/voiplines.js
@@ -83,20 +83,30 @@ function onClickApply() {
        
        
        // 2. Update sip.conf
+       
+       // 2.0 uncomment sip register
+       var url = '/cgi-bin/uncomment.cgi?file=/etc/asterisk/sip.conf&key=register-mini-asterisk';
+               
+       downloadUrl(url,uncommentregReturn);    
+       
+       
+       
+
+
+function uncommentregReturn(doc,status) {
+    loadHtmlTextFile(doc, function(line) {
+           //parseSipShowPeers(line);
+       }
+       );
        //  2.1 insert register command  
        //          ;register => 1234:password@mysipprovider.com   becomes     register => trev:password@192.168.1.30 
        
-       var new_register = user+":"+passwd+"@"+host;
-       var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=9876:password@mysipprovider.com&that=' + new_register ;
-//     var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=;register&that=register';
+       var new_register = document.getElementById('user').value+":"+document.getElementById('pass').value+"@"+document.getElementById('host').value;
+       var url = '/cgi-bin/setlinekey2.cgi?file=/etc/asterisk/sip.conf&this=9876:password@mysipprovider.com&that=' + new_register + '&key=register-mini-asterisk';
+
                
-       downloadUrl(url,semiReturn);
+       downloadUrl(url,updateregReturn);
        
-       //  2.2 update sip trunk details  ... user pw host
-       //          [usersip]             becomes       [trev]
-       //          username=usersip                     username=trev
-       //          secret=passwordsip                   secret=password
-       //          host=hostsip                         host=192.168.1.30
        // 3. Modify extensions.conf for new provider
        //          exten => _1.,1,Dial(SIP/voip/${EXTEN:1})    becomes     exten => _1.,1,Dial(SIP/trev/${EXTEN:1}) 
        // 4. asterisk sip reload ....ORDER? beardy has this at position 4
@@ -104,35 +114,38 @@ function onClickApply() {
 
 }
 
-function semiReturn(doc,status) {
+function updateregReturn(doc,status) {
     loadHtmlTextFile(doc, function(line) {
            //parseSipShowPeers(line);
        }
        );
-       
-       //          username=usersip                     username=trev
-    //   need to switch keywords based on selection
-       var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=;dregister=&that=register=';
 
-       downloadUrl(url,registerReturn);
+       //  2.15 uncomment sip trunk
+
+       var url = '/cgi-bin/uncomment.cgi?file=/etc/asterisk/sip.conf&key='+selection;
+               
+       downloadUrl(url,dialplanReloadReturn);  
+
 }
 
 
 
 
-function registerReturn(doc,status) {
+function uncommenttrunkReturn(doc,status) {
     loadHtmlTextFile(doc, function(line) {
            //parseSipShowPeers(line);
        }
        );
+       //  2.2 update sip trunk details  ... user pw host
+       //          [usersip]             becomes       [trev]
+       //          username=usersip                     username=trev
+       //          secret=passwordsip                   secret=password
+       //          host=hostsip                         host=192.168.1.30
        
-       //   username=usersip                     username=trev
-    //   need to switch keywords based on selection
-       var url = '/cgi-bin/setlinekey2.cgi?file=/etc/asterisk/sip.conf&this=username=&that=' 
-                       + document.getElementById('user').value 
-                       + '&key='+ selection + '-mini-ast';
+       var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=;dregister=&that=register=';
 
-       downloadUrl(url,usernameReturn);
+       downloadUrl(url,dialplanReloadReturn);
+       
 }
 
 function usernameReturn(doc,status) {