mirror of
https://gitlab.com/t6353/sharee.bike.git
synced 2025-05-10 05:56:27 +02:00
text-cms init and return feedb change
This commit is contained in:
ragu
parent
c1fe6c235c
commit
a61920988c
23 changed files with 267 additions and 408 deletions
|
|
@ -29,7 +29,7 @@ sub tpl(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $session="";
|
||||
my $session_and="";
|
||||
|
|
@ -56,7 +56,7 @@ sub tpl(){
|
|||
|
||||
print "<div class='container'>\n";
|
||||
print "<div id='Contenttxt' style='margin-top:20px;padding-bottom:350px;'>\n";
|
||||
$self->tplselect($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
$self->tplselect($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
print "</div>\n";
|
||||
print "</div>\n";
|
||||
#print "<script src='$varenv->{js_bootstrap}'></script>\n";
|
||||
|
|
@ -71,9 +71,8 @@ sub tplselect(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $u_id = $users_dms->{u_id} || "";
|
||||
my $sort = "";
|
||||
my $lang = "de";
|
||||
my $tpl_id = $node_meta->{tpl_id};
|
||||
|
|
@ -81,29 +80,22 @@ sub tplselect(){
|
|||
if($node_meta->{main_id}){
|
||||
if($tpl_id == 2){
|
||||
require "Tpl/Anmelden.pm";
|
||||
&Anmelden::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
&Anmelden::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
|
||||
}elsif($tpl_id == 302 || $tpl_id == 302008 || $tpl_id == 302004){#Adresse
|
||||
require "Tpl/FormEdit.pm";
|
||||
&FormEdit::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
&FormEdit::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
}elsif($tpl_id == 308){
|
||||
require "Tpl/PayoneSelect.pm";
|
||||
&PayoneSelect::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
&PayoneSelect::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
}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);
|
||||
&Contact::tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
}
|
||||
}
|
||||
my $debug = "Mlogic --> (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} | u_id: $u_id | mode: $mode)";
|
||||
my $debug = "Mlogic --> (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} | u_id: $users_dms->{u_id} | mode: $mode)";
|
||||
print $q->div({-style=>'position:fixed;bottom:0%;right:2%;z-index:10;font-size:13px;'},"$debug"),"\n" if($users_sharee->{c_id} eq $varenv->{superu_id});
|
||||
|
||||
if($return && $return =~ /failure/){
|
||||
require "Mod/Failure.pm";
|
||||
&Failure::tpl("",$u_id,"","","","",$return);
|
||||
}
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ sub tpl(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ sub tpl(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ sub tpl(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ sub tpl(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
|
|
@ -115,7 +115,8 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
|
|||
table => "contenttrans",
|
||||
fetch => "all",
|
||||
int10 => "$ctrel->{c_id}",
|
||||
keyfield => "c_id",
|
||||
keyfield => "ct_name",
|
||||
ct_name => "~::[1-9]",
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -125,7 +126,7 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
|
|||
$ctt->{$id}->{wwwhost} = "$operator_hash->{$sharee_operator}";
|
||||
$ctt->{$id}->{operator} = "$sharee_operator";
|
||||
$ctt->{$id}->{basedir} = "$dbt->{copri_conf}->{basedir}/$dbt->{operator}->{$sharee_operator}->{dir_app}";
|
||||
#print "$sharee_operator|$ctt->{$id}->{wwwhost}|$ctt->{$id}->{operator}|$ctt->{$id}->{basedir}<br>";
|
||||
#print "$id|$sharee_operator|$ctt->{$id}->{wwwhost}|$ctt->{$id}->{operator}|$ctt->{$id}->{basedir}|$ctt->{$id}->{ct_name}<br>";
|
||||
}
|
||||
$ctt_all = { %$ctt_all, %$ctt };
|
||||
|
||||
|
|
@ -232,7 +233,7 @@ EOF
|
|||
}
|
||||
|
||||
#subMenue--------
|
||||
$submenu->tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
$submenu->tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
#-----------------
|
||||
|
||||
my $catch_failure=0;
|
||||
|
|
@ -347,11 +348,10 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
|
|||
}
|
||||
print $q->div({-class=>'content2'}, "Nach der Mietradnutzung haben Sie hier die Möglichkeit die Mietvorgänge einzusehen und gebuchte Rechnungen als PDF herunterzuladen."),"\n";
|
||||
print $q->div({-class=>'content2'}, "$bonus_ak"),"\n" if($R::success && $R::success eq "txt15");
|
||||
print $q->div({-class=>'content2'}, "Aktuell liegen keine Buchungen vor."),"\n" if(!$cttpos_count);
|
||||
|
||||
}elsif($key =~ /barcode/ && $cttpos_count){
|
||||
}elsif($key =~ /barcode/){
|
||||
|
||||
#print $q->div({-style=>'padding-top:1.5em;font-weight:bold;'},"Ihre Buchungsdaten der letzten 1 ½ Jahre im Überblick"),"\n";
|
||||
if($cttpos_count){
|
||||
print $q->div({-style=>'padding-top:1.5em;font-weight:bold;'},"Folgende Positionen liegen zur nächsten Abbuchung vor"),"\n";
|
||||
|
||||
my @tpl_posorder = ("txt01=Beschreibung","int04=Station","ct_name=(Rad) Nummer","int26=CO2","int02=Betrag");
|
||||
|
|
@ -461,13 +461,17 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
|
|||
}
|
||||
print $q->end_table;
|
||||
print "</div>\n";
|
||||
}else{
|
||||
print $q->div({-class=>'content2',-style=>'padding:0.5em 0;'}, "Aktuell liegen keine Mietvorgänge vor."),"\n";
|
||||
}#end if $cttpos_count
|
||||
|
||||
my $i=0;
|
||||
my $dtext = "";
|
||||
print "<div style='clear:both;'>\n";
|
||||
foreach my $id (sort { $ctt_all->{$b}->{ct_name} cmp $ctt_all->{$a}->{ct_name} } keys(%$ctt_all)){
|
||||
|
||||
if( -f "$ctt_all->{$id}->{basedir}/pdfinvoice/Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf" && $ctt_all->{$id}->{ct_name} =~ /\d/ && $coo){
|
||||
if( -f "$ctt_all->{$id}->{basedir}/pdfinvoice/Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf" && $ctt_all->{$id}->{ct_name} =~ /\d/ && $coo){
|
||||
#print "$ctt_all->{$id}->{basedir}/pdfinvoice/Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf && $ctt_all->{$id}->{ct_name} =~ /\d/ && $coo<br />";
|
||||
$i++;
|
||||
my $invoice_time = $ctt_all->{$id}->{invoice_time} || $ctt_all->{$id}->{mtime};
|
||||
$invoice_time = $lb->time4de($invoice_time,0);
|
||||
|
|
@ -549,15 +553,15 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
|
|||
if($key eq "txt15"){
|
||||
if($R::failure =~ /^txt15/){
|
||||
$autofocus = "autofocus";
|
||||
$label_des = "<span style=color:$red>$bonus_avail</span>";
|
||||
$bonus_desc = "<span style=color:$red>$bonus_avail</span>";
|
||||
}
|
||||
if($R::failure =~ /conflict_txt15/){
|
||||
$label_des = "<span style=color:$red>$bonus_conflict</span>";
|
||||
$bonus_desc = "<span style=color:$red>$bonus_conflict</span>";
|
||||
}
|
||||
|
||||
my $saved_coupon = "";
|
||||
$saved_coupon = "$ctadrcoupon->{sharee_kn}->{txt15}" if($ctadrcoupon->{sharee_kn}->{txt15});
|
||||
print $q->label({-for=>"$key", -style=>'padding-top:1.5em;'},"$bonus_desc $label_des"),"\n";
|
||||
print $q->label({-for=>"$key", -style=>'padding-top:1.5em;'},"$bonus_desc"),"\n";
|
||||
print "<input id='$key' type='text' class='form-control' name='$key' value='$saved_coupon' override $autofocus />\n";
|
||||
print $q->div(" ");
|
||||
foreach my $opid (keys(%$ctadrcoupon)){
|
||||
|
|
|
|||
|
|
@ -1,177 +0,0 @@
|
|||
package Listing;
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# Copyright (c) Rainer Gümpelein, TeilRad GmbH
|
||||
#
|
||||
use strict;
|
||||
use warnings;
|
||||
use CGI ':standard';
|
||||
use Lib::Config;
|
||||
use Mod::Buttons;
|
||||
use Mod::Libenz;
|
||||
use Mod::Libenzdb;
|
||||
use Mod::DBtank;
|
||||
use Encode;
|
||||
use Data::Dumper;
|
||||
|
||||
sub new {
|
||||
my $class = shift;
|
||||
my $self = {};
|
||||
bless($self,$class);
|
||||
return $self;
|
||||
}
|
||||
|
||||
#Template
|
||||
sub tpl(){
|
||||
my $node_meta = shift;
|
||||
my $users_dms = shift || "";
|
||||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
my $but = new Buttons;
|
||||
my $lb = new Libenz;
|
||||
my $db = new Libenzdb;
|
||||
my $dbt = new DBtank;
|
||||
|
||||
my $lang = "de";
|
||||
my $script = $q->script_name();
|
||||
my $path_info = $q->path_info();
|
||||
my $path = $path_info;
|
||||
#with meta_host,
|
||||
if("$varenv->{metahost}"){
|
||||
$path = "$script" . "$path_info";
|
||||
$script="";
|
||||
}
|
||||
my $user_agent = $q->user_agent();
|
||||
my @tpl_order = split /,/,$node_meta->{tpl_order};
|
||||
my $main_ids = $node_meta->{main_id};
|
||||
my @viewsel = split /\//,$1 if($path =~ /^\/(.*)/);
|
||||
|
||||
my $session="";
|
||||
my $session_and="";
|
||||
if(length($R::sessionid) > 20){
|
||||
$session = "?sessionid=$R::sessionid";
|
||||
$session_and = "&sessionid=$R::sessionid";
|
||||
}
|
||||
|
||||
my $ct4rel = {};
|
||||
my $scol = "sort";
|
||||
my $sort_updown = "up";
|
||||
if($path =~ /NEWS/){
|
||||
$scol = "date_time01";
|
||||
$sort_updown = "down";
|
||||
#$scol = "date_time01";
|
||||
}
|
||||
|
||||
my $content2 = "content2";
|
||||
my $content_img = "pic-float";
|
||||
$ct4rel = $db->collect_ct4rel2("content",$main_ids,$lang,"","","","","",$users_dms->{u_id});
|
||||
|
||||
print "<div id='Contentapp'>\n";
|
||||
|
||||
#Content sequential
|
||||
#BIG LOOP content table
|
||||
foreach my $id (sort {
|
||||
if($sort_updown eq "down"){
|
||||
if ($scol =~ /barcode|int|sort/) {
|
||||
$ct4rel->{$b}->{$scol} <=> $ct4rel->{$a}->{$scol}
|
||||
}else{
|
||||
lc($ct4rel->{$b}->{$scol}) cmp lc($ct4rel->{$a}->{$scol})
|
||||
}
|
||||
}else{
|
||||
if ($scol =~ /barcode|int|sort/) {
|
||||
$ct4rel->{$a}->{$scol} <=> $ct4rel->{$b}->{$scol}
|
||||
}else{
|
||||
lc($ct4rel->{$a}->{$scol}) cmp lc($ct4rel->{$b}->{$scol})
|
||||
}
|
||||
}
|
||||
} keys(%$ct4rel)){
|
||||
|
||||
my $j=0;
|
||||
my $date_time;
|
||||
my $uritxt_key;
|
||||
|
||||
foreach (@tpl_order){
|
||||
my ($key,$des,$size) = split /=/,$_;
|
||||
$ct4rel->{$id}->{$key} = $q->unescapeHTML("$ct4rel->{$id}->{$key}");
|
||||
$ct4rel->{$id}->{$key} = $lb->newline($ct4rel->{$id}->{$key},"","");
|
||||
|
||||
my $datamain_id = $ct4rel->{$id}->{main_id};
|
||||
my $dir_main = "$varenv->{data}/$datamain_id/$ct4rel->{$id}->{c_id}";
|
||||
my $dir_thumb = "$varenv->{data}/$datamain_id-thumb/$ct4rel->{$id}->{c_id}";
|
||||
my $dir_resize = "$varenv->{data}/$datamain_id-resize/$ct4rel->{$id}->{c_id}";
|
||||
|
||||
|
||||
if($key =~ /img/ && $ct4rel->{$id}->{rel_id}){
|
||||
#print "<div class=''>\n";
|
||||
if( -d "$dir_resize"){
|
||||
my @pics = $lb->read_dirfiles($dir_resize,"\.JPG|\.JPEG|\.PNG","file");
|
||||
foreach(@pics){
|
||||
print $q->img({-id=>"$content_img" ,-src=>"$varenv->{metahost}/data/$datamain_id-resize/$ct4rel->{$id}->{c_id}/$_"}),"\n" if($_ =~ /\w/);
|
||||
}
|
||||
}
|
||||
#print "</div>\n";
|
||||
print $q->div({-style=>'clear:both;'},""),"\n";
|
||||
}elsif($key =~ /pdf/){
|
||||
if( -d "$dir_main"){
|
||||
my @pdfs = $lb->read_dirfiles($dir_main,"\.JPG|\.JPEG|\.PNG","file","not");
|
||||
foreach(@pdfs){
|
||||
print $q->div($q->a({-href=>"$varenv->{wwwhost}/FileOut?file=$datamain_id/$ct4rel->{$id}->{c_id}/$_$session_and", -target=>'_default', -title=>'Download',-type=>'application/octet-stream'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:50px;'}), "$_")),"\n";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}elsif($key =~ /date_time/ && $ct4rel->{$id}->{$key} =~ /\d{4}-\d{2}-\d{2}/){
|
||||
$date_time = $lb->time4de("$ct4rel->{$id}->{$key}","","Date_to_Text_Long");
|
||||
$date_time =~ s/^\w+,\s\w+//;
|
||||
}elsif($key =~ /node_name/){
|
||||
my $ct_users;
|
||||
$ct_users = $db->get_owner($ct4rel->{$id}->{owner}) if($ct4rel->{$id}->{owner});
|
||||
$ct4rel->{$id}->{mtime} = $lb->time4de($ct4rel->{$id}->{mtime},"1") if($ct4rel->{$id}->{mtime});
|
||||
print $q->div({-class=>'content2_group'},"Absender: $ct_users->{u_name} | $ct4rel->{$id}->{mtime}"),"\n";
|
||||
}elsif($key =~ /ct_name/){
|
||||
my $debug;
|
||||
if($users_dms->{u_id}){
|
||||
print $q->div({-class=>'content_title2',-style=>"background-color:silver;padding:0.2em;"},$q->a({-class=>'editnav',-href=>"$path/manager?node2edit=edit_content\&rel_id=$ct4rel->{$id}->{rel_id}", -title=>"edit content"}, "$ct4rel->{$id}->{$key}"),$debug),"\n";
|
||||
print $q->div({-class=>'content_title2'},"$date_time"),"\n" if($date_time);
|
||||
}elsif(!$R::sharee_edit){
|
||||
print $q->div({-class=>'content_title2'},"$date_time"),"\n" if($date_time);
|
||||
print $q->div({-id=>"$ct4rel->{$id}->{c_id}",-class=>'content_title2'},"$ct4rel->{$id}->{$key}"),"\n" if($ct4rel->{$id}->{$key} =~ /[A-Za-z]/);
|
||||
print $q->div({-style=>""},"$debug"),"\n";
|
||||
}
|
||||
}elsif($key =~ /uri(\d+)/ && $ct4rel->{$id}->{$key} =~ /http/){
|
||||
$uritxt_key = "txt" . $1;
|
||||
print $q->div({-class=>'content_direct2',-style=>'font-size:14px;'},$q->a({-href=>"$ct4rel->{$id}->{$key}"},"zum Projekt")),"\n";
|
||||
}elsif($key =~ /txt|int/ && $ct4rel->{$id}->{$key} && "$key" ne "$uritxt_key"){
|
||||
if($key =~ /txt/ && $size =~ /area(\d+)/ && $ct4rel->{$id}->{$key}){
|
||||
#phone tag
|
||||
if($ct4rel->{$id}->{$key} =~ /Telefon|Mobile/){
|
||||
$ct4rel->{$id}->{$key} =~ s/([\s0-9-]+)/\<a href=\'tel:00$1\'\>$1\<\/a\>/;
|
||||
}
|
||||
#email tag with little coding against grabber
|
||||
if($ct4rel->{$id}->{$key} =~ /(\w+\@[\w-]+\.de)/){
|
||||
$ct4rel->{$id}->{$key} =~ s/(\w+\@[\w-]+\.de)/\<a href=\'mailto:$1\'\>$1\<\/a\>/;
|
||||
$ct4rel->{$id}->{$key} =~ s/\@/\&\#64\;/g;
|
||||
#$ct4rel->{$id}->{$key} =~ s/\.de/\&\#46\;de/g;
|
||||
}
|
||||
#Development
|
||||
if($ct4rel->{$id}->{$key} =~ /(www\.GNU-Systems\.de)/){
|
||||
$ct4rel->{$id}->{$key} =~ s/(www\.[\w-]+\.de)/\<a href=\'http:\/\/$1\' target=\'_blank\'\>$1\<\/a\>/g;
|
||||
}
|
||||
$ct4rel->{$id}->{$key} =~ s/\\//g;
|
||||
print $q->div({-class=>"$content2"}, "$ct4rel->{$id}->{$key}"),"\n";
|
||||
}elsif($ct4rel->{$id}->{$key} && $size !~ /checkbox/){
|
||||
print $q->div({-class=>"$content2"}, "$ct4rel->{$id}->{$key}"),"\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
print $q->div({-class=>"$content2"}," "),"\n";
|
||||
}#end if
|
||||
print "</div>\n";
|
||||
}
|
||||
1;
|
||||
|
|
@ -28,7 +28,7 @@ sub tpl(){
|
|||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || "";
|
||||
my $return = shift || "";
|
||||
my $feedb = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $cf = new Config;
|
||||
|
|
@ -58,14 +58,14 @@ sub tpl(){
|
|||
print "<div id='Contentapp'>\n";
|
||||
|
||||
#subMenue--------
|
||||
$submenu->tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
$submenu->tpl($node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
#-----------------
|
||||
|
||||
#Selected Payment
|
||||
if($ctrel->{int03} == 1 || $ctrel->{int03} == 3){
|
||||
$paySEPA->tpl("309",$node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
$paySEPA->tpl("309",$node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
}elsif($ctrel->{int03} == 2){
|
||||
$payCC->tpl("310",$node_meta,$users_dms,$mode,$varenv,$users_sharee,$return);
|
||||
$payCC->tpl("310",$node_meta,$users_dms,$mode,$varenv,$users_sharee,$feedb);
|
||||
}
|
||||
|
||||
print "</div>\n";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue