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

Alarmjournal select rules

Browse source
This commit is contained in:
ragu 2022-11-21 12:21:39 +01:00
parent 941f8a04aa
commit f39ac77590
5 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
copri4/main/src/Mod/APIfunc.pm
View file

@ -533,6 +533,7 @@ sub service_update(){
my $update_pos = {
table => "contenttranspos",
mtime => "now()",
int27 => 1,#ok marker for rental end ack
};
#update sig int28 counter

13
copri4/main/src/Mod/Libenz.pm
View file

@ -271,7 +271,8 @@ sub month_line(){
}
}
my $daymarker = $raster_mmpx * ($day_today - 0.5);
#my $daymarker = $raster_mmpx * ($day_today - 0.5);
my $daymarker = $raster_mmpx * $day_today;
$daymarker .= "%";
return ($daymarker,$raster_mmpx,$day4month);
@ -308,10 +309,14 @@ sub rent_scale(){
}
if(($year == $year_en) && ($mon == $mon_en)){
$doy_en = Day_of_Year($year_en,$mon_en,$day_en);
}elsif($year_en && $mon_en){
my $month_days_en = Days_in_Month($year_en,$mon_en);
$doy_en = Day_of_Year($year_en,$mon_en,$month_days_en);# wenn ausserhalb --> cal_start
#}elsif($year_en && $mon_en){
#my $month_days_en = Days_in_Month($year_en,$mon_en);
#$doy_en = Day_of_Year($year_en,$mon_en,$month_days_en);
}elsif($year && $mon){
my $month_days_en = Days_in_Month($year,$mon);
$doy_en = Day_of_Year($year,$mon,$month_days_en);# wenn ausserhalb --> cal_start
}
if(($mon != $mon_en) && ($mon != $mon_st)){
$doy_mon_st=0;$doy_mon_en=0;$doy_st=0;$doy_en=0;
}

3
copri4/main/src/Mod/Shareework.pm
View file

@ -828,8 +828,7 @@ sub send_password(){
my $pwmd5 = md5_hex($coo);
#don't change/hassle pw on tester for ex. apple@sharee.bike|google@sharee.bike
if($email && $email !~ /$dbt->{copri_conf}->{test_accounts}/i){
if($email && $email =~ /\w\@\w/ && $pwmd5 && length($pwmd5) > 20 && $email !~ /$dbt->{copri_conf}->{test_accounts}/i){
$db->updater("contentadr","1","1","txt11","$pwmd5","$owner","txt08","ilike","$email");
system(`$varenv{basedir}/src/Mod/newsletter_tink.pl "$varenv{basedir}" "$varenv{wwwhost}" "send_password" "$email" "$coo"`);
}