Profile::load($a, $which, $profile);
+ $json_info = [
+ 'addr' => $a->profile['addr'],
+ 'nick' => $which,
+ 'guid' => $a->profile['guid'],
+ 'key' => $a->profile['pubkey'],
+ 'homepage' => System::baseUrl()."/profile/{$which}",
+ 'comm' => ($a->profile['account-type'] == ACCOUNT_TYPE_COMMUNITY),
+ ];
+
if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
header('Content-type: application/json; charset=utf-8');
- $json_info = ["hide" => true];
+ $json_info["hide"] = true;
echo json_encode($json_info);
exit;
}
$contactPhoto = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
- $json_info = [
- 'fn' => $a->profile['name'],
- 'addr' => $a->profile['addr'],
- 'nick' => $which,
- 'guid' => $a->profile['guid'],
- 'key' => $a->profile['pubkey'],
- 'homepage' => System::baseUrl()."/profile/{$which}",
- 'comm' => (x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
- 'photo' => $contactPhoto["photo"],
- 'tags' => $keywords
- ];
+ $json_info['fn'] = $a->profile['name'];
+ $json_info['photo'] = $contactPhoto["photo"];
+ $json_info['tags'] = $keywords;
if (is_array($a->profile) && !$a->profile['hide-friends']) {
/// @todo What should this value tell us?
if (!(x($a->page, 'nav'))) {
$a->page['nav'] = '';
}
-
+
$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), []);
-
+
/*
* Placeholder div for popup panel
*/
-
+
$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
-
+
$nav_info = self::getInfo($a);
-
+
/*
* Build the page
*/
-
+
$tpl = get_markup_template('nav.tpl');
-
+
$a->page['nav'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(),
'$sitelocation' => $nav_info['sitelocation'],
'$clear_notifs' => L10n::t('Clear notifications'),
'$search_hint' => L10n::t('@name, !forum, #tags, content')
]);
-
+
Addon::callHooks('page_header', $a->page['nav']);
}
-
+
/**
* Prepares a list of navigation links
*
private static function getInfo(App $a)
{
$ssl_state = ((local_user()) ? true : false);
-
+
/*
* Our network is distributed, and as you visit friends some of the
* sites look exactly the same - it isn't always easy to know where you are.
* Display the current site location as a navigation aid.
*/
-
+
$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
-
+
$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 = [];
-
+
// Display login or logout
$nav['usermenu'] = [];
$userinfo = null;
-
+
if (local_user()) {
$nav['logout'] = ['logout', L10n::t('Logout'), '', L10n::t('End this session')];
-
+
// user menu
$nav['usermenu'][] = ['profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
$nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];
$nav['usermenu'][] = ['videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')];
$nav['usermenu'][] = ['events/', L10n::t('Events'), '', L10n::t('Your events')];
$nav['usermenu'][] = ['notes/', L10n::t('Personal notes'), '', L10n::t('Your personal notes')];
-
+
// user info
$contact = dba::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]);
$userinfo = [
} else {
$nav['login'] = ['login', L10n::t('Login'), ($a->module == 'login' ? 'selected' : ''), L10n::t('Sign in')];
}
-
+
// "Home" should also take you home from an authenticated remote profile connection
$homelink = Profile::getMyURL();
if (! $homelink) {
$homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : '');
}
-
+
if (($a->module != 'home') && (! (local_user()))) {
$nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')];
}
-
+
if (($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) {
$nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')];
}
-
+
$help_url = 'help';
-
+
if (!Config::get('system', 'hide_help')) {
$nav['help'] = [$help_url, L10n::t('Help'), '', L10n::t('Help and documentation')];
}
-
+
if (count($a->apps) > 0) {
$nav['apps'] = ['apps', L10n::t('Apps'), '', L10n::t('Addon applications, utilities, games')];
}
-
+
if (local_user() || !Config::get('system', 'local_search')) {
$nav['search'] = ['search', L10n::t('Search'), '', L10n::t('Search site content')];
-
+
$nav['searchoption'] = [
L10n::t('Full Text'),
L10n::t('Tags'),
L10n::t('Contacts')
];
-
+
if (Config::get('system', 'poco_local_search')) {
$nav['searchoption'][] = L10n::t('Forums');
}
}
-
+
$gdirpath = 'directory';
-
+
if (strlen(Config::get('system', 'singleuser'))) {
$gdir = Config::get('system', 'directory');
if (strlen($gdir)) {
$gdirpath = Profile::zrl($gdir, true);
}
}
-
+
if (local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) {
$nav['community'] = ['community', L10n::t('Community'), '', L10n::t('Conversations on this and other servers')];
}
-
+
if (local_user()) {
$nav['events'] = ['events', L10n::t('Events'), '', L10n::t('Events and Calendar')];
}
-
+
$nav['directory'] = [$gdirpath, L10n::t('Directory'), '', L10n::t('People directory')];
-
+
$nav['about'] = ['friendica', L10n::t('Information'), '', L10n::t('Information about this friendica instance')];
-
+
// The following nav links are only show to logged in users
if (local_user()) {
$nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')];
$nav['net_reset'] = ['network/0?f=&order=comment&nets=all', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')];
-
+
$nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
-
- if (in_array($_SESSION['page_flags'], [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_PRVGROUP])) {
- // only show friend requests for normal pages. Other page types have automatic friendship.
- if (in_array($_SESSION['page_flags'], [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_PRVGROUP])) {
- $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
- }
- if (in_array($_SESSION['page_flags'], [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE])) {
- $nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')];
- $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', ''];
- $nav['notifications']['mark'] = ['', L10n::t('Mark as seen'), '', L10n::t('Mark all system notifications seen')];
- }
+
+ // Don't show notifications for public communities
+ if ($_SESSION['page_flags'] != PAGE_COMMUNITY) {
+ $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
+ $nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')];
+ $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', ''];
+ $nav['notifications']['mark'] = ['', L10n::t('Mark as seen'), '', L10n::t('Mark all system notifications seen')];
}
-
+
$nav['messages'] = ['message', L10n::t('Messages'), '', L10n::t('Private mail')];
$nav['messages']['inbox'] = ['message', L10n::t('Inbox'), '', L10n::t('Inbox')];
$nav['messages']['outbox'] = ['message/sent', L10n::t('Outbox'), '', L10n::t('Outbox')];
$nav['messages']['new'] = ['message/new', L10n::t('New Message'), '', L10n::t('New Message')];
-
+
if (is_array($a->identities) && count($a->identities) > 1) {
$nav['manage'] = ['manage', L10n::t('Manage'), '', L10n::t('Manage other pages')];
}
-
+
$nav['delegations'] = ['delegate', L10n::t('Delegations'), '', L10n::t('Delegate Page Management')];
-
+
$nav['settings'] = ['settings', L10n::t('Settings'), '', L10n::t('Account settings')];
-
+
if (Feature::isEnabled(local_user(), 'multi_profiles')) {
$nav['profiles'] = ['profiles', L10n::t('Profiles'), '', L10n::t('Manage/Edit Profiles')];
}
-
+
$nav['contacts'] = ['contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
}
-
+
// Show the link to the admin configuration page if user is admin
if (is_site_admin()) {
$nav['admin'] = ['admin/', L10n::t('Admin'), '', L10n::t('Site setup and configuration')];
}
-
+
$nav['navigation'] = ['navigation/', L10n::t('Navigation'), '', L10n::t('Site map')];
-
+
// Provide a banner/logo/whatever
$banner = Config::get('system', 'banner');
if (is_null($banner)) {
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
}
-
+
Addon::callHooks('nav_info', $nav);
-
+
return [
'sitelocation' => $sitelocation,
'nav' => $nav,
'userinfo' => $userinfo,
];
}
-
+
/**
* Set a menu item in navbar as selected
*/
// Fetch the data from the gcontact table
if (!DBM::is_result($r)) {
$s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `nurl` = ?", normalise_link($url));
$r = dba::inArray($s);
}
logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
+ // is it a public forum? Private forums aren't exposed with this method
+ $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
+
// The account type is new since 3.5.1
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
if ($accounttype != $importer["contact-type"]) {
dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
}
- }
-
- // is it a public forum? Private forums aren't supported with this method
- // This is deprecated since 3.5.1
- $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
-
- if ($forum != $importer["forum"]) {
+ // A forum contact can either have set "forum" or "prv" - but not both
+ if (($accounttype == ACCOUNT_TYPE_COMMUNITY) && (($forum != $importer["forum"]) || ($forum == $importer["prv"]))) {
+ $condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer["id"]];
+ dba::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+ }
+ } elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1
$condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
dba::update('contact', ['forum' => $forum], $condition);
}
+
// We are processing relocations even if we are ignoring a contact
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
foreach ($relocations as $relocation) {
// Yes, then it is fine.
return true;
// Is it a post to a community?
- } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+ } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
// That's good
return true;
// Is the message a global user or a comment?
Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
- if ($importer["page-flags"] == PAGE_NORMAL) {
+ if (in_array($importer["page-flags"], [PAGE_NORMAL, PAGE_PRVGROUP])) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
$hash = random_string().(string)time(); // Generate a confirm_key
.allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
.directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
.message-content-wrapper, .apps-content-wrapper, .photos-content-wrapper,
-#adminpage, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
+#adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
+.viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
.friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
.profperm-content-wrapper {
min-height: calc(100vh - 150px);
height: 48px;
width: 48px;
}
-
#prvmail-end {
clear:both;
}
+#modal #prvmail-text-edit-bb .bb-img {
+ display: none;
+}
+
/* photos */
.photo-album-actions {
margin-bottom: 10px;
$(".fbrowser .fbswitcher [data-mode=" + FileBrowser.type + "]").addClass("active");\r
// We need to add the AjaxUpload to the button\r
FileBrowser.uploadButtons();\r
- \r
},\r
\r
// Load new content (e.g. change photo album)\r
var jsbrowser = function() {
FileBrowser.init(nickname, type, hash);
};
+ loadScript("view/js/ajaxupload.js");
loadScript("view/theme/frio/js/filebrowser.js", jsbrowser);
};
$('#photo-album-contents').justifiedGallery('norewind').on('jg.complete', function(e){ justifiedGalleryActive = false; });
}
+// Load a js script to the html head.
function loadScript(url, callback) {
- // Adding the script tag to the head as suggested before
+ // Check if the script is already in the html head.
+ var oscript = $('head script[src="' + url + '"]');
+
+ // Delete the old script from head.
+ if (oscript.length > 0) {
+ oscript.remove();
+ }
+ // Adding the script tag to the head as suggested before.
var head = document.getElementsByTagName('head')[0];
var script = document.createElement('script');
script.type = 'text/javascript';
script.onreadystatechange = callback;
script.onload = callback;
- // Fire the loading
+ // Fire the loading.
head.appendChild(script);
}
<script type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
<script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
<?php
- $baseurl = System::baseUrl();
- $frio = "view/theme/frio";
- // Because we use minimal for modals the header and the included js stuff should be only loaded
- // if the page is an standard page (so we don't have it twice for modals)
- //
- /// @todo Think about to move js stuff in the footer
- if (!$minimal && x($page, 'htmlhead')) {
- echo $page['htmlhead'];
- }
- // Add the theme color meta
- // It makes mobile Chrome UI match Frio's top bar color.
- $uid = $a->profile_uid;
- if (is_null($uid)) {
- $uid = Profile::getThemeUid();
- }
- $schema = PConfig::get($uid, 'frio', 'schema');
- if (($schema) && ($schema != '---')) {
- if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
- $schemefile = 'view/theme/frio/schema/' . $schema . '.php';
- require_once $schemefile;
+ $basepath = $a->path ? "/" . $a->path . "/" : "/";
+ $frio = "view/theme/frio";
+
+ // Because we use minimal for modals the header and the included js stuff should be only loaded
+ // if the page is an standard page (so we don't have it twice for modals)
+ //
+ /// @todo Think about to move js stuff in the footer
+ if (!$minimal && x($page, 'htmlhead')) {
+ echo $page['htmlhead'];
}
- } else {
- $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
- }
- if (!$nav_bg) {
- $nav_bg = "#708fa0";
- }
- echo '
- <meta name="theme-color" content="' . $nav_bg . '" />';
-
- $is_singleuser = Config::get('system','singleuser');
- $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
+
+ // Add the theme color meta
+ // It makes mobile Chrome UI match Frio's top bar color.
+ $uid = $a->profile_uid;
+ if (is_null($uid)) {
+ $uid = Profile::getThemeUid();
+ }
+ $schema = PConfig::get($uid, 'frio', 'schema');
+ if (($schema) && ($schema != '---')) {
+ if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
+ $schemefile = 'view/theme/frio/schema/' . $schema . '.php';
+ require_once $schemefile;
+ }
+ } else {
+ $nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
+ }
+ if (!$nav_bg) {
+ $nav_bg = "#708fa0";
+ }
+ echo '
+ <meta name="theme-color" content="' . $nav_bg . '" />';
+
+ $is_singleuser = Config::get('system','singleuser');
+ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
?>
</head>
+
<body id="top" class="mod-<?php echo $a->module." ".$is_singleuser_class;?>">
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
<?php
<div class="container">
<div class="row">
<?php
- if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != "/")) {
- echo '
+ if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
+ echo '
<aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
if (x($page, 'aside')) {
<div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
<section class="sectiontop ';
- echo $a->argv[0];
- echo '-content-wrapper">';
- if (x($page, 'content')) {
- echo $page['content'];
- }
- echo '
- <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
+ echo $a->argv[0];
+ echo '-content-wrapper">';
+ if (x($page, 'content')) {
+ echo $page['content'];
+ }
+ echo '
+ <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
</section>
</div>
';
- } else {
- echo '
+ } else {
+ echo '
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
if (x($page, 'content')) {
echo $page['content'];
echo '
</div>
';
- }
+ }
?>
</div><!--row-->
</div><!-- container -->
{{/if}}
<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
<li>
- <button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+ <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
<i class="fa fa-picture-o"></i>
</button>
</li>
<ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
{{* commented out because it isn't implemented yet
<li>
- <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+ <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
<i class="fa fa-picture-o"></i>
</button>
</li>
<ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
{{* commented out because it isn't implemented yet
<li>
- <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+ <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
<i class="fa fa-picture-o"></i>
</button>
</li>
<ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
<li>
- <button type="button" class="btn-link icon" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
+ <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="input">
<i class="fa fa-picture-o" aria-hidden="true"></i>
</button>
</li>