versioning for permission additions to ensure we're using the same set of files

3 files changed, 14 insertions, 0 deletions

diff --git a/Zotlabs/Access/PermissionRoles.php b/Zotlabs/Access/PermissionRoles.php
index 3878777cf..94c49c44f 100644
--- a/Zotlabs/Access/PermissionRoles.php
+++ b/Zotlabs/Access/PermissionRoles.php
@@ -7,6 +7,9 @@ use Zotlabs\Lib as Zlib;
 
 class PermissionRoles {
 
+	static public function version() {
+		return 1;
+	}
 
 	static function role_perms($role) {
 
diff --git a/Zotlabs/Access/Permissions.php b/Zotlabs/Access/Permissions.php
index 1951f2f0f..ed21ab99d 100644
--- a/Zotlabs/Access/Permissions.php
+++ b/Zotlabs/Access/Permissions.php
@@ -21,6 +21,8 @@ class Permissions {
 	 * are the responsbility of the channel owner to manage. You just don't want to create any 
 	 * suprises or break things so you have an opportunity to provide sane settings. 
 	 *
+	 * Update the version here and in PermissionRoles
+	 *
 	 *
 	 * Permissions with 'view' in the name are considered read permissions. Anything
 	 * else requires authentication. Read permission limits are PERMS_PUBLIC and anything else
@@ -32,6 +34,10 @@ class Permissions {
 	 *
 	 */
 
+	static public function version() {
+		return 1;
+	}
+
 
 	static public function Perms($filter = '') {
 
diff --git a/boot.php b/boot.php
index 13ba73dbc..8e365703b 100755
--- a/boot.php
+++ b/boot.php
@@ -2454,6 +2454,11 @@ function cert_bad_email() {
 
 function check_for_new_perms() {
 
+	// Do not execute if we are in the middle of a git update and the relevant versions don't match
+
+	if( \Zotlabs\Access\Permissions::version() != \Zotlabs\Access\PermissionRoles::version())
+		return;
+
 	$pregistered = get_config('system','perms');
 	$pcurrent = array_keys(\Zotlabs\Access\Permissions::Perms());