roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-13 15:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

CMS-Text sync for operators. copri email integration init

Browse source
This commit is contained in:
ragu 2023-07-27 07:05:23 +02:00
parent c603ead447
commit 1672564775
18 changed files with 182 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

28
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -68,7 +68,7 @@ my $response = {
apiserver => "$apiserver",
response => "$respreq",
uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}",
copri_version => "4.1.23.10",
copri_version => "4.1.23.15",
user_id => "",
authcookie => "",
new_authcoo => "0",
@ -95,19 +95,13 @@ my $response = {
}
};
my %varenv_prim = ();
if($varenv{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
if(1==1){
$varenv{cms} = $dbt->fetch_cms($dbh,{ lang => $q->escapeHTML($lang) });
$varenv_prim{cms} = $varenv{cms};
if($lang eq "de"){
$response->{faq_app_fullurl} = $dbt->{project_conf}->{faq_app_fullurl_de};
}else{
$response->{faq_app_fullurl} = $dbt->{project_conf}->{faq_app_fullurl_en};
}
}else{
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
$varenv{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $q->escapeHTML($lang) });
$varenv_prim{cms} = $varenv{cms};
}
my $aowner = 0;
@ -332,7 +326,7 @@ elsif($q->param('request') eq "booking_request"){
#return list of occupied/requested bikes
$record = $apif->user_bikes_occupied($dbh,$authraw,"");
$response->{bikes_occupied} = $apif->rentals(\%varenv_prim,$record,$authraw,"1");#returns JSON rental values
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"1");#returns JSON rental values
}#end still_requested
}else{
@ -416,7 +410,7 @@ elsif($q->param('request') eq "booking_cancel" || $q->param('request') eq "booki
$response = {%$response, %$booking_values};
my $record = $apif->user_bikes_occupied($dbh,$authraw,"show_dialog");
$response->{bikes_occupied} = $apif->rentals(\%varenv_prim,$record,$authraw,"1");
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"1");
#update on Ilockit
}else{
@ -425,12 +419,12 @@ elsif($q->param('request') eq "booking_cancel" || $q->param('request') eq "booki
$response = {%$response, %$booking_values};
my $record = $apif->user_bikes_occupied($dbh,$authraw,"");
$response->{bikes_occupied} = $apif->rentals(\%varenv_prim,$record,$authraw,"1");
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"1");
}
}#end occupied|available
else{
my $record = $apif->user_bikes_occupied($dbh,$authraw,"");
$response->{bikes_occupied} = $apif->rentals(\%varenv_prim,$record,$authraw,"1");
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"1");
}
}else{
@ -469,9 +463,9 @@ elsif($q->param('request') eq "user_bikes_occupied"){
$response = { %$response, %$auth };
my $record = $apif->user_bikes_occupied($dbh,$authraw,"show_dialog");
if($R::withoutkey){
$response->{bikes_occupied} = $apif->rentals(\%varenv_prim,$record,$authraw,"");
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"");
}else{
$response->{bikes_occupied} = $apif->rentals(\%varenv_prim,$record,$authraw,"1");
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"1");
}
}else{
$response->{response_state} = "Failure 1001: authcookie not defined";
@ -506,10 +500,10 @@ elsif($q->param('request') eq "bikes_available"){
#$bw->log("Y bikes_available $varenv{dbname} by c_id $authraw->{c_id}, Tarif: $authraw->{txt30}",$authraw->{txt30},"");
if($varenv{syshost} eq "shareeapp-sx"){
($response->{bikes},my $return2copri->{bikes}) = $si->sig_available($q,\%varenv_prim,\%varenv,$authraw);
($response->{bikes},my $return2copri->{bikes}) = $si->sig_available($q,\%varenv,\%varenv,$authraw);
$tk->sigbike_cupdate($return2copri->{bikes});
}else{
$response->{bikes} = $apif->bikes_available($q,\%varenv_prim,\%varenv,$authraw);
$response->{bikes} = $apif->bikes_available($q,\%varenv,\%varenv,$authraw);
}
}
if(ref($response->{bikes}) ne "HASH"){
@ -760,7 +754,7 @@ elsif($q->param('request') eq "stations_available"){
#sig first save
if($varenv{syshost} eq "shareeapp-sx"){
($response->{stations},my $return2copri->{stations}) = $si->sig_available($q,\%varenv_prim,\%varenv,$authraw);
($response->{stations},my $return2copri->{stations}) = $si->sig_available($q,\%varenv,\%varenv,$authraw);
$tk->sigstation_cupdate($return2copri->{stations});
}else{
my $cachme = $R::cachme || "";