]> wagnertech.de Git - kivitendo-erp.git/commitdiff
projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: a304d5f)
fehlende Fehlermeldungsdatei + falscher regex für cookie
authorHolger Lindemann <hli@lx-system.de>
Fri, 13 Mar 2009 07:45:19 +0000 (07:45 +0000)
committerHolger Lindemann <hli@lx-system.de>
Fri, 13 Mar 2009 07:45:19 +0000 (07:45 +0000)
lxo-import/import_lib.php patch | blob | history
lxo-import/ups.html [new file with mode: 0644] patch | blob

diff --git a/lxo-import/import_lib.php b/lxo-import/import_lib.php
index d8b2259c18a882e3e620f434897b066b0324ba0b..6fef1ecf03ed98b083be5caab63e20c3bc8c8fbd 100644 (file)
--- a/lxo-import/import_lib.php
+++ b/lxo-import/import_lib.php
@@ -302,7 +302,7 @@ function anmelden() {
         $dbhost=($hits[1])?$hits[1]:"localhost";
         preg_match("/'port'[ ]*=> '(.+)'/",$tmp,$hits);
         $dbport=($hits[1])?$hits[1]:"5432";
         $dbhost=($hits[1])?$hits[1]:"localhost";
         preg_match("/'port'[ ]*=> '(.+)'/",$tmp,$hits);
         $dbport=($hits[1])?$hits[1]:"5432";
-        preg_match("/^[ ]*\$self->\{cookie_name\}[ ]*=[ ]*'(.+)'/",$tmp,$hits);
+       preg_match("/[ ]*\\\$self->\{cookie_name\}[ ]*=[ ]*'(.+)'/",$tmp,$hits);
         $cookiename=$hits[1];
         if (!$cookiename) $cookiename='lx_office_erp_session_id';
         $cookie=$_COOKIE[$cookiename];
         $cookiename=$hits[1];
         if (!$cookiename) $cookiename='lx_office_erp_session_id';
         $cookie=$_COOKIE[$cookiename];
diff --git a/lxo-import/ups.html b/lxo-import/ups.html
new file mode 100644 (file)
index 0000000..0f91e2d
--- /dev/null
+++ b/lxo-import/ups.html
@@ -0,0 +1,19 @@
+<!-- $Id: ups.html 3212 2008-05-29 08:57:18Z hlindemann $ -->
+<html>
+       <head><title></title>
+       <link type="text/css" REL="stylesheet" HREF="css/main.css"></link>
+       </head>
+<body> 
+<center><h1>
+       Uups!
+</h1>
+<h3>   
+       Die Session auf dem Server oder das Cookie wurden gel&ouml;scht oder sind nicht mehr g&uuml;ltig!
+</h3>
+       - Sie haben eine bestimmte Zeit nicht mehr mit dem System gearbeitet - 
+       <br><br>
+<h3>   
+       Bitte melden Sie sich neu an oder klicken Sie auf einen Hauptmen&uuml;punkt.
+</h3>
+</center>
+</html>
Unnamed repository; edit this file 'description' to name the repository.