From 36d891bcadd3cc49a352289d4a95da82cfff4ca7 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 14:51:56 -0500 Subject: [PATCH] Update functions and calls Update function names and scope. update calls. --- boot.php | 1 - index.php | 5 +- mod/cal.php | 5 +- mod/community.php | 7 +- mod/contacts.php | 3 +- mod/directory.php | 3 +- mod/events.php | 5 +- mod/help.php | 7 +- mod/message.php | 3 +- mod/network.php | 5 +- mod/notes.php | 3 +- mod/notifications.php | 7 +- mod/photos.php | 3 +- mod/profile.php | 3 +- mod/profiles.php | 3 +- mod/search.php | 3 +- mod/settings.php | 3 +- mod/videos.php | 3 +- mod/viewcontacts.php | 3 +- src/Content/Nav.php | 144 ++++++++++++++++++++++-------------------- 20 files changed, 122 insertions(+), 97 deletions(-) diff --git a/boot.php b/boot.php index 2fe73bc81..b529131bb 100644 --- a/boot.php +++ b/boot.php @@ -36,7 +36,6 @@ require_once 'include/plugin.php'; require_once 'include/text.php'; require_once 'include/datetime.php'; require_once 'include/pgettext.php'; -require_once 'include/nav.php'; define('FRIENDICA_PLATFORM', 'Friendica'); define('FRIENDICA_CODENAME', 'Asparagus'); diff --git a/index.php b/index.php index 74a88eb7e..e62d4e362 100644 --- a/index.php +++ b/index.php @@ -10,6 +10,7 @@ use Friendica\App; use Friendica\BaseObject; +use Friendica\Content\Nav; use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Core\Worker; @@ -192,7 +193,7 @@ if ($install && $a->module!="view") { check_plugins($a); } -nav_set_selected('nothing'); +Nav::setSelected('nothing'); //Don't populate apps_menu if apps are private $privateapps = Config::get('config', 'private_addons'); @@ -426,7 +427,7 @@ call_hooks('page_end', $a->page['content']); * Add the navigation (menu) template */ if ($a->module != 'install' && $a->module != 'maintenance') { - nav($a); + Nav::build($a); } /* diff --git a/mod/cal.php b/mod/cal.php index 31ab5976b..6a8c466db 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -7,6 +7,7 @@ */ use Friendica\App; use Friendica\Content\Feature; +use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Database\DBM; @@ -27,7 +28,7 @@ function cal_init(App $a) return; } - nav_set_selected('events'); + Nav::setSelected('events'); if ($a->argc > 1) { $nick = $a->argv[1]; @@ -74,7 +75,7 @@ function cal_init(App $a) function cal_content(App $a) { - nav_set_selected('events'); + Nav::setSelected('events'); // get the translation strings for the callendar $i18n = get_event_strings(); diff --git a/mod/community.php b/mod/community.php index 4b755e18c..64a86f07e 100644 --- a/mod/community.php +++ b/mod/community.php @@ -1,6 +1,9 @@ $tabs)); - nav_set_selected('community'); + Nav::setSelected('community'); // We need the editor here to be able to reshare an item. if (local_user()) { diff --git a/mod/contacts.php b/mod/contacts.php index 7089cf05a..afa56b87f 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -4,6 +4,7 @@ */ use Friendica\App; use Friendica\Content\ContactSelector; +use Friendica\Content\Nav; use Friendica\Content\Widget; use Friendica\Core\System; use Friendica\Core\Worker; @@ -369,7 +370,7 @@ function contacts_content(App $a) { $sort_type = 0; $o = ''; - nav_set_selected('contacts'); + Nav::setSelected('contacts'); if (!local_user()) { notice(t('Permission denied.') . EOL); diff --git a/mod/directory.php b/mod/directory.php index a711f7231..02390f080 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -3,6 +3,7 @@ * @file mod/directory.php */ use Friendica\App; +use Friendica\Content\Nav; use Friendica\Content\Widget; use Friendica\Core\Config; use Friendica\Database\DBM; @@ -37,7 +38,7 @@ function directory_content(App $a) { } $o = ''; - nav_set_selected('directory'); + Nav::setSelected('directory'); if(x($a->data,'search')) $search = notags(trim($a->data['search'])); diff --git a/mod/events.php b/mod/events.php index b64b6a134..79db31d20 100644 --- a/mod/events.php +++ b/mod/events.php @@ -4,6 +4,7 @@ * @brief The events module */ use Friendica\App; +use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; @@ -212,9 +213,9 @@ function events_content(App $a) { } if ($a->theme_events_in_profile) { - nav_set_selected('home'); + Nav::setSelected('home'); } else { - nav_set_selected('events'); + Nav::setSelected('events'); } // get the translation strings for the callendar diff --git a/mod/help.php b/mod/help.php index 65221165f..399b7768b 100644 --- a/mod/help.php +++ b/mod/help.php @@ -1,6 +1,9 @@ true, @@ -575,7 +576,7 @@ function networkThreadedView(App $a, $update = 0) { } } - nav_set_selected('network'); + Nav::setSelected('network'); $content = ""; diff --git a/mod/notes.php b/mod/notes.php index dbf84337e..8637265fc 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -3,6 +3,7 @@ * @file mod/notes.php */ use Friendica\App; +use Friendica\Content\Nav; use Friendica\Database\DBM; use Friendica\Model\Profile; @@ -16,7 +17,7 @@ function notes_init(App $a) { $which = $a->user['nickname']; - nav_set_selected('home'); + Nav::setSelected('home'); //Profile::load($a, $which, $profile); diff --git a/mod/notifications.php b/mod/notifications.php index e2de81e6c..100170010 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -5,6 +5,7 @@ */ use Friendica\App; use Friendica\Content\ContactSelector; +use Friendica\Content\Nav; use Friendica\Core\NotificationsManager; use Friendica\Core\System; use Friendica\Database\DBM; @@ -77,7 +78,7 @@ function notifications_content(App $a) { $page = (x($_REQUEST,'page') ? $_REQUEST['page'] : 1); $show = (x($_REQUEST,'show') ? $_REQUEST['show'] : 0); - nav_set_selected('notifications'); + Nav::setSelected('notifications'); $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false); @@ -93,8 +94,8 @@ function notifications_content(App $a) { $startrec = ($page * $perpage) - $perpage; // Get introductions - if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { - nav_set_selected('introductions'); + if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) { + Nav::setSelected('introductions'); $notif_header = t('Notifications'); $all = (($a->argc > 2) && ($a->argv[2] == 'all')); diff --git a/mod/photos.php b/mod/photos.php index ac1f06f8e..a8345a74e 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -4,6 +4,7 @@ */ use Friendica\App; use Friendica\Content\Feature; +use Friendica\Content\Nav; use Friendica\Core\System; use Friendica\Core\Config; use Friendica\Core\Worker; @@ -33,7 +34,7 @@ function photos_init(App $a) { return; } - nav_set_selected('home'); + Nav::setSelected('home'); if ($a->argc > 1) { $nick = $a->argv[1]; diff --git a/mod/profile.php b/mod/profile.php index 77f8e069d..765abc9c4 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -4,6 +4,7 @@ */ use Friendica\App; use Friendica\Content\Widget; +use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\System; @@ -125,7 +126,7 @@ function profile_content(App $a, $update = 0) // Ensure we've got a profile owner if updating. $a->profile['profile_uid'] = $update; } elseif ($a->profile['profile_uid'] == local_user()) { - nav_set_selected('home'); + Nav::setSelected('home'); } $contact = null; diff --git a/mod/profiles.php b/mod/profiles.php index 5fcd2d8f1..f65341440 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -5,6 +5,7 @@ use Friendica\App; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; +use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Core\PConfig; use Friendica\Core\System; @@ -16,7 +17,7 @@ use Friendica\Network\Probe; function profiles_init(App $a) { - nav_set_selected('profiles'); + Nav::setSelected('profiles'); if (! local_user()) { return; diff --git a/mod/search.php b/mod/search.php index c17b11c5d..fe33340df 100644 --- a/mod/search.php +++ b/mod/search.php @@ -4,6 +4,7 @@ */ use Friendica\App; use Friendica\Content\Feature; +use Friendica\Content\Nav; use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Database\DBM; @@ -132,7 +133,7 @@ function search_content(App $a) { Cache::set("remote_search:".$remote, json_encode(array("time" => time(), "accesses" => 1)), CACHE_HOUR); } - nav_set_selected('search'); + Nav::setSelected('search'); if (x($a->data,'search')) $search = notags(trim($a->data['search'])); diff --git a/mod/settings.php b/mod/settings.php index 8fd890804..951da8620 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -4,6 +4,7 @@ */ use Friendica\App; use Friendica\Content\Feature; +use Friendica\Content\Nav; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Core\Config; @@ -654,7 +655,7 @@ function settings_post(App $a) function settings_content(App $a) { $o = ''; - nav_set_selected('settings'); + Nav::setSelected('settings'); if (!local_user()) { //notice(t('Permission denied.') . EOL); diff --git a/mod/videos.php b/mod/videos.php index 1a9f57a39..153bca187 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -3,6 +3,7 @@ * @file mod/videos.php */ use Friendica\App; +use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; @@ -26,7 +27,7 @@ function videos_init(App $a) { return; } - nav_set_selected('home'); + Nav::setSelected('home'); $o = ''; diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index 64dd24e16..17913a508 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -4,6 +4,7 @@ */ use Friendica\App; use Friendica\Content\ContactSelector; +use Friendica\Content\Nav; use Friendica\Core\Config; use Friendica\Database\DBM; use Friendica\Model\Contact; @@ -15,7 +16,7 @@ function viewcontacts_init(App $a) { return; } - nav_set_selected('home'); + Nav::setSelected('home'); if($a->argc > 1) { $nick = $a->argv[1]; diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 20ae440b1..8445d827f 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -11,21 +11,22 @@ use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Profile; +require_once 'boot.php'; +require_once 'include/pgettext.php'; +require_once 'include/text.php'; + class Nav { - function nav(App $a) + /** + * Build page header and site navigation bars + */ + public static function build(App $a) { - /* - * - * Build page header and site navigation bars - * - */ - if (!(x($a->page, 'nav'))) { $a->page['nav'] = ''; } - $a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array()); + $a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), []); /* * Placeholder div for popup panel @@ -33,7 +34,7 @@ class Nav $a->page['nav'] .= '' ; - $nav_info = nav_info($a); + $nav_info = self::getInfo($a); /* * Build the page @@ -41,25 +42,28 @@ class Nav $tpl = get_markup_template('nav.tpl'); - $a->page['nav'] .= replace_macros($tpl, array( - '$baseurl' => System::baseUrl(), - '$sitelocation' => $nav_info['sitelocation'], - '$nav' => $nav_info['nav'], - '$banner' => $nav_info['banner'], - '$emptynotifications' => t('Nothing new here'), - '$userinfo' => $nav_info['userinfo'], - '$sel' => $a->nav_sel, - '$apps' => $a->apps, - '$clear_notifs' => t('Clear notifications'), - '$search_hint' => t('@name, !forum, #tags, content') - )); + $a->page['nav'] .= replace_macros($tpl, + [ + '$baseurl' => System::baseUrl(), + '$sitelocation' => $nav_info['sitelocation'], + '$nav' => $nav_info['nav'], + '$banner' => $nav_info['banner'], + '$emptynotifications' => t('Nothing new here'), + '$userinfo' => $nav_info['userinfo'], + '$sel' => $a->nav_sel, + '$apps' => $a->apps, + '$clear_notifs' => t('Clear notifications'), + '$search_hint' => t('@name, !forum, #tags, content') + ] + ); call_hooks('page_header', $a->page['nav']); } /** - * @brief Prepares a list of navigation links + * Prepares a list of navigation links * + * @brief Prepares a list of navigation links * @param App $a * @return array Navigation links * string 'sitelocation' => The webbie (username@site.com) @@ -67,7 +71,7 @@ class Nav * string 'banner' => Formatted html link with banner image * array 'userinfo' => Array of user information (name, icon) */ - function nav_info(App $a) + private static function getInfo(App $a) { $ssl_state = ((local_user()) ? true : false); @@ -82,31 +86,31 @@ class Nav $sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2); // nav links: array of array('href', 'text', 'extra css classes', 'title') - $nav = array(); + $nav = []; // Display login or logout - $nav['usermenu'] = array(); + $nav['usermenu'] = []; $userinfo = null; if (local_user()) { - $nav['logout'] = array('logout', t('Logout'), '', t('End this session')); + $nav['logout'] = ['logout', t('Logout'), '', t('End this session')]; // user menu - $nav['usermenu'][] = array('profile/' . $a->user['nickname'], t('Status'), '', t('Your posts and conversations')); - $nav['usermenu'][] = array('profile/' . $a->user['nickname'] . '?tab=profile', t('Profile'), '', t('Your profile page')); - $nav['usermenu'][] = array('photos/' . $a->user['nickname'], t('Photos'), '', t('Your photos')); - $nav['usermenu'][] = array('videos/' . $a->user['nickname'], t('Videos'), '', t('Your videos')); - $nav['usermenu'][] = array('events/', t('Events'), '', t('Your events')); - $nav['usermenu'][] = array('notes/', t('Personal notes'), '', t('Your personal notes')); + $nav['usermenu'][] = ['profile/' . $a->user['nickname'], t('Status'), '', t('Your posts and conversations')]; + $nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '?tab=profile', t('Profile'), '', t('Your profile page')]; + $nav['usermenu'][] = ['photos/' . $a->user['nickname'], t('Photos'), '', t('Your photos')]; + $nav['usermenu'][] = ['videos/' . $a->user['nickname'], t('Videos'), '', t('Your videos')]; + $nav['usermenu'][] = ['events/', t('Events'), '', t('Your events')]; + $nav['usermenu'][] = ['notes/', t('Personal notes'), '', t('Your personal notes')]; // user info $contact = dba::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]); - $userinfo = array( + $userinfo = [ 'icon' => (DBM::is_result($contact) ? $a->remove_baseurl($contact['micro']) : 'images/person-48.jpg'), 'name' => $a->user['username'], - ); + ]; } else { - $nav['login'] = array('login', t('Login'), ($a->module == 'login' ? 'selected' : ''), t('Sign in')); + $nav['login'] = ['login', t('Login'), ($a->module == 'login' ? 'selected' : ''), t('Sign in')]; } // "Home" should also take you home from an authenticated remote profile connection @@ -116,30 +120,31 @@ class Nav } if (($a->module != 'home') && (! (local_user()))) { - $nav['home'] = array($homelink, t('Home'), '', t('Home Page')); + $nav['home'] = [$homelink, t('Home'), '', t('Home Page')]; } if (($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) { - $nav['register'] = array('register', t('Register'), '', t('Create an account')); + $nav['register'] = ['register', t('Register'), '', t('Create an account')]; } $help_url = 'help'; if (!Config::get('system', 'hide_help')) { - $nav['help'] = array($help_url, t('Help'), '', t('Help and documentation')); + $nav['help'] = [$help_url, t('Help'), '', t('Help and documentation')]; } if (count($a->apps) > 0) { - $nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games')); + $nav['apps'] = ['apps', t('Apps'), '', t('Addon applications, utilities, games')]; } if (local_user() || !Config::get('system', 'local_search')) { - $nav['search'] = array('search', t('Search'), '', t('Search site content')); + $nav['search'] = ['search', t('Search'), '', t('Search site content')]; - $nav['searchoption'] = array( + $nav['searchoption'] = [ t('Full Text'), t('Tags'), - t('Contacts')); + t('Contacts') + ]; if (Config::get('system', 'poco_local_search')) { $nav['searchoption'][] = t('Forums'); @@ -156,23 +161,23 @@ class Nav } if (local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) { - $nav['community'] = array('community', t('Community'), '', t('Conversations on this and other servers')); + $nav['community'] = ['community', t('Community'), '', t('Conversations on this and other servers')]; } if (local_user()) { - $nav['events'] = array('events', t('Events'), '', t('Events and Calendar')); + $nav['events'] = ['events', t('Events'), '', t('Events and Calendar')]; } - $nav['directory'] = array($gdirpath, t('Directory'), '', t('People directory')); + $nav['directory'] = [$gdirpath, t('Directory'), '', t('People directory')]; - $nav['about'] = array('friendica', t('Information'), '', t('Information about this friendica instance')); + $nav['about'] = ['friendica', t('Information'), '', t('Information about this friendica instance')]; // The following nav links are only show to logged in users if (local_user()) { - $nav['network'] = array('network', t('Network'), '', t('Conversations from your friends')); - $nav['net_reset'] = array('network/0?f=&order=comment&nets=all', t('Network Reset'), '', t('Load Network page with no filters')); + $nav['network'] = ['network', t('Network'), '', t('Conversations from your friends')]; + $nav['net_reset'] = ['network/0?f=&order=comment&nets=all', t('Network Reset'), '', t('Load Network page with no filters')]; - $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), '', t('Your posts and conversations')); + $nav['home'] = ['profile/' . $a->user['nickname'], t('Home'), '', t('Your posts and conversations')]; if (in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_PRVGROUP))) { // only show friend requests for normal pages. Other page types have automatic friendship. @@ -180,38 +185,38 @@ class Nav $nav['introductions'] = array('notifications/intros', t('Introductions'), '', t('Friend Requests')); } if (in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) { - $nav['notifications'] = array('notifications', t('Notifications'), '', t('Notifications')); - $nav['notifications']['all'] = array('notifications/system', t('See all notifications'), '', ''); - $nav['notifications']['mark'] = array('', t('Mark as seen'), '', t('Mark all system notifications seen')); + $nav['notifications'] = ['notifications', t('Notifications'), '', t('Notifications')]; + $nav['notifications']['all'] = ['notifications/system', t('See all notifications'), '', '']; + $nav['notifications']['mark'] = ['', t('Mark as seen'), '', t('Mark all system notifications seen')]; } } - $nav['messages'] = array('message', t('Messages'), '', t('Private mail')); - $nav['messages']['inbox'] = array('message', t('Inbox'), '', t('Inbox')); - $nav['messages']['outbox'] = array('message/sent', t('Outbox'), '', t('Outbox')); - $nav['messages']['new'] = array('message/new', t('New Message'), '', t('New Message')); + $nav['messages'] = ['message', t('Messages'), '', t('Private mail')]; + $nav['messages']['inbox'] = ['message', t('Inbox'), '', t('Inbox')]; + $nav['messages']['outbox'] = ['message/sent', t('Outbox'), '', t('Outbox')]; + $nav['messages']['new'] = ['message/new', t('New Message'), '', t('New Message')]; if (is_array($a->identities) && count($a->identities) > 1) { - $nav['manage'] = array('manage', t('Manage'), '', t('Manage other pages')); + $nav['manage'] = ['manage', t('Manage'), '', t('Manage other pages')]; } - $nav['delegations'] = array('delegate', t('Delegations'), '', t('Delegate Page Management')); + $nav['delegations'] = ['delegate', t('Delegations'), '', t('Delegate Page Management')]; - $nav['settings'] = array('settings', t('Settings'), '', t('Account settings')); + $nav['settings'] = ['settings', t('Settings'), '', t('Account settings')]; if (Feature::isEnabled(local_user(), 'multi_profiles')) { - $nav['profiles'] = array('profiles', t('Profiles'), '', t('Manage/Edit Profiles')); + $nav['profiles'] = ['profiles', t('Profiles'), '', t('Manage/Edit Profiles')]; } - $nav['contacts'] = array('contacts', t('Contacts'), '', t('Manage/edit friends and contacts')); + $nav['contacts'] = ['contacts', t('Contacts'), '', t('Manage/edit friends and contacts')]; } // Show the link to the admin configuration page if user is admin if (is_site_admin()) { - $nav['admin'] = array('admin/', t('Admin'), '', t('Site setup and configuration')); + $nav['admin'] = ['admin/', t('Admin'), '', t('Site setup and configuration')]; } - $nav['navigation'] = array('navigation/', t('Navigation'), '', t('Site map')); + $nav['navigation'] = ['navigation/', t('Navigation'), '', t('Site map')]; // Provide a banner/logo/whatever $banner = Config::get('system', 'banner'); @@ -221,22 +226,21 @@ class Nav call_hooks('nav_info', $nav); - return array( + return [ 'sitelocation' => $sitelocation, 'nav' => $nav, 'banner' => $banner, 'userinfo' => $userinfo, - ); + ]; } /** * Set a menu item in navbar as selected - * */ - function nav_set_selected($item) + public static function setSelected($item) { $a = get_app(); - $a->nav_sel = array( + $a->nav_sel = [ 'global' => null, 'community' => null, 'network' => null, @@ -250,8 +254,8 @@ class Nav 'contacts' => null, 'manage' => null, 'events' => null, - 'register' => null, - ); + 'register' => null + ]; $a->nav_sel[$item] = 'selected'; } }