X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=f29e3eb69ba8e057fa375a71d25a3e42de83276d;hb=18d93cddf60d46e1334d6dd7454a76f1d6549052;hp=f3fbb9eb77cb7834af4a3d5f553e418dbefec160;hpb=ee39aba490fb7e17ba9c01a9a4f4aedc51bee564;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index f3fbb9eb77..f29e3eb69b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,6 +1,11 @@
 <?php
 
-function directory_init(App &$a) {
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+
+function directory_init(App $a) {
 	$a->set_pager_itemspage(60);
 
 	if(local_user()) {
@@ -9,31 +14,23 @@ function directory_init(App &$a) {
 		$a->page['aside'] .= findpeople_widget();
 
 		$a->page['aside'] .= follow_widget();
-
 	}
 	else {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
-
-
 }
 
-
-function directory_post(App &$a) {
+function directory_post(App $a) {
 	if(x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
-
-
-function directory_content(App &$a) {
-	global $db;
-
+function directory_content(App $a) {
 	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;
 	}
@@ -47,7 +44,7 @@ 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);
 	}
@@ -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';
@@ -124,7 +121,7 @@ function directory_content(App &$a) {
 			}
 //			if(strlen($rr['dob'])) {
 //				if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-//					$details .= '<br />' . t('Age: ') . $years ; 
+//					$details .= '<br />' . t('Age: ') . $years ;
 //			}
 //			if(strlen($rr['gender']))
 //				$details .= '<br />' . t('Gender: ') . $rr['gender'];
@@ -146,12 +143,7 @@ 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))
@@ -165,7 +157,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'],