aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-18 22:51:52 -0700
committerMario Vavti <mario@mariovavti.com>2017-06-20 10:51:46 +0200
commit3b5e1c05b78f72a31eda76b0ff90d08b58ee452d (patch)
treee924d5d3492485b8bb08b489b5e4ef33a59f2253
parent1472f85b162ea6f1ab9e19e94b86fc4a8ef074be (diff)
downloadvolse-hubzilla-3b5e1c05b78f72a31eda76b0ff90d08b58ee452d.tar.gz
volse-hubzilla-3b5e1c05b78f72a31eda76b0ff90d08b58ee452d.tar.bz2
volse-hubzilla-3b5e1c05b78f72a31eda76b0ff90d08b58ee452d.zip
minor cleanup of moderated comment feature
-rw-r--r--Zotlabs/Lib/Enotify.php2
-rw-r--r--include/channel.php13
2 files changed, 9 insertions, 6 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 114021568..90662ce84 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -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>' );
}
}
diff --git a/include/channel.php b/include/channel.php
index 50cc90178..e283ed940 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -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)
);
}