projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vergessener Lauf von locales.pl
[kivitendo-erp.git]
/
lxo-import
/
import_lib.php
diff --git
a/lxo-import/import_lib.php
b/lxo-import/import_lib.php
index
c60975a
..
6fef1ec
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];
@@
-363,10
+363,14
@@
function authuser($dbhost,$dbport,$dbuser,$dbpasswd,$dbname,$cookie) {
$db->query($sql2,"authuser_B");
$sql3="insert into session ";*/
}
$db->query($sql2,"authuser_B");
$sql3="insert into session ";*/
}
+ $sql="select * from auth.user where id=".$rs[0]["id"];
+ $rs1=$db->getAll($sql,"authuser_1");
+ if (!$rs1) return false;
+ $auth=array();
+ $auth["login"]=$rs1[0]["login"];
$sql="select * from auth.user_config where user_id=".$rs[0]["id"];
$rs1=$db->getAll($sql,"authuser_2");
$sql="select * from auth.user_config where user_id=".$rs[0]["id"];
$rs1=$db->getAll($sql,"authuser_2");
- $auth=array();
- $keys=array("login","dbname","dbpasswd","dbhost","dbport","dbuser");
+ $keys=array("dbname","dbpasswd","dbhost","dbport","dbuser");
foreach ($rs1 as $row) {
if (in_array($row["cfg_key"],$keys)) {
$auth[$row["cfg_key"]]=$row["cfg_value"];
foreach ($rs1 as $row) {
if (in_array($row["cfg_key"],$keys)) {
$auth[$row["cfg_key"]]=$row["cfg_value"];