cripple account when expired

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index fe348f689e27462d031f7bacdd3dc6f96c6e8576..3268cb254f7f6062f81c05c5116981e3d63db011 100644 (file)
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -139,6 +139,12 @@ function fb_get_self($uid) {
 
 function fb_get_friends($uid) {
 
+       $r = q("SELECT `id` FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+               intval($uid)
+       );
+       if(! count($r))
+               return;
+
        $access_token = get_pconfig($uid,'facebook','access_token');
 
        $no_linking = get_pconfig($uid,'facebook','no_linking');
@@ -808,8 +814,18 @@ function fb_consume_all($uid) {
 }
 
 function fb_consume_stream($uid,$j,$wall = false) {
+
        $a = get_app();
 
+
+       $user = q("SELECT `nickname`, `blockwall` FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
+               intval($uid)
+       );
+       if(! count($user))
+               return;
+
+       $my_local_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
        $no_linking = get_pconfig($uid,'facebook','no_linking');
        if($no_linking)
                return;
@@ -818,11 +834,6 @@ function fb_consume_stream($uid,$j,$wall = false) {
                intval($uid)
        );
 
-       $user = q("SELECT `nickname`, `blockwall` FROM `user` WHERE `uid` = %d LIMIT 1",
-               intval($uid)
-       );
-       if(count($user))
-               $my_local_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
 
        $self_id = get_pconfig($uid,'facebook','self_id');
        if(! count($j->data) || (! strlen($self_id)))

diff --git a/include/diaspora.php b/include/diaspora.php
index a6f3002b9dc9f04bfea72ed44851209e3d2a400d..3c28373eacebaec0ade5e06952fff99dd4ce82f7 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -8,7 +8,7 @@ require_once('include/contact_selectors.php');
 
 function diaspora_dispatch_public($msg) {
 
-       $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) ",
+       $r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN ( SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s' ) AND `account_expired` = 0 ",
                dbesc(NETWORK_DIASPORA),
                dbesc($msg['author'])
        );

diff --git a/include/poller.php b/include/poller.php
index e80b696bf8615f9ca89df7963f01a76f1cd4d9c1..dbae1deec9713a80af16a19a2877b988a00fcfd4 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -86,11 +86,12 @@ function poller_run($argv, $argc){
        // and which have a polling address and ignore Diaspora since 
        // we are unable to match those posts with a Diaspora GUID and prevent duplicates.
 
-       $contacts = q("SELECT `id` FROM `contact` 
+       $contacts = q("SELECT `contact`.`id` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
                WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
                AND `network` != '%s'
                $sql_extra 
-               AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()",
+               AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0 
+               AND `user`.`account_expired` = 0 ORDER BY RAND()",
                intval(CONTACT_IS_SHARING),
                intval(CONTACT_IS_FRIEND),
                dbesc(NETWORK_DIASPORA)

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 84cb2fc165ac3ba13b47fa63ecaac5c814935286..d174c87ee681bdc35181cb17569ef477b7e20329 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -72,7 +72,7 @@ function dfrn_notify_post(&$a) {
                        FROM `contact` 
                        LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
                        WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
-                               AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+                               AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 $sql_extra LIMIT 1",
                dbesc($a->argv[1])
        );
 
@@ -829,7 +829,8 @@ function dfrn_notify_content(&$a) {
                }
 
                $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` 
-                               WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+                               WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s' 
+                               AND `user`.`account_expired` = 0 $sql_extra LIMIT 1",
                                dbesc($a->argv[1])
                );
 

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 4dff5d531ab27a9450ebe2b37c6c37a7645ad0e1..b2f0069271277d76fa334a9f8fdc1d3f6809f891 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -44,7 +44,7 @@ function pubsub_init(&$a) {
 
                $subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
                        dbesc($nick)
                );
                if(! count($r))
@@ -99,7 +99,7 @@ function pubsub_post(&$a) {
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
                dbesc($nick)
        );
        if(! count($r))

diff --git a/mod/receive.php b/mod/receive.php
index 72e2903483b0f6eb8806b3a96d4fda9b3cb5dfb1..950bf0bd388e80ed20fd69541bd46b7e5765c99e 100644 (file)
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -24,7 +24,7 @@ function receive_post(&$a) {
 
                $guid = $a->argv[2];
 
-               $r = q("SELECT * FROM `user` WHERE `guid` = '%s' LIMIT 1",
+               $r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 LIMIT 1",
                        dbesc($guid)
                );
                if(! count($r))

diff --git a/mod/salmon.php b/mod/salmon.php
index 0264e820db2a03f224c512928170d2868cfce9b3..6172d17a1ddda0e7c0816fc2cdfbf945f9becbb4 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -25,12 +25,12 @@ function salmon_post(&$a) {
 
        $xml = file_get_contents('php://input');
 
-       logger('mod-salmon: new salmon ' . $xml);
+       logger('mod-salmon: new salmon ' . $xml, LOGGER_DATA);
 
        $nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
        $mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
 
-       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1",
                dbesc($nick)
        );
        if(! count($r))