text-cms init and return feedb change

This commit is contained in:
ragu 2023-01-17 20:43:36 +01:00
parent c1fe6c235c
commit a61920988c
23 changed files with 267 additions and 408 deletions

View file

@ -32,8 +32,9 @@ sub tpl(){
my $mode = shift || "";
my $varenv = shift;
my $users_sharee = shift || "";
my $return = shift || "";
my $feedb = shift || "";
my $return = "";
my $q = new CGI;
my $bw = new Basework;
my $lb = new Libenz;
@ -129,12 +130,8 @@ sub tpl(){
if($users_dms->{u_id} && $main_id){
if(ref($return) eq "HASH"){
$return = $bw->return_feedback($node_meta,$users_dms,$return);
}else{
#deprecated
$return = $lb->return_feedback($return,$node_meta->{node_name},$users_dms->{owner}) if($return !~ /shareejson/);
}
$feedb->{message} .= "\n$return" if($return);
$bw->return_feedback($node_meta,$users_dms,$feedb);
if($main_id >= "100000"){
my $mstyle="";
@ -294,7 +291,7 @@ sub tpl(){
print $q->div({-style=>'position:fixed;bottom:0%;right:1%;z-index:10;padding:2px;font-size:13px;'},"$debug",$q->a({-style=>'color:black;text-decoration: none;',-href=>'https://sharee.bike',-target=>'_blank'},"sharee.bike © TeilRad GmbH 2022")),"\n";
print $q->div({-style=>'padding: 30px 0 0 0;'}, ""), "\n";
$self->tplselect($node_meta,$users_dms,$mode,$varenv,$return);
$self->tplselect($node_meta,$users_dms,$mode,$varenv,$feedb);
print "</div>\n";
}#end logedin environment
@ -307,8 +304,9 @@ sub tplselect(){
my $users_dms = shift;
my $mode = shift || "";
my $varenv = shift;
my $return = shift || "";
my $feedb = shift || "";
my $return = "";
my $sort = "";
my $lang = "de";
my $tpl_name = $node_meta->{tpl_name};
@ -316,42 +314,41 @@ sub tplselect(){
my $ct_table = $node_meta->{ct_table};
my $parent_id = $node_meta->{parent_id};
my $main_id = $node_meta->{main_id};
my $u_id = $users_dms->{u_id};
#print Dumper($node_meta);
#exit;
if($node_meta->{tpl_id} =~ /195|199/ && $node_meta->{ct_table} eq "contentuser"){
if($node_meta->{tpl_id} =~ /194|195|199/ && $node_meta->{ct_table} eq "contentuser"){
require "Tpl/SubListe.pm";
$return = &SubListe::tpl($node_meta,$users_dms,$mode,$return);
$return = &SubListe::tpl($node_meta,$users_dms,$feedb);
}elsif($node_meta->{ct_table} eq "contentuser"){
require "Tpl/MandantConf.pm";
$return = &MandantConf::tpl($node_meta,$users_dms,$mode,$return);
$return = &MandantConf::tpl($node_meta,$users_dms,$mode,$feedb);
}elsif($node_meta->{tpl_id} == 1 && $node_meta->{main_id} == 200017){
require "Tpl/Karte_osm.pm";
&Karte_osm::tpl($node_meta,$users_dms,$mode,$varenv,"",$return);
&Karte_osm::tpl($node_meta,$users_dms,$mode,$varenv,"",$feedb);
}elsif($node_meta->{ct_table} =~ /contentpos|contentadrpos|users$/){#contentpos or contentadrpos
require "Tpl/SubListe.pm";
$return = &SubListe::tpl($node_meta,$users_dms,$mode,$return);
$return = &SubListe::tpl($node_meta,$users_dms,$feedb);
}elsif($node_meta->{ct_table} =~ /content$|contentadr$|contenttrans$/){
require "Tpl/Liste3.pm";
$return = &Liste3::tpl($node_meta,$users_dms,$mode,$return);
$return = &Liste3::tpl($node_meta,$users_dms,$mode,$feedb);
}elsif($node_meta->{ct_table} =~ /contenttranspos|contenttheftpos/){
require "Tpl/Calorin.pm";
&Calorin::tpl($node_meta,$users_dms,$mode,$return);
&Calorin::tpl($node_meta,$users_dms,$mode,$feedb);
}
##Modalbox things##
if($return !~ /failure/){
if($return =~ /failure/ || (ref($feedb) eq "HASH" && $feedb->{message} =~ /failure/)){
$feedb->{message} .= "\n$return" if($return);
require "Mod/Failure.pm";
&Failure::tpl($varenv,$users_dms->{u_id},$feedb);
}else{
if(($R::ct_trans !~ /close/) && ($ct_table =~ /contenttrans/) && ($R::ct_trans || $R::trans2edit || $R::ctpos_activ || $R::select_part || $R::set_main_id)){
&Modalbox::mobox($node_meta,$users_dms,$mode,$return);
&Modalbox::mobox($node_meta,$users_dms,$return);
}elsif(($R::ct_trans !~ /close/) && ($ct_table =~ /content$|contentadr|contentuser|contentpos|users$|contenttranspos/ && ($R::ct_trans || $R::rel_edit || $R::base_edit)) || ($R::node2edit && $R::node2edit =~ /edit/)){
&Modalbox3::mobox3($node_meta,$users_dms,$mode,$return) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save/ && !$R::service_id);
&Modalbox3::mobox3($node_meta,$users_dms,$feedb,$return,$mode) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save/ && !$R::service_id);
}
}
if($return =~ /failure/){
require "Mod/Failure.pm";
&Failure::tpl("",$u_id,"","","","",$return);
}
}
1;