Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
travelynx
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
derf
travelynx
Commits
ac816c09
Unverified
Commit
ac816c09
authored
1 year ago
by
Birte Kristina Friesel
Browse files
Options
Downloads
Patches
Plain Diff
rename get_privacy_by_name to get_privacy_by, allow requests by uid
parent
68468379
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/Travelynx/Controller/Account.pm
+1
-1
1 addition, 1 deletion
lib/Travelynx/Controller/Account.pm
lib/Travelynx/Controller/Profile.pm
+4
-4
4 additions, 4 deletions
lib/Travelynx/Controller/Profile.pm
lib/Travelynx/Model/Users.pm
+13
-11
13 additions, 11 deletions
lib/Travelynx/Model/Users.pm
with
18 additions
and
16 deletions
lib/Travelynx/Controller/Account.pm
+
1
−
1
View file @
ac816c09
...
@@ -994,7 +994,7 @@ sub webfinger {
...
@@ -994,7 +994,7 @@ sub webfinger {
}
}
my
$name
=
$+
{
name
};
my
$name
=
$+
{
name
};
my
$user
=
$self
->
users
->
get_privacy_by
_name
(
name
=>
$name
);
my
$user
=
$self
->
users
->
get_privacy_by
(
name
=>
$name
);
if
(
not
$user
)
{
if
(
not
$user
)
{
$self
->
render
(
'
not_found
',
status
=>
404
);
$self
->
render
(
'
not_found
',
status
=>
404
);
...
...
This diff is collapsed.
Click to expand it.
lib/Travelynx/Controller/Profile.pm
+
4
−
4
View file @
ac816c09
...
@@ -63,7 +63,7 @@ sub profile {
...
@@ -63,7 +63,7 @@ sub profile {
my
(
$self
)
=
@_
;
my
(
$self
)
=
@_
;
my
$name
=
$self
->
stash
('
name
');
my
$name
=
$self
->
stash
('
name
');
my
$user
=
$self
->
users
->
get_privacy_by
_name
(
name
=>
$name
);
my
$user
=
$self
->
users
->
get_privacy_by
(
name
=>
$name
);
if
(
not
$user
)
{
if
(
not
$user
)
{
$self
->
render
('
not_found
');
$self
->
render
('
not_found
');
...
@@ -157,7 +157,7 @@ sub journey_details {
...
@@ -157,7 +157,7 @@ sub journey_details {
my
(
$self
)
=
@_
;
my
(
$self
)
=
@_
;
my
$name
=
$self
->
stash
('
name
');
my
$name
=
$self
->
stash
('
name
');
my
$journey_id
=
$self
->
stash
('
id
');
my
$journey_id
=
$self
->
stash
('
id
');
my
$user
=
$self
->
users
->
get_privacy_by
_name
(
name
=>
$name
);
my
$user
=
$self
->
users
->
get_privacy_by
(
name
=>
$name
);
$self
->
param
(
journey_id
=>
$journey_id
);
$self
->
param
(
journey_id
=>
$journey_id
);
...
@@ -290,7 +290,7 @@ sub user_status {
...
@@ -290,7 +290,7 @@ sub user_status {
my
$name
=
$self
->
stash
('
name
');
my
$name
=
$self
->
stash
('
name
');
my
$ts
=
$self
->
stash
('
ts
')
//
0
;
my
$ts
=
$self
->
stash
('
ts
')
//
0
;
my
$user
=
$self
->
users
->
get_privacy_by
_name
(
name
=>
$name
);
my
$user
=
$self
->
users
->
get_privacy_by
(
name
=>
$name
);
if
(
not
$user
)
{
if
(
not
$user
)
{
$self
->
render
('
not_found
');
$self
->
render
('
not_found
');
...
@@ -434,7 +434,7 @@ sub status_card {
...
@@ -434,7 +434,7 @@ sub status_card {
my
$name
=
$self
->
stash
('
name
');
my
$name
=
$self
->
stash
('
name
');
$name
=~
s{[.]html$}{}
;
$name
=~
s{[.]html$}{}
;
my
$user
=
$self
->
users
->
get_privacy_by
_name
(
name
=>
$name
);
my
$user
=
$self
->
users
->
get_privacy_by
(
name
=>
$name
);
delete
$self
->
stash
->
{
layout
};
delete
$self
->
stash
->
{
layout
};
...
...
This diff is collapsed.
Click to expand it.
lib/Travelynx/Model/Users.pm
+
13
−
11
View file @
ac816c09
...
@@ -154,19 +154,21 @@ sub get_uid_by_name_and_mail {
...
@@ -154,19 +154,21 @@ sub get_uid_by_name_and_mail {
return
;
return
;
}
}
sub
get_privacy_by
_name
{
sub
get_privacy_by
{
my
(
$self
,
%opt
)
=
@_
;
my
(
$self
,
%opt
)
=
@_
;
my
$db
=
$opt
{
db
}
//
$self
->
{
pg
}
->
db
;
my
$db
=
$opt
{
db
}
//
$self
->
{
pg
}
->
db
;
my
$name
=
$opt
{
name
};
my
$res
=
$db
->
select
(
my
%where
;
'
users
',
[
'
id
',
'
public_level
'
],
if
(
$opt
{
name
}
)
{
{
$where
{
name
}
=
$opt
{
name
};
name
=>
$name
,
}
status
=>
1
else
{
}
$where
{
id
}
=
$opt
{
uid
};
);
}
my
$res
=
$db
->
select
(
'
users
',
[
'
id
',
'
public_level
'
],
{
%where
,
status
=>
1
}
);
if
(
my
$user
=
$res
->
hash
)
{
if
(
my
$user
=
$res
->
hash
)
{
return
{
return
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment