keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch identities to manage pages

Browse source
This commit is contained in:
Friendika 2011-03-01 20:18:47 -08:00
parent 5ff1462e1e
commit 377f991ac5
6 changed files with 60 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
boot.php
View file

@ -197,6 +197,7 @@ class App {
public $interactive = true;
public $plugins;
public $apps;
public $identities;
private $scheme;
private $hostname;

17
include/auth.php
View file

@ -61,6 +61,13 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
$r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
dbesc($a->user['password']),
dbesc($a->user['email'])
);
if(count($r))
$a->identities = $r;
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
if(count($r)) {
@ -192,7 +199,15 @@ else {
$a->timezone = $a->user['timezone'];
}
$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
$r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
dbesc($a->user['password']),
dbesc($a->user['email'])
);
if(count($r))
$a->identities = $r;
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
if(count($r)) {
$a->contact = $r[0];

7
include/nav.php
View file

@ -25,7 +25,9 @@ function nav(&$a) {
*
*/
$a->page['nav'] .= '<div id="site-location">' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
$a->page['nav'] .= '<div id="site-location">' . $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
/**
@ -98,6 +100,9 @@ function nav(&$a) {
$a->page['nav'] .= '<a id="nav-messages-link" class="nav-commlink" href="message">' . t('Messages')
. '</a><span id="mail-update" class="nav-ajax-left"></span>' . "\r\n";
if(is_array($a->identities) && count($a->identities) > 1) {
$a->page['nav'] .= '<a id="nav-manage-link" class="nav-commlink" href="manage">' . t('Manage') . '</a>' . "\r\n";
}
$a->page['nav'] .= '<a id="nav-settings-link" class="nav-link" href="settings">' . t('Settings') . "</a>\r\n";

12
mod/openid.php
View file

@ -78,8 +78,16 @@ function openid_content(&$a) {
$a->timezone = $a->user['timezone'];
}
$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));
$r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
dbesc($a->user['password']),
dbesc($a->user['email'])
);
if(count($r))
$a->identities = $r;
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid'])
);
if(count($r)) {
$a->contact = $r[0];
$a->cid = $r[0]['id'];

13
view/theme/duepuntozero/style.css
View file

@ -2040,3 +2040,16 @@ a.mail-list-link {
margin: 10px;
}
#identity-manage-desc {
margin-top:15px;
margin-bottom: 15px;
}
#identity-manage-choose {
margin-bottom: 15px;
}
#identity-submit {
margin-top: 20px;
}

14
view/theme/loozah/style.css
View file

@ -2086,3 +2086,17 @@ a.mail-list-link {
margin: 10px;
}
#identity-manage-desc {
margin-top:15px;
margin-bottom: 15px;
}
#identity-manage-choose {
margin-bottom: 15px;
}
#identity-submit {
margin-top: 20px;
}