MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

backend for delegating forums

Browse source
This commit is contained in:
friendica 2012-01-26 16:52:12 -08:00
parent 10f768630b
commit 167ab537b5
6 changed files with 103 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -9,9 +9,9 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1235' );
define ( 'FRIENDICA_VERSION', '2.3.1236' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1116 );
define ( 'DB_UPDATE_VERSION', 1117 );
define ( 'EOL', "<br />\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

7
database.sql
View file

@ -769,4 +769,11 @@ INDEX ( `twit` ),
INDEX ( `stat` )
) ENGINE = MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `manage` {
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`uid` INT NOT NULL ,
`mid` INT NOT NULL,
INDEX ( `uid` ),
INDEX ( `mid` )
) ENGINE = MyISAM DEFAULT CHARSET=utf8;

23
include/security.php
View file

@ -34,13 +34,30 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$a->timezone = $a->user['timezone'];
}
$r = q("SELECT `uid`,`username` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
dbesc($a->user['password']),
dbesc($a->user['email'])
$master_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))
$master_record = $r[0];
}
$r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s'",
dbesc($master_record['password']),
dbesc($master_record['email'])
);
if(count($r))
$a->identities = $r;
else
$a->identities = array();
$r = q("select `user`.`uid`, `user`.`username`, `user`.`nickname` from manage left join user on manage.mid = user.uid
where `manage`.`uid` = %d",
intval($master_record['uid'])
);
if(count($r))
$a->identities = array_merge($a->identities,$r);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval($_SESSION['uid']));

64
mod/manage.php
View file

@ -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;
$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($a->user['email']),
dbesc($a->user['password'])
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";
}

12
mod/settings.php
View file

@ -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);
@ -404,6 +405,11 @@ function settings_content(&$a) {
return;
}
if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
notice( t('Permission denied.') . EOL );
return;
}
$tabs = array(
array(
'label' => t('Account settings'),

14
update.php
View file

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1116 );
define( 'UPDATE_VERSION' , 1117 );
/**
*
@ -997,3 +997,15 @@ function update_1115() {
ADD INDEX (`moderated`) ");
}
function update_1116() {
q("create table if not exists `manage` {
`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`uid` INT NOT NULL ,
`mid` INT NOT NULL,
INDEX ( `uid` ),
INDEX ( `mid` )
) ENGINE = MYISAM ");
}