Index: ipk/source.sh4/titanswaptools_callmonitor/CONTROL/control
===================================================================
--- ipk/source.sh4/titanswaptools_callmonitor/CONTROL/control	(revision 18474)
+++ ipk/source.sh4/titanswaptools_callmonitor/CONTROL/control	(revision 18478)
@@ -1,4 +1,4 @@
 Package: titan-plugin-swaptools-callmonitor
-Version: 1.6
+Version: 2.0
 Architecture: sh4
 OE: Callmonitor
Index: ipk/source.sh4/titanswaptools_callmonitor/var/swap/titanplugins/callmonitor1/fritzbox_msg_new.sh
===================================================================
--- ipk/source.sh4/titanswaptools_callmonitor/var/swap/titanplugins/callmonitor1/fritzbox_msg_new.sh	(revision 18474)
+++ ipk/source.sh4/titanswaptools_callmonitor/var/swap/titanplugins/callmonitor1/fritzbox_msg_new.sh	(revision 18478)
@@ -201,5 +201,5 @@
 loadFritzBook () {
  if [ $usePhoneBook = "1" ]; then
-	 	rm $FRITZBUCH
+	 	#rm $FRITZBUCH
 	 	if [ ! -f $FRITZBUCH ]; then
 	 	 	# Challenge abholen
@@ -237,14 +237,44 @@
 				#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