diff --git a/membersince/membersince.php b/membersince/membersince.php index 63482579..8c42c135 100644 --- a/membersince/membersince.php +++ b/membersince/membersince.php @@ -2,7 +2,7 @@ /** * Name: MemberSince * Description: Display membership date in profile - * Version: 1.0 + * Version: 1.1 * Author: Mike Macgirvin * */ @@ -23,9 +23,37 @@ function membersince_uninstall() function membersince_display(&$a, &$b) { - // Works in Vier - $b = preg_replace('/<\/dl>/', "\n\n\n
\n
" . L10n::t('Member since:') . "
\n
" . DateTimeFormat::local($a->profile['register_date']) . "
\n
", $b, 1); + if (current_theme() == 'frio') { + // Works in Frio. + $doc = new DOMDocument(); + $doc->loadHTML($b); - // Trying for Frio - //$b = preg_replace('/<\/div>/', "
" . L10n::t('Member since:') . "
" . DateTimeFormat::local($a->profile['register_date']) . "
", $b, 1); + $elm = $doc->getElementById('aprofile-fullname'); + + $div = $doc->createElement('div'); + $div->setAttribute('id','aprofile-membersince'); + $div->setAttribute('class','col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile'); + + // The seperator line. + $hr = $doc->createElement('hr',''); + $hr->setAttribute('class','profile-separator'); + + // The label div. + $label = $doc->createElement('div', L10n::t('Member since:')); + $label->setAttribute('class', 'col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted'); + + // The div for the register date of the profile owner. + $entry = $doc->createElement('div', DateTimeFormat::local($a->profile['register_date'])); + $entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry'); + + $div->appendChild($hr); + $div->appendChild($label); + $div->appendChild($entry); + $elm->parentNode->insertBefore($div, $elm->nextSibling); + + $b = $doc->saveHTML(); + } else { + // Works in Vier. + $b = preg_replace('/<\/dl>/', "\n\n\n
\n
" . L10n::t('Member since:') . "
\n
" . DateTimeFormat::local($a->profile['register_date']) . "
\n
", $b, 1); + } } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 8e194f85..1e416f47 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -543,7 +543,10 @@ function pumpio_send(&$a,&$b) { logger('pumpio_send '.$username.': success '.$post_id); if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); - Item::update(['extid' => $post_id], ['id' => $b['id']]); + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", + dbesc($post_id), + intval($b['id']) + ); } } else { logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user,true)); @@ -867,7 +870,13 @@ function pumpio_dounlike(&$a, $uid, $self, $post, $own_id) { $contactid = $orig_post['contact-id']; } - Item::delete(['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]); + $r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `verb` = '%s' AND `uid` = %d AND `contact-id` = %d AND `thr-parent` = '%s'", + dbesc(DateTimeFormat::utcNow()), + dbesc(ACTIVITY_LIKE), + intval($uid), + intval($contactid), + dbesc($orig_post['uri']) + ); if(count($r)) logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']); @@ -1051,7 +1060,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { ); if (count($r)) - return Item::deleteById($r[0]["id"]); + return Item::delete($r[0]["id"]); $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", dbesc($post->object->id), @@ -1059,7 +1068,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { ); if (count($r)) - return Item::deleteById($r[0]["id"]); + return Item::delete($r[0]["id"]); } function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { @@ -1247,9 +1256,13 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $postarray["id"] = $top_item; if (($top_item == 0) && ($post->verb == "update")) { - $fields = ['title' => $postarray["title"], 'body' => $postarray["body"], 'changed' => $postarray["edited"]]; - $condition = ['uri' => $postarray["uri"], 'uid' => $uid]; - Item::update($fields, $condition); + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", + dbesc($postarray["title"]), + dbesc($postarray["body"]), + dbesc($postarray["edited"]), + dbesc($postarray["uri"]), + intval($uid) + ); } if ($post->object->objectType == "comment") { @@ -1478,7 +1491,10 @@ function pumpio_queue_hook(&$a,&$b) { logger('pumpio_queue: send '.$username.': success '.$post_id); if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']); - Item::update(['extid' => $post_id], ['id' => $z['item']]); + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", + dbesc($post_id), + intval($z['item']) + ); } Queue::removeItem($x['id']); } else diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index f1c080f4..22e8f5f9 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -600,7 +600,11 @@ function statusnet_post_hook(App $a, &$b) logger('Send to GNU Social failed: "' . $result->error . '"'); } elseif ($iscomment) { logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']); - Item::update(['extid' => $hostname . "::" . $result->id, 'body' => $result->text], ['id' => $b['id']]); + q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d", + dbesc($hostname . "::" . $result->id), + dbesc($result->text), + intval($b['id']) + ); } } if ($tempfile != "") { diff --git a/twitter/twitter.php b/twitter/twitter.php index 47b4fa07..bf85f081 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -571,7 +571,11 @@ function twitter_post_hook(App $a, &$b) $image = ""; } elseif ($iscomment) { logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); - Item::update(['extid' => "twitter::" . $result->id_str, 'body' => $result->text], ['id' => $b['id']]); + q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d", + dbesc("twitter::" . $result->id_str), + dbesc($result->text), + intval($b['id']) + ); } } @@ -617,7 +621,10 @@ function twitter_post_hook(App $a, &$b) notice(L10n::t('Twitter post failed. Queued for retry.') . EOL); } elseif ($iscomment) { logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']); - Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]); + q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", + dbesc("twitter::" . $result->id_str), + intval($b['id']) + ); } } }