Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 06:35:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix the nav

Browse source
This commit is contained in:
friendica 2012-09-02 20:57:44 -07:00
parent aff33531ac
commit 7550cd586b
2 changed files with 11 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/nav.php
View file

@ -50,12 +50,11 @@ function nav(&$a) {
$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('events/', t('Events'), "", t('Your events'));
$nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
// user info
// $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->entity['entity_id']));
$userinfo = array(
'icon' => $a->get_baseurl($ssl_state)."/images/person-48.jpg",
'icon' => $a->get_baseurl($ssl_state). $r[0]['micro'],
'name' => $a->identity['entity_name'],
);
@ -114,11 +113,7 @@ function nav(&$a) {
$nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
/* only show friend requests for normal pages. Other page types have automatic friendship. */
// if($_SESSION['page_flags'] == PAGE_NORMAL || $_SESSION['page_flags'] == PAGE_PRVGROUP) {
if($a->identity['entity_pageflags'] == PAGE_NORMAL) {
if($a->identity['entity_pageflags'] == PAGE_NORMAL) {
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
@ -131,9 +126,7 @@ function nav(&$a) {
$nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox'));
$nav['messages']['new'] = array('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'] = array('manage', t('Channel Manager'), "", t('Manage Your Channels'));
$nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
$nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));

91
mod/manage.php
View file

@ -1,85 +1,5 @@
<?php
function manage_post(&$a) {
if(! local_user())
return;
$uid = local_user();
$orig_record = $a->user;
if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
$r = q("select * from user where uid = %d limit 1",
intval($_SESSION['submanage'])
);
if(count($r)) {
$uid = intval($r[0]['uid']);
$orig_record = $r[0];
}
}
$r = q("select * from manage where uid = %d",
intval($uid)
);
$submanage = $r;
$identity = ((x($_POST['identity'])) ? intval($_POST['identity']) : 0);
if(! $identity)
return;
$limited_id = 0;
$original_id = $uid;
if(count($submanage)) {
foreach($submanage as $m) {
if($identity == $m['mid']) {
$limited_id = $m['mid'];
break;
}
}
}
if($limited_id) {
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($limited_id)
);
}
else {
$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `email` = '%s' AND `password` = '%s' LIMIT 1",
intval($identity),
dbesc($orig_record['email']),
dbesc($orig_record['password'])
);
}
if(! count($r))
return;
unset($_SESSION['authenticated']);
unset($_SESSION['uid']);
unset($_SESSION['visitor_id']);
unset($_SESSION['administrator']);
unset($_SESSION['cid']);
unset($_SESSION['theme']);
unset($_SESSION['page_flags']);
unset($_SESSION['return_url']);
if(x($_SESSION,'submanage'))
unset($_SESSION['submanage']);
require_once('include/security.php');
authenticate_success($r[0],true,true);
if($limited_id)
$_SESSION['submanage'] = $original_id;
goaway($a->get_baseurl(true) . '/profile/' . $a->user['nickname']);
// NOTREACHED
}
function manage_content(&$a) {
if(! get_account_id()) {
@ -87,7 +7,7 @@ function manage_content(&$a) {
return;
}
$change_channel = ((argc() > 1) ? intval($argv(1)) : 0);
$change_channel = ((argc() > 1) ? intval(argv(1)) : 0);
if($change_channel) {
$r = q("select * from entity where entity_id = %d and entity_account_id = %d limit 1",
intval($change_channel),
@ -99,6 +19,9 @@ function manage_content(&$a) {
$_SESSION['theme'] = $r[0]['entity_theme'];
date_default_timezone_set($r[0]['entity_timezone']);
}
if($r[0]['entity_startpage'])
goaway(z_root() . '/' . $r[0]['entity_startpage']);
goaway(z_root());
}
@ -123,9 +46,9 @@ function manage_content(&$a) {
$o = replace_macros(get_markup_template('channels.tpl'), array(
'$header' => t('Manage Channels'),
'$desc' => t('These are your Profile Channels. Select any Profile Channel to attach and make that the current channel.'),
'$links' => $links,
'$header' => t('Channel Manager'),
'$desc' => t('Attach to one of your channels by selecting it.'),
'$links' => $links,
'$all_channels' => $channels,
));