X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FDirectory.php;h=d71e593dc5673c7b4de59a399ac21e658c051b9f;hb=bf8fb215a9cc554b5ec5b774168a52fb56fa43e6;hp=a59461037d4899d7c61c0a54c52eaa8fb55f3e0a;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git

diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index a59461037d..d71e593dc5 100644
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -1,22 +1,40 @@
 <?php
 /**
- * @file src/Worker/Directory.php
- * @brief Sends updated profile data to the directory
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Util\Network;
+use Friendica\Database\DBA;
+use Friendica\DI;
 
+/**
+ * Sends updated profile data to the directory
+ */
 class Directory
 {
 	public static function execute($url = '')
 	{
-		$dir = Config::get('system', 'directory');
+		$dir = DI::config()->get('system', 'directory');
 
 		if (!strlen($dir)) {
 			return;
@@ -31,27 +49,21 @@ class Directory
 
 		$arr = ['url' => $url];
 
-		Addon::callHooks('globaldir_update', $arr);
+		Hook::callAll('globaldir_update', $arr);
 
-		logger('Updating directory: ' . $arr['url'], LOGGER_DEBUG);
+		Logger::log('Updating directory: ' . $arr['url'], Logger::DEBUG);
 		if (strlen($arr['url'])) {
-			Network::fetchUrl($dir . '?url=' . bin2hex($arr['url']));
+			DI::httpRequest()->fetch($dir . '?url=' . bin2hex($arr['url']));
 		}
 
 		return;
 	}
 
 	private static function updateAll() {
-		$r = q("SELECT `url` FROM `contact`
-			INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
-			INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-				WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND
-					NOT `user`.`account_expired` AND `user`.`verified`");
-
-		if (DBM::is_result($r)) {
-			foreach ($r AS $user) {
-				Worker::add(PRIORITY_LOW, 'Directory', $user['url']);
-			}
+		$users = DBA::select('owner-view', ['url'], ['net-publish' => true, 'account_expired' => false, 'verified' => true]);
+		while ($user = DBA::fetch($users)) {
+			Worker::add(PRIORITY_LOW, 'Directory', $user['url']);
 		}
+		DBA::close($users);
 	}
 }