X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=4ce919b08bd40ae46ff8e5dd7143ab0fc70f706b;hb=21a3a6f45b2cb7573e0f2013d179bddd254a526d;hp=e49e718a5e5e43aecd33b958966e05d6bd102630;hpb=5a6da8b447430174ae231a3b8203fd4bd8416cc1;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index e49e718a5e..4ce919b08b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,39 +1,36 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
+
 function directory_init(App $a) {
 	$a->set_pager_itemspage(60);
 
-	if (local_user()) {
+	if(local_user()) {
 		require_once('include/contact_widgets.php');
 
 		$a->page['aside'] .= findpeople_widget();
 
 		$a->page['aside'] .= follow_widget();
-
 	}
 	else {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
-
-
 }
 
-
 function directory_post(App $a) {
-	if (x($_POST,'search'))
+	if(x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
-
-
 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;
 	}
@@ -41,18 +38,18 @@ function directory_content(App $a) {
 	$o = '';
 	nav_set_selected('directory');
 
-	if (x($a->data,'search'))
+	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));
 	else
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
 	$gdirpath = '';
-	$dirurl = get_config('system','directory');
-	if (strlen($dirurl)) {
+	$dirurl = Config::get('system','directory');
+	if(strlen($dirurl)) {
 		$gdirpath = zrl($dirurl,true);
 	}
 
-	if ($search) {
+	if($search) {
 		$search = dbesc($search);
 
 		$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
@@ -72,25 +69,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';
@@ -110,28 +107,28 @@ function directory_content(App $a) {
 			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
 			$details = '';
-			if (strlen($rr['locality']))
+			if(strlen($rr['locality']))
 				$details .= $rr['locality'];
-			if (strlen($rr['region'])) {
-				if (strlen($rr['locality']))
+			if(strlen($rr['region'])) {
+				if(strlen($rr['locality']))
 					$details .= ', ';
 				$details .= $rr['region'];
 			}
-			if (strlen($rr['country-name'])) {
-				if (strlen($details))
+			if(strlen($rr['country-name'])) {
+				if(strlen($details))
 					$details .= ', ';
 				$details .= $rr['country-name'];
 			}
-//			if (strlen($rr['dob'])) {
-//				if (($years = age($rr['dob'],$rr['timezone'],'')) != 0)
+//			if(strlen($rr['dob'])) {
+//				if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
 //					$details .= '<br />' . t('Age: ') . $years ;
 //			}
-//			if (strlen($rr['gender']))
+//			if(strlen($rr['gender']))
 //				$details .= '<br />' . t('Gender: ') . $rr['gender'];
 
 			$profile = $rr;
 
-			if ((x($profile,'address') == 1)
+			if((x($profile,'address') == 1)
 				|| (x($profile,'locality') == 1)
 				|| (x($profile,'region') == 1)
 				|| (x($profile,'postal-code') == 1)
@@ -146,7 +143,7 @@ function directory_content(App $a) {
 
 			$about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
-			if ($a->theme['template_engine'] === 'internal') {
+			if($a->theme['template_engine'] === 'internal') {
 				$location_e = template_escape($location);
 			}
 			else {
@@ -165,7 +162,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'],
@@ -185,9 +182,8 @@ function directory_content(App $a) {
 			unset($profile);
 			unset($location);
 
-			if (! $arr['entry']) {
+			if(! $arr['entry'])
 				continue;
-			}
 
 			$entries[] = $arr['entry'];