diff --git a/copri4/main/src/Mod/Basework.pm b/copri4/main/src/Mod/Basework.pm index b4f788f..f5be93a 100755 --- a/copri4/main/src/Mod/Basework.pm +++ b/copri4/main/src/Mod/Basework.pm @@ -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); diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm index 0e6fb79..1b1514b 100755 --- a/copri4/main/src/Mod/Indexsharee.pm +++ b/copri4/main/src/Mod/Indexsharee.pm @@ -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}); diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm index 620b9bc..0e0c796 100755 --- a/copri4/main/src/Mod/Shareework.pm +++ b/copri4/main/src/Mod/Shareework.pm @@ -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 diff --git a/copri4/main/src/Mod/ajax_json.pm b/copri4/main/src/Mod/ajax_json.pm index 2a693fb..533f41e 100755 --- a/copri4/main/src/Mod/ajax_json.pm +++ b/copri4/main/src/Mod/ajax_json.pm @@ -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"); diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm index 73ad8b5..fe138ee 100755 --- a/copri4/main/src/Tpl/BaseEdit.pm +++ b/copri4/main/src/Tpl/BaseEdit.pm @@ -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"; diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm index 4a52ccc..35f4cd0 100755 --- a/copri4/main/src/Tpl/Calorin.pm +++ b/copri4/main/src/Tpl/Calorin.pm @@ -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 = ""; diff --git a/copri4/main/src/Tpl/Liste3.pm b/copri4/main/src/Tpl/Liste3.pm index cc825e8..04f2974 100755 --- a/copri4/main/src/Tpl/Liste3.pm +++ b/copri4/main/src/Tpl/Liste3.pm @@ -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/); diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm index 42afd34..369ec00 100755 --- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm +++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm @@ -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 "\n"; print $q->div(" "); foreach my $opid (keys(%$ctadrcoupon)){