Verbindungsanzeige korrigiert

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@958 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index a3949cba34b42ba51fbff24087e7cbe0caf705ee..e3098177819ea88a41c8f29245f47b788576469b 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -331,16 +331,18 @@ sub connectionstatus
 
     my ($timestr, $connstate);
 
-               my $connstate = "<span class='ipcop_StatusBig'>$Lang::tr{'idle'} $profileused</span>";
+               my $connstate = "<span>$Lang::tr{'idle'} $profileused</span>";
 
                if (-e "${General::swroot}/red/active") {
                        $timestr = &General::age("${General::swroot}/red/active");
-                       $connstate = "<span class='ipcop_StatusBig'>$Lang::tr{'connected'} - (<span class='ipcop_StatusBigRed'>$timestr</span>) $profileused</span>";
+                       $connstate = "<span>$Lang::tr{'connected'} - (<span>$timestr</span>) $profileused</span>";
                } else {
-                       if (($pppsettings{'RECONNECTION'} eq "dialondemand") && ( -e "${General::swroot}/red/dial-on-demand")) {
-                               $connstate = "<span class='ipcop_StatusBig'>$Lang::tr{'dod waiting'} $profileused</span>";
+                 if ((open(KEEPCONNECTED, "</var/ipfire/red/keepconnected") == false) && ($pppsettings{'RECONNECTION'} eq "persistent")) {
+                               $connstate = "<span>$Lang::tr{'connection closed'} $profileused</span>";
+      } elsif (($pppsettings{'RECONNECTION'} eq "dialondemand") && ( -e "${General::swroot}/red/dial-on-demand")) {
+                               $connstate = "<span>$Lang::tr{'dod waiting'} $profileused</span>";
                        } else {
-                               $connstate = "<span class='ipcop_StatusBig'>$Lang::tr{'connecting'} $profileused</span>" if (system("ps -ef | grep -q '[p]ppd'"));
+                               $connstate = "<span>$Lang::tr{'connecting'} $profileused</span>" if (system("ps -ef | grep -q '[p]ppd'"));
                        }
                }
                

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b390605d7dcdba12b9ffc9bbb8f10bdbd911139f..4d2fc630fc7f5e61ccf9a7b5ae5f7195ec95fdd7 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -473,6 +473,7 @@
 'connected' => 'Verbunden',
 'connecting' => 'Baue Verbindung auf...',
 'connection' => 'Verbindung',
+'connection closed' => 'Nicht Verbunden...',
 'connection debugging' => 'Verbindungs-Debugging',
 'connection status and controlc' => 'Verbindungsstatus und -kontrolle:',
 'connection tracking' => 'IPTables-Verbindungsverfolgung',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 5c1a25f9435caf9ba3830e8ddfb9db02e8b96688..8a4dbcd640ffe2b9d3d66ea8c1fa70520eabf78a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -493,6 +493,7 @@
 'connected' => 'Connected',
 'connecting' => 'Connecting...',
 'connection' => 'Connection',
+'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',
 'connection status and controlc' => 'Connection status and control:',
 'connection tracking' => 'IPTables Connection Tracking',