summaryrefslogtreecommitdiff
path: root/lib/Travelynx/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Travelynx/Controller')
-rw-r--r--lib/Travelynx/Controller/Account.pm13
-rwxr-xr-xlib/Travelynx/Controller/Traveling.pm12
2 files changed, 17 insertions, 8 deletions
diff --git a/lib/Travelynx/Controller/Account.pm b/lib/Travelynx/Controller/Account.pm
index 0275b96..cebe21a 100644
--- a/lib/Travelynx/Controller/Account.pm
+++ b/lib/Travelynx/Controller/Account.pm
@@ -65,7 +65,7 @@ sub register {
my $password2 = $self->req->param('password2');
my $ip = $self->req->headers->header('X-Forwarded-For');
my $ua = $self->req->headers->user_agent;
- my $date = DateTime->now( time_zone => 'Europe/Berlin' )
+ my $date = DateTime->now( time_zone => 'Europe/Berlin' )
->strftime('%d.%m.%Y %H:%M:%S %z');
# In case Mojolicious is not running behind a reverse proxy
@@ -221,13 +221,20 @@ sub privacy {
else {
$public_level &= ~0x02;
}
+ if ( $self->param('public_comment') ) {
+ $public_level |= 0x04;
+ }
+ else {
+ $public_level &= ~0x04;
+ }
$self->set_privacy( $user->{id}, $public_level );
$self->flash( success => 'privacy' );
$self->redirect_to('account');
}
else {
- $self->param( public_status => $public_level & 0x02 ? 1 : 0 );
+ $self->param( public_status => $public_level & 0x02 ? 1 : 0 );
+ $self->param( public_comment => $public_level & 0x04 ? 1 : 0 );
$self->render( 'privacy', name => $user->{name} );
}
}
@@ -640,7 +647,7 @@ sub json_export {
$self->render(
json => {
- account => $db->select( 'users', '*', { id => $uid } )->hash,
+ account => $db->select( 'users', '*', { id => $uid } )->hash,
in_transit => [
$db->select( 'in_transit_str', '*', { user_id => $uid } )
->hashes->each
diff --git a/lib/Travelynx/Controller/Traveling.pm b/lib/Travelynx/Controller/Traveling.pm
index f41d8df..3f8f37e 100755
--- a/lib/Travelynx/Controller/Traveling.pm
+++ b/lib/Travelynx/Controller/Traveling.pm
@@ -75,9 +75,10 @@ sub user_status {
$self->render(
'user_status',
- name => $name,
- journey => $status,
- twitter => \%tw_data,
+ name => $name,
+ public_level => $user->{public_level},
+ journey => $status,
+ twitter => \%tw_data,
);
}
else {
@@ -97,8 +98,9 @@ sub public_status_card {
my $status = $self->get_user_status( $user->{id} );
$self->render(
'_public_status_card',
- name => $name,
- journey => $status
+ name => $name,
+ public_level => $user->{public_level},
+ journey => $status
);
}
else {