roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-05-24 09:36:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse source
This commit is contained in:
ragu 2023-01-11 06:55:55 +01:00
parent 8607a42e34
commit c1fe6c235c
8 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copri4/main/src/Mod/Basework.pm
View file

@ -111,7 +111,7 @@ sub battery_percent {
my $max_bars = shift || 0;
my $current_bars = shift || 0;#by user input
my $current_percent = 1;#keep 1 % for Mietjournal view
my $current_percent = 0;
if($max_bars == 5){
$current_percent = 10 if($current_bars >= 1);
$current_percent = 30 if($current_bars >= 2);

2
copri4/main/src/Mod/Indexsharee.pm
View file

@ -525,7 +525,7 @@ sub handler {
my $debug=0;
$debug=1;
#send confirm codes
if($users_sharee->{c_id} && $users_sharee->{txt34} && length($users_sharee->{txt34}) > 20 && $payable_check && $R::sharee_edit && $R::sharee_edit =~ /save_account|send_email|send_sms/){
if($users_sharee->{c_id} && $users_sharee->{txt34} && length($users_sharee->{txt34}) > 10 && $payable_check && $R::sharee_edit && $R::sharee_edit =~ /save_account|send_email|send_sms/){
if(($users_sharee->{int04} != 1 || $R::sharee_edit =~ /send_email/) && ($users_sharee->{txt08} =~ /\w\@\w/)){
$tk->emailack($users_sharee->{c_id});

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

@ -423,6 +423,7 @@ sub save_account(){
my $email = $R::txt08;
$email =~ s/\s//g;
my $confirm_digest = sha1_base64($email . $valxx);
$confirm_digest =~ s/[I1LO0]//ig;
$u_rows = $dbt->update_one($dbh,$update_primary,"txt34='$confirm_digest'");
}
#user alias email

2
copri4/main/src/Mod/ajax_json.pm
View file

@ -49,7 +49,7 @@ sub handler {
open(FILE,">>/var/log/copri-bike/ajax_json.log") if($debug);
print FILE "$now_dt| u_id:$users_dms->{u_id}|$main_id\n" if($debug);
if($users_dms->{u_id} && $users_dms->{int07} == 2){
if($users_dms->{u_id} && ($users_dms->{int03} == 2 || $users_dms->{int07} == 2)){
foreach(@keywords){
my @val = $q->param($_);
my $valxx = $q->escapeHTML("@val");

4
copri4/main/src/Tpl/BaseEdit.pm
View file

@ -501,8 +501,8 @@ EOF
my $seldes = $des;
$des .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id});
$ctrel->{$key} = $q->unescapeHTML("$ctrel->{$key}");
$ctrel->{$key} = $lb->newline($ctrel->{$key},"",1);
#$ctrel->{$key} = $q->unescapeHTML("$ctrel->{$key}");
#$ctrel->{$key} = $lb->newline($ctrel->{$key},"",1);
if($key =~ /c_id|ct_name|barcode|txt/ && $size eq "readonly"){
print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";

2
copri4/main/src/Tpl/Calorin.pm
View file

@ -411,7 +411,7 @@ sub tpl(){
my $user_device = "";
my $charge = "";
$charge .= " → lock-charge $cttpos->{$pid}->{int14} %" if(looks_like_number($cttpos->{$pid}->{int14}));
$charge .= " → bike-charge $cttpos->{$pid}->{int19} %" if(looks_like_number($cttpos->{$pid}->{int19}) && $cttpos->{$pid}->{int19} >= 1);
$charge .= " → bike-charge $cttpos->{$pid}->{int19} %" if(looks_like_number($cttpos->{$pid}->{int19}) && $record_part->{$cttpos->{$pid}->{cc_id}}->{energy_id});
if($users_dms_primary->{u_id} && $dbt->{copri_conf}->{contributors} && $users_dms_primary->{u_id} =~ /$dbt->{copri_conf}->{contributors}/){
$pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$pid')"},"$cttpos->{$pid}->{c_id}", $q->span({-class=>"popuptext",-id=>"$pid"},"$pos_details"));
$user_device = "";

6
copri4/main/src/Tpl/Liste3.pm
View file

@ -919,9 +919,9 @@ sub tpl(){
$txtstyle = "text-align:right;max-width:8em;";
}
$ct4rel->{$id}->{$key} = $lb->time4de($ct4rel->{$id}->{$key},"1") if($key =~ /time$/);
$ct4rel->{$id}->{$key} = $q->unescapeHTML($ct4rel->{$id}->{$key});# if($key !~ /byte/);
my $br4text = $R::node2edit || "";
$ct4rel->{$id}->{$key} = $lb->newline($ct4rel->{$id}->{$key},"","$br4text");
#$ct4rel->{$id}->{$key} = $q->unescapeHTML($ct4rel->{$id}->{$key});# if($key !~ /byte/);
#my $br4text = $R::node2edit || "";
#$ct4rel->{$id}->{$key} = $lb->newline($ct4rel->{$id}->{$key},"","$br4text");
$set_style4nr = $set_style;
$set_style4nr="background-color:#e3dbc9;" if(($key eq "barcode") || ($key eq "int04"));
$ct4rel->{$id}->{$key} =~ s/\./,/ if($key =~ /int/);

2
copri4/shareeapp-operator/src/Tpl/FormEdit.pm
View file

@ -557,7 +557,7 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg
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"),"\n";
print $q->label({-for=>"$key", -style=>'padding-top:1.5em;'},"$bonus_desc $label_des"),"\n";
print "<input id='$key' type='text' class='form-control' name='$key' value='$saved_coupon' override $autofocus />\n";
print $q->div("&nbsp");
foreach my $opid (keys(%$ctadrcoupon)){