From: morty <morty@cs.fau.de>
Date: Wed, 7 Jul 2010 14:01:06 +0000 (+0200)
Subject: added extern (adds 09) to number, removes all non-digits from number
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/snom-frontend/commitdiff_plain/3cb02741a3740f1ebfbc60e20ff1fde79429e84b

added extern (adds 09) to number, removes all non-digits from number
---

diff --git a/snom.pl b/snom.pl
index 645a68e..6f580ab 100755
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,5 @@
 #!/bin/sh
-#$Id: snom.pl,v 1.45 2007-06-23 11:29:58 michael Exp $
+#$Id: snom.pl,v 1.44 2006/05/24 14:31:16 michael Exp $
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 
@@ -69,6 +69,7 @@ sub snom_key {
 
 sub snom_number {
 	my $number = shift;
+	$number =~ s/[^\d]//g;
 	my $req = HTTP::Request->new(GET => "http://".${$Config{$sections[$g_host->get_active]}}{host}."/command.htm?number=${number}");
 	$ua->request($req);
 }
@@ -148,8 +149,16 @@ $display->signal_connect(enter_notify_event => \&DisplayMouseOver, TRUE);
 $display->signal_connect(leave_notify_event => \&DisplayMouseOver, FALSE);
 $display->show();
 
+my $cbextern = Gtk2::CheckButton->new("extern");
+$cbextern->show();
+
+my $dialbox = Gtk2::HBox->new(0, 30);
+$dialbox->pack_start($display, 0, 0, 0);
+$dialbox->pack_start($cbextern, 0, 0, 0);
+$dialbox->show();
+
 my $dispbox = Gtk2::VBox->new(0, 5);
-$dispbox->pack_start($display, 0, 0, 0);
+$dispbox->pack_start($dialbox, 0, 0, 0);
 $dispbox->pack_start($softkeys, 0, 0, 0);
 $dispbox->pack_start($navi, 0, 0, 0);
 $dispbox->show();
@@ -190,6 +199,8 @@ $mainbox->pack_start($ubox, 0, 0, 0);
 $mainbox->pack_start($lbox, 0, 0, 0);
 $mainbox->show();
 
+
+
 $window->add($mainbox);
 $window->show();
 
@@ -249,8 +260,12 @@ sub KeyPressed
 sub DialNumber
 {
 	my ($entry) = @_;
-
-	snom_number($entry->get_text());
+	my ($num) = $entry->get_text();
+	if ($cbextern->get_active){
+	 snom_number("09".$num)
+	} else {
+	 snom_number($num);
+	}	
 	return TRUE;
 }
 
@@ -374,24 +389,18 @@ sub UpdatePhoneInfo
 	}
 	my @lines=split("\n", $response->content());
 	my $num = 0;
-	my $activated = 0;
-
 	foreach (@lines) {
 		chomp;
 		#<option value="1" selected>51@stargate.gernoth.loc</option>
 		#<option value="2">89@asterix.ear-projekt.de</option>
 		#<option value="3">41@grumpy.gernoth.loc</option>
-		if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>\s*$/) {
+		if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>$/) {
 			my $line = $3;
 			$g_identity->append_text("${3}");
-			if (defined($2)) {
-				$g_identity->set_active(${1}-1);
-				$activated=1;
-			}
+			$g_identity->set_active(${1}-1) if(defined($2));
 			$num++;
 		}
 	}
-	$g_identity->set_active(0) if (!$activated);
 	if ($num > 1) {
 		$g_identity->show;
 	} else {