harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor cleanup of moderated comment feature

Browse Source
This commit is contained in:
zotlabs 2017-06-18 22:51:52 -07:00 committed by Mario Vavti
parent 1472f85b16
commit 3b5e1c05b7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/Enotify.php
View File

@ -221,7 +221,7 @@ class Enotify {
$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>'); $hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
if($moderated) { if($moderated) {
$tsitelink .= "\n\n" . sprintf( t('Please visit %s to approve or reject this comment.'), z_root() . '/moderate' ); $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>' );
} }
} }

13
include/channel.php
View File

@ -2353,28 +2353,31 @@ function anon_identity_init($reqvars) {
if(! $anon_url) if(! $anon_url)
$anon_url = z_root(); $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", $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($anon_email) dbesc($hash)
); );
if(! $x) { if(! $x) {
xchan_store_lowlevel([ xchan_store_lowlevel([
'xchan_guid' => $anon_email, 'xchan_guid' => $anon_email,
'xchan_hash' => $anon_email, 'xchan_hash' => $hash,
'xchan_name' => $anon_name, 'xchan_name' => $anon_name,
'xchan_url' => $anon_url, 'xchan_url' => $anon_url,
'xchan_network' => 'unknown', 'xchan_network' => 'unknown',
'xchan_name_date' => datetime_convert() 'xchan_name_date' => datetime_convert()
]); ]);
$x = q("select * from xchan where xchan_guid = '%s' and xchan_hash = '%s' and xchan_network = 'unknown' limit 1", $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($anon_email) dbesc($hash)
); );
$photo = z_root() . '/' . get_default_profile_photo(300); $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' ", $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(datetime_convert()),
dbesc($photos[0]), dbesc($photos[0]),
@ -2382,7 +2385,7 @@ function anon_identity_init($reqvars) {
dbesc($photos[2]), dbesc($photos[2]),
dbesc($photos[3]), dbesc($photos[3]),
dbesc($anon_email), dbesc($anon_email),
dbesc($anon_email) dbesc($hash)
); );
} }