From 7e3defce4de6f9ec1953716d923506869011451d Mon Sep 17 00:00:00 2001 From: drowe67 Date: Thu, 11 Feb 2010 00:51:05 +0000 Subject: [PATCH] multiple IP handling for x86 in ipphones tooltips, ipphone and phones screens git-svn-id: https://svn.code.sf.net/p/freetel/code@153 01035d8c-6547-0410-b346-abe4f91aad63 --- mini-asterisk-gui/cgi-bin/ipphones.sh | 9 +++++++-- mini-asterisk-gui/cgi-bin/phones.sh | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mini-asterisk-gui/cgi-bin/ipphones.sh b/mini-asterisk-gui/cgi-bin/ipphones.sh index 69d3b03d..f0bf1bd5 100644 --- a/mini-asterisk-gui/cgi-bin/ipphones.sh +++ b/mini-asterisk-gui/cgi-bin/ipphones.sh @@ -64,11 +64,16 @@ cat < Phone System IP Address: EOF -echo "$ipaddress " +echo "" +echo $ipaddress | sed -n 's/ /
/p' +echo "" + +# make nice tooltips for multiple ip interfaces on some x86 boxes +ipaddress=`echo $ipaddress | sed -n 's/ / or /p'` # use perl to construct list of IP phones for us asterisk "-rx sip show peers" 2>/dev/null > sipshowpeers.txt - perl ipphones.pl $ipaddress $more + perl ipphones.pl "$ipaddress" $more cat < diff --git a/mini-asterisk-gui/cgi-bin/phones.sh b/mini-asterisk-gui/cgi-bin/phones.sh index 03a526d2..f433be96 100644 --- a/mini-asterisk-gui/cgi-bin/phones.sh +++ b/mini-asterisk-gui/cgi-bin/phones.sh @@ -37,7 +37,7 @@ ipaddress=`ifconfig | sed -n 's/.*inet addr:\(.*\) Bcast.*/\1/p'` cat /proc/cpuinfo | grep "CPU:.*ADSP" > /dev/null if [ $? -eq 0 ]; then - ipaddress=`echo $ipaddress | awk '{ print $1 }'` + ipaddress=`echo $ipaddress | awk '{ print $1 }'` fi # Construct the web page ------------------------------- @@ -80,7 +80,9 @@ cat < Phone System IP Address: EOF -echo "$ipaddress" +echo "" +echo $ipaddress | sed -n 's/ /
/p' +echo "" cat <   -- 2.25.1