Index: ipk/source.sh4/tools_callmonitor/_path_/usr/local/share/titan/plugins/callmonitor1/fritzbox_msg_new.sh
===================================================================
--- ipk/source.sh4/tools_callmonitor/_path_/usr/local/share/titan/plugins/callmonitor1/fritzbox_msg_new.sh	(revision 37137)
+++ ipk/source.sh4/tools_callmonitor/_path_/usr/local/share/titan/plugins/callmonitor1/fritzbox_msg_new.sh	(revision 37173)
@@ -2,5 +2,6 @@
 
 CONFIG=`echo "$0callmon.conf" | sed s/fritzbox_msg_new.sh//`
-NC=`echo "$0nc" | sed s/fritzbox_msg_new.sh//`
+#NC=`echo "$0nc" | sed s/fritzbox_msg_new.sh//`
+NC="nc"
 ICONV=`echo "$0iconv" | sed s/fritzbox_msg_new.sh//`
 CURL=`echo "$0curl" | sed s/fritzbox_msg_new.sh//`
@@ -12,11 +13,4 @@
 #. ./callmon.conf
  
-# Version:      @(#)fritzbox_msg_new.sh  0.81 30-Jun-2008 krasnojarsk@gmx.de
-# Author: Ludwig H.
-#-------------------------------------------------------------------------------
-#
-# V0.90 - Erkan
-# - Änderungen bis Februar 2011 eingebracht
-# - für DM600PVR angepasst
 #
 #-------------------------------------------------------------------------------
@@ -26,8 +20,4 @@
 #    #96*4*         to disable
 #
-# You should put the script into /etc/init.d (DM7020/DM600PVR) or /var/init.d (DM7000)
-#
-# For autostart on DM600PVR make a symbolic link
-# ln -s /etc/init.d/fritzbox_msg_new.sh /etc/rc2.d/S40Fritz
 #
 #SETUP---start------------------------------------------------------------------
@@ -41,5 +31,5 @@
 #Options---start----------------------------------------------------------------
 #
-Version=v2.00					#Zur Versionsanzeige im telnet
+Version=v2.60					#Zur Versionsanzeige im telnet
 debug=0								#wenn debug auf 1 steht wird am TV nichts angezeigt
 ##Ziel=4711							#bitte Rufnummer eintragen die Überwacht werden soll 
@@ -172,12 +162,12 @@
     #extract caller-id from online result
     #UH20100112
-#    NAME=`grep $SEARCHPDETAIL $TMPFILE | head -1 | sed -e "/</{; :loop; s/<[^<]*>//g; /</{; N; b loop; }; };"`
-#    ADDRESSE=`grep "address" $TMPFILE| head -1`
+#    NAME=`grep $SEARCHPDETAIL $TMPFILE | head -n 1 | sed -e "/</{; :loop; s/<[^<]*>//g; /</{; N; b loop; }; };"`
+#    ADDRESSE=`grep "address" $TMPFILE| head -n 1`
 #    ADDRESSE=`echo $ADDRESSE | sed 's/<[^>]*>/ /g'`
 
-    NAME=`grep $SEARCHPDETAIL $TMPFILE | head -1 | sed -e 's/.*Detailinformationen zu //g' | sed -e 's/ in .*//g'`
-    STRASSE=`grep '<span class="street street-address">' $TMPFILE | head -1 | sed -e 's/<span class="street street-address">//g' | sed -e 's/<\/span>.*//g'`
-    POSTCODE=`grep '<span class="postcode postal-code">' $TMPFILE | head -1 | sed -e 's/.*<span class="postcode postal-code">//g' | sed -e 's/<\/span>.*//g'`
-    ORT=`grep '<span class="city locality">' $TMPFILE | head -1 | sed -e 's/.*<span class="city locality">//g' | sed -e 's/<\/span>.*//g'`
+    NAME=`grep $SEARCHPDETAIL $TMPFILE | head -n 1 | sed -e 's/.*Detailinformationen zu //g' | sed -e 's/ in .*//g'`
+    STRASSE=`grep '<span class="street street-address">' $TMPFILE | head -n 1 | sed -e 's/<span class="street street-address">//g' | sed -e 's/<\/span>.*//g'`
+    POSTCODE=`grep '<span class="postcode postal-code">' $TMPFILE | head -n 1 | sed -e 's/.*<span class="postcode postal-code">//g' | sed -e 's/<\/span>.*//g'`
+    ORT=`grep '<span class="city locality">' $TMPFILE | head -n 1 | sed -e 's/.*<span class="city locality">//g' | sed -e 's/<\/span>.*//g'`
     ADDRESSE="$STRASSE~n$POSTCODE $ORT"
 
@@ -209,166 +199,280 @@
 	 	#rm $FRITZBUCH
 	 	if [ ! -f $FRITZBUCH ]; then
-	 	 
-	 	 if [ -z $FritzVersion ] || [ $FritzVersion -lt 50 ]; then
-	 	 	# Challenge abholen
-			echo "Challenge abholen start"
-			ChallengeXML=`wget -O - "http://$FRITZBOXIP/cgi-bin/webcm?getpage=../html/login_sid.xml" 2>/dev/null| grep Challenge`
-			Challenge=`echo $ChallengeXML | awk '{match($0,/>[^<>]+</); print substr($0,RSTART+1,RLENGTH-2)}'`
-			echo "Challenge abholen ende"
+			echo "FritzBook new"
 			
-			Passwd="$FritzPass"
-
-			# login aufbauen und hashen
-			echo "login aufbauen und hashen start"
-			CPSTR="$Challenge-$Passwd"
-			MD5=`echo -n $CPSTR | $ICONV -f ISO8859-1 -t UTF-16LE > /tmp/help; md5sum /tmp/help | awk '{print substr($0,1,32)}'`
-			RESPONSE="$Challenge-$MD5"
-			POSTDATA="login:command/response=$RESPONSE&getpage=../html/de/menus/menu2.html"
-			# login senden und SID herausfischen
-			SID=`wget -O - --post-data="$POSTDATA" "http://$FRITZBOXIP/cgi-bin/webcm" 2>/dev/null| grep "name=\"sid\"" | head -1 | awk '{match($0,/value="[^"]+"/); print substr($0,RSTART+7,RLENGTH-8)}'`
-			echo "login aufbauen und hashen ende"
-
-			$CURL --data "telcfg:settings/Phonebook/Books/Select=0&getpage=../html/de/menus/menu2.html&var:pagename=fonbuch&sid=$SID&var:menu=fon&var:lang=de" http://$FRITZBOXIP/cgi-bin/webcm  | grep ">TrFon" | sed s/'<script type="text\/javascript">'// | sed s/';<\/script>'// | sed s/'('/'"'/ | sed s/')'/'"'/ > /tmp/curlhelp.tmp
-			while read line 
-				do
-				art=`echo $line | cut -d'"' -f1`
-				if [ $art = "TrFonName" ]; then
-					name=`echo $line | cut -d'"' -f5`
-				elif [ $art = "TrFonNr" ]; then
-					nummer=`echo $line | cut -d'"' -f5`
-					echo "$nummer#$name->" >> $FRITZBUCH 
-				fi
-			done < /tmp/curlhelp.tmp
-			rm /tmp/curlhelp.tmp
-
-			if [ ! -f $FRITZBUCH ]; then
-				#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 | sed s/"&amp;"/"+"/g > /tmp/curlhelp.tmp
+			if [ -z $FritzVersion ] || [ $FritzVersion -lt 50 ]; then
+				# Challenge abholen
+				echo "Challenge abholen start"
+				ChallengeXML=`wget -O - "http://$FRITZBOXIP/cgi-bin/webcm?getpage=../html/login_sid.xml" 2>/dev/null| grep Challenge`
+				Challenge=`echo $ChallengeXML | awk '{match($0,/>[^<>]+</); print substr($0,RSTART+1,RLENGTH-2)}'`
+				echo "Challenge abholen ende"
+				
+				Passwd="$FritzPass"
+
+				# login aufbauen und hashen
+				echo "login aufbauen und hashen start"
+				CPSTR="$Challenge-$Passwd"
+				MD5=`echo -n $CPSTR | $ICONV -f ISO8859-1 -t UTF-16LE > /tmp/help; md5sum /tmp/help | awk '{print substr($0,1,32)}'`
+				RESPONSE="$Challenge-$MD5"
+				POSTDATA="login:command/response=$RESPONSE&getpage=../html/de/menus/menu2.html"
+				# login senden und SID herausfischen
+				SID=`wget -O - --post-data="$POSTDATA" "http://$FRITZBOXIP/cgi-bin/webcm" 2>/dev/null| grep "name=\"sid\"" | head -n 1 | awk '{match($0,/value="[^"]+"/); print substr($0,RSTART+7,RLENGTH-8)}'`
+				echo "login aufbauen und hashen ende"
+
+				$CURL --data "telcfg:settings/Phonebook/Books/Select=0&getpage=../html/de/menus/menu2.html&var:pagename=fonbuch&sid=$SID&var:menu=fon&var:lang=de" http://$FRITZBOXIP/cgi-bin/webcm  | grep ">TrFon" | sed s/'<script type="text\/javascript">'// | sed s/';<\/script>'// | sed s/'('/'"'/ | sed s/')'/'"'/ > /tmp/curlhelp.tmp
 				while read line 
-				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
-						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
+					do
+					art=`echo $line | cut -d'"' -f1`
+					if [ $art = "TrFonName" ]; then
+						name=`echo $line | cut -d'"' -f5`
+					elif [ $art = "TrFonNr" ]; then
+						nummer=`echo $line | cut -d'"' -f5`
+						echo "$nummer#$name->" >> $FRITZBUCH 
 					fi
 				done < /tmp/curlhelp.tmp
 				rm /tmp/curlhelp.tmp
-			fi
+
+				if [ ! -f $FRITZBUCH ]; then
+					#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 | sed s/"&amp;"/"+"/g > /tmp/curlhelp.tmp
+					while read line 
+					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
+							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
 		 
-		 else
-		 	
-			#Fritzbox Version > 50
+			elif [ -z $FritzVersion ] || [ $FritzVersion -lt 60 ]; then
+				echo "Version 50"
+				#Fritzbox Version > 50 und < 60
+				
+				Challenge=`wget -O - "http://$FRITZBOXIP/login_sid.lua" 2>/dev/null | grep Challenge | cut -d"<" -f6 | cut -d">" -f2`
+				Passwd="$FritzPass"
+				# login aufbauen und hashen
+				echo "login aufbauen und hashen start"
+				CPSTR="$Challenge-$Passwd"
+				MD5=`echo -n $CPSTR | $ICONV -f ISO8859-1 -t UTF-16LE > /tmp/helpx; md5sum /tmp/helpx | awk '{print substr($0,1,32)}'`
+				RESPONSE="$Challenge-$MD5"
+
+				POSTDATA="username=$FritzUser&response=$RESPONSE"
+
+				SID=`wget -O - --post-data="$POSTDATA" "http://$FRITZBOXIP/login_sid.lua" 2>/dev/null  | grep SID | cut -d"<" -f4 | cut -d">" -f2`
+
+				echo "login aufbauen und hashen ende"
+
+				$CURL --data "sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_select.lua  > /tmp/curlhelp.tmp
+
+				BOOKID=`cat /tmp/curlhelp.tmp | grep '<label for="uiBookid' | grep ritzcall | cut -d: -f2 | cut -d'"' -f1`
+				if [ -z "$BOOKID" ]; then
+					BOOKID=0
+				fi
+
+				$CURL --data "bookid=$BOOKID&sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua  | grep "<td class=\"tname\" title=" | sed s/'class="tname" '/"\nfritztele<"/g  | sed s/">"/"<"/g | sed s/"'"//g | sed s/'"'//g | sed s/"&amp;"/"+"/g  | sed s/"<<a href="//g | sed s/"<\/a<"//g | sed s/"+49"/"0"/g > /tmp/curlhelp3.tmp
+
+				while read line 
+					do
+						nummer1="0"
+						nummer2="0"
+						nummer3="0"
+						nummer4="0"
+						pos1=11
+						pos2=0
+						pos3=0
+						art=`echo $line | cut -d'<' -f1`
+						if [ ! -z $art ] && [ $art = "fritztele" ]; then
+							name=`echo $line | cut -d'<' -f2 | sed s/"title="//g`
+							nummer1=`echo $line | cut -d'<' -f7 | sed s/" "//g`
+							help=`echo $line | cut -d'<' -f8`
+							if [ $help = "br" ]; then
+								nummer2=`echo $line | cut -d'<' -f9 | sed s/" "//g`
+								pos1=13
+								pos2=15
+								help=`echo $line | cut -d'<' -f10`
+								if [ $help = "br" ]; then
+									nummer3=`echo $line | cut -d'<' -f11 | sed s/" "//g`
+									pos1=15
+									pos2=17
+									pos3=19
+									help=`echo $line | cut -d'<' -f12`
+									if [ $help = "br" ]; then
+										nummer4=`echo $line | cut -d'<' -f13 | sed s/" "//g`
+										pos1=17
+										pos2=19
+										pos3=21
+										pos4=23
+									fi
+								fi
+							fi
+							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
+							if [ $nummer4 != "0" ]; then
+								typ=`echo $line | cut -d'<' -f$pos4`
+								echo "$nummer4#$name->$typ" >> $FRITZBUCH
+							fi
+						fi
+					done < /tmp/curlhelp3.tmp
+				
+			else
+				#Fritzbox Version > 60
+				echo "Version 60"
+				
+				Challenge=`wget -O - "http://$FRITZBOXIP/login_sid.lua" 2>/dev/null | grep Challenge | cut -d"<" -f6 | cut -d">" -f2`
+				Passwd="$FritzPass"
+				# login aufbauen und hashen
+				echo "login aufbauen und hashen start"
+				CPSTR="$Challenge-$Passwd"
+				MD5=`echo -n $CPSTR | $ICONV -f ISO8859-1 -t UTF-16LE > /tmp/helpx; md5sum /tmp/helpx | awk '{print substr($0,1,32)}'`
+				RESPONSE="$Challenge-$MD5"
+
+				POSTDATA="username=$FritzUser&response=$RESPONSE"
+
+				SID=`wget -O - --post-data="$POSTDATA" "http://$FRITZBOXIP/login_sid.lua" 2>/dev/null  | grep SID | cut -d"<" -f4 | cut -d">" -f2`
+
+				echo "login aufbauen und hashen ende"
+
+				$CURL --data "sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_select.lua  > /tmp/curlhelp.tmp
+
+				BOOKID=`cat /tmp/curlhelp.tmp | grep ' checked id="uiBookid' | cut -d: -f2 | cut -d'"' -f1`
+				if [ -z "$BOOKID" ]; then
+					BOOKID=0
+				else
+					echo "BookID: $BOOKID"
+				fi
+		
+				#$CURL --data "bookid=$BOOKID&sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua | grep "<td class=\"tname\" title=" | sed s/'class="tname" '/"\nfritztele<"/g  | sed s/">"/"<"/g | sed s/"'"//g | sed s/'"'//g | sed s/"&amp;"/"+"/g  | sed s/"<<a href="//g | sed s/"<\/a<"//g > /tmp/curlhelp3.tmp
+				$CURL --data "bookid=$BOOKID&sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua | grep "<td class=\"tname\" title=" | sed s/'class="tname" '/"\nfritztele<"/g | sed s/">"/"<"/g | sed s/"<<"/"<"/g | sed s/"'"//g | sed s/'"'//g | sed s/"&amp;"/"+"/g | sed s/"<a href="//g | sed s/"<\/a"//g | sed s/"+49"/"0"/g > /tmp/curlhelp6.tmp
 			
-		 	Challenge=`wget -O - "http://$FRITZBOXIP/login_sid.lua" 2>/dev/null | grep Challenge | cut -d"<" -f6 | cut -d">" -f2`
-			Passwd="$FritzPass"
-			# login aufbauen und hashen
-			echo "login aufbauen und hashen start"
-			CPSTR="$Challenge-$Passwd"
-			MD5=`echo -n $CPSTR | $ICONV -f ISO8859-1 -t UTF-16LE > /tmp/helpx; md5sum /tmp/helpx | awk '{print substr($0,1,32)}'`
-			RESPONSE="$Challenge-$MD5"
-
-			POSTDATA="username=$FritzUser&response=$RESPONSE"
-
-			SID=`wget -O - --post-data="$POSTDATA" "http://$FRITZBOXIP/login_sid.lua" 2>/dev/null  | grep SID | cut -d"<" -f4 | cut -d">" -f2`
-
-			echo "login aufbauen und hashen ende"
-
-			$CURL --data "sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_select.lua  > /tmp/curlhelp.tmp
-
-			BOOKID=`cat curlhelp.tmp | grep '<label for="uiBookid' | grep ritzcall | cut -d: -f2 | cut -d'"' -f1`
-			if [ -z "$BOOKID" ]; then
-				BOOKID=0
-			fi
-
-			$CURL --data "bookid=$BOOKID&sid=$SID" http://$FRITZBOXIP/fon_num/fonbook_list.lua  | grep "<td class=\"tname\" title=" | sed s/'class="tname" '/"\nfritztele<"/g  | sed s/">"/"<"/g | sed s/"'"//g | sed s/'"'//g | sed s/"&amp;"/"+"/g  | sed s/"<<a href="//g | sed s/"<\/a<"//g > /tmp/curlhelp3.tmp
-
-			while read line 
-				do
-					nummer1="0"
-					nummer2="0"
-					nummer3="0"
-					nummer4="0"
-					pos1=11
-					pos2=0
-					pos3=0
-					art=`echo $line | cut -d'<' -f1`
-					if [ ! -z $art ] && [ $art = "fritztele" ]; then
-						name=`echo $line | cut -d'<' -f2 | sed s/"title="//g`
-						nummer1=`echo $line | cut -d'<' -f7`
-						help=`echo $line | cut -d'<' -f8`
-						if [ $help = "br" ]; then
-							nummer2=`echo $line | cut -d'<' -f9`
-							pos1=13
-							pos2=15
-							help=`echo $line | cut -d'<' -f10`
+				while read line 
+					do
+						nummer1="0"
+						nummer2="0"
+						nummer3="0"
+						nummer4="0"
+						nummer5="0"
+						nummer6="0"
+						pos1=10
+						pos2=0
+						pos3=0
+						art=`echo $line | cut -d'<' -f1`
+						if [ ! -z $art ] && [ $art = "fritztele" ]; then
+							name=`echo $line | cut -d'<' -f2 | sed s/"title="//g`
+							nummer1=`echo $line | cut -d'<' -f7 | sed s/" "//g`
+							help=`echo $line | cut -d'<' -f8`
 							if [ $help = "br" ]; then
-								nummer3=`echo $line | cut -d'<' -f11`
-								pos1=15
-								pos2=17
-								pos3=19
-								help=`echo $line | cut -d'<' -f12`
+								nummer2=`echo $line | cut -d'<' -f10 | sed s/" "//g`
+								pos1=13
+								pos2=15
+								help=`echo $line | cut -d'<' -f11`
 								if [ $help = "br" ]; then
-									nummer4=`echo $line | cut -d'<' -f13`
-									pos1=17
-									pos2=19
-									pos3=21
-									pos4=23
+									nummer3=`echo $line | cut -d'<' -f13 | sed s/" "//g`
+									pos1=16
+									pos2=18
+									pos3=20
+									help=`echo $line | cut -d'<' -f14`
+									if [ $help = "br" ]; then
+										nummer4=`echo $line | cut -d'<' -f16 | sed s/" "//g`
+										pos1=19
+										pos2=21
+										pos3=23
+										pos4=25
+										help=`echo $line | cut -d'<' -f17`
+										if [ $help = "br" ]; then
+											nummer5=`echo $line | cut -d'<' -f19 | sed s/" "//g`
+											pos1=22
+											pos2=24
+											pos3=26
+											pos4=28
+											pos5=30
+											help=`echo $line | cut -d'<' -f20`
+											if [ $help = "br" ]; then
+												nummer6=`echo $line | cut -d'<' -f22 | sed s/" "//g`
+												pos1=25
+												pos2=27
+												pos3=29
+												pos4=31
+												pos5=33
+												pos6=35
+											fi
+										fi
+									fi
 								fi
 							fi
+							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
+							if [ $nummer4 != "0" ]; then
+								typ=`echo $line | cut -d'<' -f$pos4`
+								echo "$nummer4#$name->$typ" >> $FRITZBUCH
+							fi
+							if [ $nummer5 != "0" ]; then
+								typ=`echo $line | cut -d'<' -f$pos3`
+								echo "$nummer5#$name->$typ" >> $FRITZBUCH
+							fi
+							if [ $nummer6 != "0" ]; then
+								typ=`echo $line | cut -d'<' -f$pos4`
+								echo "$nummer6#$name->$typ" >> $FRITZBUCH
+							fi
 						fi
-						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
-						if [ $nummer4 != "0" ]; then
-							typ=`echo $line | cut -d'<' -f$pos4`
-							echo "$nummer3#$name->$typ" >> $FRITZBUCH
-						fi
-					fi
-			done < /tmp/curlhelp3.tmp
-		 fi	
+					done < /tmp/curlhelp6.tmp
+				cp $FRITZBUCH $FRITZCACHE	
+			fi		
 		fi
-		cp $FRITZBUCH $FRITZCACHE
 	fi	
+
 };
 #-------------------------------------------------------------------------------
@@ -464,5 +568,5 @@
         #wget -O- http://$ip/query?boxstatus > $TMPSTATUS
         $CURL http://$ip/query?boxstatus > $TMPSTATUS
-        #STANDBY=`grep "standby" $TMPSTATUS| head -1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
+        #STANDBY=`grep "standby" $TMPSTATUS| head -n 1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
         STANDBY=`grep "standby" $TMPSTATUS| wc -l`
         #STANDBY=0
@@ -472,5 +576,5 @@
               if [ $muteRing = 1 ]; then #wenn Option gesetzt ist dann wird der Ton abgeschaltet 
                 #wget -O- http://$loginname:$passwort@127.0.0.1/cgi-bin/audio >> $TMPSTATUS #tonstatus wird ermittelt und in eine Datei geschrieben
-                #mute=`grep "mute" $TMPSTATUS| head -1 | sed -e '{s/mute://g;s/<br>//g;s/ //g}'`
+                #mute=`grep "mute" $TMPSTATUS| head -n 1 | sed -e '{s/mute://g;s/<br>//g;s/ //g}'`
                 #if [ $mute = 0 ]; then
                   #wget -q -O /dev/null "http://@$ip/query?sendrc&rcmute"  >> $NULL #Befehl für Tonsperre
@@ -556,5 +660,5 @@
           #wget -O- http://$ip/query?boxstatus > $TMPSTATUS
           $CURL http://$ip/query?boxstatus > $TMPSTATUS
-          #STANDBY=`grep "standby" $TMPSTATUS| head -1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
+          #STANDBY=`grep "standby" $TMPSTATUS| head -n 1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
           STANDBY=`grep "standby" $TMPSTATUS| wc -l`
           STANDBY=0
@@ -589,5 +693,5 @@
   #wget -O- http://$ip/query?boxstatus > $TMPSTATUS
   $CURL http://$ip/query?boxstatus > $TMPSTATUS
-  #STANDBY=`grep "standby" $TMPSTATUS| head -1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
+  #STANDBY=`grep "standby" $TMPSTATUS| head -n 1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
   STANDBY=`grep "standby" $TMPSTATUS| wc -l`
   if [ $STANDBY = 0 ]; then
@@ -600,5 +704,5 @@
       #wget -O- http://$loginname:$passwort@127.0.0.1/cgi-bin/audio >> $TMPSTATUS #tonstatus wird ermittelt und in eine Datei geschrieben
       #$CURL http://$loginname:$passwort@127.0.0.1/cgi-bin/audio >> $TMPSTATUS #tonstatus wird ermittelt und in eine Datei geschrieben
-      #'mute=`grep "mute" $TMPSTATUS| head -1 | sed -e '{s/mute://g;s/<br>//g;s/ //g}'`
+      #'mute=`grep "mute" $TMPSTATUS| head -n 1 | sed -e '{s/mute://g;s/<br>//g;s/ //g}'`
       #if [ $mute = 1 ]; then
         #wget -q -O /dev/null "http://$loginname:$passwort@$ip/cgi-bin/rc?113"  >> $NULL #Befehl für Tonsperre
@@ -639,5 +743,5 @@
     #kontrollieren ob dieses ein eingehender Anruf war
     if [ -f $TMPINCOMING ];     then 
-    eingehend=`grep "1" $TMPINCOMING| head -1`
+    eingehend=`grep "1" $TMPINCOMING| head -n 1`
     else 
     eingehend="0"
@@ -671,6 +775,8 @@
      echo "deleting $FRITZCACHE (if exists)"
      if [ -f $FRITZCACHE ];   then  rm $FRITZCACHE; fi
+	 echo "deleting $FRITZBUCH (if exists)"
+     if [ -f $FRITZBUCH ];   then  rm $FRITZBUCH; fi
      ;;
-  STOP|stop)
+  STOP1|stop1)
      #kill all processes we spawned
      #hopefully only a single tail task is running so we kill it :)
@@ -692,8 +798,21 @@
      fi
      ;;
+    STOP|stop)
+     #STOP1 (alt STOP) bewirkt hier nichts!
+     #tail zu killen reicht, um die anderen auch zu entfernen :)
+     pid=`ps | grep "tail*"| grep -v grep | awk '{print $1}'`
+     if [ "X${pid}" != "X" ] ; then
+        kill -9 ${pid}
+     fi
+	 #fals noch ein 2. läuft :-)
+     pid=`ps | grep "tail*"| grep -v grep | awk '{print $1}'`
+     if [ "X${pid}" != "X" ] ; then
+        kill -9 ${pid}
+     fi	 
+     ;;
   SHOW|show)
   sleep 10     
   if [ -f $TMPRING ];     then
-    eintragvorhanden=`grep "von" $TMPRING| head -1`
+    eintragvorhanden=`grep "von" $TMPRING| head -n 1`
     echo "Es ist ein Eintrag in TMPRING vorhanden"
     if [ "$eintragvorhanden" = "" ]; then
@@ -719,5 +838,5 @@
       #wget -O- http://$ip/query?boxstatus > $TMPSTATUS
       $CURL http://$ip/query?boxstatus > $TMPSTATUS
-      #STANDBY=`grep "standby" $TMPSTATUS| head -1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
+      #STANDBY=`grep "standby" $TMPSTATUS| head -n 1 | sed -e '{s/<standby>//g;s/<\/standby>//g}'`
       STANDBY=`grep "standby" $TMPSTATUS| wc -l`
       STANDBY=0
@@ -731,5 +850,5 @@
           if [ $muteRing = 1 ]; then #wenn Option gesetzt ist dann wird der Ton abgeschaltet
             #wget -O- http://$loginname:$passwort@127.0.0.1/cgi-bin/audio >> $TMPSTATUS #tonstatus wird ermittelt und in eine Datei geschrieben
-            #mute=`grep "mute" $TMPSTATUS| head -1 | sed -e '{s/mute://g;s/<br>//g;s/ //g}'`
+            #mute=`grep "mute" $TMPSTATUS| head -n 1 | sed -e '{s/mute://g;s/<br>//g;s/ //g}'`
             #if [ $mute = 0 ]; then 
                 #wget -q -O /dev/null "http://$ip/query?sendrc&rcmute"  >> $NULL #Befehl für Tonsperre