forked from friendica/friendica-addons
parent
13de70c40b
commit
fd0f50695e
|
@ -10,6 +10,7 @@
|
|||
require_once("addon/diaspora/Diaspora_Connection.php");
|
||||
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
|
||||
function diaspora_install() {
|
||||
register_hook('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
|
||||
|
@ -136,7 +137,7 @@ function diaspora_settings(&$a,&$s) {
|
|||
$status = "";
|
||||
|
||||
$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
|
||||
if (dbm::is_result($r)) {
|
||||
if (DBM::is_result($r)) {
|
||||
$status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
|
||||
$status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
|
||||
$status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Database\DBM;
|
||||
|
||||
function mailstream_install() {
|
||||
register_hook('plugin_settings', 'addon/mailstream/mailstream.php', 'mailstream_plugin_settings');
|
||||
|
@ -167,7 +168,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
|
|||
|
||||
function mailstream_sender($item) {
|
||||
$r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']);
|
||||
if (dbm::is_result($r)) {
|
||||
if (DBM::is_result($r)) {
|
||||
$contact = $r[0];
|
||||
if ($contact['name'] != $item['author-name']) {
|
||||
return $contact['name'] . ' - ' . $item['author-name'];
|
||||
|
@ -208,7 +209,7 @@ function mailstream_subject($item) {
|
|||
// Don't look more than 100 levels deep for a subject, in case of loops
|
||||
for ($i = 0; ($i < 100) && $parent; $i++) {
|
||||
$r = q("SELECT `thr-parent`, `title` FROM `item` WHERE `uri` = '%s'", dbesc($parent));
|
||||
if (!dbm::is_result($r)) {
|
||||
if (!DBM::is_result($r)) {
|
||||
break;
|
||||
}
|
||||
if ($r[0]['thr-parent'] === $parent) {
|
||||
|
|
Loading…
Reference in a new issue