From 9fc09e82e0029be8a42c67d6414e33daf2a3eba8 Mon Sep 17 00:00:00 2001
From: Sven Donath <lxo@dexo.de>
Date: Tue, 17 Aug 2010 00:37:26 +0200
Subject: [PATCH] =?utf8?q?mehrere=20Verbesserungen=20an=20Form.pm=20=20=20?=
 =?utf8?q?*=20automatisches=20Neuladen=20des=20gesamten=20Framesets,=20um?=
 =?utf8?q?=20sicher=20zu=20gehen,=20dass=20z.B.=20die=20gew=C3=A4hlte=20Me?=
 =?utf8?q?n=C3=BC-Variante=20=20=20=20=20nach=20Speichern=20in=20Einstellu?=
 =?utf8?q?ngen=20auch=20verwendet=20wird.=20=20=20*=20Version=20wird=20aus?=
 =?utf8?q?=20der=20Datei=20VERSION=20gelesen=20und=20ist=20nicht=20mehr=20?=
 =?utf8?q?in=20Form.pl=20hartkodiert.=20=20=20=20=20Das=20VERSION-file=20s?=
 =?utf8?q?ollte=20Mode=20600,=20besser=20400=20haben.=20=20=20*=20Javascri?=
 =?utf8?q?pt=20schreibt=20den=20richtigen=20Titel-Tag.=20Damit=20kann=20ma?=
 =?utf8?q?n=20seine=20vielen=20Tabs=20auch=20auseinanderhalten.=20=20=20?=
 =?utf8?q?=20=20Habe=20zurzeit=20keine=20Idee=20wie=20das=20besser=20gemac?=
 =?utf8?q?ht=20werden=20kann.=20=20=20*=20"Administrationsbereich"=20hei?=
 =?utf8?q?=C3=9Ft=20jetzt=20"Administration".=20Gl=C3=BCcklich=20bin=20ich?=
 =?utf8?q?=20damit=20trotzdem=20noch=20nicht.=20=20=20*=20VERSION-Datei=20?=
 =?utf8?q?auf=202.6.1-dev=20ge=C3=A4ndert,=20damit=20man=20beim=20Testen?=
 =?utf8?q?=20auch=20erkennt=20womit=20man=20arbeitet=20;-)=20=20=20=20=20K?=
 =?utf8?q?=C3=B6nnte=20auch=202.6.1-unstable=20hei=C3=9Fen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Form.pm    | 24 ++++++++++++++++++++----
 VERSION       |  2 +-
 locale/de/all |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/SL/Form.pm b/SL/Form.pm
index 707540ed7..55b6f695d 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -265,7 +265,11 @@ sub new {
   $self->{action}  =  lc $self->{action};
   $self->{action}  =~ s/( |-|,|\#)/_/g;
 
-  $self->{version} =  "2.6.1";
+  #$self->{version} =  "2.6.1";                 # Old hardcoded but secure style
+  open VERSION_FILE, "VERSION";                 # New but flexible code reads version from VERSION-file
+  $self->{version} =  <VERSION_FILE>;
+  close VERSION_FILE;							
+  $self->{version}  =~ s/[^0-9A-Za-z\.\_\-]//g; # only allow numbers, letters, points, underscores and dashes. Prevents injecting of malicious code.
 
   $main::lxdebug->leave_sub();
 
@@ -474,7 +478,10 @@ sub info {
     
     <script type="text/javascript">
     <!--
-    setTimeout("parent.frames.main_window.location.href='login.pl?action=company_logo'",1000);
+    // If JavaScript is enabled, the whole thing will be reloaded.
+    // The reason is: When one changes his menu setup (HTML / XUL / CSS ...)
+    // it now loads the correct code into the browser instead of do nothing.
+    setTimeout("top.frames.location.href='login.pl'",500);
     //-->
     </script>
     
@@ -665,6 +672,15 @@ sub header {
     </script>
     | if $self->{"fokus"};
 
+    my $title_hack = qq|
+    <script type="text/javascript">
+    <!--
+      // Write a meaningful title-tag for our frameset.
+      top.document.title="| . $self->{"title"} . qq| - | . $self->{"login"} . qq| - | . $::myconfig{dbname} . qq| - Ver. | . $self->{"version"} . qq|";
+    //-->
+    </script>
+    |;
+
     #Set Calendar
     my $jsscript = "";
     if ($self->{jsscript} == 1) {
@@ -700,9 +716,9 @@ sub header {
   $favicon
   $jsscript
   $ajax
-
   $fokus
-
+  $title_hack
+  
   <link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css" />
 
   <meta name="robots" content="noindex,nofollow" />
diff --git a/VERSION b/VERSION
index 6a6a3d8e3..8e41575f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6.1
+2.6.1-dev
diff --git a/locale/de/all b/locale/de/all
index 3b8685cb6..7a8e90422 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -159,7 +159,7 @@ $self->{texts} = {
   'Add unit'                    => 'Einheit hinzuf&uuml;gen',
   'Address'                     => 'Adresse',
   'Administration'              => 'Administration',
-  'Administration area'         => 'Administrationsbereich',
+  'Administration area'         => 'Administration',
   'Advance turnover tax return' => 'Umsatzsteuervoranmeldung',
   'Aktion'                      => 'Aktion',
   'All'                         => 'Alle',
-- 
2.20.1