Merge remote-tracking branch 'upstream/master'

1 files changed, 92 insertions, 3 deletions

diff --git a/include/account.php b/include/account.php
index 4ded069d5..9b4dc409c 100644
--- a/include/account.php
+++ b/include/account.php
@@ -108,7 +108,7 @@ function create_account($arr) {
 	$parent      = ((x($arr,'parent'))        ? intval($arr['parent'])             : 0 );
 	$flags       = ((x($arr,'account_flags')) ? intval($arr['account_flags'])      : ACCOUNT_OK);
 	$roles       = ((x($arr,'account_roles')) ? intval($arr['account_roles'])      : 0 );
-	$expires     = ((x($arr,'expires'))       ? intval($arr['expires'])            : '0000-00-00 00:00:00');
+	$expires     = ((x($arr,'expires'))       ? intval($arr['expires'])            : NULL_DATE);
 	
 	$default_service_class = get_config('system','default_service_class');
 
@@ -511,8 +511,9 @@ function user_approve($hash) {
 function downgrade_accounts() {
 
 	$r = q("select * from account where not ( account_flags & %d ) 
-		and account_expires != '0000-00-00 00:00:00' 
+		and account_expires != '%s' 
 		and account_expires < UTC_TIMESTAMP() ",
+		dbesc(NULL_DATE),
 		intval(ACCOUNT_EXPIRED)
 	);
 
@@ -528,7 +529,7 @@ function downgrade_accounts() {
 			$x = q("UPDATE account set account_service_class = '%s', account_expires = '%s'
 				where account_id = %d limit 1",
 				dbesc($basic),
-				dbesc('0000-00-00 00:00:00'),
+				dbesc(NULL_DATE),
 				intval($rr['account_id'])
 			);
 			$ret = array('account' => $rr);
@@ -547,3 +548,91 @@ function downgrade_accounts() {
 	}
 }
 
+
+
+// check service_class restrictions. If there are no service_classes defined, everything is allowed.
+// if $usage is supplied, we check against a maximum count and return true if the current usage is 
+// less than the subscriber plan allows. Otherwise we return boolean true or false if the property
+// is allowed (or not) in this subscriber plan. An unset property for this service plan means 
+// the property is allowed, so it is only necessary to provide negative properties for each plan, 
+// or what the subscriber is not allowed to do. 
+
+
+function service_class_allows($uid,$property,$usage = false) {
+	$a = get_app();
+	if($uid == local_user()) {
+		$service_class = $a->account['account_service_class'];
+	}
+	else {
+		$r = q("select account_service_class as service_class 
+				from channel c, account a 
+				where c.channel_account_id=a.account_id and c.channel_id= %d limit 1",
+			intval($uid)
+		);
+		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();
+	if($uid == local_user()) {
+		$service_class = $a->account['account_service_class'];
+	}
+	else {
+		$r = q("select account_service_class as service_class 
+				from channel c, account a 
+				where c.channel_account_id=a.account_id and c.channel_id= %d limit 1",
+				intval($uid)
+		);
+		if($r !== false and count($r)) {
+			$service_class = $r[0]['service_class'];
+		}
+	}
+	if(! x($service_class))
+		return false; // everything is allowed
+
+	$arr = get_config('service_class',$service_class);
+
+	if(! is_array($arr) || (! count($arr)))
+		return false;
+
+	return((array_key_exists($property,$arr)) ? $arr[$property] : false);
+}
+
+function upgrade_link($bbcode = false) {
+	$l = get_config('service_class','upgrade_link');
+	if(! $l)
+		return '';
+	if($bbcode)
+		$t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l);
+	else
+		$t = sprintf('<a href="%s">' . t('Click here to upgrade.') . '</div>', $l);
+	return $t;
+}
+
+function upgrade_message($bbcode = false) {
+	$x = upgrade_link($bbcode);
+	return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ;
+}
+
+function upgrade_bool_message($bbcode = false) {
+	$x = upgrade_link($bbcode);
+	return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ;
+}