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

Merge pull request #7636 from annando/manage

Browse source 
Restructured "manage" functionality, added count parameters
This commit is contained in:
Hypolite Petovan 2019-09-30 11:12:46 -04:00 committed by GitHub
commit 185f1fc687
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
mod/manage.php
View file

@ -12,7 +12,7 @@ use Friendica\Database\DBA;
function manage_post(App $a) { function manage_post(App $a) {
if (! local_user()) { if (!local_user()) {
return; return;
} }
@ -20,21 +20,13 @@ function manage_post(App $a) {
$orig_record = $a->user; $orig_record = $a->user;
if(!empty($_SESSION['submanage'])) { if(!empty($_SESSION['submanage'])) {
$r = q("select * from user where uid = %d limit 1", $user = DBA::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
intval($_SESSION['submanage']) if (DBA::isResult($user)) {
); $uid = intval($user['uid']);
if (DBA::isResult($r)) { $orig_record = $user;
$uid = intval($r[0]['uid']);
$orig_record = $r[0];
} }
} }
$r = q("SELECT * FROM `manage` WHERE `uid` = %d",
intval($uid)
);
$submanage = $r;
$identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0); $identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0);
if (!$identity) { if (!$identity) {
return; return;
@ -43,53 +35,41 @@ function manage_post(App $a) {
$limited_id = 0; $limited_id = 0;
$original_id = $uid; $original_id = $uid;
if (DBA::isResult($submanage)) { $manage = DBA::select('manage', ['mid'], ['uid' => $uid]);
foreach ($submanage as $m) { while ($m = DBA::fetch($manage)) {
if ($identity == $m['mid']) { if ($identity == $m['mid']) {
$limited_id = $m['mid']; $limited_id = $m['mid'];
break; break;
} }
} }
} DBA::close($manage);
if ($limited_id) { if ($limited_id) {
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $user = DBA::selectFirst('user', [], ['uid' => $limited_id]);
intval($limited_id)
);
} else { } else {
// Check if the target user is one of our children // Check if the target user is one of our children
$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `parent-uid` = %d LIMIT 1", $user = DBA::selectFirst('user', [], ['uid' => $identity, 'parent-uid' => $orig_record['uid']]);
intval($identity),
DBA::escape($orig_record['uid'])
);
// Check if the target user is one of our siblings // Check if the target user is one of our siblings
if (!DBA::isResult($r) && ($orig_record['parent-uid'] != 0)) { if (!DBA::isResult($user) && ($orig_record['parent-uid'] != 0)) {
$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `parent-uid` = %d LIMIT 1", $user = DBA::selectFirst('user', [], ['uid' => $identity, 'parent-uid' => $orig_record['parent-uid']]);
intval($identity),
DBA::escape($orig_record['parent-uid'])
);
} }
// Check if it's our parent // Check if it's our parent
if (!DBA::isResult($r) && ($orig_record['parent-uid'] != 0) && ($orig_record['parent-uid'] == $identity)) { if (!DBA::isResult($user) && ($orig_record['parent-uid'] != 0) && ($orig_record['parent-uid'] == $identity)) {
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $user = DBA::selectFirst('user', [], ['uid' => $identity]);
intval($identity)
);
} }
// Finally check if it's out own user // Finally check if it's out own user
if (!DBA::isResult($r) && ($orig_record['uid'] != 0) && ($orig_record['uid'] == $identity)) { if (!DBA::isResult($user) && ($orig_record['uid'] != 0) && ($orig_record['uid'] == $identity)) {
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $user = DBA::selectFirst('user', [], ['uid' => $identity]);
intval($identity)
);
}
} }
if (!DBA::isResult($r)) { }
if (!DBA::isResult($user)) {
return; return;
} }
unset($_SESSION['authenticated']); unset($_SESSION['authenticated']);
unset($_SESSION['uid']); unset($_SESSION['uid']);
unset($_SESSION['visitor_id']); unset($_SESSION['visitor_id']);
@ -109,24 +89,22 @@ function manage_post(App $a) {
unset($_SESSION['sysmsg_info']); unset($_SESSION['sysmsg_info']);
} }
Session::setAuthenticatedForUser($a, $r[0], true, true); Session::setAuthenticatedForUser($a, $user, true, true);
if ($limited_id) { if ($limited_id) {
$_SESSION['submanage'] = $original_id; $_SESSION['submanage'] = $original_id;
} }
$ret = []; $ret = [];
Hook::callAll('home_init',$ret); Hook::callAll('home_init', $ret);
$a->internalRedirect('profile/' . $a->user['nickname'] ); $a->internalRedirect('profile/' . $a->user['nickname']);
// NOTREACHED // NOTREACHED
} }
function manage_content(App $a) { function manage_content(App $a) {
if (! local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
return; return;
} }
@ -140,37 +118,24 @@ function manage_content(App $a) {
$identities = $a->identities; $identities = $a->identities;
//getting additinal information for each identity //getting additinal information for each identity
foreach ($identities as $key=>$id) { foreach ($identities as $key => $id) {
$thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = '%s' AND `self` = 1", $thumb = DBA::selectFirst('contact', ['thumb'], ['uid' => $id['uid'] , 'self' => true]);
DBA::escape($id['uid']) if (!DBA::isResult($thumb)) {
); continue;
}
$identities[$key]['thumb'] = $thumb[0]['thumb']; $identities[$key]['thumb'] = $thumb['thumb'];
$identities[$key]['selected'] = ($id['nickname'] === $a->user['nickname']); $identities[$key]['selected'] = ($id['nickname'] === $a->user['nickname']);
$notifications = 0; $condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $id['uid'], NOTIFY_INTRO, NOTIFY_MAIL];
$params = ['distinct' => true, 'expression' => 'parent'];
$notifications = DBA::count('notify', $condition, $params);
$r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))", $params = ['distinct' => true, 'expression' => 'convid'];
intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL)); $notifications += DBA::count('mail', ['uid' => $id['uid'], 'seen' => false], $params);
if (DBA::isResult($r)) { $notifications += DBA::count('intro', ['blocked' => false, 'ignore' => false, 'uid' => $id['uid']]);
$notifications = sizeof($r);
}
$r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
intval($id['uid']));
if (DBA::isResult($r)) {
$notifications = $notifications + sizeof($r);
}
$r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
intval($id['uid']));
if (DBA::isResult($r)) {
$notifications = $notifications + $r[0]["introductions"];
}
$identities[$key]['notifications'] = $notifications; $identities[$key]['notifications'] = $notifications;
} }

5
src/Database/DBA.php
View file

@ -449,6 +449,7 @@ class DBA extends BaseObject
* *
* @param string|array $table Table name or array [schema => table] * @param string|array $table Table name or array [schema => table]
* @param array $condition array of fields for condition * @param array $condition array of fields for condition
* @param array $params Array of several parameters
* *
* @return int * @return int
* *
@ -462,9 +463,9 @@ class DBA extends BaseObject
* $count = DBA::count($table, $condition); * $count = DBA::count($table, $condition);
* @throws \Exception * @throws \Exception
*/ */
public static function count($table, array $condition = []) public static function count($table, array $condition = [], array $params = [])
{ {
return self::getClass(Database::class)->count($table, $condition); return self::getClass(Database::class)->count($table, $condition, $params);
} }
/** /**

13
src/Database/Database.php
View file

@ -1470,6 +1470,7 @@ class Database
* *
* @param string|array $table Table name or array [schema => table] * @param string|array $table Table name or array [schema => table]
* @param array $condition Array of fields for condition * @param array $condition Array of fields for condition
* @param array $params Array of several parameters
* *
* @return int * @return int
* *
@ -1483,7 +1484,7 @@ class Database
* $count = DBA::count($table, $condition); * $count = DBA::count($table, $condition);
* @throws \Exception * @throws \Exception
*/ */
public function count($table, array $condition = []) public function count($table, array $condition = [], array $params = [])
{ {
if (empty($table)) { if (empty($table)) {
return false; return false;
@ -1493,7 +1494,15 @@ class Database
$condition_string = DBA::buildCondition($condition); $condition_string = DBA::buildCondition($condition);
$sql = "SELECT COUNT(*) AS `count` FROM " . $table_string . $condition_string; if (empty($params['expression'])) {
$expression = '*';
} elseif (!empty($params['distinct'])) {
$expression = "DISTINCT " . DBA::quoteIdentifier($params['expression']);
} else {
$expression = DBA::quoteIdentifier($params['expression']);
}
$sql = "SELECT COUNT(" . $expression . ") AS `count` FROM " . $table_string . $condition_string;
$row = $this->fetchFirst($sql, $condition); $row = $this->fetchFirst($sql, $condition);