Merge pull request #6688 from nupplaphil/preload_adapter_fix

Preload adapter fix

diff --git a/mod/directory.php b/mod/directory.php
index 6ef3134..256c9bb 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -45,6 +45,8 @@ function directory_content(App $a)
        }
 
        $o = '';
+       $entries = [];
+
        Nav::setSelected('directory');
 
        if (!empty($a->data['search'])) {
@@ -98,7 +100,7 @@ function directory_content(App $a)
        $limit = $pager->getStart()."," . $pager->getItemsPerPage();
 
        $r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-                       `contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
+                       `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` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
@@ -111,115 +113,118 @@ function directory_content(App $a)
                        $photo = 'photo';
                }
 
-               $entries = [];
-
                while ($rr = DBA::fetch($r)) {
-                       $itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
-
-                       $profile_link = $rr['profile_url'];
-
-                       $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
-
-                       $details = '';
-                       if (strlen($rr['locality'])) {
-                               $details .= $rr['locality'];
-                       }
-                       if (strlen($rr['region'])) {
-                               if (strlen($rr['locality'])) {
-                                       $details .= ', ';
-                               }
-                               $details .= $rr['region'];
-                       }
-                       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)
-//                                     $details .= '<br />' . L10n::t('Age: ') . $years;
-//                     }
-//                     if(strlen($rr['gender']))
-//                             $details .= '<br />' . L10n::t('Gender: ') . $rr['gender'];
-
-                       $profile = $rr;
-
-                       if (!empty($profile['address'])
-                               || !empty($profile['locality'])
-                               || !empty($profile['region'])
-                               || !empty($profile['postal-code'])
-                               || !empty($profile['country-name'])
-                       ) {
-                               $location = L10n::t('Location:');
-                       } else {
-                               $location = '';
-                       }
-
-                       $gender   = (!empty($profile['gender']) ? L10n::t('Gender:')   : false);
-                       $marital  = (!empty($profile['marital']) ? L10n::t('Status:')   : false);
-                       $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
-                       $about    = (!empty($profile['about']) ? L10n::t('About:')    : false);
-
-                       $location_e = $location;
-
-                       $photo_menu = [
-                               'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
-                       ];
-
-                       $entry = [
-                               'id'           => $rr['id'],
-                               'url'          => Contact::magicLInk($profile_link),
-                               'itemurl'      => $itemurl,
-                               'thumb'        => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::SIZE_THUMB),
-                               'img_hover'    => $rr['name'],
-                               'name'         => $rr['name'],
-                               'details'      => $details,
-                               'account_type' => Contact::getAccountType($rr),
-                               'profile'      => $profile,
-                               'location'     => $location_e,
-                               'tags'         => $rr['pub_keywords'],
-                               'gender'       => $gender,
-                               'pdesc'        => $pdesc,
-                               'marital'      => $marital,
-                               'homepage'     => $homepage,
-                               'about'        => $about,
-                               'photo_menu'   => $photo_menu,
-
-                       ];
-
-                       $arr = ['contact' => $rr, 'entry' => $entry];
-
-                       Hook::callAll('directory_item', $arr);
-
-                       unset($profile);
-                       unset($location);
-
-                       if (!$arr['entry']) {
-                               continue;
-                       }
-
-                       $entries[] = $arr['entry'];
+                       $entries[] = format_directory_entry($rr, $photo);
                }
                DBA::close($r);
-
-               $tpl = Renderer::getMarkupTemplate('directory_header.tpl');
-
-               $o .= Renderer::replaceMacros($tpl, [
-                       '$search'    => $search,
-                       '$globaldir' => L10n::t('Global Directory'),
-                       '$gdirpath'  => $gdirpath,
-                       '$desc'      => L10n::t('Find on this site'),
-                       '$contacts'  => $entries,
-                       '$finding'   => L10n::t('Results for:'),
-                       '$findterm'  => (strlen($search) ? $search : ""),
-                       '$title'     => L10n::t('Site Directory'),
-                       '$submit'    => L10n::t('Find'),
-                       '$paginate'  => $pager->renderFull($total),
-               ]);
        } else {
                info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
        }
 
+       $tpl = Renderer::getMarkupTemplate('directory_header.tpl');
+
+       $o .= Renderer::replaceMacros($tpl, [
+               '$search'    => $search,
+               '$globaldir' => L10n::t('Global Directory'),
+               '$gdirpath'  => $gdirpath,
+               '$desc'      => L10n::t('Find on this site'),
+               '$contacts'  => $entries,
+               '$finding'   => L10n::t('Results for:'),
+               '$findterm'  => (strlen($search) ? $search : ""),
+               '$title'     => L10n::t('Site Directory'),
+               '$search_mod' => 'directory',
+               '$submit'    => L10n::t('Find'),
+               '$paginate'  => $pager->renderFull($total),
+       ]);
+
        return $o;
 }
+
+/**
+ * Format contact/profile/user data from the database into an usable
+ * array for displaying directory entries.
+ * 
+ * @param array $arr The directory entry from the database.
+ * @param string $photo_size Avatar size (thumb, photo or micro).
+ * 
+ * @return array
+ */
+function format_directory_entry(array $arr, $photo_size = 'photo')
+{
+       $itemurl = (($arr['addr'] != "") ? $arr['addr'] : $arr['profile_url']);
+
+       $profile_link = $arr['profile_url'];
+
+       $pdesc = (($arr['pdesc']) ? $arr['pdesc'] . '<br />' : '');
+
+       $details = '';
+       if (strlen($arr['locality'])) {
+               $details .= $arr['locality'];
+       }
+       if (strlen($arr['region'])) {
+               if (strlen($arr['locality'])) {
+                       $details .= ', ';
+               }
+               $details .= $arr['region'];
+       }
+       if (strlen($arr['country-name'])) {
+               if (strlen($details)) {
+                       $details .= ', ';
+               }
+               $details .= $arr['country-name'];
+       }
+
+       $profile = $arr;
+
+       if (!empty($profile['address'])
+               || !empty($profile['locality'])
+               || !empty($profile['region'])
+               || !empty($profile['postal-code'])
+               || !empty($profile['country-name'])
+       ) {
+               $location = L10n::t('Location:');
+       } else {
+               $location = '';
+       }
+
+       $gender   = (!empty($profile['gender'])   ? L10n::t('Gender:')   : false);
+       $marital  = (!empty($profile['marital'])  ? L10n::t('Status:')   : false);
+       $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
+       $about    = (!empty($profile['about'])    ? L10n::t('About:')    : false);
+
+       $location_e = $location;
+
+       $photo_menu = [
+               'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
+       ];
+
+       $entry = [
+               'id'           => $arr['id'],
+               'url'          => Contact::magicLInk($profile_link),
+               'itemurl'      => $itemurl,
+               'thumb'        => ProxyUtils::proxifyUrl($arr[$photo_size], false, ProxyUtils::SIZE_THUMB),
+               'img_hover'    => $arr['name'],
+               'name'         => $arr['name'],
+               'details'      => $details,
+               'account_type' => Contact::getAccountType($arr),
+               'profile'      => $profile,
+               'location'     => $location_e,
+               'tags'         => $arr['pub_keywords'],
+               'gender'       => $gender,
+               'pdesc'        => $pdesc,
+               'marital'      => $marital,
+               'homepage'     => $homepage,
+               'about'        => $about,
+               'photo_menu'   => $photo_menu,
+
+       ];
+
+       $hook = ['contact' => $arr, 'entry' => $entry];
+
+       Hook::callAll('directory_item', $hook);
+
+       unset($profile);
+       unset($location);
+
+       return $hook['entry'];
+}

diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl
index 4c9fe12..14b1074 100644 (file)
--- a/view/templates/directory_header.tpl
+++ b/view/templates/directory_header.tpl
@@ -7,9 +7,8 @@
        </ul>
 {{/if}}
 
-
 <div id="directory-search-wrapper">
-       <form id="directory-search-form" action="directory" method="get" >
+       <form id="directory-search-form" action="{{$search_mod}}" method="get" >
                <span class="dirsearch-desc">{{$desc nofilter}}</span>
                <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
                <input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index c751421..fa3b3d0 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2310,7 +2310,7 @@ ul.dropdown-menu li:hover {
 .generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper,
  .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper,
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
-.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
+.manage-content-wrapper, .notes-content-wrapper,
 .message-content-wrapper, .apps-content-wrapper,
 #adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
 .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,

diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl
index 98ec3f5..3681291 100644 (file)
--- a/view/theme/frio/templates/directory_header.tpl
+++ b/view/theme/frio/templates/directory_header.tpl
@@ -1,40 +1,41 @@
 
-{{if $gdirpath}}
-<ul class="list-unstyled pull-right">
-       <li><div id="global-directory-link"><a href="{{$gdirpath}}">{{$globaldir}}</a></div></li>
-</ul>
-{{/if}}
-
-{{include file="section_title.tpl"}}
-
-
-{{* The search input field to search for contacts *}}
-<div id="directory-search-wrapper">
-       <form id="directory-search-form" class="navbar-form" role="search" action="directory" method="get" >
-               <div class="row">
-                       <div class="col-md-2"></div>
-                       <div class="col-md-8 ">
-                               <div class="form-group form-group-search">
-                                       <input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
-                                       <button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
+<div class="generic-page-wrapper">
+       {{if $gdirpath}}
+       <ul class="list-unstyled pull-right">
+               <li><div id="global-directory-link"><a href="{{$gdirpath}}">{{$globaldir}}</a></div></li>
+       </ul>
+       {{/if}}
+
+       {{include file="section_title.tpl"}}
+
+       {{* The search input field to search for contacts *}}
+       <div id="directory-search-wrapper">
+               <form id="directory-search-form" class="navbar-form" role="search" action="{{$search_mod}}" method="get" >
+                       <div class="row">
+                               <div class="col-md-2"></div>
+                               <div class="col-md-8 ">
+                                       <div class="form-group form-group-search">
+                                               <input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
+                                               <button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
+                                       </div>
                                </div>
+                               <div class="col-md-2"></div>
                        </div>
-                       <div class="col-md-2"></div>
-               </div>
-       </form>
-</div>
+               </form>
+       </div>
 
-<hr>
+       <hr>
 
-<div id="directory-search-end" class="clear"></div>
+       <div id="directory-search-end" class="clear"></div>
 
-{{* format each contact with the contact_template.tpl *}}
-<ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
-{{foreach $contacts as $contact}}
-       <li>{{include file="contact_template.tpl"}}</li>
-{{/foreach}}
-</ul>
+       {{* format each contact with the contact_template.tpl *}}
+       <ul id="viewcontact_wrapper" class="viewcontact_wrapper media-list">
+       {{foreach $contacts as $contact}}
+               <li>{{include file="contact_template.tpl"}}</li>
+       {{/foreach}}
+       </ul>
 
-<div class="directory-end" ></div>
+       <div class="directory-end" ></div>
 
-{{$paginate nofilter}}
+       {{$paginate nofilter}}
+</div>

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 591e102..1fb1221 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -42,11 +42,11 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="hide-comments-outer-wrapper">
                        <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
                                <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
-                                       <i class="fa fa-plus-square" aria-hidden="true"></i>
+                                       <i class="fa fa-caret-right" aria-hidden="true"></i>
                                        {{$item.num_comments}} - {{$item.show_text}}
                                </span>
                                <span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
-                                       <i class="fa fa-minus-square" aria-hidden="true"></i>
+                                       <i class="fa fa-caret-down" aria-hidden="true"></i>
                                        {{$item.num_comments}} - {{$item.hide_text}}
                                </span>
                        </div>