From 4ccea2b0a1b4c5248365b700b4ad0dd607c52a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20G=C3=BCmpelein?= Date: Sun, 9 Jan 2022 18:31:20 +0100 Subject: [PATCH] user registry and merchant select --- copri4/main/img/konrad-Briefpapier.jpg | Bin 0 -> 9463 bytes copri4/main/img/payment-creditcard2.png | Bin 0 -> 4562 bytes copri4/main/img/payment-incasso2.png | Bin 0 -> 2841 bytes copri4/main/src/Lib/Config.pm | 0 copri4/main/src/Lib/Mlogic.pm | 0 copri4/main/src/Mod/APIfunc.pm | 123 ++++++++++-------- copri4/main/src/Mod/APIjsonclient.pm | 0 copri4/main/src/Mod/APIjsonserver.pm | 38 +++--- copri4/main/src/Mod/APIvelo.pm | 0 copri4/main/src/Mod/APIxmlserver.pm | 0 copri4/main/src/Mod/Basework.pm | 3 +- copri4/main/src/Mod/Buttons.pm | 0 copri4/main/src/Mod/Callib.pm | 0 copri4/main/src/Mod/DBtank.pm | 0 copri4/main/src/Mod/Failure.pm | 0 copri4/main/src/Mod/FileOut.pm | 0 copri4/main/src/Mod/Indexsharee.pm | 0 copri4/main/src/Mod/KMLout.pm | 2 + copri4/main/src/Mod/Libenz.pm | 0 copri4/main/src/Mod/Libenzdb.pm | 0 copri4/main/src/Mod/MailTransport.pm | 2 +- copri4/main/src/Mod/Modalbox.pm | 2 +- copri4/main/src/Mod/Modalbox3.pm | 2 +- copri4/main/src/Mod/NodeEdit.pm | 0 copri4/main/src/Mod/PDFGenerator.pm | 0 copri4/main/src/Mod/Payment.pm | 0 copri4/main/src/Mod/Prelib.pm | 0 copri4/main/src/Mod/Prelogic.pm | 0 copri4/main/src/Mod/Premain.pm | 0 copri4/main/src/Mod/Pricing.pm | 0 copri4/main/src/Mod/Printpreview.pm | 0 copri4/main/src/Mod/Relation.pm | 0 copri4/main/src/Mod/RelationEdit.pm | 0 copri4/main/src/Mod/SMSTransport.pm | 0 copri4/main/src/Mod/Shareework.pm | 1 + copri4/main/src/Mod/ajax_json.pm | 0 copri4/main/src/Mod/ajax_post.pm | 0 copri4/main/src/Mod/newsletter_tink.pl | 10 +- copri4/main/src/Tpl/APIdialog.pm | 0 copri4/main/src/Tpl/Address3.pm | 0 copri4/main/src/Tpl/AttributEdit.pm | 0 copri4/main/src/Tpl/AttributMatrix.pm | 0 copri4/main/src/Tpl/BaseEdit.pm | 4 +- copri4/main/src/Tpl/Calorin.pm | 0 copri4/main/src/Tpl/Karte.pm | 24 +++- copri4/main/src/Tpl/Liste3.pm | 0 copri4/main/src/Tpl/MandantConf.pm | 0 copri4/main/src/Tpl/SubListe.pm | 0 copri4/main/src/Tpl/TransPositionen.pm | 0 copri4/main/src/scripts/Ilockauth.class | Bin copri4/main/src/scripts/Ilockauth.java | 0 copri4/main/src/scripts/Ilockit_cloud.pl | 2 +- .../main/src/scripts/Ilockit_trackingcloud.pl | 2 +- copri4/main/src/scripts/Ilockkeygen.class | Bin copri4/main/src/scripts/Ilockkeygen.java | 0 copri4/main/src/scripts/newsletter_post.pl | 4 +- .../main/src/scripts/payone_post_Payment.pl | 2 +- copri4/main/src/scripts/requested_timeout.pl | 2 +- copri4/main/src/scripts/velofaktur_client.pl | 2 +- copri4/mkaccess.sh | 1 + copri4/shareeapp-operator/src/Lib/Config.pm | 4 +- copri4/shareeapp-operator/src/Lib/Mlogic.pm | 0 .../src/Tpl/AccountSubmenu.pm | 0 copri4/shareeapp-operator/src/Tpl/Anmelden.pm | 8 +- copri4/shareeapp-operator/src/Tpl/Contact.pm | 0 copri4/shareeapp-operator/src/Tpl/FormEdit.pm | 21 ++- copri4/shareeapp-operator/src/Tpl/Listing.pm | 0 .../src/Tpl/ModalboxDialog.pm | 0 .../src/Tpl/PayoneCCclient.pm | 0 .../shareeapp-operator/src/Tpl/PayoneSEPA.pm | 8 +- .../src/Tpl/PayoneSelect.pm | 1 - copri4/shareedms-operator/src/Lib/Config.pm | 4 +- copri4/shareedms-operator/src/Lib/Mlogic.pm | 0 copri4/shareeweb-project/src/Lib/Config.pm | 0 copri4/shareeweb-project/src/Lib/Mlogic.pm | 0 75 files changed, 154 insertions(+), 118 deletions(-) create mode 100644 copri4/main/img/konrad-Briefpapier.jpg create mode 100644 copri4/main/img/payment-creditcard2.png create mode 100644 copri4/main/img/payment-incasso2.png mode change 100644 => 100755 copri4/main/src/Lib/Config.pm mode change 100644 => 100755 copri4/main/src/Lib/Mlogic.pm mode change 100644 => 100755 copri4/main/src/Mod/APIfunc.pm mode change 100644 => 100755 copri4/main/src/Mod/APIjsonclient.pm mode change 100644 => 100755 copri4/main/src/Mod/APIjsonserver.pm mode change 100644 => 100755 copri4/main/src/Mod/APIvelo.pm mode change 100644 => 100755 copri4/main/src/Mod/APIxmlserver.pm mode change 100644 => 100755 copri4/main/src/Mod/Basework.pm mode change 100644 => 100755 copri4/main/src/Mod/Buttons.pm mode change 100644 => 100755 copri4/main/src/Mod/Callib.pm mode change 100644 => 100755 copri4/main/src/Mod/DBtank.pm mode change 100644 => 100755 copri4/main/src/Mod/Failure.pm mode change 100644 => 100755 copri4/main/src/Mod/FileOut.pm mode change 100644 => 100755 copri4/main/src/Mod/Indexsharee.pm mode change 100644 => 100755 copri4/main/src/Mod/KMLout.pm mode change 100644 => 100755 copri4/main/src/Mod/Libenz.pm mode change 100644 => 100755 copri4/main/src/Mod/Libenzdb.pm mode change 100644 => 100755 copri4/main/src/Mod/MailTransport.pm mode change 100644 => 100755 copri4/main/src/Mod/Modalbox.pm mode change 100644 => 100755 copri4/main/src/Mod/Modalbox3.pm mode change 100644 => 100755 copri4/main/src/Mod/NodeEdit.pm mode change 100644 => 100755 copri4/main/src/Mod/PDFGenerator.pm mode change 100644 => 100755 copri4/main/src/Mod/Payment.pm mode change 100644 => 100755 copri4/main/src/Mod/Prelib.pm mode change 100644 => 100755 copri4/main/src/Mod/Prelogic.pm mode change 100644 => 100755 copri4/main/src/Mod/Premain.pm mode change 100644 => 100755 copri4/main/src/Mod/Pricing.pm mode change 100644 => 100755 copri4/main/src/Mod/Printpreview.pm mode change 100644 => 100755 copri4/main/src/Mod/Relation.pm mode change 100644 => 100755 copri4/main/src/Mod/RelationEdit.pm mode change 100644 => 100755 copri4/main/src/Mod/SMSTransport.pm mode change 100644 => 100755 copri4/main/src/Mod/Shareework.pm mode change 100644 => 100755 copri4/main/src/Mod/ajax_json.pm mode change 100644 => 100755 copri4/main/src/Mod/ajax_post.pm mode change 100644 => 100755 copri4/main/src/Mod/newsletter_tink.pl mode change 100644 => 100755 copri4/main/src/Tpl/APIdialog.pm mode change 100644 => 100755 copri4/main/src/Tpl/Address3.pm mode change 100644 => 100755 copri4/main/src/Tpl/AttributEdit.pm mode change 100644 => 100755 copri4/main/src/Tpl/AttributMatrix.pm mode change 100644 => 100755 copri4/main/src/Tpl/BaseEdit.pm mode change 100644 => 100755 copri4/main/src/Tpl/Calorin.pm mode change 100644 => 100755 copri4/main/src/Tpl/Karte.pm mode change 100644 => 100755 copri4/main/src/Tpl/Liste3.pm mode change 100644 => 100755 copri4/main/src/Tpl/MandantConf.pm mode change 100644 => 100755 copri4/main/src/Tpl/SubListe.pm mode change 100644 => 100755 copri4/main/src/Tpl/TransPositionen.pm mode change 100644 => 100755 copri4/main/src/scripts/Ilockauth.class mode change 100644 => 100755 copri4/main/src/scripts/Ilockauth.java mode change 100644 => 100755 copri4/main/src/scripts/Ilockkeygen.class mode change 100644 => 100755 copri4/main/src/scripts/Ilockkeygen.java mode change 100644 => 100755 copri4/shareeapp-operator/src/Lib/Config.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Lib/Mlogic.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/Anmelden.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/Contact.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/FormEdit.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/Listing.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/ModalboxDialog.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm mode change 100644 => 100755 copri4/shareeapp-operator/src/Tpl/PayoneSelect.pm mode change 100644 => 100755 copri4/shareedms-operator/src/Lib/Config.pm mode change 100644 => 100755 copri4/shareedms-operator/src/Lib/Mlogic.pm mode change 100644 => 100755 copri4/shareeweb-project/src/Lib/Config.pm mode change 100644 => 100755 copri4/shareeweb-project/src/Lib/Mlogic.pm diff --git a/copri4/main/img/konrad-Briefpapier.jpg b/copri4/main/img/konrad-Briefpapier.jpg new file mode 100644 index 0000000000000000000000000000000000000000..807b47d23e51e57ad7b799f998a46eeebb3e6287 GIT binary patch literal 9463 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 wjXsGvQ7x4x7Rk3#4v*y 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 Svr4dt1+W-{$id}->{int11} && $record->{$id}->{int11} eq "2"){ my @K_select = (); - @K_select = `cd /var/www/copri4/$varenv{syshost}/src/scripts && export CLASSPATH='.:/usr/share/java:/usr/share/java/postgresql.jar' && java Ilockauth $varenv{dbname} $bike_id`; + @K_select = `cd /var/www/copri4/main/src/scripts && export CLASSPATH='.:/usr/share/java:/usr/share/java/postgresql.jar' && java Ilockauth $varenv{dbname} $bike_id`; $bw->log("rentals java Ilockauth $bike_id | syshost:$varenv{syshost}",\@K_select,""); foreach(@K_select){ @@ -1417,8 +1417,8 @@ sub rentals(){ sub bikes_available(){ my $self = shift; my $q = shift; + my $varenv = shift; my $auth = shift; - my %varenv = $cf->envonline(); my $authed = 0; #my $users_serviceapp = $dbt->select_users($dbh,$auth->{c_id},"and int09=1"); @@ -1454,15 +1454,17 @@ sub bikes_available(){ my $op_return = {}; my @adr_tariff = (); - @adr_tariff = ("$auth->{txt30}"); - @adr_tariff = split(/\s+/,$auth->{txt30}) if($auth->{txt30} =~ /\w\s+\w/); + if(@adr_tariff){ + @adr_tariff = ("$auth->{txt30}"); + @adr_tariff = split(/\s+/,$auth->{txt30}) if($auth->{txt30} =~ /\w\s+\w/); + } foreach my $id (sort { $record->{$a}->{barcode} <=> $record->{$b}->{barcode} } keys (%$record)){ $return->{$id}->{authed} = "$authed"; - $return->{$id}->{station} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{int04}"; - $return->{$id}->{uri_operator} = "$varenv{wwwhost}"; + $return->{$id}->{station} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{int04}"; + $return->{$id}->{uri_operator} = "$varenv->{wwwhost}"; ($return->{$id}->{gps}->{latitude},$return->{$id}->{gps}->{longitude}) = split(/,/,$record->{$id}->{txt06}); - $return->{$id}->{bike} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{barcode}"; + $return->{$id}->{bike} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{barcode}"; #$return->{$id}->{description} = "$record->{$id}->{txt01}"; $return->{$id}->{description} = Encode::encode('utf-8', Encode::decode('iso-8859-1', $record->{$id}->{txt01})); $return->{$id}->{state} = "$dbt->{copri_conf}->{bike_state}->{$record->{$id}->{int10}}"; @@ -1474,10 +1476,10 @@ sub bikes_available(){ $return->{$id}->{lock_state} = "locking" if($record->{$id}->{int20} == 3); $return->{$id}->{Ilockit_GUID} = "$record->{$id}->{txt17}"; $return->{$id}->{Ilockit_ID} = "$record->{$id}->{txt18}"; - $return->{$id}->{bike_group} = ["$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{main_id}"]; + $return->{$id}->{bike_group} = ["$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{main_id}"]; #if($users_serviceapp->{int09}){ #shareetool - if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/ && scalar(@{$user_tour} >= 1)){ + if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} == 187 && scalar(@{$user_tour} >= 1)){ my @service_code = split(/\s/,$record->{$id}->{txt23}); $return->{$id}->{service_code} = [@service_code]; } @@ -1495,12 +1497,12 @@ sub bikes_available(){ $return->{$id}->{tariff_description}->{max_eur_per_day} = "$tariff_content->{$tid}->{int17}" if($tariff_content->{$tid}->{int17}); $return->{$id}->{tariff_description}->{free_hours} = "$tariff_content->{$tid}->{int16}" if($tariff_content->{$tid}->{int16}); $return->{$id}->{tariff_description}->{abo_eur_per_month} = "$tariff_content->{$tid}->{int15}" if($tariff_content->{$tid}->{int15}); - $return->{$id}->{tariff_description}->{$id}->{operator_agb} = "Mit der Mietrad Anmietung wird folgender Betreiber AGB zugestimmt (als Demo sharee AGB)." if($auth->{c_id} == 1842 || $auth->{c_id} == 5781); + $return->{$id}->{tariff_description}->{$id}->{operator_agb} = "Mit der Mietrad Anmietung wird folgender Betreiber AGB zugestimmt (als Demo sharee AGB)." if($auth->{c_id} == 1842 || $auth->{c_id} == 5781); } } } } - $op_return->{$dbt->{operator}->{$varenv{dbname}}->{oprefix} . $id} = $return->{$id}; + $op_return->{$dbt->{operator}->{$varenv->{dbname}}->{oprefix} . $id} = $return->{$id}; } return $op_return; }#end bikes_available @@ -1509,9 +1511,9 @@ sub bikes_available(){ sub bikes_all(){ my $self = shift; my $q = shift; + my $varenv = shift; my $auth = shift || {}; my $stations_allraw = shift || ""; - my %varenv = $cf->envonline(); #my $users_serviceapp = $dbt->select_users($dbh,$auth->{c_id},"and int09=1"); my $return={}; @@ -1527,8 +1529,10 @@ sub bikes_all(){ $main_ids =~ s/[a-z_]+//ig; $pref = { %$pref, main_id => "IN::($main_ids)" }; - my $station_id = $1 if($q->param('station') =~ /(\d+)/); - my $bike_id = $1 if($q->param('bike') =~ /(\d+)/); + my $station_id = ""; + my $bike_id = ""; + $station_id = $1 if($q->param('station') && $q->param('station') =~ /(\d+)/); + $bike_id = $1 if($q->param('bike') && $q->param('bike') =~ /(\d+)/); $pref = { %$pref, int04 => "=::" . $q->escapeHTML($station_id) } if(looks_like_number($station_id)); $pref = { %$pref, barcode => "=::" . $q->escapeHTML($bike_id) } if(looks_like_number($bike_id)); @@ -1538,7 +1542,7 @@ sub bikes_all(){ my @stations_service_tour = (); #shareetool - if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/){ + if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} == 187){ my $stations = ""; if(ref($stations_allraw) eq "HASH" && scalar(@{$user_tour} >= 1)){ foreach my $id (sort { $stations_allraw->{$a}->{int04} <=> $stations_allraw->{$b}->{int04} } keys (%$stations_allraw)){ @@ -1563,10 +1567,10 @@ sub bikes_all(){ foreach my $id (sort { $record->{$a}->{barcode} <=> $record->{$b}->{barcode} } keys (%$record)){ if(1==1){ $bikes_on_station->{$record->{$id}->{int04}}->{bike_ist} += 1; - $return->{$id}->{uri_operator} = "$varenv{wwwhost}"; - $return->{$id}->{station} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{int04}"; + $return->{$id}->{uri_operator} = "$varenv->{wwwhost}"; + $return->{$id}->{station} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{int04}"; ($return->{$id}->{gps}->{latitude},$return->{$id}->{gps}->{longitude}) = split(/,/,$record->{$id}->{txt06}); - $return->{$id}->{bike} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{barcode}"; + $return->{$id}->{bike} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{barcode}"; #$return->{$id}->{description} = "$record->{$id}->{txt01}"; $return->{$id}->{description} = Encode::encode('utf-8', Encode::decode('iso-8859-1', $record->{$id}->{txt01})); @@ -1579,15 +1583,15 @@ sub bikes_all(){ $return->{$id}->{lock_state} = "locking" if($record->{$id}->{int20} == 3); $return->{$id}->{Ilockit_GUID} = "$record->{$id}->{txt17}"; $return->{$id}->{Ilockit_ID} = "$record->{$id}->{txt18}"; - $return->{$id}->{bike_group} = ["$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{main_id}"]; + $return->{$id}->{bike_group} = ["$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{main_id}"]; #if($users_serviceapp->{int09}){ #shareetool - if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/ && scalar(@{$user_tour} >= 1)){ + if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} == 187 && scalar(@{$user_tour} >= 1)){ my @service_code = split(/\s/,$record->{$id}->{txt23}); $return->{$id}->{service_code} = [@service_code]; } } - $op_return->{$dbt->{operator}->{$varenv{dbname}}->{oprefix} . $id} = $return->{$id}; + $op_return->{$dbt->{operator}->{$varenv->{dbname}}->{oprefix} . $id} = $return->{$id}; } } @@ -1598,8 +1602,8 @@ sub bikes_all(){ sub stations_available(){ my $self = shift; my $q = shift || ""; + my $varenv = shift; my $auth = shift || ""; - my %varenv = $cf->envonline(); my $authed = 0; $authed = 1 if(ref($auth) eq "HASH" && $auth->{c_id}); @@ -1628,7 +1632,7 @@ sub stations_available(){ my $record = {}; #on servicetool only stations on user_tour #shareetool - if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/){ + if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} == 187){ if(scalar(@{$user_tour}) >= 1){ $pref_sql .= " AND ("; foreach(@{$user_tour}){ @@ -1648,13 +1652,13 @@ sub stations_available(){ foreach my $id (sort { $record->{$a}->{barcode} <=> $record->{$b}->{barcode} } keys (%$record)){ $return->{$id}->{authed} = "$authed"; - $return->{$id}->{station} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{int04}"; + $return->{$id}->{station} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{int04}"; if($record->{$id}->{int07}){ - $return->{$id}->{service_tour} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{int07}"; + $return->{$id}->{service_tour} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{int07}"; }else{ $return->{$id}->{service_tour} = ""; } - $return->{$id}->{uri_operator} = "$varenv{wwwhost}"; + $return->{$id}->{uri_operator} = "$varenv->{wwwhost}"; ($return->{$id}->{gps}->{latitude},$return->{$id}->{gps}->{longitude}) = split(/,/,$record->{$id}->{txt06}); #$return->{$id}->{description} = "$record->{$id}->{txt01}"; $return->{$id}->{description} = Encode::encode('utf-8', Encode::decode('iso-8859-1', $record->{$id}->{txt01})); @@ -1662,7 +1666,7 @@ sub stations_available(){ $return->{$id}->{station_group} = ""; if($record->{$id}->{txt24}){#Ilockit with new station_group logic $return->{$id}->{gps_radius} = "$record->{$id}->{int06}"; - $record->{$id}->{txt24} =~ s/(\d+)/$dbt->{operator}->{$varenv{dbname}}->{oprefix}$1/g; + $record->{$id}->{txt24} =~ s/(\d+)/$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$1/g; my @station_group = split(/\s/,$record->{$id}->{txt24}); $return->{$id}->{station_group} = [@station_group]; } @@ -1690,7 +1694,7 @@ sub stations_available(){ $return->{$id}->{operator_data}->{operator_phone} = $hotline_data->{txt07} if($hotline_data->{txt07}); $return->{$id}->{operator_data}->{operator_email} = $hotline_data->{txt08} if($hotline_data->{txt08}); - $op_return->{$dbt->{operator}->{$varenv{dbname}}->{oprefix} . $id} = $return->{$id}; + $op_return->{$dbt->{operator}->{$varenv->{dbname}}->{oprefix} . $id} = $return->{$id}; } return ($op_return, $record); }#end stations_available @@ -1700,9 +1704,9 @@ sub stations_available(){ sub stations_all(){ my $self = shift; my $q = shift || ""; + my $varenv = shift; my $bikes_on_station = shift || {}; my $auth = shift || ""; - my %varenv = $cf->envonline(); my $authed = 0; $authed = 1 if(ref($auth) eq "HASH" && $auth->{c_id}); @@ -1716,15 +1720,17 @@ sub stations_all(){ template_id => "225",#Station_liste }; - my $station_id = $1 if($q->param('station') =~ /(\d+)/); - my $work_val_id = $1 if($q->param('work_val') =~ /(\d+)/); + my $station_id = ""; + my $work_val_id = ""; + $station_id = $1 if($q->param('station') && $q->param('station') =~ /(\d+)/); + $work_val_id = $1 if($q->param('work_val') && $q->param('work_val') =~ /(\d+)/); if(looks_like_number($station_id)){ $pref->{int04} = $station_id; - }elsif($q->param('work_id') eq "int04" && $work_val_id){ + }elsif($q->param('work_id') && $q->param('work_id') eq "int04" && $work_val_id){ $pref->{int04} = $work_val_id; } - #shareetool werktatt - $pref->{int10} = 1 if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/); + #if not shareetool then only available stations + $pref->{int10} = 1 if(!$q->param('authcookie') || !$varenv->{merchant_id} || !$dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} || $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} != 187); my $pref_sql = ""; $pref_sql .= " and ("; @@ -1740,7 +1746,9 @@ sub stations_all(){ my $record = {}; #on servicetool only stations on user_tour #shareetool - if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/){ + $bw->log("stations user_tour by merchant id $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} on $varenv->{dbname}",$user_tour,""); + + if($q->param('authcookie') && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{id} == 187){ if(scalar(@{$user_tour}) >= 1){ $pref_sql .= " AND ("; foreach(@{$user_tour}){ @@ -1768,13 +1776,13 @@ sub stations_all(){ #$bike_soll = $lb->round_half($bike_soll); #$bike_soll =~ s/\.\d+//;#rounded integer $return->{$id}->{authed} = "$authed"; - $return->{$id}->{station} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{int04}"; + $return->{$id}->{station} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{int04}"; if($record->{$id}->{int07}){ - $return->{$id}->{service_tour} = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}$record->{$id}->{int07}"; + $return->{$id}->{service_tour} = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$record->{$id}->{int07}"; }else{ $return->{$id}->{service_tour} = ""; } - $return->{$id}->{uri_operator} = "$varenv{wwwhost}"; + $return->{$id}->{uri_operator} = "$varenv->{wwwhost}"; ($return->{$id}->{gps}->{latitude},$return->{$id}->{gps}->{longitude}) = split(/,/,$record->{$id}->{txt06}); #$return->{$id}->{description} = "$record->{$id}->{txt01}"; $return->{$id}->{description} = Encode::encode('utf-8', Encode::decode('iso-8859-1', $record->{$id}->{txt01})); @@ -1784,11 +1792,11 @@ sub stations_all(){ $return->{$id}->{station_group} = ""; if($record->{$id}->{txt24}){#sharee Ilockit with new station_group logic $return->{$id}->{gps_radius} = "$record->{$id}->{int06}"; - $record->{$id}->{txt24} =~ s/(\d+)/$dbt->{operator}->{$varenv{dbname}}->{oprefix}$1/g; + $record->{$id}->{txt24} =~ s/(\d+)/$dbt->{operator}->{$varenv->{dbname}}->{oprefix}$1/g; my @station_group = split(/\s/,$record->{$id}->{txt24}); $return->{$id}->{station_group} = [@station_group]; } - $op_return->{$dbt->{operator}->{$varenv{dbname}}->{oprefix} . $id} = $return->{$id}; + $op_return->{$dbt->{operator}->{$varenv->{dbname}}->{oprefix} . $id} = $return->{$id}; } return ($op_return,$record); }#end stations_all @@ -1828,6 +1836,8 @@ sub fetch_tariff(){ my $adr = shift || {}; my $authcookie = shift || ""; + my $merchant_id = ""; + $merchant_id = $1 if($authcookie && $authcookie =~ /\w+_(\w+)$/); my $tariff_content = {}; my @user_tour = (); my %varenv = $cf->envonline(); @@ -1851,8 +1861,10 @@ sub fetch_tariff(){ if((ref($adr) ne "HASH" || !$adr->{c_id}) && ($varenv{dbname} ne "sharee_lv")){ $tariff->{int18} = 2; $tariff_content = $dbt->fetch_record($dbh,$tariff); + $bw->log("1. Tariff type $tariff->{int18} select on",$varenv{dbname},""); }elsif(ref($adr) eq "HASH" && $adr->{c_id}){ #select operators address to get users tarifnr array in txt30 + delete $tariff->{int18} if($tariff->{int18}); my $authref = { table => "contentadr", fetch => "one", @@ -1862,7 +1874,7 @@ sub fetch_tariff(){ $auth_operator = $dbt->fetch_record($dbh,$authref); #shareetool - if($authcookie && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $authcookie =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/){ + if($merchant_id && $dbt->{merchant_ids}->{$merchant_id}->{id} && $dbt->{merchant_ids}->{$merchant_id}->{id} == 187){ my $users_serviceapp = $dbt->select_users($dbh,$auth_operator->{c_id},"and int09=1"); if($users_serviceapp->{int09}){ $auth_operator->{txt18} =~ s/(\d+)/$dbt->{operator}->{$varenv{dbname}}->{oprefix}$1/g; @@ -1876,9 +1888,10 @@ sub fetch_tariff(){ #FIXME user tarif select have to be fetched like in net_booking #$tariff_content must contain tariff_description in App bikes_available listing $tariff_content = $dbt->fetch_record($dbh,$tariff); + $bw->log("2. Tariff type $tariff->{int18} select on",$varenv{dbname},""); # }else{ - $bw->log("NO tariff_content on",$varenv{dbname},""); + $bw->log("3. NO tariff_content on",$varenv{dbname},""); } my $oprefix = ""; @@ -1888,14 +1901,16 @@ sub fetch_tariff(){ my @user_group = (); my @bike_group = (); my @adr_tariff = (); - @adr_tariff = ("$auth_operator->{txt30}"); - @adr_tariff = split(/\s+/,$auth_operator->{txt30}) if($auth_operator->{txt30} =~ /\w\s+\w/); + if($auth_operator->{txt30}){ + @adr_tariff = ("$auth_operator->{txt30}"); + @adr_tariff = split(/\s+/,$auth_operator->{txt30}) if($auth_operator->{txt30} =~ /\w\s+\w/); + } foreach my $id (keys (%$tariff_content)){ $bw->log("Tarif searching for authorized user-id $auth_operator->{c_id} by: if($auth_operator->{txt30} && $auth_operator->{txt30} =~ /$tariff_content->{$id}->{barcode}/ && $tariff_content->{$id}->{int12}) (s-type:$tariff_content->{$id}->{int18})","",""); foreach(@adr_tariff){ if($_ == $tariff_content->{$id}->{barcode} && $tariff_content->{$id}->{int12}){ - $bw->log("Tarif FOUND for authorized user-id $auth_operator->{c_id} if($tariff_content->{$id}->{int12}) (s-type:$tariff_content->{$id}->{int18})",$tariff_content->{$id}->{barcode},""); + $bw->log("Tarif FOUND with merchant $merchant_id for authorized user-id $auth_operator->{c_id} if($tariff_content->{$id}->{int12}) (s-type:$tariff_content->{$id}->{int18})",$tariff_content->{$id}->{barcode},""); push(@tarifnr, "$tariff_content->{$id}->{barcode}"); push(@user_group, "$oprefix$tariff_content->{$id}->{int12}");#sharee bike_node.main_id push(@bike_group, "$oprefix$tariff_content->{$id}->{int12}");#sharee bike_node.main_id @@ -1905,10 +1920,10 @@ sub fetch_tariff(){ #fallback to public tarif if no user tariff defined and not servicetool app request #shareetool - if(!@tarifnr && (!$dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} || $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} != 187)){ + if(!@tarifnr && (!$dbt->{merchant_ids}->{$merchant_id}->{id} || $dbt->{merchant_ids}->{$merchant_id}->{id} != 187)){ foreach my $id (keys (%$tariff_content)){ if($tariff_content->{$id}->{int18} eq 2){ - $bw->log("Tarif FOUND FALLBACK for No Tarif users if($tariff_content->{$id}->{int12} && $varenv{dbname}) (s-type:$tariff_content->{$id}->{int18})",$id,""); + $bw->log("Tarif FOUND FALLBACK for No Tarif users with merchant $merchant_id if($tariff_content->{$id}->{int12} && $varenv{dbname}) (s-type:$tariff_content->{$id}->{int18})",$id,""); push(@tarifnr, "$tariff_content->{$id}->{barcode}"); push(@user_group, "$oprefix$tariff_content->{$id}->{int12}");#sharee bike_node.main_id push(@bike_group, "$oprefix$tariff_content->{$id}->{int12}");#sharee bike_node.main_id @@ -1916,7 +1931,7 @@ sub fetch_tariff(){ } } #$bw->log("FETCHED_Tarif by dbname:$varenv{dbname} | user_group:@user_group | bike_group:@bike_group | user_tour:@user_tour | tarifnr: @tarifnr",$tariff_content,""); - $bw->log("FETCHED_Tarif by dbname:$varenv{dbname} | user_group:@user_group | bike_group:@bike_group | user_tour:@user_tour | tarifnr: @tarifnr",\@tarifnr,""); + $bw->log("FETCHED_Tarif by dbname:$varenv{dbname} with merchant $merchant_id | user_group:@user_group | bike_group:@bike_group | user_tour:@user_tour | tarifnr: @tarifnr",\@tarifnr,""); return (\@bike_group,\@user_group,$tariff_content,\@user_tour); } @@ -1999,13 +2014,15 @@ sub auth_verify(){ %varenv = $cf->envonline(); my $record = { c_id => 0 };#if fails - my $return = { authcookie => "" }; + my $return = { authcookie => "", + merchant_id => "" + }; my $user_group = ""; my $bike_group = ""; my $tariff_content = ""; my $user_tour = ""; - #my $source = $dbt->get_dbname();#TODO, maybe substitude varenv{dbname} by $source!? + $return->{merchant_id} = $1 if($cgi_authcookie && $cgi_authcookie =~ /\w+_(\w+)$/); my $netloc = $q->url(-base=>1); $bw->log("--> auth_verify on dbname $varenv{dbname},\n Starting with authcookie: $cgi_authcookie",$netloc,""); if($cgi_authcookie && length($cgi_authcookie) > 30){ @@ -2027,7 +2044,7 @@ sub auth_verify(){ my $auth_primary = { c_id => 0 }; $auth_primary = $dbt->fetch_record($dbh_primary,$authref); - if($auth_primary->{c_id} > 0){ + if($auth_primary->{c_id} && $auth_primary->{c_id} > 0){ $bw->log("auth_verified on primary anchor 2 by dbname $varenv{dbname}",$auth_primary->{c_id},""); #On booking_request, user must be authenticated and addr must exist @@ -2220,7 +2237,7 @@ sub auth_verify(){ #Servicetool only users with users.int09=1 #shareetool - if($varenv{dbname} ne "sharee_primary" && $q->param('authcookie') && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} && $dbt->{merchant_ids}->{$varenv{merchant_id}}->{id} == 187 && $q->param('authcookie') =~ /$dbt->{merchant_ids}->{$varenv{merchant_id}}/){ + if($varenv{dbname} ne "sharee_primary" && $q->param('authcookie') && $dbt->{merchant_ids}->{$return->{merchant_id}}->{id} && $dbt->{merchant_ids}->{$return->{merchant_id}}->{id} == 187){ my $users_serviceapp = { u_id => 0 }; $users_serviceapp = $dbt->select_users($dbh,$record->{c_id},"and int09=1"); if(!$users_serviceapp->{u_id} || $users_serviceapp->{u_id} == 0){ @@ -2271,7 +2288,7 @@ sub authorization(){ #Servicetool, only users with users.int09=1 #shareetool - if($aowner && $aowner eq "187"){ + if($varenv{dbname} ne "sharee_primary" && $aowner && $aowner eq "187"){ my $users_serviceapp = { u_id => 0 }; $users_serviceapp = $dbt->select_users($dbh,$record->{c_id},"and int09=1"); $record = { c_id => 0 } if(!$users_serviceapp->{u_id}); diff --git a/copri4/main/src/Mod/APIjsonclient.pm b/copri4/main/src/Mod/APIjsonclient.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm old mode 100644 new mode 100755 index be3c84e..e96526f --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -424,7 +424,7 @@ elsif($q->param('request') eq "bikes_available"){ my ($auth,$authraw) = $apif->auth_verify($q);#on operator loop select, operator adr must be select to get user_group $response = { %$response, %$auth }; $bw->log("Y bikes_available by c_id $authraw->{c_id}, Tarif:",$authraw->{txt30},""); - $response->{bikes} = $apif->bikes_available($q,$authraw); + $response->{bikes} = $apif->bikes_available($q,\%varenv,$authraw); } if(ref($response->{bikes}) ne "HASH"){ $response->{response_state} = "Failure 5003: cannot find any user defined bike tariff"; @@ -444,15 +444,18 @@ elsif($q->param('request') eq "bikes_all"){ $response = { %$response, %$auth }; ($response->{bikes},$response->{uri_operator_array},$response->{user_group},$response->{user_tour}) = $jsc->loop_sharees($q,$auth,$aowner); }else{ + ($aowner,my $return_merchant) = $apif->fetch_merchant($q,\%varenv,$coo,$q->param('merchant_id')); + $varenv{merchant_id} = $return_merchant->{merchant_id}; + my ($auth,$authraw) = $apif->auth_verify($q); $response = { %$response, %$auth }; $response->{response_text} = "Vorsicht, das ist die Liste aller Leihräder unabhängig von der Verfügbarkeit"; #on servicetool only stations on user_tour my $stations_allraw = {}; - (my $stations_not_used,$stations_allraw) = $apif->stations_all($q,"",$authraw) if($aowner && $aowner eq "187");#shareetool + (my $stations_not_used,$stations_allraw) = $apif->stations_all($q,\%varenv,$authraw) if($aowner && $aowner eq "187");#shareetool - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,$stations_allraw); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,$stations_allraw); my $bike = "all"; my $interval = $q->param('interval') || "31"; @@ -592,10 +595,13 @@ elsif($q->param('request') eq "stations_all"){ $response = { %$response, %$auth }; ($response->{stations},$response->{uri_operator_array},$response->{user_group},$response->{user_tour}) = $jsc->loop_sharees($q,$auth,$aowner); }else{ + ($aowner,my $return_merchant) = $apif->fetch_merchant($q,\%varenv,$coo,$q->param('merchant_id')); + $varenv{merchant_id} = $return_merchant->{merchant_id}; + my ($auth,$authraw) = $apif->auth_verify($q); $response = { %$response, %$auth }; - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); - ($response->{stations},my $stations_allraw) = $apif->stations_all($q,$bikes_on_station,$authraw); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); + ($response->{stations},my $stations_allraw) = $apif->stations_all($q,\%varenv,$bikes_on_station,$authraw); } } @@ -617,7 +623,7 @@ elsif($q->param('request') eq "stations_available"){ }else{ my ($auth,$authraw) = $apif->auth_verify($q); $response = { %$response, %$auth }; - ($response->{stations}, my $response_raw) = $apif->stations_available($q,$authraw); + ($response->{stations}, my $response_raw) = $apif->stations_available($q,\%varenv,$authraw); } } @@ -728,14 +734,14 @@ elsif($q->param('request') eq "service_done"){ if(($q->param('work_id') eq "int04" || $q->param('work_id') eq "station") && looks_like_number($bike_id) && ($q->param('work_val') || looks_like_number($q->param('work_val')))){ $q->param(-name=>'work_id',-value=>"int04") if($q->param('work_id') eq "station");#station db-field is int04 my $to_station_id = $1 if($q->param('work_val') =~ /(\d+)/); - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); #add-on to log redistribute#TODO dedicated db-fieled my $action = "txt10=" . $oprefix . $bikes_allraw->{$bike_id}->{int04} . " - " . $q->param('work_val'); $apif->service_update($q,$authraw,$node_template,$service_id,$action); - my ($stations_all,$stations_allraw) = $apif->stations_all($q,$bikes_on_station,$authraw); + my ($stations_all,$stations_allraw) = $apif->stations_all($q,\%varenv,$bikes_on_station,$authraw); if(looks_like_number($stations_allraw->{$to_station_id}->{int04})){ ($xresponse->{$article}, $responseraw, $node_template, $crecord) = $apif->service_select($q,$authraw,"","1"); my $update_hash = { int04 => "$to_station_id" }; @@ -766,14 +772,14 @@ elsif($q->param('request') eq "service_done"){ my $response_work = {}; my $node = {}; - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); if(looks_like_number($bike_id)){ (my $xresponse, my $pos_record, my $node_template, my $crecord) = $apif->service_select($q,$authraw,"","100");#check interval ($response_work, $node) = $apif->service_work($pos_record,$bikes_allraw,"",$node_template); } elsif(looks_like_number($station_id)){ - my ($stations_all,$stations_allraw) = $apif->stations_all($q,$bikes_on_station,$authraw); + my ($stations_all,$stations_allraw) = $apif->stations_all($q,\%varenv,$bikes_on_station,$authraw); (my $xresponse, my $pos_record, my $node_template, my $crecord) = $apif->service_select($q,$authraw,"","100");#check interval ($response_work, $node) = $apif->service_work($pos_record,$stations_allraw,"",$node_template); @@ -814,7 +820,7 @@ elsif($q->param('request') eq "service_work"){ $history = $q->param('history') if(looks_like_number($q->param('history'))); if(ref($auth) eq "HASH" && $auth->{authcookie}){ if(looks_like_number($bike_id)){ - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); (my $xresponse, my $pos_record, my $node_template, my $crecord) = $apif->service_select($q,$authraw,"",$history); #$bw->log("service_work bike_id $bike_id pos_record",$pos_record,""); @@ -829,7 +835,7 @@ elsif($q->param('request') eq "service_work"){ } $response = { %$response, %$op_response_work, %$auth }; }elsif($q->param('bike') && $q->param('bike') eq "all"){ - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); my $bike = $q->param('bike'); (my $xresponse, my $pos_record, my $node_template, my $crecord) = $apif->service_select($q,$authraw,"",$history); (my $response_work, $node) = $apif->service_work($pos_record,$bikes_allraw,$history,$node_template); @@ -842,8 +848,8 @@ elsif($q->param('request') eq "service_work"){ } $response = { %$response, %$op_response_work, %$auth }; }elsif(looks_like_number($station_id)){ - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); - my ($stations_all,$stations_allraw) = $apif->stations_all($q,$bikes_on_station,$authraw); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); + my ($stations_all,$stations_allraw) = $apif->stations_all($q,\%varenv,$bikes_on_station,$authraw); (my $xresponse, my $pos_record, my $node_template, my $crecord) = $apif->service_select($q,$authraw,"",$history); (my $response_work, $node) = $apif->service_work($pos_record,$stations_allraw,$history,$node_template); if(ref($response_work) ne "HASH"){#if fails @@ -855,8 +861,8 @@ elsif($q->param('request') eq "service_work"){ } $response = { %$response, %$op_response_work, %$auth }; }elsif($q->param('station') && $q->param('station') eq "all"){ - my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,$authraw,""); - my ($stations_all,$stations_allraw) = $apif->stations_all($q,$bikes_on_station,$authraw); + my ($bikes_all,$bikes_allraw,$bikes_on_station) = $apif->bikes_all($q,\%varenv,$authraw,""); + my ($stations_all,$stations_allraw) = $apif->stations_all($q,\%varenv,$bikes_on_station,$authraw); my $station = $q->param('station'); (my $xresponse, my $pos_record, my $node_template, my $crecord) = $apif->service_select($q,$authraw,"",$history); (my $response_work, $node) = $apif->service_work($pos_record,$stations_allraw,$history,$node_template); diff --git a/copri4/main/src/Mod/APIvelo.pm b/copri4/main/src/Mod/APIvelo.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/APIxmlserver.pm b/copri4/main/src/Mod/APIxmlserver.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/Basework.pm b/copri4/main/src/Mod/Basework.pm old mode 100644 new mode 100755 index e3f2c80..ea2684c --- a/copri4/main/src/Mod/Basework.pm +++ b/copri4/main/src/Mod/Basework.pm @@ -37,7 +37,8 @@ sub log { $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime; my $logfile = "/var/log/copri4/$varenv{syshost}-process.log"; - if($varenv{debug}){ + #if($varenv{debug}){ + if(1==1){ warn "$what" . "\n" . Dumper($message) . "\n";#to apache2/error.log #2021-07-21 disabled. error.log is enough diff --git a/copri4/main/src/Mod/Buttons.pm b/copri4/main/src/Mod/Buttons.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/Callib.pm b/copri4/main/src/Mod/Callib.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/Failure.pm b/copri4/main/src/Mod/Failure.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/FileOut.pm b/copri4/main/src/Mod/FileOut.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/KMLout.pm b/copri4/main/src/Mod/KMLout.pm old mode 100644 new mode 100755 index 176b411..10d9bfc --- a/copri4/main/src/Mod/KMLout.pm +++ b/copri4/main/src/Mod/KMLout.pm @@ -62,6 +62,7 @@ sub kmlGenerator { my $authcookie = shift || { authcookie => '' }; my $varenv = shift; my $users_sharee = shift || { c_id => 0 }; + $users_sharee->{c_id} = "0" if(!$users_sharee->{c_id}); my $q = new CGI; my $dbt = new DBtank; @@ -76,6 +77,7 @@ sub kmlGenerator { my $project = "all"; $project = $dbt->{website}->{$varenv->{syshost}}->{project} if($dbt->{website}->{$varenv->{syshost}}->{project}); $project = $dbt->{operator}->{$varenv->{dbname}}->{project} if($dbt->{operator}->{$varenv->{dbname}}->{project}); + #print "$project | $varenv->{syshost} | $users_sharee->{c_id} | $authcookie->{authcookie}"; my $timestamp = strftime "%Y%m%d%H%M%S", localtime; my $kmlfile = "sharee-$timestamp-$users_sharee->{c_id}.kml"; diff --git a/copri4/main/src/Mod/Libenz.pm b/copri4/main/src/Mod/Libenz.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/Libenzdb.pm b/copri4/main/src/Mod/Libenzdb.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/MailTransport.pm b/copri4/main/src/Mod/MailTransport.pm old mode 100644 new mode 100755 index ad5db61..7af31be --- a/copri4/main/src/Mod/MailTransport.pm +++ b/copri4/main/src/Mod/MailTransport.pm @@ -81,7 +81,7 @@ sub send_mail(){ port => 465, sasl_username => "$mailxconf{mailx}->{sasl_username}", sasl_password => "$mailxconf{mailx}->{sasl_password}", - helo => "$dbt->{primary}->{sharee_primary}->{live_hostname}", + helo => "$dbt->{copri_conf}->{stage}", debug => 0, ); diff --git a/copri4/main/src/Mod/Modalbox.pm b/copri4/main/src/Mod/Modalbox.pm old mode 100644 new mode 100755 index b5e6858..3ea3dd7 --- a/copri4/main/src/Mod/Modalbox.pm +++ b/copri4/main/src/Mod/Modalbox.pm @@ -78,7 +78,7 @@ print<updater("contentadr","1","1","txt11","$pwmd5","$owner","txt08","ilike","$email"); + $bw->log("$varenv{basedir}/src/Mod/newsletter_tink.pl",$email,""); system(`$varenv{basedir}/src/Mod/newsletter_tink.pl "$varenv{basedir}" "$varenv{wwwhost}" "send_password" "$email" "$coo"`); } diff --git a/copri4/main/src/Mod/ajax_json.pm b/copri4/main/src/Mod/ajax_json.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/ajax_post.pm b/copri4/main/src/Mod/ajax_post.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Mod/newsletter_tink.pl b/copri4/main/src/Mod/newsletter_tink.pl old mode 100644 new mode 100755 index 2415e25..a15d1d6 --- a/copri4/main/src/Mod/newsletter_tink.pl +++ b/copri4/main/src/Mod/newsletter_tink.pl @@ -197,8 +197,8 @@ sub esender_success { #Ack digest my $ack_digest = $q->unescapeHTML($ctadr->{txt34}) || ""; - my $email_ack_digest = $1 if($ack_digest =~ /^(\w{5})/); - my $sms_ack_digest = $1 if($ack_digest =~ /(\w{5})$/); + my $email_ack_digest = $1 if($ack_digest =~ /^(.{5})/); + my $sms_ack_digest = $1 if($ack_digest =~ /(.{5})$/); #disabled because of payone payment #my $iban = $q->unescapeHTML($ctadr->{txt22}); @@ -267,7 +267,7 @@ EOF my $subject = "$varenv{title} Anmeldebestätigung"; - if($hostname ne "$varenv{live_hostname}"){ + if($hostname ne "ginger"){ $email = $mailxconf{mailx}->{mail_testto}; $subject .= "* offline Test *"; } @@ -365,7 +365,7 @@ EOF my $subject = "$varenv{title} Passwort vergessen"; - if($hostname ne "$varenv{live_hostname}"){ + if($hostname ne "ginger"){ $email = $mailxconf{mailx}->{mail_testto}; $subject .= "* offline Test *"; } @@ -531,7 +531,7 @@ $body =~ s/\n/
/g; #----------------------------------------------------------------- - if($hostname ne "$varenv{live_hostname}"){ + if($hostname ne "ginger"){ $email = $mailxconf{mailx}->{mail_testto}; $subject .= "* offline Test *"; } diff --git a/copri4/main/src/Tpl/APIdialog.pm b/copri4/main/src/Tpl/APIdialog.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/AttributEdit.pm b/copri4/main/src/Tpl/AttributEdit.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/AttributMatrix.pm b/copri4/main/src/Tpl/AttributMatrix.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm old mode 100644 new mode 100755 index bad5018..4c0b4a9 --- a/copri4/main/src/Tpl/BaseEdit.pm +++ b/copri4/main/src/Tpl/BaseEdit.pm @@ -600,8 +600,8 @@ EOF print $q->div($but->singlesubmit7("$edit","$save_key","$ib{$save_key}","margin:10px 20px;")),"\n"; my $debug = ""; - #$debug = "(ct_table: $node_meta->{ct_table} | main_id: $node_meta->{main_id} | c_id: $ctrel->{c_id} | tpl_id: $tpl->{tpl_id} | rel_id: $ctrel->{rel_id})"; - print $q->div({-style=>'z-index:10;font-size:13px;'},"$debug"),"\n" if($users_dms->{u_id} eq $varenv{superu_id}); + $debug = "(ct_table: $node_meta->{ct_table} | main_id: $node_meta->{main_id} | c_id: $ctrel->{c_id} | tpl_id: $tpl->{tpl_id} | rel_id: $ctrel->{rel_id})"; + print $q->div({-style=>'z-index:10;font-size:13px;'},"$debug"),"\n" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}); print ""; } diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/Karte.pm b/copri4/main/src/Tpl/Karte.pm old mode 100644 new mode 100755 index 6a3b9fb..e7005f5 --- a/copri4/main/src/Tpl/Karte.pm +++ b/copri4/main/src/Tpl/Karte.pm @@ -36,20 +36,30 @@ sub tpl(){ my %apikeyconf = $aconf->getall; #print $apikeyconf{googlemap}->{google_key}; - my $initMap = $dbt->{website}->{$varenv->{syshost}}->{initMap}; - $initMap = $dbt->{operator}->{$varenv->{dbname}}->{initMap} if($dbt->{operator}->{$varenv->{dbname}}->{initMap}); - $initMap = $dbt->{primary}->{$varenv->{dbname}}->{initMap} if($dbt->{primary}->{$varenv->{dbname}}->{initMap}); - $initMap =~ s/\s//g; - my ($lat,$lng) = split(/,/,$initMap); - my $api_return = { authcookie => '' }; my $coo = $q->cookie(-name=>'domcookie') || $R::sessionid; ($api_return,$users_sharee) = $apif->auth_verify($q,$coo,""); + my $initMap = $dbt->{website}->{$varenv->{syshost}}->{initMap}; + + if($dbt->{website}->{$varenv->{syshost}}->{merchant_id}){ + $api_return->{authcookie} = $dbt->{website}->{$varenv->{syshost}}->{merchant_id} if(!$api_return->{authcookie}); + }elsif($dbt->{operator}->{$varenv->{dbname}}->{merchant_id}){ + $api_return->{authcookie} = $dbt->{operator}->{$varenv->{dbname}}->{merchant_id} if(!$api_return->{authcookie}); + $initMap = $dbt->{operator}->{$varenv->{dbname}}->{initMap}; + }elsif($dbt->{primary}->{$varenv->{dbname}}->{merchant_id}){ + $api_return->{authcookie} = $dbt->{primary}->{$varenv->{dbname}}->{merchant_id} if(!$api_return->{authcookie}); + $initMap = $dbt->{primary}->{$varenv->{dbname}}->{initMap}; + } + + $users_sharee->{c_id} = "0" if(!$users_sharee->{c_id}); + $initMap =~ s/\s//g; + my ($lat,$lng) = split(/,/,$initMap); + require "Mod/KMLout.pm"; my $kmlfile = Mod::KMLout::kmlGenerator($api_return,$varenv,$users_sharee); - print "
\n"; + print "$initMap|$varenv->{dbname}|$api_return->{authcookie}|$users_sharee->{c_id}|$kmlfile" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}); print "
\n"; diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/MandantConf.pm b/copri4/main/src/Tpl/MandantConf.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/SubListe.pm b/copri4/main/src/Tpl/SubListe.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm old mode 100644 new mode 100755 diff --git a/copri4/main/src/scripts/Ilockauth.class b/copri4/main/src/scripts/Ilockauth.class old mode 100644 new mode 100755 diff --git a/copri4/main/src/scripts/Ilockauth.java b/copri4/main/src/scripts/Ilockauth.java old mode 100644 new mode 100755 diff --git a/copri4/main/src/scripts/Ilockit_cloud.pl b/copri4/main/src/scripts/Ilockit_cloud.pl index d77bfa2..abedaed 100755 --- a/copri4/main/src/scripts/Ilockit_cloud.pl +++ b/copri4/main/src/scripts/Ilockit_cloud.pl @@ -21,7 +21,7 @@ BEGIN { $syshost = $ARGV[0] || die; } -use lib "/var/www/copri4/$syshost/src"; +use lib "/var/www/copri-bike/$syshost/src"; use strict; use warnings; use POSIX; diff --git a/copri4/main/src/scripts/Ilockit_trackingcloud.pl b/copri4/main/src/scripts/Ilockit_trackingcloud.pl index 6978f27..36061ab 100755 --- a/copri4/main/src/scripts/Ilockit_trackingcloud.pl +++ b/copri4/main/src/scripts/Ilockit_trackingcloud.pl @@ -23,7 +23,7 @@ BEGIN { $syshost = $ARGV[0] || die; } -use lib "/var/www/copri4/$syshost/src"; +use lib "/var/www/copri-bike/$syshost/src"; use strict; use warnings; use POSIX; diff --git a/copri4/main/src/scripts/Ilockkeygen.class b/copri4/main/src/scripts/Ilockkeygen.class old mode 100644 new mode 100755 diff --git a/copri4/main/src/scripts/Ilockkeygen.java b/copri4/main/src/scripts/Ilockkeygen.java old mode 100644 new mode 100755 diff --git a/copri4/main/src/scripts/newsletter_post.pl b/copri4/main/src/scripts/newsletter_post.pl index 45185cb..ac343e4 100755 --- a/copri4/main/src/scripts/newsletter_post.pl +++ b/copri4/main/src/scripts/newsletter_post.pl @@ -13,7 +13,7 @@ use vars qw($syshost); BEGIN { $syshost = $ARGV[0] || exit 1; } -use lib "/var/www/copri4/$syshost/src"; +use lib "/var/www/copri-bike/$syshost/src"; use strict; @@ -105,7 +105,7 @@ sub transport { $smtp->auth($varenv->{sasl_username},$varenv->{sasl_password}); $smtp->mail($varenv->{mail_from}); - if($hostname ne "$varenv->{live_hostname}"){ + if($hostname ne "ginger"){ $mail_to = $varenv->{mail_testto}; $subject .= "* offline Test *"; } diff --git a/copri4/main/src/scripts/payone_post_Payment.pl b/copri4/main/src/scripts/payone_post_Payment.pl index e520a6d..165b9b0 100755 --- a/copri4/main/src/scripts/payone_post_Payment.pl +++ b/copri4/main/src/scripts/payone_post_Payment.pl @@ -16,7 +16,7 @@ BEGIN { $syshost = $ARGV[0] || die 'syshost not defined'; } -use lib "/var/www/copri4/$syshost/src"; +use lib "/var/www/copri-bike/$syshost/src"; use strict; use warnings; diff --git a/copri4/main/src/scripts/requested_timeout.pl b/copri4/main/src/scripts/requested_timeout.pl index 8207c0b..17991d1 100755 --- a/copri4/main/src/scripts/requested_timeout.pl +++ b/copri4/main/src/scripts/requested_timeout.pl @@ -13,7 +13,7 @@ BEGIN { $syshost = $ARGV[0] || die; } -use lib "/var/www/copri4/$syshost/src"; +use lib "/var/www/copri-bike/$syshost/src"; use strict; use warnings; diff --git a/copri4/main/src/scripts/velofaktur_client.pl b/copri4/main/src/scripts/velofaktur_client.pl index 0cb5d4b..0165585 100755 --- a/copri4/main/src/scripts/velofaktur_client.pl +++ b/copri4/main/src/scripts/velofaktur_client.pl @@ -19,7 +19,7 @@ BEGIN { $syshost = $ARGV[0] || die; } -use lib "/var/www/copri4/$syshost/src"; +use lib "/var/www/copri-bike/$syshost/src"; use strict; use warnings; use POSIX; diff --git a/copri4/mkaccess.sh b/copri4/mkaccess.sh index 1332c96..3d21c46 100755 --- a/copri4/mkaccess.sh +++ b/copri4/mkaccess.sh @@ -18,6 +18,7 @@ for i in $(find . -type d -and -name apk); do chmod -R ug+rwx $i;done for i in $(find . -type d -and -name sql); do chmod -R go-rwx $i;done for i in $(find . -type d -and -name src); do chmod -R go-w $i;done +for i in $(find . -type d -and -name src); do chmod -R ug+x $i;done for i in $(find . -type d -and -name img); do chmod -R go-w $i;done for i in $(find . -type d -and -name apache); do chmod -R go-w $i;done for i in $(find . -type d -and -name css); do chmod -R go-w $i;done diff --git a/copri4/shareeapp-operator/src/Lib/Config.pm b/copri4/shareeapp-operator/src/Lib/Config.pm old mode 100644 new mode 100755 index 2672b85..8ca8cb3 --- a/copri4/shareeapp-operator/src/Lib/Config.pm +++ b/copri4/shareeapp-operator/src/Lib/Config.pm @@ -67,8 +67,8 @@ sub envonline(){ pdfinvoice => "$basedir/pdfinvoice", data => "$basedir/data", xmlfile => "$basedir/xml", - ftp_getfile => "ftp/SWK_codes/got_last.csv", - ftp_putfile => "ftp/SWK_return/konrad_code_protokoll.csv", + Anrede => "Anrede,Frau,Herr,Firma", + Einheit => "Stück,Paar,Satz,Meter,Liter", head_logo => "", barcode => "", printer => "PDF" diff --git a/copri4/shareeapp-operator/src/Lib/Mlogic.pm b/copri4/shareeapp-operator/src/Lib/Mlogic.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeapp-operator/src/Tpl/Anmelden.pm b/copri4/shareeapp-operator/src/Tpl/Anmelden.pm old mode 100644 new mode 100755 index 389629c..5e28ac8 --- a/copri4/shareeapp-operator/src/Tpl/Anmelden.pm +++ b/copri4/shareeapp-operator/src/Tpl/Anmelden.pm @@ -130,11 +130,11 @@ sub tpl(){ }elsif(!$R::password_forgotten){ if($R::conflict_failure){ print $q->div({-class=>'content2',-style=>'color:#c83434'},"Registrierungsfehler!"),"\n"; - print $q->div({-class=>'content2'}, "Die Registrierung wurde abgebrochen weil bereits ein Account mit Ihrer e-Mail oder Telefonnr. existiert. Bitte kontaktieren Sie uns falls hier ein Missbrauch vorliegt. Falls Sie ein neues Passwort benötigen drücken Sie bitte:"),"\n"; - print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"", -style=>"color:#$bgcolor1;font-size:1.1em;text-decoration:underline;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Passwort vergessen?")),"\n"; + print $q->div({-class=>'content2'}, "Die Registrierung wurde abgebrochen. Melden Sie sich mit ihrer E-Mail und Passwort erneut an, wenn Sie das Registrierungsformular vervollständigen oder korrigieren wollen. Falls Sie ein neues Passwort benötigen, fordern Sie diesen hier an:"),"\n"; + print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"", -style=>"color:#$bgcolor1;font-size:1.1em;text-decoration:underline;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Neues Passwort anfordern")),"\n"; } print $q->div({-class=>'content2'}, "Dein Zugang zum Lastenradmietsystem"),"\n"; - print $q->div({-style=>'color:#c83434'},"Login verweigert. ",$q->a({-class=>"", -style=>"color:gray;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Passwort vergessen?")),"\n" if($R::failure); + print $q->div({-style=>'color:#c83434'},"Login verweigert. ",$q->a({-class=>"", -style=>"color:gray;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Neues Passwort anfordern")),"\n" if($R::failure); print $q->div({-style=>'color:#c83434'},"Login verweigert. "),"\n" if($R::basicauthfailure); print $q->label({-for=>'Email'},""),"\n"; print $q->textfield(-class=>'form-control', -name=>'user_id', -value=>'', -override=>1, -type=>'email',-class=>'form-control', -id=>'Email', -placeholder=>'E-Mail Adresse', -required=>1, -autofocus=>1),"\n"; @@ -151,7 +151,7 @@ sub tpl(){ print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"btn btn-default btn-lg btn-block", -style=>"color:#$bgcolor1;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account/$varenv->{accounting_1}"}, "Registrieren")),"\n"; print $q->div({-class=>'content2'}, "Zur Information! Falls Sie bereits einen \"konrad\" oder \"TINK\" Account besitzen, können Sie mit Ihren bestehendem Account die Nutzung beider Mietradsysteme einstellen! Einfach dazu die entsprechende AGB bestätigen."),"\n" if($varenv->{wwwhost} =~ /tink|konrad/); - print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"", -style=>"color:#$bgcolor1;font-size:1.1em;text-decoration:underline;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Passwort vergessen?")),"\n"; + print $q->div({-style=>'margin-top:1em;'},$q->a({-class=>"", -style=>"color:#$bgcolor1;font-size:1.1em;text-decoration:underline;", -role=>"button", -href=>"$varenv->{wwwhost}/$varenv->{mandant}/Account"}, "Neues Passwort anfordern")),"\n"; } print "
\n"; diff --git a/copri4/shareeapp-operator/src/Tpl/Contact.pm b/copri4/shareeapp-operator/src/Tpl/Contact.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm old mode 100644 new mode 100755 index 52864e5..c861753 --- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm +++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm @@ -68,8 +68,6 @@ sub tpl(){ } my $bgcolor1 = "009899";#sharee - #my $bgcolor1 = "e2001a"; - $bgcolor1 = $dbt->{website}->{$varenv->{syshost}}->{bgcolor1} if($dbt->{website}->{$varenv->{syshost}}->{bgcolor1}); $bgcolor1 = $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1} if($dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1}); @@ -199,7 +197,7 @@ EOF }elsif((!$ctrel->{int04} || !$ctrel->{int13}) && ($tpl_id =~ /^2$|302004/) && ($path =~ /$varenv->{accounting_3}/)){ if(1==1){ $debug_message = "(!$ctrel->{int04} || !$ctrel->{int13}) && $tpl_id" if($debug); - print $q->div({-class=>'content_title3',-style=>'clear:both;'}, "Fasst geschafft $debug_message"),"\n"; + print $q->div({-class=>'content_title3',-style=>'clear:both;'}, "Fast geschafft $debug_message"),"\n"; print $q->div({-class=>'content2'}, "Es wurden Bestätigungs-Codes an Ihre e-Mail Adresse und per SMS an Ihre Telefonnr. versandt. Nach erfolgreicher Bestätigung können Sie unsere Mieträder nutzen. Bitte beachten Sie die Anweisungen."),"\n"; #}else{ #print $q->div({-class=>'content1',-style=>'padding-top:1em;clear:both;'}, "E-Mail Bestätigung"),"\n"; @@ -500,7 +498,7 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit $autofocus = "autofocus"; $label_des = "Bitte \"$des\" Angabe korrigieren"; $label_des = "Für das \"$des\" liegt ein Fehler vor." if($key eq "txt04"); - $label_des = "Bitte SMS Telefon Nr. mit Ländercode, Beispiel: +49 170 12345678" if($key eq "txt07"); + $label_des = "Bitte mobile Telefon Nr. mit Ländervorwahl, Beispiel: +49 170 12345678" if($key eq "txt07"); $label_des = "Die Bonusnummer ist leider nicht vorhanden. Bei nicht vorhandener Nummer das Feld bitte leer lassen." if($key =~ /txt15/); } #if($R::success eq $key){ @@ -575,13 +573,10 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit if($key =~ /int03/){ - print $q->div({-class=>'content2'}, " - Es werden die Kreditkartendaten von VISA und MasterCard akzeptiert.
- Die Beträge für die Leihvorgänge werden gesammelt und i.d.R. wöchentlich eingezogen. D.h. der Belastungszeitpunkt bei Bankeinzeig oder via Karte findet in den darauffolgenden Tagen statt.
- Gutschriften werden verrechnet und Ihrem Konto gutgeschrieben.
- Die Datenübetragung findet per SSL-Verschlüsselung statt.
- Nach erfolgreicher Anmeldung können Sie unter Ihren Verleihdaten die Leihrad Buchungen und Rechnungen jederzeit einsehen. - + print $q->div({-class=>'content2'}, " + Wählen Sie Ihre Zahlungsart aus.
+ Das Abbuchungsverfahren (Erteilung eines SEPA Mandats) kann nur mit einem Girokonto in Deutschland erfolgen (IBAN beginnt mit DE). Es werden nur folgende Kreditkarten akzeptiert: VISA und MasterCard.
+ Die Nutzungsgebühren werden gesammelt i.d.R. wöchentlich mit dem Verwendungszweck „Mietrad“ von unserem Zahlungsdienstleister payone eingezogen. "),"\n"; my $incasso="1"; @@ -590,8 +585,8 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit my $checked_creditcard; $checked_incasso=1 if($ctrel->{$key} == 1 || $ctrel->{$key} == 3); $checked_creditcard=2 if($ctrel->{$key} == 2); - print $q->div({ -class=>'radio', -style=>'padding-top:20px;' },$but->radiobox_vertical("$key","$incasso","$checked_incasso",$q->img({-id=>"pic-payment" ,-style=>'height:50px;',-src=>"$varenv->{metahost}/img/payment-incasso2.png"}))),"\n"; - print $q->div({ -class=>'radio', -style=>'padding-bottom:20px;' },$but->radiobox_vertical("$key","$creditcard","$checked_creditcard",$q->img({-id=>"pic-payment" ,-style=>'height:30px;', -src=>"$varenv->{metahost}/img/payment-creditcard2.png"}))),"\n"; + print $q->div({ -class=>'radio', -style=>'padding-top:20px;' },$but->radiobox_vertical("$key","$incasso","$checked_incasso",$q->img({-id=>"pic-payment" ,-style=>'height:50px;', -title=>'Abbuchung',-src=>"$varenv->{metahost}/img/payment-incasso2.png"}))),"\n"; + print $q->div({ -class=>'radio', -style=>'padding-bottom:20px;' },$but->radiobox_vertical("$key","$creditcard","$checked_creditcard",$q->img({-id=>"pic-payment" ,-style=>'height:30px;', -title=>'Kreditkarte', -src=>"$varenv->{metahost}/img/payment-creditcard2.png"}))),"\n"; print $q->hidden(-name=>"$key",-override=>1,-value=>"null"); } } diff --git a/copri4/shareeapp-operator/src/Tpl/Listing.pm b/copri4/shareeapp-operator/src/Tpl/Listing.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeapp-operator/src/Tpl/ModalboxDialog.pm b/copri4/shareeapp-operator/src/Tpl/ModalboxDialog.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm b/copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm old mode 100644 new mode 100755 index 351a8f1..c420ec1 --- a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm +++ b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm @@ -50,13 +50,17 @@ sub tpl(){ $path = "$script" . "$path_info"; $script=""; } + my $dbh = ""; my $now_dt = strftime "%Y-%m-%d %H:%M", localtime; my @viewsel = split /\//,$1 if($path =~ /^\/(.*)/); + my $bgcolor1 = "009899";#sharee + $bgcolor1 = $dbt->{website}->{$varenv->{syshost}}->{bgcolor1} if($dbt->{website}->{$varenv->{syshost}}->{bgcolor1}); + $bgcolor1 = $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1} if($dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1}); my $coo = $q->cookie(-name=>'domcookie') || $R::sessionid; my $ctadr = $users_sharee if(ref($users_sharee) eq "HASH" && $users_sharee->{c_id}); - my $tpl = $dbt->get_tpl($tpl_id); + my $tpl = $dbt->get_tpl($dbh,$tpl_id); my @tpl_order = split /,/,$tpl->{tpl_order}; print $q->start_form(),"\n"; @@ -157,7 +161,7 @@ sub tpl(){ #-------------------- } - print $q->div({-style=>'margin-top:1em;'},""),"\n"; + print $q->div({-style=>'margin-top:1em;'},""),"\n"; print "\n"; diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneSelect.pm b/copri4/shareeapp-operator/src/Tpl/PayoneSelect.pm old mode 100644 new mode 100755 index 23da31f..f187b21 --- a/copri4/shareeapp-operator/src/Tpl/PayoneSelect.pm +++ b/copri4/shareeapp-operator/src/Tpl/PayoneSelect.pm @@ -59,7 +59,6 @@ sub tpl(){ my @viewsel = split /\//,$1 if($path =~ /^\/(.*)/); my $ctrel = $users_sharee if(ref($users_sharee) eq "HASH" && $users_sharee->{c_id}); - my $ctt = $db->collect_content2("contenttrans","int10",$ctrel->{c_id}); my $tpl = $db->get_tpl($node_meta->{tpl_id}); print "
\n"; diff --git a/copri4/shareedms-operator/src/Lib/Config.pm b/copri4/shareedms-operator/src/Lib/Config.pm old mode 100644 new mode 100755 index a04a8e8..5d4b2f8 --- a/copri4/shareedms-operator/src/Lib/Config.pm +++ b/copri4/shareedms-operator/src/Lib/Config.pm @@ -63,8 +63,8 @@ sub envonline(){ pdf => "$basedir/pdf", data => "$basedir/data", xmlfile => "$basedir/xml", - ftp_getfile => "ftp/SWK_codes/got_last.csv", - ftp_putfile => "ftp/SWK_return/konrad_code_protokoll.csv", + Anrede => "Anrede,Frau,Herr,Firma", + Einheit => "Stück,Paar,Satz,Meter,Liter", map_activ => "", min_width => "1100", head_logo => "$metahost/img/sharee_bike_Logo.jpg", diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeweb-project/src/Lib/Config.pm b/copri4/shareeweb-project/src/Lib/Config.pm old mode 100644 new mode 100755 diff --git a/copri4/shareeweb-project/src/Lib/Mlogic.pm b/copri4/shareeweb-project/src/Lib/Mlogic.pm old mode 100644 new mode 100755