Merge develop

boot.php

@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.2-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1216      );
+define ( 'DB_UPDATE_VERSION',      1217      );
 
 /**
  * @brief Constant with a HTML line break.

database.sql

@@ -159,7 +159,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`writable` tinyint(1) NOT NULL DEFAULT 0,
 	`forum` tinyint(1) NOT NULL DEFAULT 0,
 	`prv` tinyint(1) NOT NULL DEFAULT 0,
-	`contact-type` int(11) unsigned NOT NULL DEFAULT 0,
+	`contact-type` int(11) NOT NULL DEFAULT 0,
 	`hidden` tinyint(1) NOT NULL DEFAULT 0,
 	`archive` tinyint(1) NOT NULL DEFAULT 0,
 	`pending` tinyint(1) NOT NULL DEFAULT 1,

doc/KeyboardShortcuts.md

@@ -0,0 +1,10 @@
+Keyboard shortcuts in Friendica
+=======================
+
+* [Home](help)
+
+General
+-------
+
+* j: Scroll to next thread
+* k: Scroll to previous thread

doc/Settings.md

@@ -6,12 +6,10 @@ If you are the admin of a Friendica node, you have access to the so called **Adm
 
 On the front page of the admin panel you will see a summary of information about your node.
 These information include the amount of messages currently being processed in the queues.
-The first number is the number of messages being actively sent.
+The first number is the number of messages which could not been delivered for various reasons.
-This number should decrease quickly.
-The second is the messages which could for various reasons not being delivered.
 They will be resend later.
 You can have a quick glance into that second queus in the "Inspect Queue" section of the admin panel.
-If you have activated the background workers, there is a third number representing the count of jobs queued for the workers.
+The second number represents the current number of jobs for the background workers.
 These worker tasks are prioritised and are done accordingly.
 
 Then you get an overview of the accounts on your node, which can be moderated in the "Users" section of the panel.

doc/database.md

@@ -14,7 +14,6 @@ Database Tables
 | [config](help/database/db_config)                    | main configuration storage                       |
 | [contact](help/database/db_contact)                  | contact table                                    |
 | [conv](help/database/db_conv)                        | private messages                                 |
-| [deliverq](help/database/db_deliverq)                |                                                  |
 | [event](help/database/db_event)                      | Events                                           |
 | [fcontact](help/database/db_fcontact)                | friend suggestion stuff                          |
 | [ffinder](help/database/db_ffinder)                  | friend suggestion stuff                          |

doc/database/db_deliverq.md

@@ -1,12 +0,0 @@
-Table deliverq
-==============
-
-| Field   | Description      | Type             | Null | Key | Default | Extra          |
-|---------|------------------|------------------|------|-----|---------|----------------|
-| id      | sequential ID    | int(10) unsigned | NO   | PRI | NULL    | auto_increment |
-| cmd     |                  | varchar(32)      | NO   |     |         |                |
-| item    |                  | int(11)          | NO   |     | 0       |                |
-| contact |                  | int(11)          | NO   |     | 0       |                |
-
-
-Return to [database documentation](help/database)

doc/de/Settings.md

@@ -5,14 +5,11 @@
 Wenn du der Administrator einer Friendica Instanz bist, hast du Zugriff auf das so genannte **Admin Panel** in dem du die Friendica Instanz konfigurieren kannst,
 
 Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusammengefasst.
-Diese Informationen beinhalten die Anzahl der Nachrichten, die sich aktuell in den Warteschlangen befinden.
+Die erste Zahl gibt die Anzahl von Nachrichten an, die nicht zugestellt werden konnten.
-Hierbei ist die erste Zahl die Zahl der Nachrichten die gerade aktiv verteilt werden.
-Diese Zahl sollte sich relativ schnell sinken.
-Die zweite Zahl gibt die Anzahl von Nachrichten an, die nicht zugestellt werden konnten.
 Die Zustellung wird zu einem späteren Zeitpunkt noch einmal versucht.
 Unter dem Punkt "Warteschlange Inspizieren" kannst du einen schnellen Blick auf die zweite Warteschlange werfen.
-Solltest du für die Hintergrundprozesse die Worker aktiviert haben, wird eine dritte Zahl angezeigt.
+Die zweite Zahl steht für die Anzahl der Aufgaben, die die Worker noch vor sich haben. 
-Diese repräsentiert die Anzahl der Aufgaben, die die Worker noch vor sich haben.
+Die Worker arbeiten Hintergrundprozesse ab. 
 Die Aufgaben der Worker sind priorisiert und werden anhand dieser Prioritäten abgearbeitet.
 
 Desweiteren findest du eine Übersicht über die Accounts auf dem Friendica Knoten, die unter dem Punkt "Nutzer" moderiert werden können.

include/acl_selectors.php

@@ -610,12 +610,18 @@ function acl_lookup(App $a, $out_type = 'json') {
 	$items = array_merge($groups, $contacts);
 
 	if ($conv_id) {
-		/* if $conv_id is set, get unknow contacts in thread */
+		/*
-		/* but first get know contacts url to filter them out */
+		 * if $conv_id is set, get unknown contacts in thread
-		function _contact_link($i){ return dbesc($i['link']); }
+		 * but first get known contacts url to filter them out
-		$known_contacts = array_map(_contact_link, $contacts);
+		 */
-		$unknow_contacts=array();
+		$known_contacts = array_map(
-		$r = q("SELECT `author-avatar`,`author-name`,`author-link`
+			function ($i) {
+				return dbesc($i['link']);
+			}
+		, $contacts);
+
+		$unknown_contacts = array();
+		$r = q("SELECT `author-link`
 				FROM `item` WHERE `parent` = %d
 					AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
 					AND `author-link` NOT IN ('%s')
@@ -629,27 +635,25 @@ function acl_lookup(App $a, $out_type = 'json') {
 		);
 		if (dbm::is_result($r)) {
 			foreach ($r as $row) {
-				// nickname..
+				$contact = get_contact_details_by_url($row['author-link']);
-				$up = parse_url($row['author-link']);
+
-				$nick = explode("/",$up['path']);
+				if (count($contact) > 0) {
-				$nick = $nick[count($nick)-1];
+					$unknown_contacts[] = array(
-				$nick .= "@".$up['host'];
-				// /nickname
-				$unknow_contacts[] = array(
 						'type'    => 'c',
-					'photo'   => proxy_url($row['author-avatar'], false, PROXY_SIZE_MICRO),
+						'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
-					'name'    => htmlentities($row['author-name']),
+						'name'    => htmlentities($contact['name']),
-					'id'      => '',
+						'id'      => intval($contact['cid']),
-					'network' => 'unknown',
+						'network' => $contact['network'],
-					'link'    => $row['author-link'],
+						'link'    => $contact['url'],
-					'nick'    => htmlentities($nick),
+						'nick'    => htmlentities($contact['nick'] ? : $contact['addr']),
-					'forum'   => false
+						'forum'   => $contact['forum']
 					);
 				}
 			}
+		}
 
-		$items = array_merge($items, $unknow_contacts);
+		$items = array_merge($items, $unknown_contacts);
-		$tot += count($unknow_contacts);
+		$tot += count($unknown_contacts);
 	}
 
 	$results = array(

include/dbstructure.php

@@ -671,7 +671,7 @@ function db_definition($charset) {
 					"writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-					"contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+					"contact-type" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),

include/photos.php

@@ -58,10 +58,9 @@ function photo_albums($uid, $update = false) {
 			);
 		} else {
 			// This query doesn't do the count and is much faster
-			$albums = qu("SELECT DISTINCT(`album`), '' AS `total`, ANY_VALUE(`created`) AS `created`
+			$albums = qu("SELECT DISTINCT(`album`), '' AS `total`
-				FROM `photo`
+				FROM `photo` USE INDEX (`uid_album_scale_created`)
-				WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
+				WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
-				GROUP BY `album` ORDER BY `created` DESC",
 				intval($uid),
 				dbesc('Contact Photos'),
 				dbesc(t('Contact Photos'))

include/socgraph.php

@@ -2096,7 +2096,7 @@ function update_gcontact($contact) {
 	fix_alternate_contact_address($contact);
 
 	if (!isset($contact["updated"]))
-		$contact["updated"] = datetime_convert();
+		$contact["updated"] = dbm::date();
 
 	if ($contact["server_url"] == "") {
 		$server_url = $contact["url"];
@@ -2151,7 +2151,7 @@ function update_gcontact($contact) {
 			dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
 			intval($contact["nsfw"]), intval($contact["contact-type"]), dbesc($contact["alias"]),
 			dbesc($contact["notify"]), dbesc($contact["url"]), dbesc($contact["location"]),
-			dbesc($contact["about"]), intval($contact["generation"]), dbesc($contact["updated"]),
+			dbesc($contact["about"]), intval($contact["generation"]), dbesc(dbm::date($contact["updated"])),
 			dbesc($contact["server_url"]), dbesc($contact["connect"]),
 			dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
 

js/main.js

@@ -322,6 +322,30 @@
 			}
 		});
 
+		// Scroll to the next/previous thread when pressing J and K
+		$(document).keydown(function (event) {
+			var threads = $('.thread_level_1');
+			if ((event.keyCode === 74 || event.keyCode === 75) && !$(event.target).is('textarea, input')) {
+				var scrollTop = $(window).scrollTop();
+				if (event.keyCode === 75) {
+					threads = $(threads.get().reverse());
+				}
+				threads.each(function(key, item) {
+					var comparison;
+					var top = $(item).offset().top - 100;
+					if (event.keyCode === 74) {
+						comparison = top > scrollTop + 1;
+					} else if (event.keyCode === 75) {
+						comparison = top < scrollTop - 1;
+					}
+					if (comparison) {
+						$('html, body').animate({ scrollTop: top }, 200);
+						return false;
+					}
+				});
+			}
+		});
+
 		// Set an event listener for infinite scroll
 		if(typeof infinite_scroll !== 'undefined') {
 			$(window).scroll(function(e){

mod/acl.php

@@ -1,7 +1,7 @@
 <?php
 /* ACL selector json backend */
 
-require_once("include/acl_selectors.php");
+require_once 'include/acl_selectors.php';
 
 function acl_init(App $a) {
 	acl_lookup($a);

mod/admin.php

@@ -474,9 +474,6 @@ function admin_page_summary(App $a) {
 	$r = qu("SELECT COUNT(`id`) AS `count` FROM `register`");
 	$pending = $r[0]['count'];
 
-	$r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1");
-	$deliverq = (($r) ? $r[0]['total'] : 0);
-
 	$r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1");
 	$queue = (($r) ? $r[0]['total'] : 0);
 
@@ -485,7 +482,7 @@ function admin_page_summary(App $a) {
 
 	// We can do better, but this is a quick queue status
 
-	$queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue);
+	$queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue);
 
 
 	$t = get_markup_template("admin_summary.tpl");

mod/manifest.php

@@ -0,0 +1,26 @@
+<?php
+    use Friendica\Core\Config;
+
+    function manifest_content(App $a) {
+
+		$tpl = get_markup_template('manifest.tpl');
+
+		header('Content-type: application/manifest+json');
+
+		$touch_icon = Config::get('system', 'touch_icon', 'images/friendica-128.png');
+		if ($touch_icon == '') {
+			$touch_icon = 'images/friendica-128.png';
+		}
+
+		$o = replace_macros($tpl, array(
+			'$baseurl' => App::get_baseurl(),
+			'$touch_icon' => $touch_icon,
+			'$title' => Config::get('config', 'sitename', 'Friendica'),
+		));
+
+		echo $o;
+
+		killme();
+
+	}
+?>

update.php

@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1216);
+define('UPDATE_VERSION' , 1217);
 
 /**
  *

view/templates/admin_summary.tpl

@@ -11,7 +11,7 @@
 
 	<dl>
 		<dt>{{$queues.label}}</dt>
-		<dd>{{$queues.deliverq}} - <a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
+		<dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
 	</dl>
 	<dl>
 		<dt>{{$pending.0}}</dt>

view/templates/head.tpl

@@ -19,6 +19,7 @@
 <link rel="apple-touch-icon" href="{{$touch_icon}}"/>
 
 <meta name="apple-mobile-web-app-capable" content="yes" />
+<link rel="manifest" href="{{$baseurl}}/manifest" />
 <script>
 // Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
 (function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");

view/templates/hovercard.tpl

@@ -26,7 +26,7 @@
 				</div>
 				<div class="hover-card-actions-connection">
 					{{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-					{{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+					{{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
 					{{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
 				</div>
 			</div>

view/templates/manifest.tpl

@@ -0,0 +1,9 @@
+{
+  "name": "{{$title}}",
+  "start_url": "{{$baseurl}}",
+  "display": "standalone",
+  "description": "A Decentralized Social Network",
+  "icons": [{
+    "src": "{{$baseurl}}/{{$touch_icon}}"
+  }]
+}

view/theme/frio/templates/contact_template.tpl

@@ -42,7 +42,6 @@
 
 				{{/if}}
 			</div>
-
 		</div>
 
 		<div class="media-body">
@@ -51,7 +50,7 @@
 				{{if $contact.photo_menu.pm     }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></button>{{/if}}
 				{{if $contact.photo_menu.poke   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></button>{{/if}}
 				{{if $contact.photo_menu.network}}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-				{{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+				{{if $contact.photo_menu.edit   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.drop   }}<button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}')" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}"><i class="fa fa-user-times" aria-hidden="true"></i></button>{{/if}}
 				{{if $contact.photo_menu.follow }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
 				{{if $contact.photo_menu.hide   }}<a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}"><i class="fa fa-times" aria-hidden="true"></i></a>{{/if}}

view/theme/frio/templates/head.tpl

@@ -41,6 +41,7 @@
 <link rel="apple-touch-icon" href="{{$touch_icon}}"/>
 
 <meta name="apple-mobile-web-app-capable" content="yes" />
+<link rel="manifest" href="{{$baseurl}}/manifest" />
 <script>
 // Prevents links to switch to Safari in a home screen app - see https://gist.github.com/irae/1042167
 (function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(chref=d.href).replace(e.href,"").indexOf("#")&&(!/^[a-z\+\.\-]+:/i.test(chref)||chref.indexOf(e.protocol+"//"+e.host)===0)&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone");