Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
hubzilla
core
Commits
3b5e1c05
Commit
3b5e1c05
authored
Jun 18, 2017
by
Zot
Committed by
Mario
Jun 20, 2017
Browse files
minor cleanup of moderated comment feature
parent
1472f85b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Zotlabs/Lib/Enotify.php
View file @
3b5e1c05
...
...
@@ -221,7 +221,7 @@ class Enotify {
$hsitelink
=
sprintf
(
$sitelink
,
'<a href="'
.
$siteurl
.
'">'
.
$sitename
.
'</a>'
);
if
(
$moderated
)
{
$tsitelink
.
=
"
\n\n
"
.
sprintf
(
t
(
'Please visit %s to approve or reject this comment.'
),
z_root
()
.
'/moderate'
);
$hsitelink
.
=
"
\n\n
"
.
sprintf
(
t
(
'Please visit %s to approve or reject this comment.'
),
z_root
()
.
'/moderate'
);
$hsitelink
.
=
"
<br><br>
"
.
sprintf
(
t
(
'Please visit %s to approve or reject this comment.'
),
'<a href="'
.
z_root
()
.
'/moderate
">'
.
z_root
()
.
'/moderate</a>
'
);
}
}
...
...
include/channel.php
View file @
3b5e1c05
...
...
@@ -2353,28 +2353,31 @@ function anon_identity_init($reqvars) {
if
(
!
$anon_url
)
$anon_url
=
z_root
();
$hash
=
hash
(
'md5'
,
$anon_email
);
$x
=
q
(
"select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1"
,
dbesc
(
$anon_email
),
dbesc
(
$
anon_email
)
dbesc
(
$
hash
)
);
if
(
!
$x
)
{
xchan_store_lowlevel
([
'xchan_guid'
=>
$anon_email
,
'xchan_hash'
=>
$
anon_email
,
'xchan_hash'
=>
$
hash
,
'xchan_name'
=>
$anon_name
,
'xchan_url'
=>
$anon_url
,
'xchan_network'
=>
'unknown'
,
'xchan_name_date'
=>
datetime_convert
()
]);
$x
=
q
(
"select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1"
,
dbesc
(
$anon_email
),
dbesc
(
$
anon_email
)
dbesc
(
$
hash
)
);
$photo
=
z_root
()
.
'/'
.
get_default_profile_photo
(
300
);
$photos
=
import_xchan_photo
(
$photo
,
$
anon_email
);
$photos
=
import_xchan_photo
(
$photo
,
$
hash
);
$r
=
q
(
"update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' "
,
dbesc
(
datetime_convert
()),
dbesc
(
$photos
[
0
]),
...
...
@@ -2382,7 +2385,7 @@ function anon_identity_init($reqvars) {
dbesc
(
$photos
[
2
]),
dbesc
(
$photos
[
3
]),
dbesc
(
$anon_email
),
dbesc
(
$
anon_email
)
dbesc
(
$
hash
)
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment