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>

diff --git a/doc/Addons.md b/doc/Addons.md
index 22b34fa..062f907 100644 (file)
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -72,12 +72,12 @@ JavaScript addon hooks
 ---
 
 #### PHP part
-Make sure your JavaScript addon file (addon/*addon_name*/*addon_name*.js) is listed in the document response. 
+Make sure your JavaScript addon file (addon/*addon_name*/*addon_name*.js) is listed in the document response.
 
 In your addon install function, add:
 
     Addon::registerHook('template_vars', 'addon/<addon_name>/<addon_name>.php', '<addon_name>_template_vars');
-    
+
 In your addon uninstall function, add:
 
     Addon::unregisterHook('template_vars', 'addon/<addon_name>/<addon_name>.php', '<addon_name>_template_vars');
@@ -104,7 +104,7 @@ Register your addon hooks in file 'addon/*addon_name*/*addon_name*.js'.
 No arguments are provided to your JavaScript callback function. Example:
 
     function myhook_function() {
-  
+
     }
 
 Modules
@@ -668,4 +668,4 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
 
 ### view/js/main.js
 
-    callAddonHooks("postprocess_liveupdate");
\ No newline at end of file
+    callAddonHooks("postprocess_liveupdate");

diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index 5b04622..0202144 100644 (file)
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -18,7 +18,7 @@ You can tag **persons who are in your social circle** by adding the "@"-sign in
 * @mike+151 - this form is used by the drop-down tag completion tool. It indicates the contact whose nickname is mike and whose contact identifier number is 151. The drop-down tool may be used to resolve people with duplicate nicknames. 
 
 You can tag a person on a different network or one that is **not in your social circle** by using the following notation:
-       
+
 * @mike@macgirvin.com - This is called a "remote mention" and can only be an email-style locator, not a web URL.
 
 Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
@@ -27,7 +27,7 @@ The exception is an ongoing conversation started from a contact of both you and
 This is a spam prevention measure.
 
 Remote mentions are delivered using the OStatus protocol.
-This protocol is used by Friendica and GNU Social and several other systems like Mastodon, but is not currently implemented in Diaspora. 
+This protocol is used by Friendica and GNU Social and several other systems like Mastodon, but is not currently implemented in Diaspora.
 As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
 These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
 
@@ -52,5 +52,5 @@ The same rules apply as with names that spaces within tags are represented by th
 It is therefore not possible to create a tag whose target contains an underscore.
 
 Topical tags are also not linked if they are purely numeric, e.g. #1.
-If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections. 
+If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections.
 

diff --git a/mod/message.php b/mod/message.php
index 1e49311..ddd5d03 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -141,6 +141,7 @@ function message_content(App $a)
                                '$cancel' => L10n::t('Cancel'),
                        ]);
                }
+
                // Now check how the user responded to the confirmation query
                if ($_REQUEST['canceled']) {
                        goaway($_SESSION['return_url']);
@@ -148,9 +149,10 @@ function message_content(App $a)
 
                $cmd = $a->argv[1];
                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);
                        }
+
                        //goaway(System::baseUrl(true) . '/message' );
                        goaway($_SESSION['return_url']);
                } else {

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

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

diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index eb4ae45..829bfc7 100644 (file)
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -83,10 +83,9 @@ server {
   # rewrite to front controller as default rule
   location / {
     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
   # by denying dot files and rewrite request to the front controller
@@ -96,7 +95,7 @@ server {
      rewrite ^(.*)$ /index.php?pagename=$1;
    }
   }
-  
+
   include mime.types;
 
   # block these file types

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index ea14aa6..511cd04 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -2081,7 +2081,6 @@ class DFRN
                        'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
                $condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
 
-               // @TODO No dba:update here?
                dba::update('contact', $fields, $condition);
 
                Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);

diff --git a/view/theme/frio/js/mod_notifications.js b/view/theme/frio/js/mod_notifications.js
index 9574ea0..9db3eab 100644 (file)
--- a/view/theme/frio/js/mod_notifications.js
+++ b/view/theme/frio/js/mod_notifications.js
@@ -7,7 +7,7 @@
 var introID = location.pathname.split("/").pop();
 
 $(document).ready(function(){
-       // Since only the DIV's inside the notification-list are marked 
+       // Since only the DIV's inside the notification-list are marked
        // with the class "unseen", we need some js to transfer this class
        // to the parent li list-elements.
        if($(".notif-item").hasClass("unseen")) {

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index b5ae5c2..c021f97 100644 (file)
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -66,22 +66,22 @@
                                        <li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.3}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
                                        <li class="empty">{{$emptynotifications}}</li>
                                </ul>
-                       </li>           
-               {{/if}}         
-               
+                       </li>
+               {{/if}}
+
                <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
                        <ul id="nav-site-menu" class="menu-popup">
-                               {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}                         
+                               {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
 
                                {{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
                                {{if $nav.admin}}<li><a accesskey="a" class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
 
                                {{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
                                {{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-                               {{if $nav.tos}}<li><a class="menu-sep {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a></li>{{/if}}                               
-                       </ul>           
+                               {{if $nav.tos}}<li><a class="menu-sep {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a></li>{{/if}}
+                       </ul>
                </li>
-               
+
                {{if $nav.help}} 
                <li id="nav-help-link" class="nav-menu {{$sel.help}}">
                        <a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>