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

diff --git a/mini-asterisk-gui2/etc/asterisk/sip.conf b/mini-asterisk-gui2/etc/asterisk/sip.conf
index dda07f02e73e8ac1e472645adda51981675f49a8..36645fb19e440c0e8e984011b7fa98bd00262b33 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:
 ;
-;register => 1234:password@mysipprovider.com   ; register-mini-asterisk do not remove this comment
+;dregister => 9876:password@mysipprovider.com  ; register-mini-asterisk do not remove this comment
 ;
 ;register => 1234:password@mysipprovider.com   
 ;

diff --git a/mini-asterisk-gui2/voiplines.html b/mini-asterisk-gui2/voiplines.html
index db7a3d47e93f8e894921669c98eac4e6dfe67ae9..2928e8b6325b28b1dd35981afcab631d5b6741c8 100644 (file)
--- a/mini-asterisk-gui2/voiplines.html
+++ b/mini-asterisk-gui2/voiplines.html
@@ -36,9 +36,9 @@
          <td>
         <select name="provider" id="provider" onchange="changeProvider()">
              <option value="none">none</option>
-             <option value="SIPNAT">SIP-NAT</option>
-             <option value="SIP">SIP</option>
-             <option value="JAZMIN">Jazmin</option>
+             <option value="sipnat">SIP-NAT</option>
+             <option value="sip">SIP</option>
+             <option value="jazmin">Jazmin</option>
         </select>
          </td></tr>
       <tr><td> </td><td><div id=info></div> </td></tr>

diff --git a/mini-asterisk-gui2/voiplines.js b/mini-asterisk-gui2/voiplines.js
index 4cc0fb2053bb033139e33fac7a87c9c045f4c224..8d698fa20a4b037f8c3af70bf69476445412ba3b 100644 (file)
--- a/mini-asterisk-gui2/voiplines.js
+++ b/mini-asterisk-gui2/voiplines.js
@@ -87,7 +87,7 @@ function onClickApply() {
        //          ;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=1234:password@mysipprovider.com&that=' + new_register ;
+       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';
                
        downloadUrl(url,semiReturn);
@@ -112,7 +112,7 @@ function semiReturn(doc,status) {
        
        //          username=usersip                     username=trev
     //   need to switch keywords based on selection
-       var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=;register=&that=register=';
+       var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=;dregister=&that=register=';
 
        downloadUrl(url,registerReturn);
 }
@@ -128,7 +128,9 @@ function registerReturn(doc,status) {
        
        //          username=usersip                     username=trev
     //   need to switch keywords based on selection
-       var url = '/cgi-bin/setword.cgi?file=/etc/asterisk/sip.conf&this=usersip&that=' + document.getElementById('user').value ;
+       var url = '/cgi-bin/setlinekey.cgi?file=/etc/asterisk/sip.conf&this=usersip&that=' 
+                       + document.getElementById('user').value 
+                       + '&key='+ selection + '-mini-asterisk';
 
        downloadUrl(url,usernameReturn);
 }
@@ -221,19 +223,19 @@ function changeProvider() {
                document.getElementById('pass').value = "";
                var temp = document.getElementById('info');
                document.getElementById('info').textContent = "No provider selected";
-       } else if (selection == "SIPNAT" ) {
+       } else if (selection == "sipnat" ) {
                // fill sipnat
                document.getElementById('user').value = "user";
                document.getElementById('host').value = "192.168.1.28";
                document.getElementById('pass').value = "xxxxxx";
                document.getElementById('info').textContent = "You reach your ITSP via a NAT router ...the most common setup";
-       } else if (selection == "SIP" ) {
+       } else if (selection == "sip" ) {
            // fill sip
                document.getElementById('user').value = "user";
                document.getElementById('host').value = "192.168.1.28";
                document.getElementById('pass').value = "xxxxxx";               
                document.getElementById('info').textContent = "No NAT router between your Phone system and your ITSP";
-       } else if (selection == "JAZMIN" ) {
+       } else if (selection == "jazmin" ) {
                // fill jazmin
                document.getElementById('user').value = "username";
                document.getElementById('host').value = "sip.jazmin.net.au";