add service class restrictions to access_tokens

2 files changed, 11 insertions, 1 deletions

diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index ccc5ec04a..b1258e049 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -132,6 +132,16 @@ class Settings extends \Zotlabs\Web\Controller {
 					$expires = datetime_convert(date_default_timezone_get(),'UTC',$_POST['expires']);
 				else
 					$expires = NULL_DATE;
+				$max_atokens = service_class_fetch(local_channel(),'access_tokens');
+				if($max_atokens) {
+					$r = q("select count(atoken_id) as total where atoken_uid = %d",
+						intval(local_channel())
+					);
+					if($r && intval($r[0]['total']) >= $max_tokens) {
+						notice( sprintf( t('This channel is limited to %d tokens'), $max_tokens) . EOL);
+						return;
+					}
+				}
 			}
 			if($token_errs) {
 				notice( t('Name and Password are required.') . EOL);
diff --git a/util/service_class b/util/service_class
index 2b5998615..50f01afff 100755
--- a/util/service_class
+++ b/util/service_class
@@ -56,7 +56,7 @@ if($argc == 3) {
 	echo "service_class             $oclass\t\t\033[1m" . $argv[2] . "\033[0m\n";
 	
 	$new = get_config('service_class', $argv[2]);
-	foreach(array('photo_upload_limit','total_items','total_pages','total_identities','total_channels','total_feeds','attach_upload_limit','minimum_feedcheck_minutes','chatrooms','chatters_inroom') as $prop) {
+	foreach(array('photo_upload_limit','total_items','total_pages','total_identities','total_channels','total_feeds','attach_upload_limit','minimum_feedcheck_minutes','chatrooms','chatters_inroom','access_tokens') as $prop) {
 		echo $prop . str_repeat(' ',26 - strlen($prop)) . (($old && $old[$prop]) ? $old[$prop] : 'unlimited') . "\t\t\033[1m" . (($new && $new[$prop]) ? $new[$prop] : 'unlimited') . "\033[0m\n";
 	}
 	$r = '';