'; + $msg->print( \*STDERR ); + #print ''; + + $msg->send; +} + + +# do not delete next line +return 1; diff --git a/lib/calcms/password_requests.pm b/lib/calcms/password_requests.pm new file mode 100644 index 0000000..7640287 --- /dev/null +++ b/lib/calcms/password_requests.pm @@ -0,0 +1,253 @@ +package password_requests; + +use warnings "all"; +use strict; + +use Data::Dumper; +use Session::Token; + +# table: calcms_password_requests +require Exporter; +our @ISA = qw(Exporter); +our @EXPORT_OK = qw(get insert delete get_columns); +our %EXPORT_TAGS = ( 'all' => [ @EXPORT_OK ] ); + +use mail; +use uac; +use db; +use auth; + +sub debug; + +sub get_columns{ + my $config=shift; + + my $dbh=db::connect($config); + my $cols=db::get_columns($dbh, 'calcms_password_requests'); + my $columns={}; + for my $col (@$cols){ + $columns->{$col}=1; + } + return $columns; +} + +sub get{ + my $config=shift; + my $condition=shift; + + my $dbh=db::connect($config); + + my @conditions=(); + my @bind_values=(); + + if (defined $condition->{user}){ + push @conditions, 'user=?'; + push @bind_values, $condition->{user}; + } + + if (defined $condition->{token}){ + push @conditions, 'token=?'; + push @bind_values, $condition->{token}; + } + + return undef if (scalar @conditions) == 0; + + my $conditions=" where ".join(" and ",@conditions); + my $query=qq{ + select * + from calcms_password_requests + $conditions + }; + #print $query."\n".Dumper(\@bind_values); + + my $entries=db::get($dbh, $query, \@bind_values); + return $entries->[0] || undef; +} + +sub update{ + my $config=shift; + my $entry=shift; + + return unless defined $entry->{user}; + + my $dbh=db::connect($config); + my $values = join(",", map {$_.'=?'} (keys %$entry)); + my @bind_values = map {$entry->{$_}} (keys %$entry); + push @bind_values, $entry->{token}; + + my $query=qq{ + update calcms_password_requests + set $values + where token=? + }; + print STDERR $query . Dumper(\@bind_values); + db::put($dbh, $query, \@bind_values); +} + + +sub insert{ + my $config=shift; + my $entry=shift; + + return undef unless defined $entry->{user}; + + my $dbh=db::connect($config); + print STDERR 'insert ' . Dumper($entry); + return db::insert($dbh, 'calcms_password_requests', $entry); +} + +sub delete{ + my $config=shift; + my $condition=shift; + + my @conditions=(); + my @bind_values=(); + + if ((defined $condition->{user}) && ($condition->{user} ne '')){ + push @conditions, 'user=?'; + push @bind_values, $condition->{user}; + } + + if ((defined $condition->{token}) && ($condition->{token} ne '')){ + push @conditions, 'token=?'; + push @bind_values, $condition->{token}; + } + + return if (scalar @conditions)==0; + my $conditions=" where ".join(" and ", @conditions); + + my $dbh=db::connect($config); + + my $query=qq{ + delete + from calcms_password_requests + $conditions + }; + + print STDERR "$query " . Dumper(\@bind_values); + db::put($dbh, $query, \@bind_values); +} + +sub sendToken{ + my $config=shift; + my $entry=shift; + + return undef unless defined $entry->{user}; + + my $user = uac::get_user($config, $entry->{user}); + return undef unless defined $user; + + # check age of existing entry + my $oldEntry = password_requests::get($config, { user => $entry->{user} } ); + if (defined $oldEntry){ + my $createdAt = $oldEntry->{created_at}; + print STDERR Dumper($oldEntry); + print STDERR "createdAt=$createdAt\n"; + my $age = time() - time::datetime_to_time($createdAt); + if ($age < 60) { + print STDERR "too many requests"; + return undef; + } + print STDERR "age=$age\n"; + } + password_requests::delete($config, $entry); + + $entry->{max_attempts} = 0; + $entry->{token} = Session::Token->new->get; + + my $baseUrl = $config->{locations}->{source_base_url} . $config->{locations}->{editor_base_url}; + my $url = $baseUrl."/requestPassword.cgi?token=" . $entry->{token}; + my $content = "Hi,$user->{full_name}\n\n"; + $content .= "Someone just tried to reset your password for $baseUrl.\n\n"; + $content .= "If you like to set a new password, please follow the link below\n"; + $content .= $url."\n\n"; + $content .= "If you do not like to set a new password, please ignore this mail.\n"; + + mail::send({ + "To" => $user->{email}, + "Subject" => "request to change password for $baseUrl", + "Data" => $content + }); + + password_requests::insert($config, $entry); +} + +sub changePassword { + my $config = shift; + my $request = shift; + my $userName = shift; + + my $params = $request->{params}->{checked}; + my $permissions = $request->{permissions}; + + unless ( ( defined $userName ) || ( $userName eq '' ) ) { + return { error => 'user not found' }; + } + + my $user = uac::get_user( $config, $userName ); + + unless ( ( defined $user ) && ( defined $user->{id} ) && ( $user->{id} ne '' ) ) { + return { error => 'user id not found' }; + } + + unless ( password_requests::checkPassword( $params->{user_password} ) ) { + return { error => 'password does not meet requirements' }; + } + + if ( $params->{user_password} ne $params->{user_password2} ) { + return { error => 'entered passwords do not match'}; + } + + #print STDERR "error at changing password:" . Dumper($errors); + + my $crypt = auth::crypt_password( $params->{user_password} ); + $user = { id => $user->{id} }; + $user->{salt} = $crypt->{salt}; + $user->{pass} = $crypt->{crypt}; + + #print '
'.Dumper($user).''; + $config->{access}->{write} = 1; + print STDERR "update user".Dumper($user); + my $result = uac::update_user( $config, $user ); + print STDERR "result:".Dumper($result); + $config->{access}->{write} = 0; + return { success => "password changed for $userName" }; +} + +sub checkPassword { + my $password = shift; + unless ( defined $password || $password eq '' ) { + error("password is empty"); + return; + } + if ( length($password) < 8 ) { + error("password to short"); + return 0; + } + unless ( $password =~ /[a-z]/ ) { + error("password should contains at least one small character"); + return 0; + } + unless ( $password =~ /[A-Z]/ ) { + error("password should contains at least one big character"); + return 0; + } + unless ( $password =~ /[0-9]/ ) { + error("password should contains at least one number"); + return 0; + } + unless ( $password =~ /[^a-zA-Z0-9]/ ) { + error("password should contains at least one special character"); + return 0; + } + return 1; +} + + +sub error{ + my $msg=shift; + print "ERROR: $msg
$query'.$query.Dumper($bind_values).''; db::put($dbh, $query, $bind_values); } +# get all series dates where no event has been created for +sub getDatesWithoutEvent{ + my $config = shift; + my $options = shift; + + return unless defined $options->{project_id}; + return unless defined $options->{studio_id}; + return unless defined $options->{from}; + return unless defined $options->{till}; + + my $dbh=db::connect($config); + + my $query=q{ + SELECT sd.* + FROM calcms_series_dates sd LEFT JOIN calcms_events e + on (sd.start = e.start) + where e.start is null + and sd.exclude != 1 + and sd.project_id = ? + and sd.studio_id = ? + and sd.start > ? + and sd.end < ? + order by sd.start + }; + + my $bind_values = [ $options->{project_id}, $options->{studio_id}, $options->{from}, $options->{till} ]; + my $entries = db::get($dbh, $query, $bind_values); + return $entries; + +} sub error{ my $msg=shift; diff --git a/lib/calcms/series_events.pm b/lib/calcms/series_events.pm index 7e9d9d2..328bf08 100644 --- a/lib/calcms/series_events.pm +++ b/lib/calcms/series_events.pm @@ -17,6 +17,8 @@ use series_dates; use studios; use studio_timeslot_dates; use event_history; +use images; + # check permissions, insert and update events related to series @@ -46,10 +48,15 @@ sub save_content{ return undef unless(defined $entry->{id}); for my $attr (keys %$entry){ + next unless defined $entry->{$attr}; $entry->{$attr}=~s/^\s+//g; $entry->{$attr}=~s/\s+$//g; } + for my $attr ('image', 'series_image'){ + $entry->{$attr} = images::normalizeName($entry->{$attr}) if defined $entry->{$attr}; + } + #print STDERR Dumper(\$entry->{content}); for my $attr ('content', 'topic'){ if (defined $entry->{$attr}){ @@ -60,7 +67,7 @@ sub save_content{ } } - #print STDERR Dumper(\$entry->{html_content}); + #print STDERR Dumper(\$entry->{series_image}); #print STDERR "ok2\n"; #return; $entry->{modified_at}= time::time_to_datetime(time()); @@ -93,8 +100,15 @@ sub save_content{ where id=? }; - #print STDERR $query.Dumper(\@bind_values); - db::put($dbh, $query, \@bind_values); + #print STDERR "update:".$query.Dumper(\@bind_values); + my $result=db::put($dbh, $query, \@bind_values); + unless (defined $result){ + print STDERR "error on updating event\n" ; + return undef; + } + + #print STDERR "result=$result\n"; + #print STDERR "entr after update".Dumper($entry); return $entry; } @@ -410,14 +424,14 @@ sub insert_event{ #get event content from series for my $attr ('program', 'series_name', 'title', 'excerpt', 'content', 'topic', 'image', 'episode', 'podcast_url', 'archive_url'){ - $event->{$attr}=$serie->{$attr} if defined $serie->{$attr}; + $event->{$attr} = $serie->{$attr} if defined $serie->{$attr}; } $event->{series_image} = $serie->{image} if defined $serie->{image}; $event->{series_image_label} = $serie->{licence} if defined $serie->{licence}; #overwrite series values from parameters for my $attr ('program', 'series_name', 'title', 'user_title', 'excerpt', 'user_except', 'content', 'topic', 'image', 'episode', 'podcast_url', 'archive_url'){ - $event->{$attr}=$params->{$attr} if defined $params->{$attr}; + $event->{$attr} = $params->{$attr} if defined $params->{$attr}; } $event->{'html_content'} = markup::creole_to_html($event->{'content'}) if defined $event->{'content'}; $event->{'html_topic'} = markup::creole_to_html($event->{'topic'}) if defined $event->{'topic'}; @@ -475,6 +489,8 @@ sub update_series_images{ return "missing studio_id" unless defined $options->{studio_id}; return "missing series_id" unless defined $options->{series_id}; return "missing series_image" unless defined $options->{series_image}; + + #print "save $options->{series_image}\n"; my $events=series::get_events( $config, { diff --git a/lib/calcms/studios.pm b/lib/calcms/studios.pm index 8b7edfa..99fa98e 100644 --- a/lib/calcms/studios.pm +++ b/lib/calcms/studios.pm @@ -1,16 +1,19 @@ #!/bin/perl -use CGI; +#use CGI; #use CGI::Carp qw(warningsToBrowser fatalsToBrowser); -use CGI::Session qw(-ip-match); -use CGI::Cookie; +#use CGI::Session qw(-ip-match); +#use CGI::Cookie; #$CGI::Session::IP_MATCH=1; package studios; use warnings "all"; use strict; + use Data::Dumper; +use images; + require Exporter; our @ISA = qw(Exporter); our @EXPORT_OK = qw(get_columns get get_by_id insert update delete check check_studio); @@ -96,8 +99,9 @@ sub insert{ my $config=shift; my $entry=shift; - $entry->{created_at} = time::time_to_datetime(time()); - $entry->{modified_at}= time::time_to_datetime(time()); + $entry->{created_at} = time::time_to_datetime(time()); + $entry->{modified_at} = time::time_to_datetime(time()); + $entry->{image} = images::normalizeName( $entry->{image} ) if defined $entry->{image}; my $dbh=db::connect($config); my $id=db::insert($dbh, 'calcms_studios', $entry); @@ -116,6 +120,7 @@ sub update{ for my $column (keys %$columns){ $entry->{$column}=$studio->{$column} if defined $studio->{$column}; } + $entry->{image} = images::normalizeName( $entry->{image} ) if defined $entry->{image}; my $values =join(",", map {$_.'=?'} (keys %$entry)); my @bind_values =map {$entry->{$_}} (keys %$entry); diff --git a/website/agenda/planung/requestPassword.cgi b/website/agenda/planung/requestPassword.cgi new file mode 100644 index 0000000..3b99163 --- /dev/null +++ b/website/agenda/planung/requestPassword.cgi @@ -0,0 +1,165 @@ +#! /usr/bin/perl -w + +use warnings "all"; +use strict; + +use Data::Dumper; + +use params; +use config; +use db; +use auth; +use password_requests; + +binmode STDOUT, ":utf8"; + +my $r = shift; +( my $cgi, my $params, my $error ) = params::get($r); + +my $config = config::get('../config/config.cgi'); +my $debug = $config->{system}->{debug}; + +$params = check_params($params); + +print "Content-type:text/html\n\n"; +print qq{ + ++ + +
DRKlYu3Eg4NqAR&Rp(mcz=MfL_Wt9Wy>Z#G^|^D>Jy*