From 46d0e23e7bcb3bb1d000bae8dea7e52d4a1d018f Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 7 Feb 2017 19:49:15 -0800
Subject: atokens - we only need one permission column

---
 Zotlabs/Lib/Permcat.php            | 11 +++++++----
 Zotlabs/Module/Settings/Tokens.php |  3 ++-
 view/tpl/settings_tokens.tpl       |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Zotlabs/Lib/Permcat.php b/Zotlabs/Lib/Permcat.php
index a38645f73..525e55091 100644
--- a/Zotlabs/Lib/Permcat.php
+++ b/Zotlabs/Lib/Permcat.php
@@ -79,7 +79,7 @@ class Permcat {
 			],
 			[ 'moderator', t('moderator','permcat'),
 				[ 'view_stream','view_profile','view_contacts','view_storage','view_pages',
-				  'write_storage','post_wall','wite_pages','write_wiki','post_comments','post_like','tag_deliver',
+				  'write_storage','post_wall','write_pages','write_wiki','post_comments','post_like','tag_deliver',
 				  'chat', 'republish' ]
 			]
 		];
@@ -101,10 +101,13 @@ class Permcat {
 
 	}
 
+	static public function update($channel_id, $name,$permarr) {
+		PConfig::Set($channel_id,'permcat',$name,$permarr);
+	}
 
-
-
-
+	static public function delete($channel_id,$name) {
+		PConfig::Delete($channel_id,'permcat',$name);
+	}
 
 
 }
\ No newline at end of file
diff --git a/Zotlabs/Module/Settings/Tokens.php b/Zotlabs/Module/Settings/Tokens.php
index d32a00c95..bf22ec7aa 100644
--- a/Zotlabs/Module/Settings/Tokens.php
+++ b/Zotlabs/Module/Settings/Tokens.php
@@ -161,7 +161,8 @@ class Tokens {
 			'$me' => t('My Settings'),
 			'$perms' => $perms,
 			'$inherited' => t('inherited'),
-			'$notself' => '1',
+			'$notself' => 0,
+			'$self' => 1,
 			'$permlbl' => t('Individual Permissions'),
 			'$permnote'       => t('Some permissions may be inherited from your channel\'s <a href="settings"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can <strong>not</strong> change those settings here.'),
 			'$submit' 	=> t('Submit')
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
index 6f08ce971..48190c00c 100644
--- a/view/tpl/settings_tokens.tpl
+++ b/view/tpl/settings_tokens.tpl
@@ -35,7 +35,7 @@
 
 				<table id="perms-tool-table" class=form-group>
 					<tr>
-						<td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td>
+						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
 					</tr>
 						{{foreach $perms as $prm}}
 						{{include file="field_acheckbox.tpl" field=$prm}}
-- 
cgit v1.2.3