From fd29218991eea1c1338984331fe01173ede4ff7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rainer=20G=C3=BCmpelein?= Date: Sat, 2 Apr 2022 20:28:45 +0200 Subject: [PATCH] minor fixes and iframe css --- copri4/main/css/local_style_2.css | 11 +- copri4/main/src/Mod/APIsigoclient.pm | 8 +- copri4/main/src/Mod/DBtank.pm | 13 +- copri4/main/src/Mod/Indexsharee.pm | 11 +- copri4/main/src/Mod/KMLout.pm | 3 +- copri4/main/src/Mod/Payment.pm | 5 +- .../src/Tpl/AccountSubmenu.pm | 8 +- copri4/shareedms-operator/src/Lib/Mlogic.pm | 22 ++- copri4/shareeweb-project/src/Lib/Mlogic.pm | 144 +++++++++++++----- 9 files changed, 155 insertions(+), 70 deletions(-) diff --git a/copri4/main/css/local_style_2.css b/copri4/main/css/local_style_2.css index b50507c..579c291 100755 --- a/copri4/main/css/local_style_2.css +++ b/copri4/main/css/local_style_2.css @@ -910,23 +910,24 @@ div#Container_txt1 { ul#BigNavi { font-size: 14px; margin: 0; - padding-top:70px; + padding-top:65px; vertical-align:top; text-align:center; - height:100px; + height:80px; border:0px solid white; } ul#BigNavi li { list-style: none; - display: inline; + height:100px; + display: inline-block; text-align:center; - margin: 0 auto; + margin: 10px auto; } ul#BigNavi a { text-align:center; margin: 1em; padding: 3em; - border: 0px solid white; + border: 0px solid black; text-decoration: none; font-weight: normal; background-color:white; diff --git a/copri4/main/src/Mod/APIsigoclient.pm b/copri4/main/src/Mod/APIsigoclient.pm index 23875e1..9eebad9 100755 --- a/copri4/main/src/Mod/APIsigoclient.pm +++ b/copri4/main/src/Mod/APIsigoclient.pm @@ -87,7 +87,7 @@ sub sigo_available { if(ref($response_in) eq "HASH"){ foreach my $resp (@{ $response_in->{items} }) { - print FILE Dumper($resp) . "\n"; + print FILE "response_in loop\n" . Dumper($resp) . "\n"; if($dbt->{operator}->{$varenv->{dbname}}->{operatorApp} && $q->param('request') eq "stations_available"){ @@ -124,7 +124,7 @@ sub sigo_available { print FILE "Bike: $bike\n"; $return->{$bike}->{bike} = "$bike"; $return->{$bike}->{authed} = "$authed"; - $return->{$bike}->{station} = "$resp->{site}->{id}" || ""; + $return->{$bike}->{station} = "SX$resp->{site}->{id}" || ""; $return->{$bike}->{uri_operator} = "$dbt->{operator}->{$varenv->{dbname}}->{operatorApp}"; $return->{$bike}->{description} = "E-Lastenrad"; $return->{$bike}->{gps}->{latitude} = "$resp->{state}->{lat}" || ""; @@ -142,7 +142,8 @@ sub sigo_available { } #$return->{$bike}->{lock_state} = "undefined";#? - $return->{$bike}->{lock_state} = "unlocked"; + #$return->{$bike}->{lock_state} = "unlocked";# I think default should be unlocked + $return->{$bike}->{lock_state} = "locked"; if($resp->{state}->{locked}){ $return->{$bike}->{lock_state} = "locked"; } @@ -173,6 +174,7 @@ sub sigo_available { warn $@; } + print FILE "response_in return\n" . Dumper($return) . "\n"; close(FILE); return $return; diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm index 785098f..e538770 100755 --- a/copri4/main/src/Mod/DBtank.pm +++ b/copri4/main/src/Mod/DBtank.pm @@ -288,16 +288,17 @@ sub channel_map(){ 184 => "web App",#mig 185 => "konstanz App",#mig 186 => "sharee App",#mig - 187 => "shareetool App",#mig + 187 => "shareetool",#mig 188 => "sys API", - 192 => "Web Bayern", - 193 => "Web Demo",#mig - 194 => "Web Example",#mig - 195 => "Web KN",#mig and import + 192 => "web Bayern", + 193 => "web demo",#mig + 194 => "web example",#mig + 195 => "web konrad",#mig and import 196 => "DMS Form std",#mig - 197 => "Web Form std",#mig + 197 => "web sharee.bike",#mig 198 => "primary",#mig 199 => "LV API",#mig + 201 => "web Rentamania",#mig }; return $channel; } diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm index e53cce7..aa608ca 100755 --- a/copri4/main/src/Mod/Indexsharee.pm +++ b/copri4/main/src/Mod/Indexsharee.pm @@ -734,12 +734,11 @@ sub handler { } my $base_uri = "true"; - my $title = "$varenv{syshost} "; - $title .= $dbt->{primary}->{$varenv{dbname}}->{pprefix} if($dbt->{primary}->{$varenv{dbname}}->{pprefix}); - $title .= $dbt->{operator}->{$varenv{dbname}}->{project} if($dbt->{operator}->{$varenv{dbname}}->{project}); - $title .= " " . $dbt->{operator}->{$varenv{dbname}}->{oprefix} if($dbt->{operator}->{$varenv{dbname}}->{oprefix}); - $title .= $dbt->{website}->{$varenv{syshost}}->{project} if($dbt->{website}->{$varenv{syshost}}->{project}); - $title .= " DEVEL $varenv{dbname}" if($dbt->{copri_conf}->{stage} eq "test"); + my $title = ""; + $title .= "devel $varenv{syshost} " if($dbt->{copri_conf}->{stage} eq "test"); + #$title .= $dbt->{primary}->{$varenv{dbname}}->{title} if($dbt->{primary}->{$varenv{dbname}}->{title}); + $title .= " " . $dbt->{operator}->{$varenv{dbname}}->{title} if($dbt->{operator}->{$varenv{dbname}}->{title}); + $title .= " " . $dbt->{website}->{$varenv{syshost}}->{title} if($dbt->{website}->{$varenv{syshost}}->{title}); my $html5 = $q->start_html(-title=>"$title", -lang=>'de', -onload=>"$onload", diff --git a/copri4/main/src/Mod/KMLout.pm b/copri4/main/src/Mod/KMLout.pm index fd6617a..5ceb676 100755 --- a/copri4/main/src/Mod/KMLout.pm +++ b/copri4/main/src/Mod/KMLout.pm @@ -166,7 +166,8 @@ sub kmlGenerator { $station_groupID = $1 if($station_group =~ /(\d+)/); $bike_groupID = $1 if($bike_group =~ /(\d+)/); - + $bw->log("KMLout bike available if: $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}","",""); + #if Lastenrad if($station_groupID == $lastenrad && $station_groupID == $bike_groupID && $station eq $response_bikes->{shareejson}->{bikes}->{$bike}->{station}){ $place_pin{$station} = $icon_green; diff --git a/copri4/main/src/Mod/Payment.pm b/copri4/main/src/Mod/Payment.pm index e15b63e..65daa28 100755 --- a/copri4/main/src/Mod/Payment.pm +++ b/copri4/main/src/Mod/Payment.pm @@ -319,9 +319,6 @@ sub preauthorizationCC_main { telephonenumber => "$ctadr->{txt07}", amount => "$amount", currency => 'EUR', - #Parameter ( personal data ) - lastname => "$ctadr->{txt01}", - country => "$ctadr->{txt10}", pseudocardpan => "$ctadr->{ct_name}", ecommercemode => "internet", # wird zu 3Dscheck, reference => "$reference" @@ -624,7 +621,7 @@ sub pdfmandat { print EMA "$topdf --page-size A4 '$varenv->{wwwhost}/PDFGenerator?printer_id=SEPA-Lastschriftmandat\&mandant_main_id=$dbt->{shareedms_conf}->{parent_id}\&id=$ctadr->{c_id}' $varenv->{basedir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{dbname}-$ctadr->{ct_name}.pdf\nreturn: $print_return\nfilesize: $filesize\nexit_code: $exit_code\n"; } close EMA; - return "$varenv->{logdir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{dbname}-$ctadr->{ct_name}.pdf"; + return "$varenv->{basedir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{dbname}-$ctadr->{ct_name}.pdf"; } #end ported from payone_post.pl # diff --git a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm index 46c9d4d..e5fa4c7 100755 --- a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm +++ b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm @@ -79,14 +79,20 @@ sub tpl(){ } my $node1 = $db->collect_node($node_meta->{parent_id},$lang,"1"); + my $margin_top = "0"; + if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "iframe"){ + $margin_top = "40px"; + } + + #bootstrap 5 with standalone bayern -#if($varenv->{syshost} eq "shareeweb-bayern"){ if(1==1){ #subMenue-------- print ""; my $lmenu0 = ""; foreach my $id (sort {$node->{$a}->{n_sort} <=> $node->{$b}->{n_sort}} keys (%$node)){ - #if($node->{$id}->{main_id} && $node->{$id}->{node_name} =~ /$dbt->{shareeapp_conf}->{mod_active}/){ $node->{$id}->{node_path} = $node->{$id}->{node_name} if(!$node->{$id}->{node_path}); my $mstyle = ""; - #print "$node->{$id}->{main_id} eq $node_meta->{main_id}|$node_meta->{parent_id}|$node_meta->{template_id}|$node->{$id}->{node_name} - $node_meta->{node_name}
\n" if($debug); if($node->{$id}->{main_id} == $node_meta->{main_id} || $node->{$id}->{main_id} == $node_meta->{parent_id}){ - $mstyle = "background-color:silver;color:black;"; + $mstyle = "background-color:#$hgcolor1;color:#fffffe;"; } if($node->{$id}->{node_name} eq "Anmelden" && $node_meta->{parent_id} == 200010){ - $mstyle = "background-color:silver;color:black;"; + $mstyle = "background-color:#$hgcolor1;color:#fffffe;"; } if($node->{$id}->{node_name} eq "Anmelden" && $users_sharee->{c_id}){ $lmenu0 .= $but->lia_button("/$parent_node/$varenv->{profile}$session","Mein Profil",$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); }else{ - $lmenu0 .= $but->lia_button("/$parent_node/$node->{$id}->{node_path}",$node->{$id}->{node_name},$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); + $lmenu0 .= $but->lia_button("/$parent_node/$node->{$id}->{node_path}",$node->{$id}->{node_name},$node->{$id}->{main_id},"","$mstyle",$users_dms->{u_id}); } } - #} - #print "
\n"; - print $q->div({-style=>'text-align:left;border:0px dotted black;'},$q->ul({-id=>'TopNavi'},$lmenu0)),"\n"; - #print "
\n"; - #end Topmenue + #bootstrap 5 with standalone site + print "
\n" if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "standalone"); + + print "
\n"; + print ""; + print ""; + print ""; + print ""; + + if($users_sharee->{c_id} && $R::sharee_edit ne "delete_account2"){ + print " | $users_sharee->{txt08} logout\n"; + } + print "
\n"; + + print "
\n"; + + print $q->div({-style=>"text-align:left;border:0px dotted #$fgcolor1;"},$q->ul({-id=>'TopNavi'},$lmenu0)),"\n"; - if(($node_meta->{tpl_id} == 1 || $node_meta->{tpl_id} == 3) && $node_meta->{main_id} == 200017){ + if(($node_meta->{tpl_id} == 1 || $node_meta->{tpl_id} == 3) && $node_meta->{main_id} == 200017){ require "Tpl/Karte.pm"; &Karte::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return); - }else{ - # print "
\n"; - print "
\n"; + }else{ $self->tplselect($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return); - print "
\n"; - #print "
\n"; - } + } + + + print "
\n"; + print "
\n"; + + my $sharee_impress_text = {}; + $sharee_impress_text->{ct_name} = "Impressum"; + $sharee_impress_text->{txt01} = ""; + + my $sharee_privacy_text = {}; + $sharee_privacy_text->{ct_name} = "Datenschutzhinweise"; + $sharee_privacy_text->{txt01} = ""; + +print < + +EOF +; + +print < + +EOF +; + + print $q->div({ -style=>"width:100%;text-align:right;"}, + " + " + #$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;text-decoration:none;", -href=>"$varenv->{wwwhost}/site/impress_1.html"}, "Impressum"), + #$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;text-decoration:none;padding:0 1em;", -href=>"$varenv->{wwwhost}/site/privacy_2.html"}, "Datenschutz") + ),"\n"; + + print "
\n";#Contenttxt + print "
\n" if($dbt->{website}->{$varenv->{syshost}}->{layout} eq "standalone");#container + } - print "\n"; + #print "\n"; my $debug_footer = "Mlogic --> (syshost: $varenv->{syshost} | users_sharee->{c_id}: $users_sharee->{c_id} | ct_table: $node_meta->{ct_table} | parent_id: $node_meta->{parent_id} | main_id: $node_meta->{main_id} | tpl_id: $node_meta->{tpl_id} | $users_dms->{u_id})"; - print $q->div({-style=>'position:fixed;bottom:0%;right:2%;z-index:10;font-size:13px;'},"$debug_footer"),"\n" if($users_sharee->{c_id} eq $varenv->{superu_id}); + print $q->div({-style=>'position:fixed;bottom:0%;left:2%;z-index:10;font-size:13px;'},"$debug_footer"),"\n" if($users_sharee->{c_id} eq $varenv->{superu_id}); if($return && $return =~ /failure/){ require "Mod/Failure.pm"; @@ -169,9 +241,9 @@ sub tplselect(){ }elsif($tpl_id == 197){ require "Tpl/Contact.pm"; &Contact::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return); - }elsif($tpl_id == 1 || $tpl_id == 3){ - require "Tpl/Listing.pm"; - &Listing::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return); + #}elsif($tpl_id == 1 || $tpl_id == 3){ + #require "Tpl/Listing.pm"; + #&Listing::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return); #require "Tpl/ModalboxDialog.pm"; #&ModalboxDialog::mobox2($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);