From: Hypolite Petovan Date: Sun, 19 Nov 2017 22:09:54 +0000 (-0500) Subject: Move Contact to src X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ec0c2e837d4795ef72d7e86c07d20e6af78717c0;p=friendica-addons.git Move Contact to src - Add relevant use statements - Change method calls - Remove mentions to include/Contact.php --- diff --git a/public_server/public_server.php b/public_server/public_server.php index 5731b0d9..fd19c8f4 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -8,6 +8,7 @@ */ use Friendica\Core\Config; +use Friendica\Model\User; function public_server_install() { @@ -75,10 +76,9 @@ function public_server_cron($a,$b) { $r = q("select * from user where account_expired = 1 and account_expires_on < UTC_TIMESTAMP() - INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00'"); if(count($r)) { - require_once('include/Contact.php'); - foreach($r as $rr) - user_remove($rr['uid']); - + foreach($r as $rr) { + User::remove($rr['uid']); + } } $nologin = Config::get('public_server','nologin'); if($nologin) { @@ -123,7 +123,7 @@ function public_server_cron($a,$b) { } function public_server_enotify(&$a, &$b) { - if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM + if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM && x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') { $b['itemlink'] = $a->get_baseurl(); $b['epreamble'] = $b['preamble'] = sprintf( t('Your account on %s will expire in a few days.'), Config::get('system','sitename')); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 4873d73d..3d3f5bf4 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -10,6 +10,7 @@ use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\Worker; use Friendica\Model\GlobalContact; +use Friendica\Object\Contact; require 'addon/pumpio/oauth/http.php'; require 'addon/pumpio/oauth/oauth_client.php'; @@ -972,7 +973,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { "photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true, "nick" => $contact->preferredUsername, "location" => $contact->location->displayName, "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id))); - $cid = get_contact($contact->url, $uid); + $cid = Contact::getIdForURL($contact->url, $uid); if ($no_insert) return($cid); diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index fc53bab8..9c1a0c04 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -8,6 +8,7 @@ */ use Friendica\Core\Config; +use Friendica\Model\User; function testdrive_install() { @@ -79,12 +80,10 @@ function testdrive_cron($a,$b) { $r = q("select * from user where account_expired = 1 and account_expires_on < UTC_TIMESTAMP() - INTERVAL 5 DAY "); if(count($r)) { - require_once('include/Contact.php'); - foreach($r as $rr) - user_remove($rr['uid']); - + foreach($r as $rr) { + User::remove($rr['uid']); + } } - } function testdrive_enotify(&$a, &$b) {