X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=59a3195b1b54d087fa7c35084b7e6b5fb3e03776;hb=e36f2bb1fb3439e9993c7568e57140c4f954b772;hp=cb0b1f4cd115d18af37ba4bbd55faf796d02132c;hpb=fd5d058156185c6c02c1285a794139d07f4d13ce;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index cb0b1f4cd1..59a3195b1b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,18 +1,22 @@
 <?php
-
+/**
+ * @file mod/directory.php
+ */
 use Friendica\App;
+use Friendica\Content\Widget;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 function directory_init(App $a) {
 	$a->set_pager_itemspage(60);
 
 	if(local_user()) {
-		require_once('include/contact_widgets.php');
-
-		$a->page['aside'] .= findpeople_widget();
+		$a->page['aside'] .= Widget::findPeople();
 
-		$a->page['aside'] .= follow_widget();
-	}
-	else {
+		$a->page['aside'] .= Widget::follow();
+	} else {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
@@ -24,12 +28,10 @@ function directory_post(App $a) {
 }
 
 function directory_content(App $a) {
-	global $db;
-
 	require_once("mod/proxy.php");
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
-		(get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
+	if((Config::get('system','block_public')) && (! local_user()) && (! remote_user()) ||
+		(Config::get('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
@@ -43,9 +45,9 @@ function directory_content(App $a) {
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
 	$gdirpath = '';
-	$dirurl = get_config('system','directory');
+	$dirurl = Config::get('system','directory');
 	if(strlen($dirurl)) {
-		$gdirpath = zrl($dirurl,true);
+		$gdirpath = Profile::zrl($dirurl,true);
 	}
 
 	if($search) {
@@ -68,25 +70,25 @@ function directory_content(App $a) {
 				(`profile`.`prv_keywords` LIKE '%$search%'))";
 	}
 
-	$publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
+	$publish = ((Config::get('system','publish_all')) ? '' : " AND `publish` = 1 " );
 
 
-	$r = $db->q("SELECT COUNT(*) AS `total` FROM `profile`
+	$r = q("SELECT COUNT(*) AS `total` FROM `profile`
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$a->set_pager_total($r[0]['total']);
 
 	$order = " ORDER BY `name` ASC ";
 
 	$limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
 
-	$r = $db->q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
+	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
 			`contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
-	if (dbm::is_result($r)) {
+			WHERE `is-default` $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
+	if (DBM::is_result($r)) {
 
 		if (in_array('small', $a->argv)) {
 			$photo = 'thumb';
@@ -142,18 +144,13 @@ function directory_content(App $a) {
 
 			$about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
-			if($a->theme['template_engine'] === 'internal') {
-				$location_e = template_escape($location);
-			}
-			else {
-				$location_e = $location;
-			}
+			$location_e = $location;
 
-			$photo_menu = array(
-				'profile' => array(t("View Profile"), zrl($profile_link))
-			);
+			$photo_menu = [
+				'profile' => [t("View Profile"), Profile::zrl($profile_link)]
+			];
 
-			$entry = array(
+			$entry = [
 				'id' => $rr['id'],
 				'url' => $profile_link,
 				'itemurl' => $itemurl,
@@ -161,7 +158,7 @@ function directory_content(App $a) {
 				'img_hover' => $rr['name'],
 				'name' => $rr['name'],
 				'details' => $details,
-				'account_type' => account_type($rr),
+				'account_type' => Contact::getAccountType($rr),
 				'profile' => $profile,
 				'location' => $location_e,
 				'tags' => $rr['pub_keywords'],
@@ -172,9 +169,9 @@ function directory_content(App $a) {
 				'about' => $about,
 				'photo_menu' => $photo_menu,
 
-			);
+			];
 
-			$arr = array('contact' => $rr, 'entry' => $entry);
+			$arr = ['contact' => $rr, 'entry' => $entry];
 
 			call_hooks('directory_item', $arr);
 
@@ -190,7 +187,7 @@ function directory_content(App $a) {
 
 		$tpl = get_markup_template('directory_header.tpl');
 
-		$o .= replace_macros($tpl, array(
+		$o .= replace_macros($tpl, [
 			'$search' => $search,
 			'$globaldir' => t('Global Directory'),
 			'$gdirpath' => $gdirpath,
@@ -201,7 +198,7 @@ function directory_content(App $a) {
 			'$title' => t('Site Directory'),
 			'$submit' => t('Find'),
 			'$paginate' => paginate($a),
-		));
+		]);
 
 	}
 	else