diff options
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/manage.php | 70 | ||||
| -rwxr-xr-x | mod/settings.php | 12 |
2 files changed, 61 insertions, 21 deletions
diff --git a/mod/manage.php b/mod/manage.php index 41ec81129..ec4dcd8a0 100755 --- a/mod/manage.php +++ b/mod/manage.php @@ -3,18 +3,56 @@ function manage_post(&$a) { - if(! local_user() || ! is_array($a->identities)) + 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; - $r = q("SELECT * FROM `user` WHERE `uid` = %d AND `email` = '%s' AND `password` = '%s' LIMIT 1", - intval($identity), - dbesc($a->user['email']), - dbesc($a->user['password']) - ); + $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; @@ -27,11 +65,15 @@ function manage_post(&$a) { 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() . '/profile/' . $a->user['nickname']); // NOTREACHED } @@ -40,23 +82,15 @@ function manage_post(&$a) { function manage_content(&$a) { - if(! local_user() || ! is_array($a->identities)) { + if(! local_user()) { notice( t('Permission denied.') . EOL); return; } - $r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s'", - dbesc($a->user['email']), - dbesc($a->user['password']) - ); - if(! count($r)) - return; - - $o = '<h3>' . t('Manage Identities and/or Pages') . '</h3>'; - $o .= '<div id="identity-manage-desc">' . t("\x28Toggle between different identities or community/group pages which share your account details.\x29") . '</div>'; + $o .= '<div id="identity-manage-desc">' . t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions') . '</div>'; $o .= '<div id="identity-manage-choose">' . t('Select an identity to manage: ') . '</div>'; @@ -64,7 +98,7 @@ function manage_content(&$a) { $o .= '<form action="manage" method="post" >' . "\r\n"; $o .= '<select name="identity" size="4">' . "\r\n"; - foreach($r as $rr) { + foreach($a->identities as $rr) { $selected = (($rr['nickname'] === $a->user['nickname']) ? ' selected="selected" ' : ''); $o .= '<option ' . $selected . 'value="' . $rr['uid'] . '">' . $rr['username'] . ' (' . $rr['nickname'] . ')</option>' . "\r\n"; } diff --git a/mod/settings.php b/mod/settings.php index 8ca0bb7f8..c61d5c227 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -39,10 +39,11 @@ EOT; function settings_post(&$a) { - if(! local_user()) { - notice( t('Permission denied.') . EOL); + if(! local_user()) + return; + + if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) return; - } if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { notice( t('Permission denied.') . EOL); @@ -403,6 +404,11 @@ function settings_content(&$a) { notice( t('Permission denied.') . EOL ); return; } + + if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) { + notice( t('Permission denied.') . EOL ); + return; + } $tabs = array( array( |