diff --git a/include/profile_advanced.php b/include/profile_advanced.php index 05fd56d023..1db959093f 100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -4,7 +4,9 @@ function advanced_profile(&$a) { $o = ''; - $o .= '

' . t('Profile') . '

'; + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => t('Profile') + )); if($a->profile['name']) { @@ -81,13 +83,13 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt ); if ($a->profile['uid'] == local_user()) - $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile')); + $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile')); - return replace_macros($tpl, array( - '$title' => t('Profile'), - '$profile' => $profile - )); - } + return replace_macros($tpl, array( + '$title' => t('Profile'), + '$profile' => $profile + )); + } return ''; } diff --git a/mod/allfriends.php b/mod/allfriends.php index c32a05a2ce..1a45775fb2 100644 --- a/mod/allfriends.php +++ b/mod/allfriends.php @@ -21,19 +21,21 @@ function allfriends_content(&$a) { ); $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array( - '$name' => $c[0]['name'], - '$photo' => $c[0]['photo'], - 'url' => z_root() . '/contacts/' . $cid - )); + '$name' => $c[0]['name'], + '$photo' => $c[0]['photo'], + 'url' => z_root() . '/contacts/' . $cid + )); - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - $a->page['aside'] .= $vcard_widget; + if(! x($a->page,'aside')) + $a->page['aside'] = ''; + $a->page['aside'] .= $vcard_widget; if(! count($c)) return; - $o .= '

' . sprintf( t('Friends of %s'), $c[0]['name']) . '

'; + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('Friends of %s'), $c[0]['name']) + )); $r = all_friends(local_user(),$cid); diff --git a/mod/common.php b/mod/common.php index a4320f9eb9..3118d12479 100644 --- a/mod/common.php +++ b/mod/common.php @@ -29,19 +29,21 @@ function common_content(&$a) { } $vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array( - '$name' => $c[0]['name'], - '$photo' => $c[0]['photo'], - 'url' => z_root() . '/contacts/' . $cid - )); + '$name' => $c[0]['name'], + '$photo' => $c[0]['photo'], + 'url' => z_root() . '/contacts/' . $cid + )); - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - $a->page['aside'] .= $vcard_widget; + if(! x($a->page,'aside')) + $a->page['aside'] = ''; + $a->page['aside'] .= $vcard_widget; if(! count($c)) return; - $o .= '

' . t('Common Friends') . '

'; + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => t('Common Friends') + )); if(! $cid) { diff --git a/mod/content.php b/mod/content.php index 1e44bf160c..e20345307d 100644 --- a/mod/content.php +++ b/mod/content.php @@ -131,7 +131,9 @@ function content_content(&$a, $update = 0) { } $sql_extra = " AND `item`.`parent` IN ( SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND ( `contact-id` IN ( $contact_str ) OR `allow_gid` like '" . protect_sprintf('%<' . intval($group) . '>%') . "' ) and deleted = 0 ) "; - $o = '

' . t('Group: ') . $r[0]['name'] . '

' . $o; + $o = replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('Group: %s'), $r[0]['name']) + )) . $o; } elseif($cid) { diff --git a/mod/dirfind.php b/mod/dirfind.php index 5c5d0e933a..0c6d79480f 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -23,8 +23,10 @@ function dirfind_content(&$a) { $o = ''; - $o .= '

' . t('People Search') . ' - ' . $search . '

'; - + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('People Search - %s'), $search) + )); + if($search) { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); diff --git a/mod/editpost.php b/mod/editpost.php index 3b8c112819..0319f200b3 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -36,12 +36,14 @@ function editpost_content(&$a) { $plaintext = false; - $o .= '

' . t('Edit post') . '

'; + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => t('Edit post') + )); $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$ispublic' => ' ', // t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] diff --git a/mod/match.php b/mod/match.php index aa0a69fc95..7773636420 100644 --- a/mod/match.php +++ b/mod/match.php @@ -9,7 +9,9 @@ function match_content(&$a) { $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $o .= '

' . t('Profile Match') . '

'; + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => t('Profile Match') + )); $r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1", intval(local_user()) diff --git a/mod/network.php b/mod/network.php index fafee97c07..7b3c92e249 100644 --- a/mod/network.php +++ b/mod/network.php @@ -55,19 +55,19 @@ function network_init(&$a) { '', //all '', //postord '', //conv - '/new', //new + '/new', //new '', //starred '', //bookmarked '', //spam ); $tab_args = array( 'f=&order=comment', //all - 'f=&order=post', //postord - 'f=&conv=1', //conv - '', //new - 'f=&star=1', //starred - 'f=&bmark=1', //bookmarked - 'f=&spam=1', //spam + 'f=&order=post', //postord + 'f=&conv=1', //conv + '', //new + 'f=&star=1', //starred + 'f=&bmark=1', //bookmarked + 'f=&spam=1', //spam ); $k = array_search('active', $last_sel_tabs); @@ -139,7 +139,9 @@ function network_init(&$a) { // search terms header if(x($_GET,'search')) { - $a->page['content'] .= '

' . t('Search Results For:') . ' ' . $search . '

'; + $a->page['content'] .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('Search Results For: %s'), $search) + )); } $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network',true,$group_id) : ''); @@ -179,11 +181,11 @@ function saved_searches($search) { if(count($r)) { foreach($r as $rr) { $saved[] = array( - 'id' => $rr['id'], - 'term' => $rr['term'], + 'id' => $rr['id'], + 'term' => $rr['term'], 'encodedterm' => urlencode($rr['term']), - 'delete' => t('Remove term'), - 'selected' => ($search==$rr['term']), + 'delete' => t('Remove term'), + 'selected' => ($search==$rr['term']), ); } } @@ -191,10 +193,10 @@ function saved_searches($search) { $tpl = get_markup_template("saved_searches_aside.tpl"); $o = replace_macros($tpl, array( - '$title' => t('Saved Searches'), - '$add' => t('add'), - '$searchbox' => search($search,'netsearch-box',$srchurl,true), - '$saved' => $saved, + '$title' => t('Saved Searches'), + '$add' => t('add'), + '$searchbox' => search($search,'netsearch-box',$srchurl,true), + '$saved' => $saved, )); return $o; @@ -479,10 +481,12 @@ function network_content(&$a, $update = 0) { 'allow_location' => $a->user['allow_location'], 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], - 'lockstate' => ((($group) || ($cid) || ($nets) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), - 'default_perms' => get_acl_permissions($a->user), - 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb), - 'bang' => (($group || $cid || $nets) ? '!' : ''), + 'lockstate'=> ((($group) || ($cid) || ($nets) || (is_array($a->user) && + ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || + (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'), + 'default_perms' => get_acl_permissions($a->user), + 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $a->user), $celeb), + 'bang' => (($group || $cid || $nets) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => local_user(), 'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector @@ -537,25 +541,39 @@ function network_content(&$a, $update = 0) { $contact_str_self = ",".$self[0]["id"]; } else { - $contact_str = ' 0 '; - info( t('Group is empty')); + $contact_str = ' 0 '; + info( t('Group is empty')); } //$sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE (`contact-id` IN ($contact_str) OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 ORDER BY `created` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` "; $sql_extra3 .= " AND `contact-id` IN ($contact_str$contact_str_self) "; - $sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str) OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 AND parent = $sql_table.$sql_parent) "; - $o = '

' . t('Group: ') . $r[0]['name'] . '

' . $o; - } elseif($cid) { + $sql_extra3 .= " AND EXISTS (SELECT id FROM `item` WHERE (`contact-id` IN ($contact_str) + OR `allow_gid` like '".protect_sprintf('%<'.intval($group).'>%')."') and deleted = 0 + AND parent = $sql_table.$sql_parent) "; + + $o = replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('Group: %s'), $r[0]['name']) + )) . $o; + + } + elseif($cid) { $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); if(count($r)) { - $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 ORDER BY `item`.`received` DESC) AS `temp1` ON $sql_table.$sql_parent = `temp1`.`parent` "; + $sql_post_table = " INNER JOIN (SELECT DISTINCT(`parent`) FROM `item` + WHERE 1 $sql_options AND `contact-id` = ".intval($cid)." and deleted = 0 + ORDER BY `item`.`received` DESC) AS `temp1` + ON $sql_table.$sql_parent = `temp1`.`parent` "; $sql_extra = ""; - $o = '

' . t('Contact: ') . $r[0]['name'] . '

' . $o; + + $o = replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => sprintf( t('Contact: %s'), $r[0]['name']) + )) . $o; + if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { notice( t('Private messages to this person are at risk of public disclosure.') . EOL); } diff --git a/mod/search.php b/mod/search.php index 5fc9617850..339efc92db 100644 --- a/mod/search.php +++ b/mod/search.php @@ -15,11 +15,11 @@ function search_saved_searches() { $saved = array(); foreach($r as $rr) { $saved[] = array( - 'id' => $rr['id'], - 'term' => $rr['term'], - 'encodedterm' => urlencode($rr['term']), - 'delete' => t('Remove term'), - 'selected' => ($search==$rr['term']), + 'id' => $rr['id'], + 'term' => $rr['term'], + 'encodedterm' => urlencode($rr['term']), + 'delete' => t('Remove term'), + 'selected' => ($search==$rr['term']), ); } @@ -27,10 +27,10 @@ function search_saved_searches() { $tpl = get_markup_template("saved_searches_aside.tpl"); $o .= replace_macros($tpl, array( - '$title' => t('Saved Searches'), - '$add' => '', - '$searchbox' => '', - '$saved' => $saved, + '$title' => t('Saved Searches'), + '$add' => '', + '$searchbox' => '', + '$saved' => $saved, )); } @@ -177,9 +177,13 @@ function search_content(&$a) { if($tag) - $o .= '

' . sprintf( t('Items tagged with: %s'), $search) . '

'; + $title = sprintf( t('Items tagged with: %s'), $search); else - $o .= '

' . sprintf( t('Search results for: %s'), $search) . '

'; + $title = sprintf( t('Search results for: %s'), $search); + + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => $title + )); logger("Start Conversation for '".$search."'", LOGGER_DEBUG); $o .= conversation($a,$r,'search',false); diff --git a/mod/suggest.php b/mod/suggest.php index af16197a04..e07e933114 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -65,7 +65,9 @@ function suggest_content(&$a) { $a->page['aside'] .= findpeople_widget(); - $o .= '

' . t('Friend Suggestions') . '

'; + $o .= replace_macros(get_markup_template("section_title.tpl"),array( + '$title' => t('Friend Suggestions') + )); $r = suggestion_query(local_user()); diff --git a/view/templates/section_title.tpl b/view/templates/section_title.tpl new file mode 100644 index 0000000000..8614fb883b --- /dev/null +++ b/view/templates/section_title.tpl @@ -0,0 +1,4 @@ +
+

{{$title}}

+
+