clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Continued a bit: 

- removed/fixed whitespaces and mixture of spaces/tabs (some)
- added new-line character at end of files (POSIX-compilant)
- reverted some code which I had messed up (compared to upstream/develop)
- removed duplicate dba::update() invocation in src/Protocol/DFRN.php
- also removed no longer valid TODO

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-06-20 22:12:59 +02:00
parent f806fa91b1
commit 8ad523fbc8
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
9 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/message.php
View File

@ -141,6 +141,7 @@ function message_content(App $a)
'$cancel' => L10n::t('Cancel'), '$cancel' => L10n::t('Cancel'),
]); ]);
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if ($_REQUEST['canceled']) { if ($_REQUEST['canceled']) {
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
@ -148,9 +149,10 @@ function message_content(App $a)
$cmd = $a->argv[1]; $cmd = $a->argv[1];
if ($cmd === 'drop') { if ($cmd === 'drop') {
if (dba::delete('mail', ['id' => $a->argv[2]])) { if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
info(L10n::t('Message deleted.') . EOL); info(L10n::t('Message deleted.') . EOL);
} }
//goaway(System::baseUrl(true) . '/message' ); //goaway(System::baseUrl(true) . '/message' );
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} else { } else {

4
mod/photos.php
View File

@ -1230,7 +1230,9 @@ function photos_content(App $a)
* By now we hide it if someone wants to. * By now we hide it if someone wants to.
*/ */
if (!Config::get('system', 'no_count', false)) { if (!Config::get('system', 'no_count', false)) {
if ($_GET['order'] === 'posted') { $order_field = defaults($_GET, 'order', '');
if ($order_field === 'posted') {
$order = 'ASC'; $order = 'ASC';
} else { } else {
$order = 'DESC'; $order = 'DESC';

2
mod/settings.php
View File

@ -149,7 +149,7 @@ function settings_post(App $a)
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth'); check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
$key = $_POST['remove']; $key = $_POST['remove'];
dba::delete('tokens', ['id' => $key]); dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
goaway(System::baseUrl(true)."/settings/oauth/"); goaway(System::baseUrl(true)."/settings/oauth/");
return; return;
} }

3
mods/sample-nginx.config
View File

@ -83,11 +83,10 @@ server {
# rewrite to front controller as default rule # rewrite to front controller as default rule
location / { location / {
if (!-e $request_filename) { if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?pagename=$1; rewrite ^(.*)$ /index.php?pagename=$1;
} }
} }
# make sure webfinger and other well known services aren't blocked # make sure webfinger and other well known services aren't blocked
# by denying dot files and rewrite request to the front controller # by denying dot files and rewrite request to the front controller
location ^~ /.well-known/ { location ^~ /.well-known/ {

1
src/Protocol/DFRN.php
View File

@ -2081,7 +2081,6 @@ class DFRN
'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]]; 'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])]; $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
// @TODO No dba:update here?
dba::update('contact', $fields, $condition); dba::update('contact', $fields, $condition);
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true); Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);