Changeset 18478

Timestamp:

Nov 7, 2012, 7:38:23 PM (13 years ago)

Author:

gost

Message:

{callmonitor] extensions for 7390 labor

Location:

ipk/source.sh4/titanswaptools_callmonitor

Files:

• CONTROL/control (modified) (1 diff)
• var/swap/titanplugins/callmonitor1/fritzbox_msg_new.sh (modified) (2 diffs)

ipk/source.sh4/titanswaptools_callmonitor/CONTROL/control

@@ -1 +1 @@
 Package: titan-plugin-swaptools-callmonitor
-Version: 1.6
+Version: 2.0
 Architecture: sh4
 OE: Callmonitor

ipk/source.sh4/titanswaptools_callmonitor/var/swap/titanplugins/callmonitor1/fritzbox_msg_new.sh

@@ -201 +201 @@
 loadFritzBook () {
  if [ $usePhoneBook = "1" ]; then
-                rm $FRITZBUCH
+                #rm $FRITZBUCH
                 if [ ! -f $FRITZBUCH ]; then
                         # Challenge abholen
@@ -237 +237 @@
                                 #testen ob neues Telefonbuch
                                 #$CURL --data "sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua > /tmp/test.curl
-                                $CURL --data "sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua | grep "<td class=\"tname\">" | sed s/"<td class=\"tname\">"/"\nfritztele<"/ | sed s/">"/"<"/g | sed s/"'"//g | sed s/'"'//g > /tmp/curlhelp.tmp
+                                $CURL --data "sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua | grep "<td class=\"tname\">" | sed s/"<td class=\"tname\">"/"\nfritztele<"/ | sed s/">"/"<"/g | sed s/"'"//g | sed s/'"'//g | sed s/"&amp;"/"+"/g > /tmp/curlhelp.tmp
                                 while read line 
-                                        do
-                                                art=`echo $line | cut -d'<' -f1`
-                                                if [ $art == "fritztele" ]; then
-                                                        name=`echo $line | cut -d'<' -f2`
-                                                        nummer=`echo $line | cut -d'<' -f8`
-                                                        echo "$nummer#$name" >> $FRITZBUCH 
+                                do
+                                        nummer1="0"
+                                        nummer2="0"
+                                        nummer3="0"
+                                        pos1=14
+                                        pos2=0
+                                        pos3=0
+                                        art=`echo $line | cut -d'<' -f1`
+                                        if [ $art = "fritztele" ]; then
+                                                name=`echo $line | cut -d'<' -f2`
+                                                nummer1=`echo $line | cut -d'<' -f8`
+                                                help=`echo $line | cut -d'<' -f11`
+                                                if [ $help == "br" ]; then
+                                                        nummer2=`echo $line | cut -d'<' -f14`
+                                                        pos1=20
+                                                        pos2=22
+                                                        help=`echo $line | cut -d'<' -f17`
+                                                        if [ $help == "br" ]; then
+                                                                nummer3=`echo $line | cut -d'<' -f20`
+                                                                pos1=26
+                                                                pos2=28
+                                                                pos3=30
+                                                        fi
                                                 fi
-                                        done < /tmp/curlhelp.tmp
+                                                if [ $nummer1 != "0" ]; then
+                                                        typ=`echo $line | cut -d'<' -f$pos1`
+                                                        echo "$nummer1#$name - $typ" >> $FRITZBUCH
+                                                fi
+                                                if [ $nummer2 != "0" ]; then
+                                                        typ=`echo $line | cut -d'<' -f$pos2`
+                                                        echo "$nummer2#$name - $typ" >> $FRITZBUCH
+                                                fi
+                                                if [ $nummer3 != "0" ]; then
+                                                        typ=`echo $line | cut -d'<' -f$pos3`
+                                                        echo "$nummer3#$name - $typ" >> $FRITZBUCH
+                                                fi
+                                        fi
+                                done < /tmp/curlhelp.tmp
                                 rm /tmp/curlhelp.tmp
                         fi