aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2015-01-11 16:12:36 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2015-01-11 16:12:36 +0100
commit43f143a211c75138d09ceb89acc48ea7d5c31ca9 (patch)
treed2ad3711e3ad31a694973be736e3a7e705a4634e /include
parent4a0150026b5b503b64471673c8621c857a38df57 (diff)
downloadvolse-hubzilla-43f143a211c75138d09ceb89acc48ea7d5c31ca9.tar.gz
volse-hubzilla-43f143a211c75138d09ceb89acc48ea7d5c31ca9.tar.bz2
volse-hubzilla-43f143a211c75138d09ceb89acc48ea7d5c31ca9.zip
Fix for issue #763 Error creating new channel within the limits of the
subscription plan
Diffstat (limited to 'include')
-rw-r--r--include/account.php26
-rw-r--r--include/identity.php2
2 files changed, 27 insertions, 1 deletions
diff --git a/include/account.php b/include/account.php
index 8df44acba..88036e2ef 100644
--- a/include/account.php
+++ b/include/account.php
@@ -590,6 +590,32 @@ function service_class_allows($uid,$property,$usage = false) {
}
}
+// like service_class_allows but queries by account rather than channel
+function account_service_class_allows($aid,$property,$usage = false) {
+ $a = get_app();
+ $r = q("select account_service_class as service_class from account where account_id = %d limit 1",
+ intval($aid)
+ );
+ if($r !== false and count($r)) {
+ $service_class = $r[0]['service_class'];
+ }
+
+ if(! x($service_class))
+ return true; // everything is allowed
+
+ $arr = get_config('service_class',$service_class);
+ if(! is_array($arr) || (! count($arr)))
+ return true;
+
+ if($usage === false)
+ return ((x($arr[$property])) ? (bool) $arr[$property] : true);
+ else {
+ if(! array_key_exists($property,$arr))
+ return true;
+ return (((intval($usage)) < intval($arr[$property])) ? true : false);
+ }
+}
+
function service_class_fetch($uid,$property) {
$a = get_app();
diff --git a/include/identity.php b/include/identity.php
index 7ae8e48f6..1b761d768 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -34,7 +34,7 @@ function identity_check_service_class($account_id) {
$ret['total_identities'] = intval($r[0]['total']);
- if(! service_class_allows($account_id,'total_identities',$r[0]['total'])) {
+ if(! account_service_class_allows($account_id,'total_identities',$r[0]['total'])) {
$result['message'] .= upgrade_message();
return $result;
}