CS update to the strings

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 367438845427d420f9139fd64ee817044ca88404..7fab53b6807cadd363da70227b1f3c3a6679e5aa 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -9,8 +9,10 @@ function directory_init(&$a) {
                $a->page['aside'] .= findpeople_widget();
 
        }
-       else
+       else {
                unset($_SESSION['theme']);
+               unset($_SESSION['mobile-theme']);
+       }
 
 
 }
@@ -25,6 +27,8 @@ function directory_post(&$a) {
 
 function directory_content(&$a) {
 
+       require_once("mod/proxy.php");
+
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
@@ -73,14 +77,12 @@ function directory_content(&$a) {
        $order = " ORDER BY `name` ASC "; 
 
 
-       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
                intval($a->pager['start']),
                intval($a->pager['itemspage'])
        );
        if(count($r)) {
 
-               $tpl = get_markup_template('directory_item.tpl');
-
                if(in_array('small', $a->argv))
                        $photo = 'thumb';
                else
@@ -90,7 +92,7 @@ function directory_content(&$a) {
 
 
                        $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-               
+
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
                        $details = '';
@@ -113,14 +115,58 @@ function directory_content(&$a) {
                        if(strlen($rr['gender']))
                                $details .= '<br />' . t('Gender: ') . $rr['gender'];
 
+                       if($rr['page-flags'] == PAGE_NORMAL)
+                               $page_type = "Personal Profile";
+                       if($rr['page-flags'] == PAGE_SOAPBOX)
+                               $page_type = "Fan Page";
+                       if($rr['page-flags'] == PAGE_COMMUNITY)
+                               $page_type = "Community Forum";
+                       if($rr['page-flags'] == PAGE_FREELOVE)
+                               $page_type = "Open Forum";
+                       if($rr['page-flags'] == PAGE_PRVGROUP)
+                               $page_type = "Private Group";
+
+                       $profile = $rr;
+
+                       if((x($profile,'address') == 1)
+                               || (x($profile,'locality') == 1)
+                               || (x($profile,'region') == 1)
+                               || (x($profile,'postal-code') == 1)
+                               || (x($profile,'country-name') == 1))
+                       $location = t('Location:');
+
+                       $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+
+                       $marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+
+                       $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+
+                       $about = ((x($profile,'about') == 1) ?  t('About:') : False);
+
+                       $tpl = get_markup_template('directory_item.tpl');
+
+                       if($a->theme['template_engine'] === 'internal') {
+                               $location_e = template_escape($location);
+                       }
+                       else {
+                               $location_e = $location;
+                       }
+
                        $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
-                               '$profile-link' => $profile_link,
-                               '$photo' => $rr[$photo],
-                               '$alt-text' => $rr['name'],
+                               '$profile_link' => $profile_link,
+                               '$photo' => proxy_url($a->get_cached_avatar_image($rr[$photo])),
+                               '$alt_text' => $rr['name'],
                                '$name' => $rr['name'],
-                               '$details' => $pdesc . $details  
-
+                               '$details' => $pdesc . $details,
+                               '$page_type' => $page_type,
+                               '$profile' => $profile,
+                               '$location' => $location_e,
+                               '$gender'   => $gender,
+                               '$pdesc'        => $pdesc,
+                               '$marital'  => $marital,
+                               '$homepage' => $homepage,
+                               '$about' => $about,
 
                        ));
 
@@ -128,6 +174,9 @@ function directory_content(&$a) {
 
                        call_hooks('directory_item', $arr);
 
+                       unset($profile);
+                       unset($location);
+
                        $o .= $entry;
 
                }