From e2cddba54e91c09a803b3e11dfad01873a912554 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Wed, 6 Jan 2016 17:37:05 +0000
Subject: [PATCH] Don't need voip menu

---
 src/freedombone-controlpanel | 85 ++++++++----------------------------
 1 file changed, 17 insertions(+), 68 deletions(-)

diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 2f6af5ab..860e770e 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1204,33 +1204,6 @@ Enter a static local IP address for this system.\n\nIt will typically be 192.168
     fi
 }
 
-function mumble_via_onion {
-    if ! grep -q $"VoIP onion domain" $COMPLETION_FILE; then
-        return
-    fi
-    if [ ! -f /etc/mumble-server.ini ]; then
-        return
-    fi
-    enable_mumble_via_onion="no"
-    dialog --title $"Enable Mumble via onion service" \
-           --backtitle $"Freedombone Control Panel" \
-           --defaultno \
-           --yesno $"Enable Mumble via an onion domain?" 10 60
-    sel=$?
-    case $sel in
-        0) enable_mumble_via_onion="yes";;
-        255) return;;
-    esac
-
-    if [[ $enable_mumble_via_onion == "yes" ]]; then
-        sed -i "s|port=.*|port=${VOIP_ONION_PORT}|g" /etc/mumble-server.ini
-    else
-        sed -i "s|port=.*|port=${VOIP_PORT}|g" /etc/mumble-server.ini
-    fi
-
-    systemctl restart mumble-server
-}
-
 function menu_backup_restore {
     while true
     do
@@ -1374,28 +1347,6 @@ function menu_media {
     done
 }
 
-function menu_voip {
-    while true
-    do
-        data=$(tempfile 2>/dev/null)
-        trap "rm -f $data" 0 1 2 5 15
-        dialog --backtitle $"Freedombone Control Panel" \
-               --title $"SIP/VoIP Menu" \
-               --radiolist $"Choose an operation:" 13 70 2 \
-               1 $"Mumble via onion service" off \
-               2 $"Exit" on 2> $data
-        sel=$?
-        case $sel in
-            1) break;;
-            255) break;;
-        esac
-        case $(cat $data) in
-            1) mumble_via_onion;;
-            2) break;;
-        esac
-    done
-}
-
 function menu_irc {
     while true
     do
@@ -1425,7 +1376,7 @@ function menu_top_level {
         trap "rm -f $data" 0 1 2 5 15
         dialog --backtitle $"Freedombone Control Panel" \
                --title $"Control Panel" \
-               --radiolist $"Choose an operation:" 26 70 19 \
+               --radiolist $"Choose an operation:" 25 70 18 \
                1 $"About this system" off \
                2 $"Backup and Restore" off \
                3 $"Reset Tripwire" off \
@@ -1436,15 +1387,14 @@ function menu_top_level {
                8 $"Security Settings" off \
                9 $"Hubzilla" off \
                10 $"Media menu" off \
-               11 $"SIP/VoIP menu" off \
-               12 $"IRC menu" off \
-               13 $"Change the name of this system" off \
-               14 $"Set the TLS date/time source" off \
-               15 $"Set a static local IP address" off \
-               16 $"Check for updates" off \
-               17 $"Power off the system" off \
-               18 $"Restart the system" off \
-               19 $"Exit" on 2> $data
+               11 $"IRC menu" off \
+               12 $"Change the name of this system" off \
+               13 $"Set the TLS date/time source" off \
+               14 $"Set a static local IP address" off \
+               15 $"Check for updates" off \
+               16 $"Power off the system" off \
+               17 $"Restart the system" off \
+               18 $"Exit" on 2> $data
         sel=$?
         case $sel in
             1) exit 1;;
@@ -1461,15 +1411,14 @@ function menu_top_level {
             8) security_settings;;
             9) menu_hubzilla;;
             10) menu_media;;
-            11) menu_voip;;
-            12) menu_irc;;
-            13) change_system_name;;
-            14) set_tls_time_source;;
-            15) set_static_IP;;
-            16) check_for_updates;;
-            17) shut_down_system;;
-            18) restart_system;;
-            19) break;;
+            11) menu_irc;;
+            12) change_system_name;;
+            13) set_tls_time_source;;
+            14) set_static_IP;;
+            15) check_for_updates;;
+            16) shut_down_system;;
+            17) restart_system;;
+            18) break;;
         esac
     done
 }