mirror of https://github.com/friendica/friendica
Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
187a81f159
28
boot.php
28
boot.php
|
|
@ -38,7 +38,7 @@ require_once('include/dbstructure.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_CODENAME', 'Asparagus');
|
define ( 'FRIENDICA_CODENAME', 'Asparagus');
|
||||||
define ( 'FRIENDICA_VERSION', '3.5.1' );
|
define ( 'FRIENDICA_VERSION', '3.5.2-dev' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1215 );
|
define ( 'DB_UPDATE_VERSION', 1215 );
|
||||||
|
|
||||||
|
|
@ -1889,11 +1889,35 @@ function goaway($s) {
|
||||||
* @return int|bool user id or false
|
* @return int|bool user id or false
|
||||||
*/
|
*/
|
||||||
function local_user() {
|
function local_user() {
|
||||||
if((x($_SESSION,'authenticated')) && (x($_SESSION,'uid')))
|
if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
|
||||||
return intval($_SESSION['uid']);
|
return intval($_SESSION['uid']);
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Returns the public contact id of logged in user or false.
|
||||||
|
*
|
||||||
|
* @return int|bool public contact id or false
|
||||||
|
*/
|
||||||
|
function public_contact() {
|
||||||
|
static $public_contact_id = false;
|
||||||
|
|
||||||
|
if (!$public_contact_id && x($_SESSION, 'authenticated')) {
|
||||||
|
if (x($_SESSION, 'my_address')) {
|
||||||
|
// Local user
|
||||||
|
$public_contact_id = intval(get_contact($_SESSION['my_address'], 0));
|
||||||
|
} else if (x($_SESSION, 'visitor_home')) {
|
||||||
|
// Remote user
|
||||||
|
$public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0));
|
||||||
|
}
|
||||||
|
} else if (!x($_SESSION, 'authenticated')) {
|
||||||
|
$public_contact_id = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $public_contact_id;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Returns contact id of authenticated site visitor or false
|
* @brief Returns contact id of authenticated site visitor or false
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once('include/Probe.php');
|
|
||||||
|
|
||||||
// Included here for completeness, but this is a very dangerous operation.
|
// Included here for completeness, but this is a very dangerous operation.
|
||||||
// It is the caller's responsibility to confirm the requestor's intent and
|
// It is the caller's responsibility to confirm the requestor's intent and
|
||||||
// authorisation to do this.
|
// authorisation to do this.
|
||||||
|
|
@ -355,6 +353,7 @@ function get_contact_details_by_addr($addr, $uid = -1) {
|
||||||
dbesc($addr));
|
dbesc($addr));
|
||||||
|
|
||||||
if (!dbm::is_result($r)) {
|
if (!dbm::is_result($r)) {
|
||||||
|
require_once('include/Probe.php');
|
||||||
$data = Probe::uri($addr);
|
$data = Probe::uri($addr);
|
||||||
|
|
||||||
$profile = get_contact_details_by_url($data['url'], $uid);
|
$profile = get_contact_details_by_url($data['url'], $uid);
|
||||||
|
|
@ -508,72 +507,96 @@ function contacts_not_grouped($uid,$start = 0,$count = 0) {
|
||||||
/**
|
/**
|
||||||
* @brief Fetch the contact id for a given url and user
|
* @brief Fetch the contact id for a given url and user
|
||||||
*
|
*
|
||||||
|
* First lookup in the contact table to find a record matching either `url`, `nurl`,
|
||||||
|
* `addr` or `alias`.
|
||||||
|
*
|
||||||
|
* If there's no record and we aren't looking for a public contact, we quit.
|
||||||
|
* If there's one, we check that it isn't time to update the picture else we
|
||||||
|
* directly return the found contact id.
|
||||||
|
*
|
||||||
|
* Second, we probe the provided $url wether it's http://server.tld/profile or
|
||||||
|
* nick@server.tld. We quit if we can't get any info back.
|
||||||
|
*
|
||||||
|
* Third, we create the contact record if it doesn't exist
|
||||||
|
*
|
||||||
|
* Fourth, we update the existing record with the new data (avatar, alias, nick)
|
||||||
|
* if there's any updates
|
||||||
|
*
|
||||||
* @param string $url Contact URL
|
* @param string $url Contact URL
|
||||||
* @param integer $uid The user id for the contact
|
* @param integer $uid The user id for the contact (0 = public contact)
|
||||||
* @param boolean $no_update Don't update the contact
|
* @param boolean $no_update Don't update the contact
|
||||||
*
|
*
|
||||||
* @return integer Contact ID
|
* @return integer Contact ID
|
||||||
*/
|
*/
|
||||||
function get_contact($url, $uid = 0, $no_update = false) {
|
function get_contact($url, $uid = 0, $no_update = false) {
|
||||||
require_once("include/Scrape.php");
|
|
||||||
|
|
||||||
logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
|
logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
|
||||||
|
|
||||||
$data = array();
|
$data = array();
|
||||||
$contactid = 0;
|
$contact_id = 0;
|
||||||
|
|
||||||
// is it an address in the format user@server.tld?
|
// We first try the nurl (http://server.tld/nick), most common case
|
||||||
/// @todo use gcontact and/or the addr field for a lookup
|
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
|
||||||
if (!strstr($url, "http") OR strstr($url, "@")) {
|
WHERE `nurl` = '%s'
|
||||||
$data = probe_url($url);
|
AND `uid` = %d",
|
||||||
$url = $data["url"];
|
|
||||||
if ($url == "")
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
|
|
||||||
dbesc(normalise_link($url)),
|
dbesc(normalise_link($url)),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (!$contact)
|
|
||||||
$contact = q("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `uid` = %d ORDER BY `id` LIMIT 1",
|
|
||||||
dbesc($url),
|
|
||||||
dbesc(normalise_link($url)),
|
|
||||||
intval($uid));
|
|
||||||
|
|
||||||
if ($contact) {
|
// Then the addr (nick@server.tld)
|
||||||
$contactid = $contact[0]["id"];
|
if (! dbm::is_result($contacts)) {
|
||||||
|
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
|
||||||
|
WHERE `addr` = '%s'
|
||||||
|
AND `uid` = %d",
|
||||||
|
dbesc($url),
|
||||||
|
intval($uid));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Then the alias (which could be anything)
|
||||||
|
if (! dbm::is_result($contacts)) {
|
||||||
|
$contacts = q("SELECT `id`, `avatar-date` FROM `contact`
|
||||||
|
WHERE `alias` IN ('%s', '%s')
|
||||||
|
AND `uid` = %d",
|
||||||
|
dbesc($url),
|
||||||
|
dbesc(normalise_link($url)),
|
||||||
|
intval($uid));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dbm::is_result($contacts)) {
|
||||||
|
$contact_id = $contacts[0]["id"];
|
||||||
|
|
||||||
// Update the contact every 7 days
|
// Update the contact every 7 days
|
||||||
$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days'));
|
$update_photo = ($contacts[0]['avatar-date'] < datetime_convert('','','now -7 days'));
|
||||||
//$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
|
|
||||||
|
|
||||||
if (!$update_photo OR $no_update) {
|
if (!$update_photo OR $no_update) {
|
||||||
return($contactid);
|
return $contact_id;
|
||||||
}
|
}
|
||||||
} elseif ($uid != 0)
|
} elseif ($uid != 0) {
|
||||||
|
// Non-existing user-specific contact, exiting
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!count($data))
|
require_once('include/Probe.php');
|
||||||
$data = probe_url($url);
|
$data = Probe::uri($url);
|
||||||
|
|
||||||
// Does this address belongs to a valid network?
|
// Last try in gcontact for unsupported networks
|
||||||
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
|
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO))) {
|
||||||
if ($uid != 0)
|
if ($uid != 0) {
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
// Get data from the gcontact table
|
// Get data from the gcontact table
|
||||||
$r = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'",
|
$gcontacts = q("SELECT `name`, `nick`, `url`, `photo`, `addr`, `alias`, `network` FROM `gcontact` WHERE `nurl` = '%s'",
|
||||||
dbesc(normalise_link($url)));
|
dbesc(normalise_link($url)));
|
||||||
if (!$r)
|
if (!$gcontacts) {
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
$data = $r[0];
|
$data = $gcontacts[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
$url = $data["url"];
|
$url = $data["url"];
|
||||||
|
|
||||||
if ($contactid == 0) {
|
if (!$contact_id) {
|
||||||
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
|
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
|
||||||
`name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
|
`name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
|
||||||
`batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
|
`batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
|
||||||
|
|
@ -602,45 +625,48 @@ function get_contact($url, $uid = 0, $no_update = false) {
|
||||||
dbesc(datetime_convert())
|
dbesc(datetime_convert())
|
||||||
);
|
);
|
||||||
|
|
||||||
$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
|
$contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
|
||||||
dbesc(normalise_link($data["url"])),
|
dbesc(normalise_link($data["url"])),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
if (!$contact)
|
if (!dbm::is_result($contacts)) {
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
$contactid = $contact[0]["id"];
|
$contact_id = $contacts[0]["id"];
|
||||||
|
|
||||||
// Update the newly created contact from data in the gcontact table
|
// Update the newly created contact from data in the gcontact table
|
||||||
$r = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'",
|
$gcontacts = q("SELECT `location`, `about`, `keywords`, `gender` FROM `gcontact` WHERE `nurl` = '%s'",
|
||||||
dbesc(normalise_link($data["url"])));
|
dbesc(normalise_link($data["url"])));
|
||||||
if ($r) {
|
if (dbm::is_result($gcontacts)) {
|
||||||
logger("Update contact ".$data["url"]);
|
logger("Update contact " . $data["url"] . ' from gcontact');
|
||||||
q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d",
|
q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d",
|
||||||
dbesc($r["location"]), dbesc($r["about"]), dbesc($r["keywords"]),
|
dbesc($gcontacts[0]["location"]), dbesc($gcontacts[0]["about"]), dbesc($gcontacts[0]["keywords"]),
|
||||||
dbesc($r["gender"]), intval($contactid));
|
dbesc($gcontacts[0]["gender"]), intval($contact_id));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != ""))
|
if (count($contacts) > 1 AND $uid == 0 AND $contact_id != 0 AND $url != "") {
|
||||||
q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`",
|
q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`",
|
||||||
dbesc(normalise_link($url)),
|
dbesc(normalise_link($url)),
|
||||||
intval($contactid));
|
intval($contact_id));
|
||||||
|
}
|
||||||
|
|
||||||
require_once("Photo.php");
|
require_once "Photo.php";
|
||||||
|
|
||||||
update_contact_avatar($data["photo"],$uid,$contactid);
|
update_contact_avatar($data["photo"], $uid, $contact_id);
|
||||||
|
|
||||||
$r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contactid));
|
$contacts = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contact_id));
|
||||||
|
|
||||||
// This condition should always be true
|
// This condition should always be true
|
||||||
if (!dbm::is_result($r))
|
if (!dbm::is_result($contacts)) {
|
||||||
return $contactid;
|
return $contact_id;
|
||||||
|
}
|
||||||
|
|
||||||
// Only update if there had something been changed
|
// Only update if there had something been changed
|
||||||
if (($data["addr"] != $r[0]["addr"]) OR
|
if ($data["addr"] != $contacts[0]["addr"] OR
|
||||||
($data["alias"] != $r[0]["alias"]) OR
|
$data["alias"] != $contacts[0]["alias"] OR
|
||||||
($data["name"] != $r[0]["name"]) OR
|
$data["name"] != $contacts[0]["name"] OR
|
||||||
($data["nick"] != $r[0]["nick"]))
|
$data["nick"] != $contacts[0]["nick"]) {
|
||||||
q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
|
q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
|
||||||
`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
|
`name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
|
||||||
dbesc($data["addr"]),
|
dbesc($data["addr"]),
|
||||||
|
|
@ -649,10 +675,11 @@ function get_contact($url, $uid = 0, $no_update = false) {
|
||||||
dbesc($data["nick"]),
|
dbesc($data["nick"]),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($contactid)
|
intval($contact_id)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return $contactid;
|
return $contact_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -675,15 +702,6 @@ function posts_from_gcontact(App $a, $gcontact_id) {
|
||||||
else
|
else
|
||||||
$sql = "`item`.`uid` = %d";
|
$sql = "`item`.`uid` = %d";
|
||||||
|
|
||||||
if(get_config('system', 'old_pager')) {
|
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `item`
|
|
||||||
WHERE `gcontact-id` = %d and $sql",
|
|
||||||
intval($gcontact_id),
|
|
||||||
intval(local_user()));
|
|
||||||
|
|
||||||
$a->set_pager_total($r[0]['total']);
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
||||||
`author-name` AS `name`, `owner-avatar` AS `photo`,
|
`author-name` AS `name`, `owner-avatar` AS `photo`,
|
||||||
`owner-link` AS `url`, `owner-avatar` AS `thumb`
|
`owner-link` AS `url`, `owner-avatar` AS `thumb`
|
||||||
|
|
@ -697,13 +715,9 @@ function posts_from_gcontact(App $a, $gcontact_id) {
|
||||||
intval($a->pager['itemspage'])
|
intval($a->pager['itemspage'])
|
||||||
);
|
);
|
||||||
|
|
||||||
$o = conversation($a,$r,'community',false);
|
$o = conversation($a, $r, 'community', false);
|
||||||
|
|
||||||
if(!get_config('system', 'old_pager')) {
|
$o .= alt_pager($a, count($r));
|
||||||
$o .= alt_pager($a,count($r));
|
|
||||||
} else {
|
|
||||||
$o .= paginate($a);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
@ -736,15 +750,6 @@ function posts_from_contact_url(App $a, $contact_url) {
|
||||||
|
|
||||||
$author_id = intval($r[0]["author-id"]);
|
$author_id = intval($r[0]["author-id"]);
|
||||||
|
|
||||||
if (get_config('system', 'old_pager')) {
|
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `item`
|
|
||||||
WHERE `author-id` = %d and $sql",
|
|
||||||
intval($author_id),
|
|
||||||
intval(local_user()));
|
|
||||||
|
|
||||||
$a->set_pager_total($r[0]['total']);
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
|
$r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
|
||||||
" ORDER BY `item`.`created` DESC LIMIT %d, %d",
|
" ORDER BY `item`.`created` DESC LIMIT %d, %d",
|
||||||
intval($author_id),
|
intval($author_id),
|
||||||
|
|
@ -753,13 +758,9 @@ function posts_from_contact_url(App $a, $contact_url) {
|
||||||
intval($a->pager['itemspage'])
|
intval($a->pager['itemspage'])
|
||||||
);
|
);
|
||||||
|
|
||||||
$o = conversation($a,$r,'community',false);
|
$o = conversation($a, $r, 'community', false);
|
||||||
|
|
||||||
if (!get_config('system', 'old_pager')) {
|
$o .= alt_pager($a, count($r));
|
||||||
$o .= alt_pager($a,count($r));
|
|
||||||
} else {
|
|
||||||
$o .= paginate($a);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -60,11 +60,20 @@ class Probe {
|
||||||
$xrd_timeout = Config::get('system','xrd_timeout', 20);
|
$xrd_timeout = Config::get('system','xrd_timeout', 20);
|
||||||
$redirects = 0;
|
$redirects = 0;
|
||||||
|
|
||||||
$xml = fetch_url($ssl_url, false, $redirects, $xrd_timeout, "application/xrd+xml");
|
$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$xml = $ret['body'];
|
||||||
|
|
||||||
$xrd = parse_xml_string($xml, false);
|
$xrd = parse_xml_string($xml, false);
|
||||||
|
|
||||||
if (!is_object($xrd)) {
|
if (!is_object($xrd)) {
|
||||||
$xml = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml");
|
$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$xml = $ret['body'];
|
||||||
$xrd = parse_xml_string($xml, false);
|
$xrd = parse_xml_string($xml, false);
|
||||||
}
|
}
|
||||||
if (!is_object($xrd))
|
if (!is_object($xrd))
|
||||||
|
|
@ -430,7 +439,12 @@ class Probe {
|
||||||
$xrd_timeout = Config::get('system','xrd_timeout', 20);
|
$xrd_timeout = Config::get('system','xrd_timeout', 20);
|
||||||
$redirects = 0;
|
$redirects = 0;
|
||||||
|
|
||||||
$data = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml");
|
$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$data = $ret['body'];
|
||||||
|
|
||||||
$xrd = parse_xml_string($data, false);
|
$xrd = parse_xml_string($data, false);
|
||||||
|
|
||||||
if (!is_object($xrd)) {
|
if (!is_object($xrd)) {
|
||||||
|
|
@ -482,9 +496,14 @@ class Probe {
|
||||||
* @return array noscrape data
|
* @return array noscrape data
|
||||||
*/
|
*/
|
||||||
private function poll_noscrape($noscrape, $data) {
|
private function poll_noscrape($noscrape, $data) {
|
||||||
$content = fetch_url($noscrape);
|
$ret = z_fetch_url($noscrape);
|
||||||
if (!$content)
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
$content = $ret['body'];
|
||||||
|
if (!$content) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$json = json_decode($content, true);
|
$json = json_decode($content, true);
|
||||||
if (!is_array($json))
|
if (!is_array($json))
|
||||||
|
|
@ -663,10 +682,14 @@ class Probe {
|
||||||
* @return array hcard data
|
* @return array hcard data
|
||||||
*/
|
*/
|
||||||
private function poll_hcard($hcard, $data, $dfrn = false) {
|
private function poll_hcard($hcard, $data, $dfrn = false) {
|
||||||
|
$ret = z_fetch_url($hcard);
|
||||||
$content = fetch_url($hcard);
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
if (!$content)
|
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
$content = $ret['body'];
|
||||||
|
if (!$content) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$doc = new DOMDocument();
|
$doc = new DOMDocument();
|
||||||
if (!@$doc->loadHTML($content))
|
if (!@$doc->loadHTML($content))
|
||||||
|
|
@ -859,8 +882,13 @@ class Probe {
|
||||||
$pubkey = substr($pubkey, strpos($pubkey, ',') + 1);
|
$pubkey = substr($pubkey, strpos($pubkey, ',') + 1);
|
||||||
else
|
else
|
||||||
$pubkey = substr($pubkey, 5);
|
$pubkey = substr($pubkey, 5);
|
||||||
} elseif (normalise_link($pubkey) == 'http://')
|
} elseif (normalise_link($pubkey) == 'http://') {
|
||||||
$pubkey = fetch_url($pubkey);
|
$ret = z_fetch_url($pubkey);
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$pubkey = $ret['body'];
|
||||||
|
}
|
||||||
|
|
||||||
$key = explode(".", $pubkey);
|
$key = explode(".", $pubkey);
|
||||||
|
|
||||||
|
|
@ -880,7 +908,11 @@ class Probe {
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Fetch all additional data from the feed
|
// Fetch all additional data from the feed
|
||||||
$feed = fetch_url($data["poll"]);
|
$ret = z_fetch_url($data["poll"]);
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$feed = $ret['body'];
|
||||||
$feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true);
|
$feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true);
|
||||||
if (!$feed_data)
|
if (!$feed_data)
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -1035,7 +1067,11 @@ class Probe {
|
||||||
* @return array feed data
|
* @return array feed data
|
||||||
*/
|
*/
|
||||||
private function feed($url, $probe = true) {
|
private function feed($url, $probe = true) {
|
||||||
$feed = fetch_url($url);
|
$ret = z_fetch_url($url);
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
$feed = $ret['body'];
|
||||||
$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
|
$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
|
||||||
|
|
||||||
if (!$feed_data) {
|
if (!$feed_data) {
|
||||||
|
|
|
||||||
|
|
@ -1686,20 +1686,16 @@ use \Friendica\Core\Config;
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($r[0]['body'] != "") {
|
if ($r[0]['body'] != "") {
|
||||||
if (!intval(get_config('system','old_share'))) {
|
if (strpos($r[0]['body'], "[/share]") !== false) {
|
||||||
if (strpos($r[0]['body'], "[/share]") !== false) {
|
$pos = strpos($r[0]['body'], "[share");
|
||||||
$pos = strpos($r[0]['body'], "[share");
|
$post = substr($r[0]['body'], $pos);
|
||||||
$post = substr($r[0]['body'], $pos);
|
} else {
|
||||||
} else {
|
$post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
|
||||||
$post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
|
|
||||||
|
|
||||||
$post .= $r[0]['body'];
|
|
||||||
$post .= "[/share]";
|
|
||||||
}
|
|
||||||
$_REQUEST['body'] = $post;
|
|
||||||
} else
|
|
||||||
$_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body'];
|
|
||||||
|
|
||||||
|
$post .= $r[0]['body'];
|
||||||
|
$post .= "[/share]";
|
||||||
|
}
|
||||||
|
$_REQUEST['body'] = $post;
|
||||||
$_REQUEST['profile_uid'] = api_user();
|
$_REQUEST['profile_uid'] = api_user();
|
||||||
$_REQUEST['type'] = 'wall';
|
$_REQUEST['type'] = 'wall';
|
||||||
$_REQUEST['api_source'] = true;
|
$_REQUEST['api_source'] = true;
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
||||||
$openid = new LightOpenID;
|
$openid = new LightOpenID;
|
||||||
$openid->identity = $openid_url;
|
$openid->identity = $openid_url;
|
||||||
$_SESSION['openid'] = $openid_url;
|
$_SESSION['openid'] = $openid_url;
|
||||||
|
$_SESSION['remember'] = $_POST['remember'];
|
||||||
$openid->returnUrl = App::get_baseurl(true).'/openid';
|
$openid->returnUrl = App::get_baseurl(true).'/openid';
|
||||||
goaway($openid->authUrl());
|
goaway($openid->authUrl());
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
|
|
@ -178,17 +179,12 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the user specified to remember the authentication, then set a cookie
|
if (! $_POST['remember']) {
|
||||||
// that expires after one week (the default is when the browser is closed).
|
|
||||||
// The cookie will be renewed automatically.
|
|
||||||
// The week ensures that sessions will expire after some inactivity.
|
|
||||||
if ($_POST['remember'])
|
|
||||||
new_cookie(604800, $r[0]);
|
|
||||||
else
|
|
||||||
new_cookie(0); // 0 means delete on browser exit
|
new_cookie(0); // 0 means delete on browser exit
|
||||||
|
}
|
||||||
|
|
||||||
// if we haven't failed up this point, log them in.
|
// if we haven't failed up this point, log them in.
|
||||||
|
$_SESSION['remember'] = $_POST['remember'];
|
||||||
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
|
$_SESSION['last_login_date'] = datetime_convert('UTC','UTC');
|
||||||
authenticate_success($record, true, true);
|
authenticate_success($record, true, true);
|
||||||
}
|
}
|
||||||
|
|
@ -203,39 +199,3 @@ function nuke_session() {
|
||||||
session_unset();
|
session_unset();
|
||||||
session_destroy();
|
session_destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Calculate the hash that is needed for the "Friendica" cookie
|
|
||||||
*
|
|
||||||
* @param array $user Record from "user" table
|
|
||||||
*
|
|
||||||
* @return string Hashed data
|
|
||||||
*/
|
|
||||||
function cookie_hash($user) {
|
|
||||||
return(hash("sha256", get_config("system", "site_prvkey").
|
|
||||||
$user["uprvkey"].
|
|
||||||
$user["password"]));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Set the "Friendica" cookie
|
|
||||||
*
|
|
||||||
* @param int $time
|
|
||||||
* @param array $user Record from "user" table
|
|
||||||
*/
|
|
||||||
function new_cookie($time, $user = array()) {
|
|
||||||
|
|
||||||
if ($time != 0)
|
|
||||||
$time = $time + time();
|
|
||||||
|
|
||||||
if ($user)
|
|
||||||
$value = json_encode(array("uid" => $user["uid"],
|
|
||||||
"hash" => cookie_hash($user),
|
|
||||||
"ip" => $_SERVER['REMOTE_ADDR']));
|
|
||||||
else
|
|
||||||
$value = "";
|
|
||||||
|
|
||||||
setcookie("Friendica", $value, $time, "/", "",
|
|
||||||
(get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,9 @@ function diaspora2bb($s) {
|
||||||
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
|
$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
|
||||||
|
|
||||||
// Handles single newlines
|
// Handles single newlines
|
||||||
$s = str_replace("\r", '<br>', $s);
|
$s = str_replace("\r\n", "\n", $s);
|
||||||
|
|
||||||
$s = str_replace("\n", " \n", $s);
|
$s = str_replace("\n", " \n", $s);
|
||||||
|
$s = str_replace("\r", " \n", $s);
|
||||||
|
|
||||||
// Replace lonely stars in lines not starting with it with literal stars
|
// Replace lonely stars in lines not starting with it with literal stars
|
||||||
$s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);
|
$s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);
|
||||||
|
|
|
||||||
|
|
@ -1163,8 +1163,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
||||||
// fix any escaped ampersands that may have been converted into links
|
// fix any escaped ampersands that may have been converted into links
|
||||||
$Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text);
|
$Text = preg_replace('/\<([^>]*?)(src|href)=(.*?)\&\;(.*?)\>/ism', '<$1$2=$3&$4>', $Text);
|
||||||
|
|
||||||
// sanitizes src attributes (only relative redir URIs or http URLs)
|
// sanitizes src attributes (http and redir URLs for displaying in a web page, cid used for inline images in emails)
|
||||||
$Text = preg_replace('#<([^>]*?)(src)="(?!http|redir)(.*?)"(.*?)>#ism', '<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text);
|
static $allowed_src_protocols = array('http', 'redir', 'cid');
|
||||||
|
$Text = preg_replace('#<([^>]*?)(src)="(?!' . implode('|', $allowed_src_protocols) . ')(.*?)"(.*?)>#ism',
|
||||||
|
'<$1$2=""$4 class="invalid-src" title="' . t('Invalid source protocol') . '">', $Text);
|
||||||
|
|
||||||
// sanitize href attributes (only whitelisted protocols URLs)
|
// sanitize href attributes (only whitelisted protocols URLs)
|
||||||
// default value for backward compatibility
|
// default value for backward compatibility
|
||||||
|
|
|
||||||
|
|
@ -416,8 +416,8 @@ These Fields are not added below (yet). They are here to for bug search.
|
||||||
`item`.`shadow`,
|
`item`.`shadow`,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
return "`item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
|
return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
|
||||||
`item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
|
`item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
|
||||||
`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
|
`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
|
||||||
`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
|
`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
|
||||||
`item`.`commented`, `item`.`created`, `item`.`edited`,
|
`item`.`commented`, `item`.`created`, `item`.`edited`,
|
||||||
|
|
@ -1066,8 +1066,9 @@ function builtin_activity_puller($item, &$conv_responses) {
|
||||||
else
|
else
|
||||||
$conv_responses[$mode][$item['thr-parent']] ++;
|
$conv_responses[$mode][$item['thr-parent']] ++;
|
||||||
|
|
||||||
if((local_user()) && (local_user() == $item['uid']) && ($item['self']))
|
if (public_contact() == $item['author-id']) {
|
||||||
$conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
|
$conv_responses[$mode][$item['thr-parent'] . '-self'] = 1;
|
||||||
|
}
|
||||||
|
|
||||||
$conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
|
$conv_responses[$mode][$item['thr-parent'] . '-l'][] = $url;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -398,7 +398,7 @@ function delivery_run(&$argv, &$argc){
|
||||||
|
|
||||||
logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
|
logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
|
||||||
|
|
||||||
if ($deliver_status == (-1)) {
|
if ($deliver_status < 0) {
|
||||||
logger('notifier: delivery failed: queuing message');
|
logger('notifier: delivery failed: queuing message');
|
||||||
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
|
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -391,7 +391,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return object XML root object
|
* @return object XML root object
|
||||||
*/
|
*/
|
||||||
private function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
|
private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
|
||||||
|
|
||||||
if ($alternatelink == "")
|
if ($alternatelink == "")
|
||||||
$alternatelink = $owner['url'];
|
$alternatelink = $owner['url'];
|
||||||
|
|
@ -462,7 +462,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return object XML author object
|
* @return object XML author object
|
||||||
*/
|
*/
|
||||||
private function add_author($doc, $owner, $authorelement, $public) {
|
private static function add_author($doc, $owner, $authorelement, $public) {
|
||||||
|
|
||||||
// Is the profile hidden or shouldn't be published in the net? Then add the "hide" element
|
// Is the profile hidden or shouldn't be published in the net? Then add the "hide" element
|
||||||
$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||||
|
|
@ -591,7 +591,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return object XML author object
|
* @return object XML author object
|
||||||
*/
|
*/
|
||||||
private function add_entry_author($doc, $element, $contact_url, $item) {
|
private static function add_entry_author($doc, $element, $contact_url, $item) {
|
||||||
|
|
||||||
$contact = get_contact_details_by_url($contact_url, $item["uid"]);
|
$contact = get_contact_details_by_url($contact_url, $item["uid"]);
|
||||||
|
|
||||||
|
|
@ -631,7 +631,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return object XML activity object
|
* @return object XML activity object
|
||||||
*/
|
*/
|
||||||
private function create_activity($doc, $element, $activity) {
|
private static function create_activity($doc, $element, $activity) {
|
||||||
|
|
||||||
if($activity) {
|
if($activity) {
|
||||||
$entry = $doc->createElement($element);
|
$entry = $doc->createElement($element);
|
||||||
|
|
@ -685,7 +685,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return object XML attachment object
|
* @return object XML attachment object
|
||||||
*/
|
*/
|
||||||
private function get_attachment($doc, $root, $item) {
|
private static function get_attachment($doc, $root, $item) {
|
||||||
$arr = explode('[/attach],',$item['attach']);
|
$arr = explode('[/attach],',$item['attach']);
|
||||||
if(count($arr)) {
|
if(count($arr)) {
|
||||||
foreach($arr as $r) {
|
foreach($arr as $r) {
|
||||||
|
|
@ -720,7 +720,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return object XML entry object
|
* @return object XML entry object
|
||||||
*/
|
*/
|
||||||
private function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
|
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
|
||||||
|
|
||||||
$mentioned = array();
|
$mentioned = array();
|
||||||
|
|
||||||
|
|
@ -913,11 +913,18 @@ class dfrn {
|
||||||
|
|
||||||
logger('dfrn_deliver: ' . $url);
|
logger('dfrn_deliver: ' . $url);
|
||||||
|
|
||||||
$xml = fetch_url($url);
|
$ret = z_fetch_url($url);
|
||||||
|
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return -2; // timed out
|
||||||
|
}
|
||||||
|
|
||||||
|
$xml = $ret['body'];
|
||||||
|
|
||||||
$curl_stat = $a->get_curl_code();
|
$curl_stat = $a->get_curl_code();
|
||||||
if(! $curl_stat)
|
if (!$curl_stat) {
|
||||||
return(-1); // timed out
|
return -3; // timed out
|
||||||
|
}
|
||||||
|
|
||||||
logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
|
logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
|
||||||
|
|
||||||
|
|
@ -1017,24 +1024,24 @@ class dfrn {
|
||||||
$key = Crypto::createNewRandomKey();
|
$key = Crypto::createNewRandomKey();
|
||||||
} catch (CryptoTestFailed $ex) {
|
} catch (CryptoTestFailed $ex) {
|
||||||
logger('Cannot safely create a key');
|
logger('Cannot safely create a key');
|
||||||
return -1;
|
return -4;
|
||||||
} catch (CannotPerformOperation $ex) {
|
} catch (CannotPerformOperation $ex) {
|
||||||
logger('Cannot safely create a key');
|
logger('Cannot safely create a key');
|
||||||
return -1;
|
return -5;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
$data = Crypto::encrypt($postvars['data'], $key);
|
$data = Crypto::encrypt($postvars['data'], $key);
|
||||||
} catch (CryptoTestFailed $ex) {
|
} catch (CryptoTestFailed $ex) {
|
||||||
logger('Cannot safely perform encryption');
|
logger('Cannot safely perform encryption');
|
||||||
return -1;
|
return -6;
|
||||||
} catch (CannotPerformOperation $ex) {
|
} catch (CannotPerformOperation $ex) {
|
||||||
logger('Cannot safely perform encryption');
|
logger('Cannot safely perform encryption');
|
||||||
return -1;
|
return -7;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
logger("rino: invalid requested verision '$rino_remote_version'");
|
logger("rino: invalid requested verision '$rino_remote_version'");
|
||||||
return -1;
|
return -8;
|
||||||
}
|
}
|
||||||
|
|
||||||
$postvars['rino'] = $rino_remote_version;
|
$postvars['rino'] = $rino_remote_version;
|
||||||
|
|
@ -1068,16 +1075,18 @@ class dfrn {
|
||||||
|
|
||||||
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
|
logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
|
||||||
|
|
||||||
$xml = post_url($contact['notify'],$postvars);
|
$xml = post_url($contact['notify'], $postvars);
|
||||||
|
|
||||||
logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
|
logger('dfrn_deliver: ' . "RECEIVED: " . $xml, LOGGER_DATA);
|
||||||
|
|
||||||
$curl_stat = $a->get_curl_code();
|
$curl_stat = $a->get_curl_code();
|
||||||
if((! $curl_stat) || (! strlen($xml)))
|
if ((!$curl_stat) || (!strlen($xml))) {
|
||||||
return(-1); // timed out
|
return -9; // timed out
|
||||||
|
}
|
||||||
|
|
||||||
if(($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after')))
|
if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) {
|
||||||
return(-1);
|
return -10;
|
||||||
|
}
|
||||||
|
|
||||||
if(strpos($xml,'<?xml') === false) {
|
if(strpos($xml,'<?xml') === false) {
|
||||||
logger('dfrn_deliver: phase 2: no valid XML returned');
|
logger('dfrn_deliver: phase 2: no valid XML returned');
|
||||||
|
|
@ -1103,7 +1112,7 @@ class dfrn {
|
||||||
* @param string $birthday Birthday of the contact
|
* @param string $birthday Birthday of the contact
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private function birthday_event($contact, $birthday) {
|
private static function birthday_event($contact, $birthday) {
|
||||||
|
|
||||||
// Check for duplicates
|
// Check for duplicates
|
||||||
$r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
|
$r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
|
||||||
|
|
@ -1146,7 +1155,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return Returns an array with relevant data of the author
|
* @return Returns an array with relevant data of the author
|
||||||
*/
|
*/
|
||||||
private function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
|
private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
|
||||||
|
|
||||||
$author = array();
|
$author = array();
|
||||||
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
|
$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
|
||||||
|
|
@ -1358,7 +1367,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return string XML string
|
* @return string XML string
|
||||||
*/
|
*/
|
||||||
private function transform_activity($xpath, $activity, $element) {
|
private static function transform_activity($xpath, $activity, $element) {
|
||||||
if (!is_object($activity))
|
if (!is_object($activity))
|
||||||
return "";
|
return "";
|
||||||
|
|
||||||
|
|
@ -1403,7 +1412,7 @@ class dfrn {
|
||||||
* @param object $mail mail elements
|
* @param object $mail mail elements
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
*/
|
*/
|
||||||
private function process_mail($xpath, $mail, $importer) {
|
private static function process_mail($xpath, $mail, $importer) {
|
||||||
|
|
||||||
logger("Processing mails");
|
logger("Processing mails");
|
||||||
|
|
||||||
|
|
@ -1454,7 +1463,7 @@ class dfrn {
|
||||||
* @param object $suggestion suggestion elements
|
* @param object $suggestion suggestion elements
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
*/
|
*/
|
||||||
private function process_suggestion($xpath, $suggestion, $importer) {
|
private static function process_suggestion($xpath, $suggestion, $importer) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
logger("Processing suggestions");
|
logger("Processing suggestions");
|
||||||
|
|
@ -1556,7 +1565,7 @@ class dfrn {
|
||||||
* @param object $relocation relocation elements
|
* @param object $relocation relocation elements
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
*/
|
*/
|
||||||
private function process_relocation($xpath, $relocation, $importer) {
|
private static function process_relocation($xpath, $relocation, $importer) {
|
||||||
|
|
||||||
logger("Processing relocations");
|
logger("Processing relocations");
|
||||||
|
|
||||||
|
|
@ -1685,7 +1694,7 @@ class dfrn {
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
* @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
|
* @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
|
||||||
*/
|
*/
|
||||||
private function update_content($current, $item, $importer, $entrytype) {
|
private static function update_content($current, $item, $importer, $entrytype) {
|
||||||
$changed = false;
|
$changed = false;
|
||||||
|
|
||||||
if (edited_timestamp_is_newer($current, $item)) {
|
if (edited_timestamp_is_newer($current, $item)) {
|
||||||
|
|
@ -1737,7 +1746,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return int Is it a toplevel entry, a comment or a relayed comment?
|
* @return int Is it a toplevel entry, a comment or a relayed comment?
|
||||||
*/
|
*/
|
||||||
private function get_entry_type($importer, $item) {
|
private static function get_entry_type($importer, $item) {
|
||||||
if ($item["parent-uri"] != $item["uri"]) {
|
if ($item["parent-uri"] != $item["uri"]) {
|
||||||
$community = false;
|
$community = false;
|
||||||
|
|
||||||
|
|
@ -1803,7 +1812,7 @@ class dfrn {
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
* @param int $posted_id The record number of item record that was just posted
|
* @param int $posted_id The record number of item record that was just posted
|
||||||
*/
|
*/
|
||||||
private function do_poke($item, $importer, $posted_id) {
|
private static function do_poke($item, $importer, $posted_id) {
|
||||||
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
|
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
|
||||||
if(!$verb)
|
if(!$verb)
|
||||||
return;
|
return;
|
||||||
|
|
@ -1858,7 +1867,7 @@ class dfrn {
|
||||||
*
|
*
|
||||||
* @return bool Should the processing of the entries be continued?
|
* @return bool Should the processing of the entries be continued?
|
||||||
*/
|
*/
|
||||||
private function process_verbs($entrytype, $importer, &$item, &$is_like) {
|
private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
|
||||||
|
|
||||||
logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
|
logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
|
||||||
|
|
||||||
|
|
@ -1958,7 +1967,7 @@ class dfrn {
|
||||||
* @param object $links link elements
|
* @param object $links link elements
|
||||||
* @param array $item the item record
|
* @param array $item the item record
|
||||||
*/
|
*/
|
||||||
private function parse_links($links, &$item) {
|
private static function parse_links($links, &$item) {
|
||||||
$rel = "";
|
$rel = "";
|
||||||
$href = "";
|
$href = "";
|
||||||
$type = "";
|
$type = "";
|
||||||
|
|
@ -2001,7 +2010,7 @@ class dfrn {
|
||||||
* @param object $entry entry elements
|
* @param object $entry entry elements
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
*/
|
*/
|
||||||
private function process_entry($header, $xpath, $entry, $importer) {
|
private static function process_entry($header, $xpath, $entry, $importer) {
|
||||||
|
|
||||||
logger("Processing entries");
|
logger("Processing entries");
|
||||||
|
|
||||||
|
|
@ -2010,6 +2019,20 @@ class dfrn {
|
||||||
// Get the uri
|
// Get the uri
|
||||||
$item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
|
$item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
|
$item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
|
$current = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
|
dbesc($item["uri"]),
|
||||||
|
intval($importer["importer_uid"])
|
||||||
|
);
|
||||||
|
|
||||||
|
// Is there an existing item?
|
||||||
|
if (dbm::is_result($current) AND edited_timestamp_is_newer($current[0], $item) AND
|
||||||
|
(datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
|
||||||
|
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Fetch the owner
|
// Fetch the owner
|
||||||
$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
|
$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
|
||||||
|
|
||||||
|
|
@ -2027,7 +2050,6 @@ class dfrn {
|
||||||
$item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue;
|
$item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
$item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
|
$item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
|
||||||
$item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
|
|
||||||
|
|
||||||
$item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
|
$item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
|
||||||
$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]);
|
$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]);
|
||||||
|
|
@ -2215,18 +2237,13 @@ class dfrn {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
|
||||||
dbesc($item["uri"]),
|
|
||||||
intval($importer["importer_uid"])
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!self::process_verbs($entrytype, $importer, $item, $is_like)) {
|
if (!self::process_verbs($entrytype, $importer, $item, $is_like)) {
|
||||||
logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG);
|
logger("Exiting because 'process_verbs' told us so", LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update content if 'updated' changes
|
// Update content if 'updated' changes
|
||||||
if (dbm::is_result($r)) {
|
if (dbm::is_result($current)) {
|
||||||
if (self::update_content($r[0], $item, $importer, $entrytype))
|
if (self::update_content($r[0], $item, $importer, $entrytype))
|
||||||
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
|
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
|
||||||
else
|
else
|
||||||
|
|
@ -2311,7 +2328,7 @@ class dfrn {
|
||||||
* @param object $deletion deletion elements
|
* @param object $deletion deletion elements
|
||||||
* @param array $importer Record of the importer user mixed with contact of the content
|
* @param array $importer Record of the importer user mixed with contact of the content
|
||||||
*/
|
*/
|
||||||
private function process_deletion($xpath, $deletion, $importer) {
|
private static function process_deletion($xpath, $deletion, $importer) {
|
||||||
|
|
||||||
logger("Processing deletions");
|
logger("Processing deletions");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -177,18 +177,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
||||||
foreach (array_reverse($entrylist) AS $entry) {
|
foreach (array_reverse($entrylist) AS $entry) {
|
||||||
$item = array_merge($header, $author);
|
$item = array_merge($header, $author);
|
||||||
|
|
||||||
$item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
|
|
||||||
|
|
||||||
if ($item["title"] == "")
|
|
||||||
$item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
|
|
||||||
|
|
||||||
if ($item["title"] == "")
|
|
||||||
$item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
|
|
||||||
|
|
||||||
$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
|
|
||||||
if (!is_object($alternate))
|
|
||||||
$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
|
|
||||||
|
|
||||||
if (is_object($alternate))
|
if (is_object($alternate))
|
||||||
foreach($alternate AS $attributes)
|
foreach($alternate AS $attributes)
|
||||||
if ($attributes->name == "href")
|
if ($attributes->name == "href")
|
||||||
|
|
@ -212,6 +200,27 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
||||||
|
|
||||||
$item["parent-uri"] = $item["uri"];
|
$item["parent-uri"] = $item["uri"];
|
||||||
|
|
||||||
|
if (!$simulate) {
|
||||||
|
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
|
||||||
|
intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
|
||||||
|
if ($r) {
|
||||||
|
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
|
if ($item["title"] == "")
|
||||||
|
$item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
|
if ($item["title"] == "")
|
||||||
|
$item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
|
$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
|
||||||
|
if (!is_object($alternate))
|
||||||
|
$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
|
||||||
|
|
||||||
$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
|
$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
|
||||||
|
|
||||||
if ($published == "")
|
if ($published == "")
|
||||||
|
|
@ -250,15 +259,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
|
||||||
if ($creator != "")
|
if ($creator != "")
|
||||||
$item["author-name"] = $creator;
|
$item["author-name"] = $creator;
|
||||||
|
|
||||||
if (!$simulate) {
|
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
|
|
||||||
intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
|
|
||||||
if ($r) {
|
|
||||||
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// @TODO ?
|
/// @TODO ?
|
||||||
// <category>Ausland</category>
|
// <category>Ausland</category>
|
||||||
// <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
|
// <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
|
||||||
|
|
|
||||||
264
include/like.php
264
include/like.php
|
|
@ -18,155 +18,169 @@ require_once("include/diaspora.php");
|
||||||
function do_like($item_id, $verb) {
|
function do_like($item_id, $verb) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
if(! local_user() && ! remote_user()) {
|
if (! local_user() && ! remote_user()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch($verb) {
|
switch ($verb) {
|
||||||
case 'like':
|
case 'like':
|
||||||
|
$bodyverb = t('%1$s likes %2$s\'s %3$s');
|
||||||
|
$activity = ACTIVITY_LIKE;
|
||||||
|
break;
|
||||||
case 'unlike':
|
case 'unlike':
|
||||||
|
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
|
||||||
$activity = ACTIVITY_LIKE;
|
$activity = ACTIVITY_LIKE;
|
||||||
break;
|
break;
|
||||||
case 'dislike':
|
case 'dislike':
|
||||||
case 'undislike':
|
case 'undislike':
|
||||||
|
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
|
||||||
$activity = ACTIVITY_DISLIKE;
|
$activity = ACTIVITY_DISLIKE;
|
||||||
break;
|
break;
|
||||||
case 'attendyes':
|
case 'attendyes':
|
||||||
case 'unattendyes':
|
case 'unattendyes':
|
||||||
|
$bodyverb = t('%1$s is attending %2$s\'s %3$s');
|
||||||
$activity = ACTIVITY_ATTEND;
|
$activity = ACTIVITY_ATTEND;
|
||||||
break;
|
break;
|
||||||
case 'attendno':
|
case 'attendno':
|
||||||
case 'unattendno':
|
case 'unattendno':
|
||||||
|
$bodyverb = t('%1$s is not attending %2$s\'s %3$s');
|
||||||
$activity = ACTIVITY_ATTENDNO;
|
$activity = ACTIVITY_ATTENDNO;
|
||||||
break;
|
break;
|
||||||
case 'attendmaybe':
|
case 'attendmaybe':
|
||||||
case 'unattendmaybe':
|
case 'unattendmaybe':
|
||||||
|
$bodyverb = t('%1$s may attend %2$s\'s %3$s');
|
||||||
$activity = ACTIVITY_ATTENDMAYBE;
|
$activity = ACTIVITY_ATTENDMAYBE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
logger('like: unknown verb ' . $verb . ' for item ' . $item_id);
|
||||||
return false;
|
return false;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Enable activity toggling instead of on/off
|
||||||
|
$event_verb_flag = $activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE;
|
||||||
|
|
||||||
logger('like: verb ' . $verb . ' item ' . $item_id);
|
logger('like: verb ' . $verb . ' item ' . $item_id);
|
||||||
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
|
// Retrieve item
|
||||||
|
$items = q("SELECT * FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
|
||||||
dbesc($item_id),
|
dbesc($item_id),
|
||||||
dbesc($item_id)
|
dbesc($item_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! $item_id || (! dbm::is_result($r))) {
|
if (! $item_id || ! dbm::is_result($items)) {
|
||||||
logger('like: no item ' . $item_id);
|
logger('like: unknown item ' . $item_id);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$item = $r[0];
|
$item = $items[0];
|
||||||
|
|
||||||
$owner_uid = $item['uid'];
|
if (! can_write_wall($a, $item['uid'])) {
|
||||||
|
logger('like: unable to write on wall ' . $item['uid']);
|
||||||
if (! can_write_wall($a,$owner_uid)) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$remote_owner = null;
|
// Retrieves the local post owner
|
||||||
|
$owners = q("SELECT `contact`.* FROM `contact`
|
||||||
|
WHERE `contact`.`self` = 1
|
||||||
|
AND `contact`.`uid` = %d",
|
||||||
|
intval($item['uid'])
|
||||||
|
);
|
||||||
|
if (dbm::is_result($owners)) {
|
||||||
|
$owner_self_contact = $owners[0];
|
||||||
|
} else {
|
||||||
|
logger('like: unknown owner ' . $item['uid']);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if(! $item['wall']) {
|
// Retrieve the current logged in user's public contact
|
||||||
// The top level post may have been written by somebody on another system
|
$author_id = public_contact();
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
|
||||||
intval($item['contact-id']),
|
$contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
|
||||||
intval($item['uid'])
|
intval($author_id)
|
||||||
|
);
|
||||||
|
if (dbm::is_result($contacts)) {
|
||||||
|
$author_contact = $contacts[0];
|
||||||
|
} else {
|
||||||
|
logger('like: unknown author ' . $author_id);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Contact-id is the uid-dependant author contact
|
||||||
|
if (local_user() == $item['uid']) {
|
||||||
|
$item_contact_id = $owner_self_contact['id'];
|
||||||
|
$item_contact = $owner_self_contact;
|
||||||
|
} else {
|
||||||
|
$item_contact_id = get_contact($author_contact['url'], $item['uid']);
|
||||||
|
|
||||||
|
$contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
|
||||||
|
intval($item_contact_id)
|
||||||
);
|
);
|
||||||
if (! dbm::is_result($r)) {
|
if (dbm::is_result($contacts)) {
|
||||||
|
$item_contact = $contacts[0];
|
||||||
|
} else {
|
||||||
|
logger('like: unknown item contact ' . $item_contact_id);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (! $r[0]['self']) {
|
|
||||||
$remote_owner = $r[0];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// this represents the post owner on this system.
|
// Look for an existing verb row
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
|
||||||
WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
|
|
||||||
intval($owner_uid)
|
|
||||||
);
|
|
||||||
if (dbm::is_result($r)) {
|
|
||||||
$owner = $r[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $owner) {
|
|
||||||
logger('like: no owner');
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $remote_owner) {
|
|
||||||
$remote_owner = $owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This represents the person posting
|
|
||||||
|
|
||||||
if ((local_user()) && (local_user() == $owner_uid)) {
|
|
||||||
$contact = $owner;
|
|
||||||
} else {
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
|
||||||
intval($_SESSION['visitor_id']),
|
|
||||||
intval($owner_uid)
|
|
||||||
);
|
|
||||||
if (dbm::is_result($r)) {
|
|
||||||
$contact = $r[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (! $contact) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$verbs = " '".dbesc($activity)."' ";
|
|
||||||
|
|
||||||
// event participation are essentially radio toggles. If you make a subsequent choice,
|
// event participation are essentially radio toggles. If you make a subsequent choice,
|
||||||
// we need to eradicate your first choice.
|
// we need to eradicate your first choice.
|
||||||
if ($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
|
if ($event_verb_flag) {
|
||||||
$verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' ";
|
$verbs = "'" . dbesc(ACTIVITY_ATTEND) . "', '" . dbesc(ACTIVITY_ATTENDNO) . "', '" . dbesc(ACTIVITY_ATTENDMAYBE) . "'";
|
||||||
|
} else {
|
||||||
|
$verbs = "'".dbesc($activity)."'";
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT `id`, `guid` FROM `item` WHERE `verb` IN ( $verbs ) AND `deleted` = 0
|
$existing_like = q("SELECT `id`, `guid`, `verb` FROM `item`
|
||||||
AND `contact-id` = %d AND `uid` = %d
|
WHERE `verb` IN ($verbs)
|
||||||
AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s') LIMIT 1",
|
AND `deleted` = 0
|
||||||
intval($contact['id']), intval($owner_uid),
|
AND `author-id` = %d
|
||||||
|
AND `uid` = %d
|
||||||
|
AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s')
|
||||||
|
LIMIT 1",
|
||||||
|
intval($author_contact['id']),
|
||||||
|
intval($item['uid']),
|
||||||
dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
|
dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
|
||||||
);
|
);
|
||||||
|
|
||||||
if (dbm::is_result($r)) {
|
// If it exists, mark it as deleted
|
||||||
$like_item = $r[0];
|
if (dbm::is_result($existing_like)) {
|
||||||
|
$like_item = $existing_like[0];
|
||||||
|
|
||||||
// Already voted, undo it
|
// Already voted, undo it
|
||||||
$r = q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d",
|
q("UPDATE `item` SET `deleted` = 1, `unseen` = 1, `changed` = '%s' WHERE `id` = %d",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($like_item['id'])
|
intval($like_item['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
// Clean up the Diaspora signatures for this like
|
// Clean up the Diaspora signatures for this like
|
||||||
// Go ahead and do it even if Diaspora support is disabled. We still want to clean up
|
// Go ahead and do it even if Diaspora support is disabled. We still want to clean up
|
||||||
// if it had been enabled in the past
|
// if it had been enabled in the past
|
||||||
$r = q("DELETE FROM `sign` WHERE `iid` = %d",
|
q("DELETE FROM `sign` WHERE `iid` = %d",
|
||||||
intval($like_item['id'])
|
intval($like_item['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
$like_item_id = $like_item['id'];
|
$like_item_id = $like_item['id'];
|
||||||
proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $like_item_id);
|
proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $like_item_id);
|
||||||
|
|
||||||
|
if (!$event_verb_flag || $like_item['verb'] == $activity) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verb is "un-something", just trying to delete existing entries
|
||||||
|
if (strpos($verb, 'un') === 0) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$uri = item_new_uri($a->get_hostname(),$owner_uid);
|
// Else or if event verb different from existing row, create a new item row
|
||||||
|
|
||||||
$post_type = (($item['resource-id']) ? t('photo') : t('status'));
|
$post_type = (($item['resource-id']) ? t('photo') : t('status'));
|
||||||
if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
|
if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
|
||||||
$post_type = t('event');
|
$post_type = t('event');
|
||||||
}
|
}
|
||||||
$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
|
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
|
||||||
$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
|
$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
|
||||||
$body = $item['body'];
|
$body = $item['body'];
|
||||||
|
|
||||||
$obj = <<< EOT
|
$obj = <<< EOT
|
||||||
|
|
@ -180,80 +194,62 @@ function do_like($item_id, $verb) {
|
||||||
<content>$body</content>
|
<content>$body</content>
|
||||||
</object>
|
</object>
|
||||||
EOT;
|
EOT;
|
||||||
if ($verb === 'like') {
|
|
||||||
$bodyverb = t('%1$s likes %2$s\'s %3$s');
|
|
||||||
}
|
|
||||||
if ($verb === 'dislike') {
|
|
||||||
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
|
|
||||||
}
|
|
||||||
if ($verb === 'attendyes') {
|
|
||||||
$bodyverb = t('%1$s is attending %2$s\'s %3$s');
|
|
||||||
}
|
|
||||||
if ($verb === 'attendno') {
|
|
||||||
$bodyverb = t('%1$s is not attending %2$s\'s %3$s');
|
|
||||||
}
|
|
||||||
if ($verb === 'attendmaybe') {
|
|
||||||
$bodyverb = t('%1$s may attend %2$s\'s %3$s');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! isset($bodyverb)) {
|
$ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
|
|
||||||
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
|
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
|
||||||
$plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
|
$plink = '[url=' . App::get_baseurl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
|
||||||
|
|
||||||
/// @TODO Or rewrite this to multi-line initialization of the array?
|
$new_item = array(
|
||||||
$arr = array();
|
'guid' => get_guid(32),
|
||||||
|
'uri' => item_new_uri($a->get_hostname(), $item['uid']),
|
||||||
|
'uid' => $item['uid'],
|
||||||
|
'contact-id' => $item_contact_id,
|
||||||
|
'type' => 'activity',
|
||||||
|
'wall' => $item['wall'],
|
||||||
|
'origin' => 1,
|
||||||
|
'gravity' => GRAVITY_LIKE,
|
||||||
|
'parent' => $item['id'],
|
||||||
|
'parent-uri' => $item['uri'],
|
||||||
|
'thr-parent' => $item['uri'],
|
||||||
|
'owner-id' => $item['owner-id'],
|
||||||
|
'owner-name' => $item['owner-name'],
|
||||||
|
'owner-link' => $item['owner-link'],
|
||||||
|
'owner-avatar' => $item['owner-avatar'],
|
||||||
|
'author-id' => $author_contact['id'],
|
||||||
|
'author-name' => $author_contact['name'],
|
||||||
|
'author-link' => $author_contact['url'],
|
||||||
|
'author-avatar' => $author_contact['thumb'],
|
||||||
|
'body' => sprintf($bodyverb, $ulink, $alink, $plink),
|
||||||
|
'verb' => $activity,
|
||||||
|
'object-type' => $objtype,
|
||||||
|
'object' => $obj,
|
||||||
|
'allow_cid' => $item['allow_cid'],
|
||||||
|
'allow_gid' => $item['allow_gid'],
|
||||||
|
'deny_cid' => $item['deny_cid'],
|
||||||
|
'deny_gid' => $item['deny_gid'],
|
||||||
|
'visible' => 1,
|
||||||
|
'unseen' => 1,
|
||||||
|
'last-child' => 0
|
||||||
|
);
|
||||||
|
|
||||||
$arr['guid'] = get_guid(32);
|
$new_item_id = item_store($new_item);
|
||||||
$arr['uri'] = $uri;
|
|
||||||
$arr['uid'] = $owner_uid;
|
|
||||||
$arr['contact-id'] = $contact['id'];
|
|
||||||
$arr['type'] = 'activity';
|
|
||||||
$arr['wall'] = $item['wall'];
|
|
||||||
$arr['origin'] = 1;
|
|
||||||
$arr['gravity'] = GRAVITY_LIKE;
|
|
||||||
$arr['parent'] = $item['id'];
|
|
||||||
$arr['parent-uri'] = $item['uri'];
|
|
||||||
$arr['thr-parent'] = $item['uri'];
|
|
||||||
$arr['owner-name'] = $remote_owner['name'];
|
|
||||||
$arr['owner-link'] = $remote_owner['url'];
|
|
||||||
$arr['owner-avatar'] = $remote_owner['thumb'];
|
|
||||||
$arr['author-name'] = $contact['name'];
|
|
||||||
$arr['author-link'] = $contact['url'];
|
|
||||||
$arr['author-avatar'] = $contact['thumb'];
|
|
||||||
$arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
|
|
||||||
$arr['verb'] = $activity;
|
|
||||||
$arr['object-type'] = $objtype;
|
|
||||||
$arr['object'] = $obj;
|
|
||||||
$arr['allow_cid'] = $item['allow_cid'];
|
|
||||||
$arr['allow_gid'] = $item['allow_gid'];
|
|
||||||
$arr['deny_cid'] = $item['deny_cid'];
|
|
||||||
$arr['deny_gid'] = $item['deny_gid'];
|
|
||||||
$arr['visible'] = 1;
|
|
||||||
$arr['unseen'] = 1;
|
|
||||||
$arr['last-child'] = 0;
|
|
||||||
|
|
||||||
$post_id = item_store($arr);
|
|
||||||
|
|
||||||
|
// @todo: Explain this block
|
||||||
if (! $item['visible']) {
|
if (! $item['visible']) {
|
||||||
$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
|
q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
|
||||||
intval($item['id']),
|
intval($item['id']),
|
||||||
intval($owner_uid)
|
intval($item['uid'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Save the author information for the like in case we need to relay to Diaspora
|
// Save the author information for the like in case we need to relay to Diaspora
|
||||||
Diaspora::store_like_signature($contact, $post_id);
|
Diaspora::store_like_signature($item_contact, $new_item_id);
|
||||||
|
|
||||||
$arr['id'] = $post_id;
|
$new_item['id'] = $new_item_id;
|
||||||
|
|
||||||
call_hooks('post_local_end', $arr);
|
call_hooks('post_local_end', $new_item);
|
||||||
|
|
||||||
proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $post_id);
|
proc_run(PRIORITY_HIGH, "include/notifier.php", "like", $new_item_id);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -143,6 +143,8 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
|
||||||
logger('fetch_url error fetching '.$url.': '.curl_error($ch), LOGGER_NORMAL);
|
logger('fetch_url error fetching '.$url.': '.curl_error($ch), LOGGER_NORMAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$ret['errno'] = curl_errno($ch);
|
||||||
|
|
||||||
$base = $s;
|
$base = $s;
|
||||||
$curl_info = @curl_getinfo($ch);
|
$curl_info = @curl_getinfo($ch);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,11 @@ function RemoveReply($subject) {
|
||||||
function onepoll_run(&$argv, &$argc){
|
function onepoll_run(&$argv, &$argc){
|
||||||
global $a, $db;
|
global $a, $db;
|
||||||
|
|
||||||
if(is_null($a)) {
|
if (is_null($a)) {
|
||||||
$a = new App;
|
$a = new App;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_null($db)) {
|
if (is_null($db)) {
|
||||||
@include(".htconfig.php");
|
@include(".htconfig.php");
|
||||||
require_once("include/dba.php");
|
require_once("include/dba.php");
|
||||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||||
|
|
@ -48,21 +48,25 @@ function onepoll_run(&$argv, &$argc){
|
||||||
$force = false;
|
$force = false;
|
||||||
$restart = false;
|
$restart = false;
|
||||||
|
|
||||||
if(($argc > 1) && (intval($argv[1])))
|
if (($argc > 1) && (intval($argv[1]))) {
|
||||||
$contact_id = intval($argv[1]);
|
$contact_id = intval($argv[1]);
|
||||||
|
}
|
||||||
|
|
||||||
if(($argc > 2) && ($argv[2] == "force"))
|
if (($argc > 2) && ($argv[2] == "force")) {
|
||||||
$force = true;
|
$force = true;
|
||||||
|
}
|
||||||
|
|
||||||
if(! $contact_id) {
|
if (! $contact_id) {
|
||||||
logger('onepoll: no contact');
|
logger('onepoll: no contact');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't check this stuff if the function is called by the poller
|
// Don't check this stuff if the function is called by the poller
|
||||||
if (App::callstack() != "poller_run")
|
if (App::callstack() != "poller_run") {
|
||||||
if (App::is_already_running('onepoll'.$contact_id, '', 540))
|
if (App::is_already_running('onepoll'.$contact_id, '', 540)) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$d = datetime_convert();
|
$d = datetime_convert();
|
||||||
|
|
||||||
|
|
@ -83,8 +87,9 @@ function onepoll_run(&$argv, &$argc){
|
||||||
intval($contact_id)
|
intval($contact_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! count($contacts))
|
if (! count($contacts)) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$contact = $contacts[0];
|
$contact = $contacts[0];
|
||||||
|
|
||||||
|
|
@ -94,9 +99,11 @@ function onepoll_run(&$argv, &$argc){
|
||||||
where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
|
where `cid` = %d and updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
|
||||||
intval($contact['id'])
|
intval($contact['id'])
|
||||||
);
|
);
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r)) {
|
||||||
if (!$r[0]['total'])
|
if (!$r[0]['total']) {
|
||||||
poco_load($contact['id'],$importer_uid,0,$contact['poco']);
|
poco_load($contact['id'],$importer_uid,0,$contact['poco']);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
|
/// @TODO Check why we don't poll the Diaspora feed at the moment (some guid problem in the items?)
|
||||||
|
|
@ -127,24 +134,24 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
$t = $contact['last-update'];
|
$t = $contact['last-update'];
|
||||||
|
|
||||||
if($contact['subhub']) {
|
if ($contact['subhub']) {
|
||||||
$poll_interval = get_config('system','pushpoll_frequency');
|
$poll_interval = get_config('system','pushpoll_frequency');
|
||||||
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
|
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
|
||||||
$hub_update = false;
|
$hub_update = false;
|
||||||
|
|
||||||
if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
|
if (datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) {
|
||||||
$hub_update = true;
|
$hub_update = true;
|
||||||
}
|
}
|
||||||
else
|
} else {
|
||||||
$hub_update = false;
|
$hub_update = false;
|
||||||
|
}
|
||||||
|
|
||||||
$importer_uid = $contact['uid'];
|
$importer_uid = $contact['uid'];
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||||
intval($importer_uid)
|
intval($importer_uid)
|
||||||
);
|
);
|
||||||
if (! dbm::is_result($r)) {
|
if (!dbm::is_result($r)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -158,7 +165,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
);
|
);
|
||||||
|
|
||||||
// Update the contact entry
|
// Update the contact entry
|
||||||
if(($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
|
if (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
|
||||||
if (!poco_reachable($contact['url'])) {
|
if (!poco_reachable($contact['url'])) {
|
||||||
logger("Skipping probably dead contact ".$contact['url']);
|
logger("Skipping probably dead contact ".$contact['url']);
|
||||||
return;
|
return;
|
||||||
|
|
@ -167,40 +174,50 @@ function onepoll_run(&$argv, &$argc){
|
||||||
if (!update_contact($contact["id"])) {
|
if (!update_contact($contact["id"])) {
|
||||||
mark_for_death($contact);
|
mark_for_death($contact);
|
||||||
return;
|
return;
|
||||||
} else
|
} else {
|
||||||
unmark_for_death($contact);
|
unmark_for_death($contact);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($contact['network'] === NETWORK_DFRN) {
|
if ($contact['network'] === NETWORK_DFRN) {
|
||||||
|
|
||||||
|
|
||||||
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
||||||
if(intval($contact['duplex']) && $contact['dfrn-id'])
|
if (intval($contact['duplex']) && $contact['dfrn-id']) {
|
||||||
$idtosend = '0:' . $orig_id;
|
$idtosend = '0:' . $orig_id;
|
||||||
if(intval($contact['duplex']) && $contact['issued-id'])
|
}
|
||||||
|
if (intval($contact['duplex']) && $contact['issued-id']) {
|
||||||
$idtosend = '1:' . $orig_id;
|
$idtosend = '1:' . $orig_id;
|
||||||
|
}
|
||||||
|
|
||||||
// they have permission to write to us. We already filtered this in the contact query.
|
// they have permission to write to us. We already filtered this in the contact query.
|
||||||
$perm = 'rw';
|
$perm = 'rw';
|
||||||
|
|
||||||
// But this may be our first communication, so set the writable flag if it isn't set already.
|
// But this may be our first communication, so set the writable flag if it isn't set already.
|
||||||
|
|
||||||
if(! intval($contact['writable']))
|
if (! intval($contact['writable'])) {
|
||||||
q("update contact set writable = 1 where id = %d", intval($contact['id']));
|
q("update contact set writable = 1 where id = %d", intval($contact['id']));
|
||||||
|
}
|
||||||
|
|
||||||
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
|
$url = $contact['poll'] . '?dfrn_id=' . $idtosend
|
||||||
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
|
||||||
. '&type=data&last_update=' . $last_update
|
. '&type=data&last_update=' . $last_update
|
||||||
. '&perm=' . $perm ;
|
. '&perm=' . $perm ;
|
||||||
|
|
||||||
$handshake_xml = fetch_url($url);
|
$ret = z_fetch_url($url);
|
||||||
|
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$handshake_xml = $ret['body'];
|
||||||
|
|
||||||
$html_code = $a->get_curl_code();
|
$html_code = $a->get_curl_code();
|
||||||
|
|
||||||
logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
|
logger('onepoll: handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
|
||||||
|
|
||||||
|
|
||||||
if((! strlen($handshake_xml)) || ($html_code >= 400) || (! $html_code)) {
|
if ((! strlen($handshake_xml)) || ($html_code >= 400) || (! $html_code)) {
|
||||||
logger("poller: $url appears to be dead - marking for death ");
|
logger("poller: $url appears to be dead - marking for death ");
|
||||||
|
|
||||||
// dead connection - might be a transient event, or this might
|
// dead connection - might be a transient event, or this might
|
||||||
|
|
@ -219,7 +236,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! strstr($handshake_xml,'<')) {
|
if (! strstr($handshake_xml,'<')) {
|
||||||
logger('poller: response from ' . $url . ' did not contain XML.');
|
logger('poller: response from ' . $url . ' did not contain XML.');
|
||||||
|
|
||||||
mark_for_death($contact);
|
mark_for_death($contact);
|
||||||
|
|
@ -235,7 +252,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
$res = parse_xml_string($handshake_xml);
|
$res = parse_xml_string($handshake_xml);
|
||||||
|
|
||||||
if(intval($res->status) == 1) {
|
if (intval($res->status) == 1) {
|
||||||
logger("poller: $url replied status 1 - marking for death ");
|
logger("poller: $url replied status 1 - marking for death ");
|
||||||
|
|
||||||
// we may not be friends anymore. Will keep trying for one month.
|
// we may not be friends anymore. Will keep trying for one month.
|
||||||
|
|
@ -248,18 +265,16 @@ function onepoll_run(&$argv, &$argc){
|
||||||
intval($contact['id'])
|
intval($contact['id'])
|
||||||
);
|
);
|
||||||
mark_for_death($contact);
|
mark_for_death($contact);
|
||||||
}
|
} elseif ($contact['term-date'] != '0000-00-00 00:00:00') {
|
||||||
else {
|
logger("poller: $url back from the dead - removing mark for death");
|
||||||
if($contact['term-date'] != '0000-00-00 00:00:00') {
|
unmark_for_death($contact);
|
||||||
logger("poller: $url back from the dead - removing mark for death");
|
|
||||||
unmark_for_death($contact);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
|
if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
|
if (((float) $res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
|
||||||
q("update contact set poco = '%s' where id = %d",
|
q("update contact set poco = '%s' where id = %d",
|
||||||
dbesc(str_replace('/profile/','/poco/', $contact['url'])),
|
dbesc(str_replace('/profile/','/poco/', $contact['url'])),
|
||||||
intval($contact['id'])
|
intval($contact['id'])
|
||||||
|
|
@ -273,21 +288,21 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
$final_dfrn_id = '';
|
$final_dfrn_id = '';
|
||||||
|
|
||||||
if(($contact['duplex']) && strlen($contact['prvkey'])) {
|
if (($contact['duplex']) && strlen($contact['prvkey'])) {
|
||||||
openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
|
openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
|
||||||
openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
|
openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
|
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
|
||||||
openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
|
openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
|
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
|
||||||
|
|
||||||
if(strpos($final_dfrn_id,':') == 1)
|
if (strpos($final_dfrn_id,':') == 1) {
|
||||||
$final_dfrn_id = substr($final_dfrn_id,2);
|
$final_dfrn_id = substr($final_dfrn_id,2);
|
||||||
|
}
|
||||||
|
|
||||||
if($final_dfrn_id != $orig_id) {
|
if ($final_dfrn_id != $orig_id) {
|
||||||
logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
|
logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
|
||||||
// did not decode properly - cannot trust this site
|
// did not decode properly - cannot trust this site
|
||||||
return;
|
return;
|
||||||
|
|
@ -299,10 +314,9 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
$xml = post_url($contact['poll'],$postvars);
|
$xml = post_url($contact['poll'],$postvars);
|
||||||
|
|
||||||
}
|
} elseif (($contact['network'] === NETWORK_OSTATUS)
|
||||||
elseif(($contact['network'] === NETWORK_OSTATUS)
|
|
||||||
|| ($contact['network'] === NETWORK_DIASPORA)
|
|| ($contact['network'] === NETWORK_DIASPORA)
|
||||||
|| ($contact['network'] === NETWORK_FEED) ) {
|
|| ($contact['network'] === NETWORK_FEED)) {
|
||||||
|
|
||||||
// Upgrading DB fields from an older Friendica version
|
// Upgrading DB fields from an older Friendica version
|
||||||
// Will only do this once per notify-enabled OStatus contact
|
// Will only do this once per notify-enabled OStatus contact
|
||||||
|
|
@ -311,10 +325,11 @@ function onepoll_run(&$argv, &$argc){
|
||||||
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
|
$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
|
||||||
|
|
||||||
// Contacts from OStatus are always writable
|
// Contacts from OStatus are always writable
|
||||||
if($contact['network'] === NETWORK_OSTATUS)
|
if ($contact['network'] === NETWORK_OSTATUS) {
|
||||||
$stat_writeable = 1;
|
$stat_writeable = 1;
|
||||||
|
}
|
||||||
|
|
||||||
if($stat_writeable != $contact['writable']) {
|
if ($stat_writeable != $contact['writable']) {
|
||||||
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
|
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
|
||||||
intval($stat_writeable),
|
intval($stat_writeable),
|
||||||
intval($contact['id'])
|
intval($contact['id'])
|
||||||
|
|
@ -323,19 +338,26 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
// Are we allowed to import from this person?
|
// Are we allowed to import from this person?
|
||||||
|
|
||||||
if($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly'])
|
if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked'] || $contact['readonly']) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
|
$cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
|
||||||
$xml = fetch_url($contact['poll'], false, $redirects, 0, Null, $cookiejar);
|
$ret = z_fetch_url($contact['poll'], false, $redirects, array('cookiejar' => $cookiejar));
|
||||||
|
|
||||||
|
if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$xml = $ret['body'];
|
||||||
|
|
||||||
unlink($cookiejar);
|
unlink($cookiejar);
|
||||||
}
|
} elseif ($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
|
||||||
elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) {
|
|
||||||
|
|
||||||
logger("Mail: Fetching", LOGGER_DEBUG);
|
logger("Mail: Fetching", LOGGER_DEBUG);
|
||||||
|
|
||||||
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
|
$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
|
||||||
if($mail_disabled)
|
if ($mail_disabled)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
logger("Mail: Enabled", LOGGER_DEBUG);
|
logger("Mail: Enabled", LOGGER_DEBUG);
|
||||||
|
|
@ -347,38 +369,38 @@ function onepoll_run(&$argv, &$argc){
|
||||||
$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
|
$mailconf = q("SELECT * FROM `mailacct` WHERE `server` != '' AND `uid` = %d LIMIT 1",
|
||||||
intval($importer_uid)
|
intval($importer_uid)
|
||||||
);
|
);
|
||||||
if(count($x) && count($mailconf)) {
|
if (count($x) && count($mailconf)) {
|
||||||
$mailbox = construct_mailbox_name($mailconf[0]);
|
$mailbox = construct_mailbox_name($mailconf[0]);
|
||||||
$password = '';
|
$password = '';
|
||||||
openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
|
openssl_private_decrypt(hex2bin($mailconf[0]['pass']),$password,$x[0]['prvkey']);
|
||||||
$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
|
$mbox = email_connect($mailbox,$mailconf[0]['user'],$password);
|
||||||
unset($password);
|
unset($password);
|
||||||
logger("Mail: Connect to " . $mailconf[0]['user']);
|
logger("Mail: Connect to " . $mailconf[0]['user']);
|
||||||
if($mbox) {
|
if ($mbox) {
|
||||||
q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d",
|
q("UPDATE `mailacct` SET `last_check` = '%s' WHERE `id` = %d AND `uid` = %d",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($mailconf[0]['id']),
|
intval($mailconf[0]['id']),
|
||||||
intval($importer_uid)
|
intval($importer_uid)
|
||||||
);
|
);
|
||||||
logger("Mail: Connected to " . $mailconf[0]['user']);
|
logger("Mail: Connected to " . $mailconf[0]['user']);
|
||||||
} else
|
} else {
|
||||||
logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors(), true));
|
logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors(), true));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if($mbox) {
|
if ($mbox) {
|
||||||
|
|
||||||
$msgs = email_poll($mbox,$contact['addr']);
|
$msgs = email_poll($mbox,$contact['addr']);
|
||||||
|
|
||||||
if(count($msgs)) {
|
if (count($msgs)) {
|
||||||
logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
|
logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);
|
||||||
|
|
||||||
$metas = email_msg_meta($mbox,implode(',',$msgs));
|
$metas = email_msg_meta($mbox,implode(',',$msgs));
|
||||||
if(count($metas) != count($msgs)) {
|
if (count($metas) != count($msgs)) {
|
||||||
logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
|
logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$msgs = array_combine($msgs, $metas);
|
$msgs = array_combine($msgs, $metas);
|
||||||
|
|
||||||
foreach($msgs as $msg_uid => $meta) {
|
foreach ($msgs as $msg_uid => $meta) {
|
||||||
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
|
logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);
|
||||||
|
|
||||||
$datarray = array();
|
$datarray = array();
|
||||||
|
|
@ -400,7 +422,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
// Only delete when mails aren't automatically moved or deleted
|
// Only delete when mails aren't automatically moved or deleted
|
||||||
if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3))
|
if (($mailconf[0]['action'] != 1) AND ($mailconf[0]['action'] != 3))
|
||||||
if($meta->deleted && ! $r[0]['deleted']) {
|
if ($meta->deleted && ! $r[0]['deleted']) {
|
||||||
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d",
|
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
|
|
@ -434,13 +456,13 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
// $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
|
// $raw_refs = ((x($headers,'references')) ? str_replace("\t",'',$headers['references']) : '');
|
||||||
$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : '');
|
$raw_refs = ((property_exists($meta,'references')) ? str_replace("\t",'',$meta->references) : '');
|
||||||
if(! trim($raw_refs))
|
if (! trim($raw_refs))
|
||||||
$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : '');
|
$raw_refs = ((property_exists($meta,'in_reply_to')) ? str_replace("\t",'',$meta->in_reply_to) : '');
|
||||||
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
|
$raw_refs = trim($raw_refs); // Don't allow a blank reference in $refs_arr
|
||||||
|
|
||||||
if($raw_refs) {
|
if ($raw_refs) {
|
||||||
$refs_arr = explode(' ', $raw_refs);
|
$refs_arr = explode(' ', $raw_refs);
|
||||||
if(count($refs_arr)) {
|
if (count($refs_arr)) {
|
||||||
for($x = 0; $x < count($refs_arr); $x ++)
|
for($x = 0; $x < count($refs_arr); $x ++)
|
||||||
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
|
$refs_arr[$x] = "'" . msgid2iri(str_replace(array('<','>',' '),array('','',''),dbesc($refs_arr[$x]))) . "'";
|
||||||
}
|
}
|
||||||
|
|
@ -456,12 +478,13 @@ function onepoll_run(&$argv, &$argc){
|
||||||
// Decoding the header
|
// Decoding the header
|
||||||
$subject = imap_mime_header_decode($meta->subject);
|
$subject = imap_mime_header_decode($meta->subject);
|
||||||
$datarray['title'] = "";
|
$datarray['title'] = "";
|
||||||
foreach($subject as $subpart)
|
foreach ($subject as $subpart) {
|
||||||
if ($subpart->charset != "default")
|
if ($subpart->charset != "default") {
|
||||||
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
|
$datarray['title'] .= iconv($subpart->charset, 'UTF-8//IGNORE', $subpart->text);
|
||||||
else
|
} else {
|
||||||
$datarray['title'] .= $subpart->text;
|
$datarray['title'] .= $subpart->text;
|
||||||
|
}
|
||||||
|
}
|
||||||
$datarray['title'] = notags(trim($datarray['title']));
|
$datarray['title'] = notags(trim($datarray['title']));
|
||||||
|
|
||||||
//$datarray['title'] = notags(trim($meta->subject));
|
//$datarray['title'] = notags(trim($meta->subject));
|
||||||
|
|
@ -476,7 +499,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
$datarray['title'] = RemoveReply($datarray['title']);
|
$datarray['title'] = RemoveReply($datarray['title']);
|
||||||
|
|
||||||
// If it seems to be a reply but a header couldn't be found take the last message with matching subject
|
// If it seems to be a reply but a header couldn't be found take the last message with matching subject
|
||||||
if(!x($datarray,'parent-uri') and $reply) {
|
if (!x($datarray,'parent-uri') and $reply) {
|
||||||
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1",
|
$r = q("SELECT `uri` , `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1",
|
||||||
dbesc(protect_sprintf($datarray['title'])),
|
dbesc(protect_sprintf($datarray['title'])),
|
||||||
intval($importer_uid),
|
intval($importer_uid),
|
||||||
|
|
@ -485,12 +508,12 @@ function onepoll_run(&$argv, &$argc){
|
||||||
$datarray['parent-uri'] = $r[0]['parent-uri'];
|
$datarray['parent-uri'] = $r[0]['parent-uri'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! x($datarray,'parent-uri'))
|
if (! x($datarray,'parent-uri'))
|
||||||
$datarray['parent-uri'] = $datarray['uri'];
|
$datarray['parent-uri'] = $datarray['uri'];
|
||||||
|
|
||||||
|
|
||||||
$r = email_get_msg($mbox,$msg_uid, $reply);
|
$r = email_get_msg($mbox,$msg_uid, $reply);
|
||||||
if(! $r) {
|
if (! $r) {
|
||||||
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);
|
logger("Mail: can't fetch msg ".$msg_uid." for ".$mailconf[0]['user']);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -502,23 +525,26 @@ function onepoll_run(&$argv, &$argc){
|
||||||
// some mailing lists have the original author as 'from' - add this sender info to msg body.
|
// some mailing lists have the original author as 'from' - add this sender info to msg body.
|
||||||
/// @TODO Adding a gravatar for the original author would be cool
|
/// @TODO Adding a gravatar for the original author would be cool
|
||||||
|
|
||||||
if(! stristr($meta->from,$contact['addr'])) {
|
if (! stristr($meta->from,$contact['addr'])) {
|
||||||
$from = imap_mime_header_decode($meta->from);
|
$from = imap_mime_header_decode($meta->from);
|
||||||
$fromdecoded = "";
|
$fromdecoded = "";
|
||||||
foreach($from as $frompart)
|
foreach ($from as $frompart) {
|
||||||
if ($frompart->charset != "default")
|
if ($frompart->charset != "default") {
|
||||||
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
|
$fromdecoded .= iconv($frompart->charset, 'UTF-8//IGNORE', $frompart->text);
|
||||||
else
|
} else {
|
||||||
$fromdecoded .= $frompart->text;
|
$fromdecoded .= $frompart->text;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
|
$fromarr = imap_rfc822_parse_adrlist($fromdecoded, $a->get_hostname());
|
||||||
|
|
||||||
$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
|
$frommail = $fromarr[0]->mailbox."@".$fromarr[0]->host;
|
||||||
|
|
||||||
if (isset($fromarr[0]->personal))
|
if (isset($fromarr[0]->personal)) {
|
||||||
$fromname = $fromarr[0]->personal;
|
$fromname = $fromarr[0]->personal;
|
||||||
else
|
} else {
|
||||||
$fromname = $frommail;
|
$fromname = $frommail;
|
||||||
|
}
|
||||||
|
|
||||||
//$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
|
//$datarray['body'] = "[b]".t('From: ') . escape_tags($fromdecoded) . "[/b]\n\n" . $datarray['body'];
|
||||||
|
|
||||||
|
|
@ -538,9 +564,9 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
$datarray['uid'] = $importer_uid;
|
$datarray['uid'] = $importer_uid;
|
||||||
$datarray['contact-id'] = $contact['id'];
|
$datarray['contact-id'] = $contact['id'];
|
||||||
if($datarray['parent-uri'] === $datarray['uri'])
|
if ($datarray['parent-uri'] === $datarray['uri'])
|
||||||
$datarray['private'] = 1;
|
$datarray['private'] = 1;
|
||||||
if(($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
|
if (($contact['network'] === NETWORK_MAIL) && (! get_pconfig($importer_uid,'system','allow_public_email_replies'))) {
|
||||||
$datarray['private'] = 1;
|
$datarray['private'] = 1;
|
||||||
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
|
$datarray['allow_cid'] = '<' . $contact['id'] . '>';
|
||||||
}
|
}
|
||||||
|
|
@ -574,24 +600,24 @@ function onepoll_run(&$argv, &$argc){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else
|
} else {
|
||||||
logger("Mail: no mails for ".$mailconf[0]['user']);
|
logger("Mail: no mails for ".$mailconf[0]['user']);
|
||||||
|
}
|
||||||
|
|
||||||
logger("Mail: closing connection for ".$mailconf[0]['user']);
|
logger("Mail: closing connection for ".$mailconf[0]['user']);
|
||||||
imap_close($mbox);
|
imap_close($mbox);
|
||||||
}
|
}
|
||||||
}
|
} elseif ($contact['network'] === NETWORK_FACEBOOK) {
|
||||||
elseif($contact['network'] === NETWORK_FACEBOOK) {
|
|
||||||
// This is picked up by the Facebook plugin on a cron hook.
|
// This is picked up by the Facebook plugin on a cron hook.
|
||||||
// Ignored here.
|
// Ignored here.
|
||||||
} elseif($contact['network'] === NETWORK_PUMPIO) {
|
} elseif ($contact['network'] === NETWORK_PUMPIO) {
|
||||||
// This is picked up by the pump.io plugin on a cron hook.
|
// This is picked up by the pump.io plugin on a cron hook.
|
||||||
// Ignored here.
|
// Ignored here.
|
||||||
}
|
}
|
||||||
|
|
||||||
if($xml) {
|
if ($xml) {
|
||||||
logger('poller: received xml : ' . $xml, LOGGER_DATA);
|
logger('poller: received xml : ' . $xml, LOGGER_DATA);
|
||||||
if(! strstr($xml,'<')) {
|
if (! strstr($xml,'<')) {
|
||||||
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
|
logger('poller: post_handshake: response from ' . $url . ' did not contain XML.');
|
||||||
$r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
|
$r = q("UPDATE `contact` SET `last-update` = '%s', `failure_update` = '%s' WHERE `id` = %d",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
|
|
@ -611,10 +637,10 @@ function onepoll_run(&$argv, &$argc){
|
||||||
consume_feed($xml,$importer,$contact,$hub,1,2);
|
consume_feed($xml,$importer,$contact,$hub,1,2);
|
||||||
|
|
||||||
$hubmode = 'subscribe';
|
$hubmode = 'subscribe';
|
||||||
if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
|
if ($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])
|
||||||
$hubmode = 'unsubscribe';
|
$hubmode = 'unsubscribe';
|
||||||
|
|
||||||
if(($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
|
if (($contact['network'] === NETWORK_OSTATUS || $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify']))
|
||||||
$hub_update = true;
|
$hub_update = true;
|
||||||
|
|
||||||
if ($force)
|
if ($force)
|
||||||
|
|
@ -622,14 +648,15 @@ function onepoll_run(&$argv, &$argc){
|
||||||
|
|
||||||
logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
|
logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
|
||||||
|
|
||||||
if((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) {
|
if ((strlen($hub)) && ($hub_update) && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED) ) {
|
||||||
logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
|
logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
|
||||||
$hubs = explode(',', $hub);
|
$hubs = explode(',', $hub);
|
||||||
if(count($hubs)) {
|
if (count($hubs)) {
|
||||||
foreach($hubs as $h) {
|
foreach ($hubs as $h) {
|
||||||
$h = trim($h);
|
$h = trim($h);
|
||||||
if(! strlen($h))
|
if (! strlen($h)) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
subscribe_to_hub($h,$importer,$contact,$hubmode);
|
subscribe_to_hub($h,$importer,$contact,$hubmode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -671,7 +698,7 @@ function onepoll_run(&$argv, &$argc){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (array_search(__file__,get_included_files())===0){
|
if (array_search(__file__,get_included_files())===0) {
|
||||||
onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
|
onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -207,6 +207,16 @@ function poller_exec_function($queue, $funcname, $argv) {
|
||||||
|
|
||||||
$duration = number_format(microtime(true) - $stamp, 3);
|
$duration = number_format(microtime(true) - $stamp, 3);
|
||||||
|
|
||||||
|
if ($duration > 3600) {
|
||||||
|
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 1 hour (".round($duration/60, 3).")", LOGGER_DEBUG);
|
||||||
|
} elseif ($duration > 600) {
|
||||||
|
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 10 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
|
||||||
|
} elseif ($duration > 300) {
|
||||||
|
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 5 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
|
||||||
|
} elseif ($duration > 120) {
|
||||||
|
logger("Prio ".$queue["priority"].": ".$queue["parameter"]." - longer than 2 minutes (".round($duration/60, 3).")", LOGGER_DEBUG);
|
||||||
|
}
|
||||||
|
|
||||||
logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds.");
|
logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".$duration." seconds.");
|
||||||
|
|
||||||
// Write down the performance values into the log
|
// Write down the performance values into the log
|
||||||
|
|
|
||||||
|
|
@ -5,15 +5,16 @@ use \Friendica\Core\Config;
|
||||||
require_once("boot.php");
|
require_once("boot.php");
|
||||||
require_once('include/queue_fn.php');
|
require_once('include/queue_fn.php');
|
||||||
require_once('include/dfrn.php');
|
require_once('include/dfrn.php');
|
||||||
|
require_once('include/cache.php');
|
||||||
|
|
||||||
function queue_run(&$argv, &$argc){
|
function queue_run(&$argv, &$argc){
|
||||||
global $a, $db;
|
global $a, $db;
|
||||||
|
|
||||||
if(is_null($a)){
|
if (is_null($a)){
|
||||||
$a = new App;
|
$a = new App;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_null($db)){
|
if (is_null($db)){
|
||||||
@include(".htconfig.php");
|
@include(".htconfig.php");
|
||||||
require_once("include/dba.php");
|
require_once("include/dba.php");
|
||||||
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||||
|
|
@ -37,14 +38,14 @@ function queue_run(&$argv, &$argc){
|
||||||
|
|
||||||
load_hooks();
|
load_hooks();
|
||||||
|
|
||||||
if($argc > 1)
|
if ($argc > 1) {
|
||||||
$queue_id = intval($argv[1]);
|
$queue_id = intval($argv[1]);
|
||||||
else
|
} else {
|
||||||
$queue_id = 0;
|
$queue_id = 0;
|
||||||
|
}
|
||||||
|
|
||||||
$deadguys = array();
|
$cachekey_deadguy = 'queue_run:deadguy:';
|
||||||
$deadservers = array();
|
$cachekey_server = 'queue_run:server:';
|
||||||
$serverlist = array();
|
|
||||||
|
|
||||||
if (!$queue_id) {
|
if (!$queue_id) {
|
||||||
|
|
||||||
|
|
@ -64,7 +65,7 @@ function queue_run(&$argv, &$argc){
|
||||||
foreach ($r as $rr) {
|
foreach ($r as $rr) {
|
||||||
logger('queue: deliverq');
|
logger('queue: deliverq');
|
||||||
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
|
proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
|
||||||
if($interval) {
|
if ($interval) {
|
||||||
time_sleep_until(microtime(true) + (float) $interval);
|
time_sleep_until(microtime(true) + (float) $interval);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -111,10 +112,10 @@ function queue_run(&$argv, &$argc){
|
||||||
// queue_predeliver hooks may have changed the queue db details,
|
// queue_predeliver hooks may have changed the queue db details,
|
||||||
// so check again if this entry still needs processing
|
// so check again if this entry still needs processing
|
||||||
|
|
||||||
if($queue_id)
|
if ($queue_id) {
|
||||||
$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
|
$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
|
||||||
intval($queue_id));
|
intval($queue_id));
|
||||||
elseif (get_config("system", "worker")) {
|
} elseif (get_config("system", "worker")) {
|
||||||
logger('Call queue for id '.$q_item['id']);
|
logger('Call queue for id '.$q_item['id']);
|
||||||
proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
|
proc_run(PRIORITY_LOW, "include/queue.php", $q_item['id']);
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -122,8 +123,9 @@ function queue_run(&$argv, &$argc){
|
||||||
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
|
$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
|
||||||
intval($q_item['id']));
|
intval($q_item['id']));
|
||||||
|
|
||||||
if(! count($qi))
|
if (!dbm::is_result($qi)) {
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||||
|
|
@ -133,26 +135,32 @@ function queue_run(&$argv, &$argc){
|
||||||
remove_queue_item($q_item['id']);
|
remove_queue_item($q_item['id']);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if(in_array($c[0]['notify'],$deadguys)) {
|
|
||||||
logger('queue: skipping known dead url: ' . $c[0]['notify']);
|
$dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
|
||||||
|
|
||||||
|
if (!is_null($dead) AND $dead) {
|
||||||
|
logger('queue: skipping known dead url: '.$c[0]['notify']);
|
||||||
update_queue_time($q_item['id']);
|
update_queue_time($q_item['id']);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$server = poco_detect_server($c[0]['url']);
|
$server = poco_detect_server($c[0]['url']);
|
||||||
|
|
||||||
if (($server != "") AND !in_array($server, $serverlist)) {
|
if ($server != "") {
|
||||||
logger("Check server ".$server." (".$c[0]["network"].")");
|
$vital = Cache::get($cachekey_server.$server);
|
||||||
if (!poco_check_server($server, $c[0]["network"], true))
|
|
||||||
$deadservers[] = $server;
|
|
||||||
|
|
||||||
$serverlist[] = $server;
|
if (is_null($vital)) {
|
||||||
}
|
logger("Check server ".$server." (".$c[0]["network"].")");
|
||||||
|
|
||||||
if (($server != "") AND in_array($server, $deadservers)) {
|
$vital = poco_check_server($server, $c[0]["network"], true);
|
||||||
logger('queue: skipping known dead server: '.$server);
|
Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
|
||||||
update_queue_time($q_item['id']);
|
}
|
||||||
continue;
|
|
||||||
|
if (!is_null($vital) AND !$vital) {
|
||||||
|
logger('queue: skipping dead server: '.$server);
|
||||||
|
update_queue_time($q_item['id']);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
|
$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`
|
||||||
|
|
@ -176,36 +184,37 @@ function queue_run(&$argv, &$argc){
|
||||||
logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
|
logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
|
||||||
$deliver_status = dfrn::deliver($owner,$contact,$data);
|
$deliver_status = dfrn::deliver($owner,$contact,$data);
|
||||||
|
|
||||||
if($deliver_status == (-1)) {
|
if ($deliver_status < 0) {
|
||||||
update_queue_time($q_item['id']);
|
update_queue_time($q_item['id']);
|
||||||
$deadguys[] = $contact['notify'];
|
Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
|
||||||
} else
|
} else {
|
||||||
remove_queue_item($q_item['id']);
|
remove_queue_item($q_item['id']);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case NETWORK_OSTATUS:
|
case NETWORK_OSTATUS:
|
||||||
if($contact['notify']) {
|
if ($contact['notify']) {
|
||||||
logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
|
logger('queue: slapdelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
|
||||||
$deliver_status = slapper($owner,$contact['notify'],$data);
|
$deliver_status = slapper($owner,$contact['notify'],$data);
|
||||||
|
|
||||||
if($deliver_status == (-1)) {
|
if ($deliver_status == (-1)) {
|
||||||
update_queue_time($q_item['id']);
|
update_queue_time($q_item['id']);
|
||||||
$deadguys[] = $contact['notify'];
|
Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
|
||||||
} else
|
} else {
|
||||||
remove_queue_item($q_item['id']);
|
remove_queue_item($q_item['id']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case NETWORK_DIASPORA:
|
case NETWORK_DIASPORA:
|
||||||
if($contact['notify']) {
|
if ($contact['notify']) {
|
||||||
logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
|
logger('queue: diaspora_delivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
|
||||||
$deliver_status = Diaspora::transmit($owner,$contact,$data,$public,true);
|
$deliver_status = Diaspora::transmit($owner,$contact,$data,$public,true);
|
||||||
|
|
||||||
if($deliver_status == (-1)) {
|
if ($deliver_status == (-1)) {
|
||||||
update_queue_time($q_item['id']);
|
update_queue_time($q_item['id']);
|
||||||
$deadguys[] = $contact['notify'];
|
Cache::set($cachekey_deadguy.$contact['notify'], true, CACHE_QUARTER_HOUR);
|
||||||
} else
|
} else {
|
||||||
remove_queue_item($q_item['id']);
|
remove_queue_item($q_item['id']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
@ -213,15 +222,15 @@ function queue_run(&$argv, &$argc){
|
||||||
$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
|
$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
|
||||||
call_hooks('queue_deliver', $a, $params);
|
call_hooks('queue_deliver', $a, $params);
|
||||||
|
|
||||||
if($params['result'])
|
if ($params['result']) {
|
||||||
remove_queue_item($q_item['id']);
|
remove_queue_item($q_item['id']);
|
||||||
else
|
} else {
|
||||||
update_queue_time($q_item['id']);
|
update_queue_time($q_item['id']);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
logger('Deliver status '.$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
|
logger('Deliver status '.(int)$deliver_status.' for item '.$q_item['id'].' to '.$contact['name'].' <'.$contact['url'].'>');
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,44 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Calculate the hash that is needed for the "Friendica" cookie
|
||||||
|
*
|
||||||
|
* @param array $user Record from "user" table
|
||||||
|
*
|
||||||
|
* @return string Hashed data
|
||||||
|
*/
|
||||||
|
function cookie_hash($user) {
|
||||||
|
return(hash("sha256", get_config("system", "site_prvkey").
|
||||||
|
$user["uprvkey"].
|
||||||
|
$user["password"]));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Set the "Friendica" cookie
|
||||||
|
*
|
||||||
|
* @param int $time
|
||||||
|
* @param array $user Record from "user" table
|
||||||
|
*/
|
||||||
|
function new_cookie($time, $user = array()) {
|
||||||
|
|
||||||
|
if ($time != 0) {
|
||||||
|
$time = $time + time();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($user) {
|
||||||
|
$value = json_encode(array("uid" => $user["uid"],
|
||||||
|
"hash" => cookie_hash($user),
|
||||||
|
"ip" => $_SERVER['REMOTE_ADDR']));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$value = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
setcookie("Friendica", $value, $time, "/", "",
|
||||||
|
(get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) {
|
function authenticate_success($user_record, $login_initial = false, $interactive = false, $login_refresh = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
@ -94,6 +133,21 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($login_initial) {
|
||||||
|
// If the user specified to remember the authentication, then set a cookie
|
||||||
|
// that expires after one week (the default is when the browser is closed).
|
||||||
|
// The cookie will be renewed automatically.
|
||||||
|
// The week ensures that sessions will expire after some inactivity.
|
||||||
|
if ($_SESSION['remember']) {
|
||||||
|
logger('Injecting cookie for remembered user '. $_SESSION['remember_user']['nickname']);
|
||||||
|
new_cookie(604800, $user_record);
|
||||||
|
unset($_SESSION['remember']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ($login_initial) {
|
if ($login_initial) {
|
||||||
call_hooks('logged_in', $a->user);
|
call_hooks('logged_in', $a->user);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -690,7 +690,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
|
$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
|
||||||
if ($servers) {
|
if (dbm::is_result($servers)) {
|
||||||
|
|
||||||
if ($servers[0]["created"] == "0000-00-00 00:00:00")
|
if ($servers[0]["created"] == "0000-00-00 00:00:00")
|
||||||
q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
|
q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
|
||||||
|
|
@ -732,21 +732,40 @@ function poco_check_server($server_url, $network = "", $force = false) {
|
||||||
$orig_last_failure = $last_failure;
|
$orig_last_failure = $last_failure;
|
||||||
|
|
||||||
// Check if the page is accessible via SSL.
|
// Check if the page is accessible via SSL.
|
||||||
|
$orig_server_url = $server_url;
|
||||||
$server_url = str_replace("http://", "https://", $server_url);
|
$server_url = str_replace("http://", "https://", $server_url);
|
||||||
$serverret = z_fetch_url($server_url."/.well-known/host-meta");
|
|
||||||
|
// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
|
||||||
|
$serverret = z_fetch_url($server_url."/.well-known/host-meta", false, $redirects, array('timeout' => 20));
|
||||||
|
|
||||||
|
// Quit if there is a timeout.
|
||||||
|
// But we want to make sure to only quit if we are mostly sure that this server url fits.
|
||||||
|
if (dbm::is_result($servers) AND ($orig_server_url == $server_url) AND
|
||||||
|
($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
|
||||||
|
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Maybe the page is unencrypted only?
|
// Maybe the page is unencrypted only?
|
||||||
$xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
|
$xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
|
||||||
if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
|
if (!$serverret["success"] OR ($serverret["body"] == "") OR (@sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
|
||||||
$server_url = str_replace("https://", "http://", $server_url);
|
$server_url = str_replace("https://", "http://", $server_url);
|
||||||
$serverret = z_fetch_url($server_url."/.well-known/host-meta");
|
|
||||||
|
// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
|
||||||
|
$serverret = z_fetch_url($server_url."/.well-known/host-meta", false, $redirects, array('timeout' => 20));
|
||||||
|
|
||||||
|
// Quit if there is a timeout
|
||||||
|
if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
|
||||||
|
logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
$xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
|
$xmlobj = @simplexml_load_string($serverret["body"],'SimpleXMLElement',0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
|
if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
|
||||||
// Workaround for bad configured servers (known nginx problem)
|
// Workaround for bad configured servers (known nginx problem)
|
||||||
if ($serverret["debug"]["http_code"] != "403") {
|
if (!in_array($serverret["debug"]["http_code"], array("403", "404"))) {
|
||||||
$last_failure = datetime_convert();
|
$last_failure = datetime_convert();
|
||||||
$failure = true;
|
$failure = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
106
include/text.php
106
include/text.php
|
|
@ -268,90 +268,90 @@ function hex2bin($s) {
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('paginate_data')) {
|
|
||||||
/**
|
/**
|
||||||
* Automatica pagination data.
|
* @brief Paginator function. Pushes relevant links in a pager array structure.
|
||||||
|
*
|
||||||
|
* Links are generated depending on the current page and the total number of items.
|
||||||
|
* Inactive links (like "first" and "prev" on page 1) are given the "disabled" class.
|
||||||
|
* Current page link is given the "active" CSS class
|
||||||
*
|
*
|
||||||
* @param App $a App instance
|
* @param App $a App instance
|
||||||
* @param int $count [optional] item count (used with alt pager)
|
* @param int $count [optional] item count (used with minimal pager)
|
||||||
* @return Array data for pagination template
|
* @return Array data for pagination template
|
||||||
*/
|
*/
|
||||||
function paginate_data(App $a, $count=null) {
|
function paginate_data(App $a, $count = null) {
|
||||||
$stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
|
$stripped = preg_replace('/([&?]page=[0-9]*)/', '', $a->query_string);
|
||||||
|
|
||||||
$stripped = str_replace('q=','',$stripped);
|
$stripped = str_replace('q=', '', $stripped);
|
||||||
$stripped = trim($stripped,'/');
|
$stripped = trim($stripped, '/');
|
||||||
$pagenum = $a->pager['page'];
|
$pagenum = $a->pager['page'];
|
||||||
|
|
||||||
if (($a->page_offset != "") AND !preg_match('/[?&].offset=/', $stripped))
|
if (($a->page_offset != '') AND !preg_match('/[?&].offset=/', $stripped)) {
|
||||||
$stripped .= "&offset=".urlencode($a->page_offset);
|
$stripped .= '&offset=' . urlencode($a->page_offset);
|
||||||
|
|
||||||
$url = $stripped;
|
|
||||||
|
|
||||||
$data = array();
|
|
||||||
function _l(&$d, $name, $url, $text, $class="") {
|
|
||||||
if (!strpos($url, "?")) {
|
|
||||||
if ($pos = strpos($url, "&"))
|
|
||||||
$url = substr($url, 0, $pos)."?".substr($url, $pos + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
$d[$name] = array('url'=>$url, 'text'=>$text, 'class'=>$class);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_null($count)){
|
$url = $stripped;
|
||||||
// alt pager
|
$data = array();
|
||||||
if($a->pager['page']>1)
|
|
||||||
_l($data, "prev", $url.'&page='.($a->pager['page'] - 1), t('newer'));
|
function _l(&$d, $name, $url, $text, $class = '') {
|
||||||
if($count>0)
|
if (strpos($url, '?') === false && ($pos = strpos($url, '&')) !== false) {
|
||||||
_l($data, "next", $url.'&page='.($a->pager['page'] + 1), t('older'));
|
$url = substr($url, 0, $pos) . '?' . substr($url, $pos + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
$d[$name] = array('url' => $url, 'text' => $text, 'class' => $class);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_null($count)) {
|
||||||
|
// minimal pager (newer / older)
|
||||||
|
$data['class'] = 'pager';
|
||||||
|
_l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), t('newer'), 'previous' . ($a->pager['page'] == 1 ? ' disabled' : ''));
|
||||||
|
_l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), t('older'), 'next' . ($count <= 0 ? ' disabled' : ''));
|
||||||
} else {
|
} else {
|
||||||
// full pager
|
// full pager (first / prev / 1 / 2 / ... / 14 / 15 / next / last)
|
||||||
if($a->pager['total'] > $a->pager['itemspage']) {
|
$data['class'] = 'pagination';
|
||||||
if($a->pager['page'] != 1)
|
if ($a->pager['total'] > $a->pager['itemspage']) {
|
||||||
_l($data, "prev", $url.'&page='.($a->pager['page'] - 1), t('prev'));
|
_l($data, 'first', $url . '&page=1', t('first'), $a->pager['page'] == 1 ? 'disabled' : '');
|
||||||
|
_l($data, 'prev', $url . '&page=' . ($a->pager['page'] - 1), t('prev'), $a->pager['page'] == 1 ? 'disabled' : '');
|
||||||
_l($data, "first", $url."&page=1", t('first'));
|
|
||||||
|
|
||||||
|
|
||||||
$numpages = $a->pager['total'] / $a->pager['itemspage'];
|
$numpages = $a->pager['total'] / $a->pager['itemspage'];
|
||||||
|
|
||||||
$numstart = 1;
|
$numstart = 1;
|
||||||
$numstop = $numpages;
|
$numstop = $numpages;
|
||||||
|
|
||||||
if($numpages > 14) {
|
// Limit the number of displayed page number buttons.
|
||||||
$numstart = (($pagenum > 7) ? ($pagenum - 7) : 1);
|
if ($numpages > 8) {
|
||||||
$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 14));
|
$numstart = (($pagenum > 4) ? ($pagenum - 4) : 1);
|
||||||
|
$numstop = (($pagenum > ($numpages - 7)) ? $numpages : ($numstart + 8));
|
||||||
}
|
}
|
||||||
|
|
||||||
$pages = array();
|
$pages = array();
|
||||||
|
|
||||||
for($i = $numstart; $i <= $numstop; $i++){
|
for ($i = $numstart; $i <= $numstop; $i++) {
|
||||||
if($i == $a->pager['page'])
|
if ($i == $a->pager['page']) {
|
||||||
_l($pages, $i, "#", $i, "current");
|
_l($pages, $i, '#', $i, 'current active');
|
||||||
else
|
} else {
|
||||||
_l($pages, $i, $url."&page=$i", $i, "n");
|
_l($pages, $i, $url . '&page='. $i, $i, 'n');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(($a->pager['total'] % $a->pager['itemspage']) != 0) {
|
if (($a->pager['total'] % $a->pager['itemspage']) != 0) {
|
||||||
if($i == $a->pager['page'])
|
if ($i == $a->pager['page']) {
|
||||||
_l($pages, $i, "#", $i, "current");
|
_l($pages, $i, '#', $i, 'current active');
|
||||||
else
|
} else {
|
||||||
_l($pages, $i, $url."&page=$i", $i, "n");
|
_l($pages, $i, $url . '&page=' . $i, $i, 'n');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$data['pages'] = $pages;
|
$data['pages'] = $pages;
|
||||||
|
|
||||||
$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
|
$lastpage = (($numpages > intval($numpages)) ? intval($numpages)+1 : $numpages);
|
||||||
_l($data, "last", $url."&page=$lastpage", t('last'));
|
_l($data, 'next', $url . '&page=' . ($a->pager['page'] + 1), t('next'), $a->pager['page'] == $lastpage ? 'disabled' : '');
|
||||||
|
_l($data, 'last', $url . '&page=' . $lastpage, t('last'), $a->pager['page'] == $lastpage ? 'disabled' : '');
|
||||||
if(($a->pager['total'] - ($a->pager['itemspage'] * $a->pager['page'])) > 0)
|
|
||||||
_l($data, "next", $url."&page=".($a->pager['page'] + 1), t('next'));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $data;
|
|
||||||
|
|
||||||
}}
|
return $data;
|
||||||
|
}
|
||||||
|
|
||||||
if(! function_exists('paginate')) {
|
if(! function_exists('paginate')) {
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -649,9 +649,7 @@ function admin_page_site_post(App $a) {
|
||||||
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
|
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
|
||||||
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
|
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
|
||||||
$force_ssl = ((x($_POST,'force_ssl')) ? True : False);
|
$force_ssl = ((x($_POST,'force_ssl')) ? True : False);
|
||||||
$old_share = ((x($_POST,'old_share')) ? True : False);
|
|
||||||
$hide_help = ((x($_POST,'hide_help')) ? True : False);
|
$hide_help = ((x($_POST,'hide_help')) ? True : False);
|
||||||
$suppress_language = ((x($_POST,'suppress_language')) ? True : False);
|
|
||||||
$suppress_tags = ((x($_POST,'suppress_tags')) ? True : False);
|
$suppress_tags = ((x($_POST,'suppress_tags')) ? True : False);
|
||||||
$use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False);
|
$use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False);
|
||||||
$itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : '');
|
$itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : '');
|
||||||
|
|
@ -662,7 +660,6 @@ function admin_page_site_post(App $a) {
|
||||||
$basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : '');
|
$basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : '');
|
||||||
$singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : '');
|
$singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : '');
|
||||||
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
|
$proxy_disabled = ((x($_POST,'proxy_disabled')) ? True : False);
|
||||||
$old_pager = ((x($_POST,'old_pager')) ? True : False);
|
|
||||||
$only_tag_search = ((x($_POST,'only_tag_search')) ? True : False);
|
$only_tag_search = ((x($_POST,'only_tag_search')) ? True : False);
|
||||||
$rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0);
|
$rino = ((x($_POST,'rino')) ? intval($_POST['rino']) : 0);
|
||||||
$embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : '');
|
$embedly = ((x($_POST,'embedly')) ? notags(trim($_POST['embedly'])) : '');
|
||||||
|
|
@ -734,7 +731,6 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('config','sitename',$sitename);
|
set_config('config','sitename',$sitename);
|
||||||
set_config('config','hostname',$hostname);
|
set_config('config','hostname',$hostname);
|
||||||
set_config('config','sender_email', $sender_email);
|
set_config('config','sender_email', $sender_email);
|
||||||
set_config('system','suppress_language',$suppress_language);
|
|
||||||
set_config('system','suppress_tags',$suppress_tags);
|
set_config('system','suppress_tags',$suppress_tags);
|
||||||
set_config('system','shortcut_icon',$shortcut_icon);
|
set_config('system','shortcut_icon',$shortcut_icon);
|
||||||
set_config('system','touch_icon',$touch_icon);
|
set_config('system','touch_icon',$touch_icon);
|
||||||
|
|
@ -805,7 +801,6 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('config','private_addons', $private_addons);
|
set_config('config','private_addons', $private_addons);
|
||||||
|
|
||||||
set_config('system','force_ssl', $force_ssl);
|
set_config('system','force_ssl', $force_ssl);
|
||||||
set_config('system','old_share', $old_share);
|
|
||||||
set_config('system','hide_help', $hide_help);
|
set_config('system','hide_help', $hide_help);
|
||||||
set_config('system','use_fulltext_engine', $use_fulltext_engine);
|
set_config('system','use_fulltext_engine', $use_fulltext_engine);
|
||||||
set_config('system','itemcache', $itemcache);
|
set_config('system','itemcache', $itemcache);
|
||||||
|
|
@ -815,7 +810,6 @@ function admin_page_site_post(App $a) {
|
||||||
set_config('system','temppath', $temppath);
|
set_config('system','temppath', $temppath);
|
||||||
set_config('system','basepath', $basepath);
|
set_config('system','basepath', $basepath);
|
||||||
set_config('system','proxy_disabled', $proxy_disabled);
|
set_config('system','proxy_disabled', $proxy_disabled);
|
||||||
set_config('system','old_pager', $old_pager);
|
|
||||||
set_config('system','only_tag_search', $only_tag_search);
|
set_config('system','only_tag_search', $only_tag_search);
|
||||||
set_config('system','worker', $worker);
|
set_config('system','worker', $worker);
|
||||||
set_config('system','worker_queues', $worker_queues);
|
set_config('system','worker_queues', $worker_queues);
|
||||||
|
|
@ -996,7 +990,6 @@ function admin_page_site(App $a) {
|
||||||
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
|
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
|
||||||
'$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
|
'$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
|
||||||
'$force_ssl' => array('force_ssl', t("Force SSL"), get_config('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
|
'$force_ssl' => array('force_ssl', t("Force SSL"), get_config('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
|
||||||
'$old_share' => array('old_share', t("Old style 'Share'"), get_config('system','old_share'), t("Deactivates the bbcode element 'share' for repeating items.")),
|
|
||||||
'$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
|
'$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
|
||||||
'$singleuser' => array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names),
|
'$singleuser' => array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names),
|
||||||
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
||||||
|
|
@ -1052,7 +1045,6 @@ function admin_page_site(App $a) {
|
||||||
'$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details.")),
|
'$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details.")),
|
||||||
|
|
||||||
'$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
|
'$use_fulltext_engine' => array('use_fulltext_engine', t("Use MySQL full text engine"), get_config('system','use_fulltext_engine'), t("Activates the full text engine. Speeds up search - but can only search for four and more characters.")),
|
||||||
'$suppress_language' => array('suppress_language', t("Suppress Language"), get_config('system','suppress_language'), t("Suppress language information in meta information about a posting.")),
|
|
||||||
'$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
|
'$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
|
||||||
'$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
|
'$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
|
||||||
'$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
|
'$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
|
||||||
|
|
@ -1061,7 +1053,6 @@ function admin_page_site(App $a) {
|
||||||
'$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
|
'$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
|
||||||
'$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
|
'$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
|
||||||
'$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
|
'$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
|
||||||
'$old_pager' => array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
|
|
||||||
'$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
|
'$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
|
||||||
|
|
||||||
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
|
'$relocate_url' => array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
|
||||||
|
|
|
||||||
|
|
@ -48,27 +48,6 @@ function community_content(App $a, $update = 0) {
|
||||||
// Only public posts can be shown
|
// Only public posts can be shown
|
||||||
// OR your own posts if you are a logged in member
|
// OR your own posts if you are a logged in member
|
||||||
|
|
||||||
if(get_config('system', 'old_pager')) {
|
|
||||||
$r = qu("SELECT COUNT(distinct(`item`.`uri`)) AS `total`
|
|
||||||
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
|
||||||
INNER JOIN `user` ON `user`.`uid` = `item`.`uid` AND `user`.`hidewall` = 0
|
|
||||||
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
|
||||||
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
|
|
||||||
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
|
||||||
AND `item`.`private` = 0 AND `item`.`wall` = 1"
|
|
||||||
);
|
|
||||||
|
|
||||||
if (dbm::is_result($r))
|
|
||||||
$a->set_pager_total($r[0]['total']);
|
|
||||||
|
|
||||||
if(! $r[0]['total']) {
|
|
||||||
info( t('No results.') . EOL);
|
|
||||||
return $o;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
|
$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
|
||||||
|
|
||||||
if (! dbm::is_result($r)) {
|
if (! dbm::is_result($r)) {
|
||||||
|
|
@ -105,13 +84,9 @@ function community_content(App $a, $update = 0) {
|
||||||
|
|
||||||
// we behave the same in message lists as the search module
|
// we behave the same in message lists as the search module
|
||||||
|
|
||||||
$o .= conversation($a,$s,'community',$update);
|
$o .= conversation($a, $s, 'community', $update);
|
||||||
|
|
||||||
if(!get_config('system', 'old_pager')) {
|
$o .= alt_pager($a, count($r));
|
||||||
$o .= alt_pager($a,count($r));
|
|
||||||
} else {
|
|
||||||
$o .= paginate($a);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -599,21 +599,6 @@ function network_content(App $a, $update = 0) {
|
||||||
$pager_sql = '';
|
$pager_sql = '';
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
if(get_config('system', 'old_pager')) {
|
|
||||||
$r = qu("SELECT COUNT(*) AS `total`
|
|
||||||
FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
|
|
||||||
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
|
|
||||||
WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
|
|
||||||
$sql_extra2 $sql_extra3
|
|
||||||
$sql_extra $sql_nets ",
|
|
||||||
intval($_SESSION['uid'])
|
|
||||||
);
|
|
||||||
|
|
||||||
if (dbm::is_result($r)) {
|
|
||||||
$a->set_pager_total($r[0]['total']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if we serve a mobile device and get the user settings
|
// check if we serve a mobile device and get the user settings
|
||||||
// accordingly
|
// accordingly
|
||||||
if ($a->is_mobile) {
|
if ($a->is_mobile) {
|
||||||
|
|
@ -788,15 +773,13 @@ function network_content(App $a, $update = 0) {
|
||||||
|
|
||||||
$mode = (($nouveau) ? 'network-new' : 'network');
|
$mode = (($nouveau) ? 'network-new' : 'network');
|
||||||
|
|
||||||
$o .= conversation($a,$items,$mode,$update);
|
$o .= conversation($a, $items, $mode, $update);
|
||||||
|
|
||||||
if (!$update) {
|
if (!$update) {
|
||||||
if (get_pconfig(local_user(),'system','infinite_scroll')) {
|
if (get_pconfig(local_user(), 'system', 'infinite_scroll')) {
|
||||||
$o .= scroll_loader();
|
$o .= scroll_loader();
|
||||||
} elseif (!get_config('system', 'old_pager')) {
|
|
||||||
$o .= alt_pager($a,count($items));
|
|
||||||
} else {
|
} else {
|
||||||
$o .= paginate($a);
|
$o .= alt_pager($a, count($items));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -228,9 +228,10 @@ function nodeinfo_cron() {
|
||||||
|
|
||||||
logger("local_posts: ".$local_posts, LOGGER_DEBUG);
|
logger("local_posts: ".$local_posts, LOGGER_DEBUG);
|
||||||
|
|
||||||
$posts = qu("SELECT COUNT(*) AS `local_comments` FROM `item`
|
$posts = qu("SELECT COUNT(*) FROM `contact`
|
||||||
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `item`.`uid` = `contact`.`uid` AND
|
||||||
WHERE `contact`.`self` and `item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')",
|
`item`.`id` != `item`.`parent` AND `item`.`network` IN ('%s', '%s', '%s')
|
||||||
|
WHERE `contact`.`self`",
|
||||||
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
|
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
|
||||||
|
|
||||||
if (!is_array($posts))
|
if (!is_array($posts))
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ function openid_content(App $a) {
|
||||||
// mod/settings.php in 8367cad so it might have left mixed
|
// mod/settings.php in 8367cad so it might have left mixed
|
||||||
// records in the user table
|
// records in the user table
|
||||||
//
|
//
|
||||||
$r = q("SELECT * FROM `user`
|
$r = q("SELECT *, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user`
|
||||||
WHERE ( `openid` = '%s' OR `openid` = '%s' )
|
WHERE ( `openid` = '%s' OR `openid` = '%s' )
|
||||||
AND `blocked` = 0 AND `account_expired` = 0
|
AND `blocked` = 0 AND `account_expired` = 0
|
||||||
AND `account_removed` = 0 AND `verified` = 1
|
AND `account_removed` = 0 AND `verified` = 1
|
||||||
|
|
|
||||||
|
|
@ -251,23 +251,6 @@ function profile_content(App $a, $update = 0) {
|
||||||
$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
|
$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(get_config('system', 'old_pager')) {
|
|
||||||
$r = q("SELECT COUNT(*) AS `total`
|
|
||||||
FROM `thread` INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
|
|
||||||
$sql_post_table INNER JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
|
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
|
||||||
WHERE `thread`.`uid` = %d AND `thread`.`visible` = 1 AND `thread`.`deleted` = 0
|
|
||||||
and `thread`.`moderated` = 0
|
|
||||||
AND `thread`.`wall` = 1
|
|
||||||
$sql_extra3 $sql_extra $sql_extra2 ",
|
|
||||||
intval($a->profile['profile_uid'])
|
|
||||||
);
|
|
||||||
|
|
||||||
if (dbm::is_result($r)) {
|
|
||||||
$a->set_pager_total($r[0]['total']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if we serve a mobile device and get the user settings
|
// check if we serve a mobile device and get the user settings
|
||||||
// accordingly
|
// accordingly
|
||||||
if ($a->is_mobile) {
|
if ($a->is_mobile) {
|
||||||
|
|
@ -335,14 +318,10 @@ function profile_content(App $a, $update = 0) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$o .= conversation($a,$items,'profile',$update);
|
$o .= conversation($a, $items, 'profile', $update);
|
||||||
|
|
||||||
if(! $update) {
|
if (!$update) {
|
||||||
if(!get_config('system', 'old_pager')) {
|
$o .= alt_pager($a, count($items));
|
||||||
$o .= alt_pager($a,count($items));
|
|
||||||
} else {
|
|
||||||
$o .= paginate($a);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
|
|
||||||
|
|
@ -15,28 +15,18 @@ function share_init(App $a) {
|
||||||
if(! dbm::is_result($r) || ($r[0]['private'] == 1))
|
if(! dbm::is_result($r) || ($r[0]['private'] == 1))
|
||||||
killme();
|
killme();
|
||||||
|
|
||||||
if (!intval(get_config('system','old_share'))) {
|
if (strpos($r[0]['body'], "[/share]") !== false) {
|
||||||
if (strpos($r[0]['body'], "[/share]") !== false) {
|
$pos = strpos($r[0]['body'], "[share");
|
||||||
$pos = strpos($r[0]['body'], "[share");
|
$o = substr($r[0]['body'], $pos);
|
||||||
$o = substr($r[0]['body'], $pos);
|
|
||||||
} else {
|
|
||||||
$o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
|
|
||||||
|
|
||||||
if($r[0]['title'])
|
|
||||||
$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
|
|
||||||
$o .= $r[0]['body'];
|
|
||||||
$o.= "[/share]";
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
$o = '';
|
$o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
|
||||||
|
|
||||||
$o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
|
|
||||||
if($r[0]['title'])
|
if($r[0]['title'])
|
||||||
$o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
|
$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
|
||||||
$o .= $r[0]['body'] . "\n" ;
|
$o .= $r[0]['body'];
|
||||||
|
$o.= "[/share]";
|
||||||
$o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
echo $o;
|
echo $o;
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -287,32 +287,6 @@ class Item extends BaseObject {
|
||||||
|
|
||||||
localize_item($item);
|
localize_item($item);
|
||||||
|
|
||||||
if ($item["postopts"] and !get_config("system", "suppress_language")) {
|
|
||||||
//$langdata = explode(";", $item["postopts"]);
|
|
||||||
//$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
|
|
||||||
$langstr = "";
|
|
||||||
if (substr($item["postopts"], 0, 5) == "lang=") {
|
|
||||||
$postopts = substr($item["postopts"], 5);
|
|
||||||
|
|
||||||
$languages = explode(":", $postopts);
|
|
||||||
|
|
||||||
if (sizeof($languages) == 1) {
|
|
||||||
$languages = array();
|
|
||||||
$languages[] = $postopts;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($languages as $language) {
|
|
||||||
$langdata = explode(";", $language);
|
|
||||||
if ($langstr != "") {
|
|
||||||
$langstr .= ", ";
|
|
||||||
}
|
|
||||||
|
|
||||||
//$langstr .= $langdata[0]." (".round($langdata[1]*100, 1)."%)";
|
|
||||||
$langstr .= round($langdata[1]*100, 1)."% ".$langdata[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$body = prepare_body($item,true);
|
$body = prepare_body($item,true);
|
||||||
|
|
||||||
list($categories, $folders) = get_cats_and_terms($item);
|
list($categories, $folders) = get_cats_and_terms($item);
|
||||||
|
|
@ -420,7 +394,6 @@ class Item extends BaseObject {
|
||||||
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
|
'previewing' => ($conv->is_preview() ? ' preview ' : ''),
|
||||||
'wait' => t('Please wait'),
|
'wait' => t('Please wait'),
|
||||||
'thread_level' => $thread_level,
|
'thread_level' => $thread_level,
|
||||||
'postopts' => $langstr,
|
|
||||||
'edited' => $edited,
|
'edited' => $edited,
|
||||||
'network' => $item["item_network"],
|
'network' => $item["item_network"],
|
||||||
'network_name' => network_to_name($item['item_network'], $profile_link),
|
'network_name' => network_to_name($item['item_network'], $profile_link),
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,6 @@
|
||||||
{{include file="field_select.tpl" field=$theme_mobile}}
|
{{include file="field_select.tpl" field=$theme_mobile}}
|
||||||
{{include file="field_select.tpl" field=$ssl_policy}}
|
{{include file="field_select.tpl" field=$ssl_policy}}
|
||||||
{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
|
{{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}}
|
||||||
{{include file="field_checkbox.tpl" field=$old_share}}
|
|
||||||
{{include file="field_checkbox.tpl" field=$hide_help}}
|
{{include file="field_checkbox.tpl" field=$hide_help}}
|
||||||
{{include file="field_select.tpl" field=$singleuser}}
|
{{include file="field_select.tpl" field=$singleuser}}
|
||||||
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
||||||
|
|
@ -132,7 +131,6 @@
|
||||||
{{include file="field_input.tpl" field=$lockpath}}
|
{{include file="field_input.tpl" field=$lockpath}}
|
||||||
{{include file="field_input.tpl" field=$temppath}}
|
{{include file="field_input.tpl" field=$temppath}}
|
||||||
{{include file="field_input.tpl" field=$basepath}}
|
{{include file="field_input.tpl" field=$basepath}}
|
||||||
{{include file="field_checkbox.tpl" field=$suppress_language}}
|
|
||||||
{{include file="field_checkbox.tpl" field=$suppress_tags}}
|
{{include file="field_checkbox.tpl" field=$suppress_tags}}
|
||||||
{{include file="field_checkbox.tpl" field=$nodeinfo}}
|
{{include file="field_checkbox.tpl" field=$nodeinfo}}
|
||||||
{{include file="field_input.tpl" field=$embedly}}
|
{{include file="field_input.tpl" field=$embedly}}
|
||||||
|
|
@ -153,7 +151,6 @@
|
||||||
{{include file="field_input.tpl" field=$itemcache_duration}}
|
{{include file="field_input.tpl" field=$itemcache_duration}}
|
||||||
{{include file="field_input.tpl" field=$max_comments}}
|
{{include file="field_input.tpl" field=$max_comments}}
|
||||||
{{include file="field_checkbox.tpl" field=$proxy_disabled}}
|
{{include file="field_checkbox.tpl" field=$proxy_disabled}}
|
||||||
{{include file="field_checkbox.tpl" field=$old_pager}}
|
|
||||||
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
|
||||||
|
|
||||||
<h3>{{$worker_title}}</h3>
|
<h3>{{$worker_title}}</h3>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
{{if $pager}}
|
{{if $pager}}
|
||||||
{{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}}
|
{{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}}
|
||||||
|
|
||||||
{{if $pager.first}}<span class="pager_first $pager.first.class"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
|
{{if $pager.first}}<span class="pager_first {{$pager.first.class}}"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
|
||||||
|
|
||||||
{{foreach $pager.pages as $p}}<span class="pager_{{$p.class}}"><a href="{{$p.url}}">{{$p.text}}</a></span>{{/foreach}}
|
{{foreach $pager.pages as $p}}<span class="pager_{{$p.class}}"><a href="{{$p.url}}">{{$p.text}}</a></span>{{/foreach}}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1552,6 +1552,9 @@ blockquote.shared_content {
|
||||||
clear:left;
|
clear:left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.pager_first,
|
.pager_first,
|
||||||
.pager_last,
|
.pager_last,
|
||||||
|
|
|
||||||
|
|
@ -2508,6 +2508,56 @@ body .tread-wrapper .hovercard:hover .hover-card-content a {
|
||||||
color: $link_color !important;
|
color: $link_color !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Pagination improvements */
|
||||||
|
.pagination {
|
||||||
|
text-align: center;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
.pagination > li > a,
|
||||||
|
.pagination > li > span {
|
||||||
|
color: $link_color;
|
||||||
|
float: none;
|
||||||
|
}
|
||||||
|
.pagination>li>a:hover,
|
||||||
|
.pagination>li>span:hover {
|
||||||
|
color: $link_hover_color;
|
||||||
|
}
|
||||||
|
.pagination > .active > a,
|
||||||
|
.pagination > .active > a:focus,
|
||||||
|
.pagination > .active > a:hover,
|
||||||
|
.pagination > .active > span,
|
||||||
|
.pagination > .active > span:focus,
|
||||||
|
.pagination > .active > span:hover {
|
||||||
|
background-color: $link_color;
|
||||||
|
border-color: $link_color;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
.pagination li.pager_n a {
|
||||||
|
margin-left: 3px;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
.pagination .pager_prev a {
|
||||||
|
margin-left: -5px;
|
||||||
|
margin-right: 4px;
|
||||||
|
border-top-right-radius: 3px;
|
||||||
|
border-bottom-right-radius: 3px;
|
||||||
|
}
|
||||||
|
.pagination .pager_next a {
|
||||||
|
margin-left: 4px;
|
||||||
|
margin-right: -5px;
|
||||||
|
border-top-left-radius: 3px;
|
||||||
|
border-bottom-left-radius: 3px;
|
||||||
|
}
|
||||||
|
.pager .next > a,
|
||||||
|
.pager .previous > a {
|
||||||
|
float: none;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
.pagination .disabled > a,
|
||||||
|
.pager .disabled > a {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* some temporary workarounds until this will solved
|
* some temporary workarounds until this will solved
|
||||||
* elsewhere (e.g. new templates)
|
* elsewhere (e.g. new templates)
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,9 @@
|
||||||
|
|
||||||
// Catch the GUID from the URL
|
// Catch the GUID from the URL
|
||||||
var itemGuid = window.location.pathname.split("/").pop();
|
var itemGuid = window.location.pathname.split("/").pop();
|
||||||
|
var itemGuidSafe = itemGuid.replace(/%.*/, '');
|
||||||
|
|
||||||
$(window).load(function(){
|
$(window).load(function(){
|
||||||
// Scroll to the Item by its GUID
|
// Scroll to the Item by its GUID
|
||||||
scrollToItem('item-'+itemGuid);
|
scrollToItem('item-' + itemGuidSafe);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -162,21 +162,29 @@ function qCommentInsert(obj,id) {
|
||||||
|
|
||||||
function confirmDelete() { return confirm(aStr.delitem); }
|
function confirmDelete() { return confirm(aStr.delitem); }
|
||||||
|
|
||||||
function dropItem(url, object) {
|
/**
|
||||||
|
* Hide and removes an item element from the DOM after the deletion url is
|
||||||
|
* successful, restore it else.
|
||||||
|
*
|
||||||
|
* @param {string} url The item removal URL
|
||||||
|
* @param {string} elementId The DOM id of the item element
|
||||||
|
* @returns {undefined}
|
||||||
|
*/
|
||||||
|
function dropItem(url, elementId) {
|
||||||
var confirm = confirmDelete();
|
var confirm = confirmDelete();
|
||||||
|
|
||||||
//if the first character of the object is #, remove it because
|
if (confirm) {
|
||||||
// we use getElementById which don't need the #
|
|
||||||
// getElementByID selects elements even if there are special characters
|
|
||||||
// in the ID (like %) which won't work with jQuery
|
|
||||||
/// @todo ceck if we can solve this in the template
|
|
||||||
object = object.indexOf('#') == 0 ? object.substring(1) : object;
|
|
||||||
|
|
||||||
if(confirm) {
|
|
||||||
$('body').css('cursor', 'wait');
|
$('body').css('cursor', 'wait');
|
||||||
$(document.getElementById(object)).fadeTo('fast', 0.33, function () {
|
|
||||||
$.get(url).done(function() {
|
var $el = $(document.getElementById(elementId));
|
||||||
$(document.getElementById(object)).remove();
|
|
||||||
|
$el.fadeTo('fast', 0.33, function () {
|
||||||
|
$.get(url).then(function() {
|
||||||
|
$el.remove();
|
||||||
|
}).error(function() {
|
||||||
|
// @todo Show related error message
|
||||||
|
$el.show();
|
||||||
|
}).always(function() {
|
||||||
$('body').css('cursor', 'auto');
|
$('body').css('cursor', 'auto');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -573,31 +573,38 @@ String.prototype.rtrim = function() {
|
||||||
return trimmed;
|
return trimmed;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Scroll to a specific item and highlight it
|
/**
|
||||||
// Note: jquery.color.js is needed
|
* Scroll the screen to the item element whose id is provided, then highlights it
|
||||||
function scrollToItem(itemID) {
|
*
|
||||||
if( typeof itemID === "undefined")
|
* Note: jquery.color.js is required
|
||||||
|
*
|
||||||
|
* @param {string} elementId The item element id
|
||||||
|
* @returns {undefined}
|
||||||
|
*/
|
||||||
|
function scrollToItem(elementId) {
|
||||||
|
if (typeof elementId === "undefined") {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var elm = $('#'+itemID);
|
var $el = $(document.getElementById(elementId));
|
||||||
// Test if the Item exists
|
// Test if the Item exists
|
||||||
if(!elm.length)
|
if (!$el.length) {
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Define the colors which are used for highlighting
|
// Define the colors which are used for highlighting
|
||||||
var colWhite = {backgroundColor:'#F5F5F5'};
|
var colWhite = {backgroundColor:'#F5F5F5'};
|
||||||
var colShiny = {backgroundColor:'#FFF176'};
|
var colShiny = {backgroundColor:'#FFF176'};
|
||||||
|
|
||||||
// Get the Item Position (we need to substract 100 to match
|
// Get the Item Position (we need to substract 100 to match correct position
|
||||||
// correct position
|
var itemPos = $el.offset().top - 100;
|
||||||
var itemPos = $(elm).offset().top - 100;
|
|
||||||
|
|
||||||
// Scroll to the DIV with the ID (GUID)
|
// Scroll to the DIV with the ID (GUID)
|
||||||
$('html, body').animate({
|
$('html, body').animate({
|
||||||
scrollTop: itemPos
|
scrollTop: itemPos
|
||||||
}, 400, function() {
|
}, 400, function() {
|
||||||
// Highlight post/commenent with ID (GUID)
|
// Highlight post/commenent with ID (GUID)
|
||||||
$(elm).animate(colWhite, 1000).animate(colShiny).animate(colWhite, 600);
|
$el.animate(colWhite, 1000).animate(colShiny).animate(colWhite, 600);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,292 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
class colors {
|
|
||||||
|
|
||||||
/* Convert hexdec color string to rgb(a) string */
|
|
||||||
|
|
||||||
function hex2rgba($color, $opacity = false) {
|
|
||||||
|
|
||||||
$default = 'rgb(0,0,0)';
|
|
||||||
|
|
||||||
//Return default if no color provided
|
|
||||||
if(empty($color))
|
|
||||||
return $default;
|
|
||||||
|
|
||||||
//Sanitize $color if "#" is provided
|
|
||||||
if ($color[0] == '#' ) {
|
|
||||||
$color = substr( $color, 1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check if color has 6 or 3 characters and get values
|
|
||||||
if (strlen($color) == 6) {
|
|
||||||
$hex = array( $color[0] . $color[1], $color[2] . $color[3], $color[4] . $color[5] );
|
|
||||||
} elseif ( strlen( $color ) == 3 ) {
|
|
||||||
$hex = array( $color[0] . $color[0], $color[1] . $color[1], $color[2] . $color[2] );
|
|
||||||
} else {
|
|
||||||
return $default;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Convert hexadec to rgb
|
|
||||||
$rgb = array_map('hexdec', $hex);
|
|
||||||
|
|
||||||
//Check if opacity is set(rgba or rgb)
|
|
||||||
if($opacity){
|
|
||||||
if(abs($opacity) > 1)
|
|
||||||
$opacity = 1.0;
|
|
||||||
$output = 'rgba('.implode(",",$rgb).','.$opacity.')';
|
|
||||||
} else {
|
|
||||||
$output = 'rgb('.implode(",",$rgb).')';
|
|
||||||
}
|
|
||||||
|
|
||||||
//Return rgb(a) color string
|
|
||||||
return $output;
|
|
||||||
}
|
|
||||||
|
|
||||||
function hex2rgb( $colour ) {
|
|
||||||
if ( $colour[0] == '#' ) {
|
|
||||||
$colour = substr( $colour, 1 );
|
|
||||||
}
|
|
||||||
if ( strlen( $colour ) == 6 ) {
|
|
||||||
list( $r, $g, $b ) = array( $colour[0] . $colour[1], $colour[2] . $colour[3], $colour[4] . $colour[5] );
|
|
||||||
} elseif ( strlen( $colour ) == 3 ) {
|
|
||||||
list( $r, $g, $b ) = array( $colour[0] . $colour[0], $colour[1] . $colour[1], $colour[2] . $colour[2] );
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
$r = hexdec( $r );
|
|
||||||
$g = hexdec( $g );
|
|
||||||
$b = hexdec( $b );
|
|
||||||
return array( 'red' => $r, 'green' => $g, 'blue' => $b );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function rgbToHsl( $r, $g, $b ) {
|
|
||||||
$oldR = $r;
|
|
||||||
$oldG = $g;
|
|
||||||
$oldB = $b;
|
|
||||||
$r /= 255;
|
|
||||||
$g /= 255;
|
|
||||||
$b /= 255;
|
|
||||||
$max = max( $r, $g, $b );
|
|
||||||
$min = min( $r, $g, $b );
|
|
||||||
$h;
|
|
||||||
$s;
|
|
||||||
$l = ( $max + $min ) / 2;
|
|
||||||
$d = $max - $min;
|
|
||||||
|
|
||||||
if( $d == 0 ){
|
|
||||||
$h = $s = 0; // achromatic
|
|
||||||
} else {
|
|
||||||
$s = $d / ( 1 - abs( 2 * $l - 1 ) );
|
|
||||||
switch( $max ){
|
|
||||||
case $r:
|
|
||||||
$h = 60 * fmod( ( ( $g - $b ) / $d ), 6 );
|
|
||||||
if ($b > $g) {
|
|
||||||
$h += 360;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case $g:
|
|
||||||
$h = 60 * ( ( $b - $r ) / $d + 2 );
|
|
||||||
break;
|
|
||||||
case $b:
|
|
||||||
$h = 60 * ( ( $r - $g ) / $d + 4 );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return array( round( $h, 2 ), round( $s, 2 ), round( $l, 2 ) );
|
|
||||||
}
|
|
||||||
function hslToRgb( $h, $s, $l ){
|
|
||||||
$r = "";
|
|
||||||
$g = "";
|
|
||||||
$b = "";
|
|
||||||
|
|
||||||
$c = ( 1 - abs( 2 * $l - 1 ) ) * $s;
|
|
||||||
$x = $c * ( 1 - abs( fmod( ( $h / 60 ), 2 ) - 1 ) );
|
|
||||||
$m = $l - ( $c / 2 );
|
|
||||||
if ( $h < 60 ) {
|
|
||||||
$r = $c;
|
|
||||||
$g = $x;
|
|
||||||
$b = 0;
|
|
||||||
} else if ( $h < 120 ) {
|
|
||||||
$r = $x;
|
|
||||||
$g = $c;
|
|
||||||
$b = 0;
|
|
||||||
} else if ( $h < 180 ) {
|
|
||||||
$r = 0;
|
|
||||||
$g = $c;
|
|
||||||
$b = $x;
|
|
||||||
} else if ( $h < 240 ) {
|
|
||||||
$r = 0;
|
|
||||||
$g = $x;
|
|
||||||
$b = $c;
|
|
||||||
} else if ( $h < 300 ) {
|
|
||||||
$r = $x;
|
|
||||||
$g = 0;
|
|
||||||
$b = $c;
|
|
||||||
} else {
|
|
||||||
$r = $c;
|
|
||||||
$g = 0;
|
|
||||||
$b = $x;
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = ( $r + $m ) * 255;
|
|
||||||
$g = ( $g + $m ) * 255;
|
|
||||||
$b = ( $b + $m ) * 255;
|
|
||||||
|
|
||||||
return array( floor( $r ), floor( $g ), floor( $b ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Som more example code - this needs to be deletet if we don't need it in
|
|
||||||
* the future
|
|
||||||
*/
|
|
||||||
|
|
||||||
function HTMLToRGB($htmlCode)
|
|
||||||
{
|
|
||||||
if($htmlCode[0] == '#')
|
|
||||||
$htmlCode = substr($htmlCode, 1);
|
|
||||||
|
|
||||||
if (strlen($htmlCode) == 3)
|
|
||||||
{
|
|
||||||
$htmlCode = $htmlCode[0] . $htmlCode[0] . $htmlCode[1] . $htmlCode[1] . $htmlCode[2] . $htmlCode[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = hexdec($htmlCode[0] . $htmlCode[1]);
|
|
||||||
$g = hexdec($htmlCode[2] . $htmlCode[3]);
|
|
||||||
$b = hexdec($htmlCode[4] . $htmlCode[5]);
|
|
||||||
|
|
||||||
return $b + ($g << 0x8) + ($r << 0x10);
|
|
||||||
}
|
|
||||||
|
|
||||||
function RGBToHTML($RGB)
|
|
||||||
{
|
|
||||||
$r = 0xFF & ($RGB >> 0x10);
|
|
||||||
$g = 0xFF & ($RGB >> 0x8);
|
|
||||||
$b = 0xFF & $RGB;
|
|
||||||
|
|
||||||
$r = dechex($r);
|
|
||||||
$g = dechex($g);
|
|
||||||
$b = dechex($b);
|
|
||||||
|
|
||||||
return "#" . str_pad($r, 2, "0", STR_PAD_LEFT) . str_pad($g, 2, "0", STR_PAD_LEFT) . str_pad($b, 2, "0", STR_PAD_LEFT);
|
|
||||||
}
|
|
||||||
|
|
||||||
function ChangeLuminosity($RGB, $LuminosityPercent)
|
|
||||||
{
|
|
||||||
$HSL = RGBToHSL($RGB);
|
|
||||||
$NewHSL = (int)(((float)$LuminosityPercent / 100) * 255) + (0xFFFF00 & $HSL);
|
|
||||||
return HSLToRGB($NewHSL);
|
|
||||||
}
|
|
||||||
|
|
||||||
function RGBToHSL($RGB)
|
|
||||||
{
|
|
||||||
$r = 0xFF & ($RGB >> 0x10);
|
|
||||||
$g = 0xFF & ($RGB >> 0x8);
|
|
||||||
$b = 0xFF & $RGB;
|
|
||||||
|
|
||||||
$r = ((float)$r) / 255.0;
|
|
||||||
$g = ((float)$g) / 255.0;
|
|
||||||
$b = ((float)$b) / 255.0;
|
|
||||||
|
|
||||||
$maxC = max($r, $g, $b);
|
|
||||||
$minC = min($r, $g, $b);
|
|
||||||
|
|
||||||
$l = ($maxC + $minC) / 2.0;
|
|
||||||
|
|
||||||
if($maxC == $minC)
|
|
||||||
{
|
|
||||||
$s = 0;
|
|
||||||
$h = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if($l < .5)
|
|
||||||
{
|
|
||||||
$s = ($maxC - $minC) / ($maxC + $minC);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$s = ($maxC - $minC) / (2.0 - $maxC - $minC);
|
|
||||||
}
|
|
||||||
if($r == $maxC)
|
|
||||||
$h = ($g - $b) / ($maxC - $minC);
|
|
||||||
if($g == $maxC)
|
|
||||||
$h = 2.0 + ($b - $r) / ($maxC - $minC);
|
|
||||||
if($b == $maxC)
|
|
||||||
$h = 4.0 + ($r - $g) / ($maxC - $minC);
|
|
||||||
|
|
||||||
$h = $h / 6.0;
|
|
||||||
}
|
|
||||||
|
|
||||||
$h = (int)round(255.0 * $h);
|
|
||||||
$s = (int)round(255.0 * $s);
|
|
||||||
$l = (int)round(255.0 * $l);
|
|
||||||
|
|
||||||
$HSL = $l + ($s << 0x8) + ($h << 0x10);
|
|
||||||
return $HSL;
|
|
||||||
}
|
|
||||||
|
|
||||||
function HSLToRGB($HSL)
|
|
||||||
{
|
|
||||||
$h = 0xFF & ($HSL >> 0x10);
|
|
||||||
$s = 0xFF & ($HSL >> 0x8);
|
|
||||||
$l = 0xFF & $HSL;
|
|
||||||
|
|
||||||
$h = ((float)$h) / 255.0;
|
|
||||||
$s = ((float)$s) / 255.0;
|
|
||||||
$l = ((float)$l) / 255.0;
|
|
||||||
|
|
||||||
if($s == 0)
|
|
||||||
{
|
|
||||||
$r = $l;
|
|
||||||
$g = $l;
|
|
||||||
$b = $l;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if($l < .5)
|
|
||||||
{
|
|
||||||
$t2 = $l * (1.0 + $s);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$t2 = ($l + $s) - ($l * $s);
|
|
||||||
}
|
|
||||||
$t1 = 2.0 * $l - $t2;
|
|
||||||
|
|
||||||
$rt3 = $h + 1.0/3.0;
|
|
||||||
$gt3 = $h;
|
|
||||||
$bt3 = $h - 1.0/3.0;
|
|
||||||
|
|
||||||
if($rt3 < 0) $rt3 += 1.0;
|
|
||||||
if($rt3 > 1) $rt3 -= 1.0;
|
|
||||||
if($gt3 < 0) $gt3 += 1.0;
|
|
||||||
if($gt3 > 1) $gt3 -= 1.0;
|
|
||||||
if($bt3 < 0) $bt3 += 1.0;
|
|
||||||
if($bt3 > 1) $bt3 -= 1.0;
|
|
||||||
|
|
||||||
if(6.0 * $rt3 < 1) $r = $t1 + ($t2 - $t1) * 6.0 * $rt3;
|
|
||||||
elseif(2.0 * $rt3 < 1) $r = $t2;
|
|
||||||
elseif(3.0 * $rt3 < 2) $r = $t1 + ($t2 - $t1) * ((2.0/3.0) - $rt3) * 6.0;
|
|
||||||
else $r = $t1;
|
|
||||||
|
|
||||||
if(6.0 * $gt3 < 1) $g = $t1 + ($t2 - $t1) * 6.0 * $gt3;
|
|
||||||
elseif(2.0 * $gt3 < 1) $g = $t2;
|
|
||||||
elseif(3.0 * $gt3 < 2) $g = $t1 + ($t2 - $t1) * ((2.0/3.0) - $gt3) * 6.0;
|
|
||||||
else $g = $t1;
|
|
||||||
|
|
||||||
if(6.0 * $bt3 < 1) $b = $t1 + ($t2 - $t1) * 6.0 * $bt3;
|
|
||||||
elseif(2.0 * $bt3 < 1) $b = $t2;
|
|
||||||
elseif(3.0 * $bt3 < 2) $b = $t1 + ($t2 - $t1) * ((2.0/3.0) - $bt3) * 6.0;
|
|
||||||
else $b = $t1;
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = (int)round(255.0 * $r);
|
|
||||||
$g = (int)round(255.0 * $g);
|
|
||||||
$b = (int)round(255.0 * $b);
|
|
||||||
|
|
||||||
$RGB = $b + ($g << 0x8) + ($r << 0x10);
|
|
||||||
return $RGB;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
|
||||||
|
{{* Pager template, uses output of paginate_data() in include/text.php *}}
|
||||||
|
|
||||||
|
{{if $pager}}
|
||||||
|
<ul class="{{$pager.class}} pagination-sm">
|
||||||
|
{{if $pager.first}}<li class="pager_first {{$pager.first.class}}"><a href="{{$pager.first.url}}" title="{{$pager.first.text}}">∣<</a></li>{{/if}}
|
||||||
|
|
||||||
|
{{if $pager.prev}}<li class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}" title="{{$pager.prev.text}}"><</a></li>{{/if}}
|
||||||
|
|
||||||
|
{{foreach $pager.pages as $p}}<li class="pager_{{$p.class}} hidden-xs hidden-sm"><a href="{{$p.url}}">{{$p.text}}</a></li>{{/foreach}}
|
||||||
|
|
||||||
|
{{if $pager.next}}<li class="pager_next {{$pager.next.class}}"><a href="{{$pager.next.url}}" title="{{$pager.next.text}}">></a></li>{{/if}}
|
||||||
|
|
||||||
|
{{if $pager.last}}<li class="pager_last {{$pager.last.class}}"><a href="{{$pager.last.url}}" title="{{$pager.last.text}}">>∣</a></li>{{/if}}
|
||||||
|
</ul>
|
||||||
|
{{/if}}
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
<!-- ./TODO => Unknow block -->
|
<!-- ./TODO => Unknow block -->
|
||||||
|
|
||||||
|
|
||||||
<div class="panel">
|
<div class="panel" id="item-{{$item.guid}}">
|
||||||
<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
|
<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
|
||||||
<div class="media">
|
<div class="media">
|
||||||
{{* Put additional actions in a top-right dropdown menu *}}
|
{{* Put additional actions in a top-right dropdown menu *}}
|
||||||
|
|
@ -54,7 +54,7 @@
|
||||||
{{if $item.drop.dropping}}
|
{{if $item.drop.dropping}}
|
||||||
<li role="separator" class="divider"></li>
|
<li role="separator" class="divider"></li>
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
|
<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
||||||
|
|
||||||
{{if $item.drop.dropping}}
|
{{if $item.drop.dropping}}
|
||||||
<li role="menuitem">
|
<li role="menuitem">
|
||||||
<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', '#item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
|
<a class="navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}'); return false;" title="{{$item.drop.delete}}"><i class="fa fa-trash"></i> {{$item.drop.delete}}</a>
|
||||||
</li>
|
</li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -1909,6 +1909,9 @@ input#profile-jot-email {
|
||||||
-webkit-border-radius: 10px;
|
-webkit-border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.pager_first,
|
.pager_first,
|
||||||
.pager_last,
|
.pager_last,
|
||||||
|
|
|
||||||
|
|
@ -1866,6 +1866,9 @@ input#dfrn-url {
|
||||||
-webkit-border-radius: 10px;
|
-webkit-border-radius: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.pager_first,
|
.pager_first,
|
||||||
.pager_last,
|
.pager_last,
|
||||||
|
|
|
||||||
|
|
@ -2481,6 +2481,9 @@ footer {
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* ADMIN
|
* ADMIN
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -2481,6 +2481,9 @@ footer {
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* ADMIN
|
* ADMIN
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1675,6 +1675,9 @@ footer { height: 100px; display: table-row; }
|
||||||
margin-top: 25px;
|
margin-top: 25px;
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ADMIN
|
* ADMIN
|
||||||
|
|
|
||||||
|
|
@ -396,6 +396,10 @@ ul.menu-popup li a:hover {
|
||||||
margin: 4px;
|
margin: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.pager_current {
|
.pager_current {
|
||||||
background-color: #1873a2;
|
background-color: #1873a2;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
|
|
|
||||||
|
|
@ -247,6 +247,10 @@ div.pager {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.pager .disabled {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.hide-comments-outer {
|
.hide-comments-outer {
|
||||||
margin-left: 80px;
|
margin-left: 80px;
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue