From 62ee225c2f98592a4d23f302a835deaa4d68879b Mon Sep 17 00:00:00 2001 From: "C. Braun" Date: Thu, 12 May 2011 15:44:31 +0200 Subject: [PATCH] CSV-Import an neue Konfigurationsdatei angepasst. Bug-ID: 1632. --- doc/changelog | 3 ++- locale/fr/all | 28 ++++++++++++++-------------- locale/fr/missing | 28 ++++++++++++++-------------- lxo-import/addressB.php | 13 +++++++------ lxo-import/blz.php | 2 +- lxo-import/contactB.php | 13 ++++++++----- lxo-import/partsB.php | 4 ++-- lxo-import/shiptoB.php | 4 ++-- 8 files changed, 50 insertions(+), 45 deletions(-) diff --git a/doc/changelog b/doc/changelog index 9b13a3e57..526158b91 100644 --- a/doc/changelog +++ b/doc/changelog @@ -26,7 +26,8 @@ - Bugfix 1626: Beim Festlegen der Standardkonten kann beim Warenbestand eine Überschrift ausgewählt werden. - Bugfix 1584: Summen und Saldenliste: Export to PDF/CSV in EÜR Modus falsch - Bugfix 1597: Report Lagerbestand wirft Fehler, wenn Artikelnummer ausgeblendet werden soll - - Bugfix 1569: Zahlungseingang löschen bei Rechnung + - Bugfix 1569: Zahlungseingang löschen bei Rechnung + - Bugfix 1632: Nach Installation 2.6.2-0 aus .deb funktioniert CSV-Import nicht 2011-02-02 - Release 2.6.2 diff --git a/locale/fr/all b/locale/fr/all index 6b0057729..e74b8ec5e 100644 --- a/locale/fr/all +++ b/locale/fr/all @@ -262,7 +262,7 @@ $self->{texts} = { 'Bin From' => '', 'Bin List' => '', 'Bin To' => '', - 'Binding to the LDAP server as "#1" failed. Please check config/authentication.pl.' => '', + 'Binding to the LDAP server as "#1" failed. Please check config/lx_office.conf.' => '', 'Bins saved.' => '', 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' => '', 'Birthday' => '', @@ -472,7 +472,7 @@ $self->{texts} = { 'Database Connection Test' => '', 'Database Host' => '', 'Database User missing!' => '', - 'Database backups and restorations are disabled in lx-erp.conf.' => '', + 'Database backups and restorations are disabled in lx_office.conf.' => '', 'Database name' => '', 'Database template' => '', 'Database update error:' => '', @@ -808,7 +808,7 @@ $self->{texts} = { 'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".' => '', 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => '', 'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => '', - 'If you want to change any of these parameters then press the "Back" button, edit the file "config/authentication.pl" and login into the admin module again.' => '', + 'If you want to change any of these parameters then press the "Back" button, edit the file "config/lx_office.conf" and login into the admin module again.' => '', 'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' => '', 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' => '', 'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' => '', @@ -1058,7 +1058,7 @@ $self->{texts} = { 'No group has been selected, or the group does not exist anymore.' => '', 'No groups have been added yet.' => '', 'No licenses were found that match the search criteria.' => '', - 'No or an unknown authenticantion module specified in "config/authentication.pl".' => '', + 'No or an unknown authenticantion module specified in "config/lx_office.conf".' => '', 'No part was found matching the search parameters.' => '', 'No prices will be updated because no prices have been entered.' => '', 'No problems were recognized.' => '', @@ -1540,14 +1540,14 @@ $self->{texts} = { 'The AP transaction #1 has been deleted.' => '', 'The AR transaction #1 has been deleted.' => '', 'The GL transaction #1 has been deleted.' => '', - 'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => '', + 'The LDAP server "#1:#2" is unreachable. Please check config/lx_office.conf.' => '', 'The SEPA export has been created.' => '', 'The access rights have been saved.' => '', 'The account 3804 already exists, the update will be skipped.' => '', 'The account 3804 will not be added automatically.' => '', 'The assembly has been created.' => '', 'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '', - 'The authentication configuration file "config/authentication.pl" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '', + 'The authentication configuration file "config/lx_office.conf" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '', 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' => '', 'The available options depend on the varibale type:' => '', 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' => '', @@ -1556,9 +1556,9 @@ $self->{texts} = { 'The base unit does not exist.' => '', 'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => '', 'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => '', - 'The config file "config/authentication.pl" contained invalid Perl code:' => '', - 'The config file "config/authentication.pl" was not found.' => '', - 'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/authentication.pl.' => '', + 'The config file "config/lx_office.conf" contained invalid Perl code:' => '', + 'The config file "config/lx_office.conf" was not found.' => '', + 'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/lx_office.conf.' => '', 'The connection to the authentication database failed:' => '', 'The connection to the database could not be established.' => '', 'The connection to the template database failed:' => '', @@ -1604,7 +1604,7 @@ $self->{texts} = { 'The group has been saved.' => '', 'The group memberships have been saved.' => '', 'The group name is missing.' => '', - 'The licensing module has been deactivated in lx-erp.conf.' => '', + 'The licensing module has been deactivated in lx_office.conf.' => '', 'The list has been printed.' => '', 'The login is missing.' => '', 'The name in row %d has already been used before.' => '', @@ -1917,10 +1917,10 @@ $self->{texts} = { 'click here to edit cvars' => '', 'close' => '', 'closed' => '', - 'config/authentication.pl: Key "DB_config" is missing.' => '', - 'config/authentication.pl: Key "LDAP_config" is missing.' => '', - 'config/authentication.pl: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '', - 'config/authentication.pl: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '', + 'config/lx_office.conf: Key "DB_config" is missing.' => '', + 'config/lx_office.conf: Key "LDAP_config" is missing.' => '', + 'config/lx_office.conf: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '', + 'config/lx_office.conf: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '', 'continue' => '', 'correction' => '', 'cp_greeting to cp_gender migration' => '', diff --git a/locale/fr/missing b/locale/fr/missing index f9f9bb5ae..9c73bacff 100644 --- a/locale/fr/missing +++ b/locale/fr/missing @@ -259,7 +259,7 @@ $missing = { 'Bin From' => '', 'Bin List' => '', 'Bin To' => '', - 'Binding to the LDAP server as "#1" failed. Please check config/authentication.pl.' => '', + 'Binding to the LDAP server as "#1" failed. Please check config/lx_office.conf.' => '', 'Bins saved.' => '', 'Bins that have been used in the past cannot be deleted anymore. For these bins there\'s no checkbox in the "Delete" column.' => '', 'Birthday' => '', @@ -469,7 +469,7 @@ $missing = { 'Database Connection Test' => '', 'Database Host' => '', 'Database User missing!' => '', - 'Database backups and restorations are disabled in lx-erp.conf.' => '', + 'Database backups and restorations are disabled in lx_office.conf.' => '', 'Database name' => '', 'Database template' => '', 'Database update error:' => '', @@ -805,7 +805,7 @@ $missing = { 'If you chose to let Lx-Office do the migration then Lx-Office will also remove the old member file after creating a backup copy of it in the directory "#1".' => '', 'If you enter values for the part number and / or part description then only those bins containing parts whose part number or part description match your input will be shown.' => '', 'If you see this message, you most likely just setup your LX-Office and haven\'t added any entry types. If this is the case, the option is accessible for administrators in the System menu.' => '', - 'If you want to change any of these parameters then press the "Back" button, edit the file "config/authentication.pl" and login into the admin module again.' => '', + 'If you want to change any of these parameters then press the "Back" button, edit the file "config/lx_office.conf" and login into the admin module again.' => '', 'If you want to delete such a dataset you have to edit the user(s) that are using the dataset in question and have them use another dataset.' => '', 'If you want to set up the authentication database yourself then log in to the administration panel. Lx-Office will then create the database and tables for you.' => '', 'If you yourself want to upgrade the installation then please read the file "doc/UPGRADE" and follow the steps outlined in this file.' => '', @@ -1055,7 +1055,7 @@ $missing = { 'No group has been selected, or the group does not exist anymore.' => '', 'No groups have been added yet.' => '', 'No licenses were found that match the search criteria.' => '', - 'No or an unknown authenticantion module specified in "config/authentication.pl".' => '', + 'No or an unknown authenticantion module specified in "config/lx_office.conf".' => '', 'No part was found matching the search parameters.' => '', 'No prices will be updated because no prices have been entered.' => '', 'No problems were recognized.' => '', @@ -1537,14 +1537,14 @@ $missing = { 'The AP transaction #1 has been deleted.' => '', 'The AR transaction #1 has been deleted.' => '', 'The GL transaction #1 has been deleted.' => '', - 'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => '', + 'The LDAP server "#1:#2" is unreachable. Please check config/lx_office.conf.' => '', 'The SEPA export has been created.' => '', 'The access rights have been saved.' => '', 'The account 3804 already exists, the update will be skipped.' => '', 'The account 3804 will not be added automatically.' => '', 'The assembly has been created.' => '', 'The assistant could not find anything wrong with #1. Maybe the problem has been solved in the meantime.' => '', - 'The authentication configuration file "config/authentication.pl" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '', + 'The authentication configuration file "config/lx_office.conf" does not exist. This Lx-Office installation has probably not been updated correctly yet. Please contact your administrator.' => '', 'The authentication database is not reachable at the moment. Either it hasn\'t been set up yet or the database server might be down. Please contact your administrator.' => '', 'The available options depend on the varibale type:' => '', 'The backup you upload here has to be a file created with "pg_dump -o -Ft".' => '', @@ -1553,9 +1553,9 @@ $missing = { 'The base unit does not exist.' => '', 'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => '', 'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => '', - 'The config file "config/authentication.pl" contained invalid Perl code:' => '', - 'The config file "config/authentication.pl" was not found.' => '', - 'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/authentication.pl.' => '', + 'The config file "config/lx_office.conf" contained invalid Perl code:' => '', + 'The config file "config/lx_office.conf" was not found.' => '', + 'The connection to the LDAP server cannot be encrypted (SSL/TLS startup failure). Please check config/lx_office.conf.' => '', 'The connection to the authentication database failed:' => '', 'The connection to the database could not be established.' => '', 'The connection to the template database failed:' => '', @@ -1601,7 +1601,7 @@ $missing = { 'The group has been saved.' => '', 'The group memberships have been saved.' => '', 'The group name is missing.' => '', - 'The licensing module has been deactivated in lx-erp.conf.' => '', + 'The licensing module has been deactivated in lx_office.conf.' => '', 'The list has been printed.' => '', 'The login is missing.' => '', 'The name in row %d has already been used before.' => '', @@ -1914,10 +1914,10 @@ $missing = { 'click here to edit cvars' => '', 'close' => '', 'closed' => '', - 'config/authentication.pl: Key "DB_config" is missing.' => '', - 'config/authentication.pl: Key "LDAP_config" is missing.' => '', - 'config/authentication.pl: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '', - 'config/authentication.pl: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '', + 'config/lx_office.conf: Key "DB_config" is missing.' => '', + 'config/lx_office.conf: Key "LDAP_config" is missing.' => '', + 'config/lx_office.conf: Missing parameters in "DB_config". Required parameters are "host", "db" and "user".' => '', + 'config/lx_office.conf: Missing parameters in "LDAP_config". Required parameters are "host", "attribute" and "base_dn".' => '', 'continue' => '', 'correction' => '', 'cp_greeting to cp_gender migration' => '', diff --git a/lxo-import/addressB.php b/lxo-import/addressB.php index df0cfc50e..53d674643 100644 --- a/lxo-import/addressB.php +++ b/lxo-import/addressB.php @@ -14,10 +14,15 @@ Web: http://lx-system.de require ("import_lib.php"); +function ende($txt) { + echo "Abbruch: $txt
"; + exit(1); +} + if (!$_SESSION["db"]) { - $conffile="../config/authentication.pl"; + $conffile="../config/lx_office.conf"; if (!is_file($conffile)) { - ende("authentication.pl nicht gefunden oder unlesbar"); + ende("lx_office.conf nicht gefunden oder unlesbar"); } } @@ -44,10 +49,6 @@ $db=$_SESSION["db"]; //new myDB($login); $crm=checkCRM(); -function ende($txt) { - echo "Abbruch: $txt
"; - exit(1); -} $dir = "../users/"; clearstatcache (); //print_r($_FILES); diff --git a/lxo-import/blz.php b/lxo-import/blz.php index c1f726061..482aa6bf8 100644 --- a/lxo-import/blz.php +++ b/lxo-import/blz.php @@ -30,7 +30,7 @@ if ($_POST["ok"]=="Hilfe") { require ("import_lib.php"); if (!$_SESSION["db"]) { - $conffile="../config/authentication.pl"; + $conffile="../config/lx_office.conf"; if (!is_file($conffile)) { ende(4); } diff --git a/lxo-import/contactB.php b/lxo-import/contactB.php index 5dd8891e5..f0b286805 100644 --- a/lxo-import/contactB.php +++ b/lxo-import/contactB.php @@ -12,11 +12,18 @@ Web: http://lx-system.de */ if (!$_SESSION["db"]) { - $conffile="../config/authentication.pl"; + $conffile="../config/lx_office.conf"; if (!is_file($conffile)) { ende(4); } } + +function ende($nr) { + echo "Abbruch: $nr\n"; + exit($nr); +} + + require ("import_lib.php"); if (!anmelden()) ende(5); @@ -41,10 +48,6 @@ if ($_POST["ok"]) { } $nun=time(); - function ende($nr) { - echo "Abbruch: $nr\n"; - exit($nr); - } if ($_POST["ok"]=="Hilfe") { echo "Importfelder:
"; echo "Feldname => Bedeutung
"; diff --git a/lxo-import/partsB.php b/lxo-import/partsB.php index cb9de6763..4a3c7e48e 100644 --- a/lxo-import/partsB.php +++ b/lxo-import/partsB.php @@ -19,9 +19,9 @@ function ende($txt) { } if (!$_SESSION["db"]) { - $conffile="../config/authentication.pl"; + $conffile="../config/lx_office.conf"; if (!is_file($conffile)) { - ende("authentication.pl nicht gefunden oder kein Leserecht."); + ende("lx_office.conf nicht gefunden oder kein Leserecht."); } } require ("import_lib.php"); diff --git a/lxo-import/shiptoB.php b/lxo-import/shiptoB.php index 5e22a285f..fc934c394 100644 --- a/lxo-import/shiptoB.php +++ b/lxo-import/shiptoB.php @@ -30,9 +30,9 @@ Web: http://www.linet-services.de, http://www.lx-system.de }; if (!$_SESSION["db"]) { - $conffile="../config/authentication.pl"; + $conffile="../config/lx_office.conf"; if (!is_file($conffile)) { - ende("authentication.pl nicht gefunden oder unlesbar"); + ende("lx_office.conf nicht gefunden oder unlesbar"); } } -- 2.20.1