]> git.zerfleddert.de Git - snom-frontend/commitdiff
re-add accidentally reverted fix for firmware v7
authorMichael Gernoth <michael@gernoth.net>
Thu, 8 Jul 2010 06:54:37 +0000 (08:54 +0200)
committerMichael Gernoth <michael@gernoth.net>
Thu, 8 Jul 2010 06:54:37 +0000 (08:54 +0200)
snom.pl

diff --git a/snom.pl b/snom.pl
index 3ee79daad211a548ffc900bc3c2716871df6c86c..34d61a2fbc1dceb3e1ae54c3b82cf309012be58d 100755 (executable)
--- a/snom.pl
+++ b/snom.pl
@@ -1,5 +1,4 @@
 #!/bin/sh
 #!/bin/sh
-#$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" "$@"
 
 
 PATH=/opt/csw/bin:/opt/local/bin:/usr/bin:/bin exec perl -w -x "$0" "$@"
 
@@ -437,18 +436,24 @@ sub UpdatePhoneInfo
        }
        my @lines=split("\n", $response->content());
        my $num = 0;
        }
        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>
        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\>$/) {
+               if (m/^\<option value=\"(.+)\"( selected)?\>([^<\@]*)\@([^<]*)\<\/option\>\s*$/) {
                        my $line = $3;
                        $g_identity->append_text("${3}");
                        my $line = $3;
                        $g_identity->append_text("${3}");
-                       $g_identity->set_active(${1}-1) if(defined($2));
+                       if (defined($2)) {
+                               $g_identity->set_active(${1}-1);
+                               $activated=1;
+                       }
                        $num++;
                }
        }
                        $num++;
                }
        }
+       $g_identity->set_active(0) if (!$activated);
        if ($num > 1) {
                $g_identity->show;
        } else {
        if ($num > 1) {
                $g_identity->show;
        } else {
Impressum, Datenschutz