From b12d254427135bc3313f22163e9c3f4c42e68076 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 20 Apr 2018 15:03:16 -0700
Subject: fix any misconfigured channel permission limits

---
 Zotlabs/Update/_1212.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Zotlabs/Update/_1212.php

(limited to 'Zotlabs')

diff --git a/Zotlabs/Update/_1212.php b/Zotlabs/Update/_1212.php
new file mode 100644
index 000000000..f15ba8a71
--- /dev/null
+++ b/Zotlabs/Update/_1212.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1212 {
+
+	function run() {
+
+		$r = q("select channel_id from channel where true");
+		if($r) {
+			foreach($r as $rv) {
+				$role = get_pconfig($rv['channel_id'],'system','permissions_role');
+				if($role !== 'custom') {
+					$role_permissions = \Zotlabs\Access\PermissionRoles::role_perms($role);
+					if(array_key_exists('limits',$role_permissions) && array_key_exists('post_comments',$role_permissions['limits'])) {
+						set_pconfig($rv['channel_id'],'perm_limits','post_comments',$role_permissions['limits']['post_comments']);
+					}
+				}
+			}
+		}
+
+		return UPDATE_SUCCESS;
+
+	}
+
+}
-- 
cgit v1.2.3


From 1bb67f63e37a10b9bcf5c6ea1d0d4ae431b00cab Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 20 Apr 2018 14:38:15 -0700
Subject: anonymous comments shouldn't be allowed in StdLimits

---
 Zotlabs/Access/PermissionLimits.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Access/PermissionLimits.php b/Zotlabs/Access/PermissionLimits.php
index 1d15098fc..eb660ead9 100644
--- a/Zotlabs/Access/PermissionLimits.php
+++ b/Zotlabs/Access/PermissionLimits.php
@@ -41,10 +41,8 @@ class PermissionLimits {
 		$limits = [];
 		$perms = Permissions::Perms();
 
-		$anon_comments = get_config('system','anonymous_comments',true);
-
 		foreach($perms as $k => $v) {
-			if(strstr($k, 'view') || ($k === 'post_comments' && $anon_comments))
+			if(strstr($k, 'view'))
 				$limits[$k] = PERMS_PUBLIC;
 			else
 				$limits[$k] = PERMS_SPECIFIC;
-- 
cgit v1.2.3


From 2dff10564c66ceb9f199d4edc936a542c28f5104 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 23 Apr 2018 21:12:31 +0200
Subject: possible fix for issue #1101

---
 Zotlabs/Module/Ping.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 87f9ee78a..206b8c3d1 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -143,7 +143,7 @@ class Ping extends \Zotlabs\Web\Controller {
 
 		$sql_extra = '';
 		if(! ($vnotify & VNOTIFY_LIKE))
-			$sql_extra = ' AND verb NOT IN ("' . dbesc(ACTIVITY_LIKE) . '", "' . dbesc(ACTIVITY_DISLIKE) . '") ';
+			$sql_extra = " AND verb NOT IN ('" . dbesc(ACTIVITY_LIKE) . "', '" . dbesc(ACTIVITY_DISLIKE) . "') ";
 
 		$discover_tab_on = can_view_public_stream();
 
-- 
cgit v1.2.3