From cdd510909f8828b206f7f5a626578d1e526f5d74 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 18 Jul 2018 05:49:41 +0000
Subject: [PATCH 1/6] We don't store the "type" parameter anymore

---
 fromgplus/fromgplus.php | 1 -
 ifttt/ifttt.php         | 1 -
 pumpio/pumpio.php       | 1 -
 statusnet/statusnet.php | 1 -
 twitter/twitter.php     | 1 -
 5 files changed, 5 deletions(-)

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index fcee3260..0f208037 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -169,7 +169,6 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
 	$_SESSION['uid'] = $uid;
 
 	unset($_REQUEST);
-	$_REQUEST['type'] = 'wall';
 	$_REQUEST['api_source'] = true;
 
 	$_REQUEST['profile_uid'] = $uid;
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 48278d5c..a17b05c1 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -171,7 +171,6 @@ function ifttt_message($uid, $item)
 	$_SESSION['uid'] = $uid;
 
 	unset($_REQUEST);
-	$_REQUEST['type'] = 'wall';
 	$_REQUEST['api_source'] = true;
 	$_REQUEST['profile_uid'] = $uid;
 	$_REQUEST['source'] = 'IFTTT';
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 5c28a8f4..494fd409 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -817,7 +817,6 @@ function pumpio_fetchtimeline(&$a, $uid)
 				$_SESSION["uid"] = $uid;
 
 				unset($_REQUEST);
-				$_REQUEST["type"] = "wall";
 				$_REQUEST["api_source"] = true;
 				$_REQUEST["profile_uid"] = $uid;
 				$_REQUEST["source"] = "pump.io";
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 62c3f41b..51fe6506 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -832,7 +832,6 @@ function statusnet_fetchtimeline(App $a, $uid)
 				$_SESSION["uid"] = $uid;
 
 				unset($_REQUEST);
-				$_REQUEST["type"] = "wall";
 				$_REQUEST["api_source"] = true;
 				$_REQUEST["profile_uid"] = $uid;
 				//$_REQUEST["source"] = "StatusNet";
diff --git a/twitter/twitter.php b/twitter/twitter.php
index e8431241..96bd2bbf 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -801,7 +801,6 @@ function twitter_prepare_body(App $a, &$b)
  */
 function twitter_do_mirrorpost(App $a, $uid, $post)
 {
-	$datarray["type"] = "wall";
 	$datarray["api_source"] = true;
 	$datarray["profile_uid"] = $uid;
 	$datarray["extid"] = NETWORK_TWITTER;
-- 
2.43.0


From 3050aef871dbae8d8508c67e847e921aba5c4ca5 Mon Sep 17 00:00:00 2001
From: Andreas Neustifter <andreas.neustifter@gmail.com>
Date: Thu, 19 Jul 2018 06:18:45 +0200
Subject: [PATCH 2/6] Unify header level for weather widget.

---
 curweather/templates/widget.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curweather/templates/widget.tpl b/curweather/templates/widget.tpl
index db3b7a8f..0847ec08 100644
--- a/curweather/templates/widget.tpl
+++ b/curweather/templates/widget.tpl
@@ -1,6 +1,6 @@
 <div id="curweather-network" class="widget">
 	<div class="title tool">
-		<h4 title="{{$lastupdate}}">{{$title}}: {{$city}}</h4>
+		<h3 title="{{$lastupdate}}">{{$title}}: {{$city}}</h3>
 	</div>
 	<p>
 	<img src="{{$icon}}" title="{{$description}}">
-- 
2.43.0


From abc76a42aed6b2f00e75f98117b114b841cc6a98 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 19 Jul 2018 22:18:02 -0400
Subject: [PATCH 3/6] [multiple] Move \dba to \Friendica\Database\dba

- Updated use statement lists
---
 .../advancedcontentfilter.php                 | 21 ++++++++++++-------
 buffer/buffer.php                             |  1 +
 catavatar/catavatar.php                       |  9 ++++----
 diaspora/diaspora.php                         |  1 +
 ifttt/ifttt.php                               |  1 +
 libertree/libertree.php                       |  1 +
 public_server/public_server.php               |  1 +
 pumpio/pumpio.php                             |  3 ++-
 statusnet/statusnet.php                       |  3 ++-
 tumblr/tumblr.php                             |  1 +
 twitter/twitter.php                           |  5 +++--
 windowsphonepush/windowsphonepush.php         |  3 ++-
 wppost/wppost.php                             |  1 +
 13 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index eebec4b0..239f3d9f 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -34,15 +34,22 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text\Markdown;
 use Friendica\Core\Addon;
+use Friendica\Core\Cache;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Database\dba;
+use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
+use Friendica\Model\Item;
+use Friendica\Model\Term;
+use Friendica\Module\Login;
 use Friendica\Network\HTTPException;
+use Friendica\Util\DateTimeFormat;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\ExpressionLanguage;
-use Friendica\Model\Item;
 
 require_once 'boot.php';
 require_once 'include/conversation.php';
@@ -110,7 +117,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 		$vars[str_replace('-', '_', $key)] = $value;
 	}
 
-	$rules = Friendica\Core\Cache::get('rules_' . local_user());
+	$rules = Cache::get('rules_' . local_user());
 	if (!isset($rules)) {
 		$rules = dba::inArray(dba::select(
 			'advancedcontentfilter_rules',
@@ -179,7 +186,7 @@ function advancedcontentfilter_init(App $a)
 function advancedcontentfilter_content(App $a)
 {
 	if (!local_user()) {
-		return \Friendica\Module\Login::form('/' . implode('/', $a->argv));
+		return Login::form('/' . implode('/', $a->argv));
 	}
 
 	if ($a->argc > 0 && $a->argv[1] == 'help') {
@@ -194,7 +201,7 @@ function advancedcontentfilter_content(App $a)
 
 		$content = file_get_contents($help_path);
 
-		$html = \Friendica\Content\Text\Markdown::convert($content, false);
+		$html = Markdown::convert($content, false);
 
 		$html = str_replace('code>', 'key>', $html);
 
@@ -332,7 +339,7 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 	}
 
 	$fields['uid'] = local_user();
-	$fields['created'] = \Friendica\Util\DateTimeFormat::utcNow();
+	$fields['created'] = DateTimeFormat::utcNow();
 
 	if (!dba::insert('advancedcontentfilter_rules', $fields)) {
 		throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
@@ -407,11 +414,11 @@ function advancedcontentfilter_get_variables_guid(ServerRequestInterface $reques
 	$params = ['order' => ['uid' => true]];
 	$item = Item::selectFirstForUser(local_user(), [], $condition, $params);
 
-	if (!\Friendica\Database\DBM::is_result($item)) {
+	if (!DBM::is_result($item)) {
 		throw new HTTPException\NotFoundException(L10n::t('Unknown post with guid: %s', $args['guid']));
 	}
 
-	$tags = \Friendica\Model\Term::populateTagsFromItem($item);
+	$tags = Term::populateTagsFromItem($item);
 
 	$item['tags'] = $tags['tags'];
 	$item['hashtags'] = $tags['hashtags'];
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 9d14fd83..0fef4848 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -13,6 +13,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
 use Friendica\Model\ItemContent;
 
 function buffer_install() {
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 72fc1e07..20291b5b 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -5,17 +5,18 @@
  * Version: 1.1
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
+
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\Worker;
 use Friendica\Core\PConfig;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Core\Worker;
+use Friendica\Database\dba;
+use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
-use Friendica\Database\DBM;
+use Friendica\Network\HTTPException\NotFoundException;
 
 define("CATAVATAR_SIZE", 256);
 
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 04d3c7ec..7f955ce3 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -13,6 +13,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\Queue;
 
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 48278d5c..ac79cc9a 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -14,6 +14,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Model\Item;
 
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 4d159bf0..b1188e9a 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -10,6 +10,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
 use Friendica\Util\Network;
 
 function libertree_install() {
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 0469a576..9e566641 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -9,6 +9,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
 use Friendica\Util\DateTimeFormat;
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 479da7d0..be8d6f8a 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -13,6 +13,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\dba;
+use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
@@ -21,7 +23,6 @@ use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Database\DBM;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 62c3f41b..36534d73 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -47,6 +47,8 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
+use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -55,7 +57,6 @@ use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Database\DBM;
 
 function statusnet_install()
 {
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 9617a3a0..6026e9b1 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -14,6 +14,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
 
 function tumblr_install() {
 	Addon::registerHook('post_local',           'addon/tumblr/tumblr.php', 'tumblr_post_local');
diff --git a/twitter/twitter.php b/twitter/twitter.php
index b17cf61a..3ff70ecc 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -71,8 +71,10 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GContact;
+use Friendica\Database\dba;
+use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\ItemContent;
@@ -81,7 +83,6 @@ use Friendica\Model\User;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Database\DBM;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index dd461ea4..725e8980 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -32,8 +32,9 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Model\User;
+use Friendica\Database\dba;
 use Friendica\Model\Item;
+use Friendica\Model\User;
 
 function windowsphonepush_install()
 {
diff --git a/wppost/wppost.php b/wppost/wppost.php
index a2c11293..caa355e8 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -11,6 +11,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Database\dba;
 use Friendica\Util\Network;
 
 function wppost_install() {
-- 
2.43.0


From 9616e770f32b296ee857872fb2fa384f6fcd878d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 20 Jul 2018 05:36:55 +0000
Subject: [PATCH 4/6] Fixes some notice

---
 mastodoncustomemojis/mastodoncustomemojis.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index 71b6db5c..93d0ba65 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -54,7 +54,7 @@ HTML;
 function mastodoncustomemojis_put_item_in_cache(App $a, array &$hook_data)
 {
 	// Mastodon uses OStatus, skipping other network protocols
-	if ($hook_data['item']['network'] != Protocol::OSTATUS) {
+	if (empty($hook_data['item']['author-link']) || ($hook_data['item']['network'] != Protocol::OSTATUS)) {
 		return;
 	}
 
-- 
2.43.0


From 57505bdf82fa7967adadcf3a9c43ec177f64a111 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Fri, 20 Jul 2018 08:20:48 -0400
Subject: [PATCH 5/6] [multiple] Rename Friendica\Database\dba to
 Friendica\Database\DBA

---
 .../advancedcontentfilter.php                 | 26 +++++++-------
 buffer/buffer.php                             |  4 +--
 catavatar/catavatar.php                       | 16 ++++-----
 diaspora/diaspora.php                         |  4 +--
 ifttt/ifttt.php                               |  4 +--
 libertree/libertree.php                       |  4 +--
 public_server/public_server.php               | 14 ++++----
 pumpio/pumpio.php                             | 18 +++++-----
 statusnet/statusnet.php                       |  6 ++--
 tumblr/tumblr.php                             |  4 +--
 twitter/twitter.php                           | 36 +++++++++----------
 windowsphonepush/windowsphonepush.php         |  4 +--
 wppost/wppost.php                             |  4 +--
 13 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 239f3d9f..42a5ba30 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -39,7 +39,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Item;
@@ -119,7 +119,7 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 
 	$rules = Cache::get('rules_' . local_user());
 	if (!isset($rules)) {
-		$rules = dba::inArray(dba::select(
+		$rules = DBA::inArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
 			['uid' => local_user(), 'active' => true]
@@ -300,7 +300,7 @@ function advancedcontentfilter_get_rules()
 		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
-	$rules = dba::inArray(dba::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
+	$rules = DBA::inArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
 
 	return json_encode($rules);
 }
@@ -311,7 +311,7 @@ function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, Res
 		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
-	$rule = dba::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);
+	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);
 
 	return json_encode($rule);
 }
@@ -341,11 +341,11 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 	$fields['uid'] = local_user();
 	$fields['created'] = DateTimeFormat::utcNow();
 
-	if (!dba::insert('advancedcontentfilter_rules', $fields)) {
-		throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
+	if (!DBA::insert('advancedcontentfilter_rules', $fields)) {
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}
 
-	$rule = dba::selectFirst('advancedcontentfilter_rules', [], ['id' => dba::lastInsertId()]);
+	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => DBA::lastInsertId()]);
 
 	return json_encode(['message' => L10n::t('Rule successfully added'), 'rule' => $rule]);
 }
@@ -360,7 +360,7 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
 		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}
 
-	if (!dba::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
 		throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
 	}
 
@@ -372,8 +372,8 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
 		throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
 	}
 
-	if (!dba::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {
-		throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
+	if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}
 
 	return json_encode(['message' => L10n::t('Rule successfully updated')]);
@@ -389,12 +389,12 @@ function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request,
 		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}
 
-	if (!dba::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
 		throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
 	}
 
-	if (!dba::delete('advancedcontentfilter_rules', ['id' => $args['id']])) {
-		throw new HTTPException\ServiceUnavaiableException(dba::errorMessage());
+	if (!DBA::delete('advancedcontentfilter_rules', ['id' => $args['id']])) {
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}
 
 	return json_encode(['message' => L10n::t('Rule successfully deleted')]);
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 0fef4848..ef95f1d7 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -13,7 +13,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Model\ItemContent;
 
 function buffer_install() {
@@ -260,7 +260,7 @@ function buffer_send(App $a, &$b)
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 20291b5b..074cc00c 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -12,7 +12,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
@@ -78,14 +78,14 @@ function catavatar_addon_settings_post(App $a, &$s)
 	// delete the current cached cat avatar
 	$condition = ['uid' => local_user(), 'blocked' => false,
 			'account_expired' => false, 'account_removed' => false];
-	$user = dba::selectFirst('user', ['email'], $condition);
+	$user = DBA::selectFirst('user', ['email'], $condition);
 
 	$seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
 
 	if (!empty($_POST['catavatar-usecat'])) {
 		$url = $a->get_baseurl() . '/catavatar/' . local_user() . '?ts=' . time();
 
-		$self = dba::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
 		if (!DBM::is_result($self)) {
 			notice(L10n::t("The cat hadn't found itself."));
 			return;
@@ -94,16 +94,16 @@ function catavatar_addon_settings_post(App $a, &$s)
 		Photo::importProfilePhoto($url, local_user(), $self['id']);
 
 		$condition = ['uid' => local_user(), 'contact-id' => $self['id']];
-		$photo = dba::selectFirst('photo', ['resource-id'], $condition);
+		$photo = DBA::selectFirst('photo', ['resource-id'], $condition);
 		if (!DBM::is_result($photo)) {
 			notice(L10n::t('There was an error, the cat ran away.'));
 			return;
 		}
 
-		dba::update('photo', ['profile' => false], ['profile' => true, 'uid' => local_user()]);
+		DBA::update('photo', ['profile' => false], ['profile' => true, 'uid' => local_user()]);
 
 		$fields = ['profile' => true, 'album' => L10n::t('Profile Photos'), 'contact-id' => 0];
-		dba::update('photo', $fields, ['uid' => local_user(), 'resource-id' => $photo['resource-id']]);
+		DBA::update('photo', $fields, ['uid' => local_user(), 'resource-id' => $photo['resource-id']]);
 
 		Photo::importProfilePhoto($url, local_user(), $self['id']);
 
@@ -138,7 +138,7 @@ function catavatar_addon_settings_post(App $a, &$s)
  */
 function catavatar_lookup(App $a, &$b)
 {
-	$user = dba::selectFirst('user', ['uid'], ['email' => $b['email']]);
+	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	$url = $a->get_baseurl() . '/catavatar/' . $user['uid'];
 
 	switch($b['size']) {
@@ -174,7 +174,7 @@ function catavatar_content(App $a)
 
 	$condition = ['uid' => $uid, 'blocked' => false,
 			'account_expired' => false, 'account_removed' => false];
-	$user = dba::selectFirst('user', ['email'], $condition);
+	$user = DBA::selectFirst('user', ['email'], $condition);
 
 	if ($user === false) {
 		throw new NotFoundException();
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 7f955ce3..2f8c13fe 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -13,7 +13,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Queue;
 
@@ -293,7 +293,7 @@ function diaspora_send(&$a,&$b) {
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 87cb1760..832f3df2 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -14,7 +14,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Item;
 
@@ -101,7 +101,7 @@ function ifttt_post(App $a)
 
 	$nickname = $a->argv[1];
 
-	$user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname]);
+	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBM::is_result($user)) {
 		logger('User ' . $nickname . ' not found.', LOGGER_DEBUG);
 		return;
diff --git a/libertree/libertree.php b/libertree/libertree.php
index b1188e9a..7fce4b4e 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -10,7 +10,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Util\Network;
 
 function libertree_install() {
@@ -173,7 +173,7 @@ function libertree_send(&$a,&$b) {
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 9e566641..a30d3303 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -9,7 +9,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Util\DateTimeFormat;
 
@@ -47,7 +47,7 @@ function public_server_register_account($a, $b)
 	}
 
 	$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days'), 'expire' => $days_posts];
-	dba::update('user', $fields, ['uid' => $uid]);
+	DBA::update('user', $fields, ['uid' => $uid]);
 }
 
 function public_server_cron($a, $b)
@@ -75,7 +75,7 @@ function public_server_cron($a, $b)
 			]);
 
 			$fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
-			dba::update('user', $fields, ['uid' => $rr['uid']]);
+			DBA::update('user', $fields, ['uid' => $rr['uid']]);
 		}
 	}
 
@@ -86,7 +86,7 @@ function public_server_cron($a, $b)
 		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-				dba::update('user', $fields, ['uid' => $rr['uid']]);
+				DBA::update('user', $fields, ['uid' => $rr['uid']]);
 			}
 		}
 	}
@@ -98,7 +98,7 @@ function public_server_cron($a, $b)
 		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-				dba::update('user', $fields, ['uid' => $rr['uid']]);
+				DBA::update('user', $fields, ['uid' => $rr['uid']]);
 			}
 		}
 	}
@@ -110,7 +110,7 @@ function public_server_cron($a, $b)
 			intval($flagposts), dbesc(NULL_DATE));
 		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
-				dba::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
+				DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
 			}
 		}
 	}
@@ -138,7 +138,7 @@ function public_server_login($a, $b)
 
 	$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
 	$condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), NULL_DATE];
-	dba::update('user', $fields, $condition);
+	DBA::update('user', $fields, $condition);
 }
 
 function public_server_addon_admin_post(&$a)
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index a2f21ce1..191f8505 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -13,7 +13,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
@@ -439,7 +439,7 @@ function pumpio_send(&$a, &$b)
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
@@ -952,7 +952,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 	}
 
 	$condition = ['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']];
-	if (dba::exists('item', $condition)) {
+	if (DBA::exists('item', $condition)) {
 		logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 		return;
 	}
@@ -1079,13 +1079,13 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id)
 {
 	// Two queries for speed issues
 	$condition = ['uri' => $post->object->id, 'uid' => $uid];
-	if (dba::exists('item', $condition)) {
+	if (DBA::exists('item', $condition)) {
 		Item::delete($condition);
 		return true;
 	}
 
 	$condition = ['extid' => $post->object->id, 'uid' => $uid];
-	if (dba::exists('item', $condition)) {
+	if (DBA::exists('item', $condition)) {
 		Item::delete($condition);
 		return true;
 	}
@@ -1110,10 +1110,10 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 
 	if ($post->verb != "update") {
 		// Two queries for speed issues
-		if (dba::exists('item', ['uri' => $post->object->id, 'uid' => $uid])) {
+		if (DBA::exists('item', ['uri' => $post->object->id, 'uid' => $uid])) {
 			return false;
 		}
-		if (dba::exists('item', ['extid' => $post->object->id, 'uid' => $uid])) {
+		if (DBA::exists('item', ['extid' => $post->object->id, 'uid' => $uid])) {
 			return false;
 		}
 	}
@@ -1639,11 +1639,11 @@ function pumpio_fetchallcomments(&$a, $uid, $id)
 		}
 
 		// Checking if the comment already exists - Two queries for speed issues
-		if (dba::exists('item', ['uri' => $item->id, 'uid' => $uid])) {
+		if (DBA::exists('item', ['uri' => $item->id, 'uid' => $uid])) {
 			continue;
 		}
 
-		if (dba::exists('item', ['extid' => $item->id, 'uid' => $uid])) {
+		if (DBA::exists('item', ['extid' => $item->id, 'uid' => $uid])) {
 			continue;
 		}
 
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 04926f14..9af2c6d1 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -47,7 +47,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
@@ -492,7 +492,7 @@ function statusnet_post_hook(App $a, &$b)
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
@@ -1074,7 +1074,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 
 	$postarray['uri'] = $hostname . "::" . $content->id;
 
-	if (dba::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
+	if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
 		return [];
 	}
 
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 6026e9b1..7ed91175 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -14,7 +14,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 
 function tumblr_install() {
 	Addon::registerHook('post_local',           'addon/tumblr/tumblr.php', 'tumblr_post_local');
@@ -332,7 +332,7 @@ function tumblr_send(&$a,&$b) {
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 79c77eee..aa0adfb8 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -71,7 +71,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
@@ -495,7 +495,7 @@ function twitter_post_hook(App $a, &$b)
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
@@ -734,17 +734,17 @@ function twitter_expire(App $a, $b)
 		return;
 	}
 
-	$r = dba::select('item', ['id', 'iaid', 'icid'], ['deleted' => true, 'network' => NETWORK_TWITTER]);
-	while ($row = dba::fetch($r)) {
-		dba::delete('item', ['id' => $row['id']]);
-		if (!empty($row['iaid']) && !dba::exists('item', ['iaid' => $row['iaid']])) {
-			dba::delete('item-activity', ['id' => $row['iaid']]);
+	$r = DBA::select('item', ['id', 'iaid', 'icid'], ['deleted' => true, 'network' => NETWORK_TWITTER]);
+	while ($row = DBA::fetch($r)) {
+		DBA::delete('item', ['id' => $row['id']]);
+		if (!empty($row['iaid']) && !DBA::exists('item', ['iaid' => $row['iaid']])) {
+			DBA::delete('item-activity', ['id' => $row['iaid']]);
 		}
-		if (!empty($row['icid']) && !dba::exists('item', ['icid' => $row['icid']])) {
-			dba::delete('item-content', ['id' => $row['icid']]);
+		if (!empty($row['icid']) && !DBA::exists('item', ['icid' => $row['icid']])) {
+			DBA::delete('item-content', ['id' => $row['icid']]);
 		}
 	}
-	dba::close($r);
+	DBA::close($r);
 
 	require_once "include/items.php";
 
@@ -1014,11 +1014,11 @@ function twitter_fetch_contact($uid, $data, $create_user)
 
 	$cid = Contact::getIdForURL($url, 0, true, $fields);
 	if (!empty($cid)) {
-		dba::update('contact', $fields, ['id' => $cid]);
+		DBA::update('contact', $fields, ['id' => $cid]);
 		Contact::updateAvatar($avatar, 0, $cid);
 	}
 
-	$contact = dba::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]);
+	$contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]);
 	if (!DBM::is_result($contact) && !$create_user) {
 		return 0;
 	}
@@ -1037,11 +1037,11 @@ function twitter_fetch_contact($uid, $data, $create_user)
 		$fields['readonly'] = false;
 		$fields['pending'] = false;
 
-		if (!dba::insert('contact', $fields)) {
+		if (!DBA::insert('contact', $fields)) {
 			return false;
 		}
 
-		$contact_id = dba::lastInsertId();
+		$contact_id = DBA::lastInsertId();
 
 		Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
@@ -1066,7 +1066,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 			$fields['name-date'] = DateTimeFormat::utcNow();
 			$fields['uri-date'] = DateTimeFormat::utcNow();
 
-			dba::update('contact', $fields, ['id' => $contact['id']]);
+			DBA::update('contact', $fields, ['id' => $contact['id']]);
 		}
 	}
 
@@ -1342,7 +1342,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
 	// $postarray['object'] = json_encode($post); // Activate for debugging
 
 	// Don't import our own comments
-	if (dba::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
+	if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
 		logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
 		return [];
 	}
@@ -1515,7 +1515,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 			break;
 		}
 
-		if (dba::exists('item', ['uri' => 'twitter::' . $post->id_str, 'uid' => $uid])) {
+		if (DBA::exists('item', ['uri' => 'twitter::' . $post->id_str, 'uid' => $uid])) {
 			break;
 		}
 
@@ -1660,7 +1660,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 			$notify = false;
 
 			if ($postarray['uri'] == $postarray['parent-uri']) {
-				$contact = dba::selectFirst('contact', [], ['id' => $postarray['contact-id'], 'self' => false]);
+				$contact = DBA::selectFirst('contact', [], ['id' => $postarray['contact-id'], 'self' => false]);
 				if (DBM::is_result($contact)) {
 					$notify = Item::isRemoteSelf($contact, $postarray);
 				}
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 725e8980..c3f5ff15 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -32,7 +32,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 
@@ -463,7 +463,7 @@ function windowsphonepush_login(App $a)
 	$user_id = User::authenticate($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
 
 	if ($user_id) {
-		$record = dba::selectFirst('user', [], ['uid' => $user_id]);
+		$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
 	} else {
 		logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
diff --git a/wppost/wppost.php b/wppost/wppost.php
index caa355e8..45b48993 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -11,7 +11,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use Friendica\Util\Network;
 
 function wppost_install() {
@@ -210,7 +210,7 @@ function wppost_send(&$a,&$b) {
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
-- 
2.43.0


From b3e3988f181299fad1d927973e2b7a35622779de Mon Sep 17 00:00:00 2001
From: Andreas Neustifter <andreas.neustifter@gmail.com>
Date: Fri, 20 Jul 2018 17:54:12 +0200
Subject: [PATCH 6/6] [js_upload] Better wording for mass-upload photos button.

---
 js_upload/js_upload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 2b15720b..b1373ffc 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -41,7 +41,7 @@ function js_upload_form(&$a,&$b) {
 	$b['addon_text'] .= '<link href="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
 	$b['addon_text'] .= '<script src="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
 
-	$upload_msg = L10n::t('Upload a file');
+	$upload_msg = L10n::t('Select files for upload');
 	$drop_msg = L10n::t('Drop files here to upload');
 	$cancel = L10n::t('Cancel');
 	$failed = L10n::t('Failed');
-- 
2.43.0