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

Merge pull request #9021 from annando/removed-unused

Browse source 
Remove unused "rating" functionality
This commit is contained in:
Hypolite Petovan 2020-08-16 18:27:27 -04:00 committed by GitHub
commit c4446e200f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
mod/dfrn_poll.php
View file

@ -239,7 +239,6 @@ function dfrn_poll_post(App $a)
{ {
$dfrn_id = $_POST['dfrn_id'] ?? ''; $dfrn_id = $_POST['dfrn_id'] ?? '';
$challenge = $_POST['challenge'] ?? ''; $challenge = $_POST['challenge'] ?? '';
$url = $_POST['url'] ?? '';
$sec = $_POST['sec'] ?? ''; $sec = $_POST['sec'] ?? '';
$ptype = $_POST['type'] ?? ''; $ptype = $_POST['type'] ?? '';
$perm = ($_POST['perm'] ?? '') ?: 'r'; $perm = ($_POST['perm'] ?? '') ?: 'r';
@ -319,7 +318,6 @@ function dfrn_poll_post(App $a)
exit(); exit();
} }
$type = $r[0]['type'];
$last_update = $r[0]['last_update']; $last_update = $r[0]['last_update'];
DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]); DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]);
@ -346,59 +344,29 @@ function dfrn_poll_post(App $a)
} }
$contact = $r[0]; $contact = $r[0];
$owner_uid = $r[0]['uid'];
$contact_id = $r[0]['id']; $contact_id = $r[0]['id'];
if ($type === 'reputation' && strlen($url)) { // Update the writable flag if it changed
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1", Logger::debug('post request feed', ['post' => $_POST]);
DBA::escape($url), if ($dfrn_version >= 2.21) {
intval($owner_uid) if ($perm === 'rw') {
); $writable = 1;
$reputation = 0; } else {
$text = ''; $writable = 0;
if (DBA::isResult($r)) {
$reputation = $r[0]['rating'];
$text = $r[0]['reason'];
if ($r[0]['id'] == $contact_id) { // inquiring about own reputation not allowed
$reputation = 0;
$text = '';
}
} }
echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?> if ($writable != $contact['writable']) {
<reputation> q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
<url>$url</url> intval($writable),
<rating>$reputation</rating> intval($contact_id)
<description>$text</description> );
</reputation>
";
exit();
// NOTREACHED
} else {
// Update the writable flag if it changed
Logger::debug('post request feed', ['post' => $_POST]);
if ($dfrn_version >= 2.21) {
if ($perm === 'rw') {
$writable = 1;
} else {
$writable = 0;
}
if ($writable != $contact['writable']) {
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
intval($writable),
intval($contact_id)
);
}
} }
header("Content-type: application/atom+xml");
$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;
exit();
} }
header("Content-type: application/atom+xml");
$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;
exit();
} }
function dfrn_poll_content(App $a) function dfrn_poll_content(App $a)

1
static/dbview.config.php
View file

@ -186,7 +186,6 @@ return [
"archive" => ["contact", "archive"], "archive" => ["contact", "archive"],
"pending" => ["contact", "pending"], "pending" => ["contact", "pending"],
"deleted" => ["contact", "deleted"], "deleted" => ["contact", "deleted"],
"rating" => ["contact", "rating"],
"unsearchable" => ["contact", "unsearchable"], "unsearchable" => ["contact", "unsearchable"],
"sensitive" => ["contact", "sensitive"], "sensitive" => ["contact", "sensitive"],
"baseurl" => ["contact", "baseurl"], "baseurl" => ["contact", "baseurl"],