diff options
| author | Mario <mario@mariovavti.com> | 2021-03-12 10:07:15 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-12 10:07:15 +0000 |
| commit | 3f053611bdbbd4a26a5d9c76a294b7ada07f0726 (patch) | |
| tree | b8b16b780d0353ede8580b41ec9e16f622c94c87 /include/account.php | |
| parent | c29261487cdecda4282df25769540bc4fa20631d (diff) | |
| parent | 1582b8bc9620a661823c608c0c7023a70554214b (diff) | |
| download | volse-hubzilla-3f053611bdbbd4a26a5d9c76a294b7ada07f0726.tar.gz volse-hubzilla-3f053611bdbbd4a26a5d9c76a294b7ada07f0726.tar.bz2 volse-hubzilla-3f053611bdbbd4a26a5d9c76a294b7ada07f0726.zip | |
Merge branch 'dev' into air
Diffstat (limited to 'include/account.php')
| -rw-r--r-- | include/account.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/account.php b/include/account.php index bdc7f1caf..7e5510b53 100644 --- a/include/account.php +++ b/include/account.php @@ -969,8 +969,8 @@ function verify_register_scheme() { */ function downgrade_accounts() { - $r = q("select * from account where not ( account_flags & %d ) > 0 - and account_expires > '%s' + $r = q("select * from account where not ( account_flags & %d ) > 0 + and account_expires > '%s' and account_expires < %s ", intval(ACCOUNT_EXPIRED), dbesc(NULL_DATE), @@ -1110,8 +1110,8 @@ function service_class_fetch($uid, $property) { $service_class = App::$account['account_service_class']; } else { - $r = q("select account_service_class as service_class - from channel c, account a + $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) ); @@ -1144,6 +1144,8 @@ function service_class_fetch($uid, $property) { */ function account_service_class_fetch($aid, $property) { + $service_class = null; + $r = q("select account_service_class as service_class from account where account_id = %d limit 1", intval($aid) ); @@ -1151,7 +1153,7 @@ function account_service_class_fetch($aid, $property) { $service_class = $r[0]['service_class']; } - if(! x($service_class)) + if(! isset($service_class)) return false; // everything is allowed $arr = get_config('service_class', $service_class); |