Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 16:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
streams/include/zot.php

3927 lines
125 KiB
PHP
Raw Normal View History

Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
<?php
item store hooks
2013-11-29 02:10:04 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @file include/zot.php
first pass name change
2015-05-05 10:56:10 +00:00
* @brief Hubzilla implementation of zot protocol.
item store hooks
2013-11-29 02:10:04 +00:00
*
* https://github.com/friendica/red/wiki/zot
* https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview
*
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
require_once('include/crypto.php');
require_once('include/items.php');
require_once('include/hubloc.php');
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
require_once('include/DReport.php');
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
item store hooks
2013-11-29 02:10:04 +00:00
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Generates a unique string for use as a zot guid.
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* Generates a unique string for use as a zot guid using our DNS-based url, the
* channel nickname and some entropy.
* The entropy ensures uniqueness against re-installs where the same URL and
* nickname are chosen.
doco
2013-11-29 01:47:33 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @note zot doesn't require this to be unique. Internally we use a whirlpool
* hash of this guid and the signature of this guid signed with the channel
* private key. This can be verified and should make the probability of
* collision of the verified result negligible within the constraints of our
* immediate universe.
doco
2013-11-29 01:47:33 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param string $channel_nick a unique nickname of controlling entity
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
* @returns string
*/
moving a lot of structure around. 'entity' is now 'channel'
2012-09-26 00:57:20 +00:00
function zot_new_uid($channel_nick) {
$rawstr = z_root() . '/' . $channel_nick . '.' . mt_rand();
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
return(base64url_encode(hash('whirlpool', $rawstr, true), true));
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
}
clean up more code duplication
2014-07-15 04:21:24 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Generates a portable hash identifier for a channel.
clean up more code duplication
2014-07-15 04:21:24 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* Generates a portable hash identifier for the channel identified by $guid and
* signed with $guid_sig.
clean up more code duplication
2014-07-15 04:21:24 +00:00
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @note This ID is portable across the network but MUST be calculated locally
* by verifying the signature and can not be trusted as an identity.
clean up more code duplication
2014-07-15 04:21:24 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param string $guid
* @param string $guid_sig
clean up more code duplication
2014-07-15 04:21:24 +00:00
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function make_xchan_hash($guid, $guid_sig) {
return base64url_encode(hash('whirlpool', $guid . $guid_sig, true));
clean up more code duplication
2014-07-15 04:21:24 +00:00
}
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Given a zot hash, return all distinct hubs.
*
* This function is used in building the zot discovery packet and therefore
* should only be used by channels which are defined on this hub.
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param string $hash - xchan_hash
* @returns array of hubloc (hub location structures)
* * \b hubloc_id int
* * \b hubloc_guid char(255)
* * \b hubloc_guid_sig text
* * \b hubloc_hash char(255)
* * \b hubloc_addr char(255)
* * \b hubloc_flags int
* * \b hubloc_status int
* * \b hubloc_url char(255)
* * \b hubloc_url_sig text
* * \b hubloc_host char(255)
* * \b hubloc_callback char(255)
* * \b hubloc_connect char(255)
* * \b hubloc_sitekey text
* * \b hubloc_updated datetime
* * \b hubloc_connected datetime
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
*/
reduce the likelihood that a given channel will have 30-40 valid hublocs with the same hubloc_url.
2013-11-27 10:51:16 +00:00
function zot_get_hublocs($hash) {
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/* Only search for active hublocs - e.g. those that haven't been marked deleted */
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
incorrect value for hubloc_deleted in zot_get_hublocs() query
2015-07-07 23:06:34 +00:00
$ret = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0 order by hubloc_url ",
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 23:35:42 +00:00
dbesc($hash)
only list undeleted hublocs in zot_finger
2013-11-29 00:46:47 +00:00
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
reduce the likelihood that a given channel will have 30-40 valid hublocs with the same hubloc_url.
2013-11-27 10:51:16 +00:00
return $ret;
move today's events into a ping notification
2012-07-29 00:21:42 +00:00
}
php warnings
2014-11-03 03:22:18 +00:00
doco
2013-11-29 01:47:33 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Builds a zot notification packet.
doco
2013-11-29 01:47:33 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* Builds a zot notification packet that you can either store in the queue with
* a message array or call zot_zot to immediately zot it to the other side.
more infrastructure changes
2012-11-15 03:27:16 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param array $channel
* sender channel structure
* @param string $type
* packet type: one of 'ping', 'pickup', 'purge', 'refresh', 'force_refresh', 'notify', 'auth_check'
* @param array $recipients
* envelope information, array ( 'guid' => string, 'guid_sig' => string ); empty for public posts
* @param string $remote_key
* optional public site key of target hub used to encrypt entire packet
* NOTE: remote_key and encrypted packets are required for 'auth_check' packets, optional for all others
* @param string $secret
* random string, required for packets which require verification/callback
* e.g. 'pickup', 'purge', 'notify', 'auth_check'. Packet types 'ping', 'force_refresh', and 'refresh' do not require verification
* @param string $extra
doco
2013-11-29 01:47:33 +00:00
* @returns string json encoded zot packet
more infrastructure changes
2012-11-15 03:27:16 +00:00
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function zot_build_packet($channel, $type = 'notify', $recipients = null, $remote_key = null, $secret = null, $extra = null) {
more infrastructure changes
2012-11-15 03:27:16 +00:00
$data = array(
'type' => $type,
'sender' => array(
'guid' => $channel['channel_guid'],
'guid_sig' => base64url_encode(rsa_sign($channel['channel_guid'],$channel['channel_prvkey'])),
'url' => z_root(),
'url_sig' => base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
),
more infrastructure changes
2012-11-15 03:27:16 +00:00
'callback' => '/post',
'version' => ZOT_REVISION
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($recipients) {
for ($x = 0; $x < count($recipients); $x ++)
works one way sort of - now to go the other way - which will require fixing a whole slew of FIXMEs
2014-08-27 01:58:48 +00:00
unset($recipients[$x]['hash']);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
more infrastructure changes
2012-11-15 03:27:16 +00:00
$data['recipients'] = $recipients;
works one way sort of - now to go the other way - which will require fixing a whole slew of FIXMEs
2014-08-27 01:58:48 +00:00
}
more infrastructure changes
2012-11-15 03:27:16 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($secret) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$data['secret'] = $secret;
magic auth - it's mostly done or at least all the code bits are written and it looks in theory to be pretty secure and it doesn't white screen. Getting it to actually work(?), well we won't know how hard that will be until we get it on a couple of systems and try it. Magic auth on one box is a no-op because you're already authenticated.
2013-01-22 03:16:21 +00:00
$data['secret_sig'] = base64url_encode(rsa_sign($secret,$channel['channel_prvkey']));
}
For private messages, use hush-hush ultra top-secret mode by default
2012-11-19 03:19:16 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($extra) {
foreach ($extra as $k => $v)
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$data[$k] = $v;
}
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('zot_build_packet: ' . print_r($data,true), LOGGER_DATA);
tracking through comments
2012-11-27 11:08:26 +00:00
more infrastructure changes
2012-11-15 03:27:16 +00:00
// Hush-hush ultra top-secret mode
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($remote_key) {
Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable.
2013-11-20 23:20:12 +00:00
$data = crypto_encapsulate(json_encode($data),$remote_key);
more infrastructure changes
2012-11-15 03:27:16 +00:00
}
return json_encode($data);
}
doco
2013-03-26 04:32:12 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief
*
* @see z_post_url()
doco
2013-03-26 04:32:12 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param string $url
* @param array $data
* @return array see z_post_url() for returned data format
doco
2013-03-26 04:32:12 +00:00
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function zot_zot($url, $data) {
return z_post_url($url, array('data' => $data));
more infrastructure changes
2012-11-15 03:27:16 +00:00
}
doco
2013-03-26 04:32:12 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Look up information about channel.
doco
2013-03-26 04:32:12 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param string $webbie
* does not have to be host qualified e.g. 'foo' is treated as 'foo\@thishub'
* @param array $channel
doco
2013-03-26 04:32:12 +00:00
* (optional), if supplied permissions will be enumerated specifically for $channel
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param boolean $autofallback
bring back photo shadows (via theme settings)
2013-10-03 05:59:58 +00:00
* fallback/failover to http if https connection cannot be established. Default is true.
doco
2013-03-26 04:32:12 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @return array see z_post_url() and \ref mod/zfinger.php
doco
2013-03-26 04:32:12 +00:00
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function zot_finger($webbie, $channel = null, $autofallback = true) {
doco
2013-03-26 04:32:12 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (strpos($webbie,'@') === false) {
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$address = $webbie;
$host = get_app()->get_hostname();
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$address = substr($webbie,0,strpos($webbie,'@'));
$host = substr($webbie,strpos($webbie,'@')+1);
}
$xchan_addr = $address . '@' . $host;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ((! $address) || (! $xchan_addr)) {
make zot_finger more bulletproof
2013-07-22 05:39:21 +00:00
logger('zot_finger: no address :' . $webbie);
return array('success' => false);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
}
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
logger('using xchan_addr: ' . $xchan_addr, LOGGER_DATA);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
ok *now* shred works with alternate config files
2014-05-08 03:31:21 +00:00
// potential issue here; the xchan_addr points to the primary hub.
// The webbie we were called with may not, so it might not be found
// unless we query for hubloc_addr instead of xchan_addr
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$r = q("select xchan.*, hubloc.* from xchan
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
left join hubloc on xchan_hash = hubloc_hash
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
where xchan_addr = '%s' and hubloc_primary = 1 limit 1",
dbesc($xchan_addr)
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($r) {
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$url = $r[0]['hubloc_url'];
sort out some anomalies
2014-08-26 04:42:46 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($r[0]['hubloc_network'] && $r[0]['hubloc_network'] !== 'zot') {
sort out some anomalies
2014-08-26 04:42:46 +00:00
logger('zot_finger: alternate network: ' . $webbie);
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
logger('url: '.$url.', net: '.var_export($r[0]['hubloc_network'],true), LOGGER_DATA);
sort out some anomalies
2014-08-26 04:42:46 +00:00
return array('success' => false);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
}
} else {
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$url = 'https://' . $host;
}
sort out some anomalies
2014-08-26 04:42:46 +00:00
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
$rhs = '/.well-known/zot-info';
use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches.
2013-02-14 04:09:30 +00:00
$https = ((strpos($url,'https://') === 0) ? true : false);
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
improve logging zot_finger
2013-07-22 04:54:20 +00:00
logger('zot_finger: ' . $address . ' at ' . $url, LOGGER_DEBUG);
implement "finger" command
2013-01-12 23:55:37 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($channel) {
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$postvars = array(
add key passing and verification to targeted discovery
2012-11-02 22:34:35 +00:00
'address' => $address,
'target' => $channel['channel_guid'],
'target_sig' => $channel['channel_guid_sig'],
'key' => $channel['channel_pubkey']
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
);
implement "finger" command
2013-01-12 23:55:37 +00:00
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$result = z_post_url($url . $rhs,$postvars);
use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches.
2013-02-14 04:09:30 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ((! $result['success']) && ($autofallback)) {
if ($https) {
use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches.
2013-02-14 04:09:30 +00:00
logger('zot_finger: https failed. falling back to http');
$result = z_post_url('http://' . $host . $rhs,$postvars);
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
implement "finger" command
2013-01-12 23:55:37 +00:00
$rhs .= '?f=&address=' . urlencode($address);
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
$result = z_fetch_url($url . $rhs);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ((! $result['success']) && ($autofallback)) {
if ($https) {
use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches.
2013-02-14 04:09:30 +00:00
logger('zot_finger: https failed. falling back to http');
$result = z_fetch_url('http://' . $host . $rhs);
}
}
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
}
use our own CA bundle as authoritative for backend communications. This avoids OS dependent CA validity mismatches.
2013-02-14 04:09:30 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $result['success'])
logger('zot_finger: no results');
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
return $result;
get permission discovery working - guid sigs were getting truncated in db
2012-11-01 03:53:02 +00:00
}
doco
2013-03-26 04:32:12 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Refreshes after permission changed or friending, etc.
*
* zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* to fetch new permissions via a finger/discovery operation. This may result in a new connection
* (abook entry) being added to a local channel and it may result in auto-permissions being granted.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
*
* Friending in zot is accomplished by sending a refresh packet to a specific channel which indicates a
* permission change has been made by the sender which affects the target channel. The hub controlling
* the target channel does targetted discovery (a zot-finger request requesting permissions for the local
* channel). These are decoded here, and if necessary and abook structure (addressbook) is created to store
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* the permissions assigned to this channel.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* Initially these abook structures are created with a 'pending' flag, so that no reverse permissions are
* implied until this is approved by the owner channel. A channel can also auto-populate permissions in
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* return and send back a refresh packet of its own. This is used by forum and group communication channels
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* so that friending and membership in the channel's "club" is automatic.
doco
2013-03-26 04:32:12 +00:00
*
doco
2013-11-29 02:46:59 +00:00
* @param array $them => xchan structure of sender
* @param array $channel => local channel structure of target recipient, required for "friending" operations
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param array $force default false
doco
2013-03-26 04:32:12 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @returns boolean true if successful, else false
doco
2013-03-26 04:32:12 +00:00
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function zot_refresh($them, $channel = null, $force = false) {
doco
2013-03-26 04:32:12 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (array_key_exists('xchan_network', $them) && ($them['xchan_network'] !== 'zot')) {
sort out some anomalies
2014-08-26 04:42:46 +00:00
logger('zot_refresh: not got zot. ' . $them['xchan_name']);
return true;
}
more logging, some debugging of group membership page
2012-12-30 23:28:13 +00:00
logger('zot_refresh: them: ' . print_r($them,true), LOGGER_DATA);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($channel)
issue with abook creation
2013-01-03 09:53:22 +00:00
logger('zot_refresh: channel: ' . print_r($channel,true), LOGGER_DATA);
more logging, some debugging of group membership page
2012-12-30 23:28:13 +00:00
let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates
2015-01-30 21:45:28 +00:00
$url = null;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($them['hubloc_url']) {
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
$url = $them['hubloc_url'];
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
zot_refresh: always try the hubloc pointed to by xchan_addr first
2015-09-10 23:48:08 +00:00
$r = null;
more work on surviving hub re-installs
2015-09-18 21:31:29 +00:00
// if they re-installed the server we could end up with the wrong record - pointing to the old install.
// We'll order by reverse id to try and pick off the newest one first and hopefully end up with the
// correct hubloc. If this doesn't work we may have to re-write this section to try them all.
zot_refresh: always try the hubloc pointed to by xchan_addr first
2015-09-10 23:48:08 +00:00
if(array_key_exists('xchan_addr',$them) && $them['xchan_addr']) {
more work on surviving hub re-installs
2015-09-18 21:31:29 +00:00
$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_addr = '%s' order by hubloc_id desc",
zot_refresh: always try the hubloc pointed to by xchan_addr first
2015-09-10 23:48:08 +00:00
dbesc($them['xchan_addr'])
);
}
if(! $r) {
more work on surviving hub re-installs
2015-09-18 21:31:29 +00:00
$r = q("select hubloc_url, hubloc_primary from hubloc where hubloc_hash = '%s' order by hubloc_id desc",
zot_refresh: always try the hubloc pointed to by xchan_addr first
2015-09-10 23:48:08 +00:00
dbesc($them['xchan_hash'])
);
}
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-10 23:51:22 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($r) {
foreach ($r as $rr) {
issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync
2015-08-23 20:27:34 +00:00
if (intval($rr['hubloc_primary'])) {
let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates
2015-01-30 21:45:28 +00:00
$url = $rr['hubloc_url'];
break;
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $url)
let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates
2015-01-30 21:45:28 +00:00
$url = $r[0]['hubloc_url'];
}
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $url) {
more logging, some debugging of group membership page
2012-12-30 23:28:13 +00:00
logger('zot_refresh: no url');
more progress on onepoll
2012-12-31 06:41:53 +00:00
return false;
more logging, some debugging of group membership page
2012-12-30 23:28:13 +00:00
}
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
$postvars = array();
if($channel) {
$postvars['target'] = $channel['channel_guid'];
$postvars['target_sig'] = $channel['channel_guid_sig'];
$postvars['key'] = $channel['channel_pubkey'];
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (array_key_exists('xchan_addr',$them) && $them['xchan_addr'])
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
$postvars['address'] = $them['xchan_addr'];
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (array_key_exists('xchan_hash',$them) && $them['xchan_hash'])
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
$postvars['guid_hash'] = $them['xchan_hash'];
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (array_key_exists('xchan_guid',$them) && $them['xchan_guid']
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
&& array_key_exists('xchan_guid_sig',$them) && $them['xchan_guid_sig']) {
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
$postvars['guid'] = $them['xchan_guid'];
$postvars['guid_sig'] = $them['xchan_guid_sig'];
}
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
$rhs = '/.well-known/zot-info';
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
$result = z_post_url($url . $rhs,$postvars);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('zot_refresh: zot-info: ' . print_r($result,true), LOGGER_DATA);
more debugging - looks like michameer.dyndns.org is throwing 500s so cannot test further
2013-01-04 00:39:22 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($result['success']) {
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
$j = json_decode($result['body'],true);
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! (($j) && ($j['success']))) {
searchable flag logic reversed
2013-02-02 11:11:23 +00:00
logger('zot_refresh: result not decodable');
better handling of failures to lookup remote authors
2013-01-26 23:50:31 +00:00
return false;
searchable flag logic reversed
2013-02-02 11:11:23 +00:00
}
better handling of failures to lookup remote authors
2013-01-26 23:50:31 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$x = import_xchan($j, (($force) ? UPDATE_FLAGS_FORCED : UPDATE_FLAGS_UPDATED));
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
better handling of failures to lookup remote authors
2013-01-26 23:50:31 +00:00
if(! $x['success'])
return false;
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
$their_perms = 0;
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
if($channel) {
$global_perms = get_perms();
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
if($j['permissions']['data']) {
Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable.
2013-11-20 23:20:12 +00:00
$permissions = crypto_unencapsulate(array(
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
'data' => $j['permissions']['data'],
'key' => $j['permissions']['key'],
'iv' => $j['permissions']['iv']),
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
$channel['channel_prvkey']);
if($permissions)
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
$permissions = json_decode($permissions,true);
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA);
}
else
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
$permissions = $j['permissions'];
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
some anomolies found when viewing connections in various cases.
2014-03-03 03:40:59 +00:00
$connected_set = false;
foreach issue
2013-01-02 09:44:50 +00:00
if($permissions && is_array($permissions)) {
foreach($permissions as $k => $v) {
some anomolies found when viewing connections in various cases.
2014-03-03 03:40:59 +00:00
// The connected permission means you are in their address book
if($k === 'connected') {
$connected_set = intval($v);
continue;
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
ensure that we don't have permission settings issues due to version skew across sites.
2014-07-18 03:59:58 +00:00
if(($v) && (array_key_exists($k,$global_perms))) {
foreach issue
2013-01-02 09:44:50 +00:00
$their_perms = $their_perms | intval($global_perms[$k][1]);
}
one could say we've sort of got zot - at least there are two-way communications for channel meta info, don't yet know if it's working
2012-11-13 00:16:37 +00:00
}
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
}
add pending check on group queries
2012-11-30 07:06:03 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(array_key_exists('profile',$j) && array_key_exists('next_birthday',$j['profile'])) {
bring back birthdays
2014-06-03 00:49:19 +00:00
$next_birthday = datetime_convert('UTC','UTC',$j['profile']['next_birthday']);
}
else {
This is long overdue - use a symblic constant NULL_DATE instead of the easily mis-typed sequence '0000-00-00 00:00:00'
2014-09-09 03:35:15 +00:00
$next_birthday = NULL_DATE;
bring back birthdays
2014-06-03 00:49:19 +00:00
}
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php util/messages.po
2015-09-28 00:00:41 +00:00
$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
add some safety checks on the sending side of sync
2015-09-27 23:47:25 +00:00
dbesc($x['hash']),
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php util/messages.po
2015-09-28 00:00:41 +00:00
intval($channel['channel_id'])
add some safety checks on the sending side of sync
2015-09-27 23:47:25 +00:00
);
change flags for one-way connections from hidden to unconnected so we can still use hidden for - well hiding connections
2014-03-04 22:35:42 +00:00
if($r) {
add some safety checks on the sending side of sync
2015-09-27 23:47:25 +00:00
// connection exists
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// if the dob is the same as what we have stored (disregarding the year), keep the one
duplicate birthday events showing up
2014-06-05 04:02:57 +00:00
// we have as we may have updated the year after sending a notification; and resetting
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// to the one we just received would cause us to create duplicated events.
duplicate birthday events showing up
2014-06-05 04:02:57 +00:00
if(substr($r[0]['abook_dob'],5) == substr($next_birthday,5))
$next_birthday = $r[0]['abook_dob'];
convert the abook fields
2015-06-15 04:08:00 +00:00
$current_abook_connected = (intval($r[0]['abook_unconnected']) ? 0 : 1);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
bring back birthdays
2014-06-03 00:49:19 +00:00
$y = q("update abook set abook_their_perms = %d, abook_dob = '%s'
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
where abook_xchan = '%s' and abook_channel = %d
convert the abook fields
2015-06-15 04:08:00 +00:00
and abook_self = 0 ",
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
intval($their_perms),
escape dates
2015-02-05 17:15:26 +00:00
dbescdate($next_birthday),
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
dbesc($x['hash']),
convert the abook fields
2015-06-15 04:08:00 +00:00
intval($channel['channel_id'])
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
);
some anomolies found when viewing connections in various cases.
2014-03-03 03:40:59 +00:00
bring friends back
2014-03-06 09:29:42 +00:00
// if(($connected_set === 0 || $connected_set === 1) && ($connected_set !== $current_abook_unconnected)) {
change flags for one-way connections from hidden to unconnected so we can still use hidden for - well hiding connections
2014-03-04 22:35:42 +00:00
// if they are in your address book but you aren't in theirs, and/or this does not
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// match your current connected state setting, toggle it.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/** @FIXME uncoverted to postgres */
/** @FIXME when this was enabled, all contacts became unconnected. Currently disabled intentionally */
convert the abook fields
2015-06-15 04:08:00 +00:00
// $y1 = q("update abook set abook_unconnected = 1
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// where abook_xchan = '%s' and abook_channel = %d
convert the abook fields
2015-06-15 04:08:00 +00:00
// and abook_self = 0 limit 1",
bring friends back
2014-03-06 09:29:42 +00:00
// dbesc($x['hash']),
convert the abook fields
2015-06-15 04:08:00 +00:00
// intval($channel['channel_id'])
bring friends back
2014-03-06 09:29:42 +00:00
// );
// }
some anomolies found when viewing connections in various cases.
2014-03-03 03:40:59 +00:00
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
if(! $y)
logger('abook update failed');
populate some posts when somebody is granted "read stream" permission
2013-11-18 00:50:32 +00:00
else {
// if we were just granted read stream permission and didn't have it before, try to pull in some posts
if((! ($r[0]['abook_their_perms'] & PERMS_R_STREAM)) && ($their_perms & PERMS_R_STREAM))
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
proc_run('php','include/onepoll.php',$r[0]['abook_id']);
populate some posts when somebody is granted "read stream" permission
2013-11-18 00:50:32 +00:00
}
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
}
else {
add some safety checks on the sending side of sync
2015-09-27 23:47:25 +00:00
// new connection
ok heads up - potentially destabilising change. I've tried to sort out all the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes. What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected. With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
2014-11-05 01:11:02 +00:00
$role = get_pconfig($channel['channel_id'],'system','permissions_role');
if($role) {
don't overwrite $x (contains import_xchan result) with role permissions
2014-11-06 16:24:05 +00:00
$xx = get_role_perms($role);
if($xx['perms_auto'])
$default_perms = $xx['perms_accept'];
ok heads up - potentially destabilising change. I've tried to sort out all the default connection permissions for those who don't have a predefined (or therefore have a "custom") permissions role. Unfortunately this includes most people that were using this software more than a month ago. The real changes are that the SELF address book entry no longer holds "auto-permissions" but instead holds your "default permissions" (if you have a pre-defined role, the defaults will be pulled from the role table). The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes. What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected. With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
2014-11-05 01:11:02 +00:00
}
if(! $default_perms)
$default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
auto-friending for forums and stuff is almost trivial now. But we will need a page to set the permissions on the "self" abook record. These will be the default permissions for anybody we wish to connect with.
2012-12-02 06:37:41 +00:00
Implements a new permission level PERMS_PENDING With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel.
2014-06-17 07:26:18 +00:00
// Keep original perms to check if we need to notify them
$previous_perms = get_all_perms($channel['channel_id'],$x['hash']);
change default affinity (abook_closeness) to 80 for all new connections going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness
2015-03-08 21:11:38 +00:00
$closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness');
if($closeness === false)
$closeness = 80;
convert the abook fields
2015-06-15 04:08:00 +00:00
$y = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_pending ) values ( %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )",
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
intval($channel['channel_account_id']),
intval($channel['channel_id']),
change default affinity (abook_closeness) to 80 for all new connections going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness
2015-03-08 21:11:38 +00:00
intval($closeness),
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
dbesc($x['hash']),
intval($their_perms),
auto-friending for forums and stuff is almost trivial now. But we will need a page to set the permissions on the "self" abook record. These will be the default permissions for anybody we wish to connect with.
2012-12-02 06:37:41 +00:00
intval($default_perms),
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
dbesc(datetime_convert()),
dbesc(datetime_convert()),
bring back birthdays
2014-06-03 00:49:19 +00:00
dbesc($next_birthday),
convert the abook fields
2015-06-15 04:08:00 +00:00
intval(($default_perms) ? 0 : 1)
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
);
this should fix the auto-friend stuff
2013-02-07 22:49:09 +00:00
auto-friending for forums and stuff is almost trivial now. But we will need a page to set the permissions on the "self" abook record. These will be the default permissions for anybody we wish to connect with.
2012-12-02 06:37:41 +00:00
if($y) {
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
logger("New introduction received for {$channel['channel_name']}");
Implements a new permission level PERMS_PENDING With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel.
2014-06-17 07:26:18 +00:00
$new_perms = get_all_perms($channel['channel_id'],$x['hash']);
clone new connections
2015-09-20 05:46:59 +00:00
// Send a clone sync packet and a permissions update if permissions have changed
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-20 05:48:22 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-20 23:55:24 +00:00
$new_connection = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 order by abook_created desc limit 1",
clone new connections
2015-09-20 05:46:59 +00:00
dbesc($x['hash']),
intval($channel['channel_id'])
populate some posts when somebody is granted "read stream" permission
2013-11-18 00:50:32 +00:00
);
clone new connections
2015-09-20 05:46:59 +00:00
send new connection notification even if auto-perms are set
2014-06-13 00:31:42 +00:00
if($new_connection) {
clone new connections
2015-09-20 05:46:59 +00:00
if($new_perms != $previous_perms)
proc_run('php','include/notifier.php','permission_update',$new_connection[0]['abook_id']);
new connection notification
2014-03-28 01:03:19 +00:00
require_once('include/enotify.php');
notification(array(
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
'type' => NOTIFY_INTRO,
'from_xchan' => $x['hash'],
'to_xchan' => $channel['channel_hash'],
'link' => z_root() . '/connedit/' . $new_connection[0]['abook_id'],
new connection notification
2014-03-28 01:03:19 +00:00
));
clone new connections
2015-09-20 05:46:59 +00:00
if($their_perms & PERMS_R_STREAM) {
if(($channel['channel_w_stream'] & PERMS_PENDING)
|| (! intval($new_connection[0]['abook_pending'])) )
proc_run('php','include/onepoll.php',$new_connection[0]['abook_id']);
}
unset($new_connection[0]['abook_id']);
unset($new_connection[0]['abook_account']);
unset($new_connection[0]['abook_channel']);
build_sync_packet($channel['channel_id'], array('abook' => $new_connection));
Implements a new permission level PERMS_PENDING With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel.
2014-06-17 07:26:18 +00:00
}
auto-friending for forums and stuff is almost trivial now. But we will need a page to set the permissions on the "self" abook record. These will be the default permissions for anybody we wish to connect with.
2012-12-02 06:37:41 +00:00
}
Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet.
2012-11-30 02:15:13 +00:00
}
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
}
return true;
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
starting to get into the hairy parts of zot - identity, location, and permission synchronisation. After this, messaging should be a piece of cake.
2012-11-11 04:08:07 +00:00
return false;
}
doco
2013-03-26 04:32:12 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Look up if channel is known and previously verified.
doco
2013-03-26 04:32:12 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* A guid and a url, both signed by the sender, distinguish a known sender at a
* known location.
* This function looks these up to see if the channel is known and therefore
* previously verified. If not, we will need to verify it.
zot doco
2013-11-29 00:13:09 +00:00
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @param array $arr an associative array which must contain:
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* * \e string \b guid => guid of conversant
* * \e string \b guid_sig => guid signed with conversant's private key
* * \e string \b url => URL of the origination hub of this communication
* * \e string \b url_sig => URL signed with conversant's private key
zot doco
2013-11-29 00:13:09 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @returns array|null null if site is blacklisted or not found, otherwise an
* array with an hubloc record
doco
2013-03-26 04:32:12 +00:00
*/
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
function zot_gethub($arr,$multiple = false) {
got zot
2012-11-13 04:59:18 +00:00
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
if($arr['guid'] && $arr['guid_sig'] && $arr['url'] && $arr['url_sig']) {
provide the site blacklist everywhere it is needed
2014-08-22 04:07:32 +00:00
$blacklisted = false;
$bl1 = get_config('system','blacklisted_sites');
if(is_array($bl1) && $bl1) {
foreach($bl1 as $bl) {
if($bl && strpos($arr['url'],$bl) !== false) {
$blacklisted = true;
break;
}
}
}
if($blacklisted) {
logger('zot_gethub: blacklisted site: ' . $arr['url']);
return null;
}
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
$limit = (($multiple) ? '' : ' limit 1 ');
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$r = q("select * from hubloc
where hubloc_guid = '%s' and hubloc_guid_sig = '%s'
a few minor changes
2012-08-27 06:05:00 +00:00
and hubloc_url = '%s' and hubloc_url_sig = '%s'
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
$limit",
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
dbesc($arr['guid']),
dbesc($arr['guid_sig']),
dbesc($arr['url']),
dbesc($arr['url_sig'])
zot basic comm structure (real basic)
2012-08-10 03:31:06 +00:00
);
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
if($r) {
fix the contorted update logic on the network page
2013-01-05 03:24:17 +00:00
logger('zot_gethub: found', LOGGER_DEBUG);
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
return (($multiple) ? $r : $r[0]);
fix the contorted update logic on the network page
2013-01-05 03:24:17 +00:00
}
zot basic comm structure (real basic)
2012-08-10 03:31:06 +00:00
}
more error checking
2013-07-15 03:42:06 +00:00
logger('zot_gethub: not found: ' . print_r($arr,true), LOGGER_DEBUG);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
zot basic comm structure (real basic)
2012-08-10 03:31:06 +00:00
return null;
}
zot doco
2013-11-29 00:13:09 +00:00
/**
typo
2015-07-20 04:04:02 +00:00
* @brief Registers an unknown hub.
zot doco
2013-11-29 00:13:09 +00:00
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* A communication has been received which has an unknown (to us) sender.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* Perform discovery based on our calculated hash of the sender at the
* origination address. This will fetch the discovery packet of the sender,
* which contains the public key we need to verify our guid and url signatures.
zot doco
2013-11-29 00:13:09 +00:00
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @param array $arr an associative array which must contain:
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* * \e string \b guid => guid of conversant
* * \e string \b guid_sig => guid signed with conversant's private key
* * \e string \b url => URL of the origination hub of this communication
* * \e string \b url_sig => URL signed with conversant's private key
zot doco
2013-11-29 00:13:09 +00:00
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @returns array an associative array with
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* * \b success boolean true or false
* * \b message (optional) error string only if success is false
zot doco
2013-11-29 00:13:09 +00:00
*/
zot basic comm structure (real basic)
2012-08-10 03:31:06 +00:00
function zot_register_hub($arr) {
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
$result = array('success' => false);
no hub - well doh, no wonder; we were looking for array['hub'] and it's actually array['url'].
2012-12-30 07:45:06 +00:00
if($arr['url'] && $arr['url_sig'] && $arr['guid'] && $arr['guid_sig']) {
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
clean up more code duplication
2014-07-15 04:21:24 +00:00
$guid_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
zome issues registering new hubs
2013-01-03 00:28:47 +00:00
$url = $arr['url'] . '/.well-known/zot-info/?f=&guid_hash=' . $guid_hash;
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('zot_register_hub: ' . $url, LOGGER_DEBUG);
zome issues registering new hubs
2013-01-03 00:28:47 +00:00
$x = z_fetch_url($url);
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('zot_register_hub: ' . print_r($x,true), LOGGER_DATA);
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
zot basic comm structure (real basic)
2012-08-10 03:31:06 +00:00
if($x['success']) {
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
$record = json_decode($x['body'],true);
zot doco
2013-11-29 00:13:09 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/*
* We now have a key - only continue registration if our signatures are valid
zot doco
2013-11-29 00:13:09 +00:00
* AND the guid and guid sig in the returned packet match those provided in
* our current communication.
*/
if((rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$record['key']))
&& (rsa_verify($arr['url'],base64url_decode($arr['url_sig']),$record['key']))
&& ($arr['guid'] === $record['guid'])
&& ($arr['guid_sig'] === $record['guid_sig'])) {
$c = import_xchan($record);
if($c['success'])
$result['success'] = true;
}
else {
logger('zot_register_hub: failure to verify returned packet.');
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
zot basic comm structure (real basic)
2012-08-10 03:31:06 +00:00
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
rework a couple of zot basics
2012-11-11 07:26:12 +00:00
return $result;
basic hub registration
2012-08-22 06:11:27 +00:00
}
grrr... hashes aren't matching.
2012-11-02 05:23:13 +00:00
zot doco
2013-11-29 00:13:09 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Takes an associative array of a fetched discovery packet and updates
zot doco
2013-11-29 00:13:09 +00:00
* all internal data structures which need to be updated as a result.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
*
zot doco
2013-11-29 00:13:09 +00:00
* @param array $arr => json_decoded discovery packet
* @param int $ud_flags
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
* Determines whether to create a directory update record if any changes occur, default is UPDATE_FLAGS_UPDATED
directory sync issues
2014-03-04 05:00:42 +00:00
* $ud_flags = UPDATE_FLAGS_FORCED indicates a forced refresh where we unconditionally create a directory update record
implement a forced directory update mode where we unconditionally create a directory sync packet. This is needed to ensure that monthly directory pings are propagated to other directory servers so they can each prove for themselves whether or not an account is alive or dead. We do not trust other directories to provide us information beyond "look at this entry and decide for yourself" as doing otherwise would invite rogue directory manipulations. As this scheduled update occurs on all channels across all servers, we should also pick up refresh messages from all existing channel clones and these should also propagate out to all directory servers using the same mechanism (though perhaps not at the same time).
2014-02-11 22:19:20 +00:00
* this typically occurs once a month for each channel as part of a scheduled ping to notify the directory
* that the channel still exists
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
* @param array $ud_arr
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* If set [typically by update_directory_entry()] indicates a specific update table row and more particularly
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
* contains a particular address (ud_addr) which needs to be updated in that table.
zot doco
2013-11-29 00:13:09 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @return associative array
* * \e boolean \b success boolean true or false
* * \e string \b message (optional) error string only if success is false
zot doco
2013-11-29 00:13:09 +00:00
*/
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) {
more infrastructure changes
2012-11-15 03:27:16 +00:00
add hooks to zot-finger and import_xchan
2013-12-04 01:55:10 +00:00
call_hooks('import_xchan', $arr);
more infrastructure changes
2012-11-15 03:27:16 +00:00
$ret = array('success' => false);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$dirmode = intval(get_config('system','directory_mode'));
start saving site info
2013-07-24 05:33:56 +00:00
update
2013-03-21 09:21:44 +00:00
$changed = false;
implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it.
2013-09-15 10:48:43 +00:00
$what = '';
more infrastructure changes
2012-11-15 03:27:16 +00:00
validate input to import_xchan(), as we don't consistently check it prior to entering this function
2013-07-19 01:22:08 +00:00
if(! (is_array($arr) && array_key_exists('success',$arr) && $arr['success'])) {
logger('import_xchan: invalid data packet: ' . print_r($arr,true));
$ret['message'] = t('Invalid data packet');
return $ret;
}
zot logging to figure out why we occasionally don't have an address on xchan_import - I suspect we don't have anything useful at all.
2014-08-13 03:46:33 +00:00
if(! ($arr['guid'] && $arr['guid_sig'])) {
logger('import_xchan: no identity information provided. ' . print_r($arr,true));
return $ret;
}
validate input to import_xchan(), as we don't consistently check it prior to entering this function
2013-07-19 01:22:08 +00:00
clean up more code duplication
2014-07-15 04:21:24 +00:00
$xchan_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
pull the plug on the old location sync section of import_xchan - this has now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours.
2014-09-15 01:09:16 +00:00
$arr['hash'] = $xchan_hash;
more infrastructure changes
2012-11-15 03:27:16 +00:00
$import_photos = false;
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
if(! rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$arr['key'])) {
more logging, some debugging of group membership page
2012-12-30 23:28:13 +00:00
logger('import_xchan: Unable to verify channel signature for ' . $arr['address']);
more infrastructure changes
2012-11-15 03:27:16 +00:00
$ret['message'] = t('Unable to verify channel signature');
return $ret;
}
add some debugging - update times are changing much faster than they're supposed to. Log what has changed.
2013-04-30 01:21:23 +00:00
logger('import_xchan: ' . $xchan_hash, LOGGER_DEBUG);
more infrastructure changes
2012-11-15 03:27:16 +00:00
$r = q("select * from xchan where xchan_hash = '%s' limit 1",
dbesc($xchan_hash)
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
);
more infrastructure changes
2012-11-15 03:27:16 +00:00
implement premium channel discovery
2013-08-22 00:34:04 +00:00
if(! array_key_exists('connect_url', $arr))
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$arr['connect_url'] = '';
try to fix bad addresses that got into the network
2013-08-26 03:17:45 +00:00
if(strpos($arr['address'],'/') !== false)
$arr['address'] = substr($arr['address'],0,strpos($arr['address'],'/'));
hidden directory entries
2013-01-22 08:20:25 +00:00
more infrastructure changes
2012-11-15 03:27:16 +00:00
if($r) {
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
if($r[0]['xchan_photo_date'] != $arr['photo_updated'])
hidden directory entries
2013-01-22 08:20:25 +00:00
$import_photos = true;
security fixes related to directory access and sites that are off the grid
2013-01-22 10:56:32 +00:00
// if we import an entry from a site that's not ours and either or both of us is off the grid - hide the entry.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/** @TODO: check if we're the same directory realm, which would mean we are allowed to see it */
security fixes related to directory access and sites that are off the grid
2013-01-22 10:56:32 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$dirmode = get_config('system','directory_mode');
security fixes related to directory access and sites that are off the grid
2013-01-22 10:56:32 +00:00
add public forum identification to libzot. No attempt is made to identify other types of forums or weird custom channel permissions. If the channel is auto-accept and taggable, it's a public forum.
2014-11-10 23:21:04 +00:00
if((($arr['site']['directory_mode'] === 'standalone') || ($dirmode & DIRECTORY_MODE_STANDALONE)) && ($arr['site']['url'] != z_root()))
security fixes related to directory access and sites that are off the grid
2013-01-22 10:56:32 +00:00
$arr['searchable'] = false;
searchable flag logic reversed
2013-02-02 11:11:23 +00:00
$hidden = (1 - intval($arr['searchable']));
security fixes related to directory access and sites that are off the grid
2013-01-22 10:56:32 +00:00
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
$hidden_changed = $adult_changed = $deleted_changed = $pubforum_changed = 0;
adult channel setting
2013-09-23 03:38:24 +00:00
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
if(intval($r[0]['xchan_hidden']) != (1 - intval($arr['searchable'])))
$hidden_changed = 1;
if(intval($r[0]['xchan_selfcensored']) != intval($arr['adult_content']))
$adult_changed = 1;
if(intval($r[0]['xchan_deleted']) != intval($arr['deleted']))
$deleted_changed = 1;
if(intval($r[0]['xchan_pubforum']) != intval($arr['public_forum']))
$pubforum_changed = 1;
indicate public forums in directory results (there will be some [possibly considerable] lag time before existing forums are correctly tagged).
2014-11-11 01:44:02 +00:00
update xchans on url change
2013-03-13 00:39:35 +00:00
if(($r[0]['xchan_name_date'] != $arr['name_updated'])
|| ($r[0]['xchan_connurl'] != $arr['connections_url'])
|| ($r[0]['xchan_addr'] != $arr['address'])
implement premium channel discovery
2013-08-22 00:34:04 +00:00
|| ($r[0]['xchan_follow'] != $arr['follow_url'])
|| ($r[0]['xchan_connpage'] != $arr['connect_url'])
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
|| ($r[0]['xchan_url'] != $arr['url'])
|| $hidden_changed || adult_changed || deleted_changed || $pubforum_changed ) {
implement premium channel discovery
2013-08-22 00:34:04 +00:00
$r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s',
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
xchan_connpage = '%s', xchan_hidden = %d, xchan_selfcensored = %d, xchan_deleted = %d, xchan_pubforum = %d,
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s'",
don't allow an xchan to be imported with an empty name. To avoid translation issues we'll just make it '-'.
2014-09-12 01:11:07 +00:00
dbesc(($arr['name']) ? $arr['name'] : '-'),
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
dbesc($arr['name_updated']),
more poco discovery
2013-01-01 10:06:41 +00:00
dbesc($arr['connections_url']),
implement premium channel discovery
2013-08-22 00:34:04 +00:00
dbesc($arr['follow_url']),
dbesc($arr['connect_url']),
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
intval(1 - intval($arr['searchable'])),
intval($arr['adult_content']),
intval($arr['deleted']),
intval($arr['public_forum']),
update xchans on url change
2013-03-13 00:39:35 +00:00
dbesc($arr['address']),
dbesc($arr['url']),
more infrastructure changes
2012-11-15 03:27:16 +00:00
dbesc($xchan_hash)
);
add some debugging - update times are changing much faster than they're supposed to. Log what has changed.
2013-04-30 01:21:23 +00:00
logger('import_xchan: existing: ' . print_r($r[0],true), LOGGER_DATA);
logger('import_xchan: new: ' . print_r($arr,true), LOGGER_DATA);
implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it.
2013-09-15 10:48:43 +00:00
$what .= 'xchan ';
update
2013-03-21 09:21:44 +00:00
$changed = true;
more infrastructure changes
2012-11-15 03:27:16 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
more infrastructure changes
2012-11-15 03:27:16 +00:00
$import_photos = true;
set hidden flags on new directory entries, not just existing ones
2013-03-27 02:37:33 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if((($arr['site']['directory_mode'] === 'standalone')
|| ($dirmode & DIRECTORY_MODE_STANDALONE))
&& ($arr['site']['url'] != z_root()))
set hidden flags on new directory entries, not just existing ones
2013-03-27 02:37:33 +00:00
$arr['searchable'] = false;
more infrastructure changes
2012-11-15 03:27:16 +00:00
$x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype,
sql typo
2015-01-28 03:58:43 +00:00
xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_hidden, xchan_selfcensored, xchan_deleted, xchan_pubforum )
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d) ",
more infrastructure changes
2012-11-15 03:27:16 +00:00
dbesc($xchan_hash),
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
dbesc($arr['guid']),
dbesc($arr['guid_sig']),
dbesc($arr['key']),
dbesc($arr['photo_mimetype']),
dbesc($arr['photo']),
dbesc($arr['address']),
dbesc($arr['url']),
more poco discovery
2013-01-01 10:06:41 +00:00
dbesc($arr['connections_url']),
implement premium channel discovery
2013-08-22 00:34:04 +00:00
dbesc($arr['follow_url']),
dbesc($arr['connect_url']),
don't allow an xchan to be imported with an empty name. To avoid translation issues we'll just make it '-'.
2014-09-12 01:11:07 +00:00
dbesc(($arr['name']) ? $arr['name'] : '-'),
more infrastructure changes
2012-11-15 03:27:16 +00:00
dbesc('zot'),
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
dbescdate($arr['photo_updated']),
dbescdate($arr['name_updated']),
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
intval(1 - intval($arr['searchable'])),
intval($arr['adult_content']),
intval($arr['deleted']),
intval($arr['public_forum'])
more infrastructure changes
2012-11-15 03:27:16 +00:00
);
some alteration to the way directory sync was originally supposed to work. I'm making this up as I go and not exactly certain where to go next but it makes more sense now and I think the basic idea will actually work. I'll just have to keep making it up until it does work.
2013-09-09 08:05:29 +00:00
implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it.
2013-09-15 10:48:43 +00:00
$what .= 'new_xchan';
update
2013-03-21 09:21:44 +00:00
$changed = true;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
}
more infrastructure changes
2012-11-15 03:27:16 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($import_photos) {
more infrastructure changes
2012-11-15 03:27:16 +00:00
photo driver abstraction
2013-04-26 03:01:24 +00:00
require_once('include/photo/photo_driver.php');
more infrastructure changes
2012-11-15 03:27:16 +00:00
issue #225
2013-12-06 02:17:16 +00:00
// see if this is a channel clone that's hosted locally - which we treat different from other xchans/connections
$local = q("select channel_account_id, channel_id from channel where channel_hash = '%s' limit 1",
dbesc($xchan_hash)
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($local) {
$ph = z_fetch_url($arr['photo'], true);
if ($ph['success']) {
issue #225
2013-12-06 02:17:16 +00:00
import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'],$local[0]['channel_id']);
// reset the names in case they got messed up when we had a bug in this function
$photos = array(
z_root() . '/photo/profile/l/' . $local[0]['channel_id'],
z_root() . '/photo/profile/m/' . $local[0]['channel_id'],
z_root() . '/photo/profile/s/' . $local[0]['channel_id'],
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
2014-04-14 01:30:06 +00:00
$arr['photo_mimetype'],
false
issue #225
2013-12-06 02:17:16 +00:00
);
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.
2015-09-02 05:03:10 +00:00
$photos = import_xchan_photo($arr['photo'], $xchan_hash);
issue #225
2013-12-06 02:17:16 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($photos) {
if ($photos[4]) {
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
2014-04-14 01:30:06 +00:00
// importing the photo failed somehow. Leave the photo_date alone so we can try again at a later date.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// This often happens when somebody joins the matrix with a bad cert.
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
2014-04-14 01:30:06 +00:00
$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
where xchan_hash = '%s'",
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
2014-04-14 01:30:06 +00:00
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc($photos[3]),
dbesc($xchan_hash)
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
2014-04-14 01:30:06 +00:00
$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
where xchan_hash = '%s'",
dbescdate(datetime_convert('UTC','UTC',$arr['photo_updated'])),
Often somebody will join the matrix with a dodgy cert and we'll sort that out but their profile photo will remain rainbow man (or the site default). However the photo_date has been updated so we won't try again. This checkin looks for such a failure and leaves the photo_date alone if the photo import failed.
2014-04-14 01:30:06 +00:00
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc($photos[3]),
dbesc($xchan_hash)
);
}
issue #225
2013-12-06 02:17:16 +00:00
$what .= 'photo ';
$changed = true;
}
more infrastructure changes
2012-11-15 03:27:16 +00:00
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// what we are missing for true hub independence is for any changes in the primary hub to
.
2013-03-11 01:45:58 +00:00
// get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$s = sync_locations($arr, $arr);
believe i found the issue which was causing hundreds/thousands of identical hublocs to be created
2014-02-20 09:35:08 +00:00
pull the plug on the old location sync section of import_xchan - this has now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours.
2014-09-15 01:09:16 +00:00
if($s) {
if($s['change_message'])
$what .= $s['change_message'];
if($s['changed'])
$changed = $s['changed'];
if($s['message'])
$ret['message'] .= $s['message'];
more infrastructure changes
2012-11-15 03:27:16 +00:00
}
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
// Which entries in the update table are we interested in updating?
cleanup
2014-03-18 23:50:46 +00:00
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
$address = (($ud_arr && $ud_arr['ud_addr']) ? $ud_arr['ud_addr'] : $arr['address']);
cleanup
2014-03-18 23:50:46 +00:00
change the way profiles are imported
2013-05-01 01:16:51 +00:00
// Are we a directory server of some kind?
start saving site info
2013-07-24 05:33:56 +00:00
add collections widget to connections page - and some more work on realms
2014-08-18 00:48:41 +00:00
$other_realm = false;
$realm = get_directory_realm();
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(array_key_exists('site',$arr)
&& array_key_exists('realm',$arr['site'])
realm detection logic reversed
2014-09-04 23:09:52 +00:00
&& (strpos($arr['site']['realm'],$realm) === false))
add collections widget to connections page - and some more work on realms
2014-08-18 00:48:41 +00:00
$other_realm = true;
change the way profiles are imported
2013-05-01 01:16:51 +00:00
if($dirmode != DIRECTORY_MODE_NORMAL) {
add collections widget to connections page - and some more work on realms
2014-08-18 00:48:41 +00:00
// We're some kind of directory server. However we can only add directory information
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// if the entry is in the same realm (or is a sub-realm). Sub-realms are denoted by
// including the parent realm in the name. e.g. 'RED_GLOBAL:foo' would allow an entry to
add collections widget to connections page - and some more work on realms
2014-08-18 00:48:41 +00:00
// be in directories for the local realm (foo) and also the RED_GLOBAL realm.
if(array_key_exists('profile',$arr) && is_array($arr['profile']) && (! $other_realm)) {
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
$profile_changed = import_directory_profile($xchan_hash,$arr['profile'],$address,$ud_flags, 1);
change the way profiles are imported
2013-05-01 01:16:51 +00:00
if($profile_changed) {
implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it.
2013-09-15 10:48:43 +00:00
$what .= 'profile ';
change the way profiles are imported
2013-05-01 01:16:51 +00:00
$changed = true;
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
change the way profiles are imported
2013-05-01 01:16:51 +00:00
logger('import_xchan: profile not available - hiding');
// they may have made it private
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
$r = q("delete from xprof where xprof_hash = '%s'",
change the way profiles are imported
2013-05-01 01:16:51 +00:00
dbesc($xchan_hash)
);
allow additional uses for xtags
2015-10-02 00:28:03 +00:00
$r = q("delete from xtag where xtag_hash = '%s' and xtag_flags = 0",
change the way profiles are imported
2013-05-01 01:16:51 +00:00
dbesc($xchan_hash)
);
}
}
start saving site info
2013-07-24 05:33:56 +00:00
if(array_key_exists('site',$arr) && is_array($arr['site'])) {
$profile_changed = import_site($arr['site'],$arr['key']);
if($profile_changed) {
implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it.
2013-09-15 10:48:43 +00:00
$what .= 'site ';
start saving site info
2013-07-24 05:33:56 +00:00
$changed = true;
}
}
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
directory sync issues
2014-03-04 05:00:42 +00:00
if(($changed) || ($ud_flags == UPDATE_FLAGS_FORCED)) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$guid = random_string() . '@' . get_app()->get_hostname();
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
update_modtime($xchan_hash,$guid,$address,$ud_flags);
implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it.
2013-09-15 10:48:43 +00:00
logger('import_xchan: changed: ' . $what,LOGGER_DEBUG);
update
2013-03-21 09:21:44 +00:00
}
update even if no change
2013-10-15 05:20:14 +00:00
elseif(! $ud_flags) {
// nothing changed but we still need to update the updates record
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d)>0 ",
much better fix to problem yesterday of updates with the wrong ud_addr getting updated. Now we'll pass in the update table row to import_xchan so we know exactly which ud_addr applies. We still need ud_flags passed in separately.
2014-07-01 04:17:19 +00:00
intval(UPDATE_FLAGS_UPDATED),
dbesc($address),
intval(UPDATE_FLAGS_UPDATED)
);
update even if no change
2013-10-15 05:20:14 +00:00
}
update
2013-03-21 09:21:44 +00:00
more infrastructure changes
2012-11-15 03:27:16 +00:00
if(! x($ret,'message')) {
$ret['success'] = true;
$ret['hash'] = $xchan_hash;
}
more logging, some debugging of group membership page
2012-12-30 23:28:13 +00:00
logger('import_xchan: result: ' . print_r($ret,true), LOGGER_DATA);
more infrastructure changes
2012-11-15 03:27:16 +00:00
return $ret;
}
zot doco
2013-11-29 00:13:09 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Called immediately after sending a zot message which is using queue processing.
*
* Updates the queue item according to the response result and logs any information
* returned to aid communications troubleshooting.
zot doco
2013-11-29 00:13:09 +00:00
*
* @param string $hub - url of site we just contacted
* @param array $arr - output of z_post_url()
* @param array $outq - The queue structure attached to this request
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function zot_process_response($hub, $arr, $outq) {
zot doco
2013-11-29 00:13:09 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $arr['success']) {
more delivery diagnostics
2012-12-31 22:45:26 +00:00
logger('zot_process_response: failed: ' . $hub);
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
return;
more delivery diagnostics
2012-12-31 22:45:26 +00:00
}
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$x = json_decode($arr['body'], true);
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $x) {
more delivery diagnostics
2012-12-31 22:45:26 +00:00
logger('zot_process_response: No json from ' . $hub);
logger('zot_process_response: headers: ' . print_r($arr['header'],true), LOGGER_DATA);
}
add one more test
2015-09-22 11:28:05 +00:00
if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) {
more progress on delivery reports. Store the remote results from zot sites locally.
2015-09-22 05:30:28 +00:00
foreach($x['delivery_report'] as $xx) {
filter delivery reports
2015-10-17 20:26:55 +00:00
if(is_array($xx) && array_key_exists('message_id',$xx) && delivery_report_is_storable($xx)) {
more progress on delivery reports. Store the remote results from zot sites locally.
2015-09-22 05:30:28 +00:00
q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
dbesc($xx['message_id']),
dbesc($xx['location']),
dbesc($xx['recipient']),
dbesc($xx['status']),
dbesc(datetime_convert($xx['date'])),
dbesc($xx['sender'])
);
}
}
}
heavy lifting for delivery reports
2015-09-22 09:32:04 +00:00
q("delete from dreport where dreport_queue = '%s' limit 1",
dbesc($outq['outq_hash'])
);
I'm going to use the site_update timestamp to indicate whenever we successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated.
2015-03-03 23:54:38 +00:00
// update the timestamp for this site
ensure that living sites are marked as alive
2015-09-11 12:06:37 +00:00
q("update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
I'm going to use the site_update timestamp to indicate whenever we successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated.
2015-03-03 23:54:38 +00:00
dbesc(datetime_convert()),
dbesc(dirname($hub))
);
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
// synchronous message types are handled immediately
// async messages remain in the queue until processed.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (intval($outq['outq_async'])) {
q("update outq set outq_delivered = 1, outq_updated = '%s' where outq_hash = '%s' and outq_channel = %d",
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
dbesc(datetime_convert()),
dbesc($outq['outq_hash']),
intval($outq['outq_channel'])
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
q("delete from outq where outq_hash = '%s' and outq_channel = %d",
DATABASE: outq additions, delivery now getting the notify across to the other side
2012-11-20 00:51:15 +00:00
dbesc($outq['outq_hash']),
intval($outq['outq_channel'])
);
}
provide remote delivery report at logger_debug level
2015-09-11 00:53:06 +00:00
logger('zot_process_response: ' . print_r($x,true), LOGGER_DEBUG);
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
}
doco
2013-03-26 04:32:12 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief
*
* We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender.
* Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site private key.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* The entire pickup message is encrypted with the remote site's public key.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* If everything checks out on the remote end, we will receive back a packet containing one or more messages,
* which will be processed and delivered before this function ultimately returns.
*
* @see zot_import()
doco
2013-03-26 04:32:12 +00:00
*
zot doco
2013-11-29 00:13:09 +00:00
* @param array $arr
* decrypted and json decoded notify packet from remote site
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @return array from zot_import()
doco
2013-03-26 04:32:12 +00:00
*/
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
function zot_fetch($arr) {
logger('zot_fetch: ' . print_r($arr,true), LOGGER_DATA);
$url = $arr['sender']['url'] . $arr['callback'];
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
// set $multiple param on zot_gethub() to return all matching hubs
// This allows us to recover from re-installs when a redundant (but invalid) hubloc for
// this identity is widely dispersed throughout the network.
$ret_hubs = zot_gethub($arr['sender'],true);
if(! $ret_hubs) {
doco
2013-03-26 04:32:12 +00:00
logger('zot_fetch: no hub: ' . print_r($arr['sender'],true));
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
return;
}
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
foreach($ret_hubs as $ret_hub) {
$data = array(
'type' => 'pickup',
'url' => z_root(),
'callback_sig' => base64url_encode(rsa_sign(z_root() . '/post',get_config('system','prvkey'))),
'callback' => z_root() . '/post',
'secret' => $arr['secret'],
'secret_sig' => base64url_encode(rsa_sign($arr['secret'],get_config('system','prvkey')))
);
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
$datatosend = json_encode(crypto_encapsulate(json_encode($data),$ret_hub['hubloc_sitekey']));
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
$fetch = zot_zot($url,$datatosend);
$result = zot_import($fetch, $arr['sender']['url']);
if($result)
return $result;
}
return;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
}
more doco
2013-03-27 02:53:04 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Process incoming array of messages.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
*
* Process an incoming array of messages which were obtained via pickup, and
more doco
2013-03-27 02:53:04 +00:00
* import, update, delete as directed.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
*
* The message types handled here are 'activity' (e.g. posts), 'mail' ,
* 'profile', 'location' and 'channel_sync'.
*
* @param array $arr
* 'pickup' structure returned from remote site
* @param string $sender_url
* the url specified by the sender in the initial communication.
* We will verify the sender and url in each returned message structure and
* also verify that all the messages returned match the site url that we are
* currently processing.
*
* @returns array
* suitable for logging remotely, enumerating the processing results of each message/recipient combination
* * [0] => \e string $channel_hash
* * [1] => \e string $delivery_status
* * [2] => \e string $address
more doco
2013-03-27 02:53:04 +00:00
*/
block forgeries
2013-10-02 09:50:02 +00:00
function zot_import($arr, $sender_url) {
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$data = json_decode($arr['body'], true);
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
It's really not supposed to be quite this chatty on the network - ah that's why. Oops.
2013-01-29 04:51:37 +00:00
if(! $data) {
logger('zot_import: empty body');
return array();
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(array_key_exists('iv', $data)) {
Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable.
2013-11-20 23:20:12 +00:00
$data = json_decode(crypto_unencapsulate($data,get_config('system','prvkey')),true);
Implements a new permission level PERMS_PENDING With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel.
2014-06-17 07:26:18 +00:00
}
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
log the remote message if there was one
2015-09-11 21:56:31 +00:00
if(! $data['success']) {
if($data['message'])
logger('remote pickup failed: ' . $data['message']);
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
return false;
log the remote message if there was one
2015-09-11 21:56:31 +00:00
}
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 21:30:07 +00:00
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
$incoming = $data['pickup'];
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
$return = array();
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
if(is_array($incoming)) {
foreach($incoming as $i) {
garbage in garbage out
2015-02-04 00:03:05 +00:00
if(! is_array($i)) {
logger('incoming is not an array');
continue;
}
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
$result = null;
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
if(array_key_exists('iv',$i['notify'])) {
Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable.
2013-11-20 23:20:12 +00:00
$i['notify'] = json_decode(crypto_unencapsulate($i['notify'],get_config('system','prvkey')),true);
php warnings
2014-11-03 03:22:18 +00:00
}
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA);
y'all got mail
2012-12-06 00:44:07 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$hub = zot_gethub($i['notify']['sender']);
block forgeries
2013-10-02 09:50:02 +00:00
if((! $hub) || ($hub['hubloc_url'] != $sender_url)) {
logger('zot_import: potential forgery: wrong site for sender: ' . $sender_url . ' != ' . print_r($i['notify'],true));
continue;
}
flag notify packets that are sent in response to a message_id request and prevent them from recursing
2014-10-31 11:59:30 +00:00
$message_request = ((array_key_exists('message_id',$i['notify'])) ? true : false);
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
if($message_request)
logger('processing message request');
block forgeries
2013-10-02 09:50:02 +00:00
clean up more code duplication
2014-07-15 04:21:24 +00:00
$i['notify']['sender']['hash'] = make_xchan_hash($i['notify']['sender']['guid'],$i['notify']['sender']['guid_sig']);
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
$deliveries = null;
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
if(array_key_exists('message',$i) && array_key_exists('type',$i['message']) && $i['message']['type'] === 'rating') {
// rating messages are processed only by directory servers
logger('Rating received: ' . print_r($arr,true), LOGGER_DATA);
send rating information to directories
2015-02-03 04:13:07 +00:00
$result = process_rating_delivery($i['notify']['sender'],$i['message']);
continue;
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
}
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
if(array_key_exists('recipients',$i['notify']) && count($i['notify']['recipients'])) {
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
logger('specific recipients');
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
$recip_arr = array();
foreach($i['notify']['recipients'] as $recip) {
coverup and ignore the illegal string offset message that some sites have been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled.
2015-07-14 23:54:16 +00:00
if(is_array($recip)) {
$recip_arr[] = make_xchan_hash($recip['guid'],$recip['guid_sig']);
}
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
}
Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/zot.php
2015-07-16 01:41:50 +00:00
fix for empty recip array resulting from a mangled xchan
2015-07-16 01:31:37 +00:00
$r = false;
if($recip_arr) {
stringify_array_elms($recip_arr);
$recips = implode(',',$recip_arr);
Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/zot.php
2015-07-16 01:41:50 +00:00
$r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " )
and channel_removed = 0 ");
fix for empty recip array resulting from a mangled xchan
2015-07-16 01:31:37 +00:00
}
Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/zot.php
2015-07-16 01:41:50 +00:00
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
if(! $r) {
logger('recips: no recipients on this site');
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
continue;
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
}
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// It's a specifically targetted post. If we were sent a public_scope hint (likely),
// get rid of it so that it doesn't get stored and cause trouble.
public scope delivery issues
2014-08-07 04:16:24 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(($i) && is_array($i) && array_key_exists('message',$i) && is_array($i['message'])
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
&& $i['message']['type'] === 'activity' && array_key_exists('public_scope',$i['message']))
public scope delivery issues
2014-08-07 04:16:24 +00:00
unset($i['message']['public_scope']);
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
$deliveries = $r;
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// We found somebody on this site that's in the recipient list.
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
}
else {
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
if(($i['message']) && (array_key_exists('flags',$i['message'])) && (in_array('private',$i['message']['flags'])) && $i['message']['type'] === 'activity') {
public scope delivery issues
2014-08-07 04:16:24 +00:00
if(array_key_exists('public_scope',$i['message']) && $i['message']['public_scope'] === 'public') {
// This should not happen but until we can stop it...
logger('private message was delivered with no recipients.');
continue;
}
need to figure out what's causing this
2013-09-13 05:50:41 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
logger('public post');
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
quick-n-dirty wall-to-wall detection, wasn't working at all - this may be overboard or it may still not work at all.
2013-01-25 04:43:33 +00:00
// Public post. look for any site members who are or may be accepting posts from this sender
public scope
2013-02-15 22:13:58 +00:00
// and who are allowed to see them based on the sender's permissions
$deliveries = allowed_public_recips($i);
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
provide a way to sync locations and get rid of bogus hublocs, now implemented
2014-09-15 05:19:19 +00:00
if($i['message'] && array_key_exists('type',$i['message']) && $i['message']['type'] === 'location') {
$sys = get_sys_channel();
$deliveries = array(array('hash' => $sys['xchan_hash']));
}
over-ride the private flag if we received a post that isn't completely public, but they didn't set the private flag.
2014-08-08 00:49:57 +00:00
// if the scope is anything but 'public' we're going to store it as private regardless
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// of the private flag on the post.
over-ride the private flag if we received a post that isn't completely public, but they didn't set the private flag.
2014-08-08 00:49:57 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if($i['message'] && array_key_exists('public_scope',$i['message'])
got the logic reversed on that one
2014-08-08 01:58:33 +00:00
&& $i['message']['public_scope'] !== 'public') {
over-ride the private flag if we received a post that isn't completely public, but they didn't set the private flag.
2014-08-08 00:49:57 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(! array_key_exists('flags',$i['message']))
over-ride the private flag if we received a post that isn't completely public, but they didn't set the private flag.
2014-08-08 00:49:57 +00:00
$i['message']['flags'] = array();
if(! in_array('private',$i['message']['flags']))
$i['message']['flags'][] = 'private';
}
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
}
filter out duplicate recipients on local deliveries. We only need to deliver stuff once to any particular channel.
2013-11-18 04:43:50 +00:00
// Go through the hash array and remove duplicates. array_unique() won't do this because the array is more than one level.
$no_dups = array();
if($deliveries) {
foreach($deliveries as $d) {
if(! in_array($d['hash'],$no_dups))
$no_dups[] = $d['hash'];
}
if($no_dups) {
$deliveries = array();
foreach($no_dups as $n) {
$deliveries[] = array('hash' => $n);
}
}
}
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
if(! $deliveries) {
logger('zot_import: no deliveries on this site');
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
continue;
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if($i['message']) {
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
if($i['message']['type'] === 'activity') {
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
$arr = get_item_elements($i['message']);
encrypt private messages on disk - there are still a couple of places where the text is leaked in the logs during processing.
2013-07-29 04:04:03 +00:00
add item validation function
2015-08-14 02:35:57 +00:00
$v = validate_item_elements($i['message'],$arr);
if(! $v['success']) {
logger('Activity rejected: ' . $v['message'] . ' ' . print_r($i['message'],true));
better handling of failures to lookup remote authors
2013-01-26 23:50:31 +00:00
continue;
}
yhis should fix the privacy leak - as well as non-private replies to private posts
2013-08-01 21:27:40 +00:00
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('Activity received: ' . print_r($arr,true), LOGGER_DATA);
logger('Activity recipients: ' . print_r($deliveries,true), LOGGER_DATA);
local delivery
2012-12-03 04:54:20 +00:00
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
$relay = ((array_key_exists('flags',$i['message']) && in_array('relay',$i['message']['flags'])) ? true : false);
flag notify packets that are sent in response to a message_id request and prevent them from recursing
2014-10-31 11:59:30 +00:00
$result = process_delivery($i['notify']['sender'],$arr,$deliveries,$relay,false,$message_request);
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
}
elseif($i['message']['type'] === 'mail') {
y'all got mail
2012-12-06 00:44:07 +00:00
$arr = get_mail_elements($i['message']);
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('Mail received: ' . print_r($arr,true), LOGGER_DATA);
logger('Mail recipients: ' . print_r($deliveries,true), LOGGER_DATA);
y'all got mail
2012-12-06 00:44:07 +00:00
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
$result = process_mail_delivery($i['notify']['sender'],$arr,$deliveries);
more but slow progress on deliveries. The b*tch is trying to match permissions
2012-11-26 07:18:11 +00:00
}
profile messages for directory synchronisation
2012-12-22 12:33:32 +00:00
elseif($i['message']['type'] === 'profile') {
$arr = get_profile_elements($i['message']);
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('Profile received: ' . print_r($arr,true), LOGGER_DATA);
logger('Profile recipients: ' . print_r($deliveries,true), LOGGER_DATA);
profile messages for directory synchronisation
2012-12-22 12:33:32 +00:00
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
$result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries);
profile messages for directory synchronisation
2012-12-22 12:33:32 +00:00
}
more work on channel sync
2013-06-27 00:31:02 +00:00
elseif($i['message']['type'] === 'channel_sync') {
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
// $arr = get_channelsync_elements($i['message']);
reverting to fancybox for "save to file" selection box until we find a better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here.
2013-04-22 05:12:18 +00:00
more work on channel sync
2013-06-27 00:31:02 +00:00
$arr = $i['message'];
reverting to fancybox for "save to file" selection box until we find a better way - prettyPhoto just isn't working for this and I really need this functionality ATM until we can figure out how to make prettyPhoto work properly here.
2013-04-22 05:12:18 +00:00
more work on channel sync
2013-06-27 00:31:02 +00:00
logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA);
logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
$result = process_channel_sync_delivery($i['notify']['sender'],$arr,$deliveries);
more work on channel sync
2013-06-27 00:31:02 +00:00
}
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
elseif($i['message']['type'] === 'location') {
$arr = $i['message'];
logger('Location message received: ' . print_r($arr,true), LOGGER_DATA);
provide a way to sync locations and get rid of bogus hublocs, now implemented
2014-09-15 05:19:19 +00:00
logger('Location message recipients: ' . print_r($deliveries,true), LOGGER_DATA);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$result = process_location_delivery($i['notify']['sender'],$arr,$deliveries);
}
profile messages for directory synchronisation
2012-12-22 12:33:32 +00:00
}
flag failed auth attempts in DB table hubloc
2013-09-11 11:59:45 +00:00
if($result){
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$return = array_merge($return, $result);
flag failed auth attempts in DB table hubloc
2013-09-11 11:59:45 +00:00
}
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
}
}
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
return $return;
"heavy lifting" - zot messages flowing, now just need to be parsed and stored at the other end.
2012-11-20 04:45:12 +00:00
}
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/**
* @brief
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* A public message with no listed recipients can be delivered to anybody who
* has PERMS_NETWORK for that type of post, PERMS_AUTHED (in-network senders are
* by definition authenticated) or PERMS_SITE and is one the same site,
* or PERMS_SPECIFIC and the sender is a contact who is granted permissions via
* their connection permissions in the address book.
* Here we take a given message and construct a list of hashes of everybody
* on the site that we should try and deliver to.
* Some of these will be rejected, but this gives us a place to start.
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param array $msg
* @return NULL|array
*/
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
function public_recips($msg) {
add sys channel to public recips if scope public
2014-11-19 04:34:47 +00:00
require_once('include/identity.php');
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
$check_mentions = false;
add sys channel to public recips if scope public
2014-11-19 04:34:47 +00:00
$include_sys = false;
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
if($msg['message']['type'] === 'activity') {
patch to allow theme based widgets
2015-07-24 01:49:37 +00:00
if(! get_config('system','disable_discover_tab'))
$include_sys = true;
so public_recips and allowed_public_recips is working so much better than before, but was still not quite right. We seem to be getting all the right results for top-level posts now, but comments aren't getting through on channels for which we've allowed them to send us their stream, but not comment on our posts. The reason is we were seeing if they could comment - and we only need to do that if we own the post. If they own the post, we only need to check if they can send us their stream.
2013-09-13 03:11:56 +00:00
$col = 'channel_w_stream';
$field = PERMS_W_STREAM;
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {
so public_recips and allowed_public_recips is working so much better than before, but was still not quite right. We seem to be getting all the right results for top-level posts now, but comments aren't getting through on channels for which we've allowed them to send us their stream, but not comment on our posts. The reason is we were seeing if they could comment - and we only need to do that if we own the post. If they own the post, we only need to check if they can send us their stream.
2013-09-13 03:11:56 +00:00
// check mention recipient permissions on top level posts only
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
$check_mentions = true;
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
}
else {
public_recips cleanup
2015-02-24 00:27:12 +00:00
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// This doesn't look like it works so I have to explain what happened. These are my
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
// notes (below) from when I got this section of code working. You would think that
// we only have to find those with the requisite stream or comment permissions,
// depending on whether this is a top-level post or a comment - but you would be wrong.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// ... so public_recips and allowed_public_recips is working so much better
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// than before, but was still not quite right. We seem to be getting all the right
// results for top-level posts now, but comments aren't getting through on channels
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// for which we've allowed them to send us their stream, but not comment on our posts.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// The reason is we were seeing if they could comment - and we only need to do that if
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// we own the post. If they own the post, we only need to check if they can send us their stream.
so public_recips and allowed_public_recips is working so much better than before, but was still not quite right. We seem to be getting all the right results for top-level posts now, but comments aren't getting through on channels for which we've allowed them to send us their stream, but not comment on our posts. The reason is we were seeing if they could comment - and we only need to do that if we own the post. If they own the post, we only need to check if they can send us their stream.
2013-09-13 03:11:56 +00:00
// if this is a comment and it wasn't sent by the post owner, check to see who is allowing them to comment.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// We should have one specific recipient and this step shouldn't be needed unless somebody stuffed up
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// their software. We may need this step to protect us from bad guys intentionally stuffing up their software.
// If it is sent by the post owner, we don't need to do this. We only need to see who is receiving the
// owner's stream (which was already set above) - as they control the comment permissions, not us.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// Note that by doing this we introduce another bug because some public forums have channel_w_stream
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// permissions set to themselves only. We also need in this function to add these public forums to the
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// public recipient list based on if they are tagged or not and have tag permissions. This is complicated
// by the fact that this activity doesn't have the public forum tag. It's the parent activity that
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// contains the tag. we'll solve that further below.
so public_recips and allowed_public_recips is working so much better than before, but was still not quite right. We seem to be getting all the right results for top-level posts now, but comments aren't getting through on channels for which we've allowed them to send us their stream, but not comment on our posts. The reason is we were seeing if they could comment - and we only need to do that if we own the post. If they own the post, we only need to check if they can send us their stream.
2013-09-13 03:11:56 +00:00
if($msg['notify']['sender']['guid_sig'] != $msg['message']['owner']['guid_sig']) {
$col = 'channel_w_comment';
$field = PERMS_W_COMMENT;
}
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
}
}
elseif($msg['message']['type'] === 'mail') {
$col = 'channel_w_mail';
$field = PERMS_W_MAIL;
}
if(! $col)
return NULL;
public_recips cleanup
2015-02-24 00:27:12 +00:00
$col = dbesc($col);
// First find those channels who are accepting posts from anybody, or at least
// something greater than just their connections.
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if($msg['notify']['sender']['url'] === z_root()) {
$sql = " where (( " . $col . " & " . intval(PERMS_NETWORK) . " ) > 0
or ( " . $col . " & " . intval(PERMS_SITE) . " ) > 0
or ( " . $col . " & " . intval(PERMS_PUBLIC) . ") > 0
public_recips cleanup
2015-02-24 00:27:12 +00:00
or ( " . $col . " & " . intval(PERMS_AUTHED) . ") > 0 ) ";
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
} else {
DB changes for some channel flags
2015-06-16 00:28:52 +00:00
$sql = " where ( " . $col . " = " . intval(PERMS_NETWORK) . "
or " . $col . " = " . intval(PERMS_PUBLIC) . "
or " . $col . " = " . intval(PERMS_AUTHED) . " ) ";
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
is_commentable() had some major issues when applied to the atrocity known as ConversationObject, hopefully this won't destabilise the network as it's a somewhat major permission tweak related to comments; also add any local clones to allowed_public_recips() as they should always be allowed recipients. Not sure what to do about host permissions in the event of clones. They have more than one host, and it isn't spelled out in the sent message. All of this stuff will make your head hurt.
2013-09-20 12:45:11 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$r = q("select channel_hash as hash from channel $sql or channel_hash = '%s'
DB changes for some channel flags
2015-06-16 00:28:52 +00:00
and channel_removed = 0 ",
is_commentable() had some major issues when applied to the atrocity known as ConversationObject, hopefully this won't destabilise the network as it's a somewhat major permission tweak related to comments; also add any local clones to allowed_public_recips() as they should always be allowed recipients. Not sure what to do about host permissions in the event of clones. They have more than one host, and it isn't spelled out in the sent message. All of this stuff will make your head hurt.
2013-09-20 12:45:11 +00:00
dbesc($msg['notify']['sender']['hash'])
);
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
if(! $r)
$r = array();
public_recips cleanup
2015-02-24 00:27:12 +00:00
// Now we have to get a bit dirty. Find every channel that has the sender in their connections (abook)
// and is allowing this sender at least at a high level.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id
DB changes for some channel flags
2015-06-16 00:28:52 +00:00
where abook_xchan = '%s' and channel_removed = 0
and (( " . $col . " = " . intval(PERMS_SPECIFIC) . " and ( abook_my_perms & " . intval($field) . " ) > 0 )
OR " . $col . " = " . intval(PERMS_PENDING) . "
OR ( " . $col . " = " . intval(PERMS_CONTACTS) . " and abook_pending = 0 )) ",
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
dbesc($msg['notify']['sender']['hash'])
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
);
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
if(! $x)
$x = array();
$r = array_merge($r,$x);
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
change logging of some troublesome or noisy bits so we can figure out what is really going on
2014-11-20 03:22:22 +00:00
//logger('message: ' . print_r($msg['message'],true));
there's still a permission issue delivering a public post directly to the sys channel (on the local system), but this puts the local sys channel in the public delivery chain and fixes an issue with unseen counts showing on the discover page (where you can't do anything about it).
2014-11-19 08:56:05 +00:00
add sys channel to public recips if scope public
2014-11-19 04:34:47 +00:00
if($include_sys && array_key_exists('public_scope',$msg['message']) && $msg['message']['public_scope'] === 'public') {
$sys = get_sys_channel();
if($sys)
$r[] = array('hash' => $sys['channel_hash']);
}
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
// look for any public mentions on this site
// They will get filtered by tgroup_check() so we don't need to check permissions now
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
if($check_mentions) {
// It's a top level post. Look at the tags. See if any of them are mentions and are on this hub.
if($msg['message']['tags']) {
if(is_array($msg['message']['tags']) && $msg['message']['tags']) {
foreach($msg['message']['tags'] as $tag) {
if(($tag['type'] === 'mention') && (strpos($tag['url'],z_root()) !== false)) {
$address = basename($tag['url']);
if($address) {
some work on issue #329
2015-05-26 02:17:35 +00:00
$z = q("select channel_hash as hash from channel where channel_address = '%s'
DB changes for some channel flags
2015-06-16 00:28:52 +00:00
and channel_removed = 0 limit 1",
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
dbesc($address)
);
if($z)
$r = array_merge($r,$z);
}
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
}
}
}
}
}
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
else {
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
// This is a comment. We need to find any parent with ITEM_UPLINK set. But in fact, let's just return
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// everybody that stored a copy of the parent. This way we know we're covered. We'll check the
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
// comment permissions when we deliver them.
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
if($msg['message']['message_top']) {
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
$z = q("select owner_xchan as hash from item where parent_mid = '%s' ",
item flag fixes discovered after a few merges
2015-06-24 02:45:39 +00:00
dbesc($msg['message']['message_top'])
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
);
if($z)
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$r = array_merge($r,$z);
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
}
}
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
// There are probably a lot of duplicates in $r at this point. We need to filter those out.
solve some (hopefully most) missing delivery issues
2015-02-25 09:39:45 +00:00
// It's a bit of work since it's a multi-dimensional array
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
if($r) {
$uniq = array();
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
foreach($r as $rr) {
if(! in_array($rr['hash'],$uniq))
$uniq[] = $rr['hash'];
}
$r = array();
foreach($uniq as $rr) {
$r[] = array('hash' => $rr);
}
}
possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked)
2013-08-22 12:50:15 +00:00
more diagnostics
2013-07-15 10:12:51 +00:00
logger('public_recips: ' . print_r($r,true), LOGGER_DATA);
more heavy lifting on delivery - now we can find all the recipients on the system who have any acceptable permissions for receiving a post. Next we just need to process edits and deletes, and otherwise store the message - yay. Still a lot of work, but we've come a long way baby.
2012-11-27 00:48:04 +00:00
return $r;
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* This is the second part of public_recipes().
* We'll find all the channels willing to accept public posts from us, then
* match them against the sender privacy scope and see who in that list that
* the sender is allowing.
*
* @see public_recipes()
* @param array $msg
* @return array
*/
public scope
2013-02-15 22:13:58 +00:00
function allowed_public_recips($msg) {
change logging of some troublesome or noisy bits so we can figure out what is really going on
2014-11-20 03:22:22 +00:00
logger('allowed_public_recips: ' . print_r($msg,true),LOGGER_DATA);
public scope
2013-02-15 22:13:58 +00:00
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
if(array_key_exists('public_scope',$msg['message']))
$scope = $msg['message']['public_scope'];
// Mail won't have a public scope.
// in fact, it's doubtful mail will ever get here since it almost universally
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// has a recipient, but in fact we don't require this, so it's technically
// possible to send mail to anybody that's listening.
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
public scope
2013-02-15 22:13:58 +00:00
$recips = public_recips($msg);
if(! $recips)
return $recips;
if($msg['message']['type'] === 'mail')
return $recips;
don't block "public" messages with authenticated scope
2014-08-15 19:36:24 +00:00
if($scope === 'public' || $scope === 'network: red' || $scope === 'authenticated')
public scope
2013-02-15 22:13:58 +00:00
return $recips;
if(strpos($scope,'site:') === 0) {
if(($scope === 'site: ' . get_app()->get_hostname()) && ($msg['notify']['sender']['url'] === z_root()))
return $recips;
else
return array();
}
make public delivery to contacts or any connections work again $hash wasn't defined in this case
2015-03-02 10:05:03 +00:00
$hash = make_xchan_hash($msg['notify']['sender']['guid'],$msg['notify']['sender']['guid_sig']);
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
public scope
2013-02-15 22:13:58 +00:00
if($scope === 'self') {
foreach($recips as $r)
if($r['hash'] === $hash)
return array('hash' => $hash);
}
Found the cause of the delete looping, and I can prevent it going forward. The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
2015-02-25 23:27:33 +00:00
// note: we shouldn't ever see $scope === 'specific' in this function, but handle it anyway
if($scope === 'contacts' || $scope === 'any connections' || $scope === 'specific') {
public scope
2013-02-15 22:13:58 +00:00
$condensed_recips = array();
foreach($recips as $rr)
$condensed_recips[] = $rr['hash'];
$results = array();
DB changes for some channel flags
2015-06-16 00:28:52 +00:00
$r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and channel_removed = 0 ",
dbesc($hash)
public scope
2013-02-15 22:13:58 +00:00
);
if($r) {
foreach($r as $rr)
if(in_array($rr['hash'],$condensed_recips))
$results[] = array('hash' => $rr['hash']);
}
return $results;
}
return array();
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* @param array $sender
* @param array $arr
* @param array $deliveries
* @param boolean $relay
* @param boolean $public (optional) default false
* @param boolean $request (optional) default false
* @return array
*/
function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $request = false) {
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
$result = array();
block forgeries
2013-10-02 09:50:02 +00:00
add reporting site to delivery report
2015-09-19 05:00:33 +00:00
$result['site'] = z_root();
block forgeries
2013-10-02 09:50:02 +00:00
// We've validated the sender. Now make sure that the sender is the owner or author
more work on firehose
2014-03-27 01:45:01 +00:00
if(! $public) {
if($sender['hash'] != $arr['owner_xchan'] && $sender['hash'] != $arr['author_xchan']) {
logger("process_delivery: sender {$sender['hash']} is not owner {$arr['owner_xchan']} or author {$arr['author_xchan']} - mid {$arr['mid']}");
return;
}
block forgeries
2013-10-02 09:50:02 +00:00
}
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
2014-12-02 02:58:27 +00:00
document the issue with cloned delivery to self vs normal delivery to self
2015-09-30 23:27:24 +00:00
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
foreach($deliveries as $d) {
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
2014-12-02 02:58:27 +00:00
$local_public = $public;
new delivery report format
2015-09-21 03:21:54 +00:00
$DR = new DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']);
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
$r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash'])
);
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
if(! $r) {
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('recipient not found');
$result[] = $DR->get();
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
continue;
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
}
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
delivery reports - crude but mostly functional at least for zot deliveries
2015-09-22 11:04:51 +00:00
$channel = $r[0];
$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
document the issue with cloned delivery to self vs normal delivery to self
2015-09-30 23:27:24 +00:00
/**
* @FIXME: Somehow we need to block normal message delivery from our clones, as the delivered
* message doesn't have ACL information in it as the cloned copy does. That copy
* will normally arrive first via sync delivery, but this isn't guaranteed.
* There's a chance the current delivery could take place before the cloned copy arrives
* hence the item could have the wrong ACL and *could* be used in subsequent deliveries or
* access checks. So far all attempts at identifying this situation precisely
* have caused issues with delivery of relayed comments.
*/
// if(($d['hash'] === $sender['hash']) && ($sender['url'] !== z_root()) && (! $relay)) {
undo self deliver check
2015-09-30 19:59:13 +00:00
// $DR->update('self delivery ignored');
// $result[] = $DR->get();
// continue;
// }
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
diaspora's spammy permission model seems to have leaked through our firehose. Don't let it.
2015-03-10 19:22:22 +00:00
// allow public postings to the sys channel regardless of permissions, but not
// for comments travelling upstream. Wait and catch them on the way down.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// They may have been blocked by the owner.
diaspora's spammy permission model seems to have leaked through our firehose. Don't let it.
2015-03-10 19:22:22 +00:00
DB changes for some channel flags
2015-06-16 00:28:52 +00:00
if(intval($channel['channel_system']) && (! $arr['item_private']) && (! $relay)) {
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
2014-12-02 02:58:27 +00:00
$local_public = true;
couple of fixes: - significantly increase the content availability on the discover channel - fix the button group on the blog/list mode which made the border on a single comment button a bit wonky
2014-11-19 22:41:24 +00:00
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
$r = q("select xchan_selfcensored from xchan where xchan_hash = '%s' limit 1",
don't import to sys channel from self-censored authors
2014-12-12 08:26:07 +00:00
dbesc($sender['hash'])
);
// don't import sys channel posts from selfcensored authors
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
if($r && (intval($r[0]['xchan_selfcensored']))) {
don't import to sys channel from self-censored authors
2014-12-12 08:26:07 +00:00
$local_public = false;
continue;
}
}
hopefully this won't screw up everything - if it does, revert. Otherwise this should work at delivery time to check tag deliveries and bounce the message before it's stored if the channel doesn't allow you to post and you aren't allowed to tag deliver either. Previously this was handled after the post was already stored so you needed posting permission as well as tag deliver permission to get past the checks.
2013-06-16 07:57:39 +00:00
$tag_delivery = tgroup_check($channel['channel_id'],$arr);
add item validation function
2015-08-14 02:35:57 +00:00
$perm = 'send_stream';
if(($arr['mid'] !== $arr['parent_mid']) && ($relay))
$perm = 'post_comments';
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
fix bug #84, make imported messages from your clones show up on your wall
2013-07-30 00:30:46 +00:00
// This is our own post, possibly coming from a channel clone
if($arr['owner_xchan'] == $d['hash']) {
heavy lifting converting item flag bits
2015-01-23 01:41:16 +00:00
$arr['item_wall'] = 1;
fix bug #84, make imported messages from your clones show up on your wall
2013-07-30 00:30:46 +00:00
}
else {
heavy lifting converting item flag bits
2015-01-23 01:41:16 +00:00
$arr['item_wall'] = 0;
fix bug #84, make imported messages from your clones show up on your wall
2013-07-30 00:30:46 +00:00
}
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
2014-12-02 02:58:27 +00:00
if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery) && (! $local_public)) {
Include the entire original item when notifying other channels of deletions as it contains important routing and scope information. Previously we were only sending a couple of critical fields like the message-id, flags, and creation date. The thinking was that it is deleted, let's not resend the deleted contents anywhere. But in order to route this through the same path the original post took we really need the entire original post with all of its baggage attached.
2014-04-10 23:14:19 +00:00
logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('permission denied');
$result[] = $DR->get();
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
continue;
}
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 07:13:46 +00:00
if($arr['mid'] != $arr['parent_mid']) {
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
// check source route.
// We are only going to accept comments from this sender if the comment has the same route as the top-level-post,
// this is so that permissions mismatches between senders apply to the entire conversation
// As a side effect we will also do a preliminary check that we have the top-level-post, otherwise
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// processing it is pointless.
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
we need to actually ask for the id from the DB if we want to use it.
2015-01-28 01:46:16 +00:00
$r = q("select route, id from item where mid = '%s' and uid = %d limit 1",
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
dbesc($arr['parent_mid']),
intval($channel['channel_id'])
);
if(! $r) {
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('comment parent not found');
$result[] = $DR->get();
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// We don't seem to have a copy of this conversation or at least the parent
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
// - so request a copy of the entire conversation to date.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// Don't do this if it's a relay post as we're the ones who are supposed to
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
// have the copy and we don't want the request to loop.
// Also don't do this if this comment came from a conversation request packet.
// It's possible that comments are allowed but posting isn't and that could
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// cause a conversation fetch loop. We can detect these packets since they are
// delivered via a 'notify' packet type that has a message_id element in the
// initial zot packet (just like the corresponding 'request' packet type which
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
// makes the request).
// We'll also check the send_stream permission - because if it isn't allowed,
// the top level post is unlikely to be imported and
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// this is just an exercise in futility.
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if((! $relay) && (! $request) && (! $local_public)
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
&& perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
add some more safety checks before turning the conversation request messages back on
2014-11-02 07:06:52 +00:00
}
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
continue;
}
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 07:13:46 +00:00
if($relay) {
// reset the route in case it travelled a great distance upstream
// use our parent's route so when we go back downstream we'll match
// with whatever route our parent has.
$arr['route'] = $r[0]['route'];
}
else {
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 07:13:46 +00:00
// going downstream check that we have the same upstream provider that
// sent it to us originally. Ignore it if it came from another source
improved route mismatch detection. We will be less strict about the absolute route matching and only look at the last hop before it got to us - which is ultimately all we should care about (since that sender controls the thread permissions). Route mismatches seem to occur somewhat frequently from yamkote (for unknown reasons), and the logging has been improved a bit so it should provide some slightly more useful debugging info in case it still happens going forward. Oh, also we'll set the parent on comments when we store the initial post (item_store()) and only go back and set the parent for top-level posts. This should reduce the number of comments with missing parents on shared hosts, but may increase the number of missing threads. Probably worthwhile to do a query occasionally for parent = 0 and see how we're doing and how many have shared host related delivery issues.
2015-01-27 23:47:24 +00:00
// (with potentially different permissions).
// only compare the last hop since it could have arrived at the last location any number of ways.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// Always accept empty routes and firehose items (route contains 'undefined') .
improved route mismatch detection. We will be less strict about the absolute route matching and only look at the last hop before it got to us - which is ultimately all we should care about (since that sender controls the thread permissions). Route mismatches seem to occur somewhat frequently from yamkote (for unknown reasons), and the logging has been improved a bit so it should provide some slightly more useful debugging info in case it still happens going forward. Oh, also we'll set the parent on comments when we store the initial post (item_store()) and only go back and set the parent for top-level posts. This should reduce the number of comments with missing parents on shared hosts, but may increase the number of missing threads. Probably worthwhile to do a query occasionally for parent = 0 and see how we're doing and how many have shared host related delivery issues.
2015-01-27 23:47:24 +00:00
$existing_route = explode(',', $r[0]['route']);
$routes = count($existing_route);
if($routes) {
$last_hop = array_pop($existing_route);
$last_prior_route = implode(',',$existing_route);
}
else {
$last_hop = '';
$last_prior_route = '';
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
add yet another firehose check
2015-01-28 09:13:32 +00:00
if(in_array('undefined',$existing_route) || $last_hop == 'undefined' || $sender['hash'] == 'undefined')
more minor tweaks to the route mismatch algorithm after watching it all day.
2015-01-28 09:06:56 +00:00
$last_hop = '';
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 07:13:46 +00:00
$current_route = (($arr['route']) ? $arr['route'] . ',' : '') . $sender['hash'];
more minor tweaks to the route mismatch algorithm after watching it all day.
2015-01-28 09:06:56 +00:00
if($last_hop && $last_hop != $sender['hash']) {
improved route mismatch detection. We will be less strict about the absolute route matching and only look at the last hop before it got to us - which is ultimately all we should care about (since that sender controls the thread permissions). Route mismatches seem to occur somewhat frequently from yamkote (for unknown reasons), and the logging has been improved a bit so it should provide some slightly more useful debugging info in case it still happens going forward. Oh, also we'll set the parent on comments when we store the initial post (item_store()) and only go back and set the parent for top-level posts. This should reduce the number of comments with missing parents on shared hosts, but may increase the number of missing threads. Probably worthwhile to do a query occasionally for parent = 0 and see how we're doing and how many have shared host related delivery issues.
2015-01-27 23:47:24 +00:00
logger('comment route mismatch: parent route = ' . $r[0]['route'] . ' expected = ' . $current_route, LOGGER_DEBUG);
logger('comment route mismatch: parent msg = ' . $r[0]['id'],LOGGER_DEBUG);
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('comment route mismatch');
$result[] = $DR->get();
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 07:13:46 +00:00
continue;
}
improved route mismatch detection. We will be less strict about the absolute route matching and only look at the last hop before it got to us - which is ultimately all we should care about (since that sender controls the thread permissions). Route mismatches seem to occur somewhat frequently from yamkote (for unknown reasons), and the logging has been improved a bit so it should provide some slightly more useful debugging info in case it still happens going forward. Oh, also we'll set the parent on comments when we store the initial post (item_store()) and only go back and set the parent for top-level posts. This should reduce the number of comments with missing parents on shared hosts, but may increase the number of missing threads. Probably worthwhile to do a query occasionally for parent = 0 and see how we're doing and how many have shared host related delivery issues.
2015-01-27 23:47:24 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// we'll add sender['hash'] onto this when we deliver it. $last_prior_route now has the previously stored route
improved route mismatch detection. We will be less strict about the absolute route matching and only look at the last hop before it got to us - which is ultimately all we should care about (since that sender controls the thread permissions). Route mismatches seem to occur somewhat frequently from yamkote (for unknown reasons), and the logging has been improved a bit so it should provide some slightly more useful debugging info in case it still happens going forward. Oh, also we'll set the parent on comments when we store the initial post (item_store()) and only go back and set the parent for top-level posts. This should reduce the number of comments with missing parents on shared hosts, but may increase the number of missing threads. Probably worthwhile to do a query occasionally for parent = 0 and see how we're doing and how many have shared host related delivery issues.
2015-01-27 23:47:24 +00:00
// *except* for the sender['hash'] which would've been the last hop before it got to us.
$arr['route'] = $last_prior_route;
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
}
}
really fix post filtering
2015-09-02 13:49:07 +00:00
$ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
intval($channel['channel_id']),
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-02 22:49:50 +00:00
dbesc($arr['owner_xchan'])
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
);
$abook = (($ab) ? $ab[0] : null);
more message restrict conversions
2015-01-29 22:51:41 +00:00
if(intval($arr['item_deleted'])) {
issue #65
2013-07-02 02:41:11 +00:00
// remove_community_tag is a no-op if this isn't a community tag activity
remove_community_tag($sender,$arr,$channel['channel_id']);
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
// set these just in case we need to store a fresh copy of the deleted post.
// This could happen if the delete got here before the original post did.
$arr['aid'] = $channel['channel_account_id'];
$arr['uid'] = $channel['channel_id'];
well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
2015-02-12 00:11:21 +00:00
$item_id = delete_imported_item($sender,$arr,$channel['channel_id'],$relay);
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update(($item_id) ? 'deleted' : 'delete_failed');
$result[] = $DR->get();
delete item should now mostly work
2013-01-29 03:24:36 +00:00
if($relay && $item_id) {
logger('process_delivery: invoking relay');
proc_run('php','include/notifier.php','relay',intval($item_id));
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('relayed');
$result[] = $DR->get();
delete item should now mostly work
2013-01-29 03:24:36 +00:00
}
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
continue;
}
more message restrict conversions
2015-01-29 22:51:41 +00:00
$r = q("select * from item where mid = '%s' and uid = %d limit 1",
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
2013-03-22 01:25:41 +00:00
dbesc($arr['mid']),
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
intval($channel['channel_id'])
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
);
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
if($r) {
Tried this once before but had to revert. Basically prevent a comment from being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions.
2014-10-20 00:31:10 +00:00
// We already have this post.
ah yes, the redundant relay run was for the benefit of wall-to-wall posts issue #633
2014-10-10 22:17:32 +00:00
$item_id = $r[0]['id'];
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
more message restrict conversions
2015-01-29 22:51:41 +00:00
if(intval($r[0]['item_deleted'])) {
don't update locally deleted items
2015-01-06 23:44:23 +00:00
// It was deleted locally.
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('update ignored');
$result[] = $DR->get();
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-21 03:58:55 +00:00
don't update locally deleted items
2015-01-06 23:44:23 +00:00
continue;
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
// Maybe it has been edited?
don't update locally deleted items
2015-01-06 23:44:23 +00:00
elseif($arr['edited'] > $r[0]['edited']) {
this might make edits update across the wire, or it might not
2013-03-01 02:20:42 +00:00
$arr['id'] = $r[0]['id'];
edits might really work now
2013-03-01 02:59:03 +00:00
$arr['uid'] = $channel['channel_id'];
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
if(($arr['mid'] == $arr['parent_mid']) && (! post_is_importable($arr,$abook))) {
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('update ignored');
$result[] = $DR->get();
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
}
else {
event integration improvements
2015-08-19 23:50:32 +00:00
update_imported_item($sender,$arr,$r[0],$channel['channel_id']);
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('updated');
$result[] = $DR->get();
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
if(! $relay)
add_source_route($item_id,$sender['hash']);
}
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
}
else {
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('update ignored');
$result[] = $DR->get();
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
Tried this once before but had to revert. Basically prevent a comment from being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions.
2014-10-20 00:31:10 +00:00
// We need this line to ensure wall-to-wall comments are relayed (by falling through to the relay bit),
// and at the same time not relay any other relayable posts more than once, because to do so is very wasteful.
slow progress removing bitfields on item table
2015-01-22 00:06:25 +00:00
if(! intval($r[0]['item_origin']))
Tried this once before but had to revert. Basically prevent a comment from being relayed more than once - as it's a huge drain on resources. But last time I tried this, wall-to-wall comments stopped getting relayed. This checkin should do the right thing in both conditions.
2014-10-20 00:31:10 +00:00
continue;
OK this is important. So read it carefully. This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-10 01:12:53 +00:00
}
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
}
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
else {
$arr['aid'] = $channel['channel_account_id'];
$arr['uid'] = $channel['channel_id'];
call post_local hooks prior to storing a post that is going to be sourced. There are some fields in the actual stored item that may change when we start the second delivery chain so a few plugins may not deal with these items correctly. Since we only source public items these effects will be slight.
2015-02-25 11:14:49 +00:00
// if it's a sourced post, call the post_local hooks as if it were
// posted locally so that crosspost connectors will be triggered.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(check_item_source($arr['uid'], $arr))
call_hooks('post_local', $arr);
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
lots of little Diaspora issues
2014-08-29 04:49:13 +00:00
$item_id = 0;
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
if(($arr['mid'] == $arr['parent_mid']) && (! post_is_importable($arr,$abook))) {
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update('post ignored');
$result[] = $DR->get();
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-29 04:16:56 +00:00
}
else {
$item_result = item_store($arr);
if($item_result['success']) {
$item_id = $item_result['item_id'];
$parr = array('item_id' => $item_id,'item' => $arr,'sender' => $sender,'channel' => $channel);
call_hooks('activity_received',$parr);
// don't add a source route if it's a relay or later recipients will get a route mismatch
if(! $relay)
add_source_route($item_id,$sender['hash']);
}
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->update(($item_id) ? 'posted' : 'storage failed: ' . $item_result['message']);
$result[] = $DR->get();
lots of little Diaspora issues
2014-08-29 04:49:13 +00:00
}
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
if($relay && $item_id) {
logger('process_delivery: invoking relay');
proc_run('php','include/notifier.php','relay',intval($item_id));
new delivery report format
2015-09-21 03:21:54 +00:00
$DR->addto_update('relayed');
$result[] = $DR->get();
got comments going back and forth - we really need local_deliver now since even local deliveries are going through zot and that isn't necessary or desirable in the long term
2012-11-28 01:09:01 +00:00
}
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
if(! $deliveries)
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$result[] = array('', 'no recipients', '', $arr['mid']);
ensure all delivery result possibilities are logged and communicated to the sender
2013-01-01 08:45:44 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
logger('process_delivery: local results: ' . print_r($result, true), LOGGER_DEBUG);
provide delivery report on both sides, local and remote
2013-01-03 10:21:35 +00:00
add individual message delivery reporting
2013-01-01 05:33:11 +00:00
return $result;
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* @param array $sender an associative array with
* * \e string \b hash a xchan_hash
* @param array $arr an associative array
* * \e int \b verb
* * \e int \b obj_type
* * \e int \b mid
* @param int $uid
*/
function remove_community_tag($sender, $arr, $uid) {
y'all got mail
2012-12-06 00:44:07 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(! (activity_match($arr['verb'], ACTIVITY_TAG) && ($arr['obj_type'] == ACTIVITY_OBJ_TAGTERM)))
issue #65
2013-07-02 02:41:11 +00:00
return;
logger('remove_community_tag: invoked');
if(! get_pconfig($uid,'system','blocktags')) {
logger('remove_community tag: permission denied.');
return;
}
$r = q("select * from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']),
intval($uid)
);
if(! $r) {
logger('remove_community_tag: no item');
return;
}
if(($sender['hash'] != $r[0]['owner_xchan']) && ($sender['hash'] != $r[0]['author_xchan'])) {
logger('remove_community_tag: sender not authorised.');
return;
}
$i = $r[0];
if($i['target'])
convert all stored json calls to json_decode_plus()
2013-08-06 10:54:49 +00:00
$i['target'] = json_decode_plus($i['target']);
issue #65
2013-07-02 02:41:11 +00:00
if($i['object'])
convert all stored json calls to json_decode_plus()
2013-08-06 10:54:49 +00:00
$i['object'] = json_decode_plus($i['object']);
issue #65
2013-07-02 02:41:11 +00:00
if(! ($i['target'] && $i['object'])) {
logger('remove_community_tag: no target/object');
return;
}
$message_id = $i['target']['id'];
$r = q("select id from item where mid = '%s' and uid = %d limit 1",
dbesc($message_id),
intval($uid)
);
if(! $r) {
logger('remove_community_tag: no parent message');
return;
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
q("delete from term where uid = %d and oid = %d and otype = %d and type = %d and term = '%s' and url = '%s'",
issue #65
2013-07-02 02:41:11 +00:00
intval($uid),
intval($r[0]['id']),
intval(TERM_OBJ_POST),
intval(TERM_HASHTAG),
dbesc($i['object']['title']),
dbesc(get_rel_link($i['object']['link'],'alternate'))
);
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief Just calls item_store_update() and logs result.
*
* @see item_store_update()
* @param array $sender (unused)
* @param array $item
* @param int $uid (unused)
*/
event integration improvements
2015-08-19 23:50:32 +00:00
function update_imported_item($sender, $item, $orig, $uid) {
this might make edits update across the wire, or it might not
2013-03-01 02:20:42 +00:00
provide detailed error to remote site for the myriad of things that can go wrong inside item_store(), !! this changes the return of item_store !!
2013-09-11 02:06:06 +00:00
$x = item_store_update($item);
event integration improvements
2015-08-19 23:50:32 +00:00
// If we're updating an event that we've saved locally, we store the item info first
// because event_addtocal will parse the body to get the 'new' event details
if($orig['resource_type'] === 'event') {
$res = event_addtocal($orig['id'],$uid);
if(! $res)
logger('update event: failed');
}
provide detailed error to remote site for the myriad of things that can go wrong inside item_store(), !! this changes the return of item_store !!
2013-09-11 02:06:06 +00:00
if(! $x['item_id'])
logger('update_imported_item: failed: ' . $x['message']);
else
logger('update_imported_item');
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/**
* @brief Deletes an imported item.
*
* @param array $sender
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* * \e string \b hash a xchan_hash
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param array $item
* @param int $uid
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @param boolean $relay
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @return boolean|int post_id
*/
function delete_imported_item($sender, $item, $uid, $relay) {
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
logger('delete_imported_item invoked', LOGGER_DEBUG);
delete item should now mostly work
2013-01-29 03:24:36 +00:00
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
$ownership_valid = false;
$item_found = false;
$post_id = 0;
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
issue #63 - missing table fields in db query
2015-10-01 04:38:21 +00:00
$r = q("select id, author_xchan, owner_xchan, source_xchan, item_deleted from item where ( author_xchan = '%s' or owner_xchan = '%s' or source_xchan = '%s' )
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
2013-03-22 01:25:41 +00:00
and mid = '%s' and uid = %d limit 1",
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
dbesc($sender['hash']),
move js files from core
2014-01-04 11:58:21 +00:00
dbesc($sender['hash']),
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
dbesc($sender['hash']),
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
2013-03-22 01:25:41 +00:00
dbesc($item['mid']),
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
intval($uid)
);
issue #63 - missing table fields in db query
2015-10-01 04:38:21 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($r) {
if ($r[0]['author_xchan'] === $sender['hash'] || $r[0]['owner_xchan'] === $sender['hash'] || $r[0]['source_xchan'] === $sender['hash'])
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
$ownership_valid = true;
delete item should now mostly work
2013-01-29 03:24:36 +00:00
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
$post_id = $r[0]['id'];
$item_found = true;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
delete item should now mostly work
2013-01-29 03:24:36 +00:00
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
// perhaps the item is still in transit and the delete notification got here before the actual item did. Store it with the deleted flag set.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// item_store() won't try to deliver any notifications or start delivery chains if this flag is set.
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
// This means we won't end up with potentially even more delivery threads trying to push this delete notification.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// But this will ensure that if the (undeleted) original post comes in at a later date, we'll reject it because it will have an older timestamp.
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
logger('delete received for non-existent item - storing item data.');
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/** @BUG $arr is undefined here, so this is dead code */
if ($arr['author_xchan'] === $sender['hash'] || $arr['owner_xchan'] === $sender['hash'] || $arr['source_xchan'] === $sender['hash']) {
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
$ownership_valid = true;
$item_result = item_store($arr);
$post_id = $item_result['item_id'];
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($ownership_valid === false) {
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
logger('delete_imported_item: failed: ownership issue');
delete item should now mostly work
2013-01-29 03:24:36 +00:00
return false;
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
break delivery loop if an item is deleted twice
2014-01-10 20:37:48 +00:00
uncomplicate item deletion and fixup all the other linked tables
2013-01-25 00:44:10 +00:00
require_once('include/items.php');
found what I believe is the root cause of issue #230, but don't yet have a workable solution. This one is hard.
2014-03-21 05:08:16 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($item_found) {
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
if (intval($r[0]['item_deleted'])) {
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
logger('delete_imported_item: item was already deleted');
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $relay)
well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
2015-02-12 00:11:21 +00:00
return false;
loop breaker
2015-02-26 22:20:43 +00:00
// This is a bit hackish, but may have to suffice until the notification/delivery loop is optimised
// a bit further. We're going to strip the ITEM_ORIGIN on this item if it's a comment, because
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// it was already deleted, and we're already relaying, and this ensures that no other process or
loop breaker
2015-02-26 22:20:43 +00:00
// code path downstream can relay it again (causing a loop). Since it's already gone it's not coming
// back, and we aren't going to (or shouldn't at any rate) delete it again in the future - so losing
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// this information from the metadata should have no other discernible impact.
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
if (($r[0]['id'] != $r[0]['parent']) && intval($r[0]['item_origin'])) {
q("update item set item_origin = 0 where id = %d and uid = %d",
loop breaker
2015-02-26 22:20:43 +00:00
intval($r[0]['id']),
intval($r[0]['uid'])
);
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
found what I believe is the root cause of issue #230, but don't yet have a workable solution. This one is hard.
2014-03-21 05:08:16 +00:00
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
require_once('include/items.php');
issue #230 - deletion failure in multiple delivery chains
2013-12-26 08:14:17 +00:00
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
// Use phased deletion to set the deleted flag, call both tag_deliver and the notifier to notify downstream channels
// and then clean up after ourselves with a cron job after several days to do the delete_item_lowlevel() (DROPITEM_PHASE2).
issue #230 - deletion failure in multiple delivery chains
2013-12-26 08:14:17 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
drop_item($post_id, false, DROPITEM_PHASE1);
tag_deliver($uid, $post_id);
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
}
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 23:26:35 +00:00
return $post_id;
You've got mail! (actually a post, mail is for another day)
2012-11-27 05:20:16 +00:00
}
extend delivery reports to mail
2013-05-17 03:43:24 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
function process_mail_delivery($sender, $arr, $deliveries) {
extend delivery reports to mail
2013-05-17 03:43:24 +00:00
$result = array();
post signatures
2013-10-03 04:04:48 +00:00
if($sender['hash'] != $arr['from_xchan']) {
logger('process_mail_delivery: sender is not mail author');
return;
}
y'all got mail
2012-12-06 00:44:07 +00:00
foreach($deliveries as $d) {
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR = new DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']);
y'all got mail
2012-12-06 00:44:07 +00:00
$r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash'])
);
extend delivery reports to mail
2013-05-17 03:43:24 +00:00
if(! $r) {
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR->update('recipient not found');
$result[] = $DR->get();
y'all got mail
2012-12-06 00:44:07 +00:00
continue;
extend delivery reports to mail
2013-05-17 03:43:24 +00:00
}
y'all got mail
2012-12-06 00:44:07 +00:00
$channel = $r[0];
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
y'all got mail
2012-12-06 00:44:07 +00:00
if(! perm_is_allowed($channel['channel_id'],$sender['hash'],'post_mail')) {
logger("permission denied for mail delivery {$channel['channel_id']}");
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR->update('permission denied');
$result[] = $DR->get();
y'all got mail
2012-12-06 00:44:07 +00:00
continue;
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
2013-03-22 01:25:41 +00:00
$r = q("select id from mail where mid = '%s' and channel_id = %d limit 1",
dbesc($arr['mid']),
y'all got mail
2012-12-06 00:44:07 +00:00
intval($channel['channel_id'])
);
if($r) {
more work on mail flags
2015-06-24 04:01:59 +00:00
if(intval($arr['mail_recalled'])) {
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
$x = q("delete from mail where id = %d and channel_id = %d",
mail recall - just set mail_flags = mail_flags & MAIL_RECALLED and tell the notifier. We'll need a special button for this. Also should probably report whether it was seen or not. Will do that another day.
2013-02-28 04:38:33 +00:00
intval($r[0]['id']),
intval($channel['channel_id'])
);
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR->update('mail recalled');
$result[] = $DR->get();
mail recall - just set mail_flags = mail_flags & MAIL_RECALLED and tell the notifier. We'll need a special button for this. Also should probably report whether it was seen or not. Will do that another day.
2013-02-28 04:38:33 +00:00
logger('mail_recalled');
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
else {
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR->update('duplicate mail received');
$result[] = $DR->get();
mail recall - just set mail_flags = mail_flags & MAIL_RECALLED and tell the notifier. We'll need a special button for this. Also should probably report whether it was seen or not. Will do that another day.
2013-02-28 04:38:33 +00:00
logger('duplicate mail received');
}
y'all got mail
2012-12-06 00:44:07 +00:00
continue;
}
else {
$arr['account_id'] = $channel['channel_account_id'];
$arr['channel_id'] = $channel['channel_id'];
$item_id = mail_store($arr);
add delivery reports to mail (not backported to redmatrix)
2015-10-01 02:27:53 +00:00
$DR->update('mail delivered');
$result[] = $DR->get();
y'all got mail
2012-12-06 00:44:07 +00:00
}
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
extend delivery reports to mail
2013-05-17 03:43:24 +00:00
return $result;
y'all got mail
2012-12-06 00:44:07 +00:00
}
profile messages for directory synchronisation
2012-12-22 12:33:32 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief Processes delivery of rating.
*
* @param array $sender
* * \e string \b hash a xchan_hash
* @param array $arr
*/
function process_rating_delivery($sender, $arr) {
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
send rating information to directories
2015-02-03 04:13:07 +00:00
logger('process_rating_delivery: ' . print_r($arr,true));
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
if(! $arr['target'])
return;
send rating information to directories
2015-02-03 04:13:07 +00:00
$z = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
dbesc($sender['hash'])
);
if((! $z) || (! rsa_verify($arr['target'] . '.' . $arr['rating'] . '.' . $arr['rating_text'], base64url_decode($arr['signature']),$z[0]['xchan_pubkey']))) {
logger('failed to verify rating');
return;
}
$r = q("select * from xlink where xlink_xchan = '%s' and xlink_link = '%s' and xlink_static = 1 limit 1",
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
dbesc($sender['hash']),
dbesc($arr['target'])
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
);
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
if($r) {
send rating information to directories
2015-02-03 04:13:07 +00:00
if($r[0]['xlink_updated'] >= $arr['edited']) {
logger('rating message duplicate');
return;
}
$x = q("update xlink set xlink_rating = %d, xlink_rating_text = '%s', xlink_sig = '%s', xlink_updated = '%s' where xlink_id = %d",
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
intval($arr['rating']),
send rating information to directories
2015-02-03 04:13:07 +00:00
dbesc($arr['rating_text']),
dbesc($arr['signature']),
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
dbesc(datetime_convert()),
intval($r[0]['xlink_id'])
);
send rating information to directories
2015-02-03 04:13:07 +00:00
logger('rating updated');
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
}
else {
send rating information to directories
2015-02-03 04:13:07 +00:00
$x = q("insert into xlink ( xlink_xchan, xlink_link, xlink_rating, xlink_rating_text, xlink_sig, xlink_updated, xlink_static )
missing param
2015-02-13 21:04:31 +00:00
values( '%s', '%s', %d, '%s', '%s', '%s', 1 ) ",
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
dbesc($sender['hash']),
dbesc($arr['target']),
intval($arr['rating']),
send rating information to directories
2015-02-03 04:13:07 +00:00
dbesc($arr['rating_text']),
dbesc($arr['signature']),
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
dbesc(datetime_convert())
);
send rating information to directories
2015-02-03 04:13:07 +00:00
logger('rating created');
handle an incoming directory rating message
2015-01-27 03:43:39 +00:00
}
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief Processes delivery of profile.
*
* @see import_directory_profile()
* @param array $sender an associative array
* * \e string \b hash a xchan_hash
* @param array $arr
* @param array $deliveries (unused)
*/
function process_profile_delivery($sender, $arr, $deliveries) {
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('process_profile_delivery', LOGGER_DEBUG);
populate the new fields in the directory updates table
2013-09-25 03:13:53 +00:00
$r = q("select xchan_addr from xchan where xchan_hash = '%s' limit 1",
dbesc($sender['hash'])
);
if($r)
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
import_directory_profile($sender['hash'], $arr, $r[0]['xchan_addr'], UPDATE_FLAGS_UPDATED, 0);
more progress on directory import
2012-12-27 02:18:56 +00:00
}
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
function process_location_delivery($sender,$arr,$deliveries) {
// deliveries is irrelevant
logger('process_location_delivery', LOGGER_DEBUG);
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
$r = q("select xchan_pubkey from xchan where xchan_hash = '%s' limit 1",
dbesc($sender['hash'])
);
if($r)
$sender['key'] = $r[0]['xchan_pubkey'];
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
new function hubloc_change_primary()
2014-10-13 22:27:03 +00:00
if(array_key_exists('locations',$arr) && $arr['locations']) {
$x = sync_locations($sender,$arr,true);
logger('process_location_delivery: results: ' . print_r($x,true), LOGGER_DEBUG);
if($x['changed']) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$guid = random_string() . '@' . get_app()->get_hostname();
new function hubloc_change_primary()
2014-10-13 22:27:03 +00:00
update_modtime($sender['hash'],$sender['guid'],$arr['locations'][0]['address'],UPDATE_FLAGS_UPDATED);
}
}
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief Synchronises locations.
*
* @param array $sender
* @param array $arr
* @param boolean $absolute (optional) default false
* @return array
*/
function sync_locations($sender, $arr, $absolute = false) {
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
$ret = array();
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
if($arr['locations']) {
$xisting = q("select hubloc_id, hubloc_url, hubloc_sitekey from hubloc where hubloc_hash = '%s'",
dbesc($sender['hash'])
);
// See if a primary is specified
$has_primary = false;
foreach($arr['locations'] as $location) {
if($location['primary']) {
$has_primary = true;
break;
}
}
cleanup of sync_locations and better logging. There was one significant code change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary.
2014-10-12 22:18:49 +00:00
// Ensure that they have one primary hub
if(! $has_primary)
$arr['locations'][0]['primary'] = true;
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
foreach($arr['locations'] as $location) {
if(! rsa_verify($location['url'],base64url_decode($location['url_sig']),$sender['key'])) {
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
logger('sync_locations: Unable to verify site signature for ' . $location['url']);
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$ret['message'] .= sprintf( t('Unable to verify site signature for %s'), $location['url']) . EOL;
continue;
}
for($x = 0; $x < count($xisting); $x ++) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(($xisting[$x]['hubloc_url'] === $location['url'])
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
&& ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) {
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$xisting[$x]['updated'] = true;
}
}
if(! $location['sitekey']) {
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
logger('sync_locations: empty hubloc sitekey. ' . print_r($location,true));
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
continue;
}
// Catch some malformed entries from the past which still exist
if(strpos($location['address'],'/') !== false)
$location['address'] = substr($location['address'],0,strpos($location['address'],'/'));
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// match as many fields as possible in case anything at all changed.
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
dbesc($sender['hash']),
dbesc($sender['guid']),
dbesc($sender['guid_sig']),
dbesc($location['url']),
dbesc($location['url_sig']),
dbesc($location['host']),
dbesc($location['address']),
dbesc($location['callback']),
dbesc($location['sitekey'])
);
if($r) {
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
logger('sync_locations: hub exists: ' . $location['url'], LOGGER_DEBUG);
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
// update connection timestamp if this is the site we're talking to
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
// This only happens when called from import_xchan
don't let a zot-finger bring a dead hub back to life unless it's the site we're currently talking to.
2015-03-03 23:22:24 +00:00
$current_site = false;
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
if(array_key_exists('site',$arr) && $location['url'] == $arr['site']['url']) {
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("update hubloc set hubloc_connected = '%s', hubloc_updated = '%s' where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc(datetime_convert()),
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
don't let a zot-finger bring a dead hub back to life unless it's the site we're currently talking to.
2015-03-03 23:22:24 +00:00
$current_site = true;
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
}
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
if($current_site && intval($r[0]['hubloc_error'])) {
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 23:35:42 +00:00
q("update hubloc set hubloc_error = 0 where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
intval($r[0]['hubloc_id'])
);
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
if(intval($r[0]['hubloc_orphancheck'])) {
q("update hubloc set hubloc_orphancheck = 0 where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
intval($r[0]['hubloc_id'])
);
}
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
q("update xchan set xchan_orphan = 0 where xchan_orphan = 1 and xchan_hash = '%s'",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc($sender['hash'])
);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
// Remove pure duplicates
if(count($r) > 1) {
for($h = 1; $h < count($r); $h ++) {
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("delete from hubloc where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
intval($r[$h]['hubloc_id'])
);
cleanup of sync_locations and better logging. There was one significant code change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary.
2014-10-12 22:18:49 +00:00
$what .= 'duplicate_hubloc_removed ';
$changed = true;
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
}
}
Merge branch 'master' into tres Conflicts: include/zot.php
2015-01-31 08:50:20 +00:00
if(intval($r[0]['hubloc_primary']) && (! $location['primary'])) {
$m = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync
2015-08-23 20:27:34 +00:00
$r[0]['hubloc_primary'] = intval($location['primary']);
sync_locations() toggle DB flag functions were broken - result of postgres changes. Split these into seperate set and reset blocks.
2015-01-30 23:01:10 +00:00
hubloc_change_primary($r[0]);
$what .= 'primary_hub ';
$changed = true;
}
Merge branch 'master' into tres Conflicts: include/zot.php
2015-01-31 08:50:20 +00:00
elseif((! intval($r[0]['hubloc_primary'])) && ($location['primary'])) {
$m = q("update hubloc set hubloc_primary = 1, hubloc_updated = '%s' where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
don't use cached data
2014-10-14 04:01:51 +00:00
// make sure hubloc_change_primary() has current data
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
$r[0]['hubloc_primary'] = intval($location['primary']);
new function hubloc_change_primary()
2014-10-13 22:27:03 +00:00
hubloc_change_primary($r[0]);
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
$what .= 'primary_hub ';
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$changed = true;
}
figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust.
2014-10-14 04:38:36 +00:00
elseif($absolute) {
// Absolute sync - make sure the current primary is correctly reflected in the xchan
if a hubloc primary change results in an xchan primary change, create a directory update packet.
2014-10-14 04:44:46 +00:00
$pr = hubloc_change_primary($r[0]);
if($pr) {
provide remote delivery report at logger_debug level
2015-09-11 00:53:06 +00:00
$what .= 'xchan_primary ';
if a hubloc primary change results in an xchan primary change, create a directory update packet.
2014-10-14 04:44:46 +00:00
$changed = true;
}
figuring out how to bootstrap the change_primary procedure when all you have is inconsistent data which you think you trust.
2014-10-14 04:38:36 +00:00
}
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 23:35:42 +00:00
if((intval($r[0]['hubloc_deleted']) && (! $location['deleted']))
|| ((! (intval($r[0]['hubloc_deleted']))) && ($location['deleted']))) {
Merge branch 'master' into tres Conflicts: include/zot.php
2015-01-31 08:50:20 +00:00
$n = q("update hubloc set hubloc_deleted = 0, hubloc_updated = '%s' where hubloc_id = %d",
sync_locations() toggle DB flag functions were broken - result of postgres changes. Split these into seperate set and reset blocks.
2015-01-30 23:01:10 +00:00
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
$what .= 'delete_hub ';
$changed = true;
}
Merge branch 'master' into tres Conflicts: include/zot.php
2015-01-31 08:50:20 +00:00
elseif((! intval($r[0]['hubloc_deleted'])) && ($location['deleted'])) {
$n = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc(datetime_convert()),
intval($r[0]['hubloc_id'])
);
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
$what .= 'delete_hub ';
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$changed = true;
}
continue;
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// Existing hubs are dealt with. Now let's process any new ones.
cleanup of sync_locations and better logging. There was one significant code change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary.
2014-10-12 22:18:49 +00:00
// New hub claiming to be primary. Make it so by removing any existing primaries.
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
if(intval($location['primary'])) {
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
$r = q("update hubloc set hubloc_primary = 0, hubloc_updated = '%s' where hubloc_hash = '%s' and hubloc_primary = 1",
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc(datetime_convert()),
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
dbesc($sender['hash'])
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
);
}
pull the plug on the old location sync section of import_xchan - this has now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different. Please revert this if the matrix breaks in the next few hours.
2014-09-15 01:09:16 +00:00
logger('sync_locations: new hub: ' . $location['url']);
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_primary, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected)
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')",
dbesc($sender['guid']),
dbesc($sender['guid_sig']),
dbesc($sender['hash']),
dbesc($location['address']),
dbesc('zot'),
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
intval($location['primary']),
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
dbesc($location['url']),
dbesc($location['url_sig']),
dbesc($location['host']),
dbesc($location['callback']),
dbesc($location['sitekey']),
dbesc(datetime_convert()),
dbesc(datetime_convert())
);
$what .= 'newhub ';
$changed = true;
new function hubloc_change_primary()
2014-10-13 22:27:03 +00:00
if($location['primary']) {
$r = q("select * from hubloc where hubloc_addr = '%s' and hubloc_sitekey = '%s' limit 1",
dbesc($location['address']),
dbesc($location['sitekey'])
);
if($r)
hubloc_change_primary($r[0]);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
}
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
}
// get rid of any hubs we have for this channel which weren't reported.
if($absolute && $xisting) {
foreach($xisting as $x) {
if(! array_key_exists('updated',$x)) {
just mark dead hubloc deleted - don't remove them. This could cause problems. Also clean up fetch_url/post_url header option
2014-09-17 02:07:19 +00:00
logger('sync_locations: deleting unreferenced hub location ' . $x['hubloc_url']);
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 23:35:42 +00:00
$r = q("update hubloc set hubloc_deleted = 1, hubloc_updated = '%s' where hubloc_id = %d",
just mark dead hubloc deleted - don't remove them. This could cause problems. Also clean up fetch_url/post_url header option
2014-09-17 02:07:19 +00:00
dbesc(datetime_convert()),
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
intval($x['hubloc_id'])
);
cleanup of sync_locations and better logging. There was one significant code change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary.
2014-10-12 22:18:49 +00:00
$what .= 'removed_hub ';
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$changed = true;
}
}
}
}
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 23:55:51 +00:00
else {
logger('No locations to sync!');
}
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 23:00:09 +00:00
$ret['change_message'] = $what;
$ret['changed'] = $changed;
return $ret;
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/**
* @brief Returns an array with all known distinct hubs for this channel.
*
* @see zot_get_hublocs()
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @param array $channel an associative array which must contain
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* * \e string \b channel_hash the hash of the channel
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* @return array an array with associative arrays
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
*/
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
function zot_encode_locations($channel) {
$ret = array();
$x = zot_get_hublocs($channel['channel_hash']);
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
if($x && count($x)) {
foreach($x as $hub) {
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
$ret[] = array(
'host' => $hub['hubloc_host'],
'address' => $hub['hubloc_addr'],
'primary' => (intval($hub['hubloc_primary']) ? true : false),
'url' => $hub['hubloc_url'],
'url_sig' => $hub['hubloc_url_sig'],
'callback' => $hub['hubloc_callback'],
'sitekey' => $hub['hubloc_sitekey'],
'deleted' => (intval($hub['hubloc_deleted']) ? true : false)
);
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 08:48:54 +00:00
return $ret;
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/**
* @brief Imports a directory profile.
change the way profiles are imported
2013-05-01 01:16:51 +00:00
*
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @param string $hash
* @param array $profile
* @param string $addr
* @param number $ud_flags
* @param number $suppress_update default 0
* @return boolean $updated if something changed
change the way profiles are imported
2013-05-01 01:16:51 +00:00
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
function import_directory_profile($hash, $profile, $addr, $ud_flags = UPDATE_FLAGS_UPDATED, $suppress_update = 0) {
more progress on directory import
2012-12-27 02:18:56 +00:00
turn down the log noise a bit
2013-01-25 03:45:08 +00:00
logger('import_directory_profile', LOGGER_DEBUG);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $hash)
change the way profiles are imported
2013-05-01 01:16:51 +00:00
return false;
more progress on directory import
2012-12-27 02:18:56 +00:00
$arr = array();
$arr['xprof_hash'] = $hash;
$arr['xprof_dob'] = datetime_convert('','',$profile['birthday'],'Y-m-d'); // !!!! check this for 0000 year
found what I believe is the root cause of issue #230, but don't yet have a workable solution. This one is hard.
2014-03-21 05:08:16 +00:00
$arr['xprof_age'] = (($profile['age']) ? intval($profile['age']) : 0);
$arr['xprof_desc'] = (($profile['description']) ? htmlspecialchars($profile['description'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_gender'] = (($profile['gender']) ? htmlspecialchars($profile['gender'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_marital'] = (($profile['marital']) ? htmlspecialchars($profile['marital'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_sexual'] = (($profile['sexual']) ? htmlspecialchars($profile['sexual'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_locale'] = (($profile['locale']) ? htmlspecialchars($profile['locale'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_region'] = (($profile['region']) ? htmlspecialchars($profile['region'], ENT_COMPAT,'UTF-8',false) : '');
issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments.
2013-12-12 07:13:36 +00:00
$arr['xprof_postcode'] = (($profile['postcode']) ? htmlspecialchars($profile['postcode'], ENT_COMPAT,'UTF-8',false) : '');
found what I believe is the root cause of issue #230, but don't yet have a workable solution. This one is hard.
2014-03-21 05:08:16 +00:00
$arr['xprof_country'] = (($profile['country']) ? htmlspecialchars($profile['country'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_about'] = (($profile['about']) ? htmlspecialchars($profile['about'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_homepage'] = (($profile['homepage']) ? htmlspecialchars($profile['homepage'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_hometown'] = (($profile['hometown']) ? htmlspecialchars($profile['hometown'], ENT_COMPAT,'UTF-8',false) : '');
extend the directory profiles a bit more
2013-12-25 09:57:04 +00:00
get rid of xtag
2012-12-27 22:36:06 +00:00
$clean = array();
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (array_key_exists('keywords', $profile) and is_array($profile['keywords'])) {
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
import_directory_keywords($hash,$profile['keywords']);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
foreach ($profile['keywords'] as $kw) {
$kw = trim(htmlspecialchars($kw,ENT_COMPAT, 'UTF-8', false));
$kw = trim($kw, ',');
some fixes to directory keyword searches
2013-09-15 00:20:24 +00:00
$clean[] = $kw;
get rid of xtag
2012-12-27 22:36:06 +00:00
}
more progress on directory import
2012-12-27 02:18:56 +00:00
}
get rid of xtag
2012-12-27 22:36:06 +00:00
$arr['xprof_keywords'] = implode(' ',$clean);
provide a "safe search" backend and allow for self-censorship using nsfw or adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig.
2013-09-20 02:50:13 +00:00
// Self censored, make it so
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
// These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult".
provide a "safe search" backend and allow for self-censorship using nsfw or adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig.
2013-09-20 02:50:13 +00:00
structure for channel unions
2013-09-26 23:25:28 +00:00
provide a "safe search" backend and allow for self-censorship using nsfw or adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig.
2013-09-20 02:50:13 +00:00
if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) {
working through the xchan table to remove bitfields, mostly complete except for updating the updater
2015-01-21 03:33:19 +00:00
q("update xchan set xchan_selfcensored = 1 where xchan_hash = '%s'",
missing hash
2013-09-20 04:13:45 +00:00
dbesc($hash)
provide a "safe search" backend and allow for self-censorship using nsfw or adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig.
2013-09-20 02:50:13 +00:00
);
}
more progress on directory import
2012-12-27 02:18:56 +00:00
$r = q("select * from xprof where xprof_hash = '%s' limit 1",
dbesc($hash)
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if ($arr['xprof_age'] > 150)
catch negative ages nix extra var
2015-02-21 03:48:51 +00:00
$arr['xprof_age'] = 150;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($arr['xprof_age'] < 0)
catch negative ages nix extra var
2015-02-21 03:48:51 +00:00
$arr['xprof_age'] = 0;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($r) {
change the way profiles are imported
2013-05-01 01:16:51 +00:00
$update = false;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
foreach ($r[0] as $k => $v) {
if ((array_key_exists($k,$arr)) && ($arr[$k] != $v)) {
sql error in profile_activity
2014-08-31 23:24:05 +00:00
logger('import_directory_profile: update ' . $k . ' => ' . $arr[$k]);
change the way profiles are imported
2013-05-01 01:16:51 +00:00
$update = true;
break;
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($update) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
q("update xprof set
xprof_desc = '%s',
xprof_dob = '%s',
missing comma
2013-07-03 05:29:24 +00:00
xprof_age = %d,
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
xprof_gender = '%s',
xprof_marital = '%s',
xprof_sexual = '%s',
xprof_locale = '%s',
xprof_region = '%s',
xprof_postcode = '%s',
change the way profiles are imported
2013-05-01 01:16:51 +00:00
xprof_country = '%s',
extend the directory profiles a bit more
2013-12-25 09:57:04 +00:00
xprof_about = '%s',
xprof_homepage = '%s',
xprof_hometown = '%s',
change the way profiles are imported
2013-05-01 01:16:51 +00:00
xprof_keywords = '%s'
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
where xprof_hash = '%s'",
change the way profiles are imported
2013-05-01 01:16:51 +00:00
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),
age was not syncing to the directory
2013-07-03 05:22:13 +00:00
intval($arr['xprof_age']),
change the way profiles are imported
2013-05-01 01:16:51 +00:00
dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']),
dbesc($arr['xprof_locale']),
dbesc($arr['xprof_region']),
dbesc($arr['xprof_postcode']),
dbesc($arr['xprof_country']),
extend the directory profiles a bit more
2013-12-25 09:57:04 +00:00
dbesc($arr['xprof_about']),
dbesc($arr['xprof_homepage']),
dbesc($arr['xprof_hometown']),
change the way profiles are imported
2013-05-01 01:16:51 +00:00
dbesc($arr['xprof_keywords']),
dbesc($arr['xprof_hash'])
);
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
} else {
change the way profiles are imported
2013-05-01 01:16:51 +00:00
$update = true;
sql error in profile_activity
2014-08-31 23:24:05 +00:00
logger('import_directory_profile: new profile ');
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_about, xprof_homepage, xprof_hometown, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
more progress on directory import
2012-12-27 02:18:56 +00:00
dbesc($arr['xprof_hash']),
dbesc($arr['xprof_desc']),
dbesc($arr['xprof_dob']),
age was not syncing to the directory
2013-07-03 05:22:13 +00:00
intval($arr['xprof_age']),
more progress on directory import
2012-12-27 02:18:56 +00:00
dbesc($arr['xprof_gender']),
dbesc($arr['xprof_marital']),
dbesc($arr['xprof_sexual']),
dbesc($arr['xprof_locale']),
dbesc($arr['xprof_region']),
dbesc($arr['xprof_postcode']),
get rid of xtag
2012-12-27 22:36:06 +00:00
dbesc($arr['xprof_country']),
extend the directory profiles a bit more
2013-12-25 09:57:04 +00:00
dbesc($arr['xprof_about']),
dbesc($arr['xprof_homepage']),
dbesc($arr['xprof_hometown']),
get rid of xtag
2012-12-27 22:36:06 +00:00
dbesc($arr['xprof_keywords'])
more progress on directory import
2012-12-27 02:18:56 +00:00
);
}
master/standalone directory profile update
2012-12-27 03:39:37 +00:00
start saving site info
2013-07-24 05:33:56 +00:00
$d = array('xprof' => $arr, 'profile' => $profile, 'update' => $update);
call_hooks('import_directory_profile', $d);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (($d['update']) && (! $suppress_update))
populate the new fields in the directory updates table
2013-09-25 03:13:53 +00:00
update_modtime($arr['xprof_hash'],random_string() . '@' . get_app()->get_hostname(), $addr, $ud_flags);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
start saving site info
2013-07-24 05:33:56 +00:00
return $d['update'];
more progress on directory import
2012-12-27 02:18:56 +00:00
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* @param string $hash
* @param array $keywords
*/
function import_directory_keywords($hash, $keywords) {
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
$existing = array();
allow additional uses for xtags
2015-10-02 00:28:03 +00:00
$r = q("select * from xtag where xtag_hash = '%s' and xtag_flags = 0",
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
dbesc($hash)
);
if($r) {
foreach($r as $rr)
$existing[] = $rr['xtag_term'];
}
$clean = array();
foreach($keywords as $kw) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$kw = trim(htmlspecialchars($kw,ENT_COMPAT, 'UTF-8', false));
$kw = trim($kw, ',');
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
$clean[] = $kw;
}
foreach($existing as $x) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(! in_array($x, $clean))
allow additional uses for xtags
2015-10-02 00:28:03 +00:00
$r = q("delete from xtag where xtag_hash = '%s' and xtag_term = '%s' and xtag_flags = 0",
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
dbesc($hash),
dbesc($x)
);
}
foreach($clean as $x) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(! in_array($x, $existing)) {
allow additional uses for xtags
2015-10-02 00:28:03 +00:00
$r = q("insert into xtag ( xtag_hash, xtag_term, xtag_flags) values ( '%s' ,'%s', 0 )",
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
dbesc($hash),
dbesc($x)
);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
This was bloody hard to sort out.... but now it's sorted and we can move forward again. Put back xtag for efficient keyword searching, use it in conjunction with xprof['keywords'] to avoid a SQL triple join and group_concat (which simply won't scale on a directory server), figured out how best to work timezone corrected birthdays into the protocol. The directory can even provide an age if one was provided to it. Both of these things need some more work, but we have the mechanisms and a plan how to do it right instead of "how the !@#$ are we going to do pull this off?"
2012-12-28 07:33:37 +00:00
}
update modification time whenever a directory related attribute is changed
2013-03-14 00:27:17 +00:00
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* @param string $hash
* @param string $guid
* @param string $addr
* @param int $flags (optional) default 0
*/
function update_modtime($hash, $guid, $addr, $flags = 0) {
update modification time whenever a directory related attribute is changed
2013-03-14 00:27:17 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$dirmode = intval(get_config('system', 'directory_mode'));
don't store update records if we're not a directory server of some kind
2013-11-05 04:43:32 +00:00
if($dirmode == DIRECTORY_MODE_NORMAL)
return;
directory sync - this will either work, or it won't work, or it will possibly recurse and blow up the matrix. Hard to say. Do you feel lucky? Well do ya' ... punk? Rule #1 - don't mess with anything unless it's blowing up the matrix. If it doesn't blow up the matrix, but doesn't work, just let it go and let's figure out what it is doing and what it isn't doing. The flow is as follows: Once a day go out to all the directory servers besides yourself and grab a list of updates. This happens in the poller. If we've never seen them before add them to the updates table. The poller also looks to see if we're a directory server and have updates that haven't yet been processed. It calls onedirsync.php to process each one. If we contact the channel to update and don't find anything (we're just doing a basic zot_finger), set a ud_last timestamp. If this is set we will only try once a day for seven days. Then we stop trying to update. This will probably cause a spike the first time through because you haven't seen any updates before, but we spread out the load over your delivery interval.
2013-10-01 01:33:27 +00:00
if($flags) {
q("insert into updates (ud_hash, ud_guid, ud_date, ud_flags, ud_addr ) values ( '%s', '%s', '%s', %d, '%s' )",
dbesc($hash),
dbesc($guid),
dbesc(datetime_convert()),
intval($flags),
dbesc($addr)
);
}
else {
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d)>0 ",
directory sync - this will either work, or it won't work, or it will possibly recurse and blow up the matrix. Hard to say. Do you feel lucky? Well do ya' ... punk? Rule #1 - don't mess with anything unless it's blowing up the matrix. If it doesn't blow up the matrix, but doesn't work, just let it go and let's figure out what it is doing and what it isn't doing. The flow is as follows: Once a day go out to all the directory servers besides yourself and grab a list of updates. This happens in the poller. If we've never seen them before add them to the updates table. The poller also looks to see if we're a directory server and have updates that haven't yet been processed. It calls onedirsync.php to process each one. If we contact the channel to update and don't find anything (we're just doing a basic zot_finger), set a ud_last timestamp. If this is set we will only try once a day for seven days. Then we stop trying to update. This will probably cause a spike the first time through because you haven't seen any updates before, but we spread out the load over your delivery interval.
2013-10-01 01:33:27 +00:00
intval(UPDATE_FLAGS_UPDATED),
sql wrong number of args
2013-10-15 04:09:39 +00:00
dbesc($addr),
directory sync - this will either work, or it won't work, or it will possibly recurse and blow up the matrix. Hard to say. Do you feel lucky? Well do ya' ... punk? Rule #1 - don't mess with anything unless it's blowing up the matrix. If it doesn't blow up the matrix, but doesn't work, just let it go and let's figure out what it is doing and what it isn't doing. The flow is as follows: Once a day go out to all the directory servers besides yourself and grab a list of updates. This happens in the poller. If we've never seen them before add them to the updates table. The poller also looks to see if we're a directory server and have updates that haven't yet been processed. It calls onedirsync.php to process each one. If we contact the channel to update and don't find anything (we're just doing a basic zot_finger), set a ud_last timestamp. If this is set we will only try once a day for seven days. Then we stop trying to update. This will probably cause a spike the first time through because you haven't seen any updates before, but we spread out the load over your delivery interval.
2013-10-01 01:33:27 +00:00
intval(UPDATE_FLAGS_UPDATED)
);
}
update modification time whenever a directory related attribute is changed
2013-03-14 00:27:17 +00:00
}
start saving site info
2013-07-24 05:33:56 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* @param array $arr
* @param string $pubkey
* @return boolean true if updated or inserted
*/
function import_site($arr, $pubkey) {
start saving site info
2013-07-24 05:33:56 +00:00
if( (! is_array($arr)) || (! $arr['url']) || (! $arr['url_sig']))
return false;
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(! rsa_verify($arr['url'], base64url_decode($arr['url_sig']), $pubkey)) {
start saving site info
2013-07-24 05:33:56 +00:00
logger('import_site: bad url_sig');
return false;
}
$update = false;
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
$exists = false;
start saving site info
2013-07-24 05:33:56 +00:00
$r = q("select * from site where site_url = '%s' limit 1",
dbesc($arr['url'])
);
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
if($r) {
$exists = true;
$siterecord = $r[0];
}
start saving site info
2013-07-24 05:33:56 +00:00
$site_directory = 0;
if($arr['directory_mode'] == 'normal')
$site_directory = DIRECTORY_MODE_NORMAL;
if($arr['directory_mode'] == 'primary')
$site_directory = DIRECTORY_MODE_PRIMARY;
if($arr['directory_mode'] == 'secondary')
$site_directory = DIRECTORY_MODE_SECONDARY;
if($arr['directory_mode'] == 'standalone')
$site_directory = DIRECTORY_MODE_STANDALONE;
$register_policy = 0;
if($arr['register_policy'] == 'closed')
$register_policy = REGISTER_CLOSED;
if($arr['register_policy'] == 'open')
$register_policy = REGISTER_OPEN;
if($arr['register_policy'] == 'approve')
$register_policy = REGISTER_APPROVE;
public site list (will take a few days to populate, assuming folks have updated their site access policy which old sites do not have)
2013-09-06 05:00:06 +00:00
$access_policy = 0;
if(array_key_exists('access_policy',$arr)) {
if($arr['access_policy'] === 'private')
$access_policy = ACCESS_PRIVATE;
if($arr['access_policy'] === 'paid')
$access_policy = ACCESS_PAID;
if($arr['access_policy'] === 'free')
$access_policy = ACCESS_FREE;
add "tiered" access policy, add tagcloud to directory pages
2013-09-19 00:47:26 +00:00
if($arr['access_policy'] === 'tiered')
$access_policy = ACCESS_TIERED;
public site list (will take a few days to populate, assuming folks have updated their site access policy which old sites do not have)
2013-09-06 05:00:06 +00:00
}
To be listed as a public site, you need to be an https site with a valid cert. If you don't make the cut, you will either not be listed as a public site or you will be de-listed. Period. This is non-negotiable.
2014-02-07 08:50:04 +00:00
// don't let insecure sites register as public hubs
if(strpos($arr['url'],'https://') === false)
$access_policy = ACCESS_PRIVATE;
if($access_policy != ACCESS_PRIVATE) {
$x = z_fetch_url($arr['url'] . '/siteinfo/json');
if(! $x['success'])
$access_policy = ACCESS_PRIVATE;
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments.
2013-12-12 07:13:36 +00:00
$directory_url = htmlspecialchars($arr['directory_url'],ENT_COMPAT,'UTF-8',false);
force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy.
2015-02-16 07:45:22 +00:00
$url = htmlspecialchars(strtolower($arr['url']),ENT_COMPAT,'UTF-8',false);
issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments.
2013-12-12 07:13:36 +00:00
$sellpage = htmlspecialchars($arr['sellpage'],ENT_COMPAT,'UTF-8',false);
$site_location = htmlspecialchars($arr['location'],ENT_COMPAT,'UTF-8',false);
provide backend storage and declaration of directory realm
2014-08-16 23:10:35 +00:00
$site_realm = htmlspecialchars($arr['realm'],ENT_COMPAT,'UTF-8',false);
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
// You can have one and only one primary directory per realm.
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 22:56:30 +00:00
// Downgrade any others claiming to be primary. As they have
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
// flubbed up this badly already, don't let them be directory servers at all.
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 22:56:30 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(($site_directory === DIRECTORY_MODE_PRIMARY)
&& ($site_realm === get_directory_realm())
&& ($arr['url'] != get_directory_primary())) {
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 22:56:30 +00:00
$site_directory = DIRECTORY_MODE_NORMAL;
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
}
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 22:56:30 +00:00
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
if($exists) {
if(($siterecord['site_flags'] != $site_directory)
|| ($siterecord['site_access'] != $access_policy)
|| ($siterecord['site_directory'] != $directory_url)
site sellpage links
2013-09-18 05:27:51 +00:00
|| ($siterecord['site_sellpage'] != $sellpage)
allow zot public providers to list their location, as a non US-based server could be a strong selling point.
2013-10-30 08:58:45 +00:00
|| ($siterecord['site_location'] != $site_location)
provide backend storage and declaration of directory realm
2014-08-16 23:10:35 +00:00
|| ($siterecord['site_register'] != $register_policy)
|| ($siterecord['site_realm'] != $site_realm)) {
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
$update = true;
found it
2013-09-16 06:02:18 +00:00
// logger('import_site: input: ' . print_r($arr,true));
// logger('import_site: stored: ' . print_r($siterecord,true));
more logging
2013-09-16 05:19:24 +00:00
create site records for all queued sites and check for death
2015-09-29 00:13:11 +00:00
$r = q("update site set site_dead = 0, site_location = '%s', site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s', site_realm = '%s', site_type = %d
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
where site_url = '%s'",
allow zot public providers to list their location, as a non US-based server could be a strong selling point.
2013-10-30 08:58:45 +00:00
dbesc($site_location),
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
intval($site_directory),
intval($access_policy),
dbesc($directory_url),
intval($register_policy),
dbesc(datetime_convert()),
site sellpage links
2013-09-18 05:27:51 +00:00
dbesc($sellpage),
provide backend storage and declaration of directory realm
2014-08-16 23:10:35 +00:00
dbesc($site_realm),
create site records for all queued sites and check for death
2015-09-29 00:13:11 +00:00
intval(SITE_TYPE_ZOT),
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
dbesc($url)
);
if(! $r) {
logger('import_site: update failed. ' . print_r($arr,true));
}
start saving site info
2013-07-24 05:33:56 +00:00
}
I'm going to use the site_update timestamp to indicate whenever we successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated.
2015-03-03 23:54:38 +00:00
else {
// update the timestamp to indicate we communicated with this site
ensure that living sites are marked as alive
2015-09-11 12:06:37 +00:00
q("update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
I'm going to use the site_update timestamp to indicate whenever we successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated.
2015-03-03 23:54:38 +00:00
dbesc(datetime_convert()),
dbesc($url)
);
}
start saving site info
2013-07-24 05:33:56 +00:00
}
else {
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
$update = true;
create site records for all queued sites and check for death
2015-09-29 00:13:11 +00:00
$r = q("insert into site ( site_location, site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage, site_realm, site_type )
another error from the db logs
2015-09-30 05:56:29 +00:00
values ( '%s', '%s', %d, %d, '%s', '%s', %d, '%s', '%s', %d )",
allow zot public providers to list their location, as a non US-based server could be a strong selling point.
2013-10-30 08:58:45 +00:00
dbesc($site_location),
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
dbesc($url),
public site list (will take a few days to populate, assuming folks have updated their site access policy which old sites do not have)
2013-09-06 05:00:06 +00:00
intval($access_policy),
access policy and directory mode were crossed on site table creation
2013-10-30 08:30:37 +00:00
intval($site_directory),
start saving site info
2013-07-24 05:33:56 +00:00
dbesc(datetime_convert()),
don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.
2013-09-16 02:04:11 +00:00
dbesc($directory_url),
site sellpage links
2013-09-18 05:27:51 +00:00
intval($register_policy),
some more work on realms
2014-08-18 02:06:56 +00:00
dbesc($sellpage),
create site records for all queued sites and check for death
2015-09-29 00:13:11 +00:00
dbesc($site_realm),
intval(SITE_TYPE_ZOT)
start saving site info
2013-07-24 05:33:56 +00:00
);
if(! $r) {
logger('import_site: record create failed. ' . print_r($arr,true));
}
}
found it
2013-09-16 06:02:18 +00:00
return $update;
start saving site info
2013-07-24 05:33:56 +00:00
}
more work on clone sync
2013-07-25 23:00:04 +00:00
/**
* Send a zot packet to all hubs where this channel is duplicated, refreshing
* such things as personal settings, channel permissions, address book updates, etc.
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
*
* @param int $uid
* @param array $packet (optional) default null
* @param boolean $groups_changed (optional) default false
more work on clone sync
2013-07-25 23:00:04 +00:00
*/
the sending side of clone syncing of collection/privacy_group information. The receiving side is not yet implemented.
2014-07-14 09:37:41 +00:00
function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
more work on clone sync
2013-07-25 23:00:04 +00:00
$a = get_app();
logger('build_sync_packet');
build_sync_packet was looking at stale channel info - load it fresh from the DB.
2013-07-26 03:10:53 +00:00
connection clone issues
2015-01-10 22:59:10 +00:00
if($packet)
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
logger('packet: ' . print_r($packet, true),LOGGER_DATA);
connection clone issues
2015-01-10 22:59:10 +00:00
more work on clone sync
2013-07-25 23:00:04 +00:00
if(! $uid)
local_user => local_channel
2015-01-29 04:56:04 +00:00
$uid = local_channel();
more work on clone sync
2013-07-25 23:00:04 +00:00
if(! $uid)
return;
Implements a new permission level PERMS_PENDING With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel.
2014-06-17 07:26:18 +00:00
$r = q("select * from channel where channel_id = %d limit 1",
build_sync_packet was looking at stale channel info - load it fresh from the DB.
2013-07-26 03:10:53 +00:00
intval($uid)
);
if(! $r)
return;
Implements a new permission level PERMS_PENDING With this a user can allow some action to any user which connects to them, even before they've connected back. Ref. https://mobiliza.org.br/display/478d9e71eaf55748dc646d3990651d6d34cfb7db5c38360538ec730ca3ccf908@zothub.com Also some code cleanup and an alternative logic for handling notifications of permission changes in zot.php. This assumes that private posts are still restricted to people in your addressbook. Regardless of your global permissions, a pending channel won't get private posts, even if the post only has a deny clause not matching the pending channel.
2014-06-17 07:26:18 +00:00
build_sync_packet was looking at stale channel info - load it fresh from the DB.
2013-07-26 03:10:53 +00:00
$channel = $r[0];
more work on clone sync
2013-07-25 23:00:04 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php util/messages.po
2015-09-28 00:00:41 +00:00
if(intval($channel['channel_removed']))
add some safety checks on the sending side of sync
2015-09-27 23:47:25 +00:00
return;
merge issue
2015-09-23 02:16:13 +00:00
$h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0",
dbesc($channel['channel_hash'])
more work on clone sync
2013-07-25 23:00:04 +00:00
);
if(! $h)
return;
$synchubs = array();
foreach($h as $x) {
if($x['hubloc_host'] == $a->get_hostname())
continue;
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
more work on clone sync
2013-07-25 23:00:04 +00:00
$synchubs[] = $x;
}
if(! $synchubs)
return;
$r = q("select xchan_guid, xchan_guid_sig from xchan where xchan_hash = '%s' limit 1",
dbesc($channel['channel_hash'])
);
if(! $r)
return;
$env_recips = array();
$env_recips[] = array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig']);
$info = (($packet) ? $packet : array());
$info['type'] = 'channel_sync';
add an encoding type to formatted zot communication structures so that we can later add alternate encodings.
2014-07-24 22:55:01 +00:00
$info['encoding'] = 'red'; // note: not zot, this packet is very red specific
more work on clone sync
2013-07-25 23:00:04 +00:00
if(array_key_exists($uid,$a->config) && array_key_exists('transient',$a->config[$uid])) {
$settings = $a->config[$uid]['transient'];
if($settings) {
$info['config'] = $settings;
}
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
more work on clone sync
2013-07-25 23:00:04 +00:00
if($channel) {
$info['channel'] = array();
foreach($channel as $k => $v) {
// filter out any joined tables like xchan
if(strpos($k,'channel_') !== 0)
continue;
// don't pass these elements, they should not be synchronised
import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
2015-09-26 20:25:34 +00:00
$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey','channel_address','channel_deleted','channel_removed','channel_system');
more work on clone sync
2013-07-25 23:00:04 +00:00
if(in_array($k,$disallowed))
continue;
$info['channel'][$k] = $v;
}
}
the sending side of clone syncing of collection/privacy_group information. The receiving side is not yet implemented.
2014-07-14 09:37:41 +00:00
if($groups_changed) {
limit fields to what we require
2014-07-15 04:52:20 +00:00
$r = q("select hash as collection, visible, deleted, name from groups where uid = %d",
the sending side of clone syncing of collection/privacy_group information. The receiving side is not yet implemented.
2014-07-14 09:37:41 +00:00
intval($uid)
);
if($r)
$info['collections'] = $r;
index collection sync info by hash rather than id
2014-07-15 04:49:48 +00:00
$r = q("select groups.hash as collection, group_member.xchan as member from groups left join group_member on groups.id = group_member.gid where group_member.uid = %d",
the sending side of clone syncing of collection/privacy_group information. The receiving side is not yet implemented.
2014-07-14 09:37:41 +00:00
intval($uid)
);
if($r)
$info['collection_members'] = $r;
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$interval = ((get_config('system','delivery_interval') !== false)
more work on clone sync
2013-07-25 23:00:04 +00:00
? intval(get_config('system','delivery_interval')) : 2 );
log the sync packets locally at LOGGER_DATA level
2013-07-26 02:50:55 +00:00
logger('build_sync_packet: packet: ' . print_r($info,true), LOGGER_DATA);
more work on clone sync
2013-07-25 23:00:04 +00:00
foreach($synchubs as $hub) {
$hash = random_string();
$n = zot_build_packet($channel,'notify',$env_recips,$hub['hubloc_sitekey'],$hash);
this should improve queue performance dramatically.
2014-03-25 02:40:36 +00:00
q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
more work on clone sync
2013-07-25 23:00:04 +00:00
dbesc($hash),
intval($channel['channel_account']),
intval($channel['channel_id']),
this should improve queue performance dramatically.
2014-03-25 02:40:36 +00:00
dbesc('zot'),
more work on clone sync
2013-07-25 23:00:04 +00:00
dbesc($hub['hubloc_callback']),
intval(1),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($n),
dbesc(json_encode($info))
);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
proc_run('php', 'include/deliver.php', $hash);
more work on clone sync
2013-07-25 23:00:04 +00:00
if($interval)
@time_sleep_until(microtime(true) + (float) $interval);
}
}
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief
*
* @param array $sender
* @param array $arr
* @param array $deliveries
* @return array
*/
function process_channel_sync_delivery($sender, $arr, $deliveries) {
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
start to modularise the clone import and sync functions
2015-09-03 03:12:40 +00:00
require_once('include/import.php');
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/** @FIXME this will sync red structures (channel, pconfig and abook). Eventually we need to make this application agnostic. */
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
$result = array();
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
foreach ($deliveries as $d) {
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
$r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash'])
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $r) {
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
$result[] = array($d['hash'],'not found');
continue;
}
$channel = $r[0];
php warnings
2014-11-03 03:22:18 +00:00
$max_friends = service_class_fetch($channel['channel_id'],'total_channels');
$max_feeds = account_service_class_fetch($channel['channel_account_id'],'total_feeds');
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
if($channel['channel_hash'] != $sender['hash']) {
logger('process_channel_sync_delivery: possible forgery. Sender ' . $sender['hash'] . ' is not ' . $channel['channel_hash']);
add the message-id to delivery reports. This _could_ allow an enterprising developer to collect the delivery reports for a given post and store them in a DB table so that the sender could track and verify where a message had been sent on a web page and verify the success or failure of those attempts without requiring admin access. (To be fair this would also need an extra flag which hasn't yet been implemented to indicate that a channel created a second delivery chain of the message).
2014-04-11 05:17:35 +00:00
$result[] = array($d['hash'],'channel mismatch',$channel['channel_name'],'');
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
continue;
}
if(array_key_exists('config',$arr) && is_array($arr['config']) && count($arr['config'])) {
foreach($arr['config'] as $cat => $k) {
foreach($arr['config'][$cat] as $k => $v)
set_pconfig($channel['channel_id'],$cat,$k,$v);
}
}
start to modularise the clone import and sync functions
2015-09-03 03:12:40 +00:00
if(array_key_exists('obj',$arr) && $arr['obj'])
sync_objs($channel,$arr['obj']);
sync likes
2015-09-11 02:18:12 +00:00
if(array_key_exists('likes',$arr) && $arr['likes'])
import_likes($channel,$arr['likes']);
app sync
2015-09-03 06:09:51 +00:00
if(array_key_exists('app',$arr) && $arr['app'])
sync_apps($channel,$arr['app']);
start to modularise the clone import and sync functions
2015-09-03 03:12:40 +00:00
import and sync chatrooms
2015-09-04 01:44:40 +00:00
if(array_key_exists('chatroom',$arr) && $arr['chatroom'])
work on event sync
2015-09-08 04:01:49 +00:00
sync_chatrooms($channel,$arr['chatroom']);
more work on import & sync of private mail and conversations
2015-10-15 00:40:50 +00:00
if(array_key_exists('conv',$arr) && $arr['conv'])
import_conv($channel,$arr['conv']);
if(array_key_exists('mail',$arr) && $arr['mail'])
import_mail($channel,$arr['mail']);
work on event sync
2015-09-08 04:01:49 +00:00
if(array_key_exists('event',$arr) && $arr['event'])
sync_events($channel,$arr['event']);
if(array_key_exists('event_item',$arr) && $arr['event_item'])
sync_items($channel,$arr['event_item']);
import and sync chatrooms
2015-09-04 01:44:40 +00:00
consolidate import_items/sync_items
2015-09-08 01:14:30 +00:00
if(array_key_exists('item',$arr) && $arr['item'])
sync_items($channel,$arr['item']);
if(array_key_exists('item_id',$arr) && $arr['item_id'])
sync_items($channel,$arr['item_id']);
menu import and sync
2015-09-09 00:51:48 +00:00
if(array_key_exists('menu',$arr) && $arr['menu'])
sync_menus($channel,$arr['menu']);
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
if(array_key_exists('channel',$arr) && is_array($arr['channel']) && count($arr['channel'])) {
remove system flags from channel import packet
2015-09-21 00:45:23 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-21 01:03:41 +00:00
if(array_key_exists('channel_pageflags',$arr['channel']) && intval($arr['channel']['channel_pageflags'])) {
// These flags cannot be sync'd.
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-21 01:10:25 +00:00
// remove the bits from the incoming flags.
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-21 01:03:41 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-28 01:03:40 +00:00
// These correspond to PAGE_REMOVED and PAGE_SYSTEM on redmatrix
remove system flags from channel import packet
2015-09-21 00:45:23 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-28 01:03:40 +00:00
if($arr['channel']['channel_pageflags'] & 0x8000)
$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x8000;
if($arr['channel']['channel_pageflags'] & 0x1000)
$arr['channel']['channel_pageflags'] = $arr['channel']['channel_pageflags'] - 0x1000;
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-21 01:03:41 +00:00
more clone sync issues across projects
2015-07-16 01:21:04 +00:00
}
clone sync fixes across red/hz
2015-07-16 01:14:19 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/zot.php
2015-09-21 01:03:41 +00:00
$disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey', 'channel_address', 'channel_notifyflags', 'channel_removed', 'channel_deleted', 'channel_system');
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
$clean = array();
foreach($arr['channel'] as $k => $v) {
if(in_array($k,$disallowed))
continue;
$clean[$k] = $v;
}
if(count($clean)) {
foreach($clean as $k => $v) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$r = dbq("UPDATE channel set " . dbesc($k) . " = '" . dbesc($v)
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
. "' where channel_id = " . intval($channel['channel_id']) );
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
}
}
}
if(array_key_exists('abook',$arr) && is_array($arr['abook']) && count($arr['abook'])) {
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
$total_friends = 0;
$total_feeds = 0;
convert the abook fields
2015-06-15 04:08:00 +00:00
$r = q("select abook_id, abook_feed from abook where abook_channel = %d",
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
intval($channel['channel_id'])
);
if($r) {
// don't count yourself
found the sucker
2014-09-22 23:23:59 +00:00
$total_friends = ((count($r) > 0) ? count($r) - 1 : 0);
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
foreach($r as $rr)
convert the abook fields
2015-06-15 04:08:00 +00:00
if(intval($rr['abook_feed']))
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
$total_feeds ++;
}
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
don't including rating stuff from cloned abooks
2015-07-17 00:53:59 +00:00
$disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text');
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
foreach($arr['abook'] as $abook) {
perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown
2014-02-10 03:45:22 +00:00
sync abook entries from redmatrix Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
2015-07-03 04:58:28 +00:00
if(! array_key_exists('abook_blocked',$abook)) {
// convert from redmatrix
abook clone sync - change logic to also unset existing cross-project flags besides just setting them
2015-07-17 01:07:23 +00:00
$abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001) ? 1 : 0);
$abook['abook_ignored'] = (($abook['abook_flags'] & 0x0002) ? 1 : 0);
$abook['abook_hidden'] = (($abook['abook_flags'] & 0x0004) ? 1 : 0);
$abook['abook_archived'] = (($abook['abook_flags'] & 0x0008) ? 1 : 0);
$abook['abook_pending'] = (($abook['abook_flags'] & 0x0010) ? 1 : 0);
$abook['abook_unconnected'] = (($abook['abook_flags'] & 0x0020) ? 1 : 0);
$abook['abook_self'] = (($abook['abook_flags'] & 0x0080) ? 1 : 0);
$abook['abook_feed'] = (($abook['abook_flags'] & 0x0100) ? 1 : 0);
sync abook entries from redmatrix Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php
2015-07-03 04:58:28 +00:00
}
found the sucker
2014-09-22 23:23:59 +00:00
$clean = array();
clone sync of "unfriend" actions
2014-08-06 00:47:17 +00:00
if($abook['abook_xchan'] && $abook['entry_deleted']) {
logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);
require_once('include/Contact.php');
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
convert the abook fields
2015-06-15 04:08:00 +00:00
$r = q("select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
clone sync of "unfriend" actions
2014-08-06 00:47:17 +00:00
dbesc($abook['abook_xchan']),
convert the abook fields
2015-06-15 04:08:00 +00:00
intval($channel['channel_id'])
clone sync of "unfriend" actions
2014-08-06 00:47:17 +00:00
);
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
if($r) {
clone sync of "unfriend" actions
2014-08-06 00:47:17 +00:00
contact_remove($channel['channel_id'],$r[0]['abook_id']);
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
if($total_friends)
$total_friends --;
convert the abook fields
2015-06-15 04:08:00 +00:00
if(intval($r[0]['abook_feed']))
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
$total_feeds --;
}
clone sync of "unfriend" actions
2014-08-06 00:47:17 +00:00
continue;
}
perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown
2014-02-10 03:45:22 +00:00
// Perform discovery if the referenced xchan hasn't ever been seen on this hub.
// This relies on the undocumented behaviour that red sites send xchan info with the abook
cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken.
2015-05-21 03:20:35 +00:00
// and import_author_xchan will look them up on all federated networks
perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown
2014-02-10 03:45:22 +00:00
cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken.
2015-05-21 03:20:35 +00:00
if($abook['abook_xchan'] && $abook['xchan_addr']) {
perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown
2014-02-10 03:45:22 +00:00
$h = zot_get_hublocs($abook['abook_xchan']);
if(! $h) {
cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken.
2015-05-21 03:20:35 +00:00
$xhash = import_author_xchan(encode_item_xchan($abook));
if(! $xhash) {
logger('process_channel_sync_delivery: import of ' . $abook['xchan_addr'] . ' failed.');
perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown
2014-02-10 03:45:22 +00:00
continue;
}
}
}
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
foreach($abook as $k => $v) {
clone sync was trying to update xchan info in the abook loop.
2013-08-27 03:58:07 +00:00
if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0))
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
continue;
$clean[$k] = $v;
}
if(! array_key_exists('abook_xchan',$clean))
continue;
make sure new contacts who are not yet in the address book are sync'd across clone instances
2013-09-09 03:38:15 +00:00
$r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($clean['abook_xchan']),
intval($channel['channel_id'])
);
// make sure we have an abook entry for this xchan on this system
if(! $r) {
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
if($max_friends !== false && $total_friends > $max_friends) {
logger('process_channel_sync_delivery: total_channels service class limit exceeded');
continue;
}
convert the abook fields
2015-06-15 04:08:00 +00:00
if($max_feeds !== false && intval($clean['abook_feed']) && $total_feeds > $max_feeds) {
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
logger('process_channel_sync_delivery: total_feeds service class limit exceeded');
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
continue;
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
}
make sure new contacts who are not yet in the address book are sync'd across clone instances
2013-09-09 03:38:15 +00:00
q("insert into abook ( abook_xchan, abook_channel ) values ('%s', %d ) ",
dbesc($clean['abook_xchan']),
intval($channel['channel_id'])
);
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
$total_friends ++;
convert the abook fields
2015-06-15 04:08:00 +00:00
if(intval($clean['abook_feed']))
honour service class restrictions for total_identities, total_channels ("friends") and total_feeds both when importing channels and subsequently when syncing clones. Limits are based on the local system - additional entries are silently dropped.
2014-09-16 00:17:00 +00:00
$total_feeds ++;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
}
make sure new contacts who are not yet in the address book are sync'd across clone instances
2013-09-09 03:38:15 +00:00
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
if(count($clean)) {
foreach($clean as $k => $v) {
more fake null shenanigans
2015-02-26 16:23:02 +00:00
if($k == 'abook_dob')
$v = dbescdate($v);
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v)
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
}
}
re-arrange the html cache a bit
2015-05-21 03:28:16 +00:00
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
}
}
sync profiles to nomadic clones
2014-06-18 00:34:51 +00:00
collection sync
2014-07-17 04:18:28 +00:00
// sync collections (privacy groups) oh joy...
if(array_key_exists('collections',$arr) && is_array($arr['collections']) && count($arr['collections'])) {
$x = q("select * from groups where uid = %d",
intval($channel['channel_id'])
);
foreach($arr['collections'] as $cl) {
$found = false;
if($x) {
foreach($x as $y) {
if($cl['collection'] == $y['hash']) {
$found = true;
break;
}
}
if($found) {
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(($y['name'] != $cl['name'])
|| ($y['visible'] != $cl['visible'])
collection sync
2014-07-17 04:18:28 +00:00
|| ($y['deleted'] != $cl['deleted'])) {
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("update groups set name = '%s', visible = %d, deleted = %d where hash = '%s' and uid = %d",
collection sync
2014-07-17 04:18:28 +00:00
dbesc($cl['name']),
intval($cl['visible']),
intval($cl['deleted']),
dbesc($cl['hash']),
intval($channel['channel_id'])
);
}
if(intval($cl['deleted']) && (! intval($y['deleted']))) {
q("delete from group_member where gid = %d",
intval($y['id'])
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
);
collection sync
2014-07-17 04:18:28 +00:00
}
}
}
if(! $found) {
$r = q("INSERT INTO `groups` ( hash, uid, visible, deleted, name )
VALUES( '%s', %d, %d, %d, '%s' ) ",
dbesc($cl['collection']),
intval($channel['channel_id']),
intval($cl['visible']),
intval($cl['deleted']),
php warnings
2014-11-03 03:22:18 +00:00
dbesc($cl['name'])
);
collection sync
2014-07-17 04:18:28 +00:00
}
collection sync issue
2014-07-17 22:53:07 +00:00
// now look for any collections locally which weren't in the list we just received.
// They need to be removed by marking deleted and removing the members.
// This shouldn't happen except for clones created before this function was written.
if($x) {
$found_local = false;
foreach($x as $y) {
foreach($arr['collections'] as $cl) {
if($cl['collection'] == $y['hash']) {
$found_local = true;
break;
}
}
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(! $found_local) {
collection sync issue
2014-07-17 22:53:07 +00:00
q("delete from group_member where gid = %d",
intval($y['id'])
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
);
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("update groups set deleted = 1 where id = %d and uid = %d",
collection sync issue
2014-07-17 22:53:07 +00:00
intval($y['id']),
intval($channel['channel_id'])
);
}
}
}
collection sync
2014-07-17 04:18:28 +00:00
}
// reload the group list with any updates
$x = q("select * from groups where uid = %d",
intval($channel['channel_id'])
);
// now sync the members
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
if(array_key_exists('collection_members', $arr)
&& is_array($arr['collection_members'])
&& count($arr['collection_members'])) {
collection sync
2014-07-17 04:18:28 +00:00
// first sort into groups keyed by the group hash
$members = array();
foreach($arr['collection_members'] as $cm) {
if(! array_key_exists($cm['collection'],$members))
$members[$cm['collection']] = array();
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
$members[$cm['collection']][] = $cm['member'];
collection sync
2014-07-17 04:18:28 +00:00
}
// our group list is already synchronised
if($x) {
foreach($x as $y) {
// for each group, loop on members list we just received
foreach($members[$y['hash']] as $member) {
$found = false;
$z = q("select xchan from group_member where gid = %d and uid = %d and xchan = '%s' limit 1",
intval($y['id']),
intval($channel['channel_id']),
dbesc($member)
);
if($z)
$found = true;
// if somebody is in the group that wasn't before - add them
if(! $found) {
q("INSERT INTO `group_member` (`uid`, `gid`, `xchan`)
VALUES( %d, %d, '%s' ) ",
intval($channel['channel_id']),
intval($y['id']),
dbesc($member)
);
}
}
// now retrieve a list of members we have on this site
$m = q("select xchan from group_member where gid = %d and uid = %d",
intval($y['id']),
intval($channel['channel_id'])
);
if($m) {
foreach($m as $mm) {
// if the local existing member isn't in the list we just received - remove them
if(! in_array($mm['xchan'],$members[$y['hash']])) {
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
q("delete from group_member where xchan = '%s' and gid = %d and uid = %d",
collection sync
2014-07-17 04:18:28 +00:00
dbesc($mm['xchan']),
intval($y['id']),
intval($channel['channel_id'])
);
}
}
}
}
}
}
}
sync profiles to nomadic clones
2014-06-18 00:34:51 +00:00
if(array_key_exists('profile',$arr) && is_array($arr['profile']) && count($arr['profile'])) {
$disallowed = array('id','aid','uid');
foreach($arr['profile'] as $profile) {
$x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1",
dbesc($profile['profile_guid']),
intval($channel['channel_id'])
);
if(! $x) {
q("insert into profile ( profile_guid, aid, uid ) values ('%s', %d, %d)",
dbesc($profile['profile_guid']),
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
intval($channel['channel_account_id']),
sync profiles to nomadic clones
2014-06-18 00:34:51 +00:00
intval($channel['channel_id'])
);
$x = q("select * from profile where profile_guid = '%s' and uid = %d limit 1",
dbesc($profile['profile_guid']),
intval($channel['channel_id'])
);
if(! $x)
continue;
}
$clean = array();
foreach($profile as $k => $v) {
if(in_array($k,$disallowed))
continue;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
sync profiles to nomadic clones
2014-06-18 00:34:51 +00:00
$clean[$k] = $v;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/**
* @TODO check if these are allowed, otherwise we'll error
* We also need to import local photos if a custom photo is selected
*/
sync profiles to nomadic clones
2014-06-18 00:34:51 +00:00
}
if(count($clean)) {
foreach($clean as $k => $v) {
clone sync fixes across red/hz
2015-07-16 01:14:19 +00:00
$r = dbq("UPDATE profile set `" . dbesc($k) . "` = '" . dbesc($v)
PostgreSQL support initial commit There were 11 main types of changes: - UPDATE's and DELETE's sometimes had LIMIT 1 at the end of them. This is not only non-compliant but it would certainly not do what whoever wrote it thought it would. It is likely this mistake was just copied from Friendica. All of these instances, the LIMIT 1 was simply removed. - Bitwise operations (and even some non-zero int checks) erroneously rely on MySQL implicit integer-boolean conversion in the WHERE clauses. This is non-compliant (and bad programming practice to boot). Proper explicit boolean conversions were added. New queries should use proper conventions. - MySQL has a different operator for bitwise XOR than postgres. Rather than add yet another dba_ func, I converted them to "& ~" ("AND NOT") when turning off, and "|" ("OR") when turning on. There were no true toggles (XOR). New queries should refrain from using XOR when not necessary. - There are several fields which the schema has marked as NOT NULL, but the inserts don't specify them. The reason this works is because mysql totally ignores the constraint and adds an empty text default automatically. Again, non-compliant, obviously. In these cases a default of empty text was added. - Several statements rely on a non-standard MySQL feature (http://dev.mysql.com/doc/refman/5.5/en/group-by-handling.html). These queries can all be rewritten to be standards compliant. Interestingly enough, the newly rewritten standards compliant queries run a zillion times faster, even on MySQL. - A couple of function/operator name translations were needed (RAND/RANDOM, GROUP_CONCAT/STRING_AGG, UTC_NOW, REGEXP/~, ^/#) -- assist functions added in the dba_ - INTERVALs: postgres requires quotes around the value, mysql requires that there are not quotes around the value -- assist functions added in the dba_ - NULL_DATE's -- Postgres does not allow the invalid date '0000-00-00 00:00:00' (there is no such thing as year 0 or month 0 or day 0). We use '0001-01-01 00:00:00' for postgres. Conversions are handled in Zot/item packets automagically by quoting all dates with dbescdate(). - char(##) specifications in the schema creates fields with blank spaces that aren't trimmed in the code. MySQL apparently treats char(##) as varchar(##), again, non-compliant. Since postgres works better with text fields anyway, this ball of bugs was simply side-stepped by using 'text' datatype for all text fields in the postgres schema. varchar was used in a couple of places where it actually seemed appropriate (size constraint), but without rigorously vetting that all of the PHP code actually validates data, new bugs might come out from under the rug. - postgres doesn't store nul bytes and a few other non-printables in text fields, even when quoted. bytea fields were used when storing binary data (photo.data, attach.data). A new dbescbin() function was added to handle this transparently. - postgres does not support LIMIT #,# syntax. All databases support LIMIT # OFFSET # syntax. Statements were updated to be standard. These changes require corresponding changes in the coding standards. Please review those before adding any code going forward. Still on my TODO list: - remove quotes from non-reserved identifiers and make reserved identifiers use dba func for quoting - Rewrite search queries for better results (both MySQL and Postgres)
2014-11-13 20:21:58 +00:00
. "' where profile_guid = '" . dbesc($profile['profile_guid']) . "' and uid = " . intval($channel['channel_id']));
sync profiles to nomadic clones
2014-06-18 00:34:51 +00:00
}
}
}
}
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
backport item sync
2015-09-22 23:19:08 +00:00
if(array_key_exists('item',$arr) && $arr['item'])
sync_items($channel,$arr['item']);
if(array_key_exists('item_id',$arr) && $arr['item_id'])
sync_items($channel,$arr['item_id']);
add plugin hooks to channel sync/import/export
2015-09-24 01:27:04 +00:00
$addon = array('channel' => $channel,'data' => $arr);
call_hooks('process_channel_sync_delivery',$addon);
backport item sync
2015-09-22 23:19:08 +00:00
report the channel sync
2015-09-22 23:43:36 +00:00
// we should probably do this for all items, but usually we only send one.
require_once('include/DReport.php');
add names to delivery report for sync delivery
2015-09-22 23:50:08 +00:00
if(array_key_exists('item',$arr) && is_array($arr['item'][0])) {
report the channel sync
2015-09-22 23:43:36 +00:00
$DR = new DReport(z_root(),$d['hash'],$d['hash'],$arr['item'][0]['message_id'],'channel sync processed');
add names to delivery report for sync delivery
2015-09-22 23:50:08 +00:00
$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
}
report the channel sync
2015-09-22 23:43:36 +00:00
else
$DR = new DReport(z_root(),$d['hash'],$d['hash'],'sync packet','channel sync delivered');
$result[] = $DR->get();
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
the rest of the heavy lifting on clone sync - now we're down to some log messages and a whole lot of testing
2013-07-26 05:57:06 +00:00
return $result;
}
rpost bbcode tag
2013-10-30 01:46:51 +00:00
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
/**
* @brief Returns path to /rpost
*
* @todo We probably should make rpost discoverable.
*
* @param array $observer
* * \e string \b xchan_url
* @return string
*/
rpost bbcode tag
2013-10-30 01:46:51 +00:00
function get_rpost_path($observer) {
if(! $observer)
return '';
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
rpost bbcode tag
2013-10-30 01:46:51 +00:00
$parsed = parse_url($observer['xchan_url']);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
return $parsed['scheme'] . '://' . $parsed['host'] . (($parsed['port']) ? ':' . $parsed['port'] : '') . '/rpost?f=';
send rpost requests from remote sites back to yours.
2013-10-30 04:49:10 +00:00
}
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
/**
* @brief
*
* @param array $x
* @return boolean|string return false or a hash
*/
include re-organisation and more doco, post_to_red fix ampersands in categories
2013-12-04 08:19:29 +00:00
function import_author_zot($x) {
Merge branch 'master' into tres Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css
2015-04-24 02:49:41 +00:00
clean up more code duplication
2014-07-15 04:21:24 +00:00
$hash = make_xchan_hash($x['guid'],$x['guid_sig']);
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
$r = q("select hubloc_url from hubloc where hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_primary = 1 limit 1",
include re-organisation and more doco, post_to_red fix ampersands in categories
2013-12-04 08:19:29 +00:00
dbesc($x['guid']),
that should take care of the bitfields in hubloc
2015-01-21 00:13:18 +00:00
dbesc($x['guid_sig'])
include re-organisation and more doco, post_to_red fix ampersands in categories
2013-12-04 08:19:29 +00:00
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($r) {
include re-organisation and more doco, post_to_red fix ampersands in categories
2013-12-04 08:19:29 +00:00
logger('import_author_zot: in cache', LOGGER_DEBUG);
return $hash;
}
logger('import_author_zot: entry not in cache - probing: ' . print_r($x,true), LOGGER_DEBUG);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$them = array('hubloc_url' => $x['url'], 'xchan_guid' => $x['guid'], 'xchan_guid_sig' => $x['guid_sig']);
if (zot_refresh($them))
include re-organisation and more doco, post_to_red fix ampersands in categories
2013-12-04 08:19:29 +00:00
return $hash;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
include re-organisation and more doco, post_to_red fix ampersands in categories
2013-12-04 08:19:29 +00:00
return false;
}
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
/**
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
* @brief Process a message request.
*
* If a site receives a comment to a post but finds they have no parent to attach it with, they
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
* may send a 'request' packet containing the message_id of the missing parent. This is the handler
* for that packet. We will create a message_list array of the entire conversation starting with
* the missing parent and invoke delivery to the sender of the packet.
*
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
* include/deliver.php (for local delivery) and mod/post.php (for web delivery) detect the existence of
* this 'message_list' at the destination and split it into individual messages which are
* processed/delivered in order.
*
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
* Called from mod/post.php
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
*
* @param array $data
* @return array
*/
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
function zot_process_message_request($data) {
$ret = array('success' => false);
disable request message response until we work through this
2014-11-01 07:36:21 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $data['message_id']) {
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$ret['message'] = 'no message_id';
logger('no message_id');
return $ret;
}
$sender = $data['sender'];
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$sender_hash = make_xchan_hash($sender['guid'], $sender['guid_sig']);
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
/*
* Find the local channel in charge of this post (the first and only recipient of the request packet)
*/
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$arr = $data['recipients'][0];
$recip_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
$c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1",
dbesc($recip_hash)
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $c) {
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
logger('recipient channel not found.');
$ret['message'] .= 'recipient not found.' . EOL;
return $ret;
}
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
/*
* fetch the requested conversation
*/
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$messages = zot_feed($c[0]['channel_id'],$sender_hash,array('message_id' => $data['message_id']));
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if ($messages) {
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$env_recips = null;
first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_deleted
2015-01-20 23:35:42 +00:00
$r = q("select * from hubloc where hubloc_hash = '%s' and not hubloc_error and not hubloc_deleted
group by hubloc_sitekey",
dbesc($sender_hash)
php warnings
2014-11-03 03:22:18 +00:00
);
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
if (! $r) {
php warnings
2014-11-03 03:22:18 +00:00
logger('no hubs');
return $ret;
}
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$hubs = $r;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$private = ((array_key_exists('flags', $messages[0]) && in_array('private',$messages[0]['flags'])) ? true : false);
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
if($private)
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
$env_recips = array('guid' => $sender['guid'], 'guid_sig' => $sender['guid_sig'], 'hash' => $sender_hash);
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
$data_packet = json_encode(array('message_list' => $messages));
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
foreach($hubs as $hub) {
$hash = random_string();
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
/*
* create a notify packet and drop the actual message packet in the queue for pickup
*/
flag notify packets that are sent in response to a message_id request and prevent them from recursing
2014-10-31 11:59:30 +00:00
$n = zot_build_packet($c[0],'notify',$env_recips,(($private) ? $hub['hubloc_sitekey'] : null),$hash,array('message_id' => $data['message_id']));
Some documentation and whitespaces at line endings.
2015-04-09 22:28:23 +00:00
q("insert into outq ( outq_hash, outq_account, outq_channel, outq_driver, outq_posturl, outq_async,
outq_created, outq_updated, outq_notify, outq_msg )
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
values ( '%s', %d, %d, '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
dbesc($hash),
intval($c[0]['channel_account_id']),
intval($c[0]['channel_id']),
dbesc('zot'),
dbesc($hub['hubloc_callback']),
intval(1),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($n),
dbesc($data_packet)
);
I'm going to try again with the conversation request packets. I've looked this over and tested a lot of edge cases, and thought about from every angle I can think of to prevent looping. I don't *think* this can loop. I also doubt that this is the problem at friendicared.de, but I don't know for sure what that problem might be.
2014-11-02 23:28:20 +00:00
/*
* invoke delivery to send out the notify packet
*/
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
proc_run('php', 'include/deliver.php', $hash);
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
}
}
$ret['success'] = true;
Correcting reported Doxygen syntax warnings. Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
2015-03-21 23:06:08 +00:00
What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect.
2014-10-31 02:15:03 +00:00
return $ret;
}
consolidate zotfinger and webfinger
2015-09-18 00:51:31 +00:00
function zotinfo($arr) {
$ret = array('success' => false);
$zhash = ((x($arr,'guid_hash')) ? $arr['guid_hash'] : '');
$zguid = ((x($arr,'guid')) ? $arr['guid'] : '');
$zguid_sig = ((x($arr,'guid_sig')) ? $arr['guid_sig'] : '');
$zaddr = ((x($arr,'address')) ? $arr['address'] : '');
$ztarget = ((x($arr,'target')) ? $arr['target'] : '');
$zsig = ((x($arr,'target_sig')) ? $arr['target_sig'] : '');
$zkey = ((x($arr,'key')) ? $arr['key'] : '');
$mindate = ((x($arr,'mindate')) ? $arr['mindate'] : '');
$feed = ((x($arr,'feed')) ? intval($arr['feed']) : 0);
if($ztarget) {
if((! $zkey) || (! $zsig) || (! rsa_verify($ztarget,base64url_decode($zsig),$zkey))) {
logger('zfinger: invalid target signature');
$ret['message'] = t("invalid target signature");
return($ret);
}
}
$r = null;
if(strlen($zhash)) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where channel_hash = '%s' limit 1",
dbesc($zhash)
);
}
elseif(strlen($zguid) && strlen($zguid_sig)) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where channel_guid = '%s' and channel_guid_sig = '%s' limit 1",
dbesc($zguid),
dbesc($zguid_sig)
);
}
elseif(strlen($zaddr)) {
if(strpos($zaddr,'[system]') === false) { /* normal address lookup */
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1",
dbesc($zaddr),
dbesc($zaddr)
);
}
else {
/**
* The special address '[system]' will return a system channel if one has been defined,
* Or the first valid channel we find if there are no system channels.
*
* This is used by magic-auth if we have no prior communications with this site - and
* returns an identity on this site which we can use to create a valid hub record so that
* we can exchange signed messages. The precise identity is irrelevant. It's the hub
* information that we really need at the other end - and this will return it.
*
*/
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where channel_system = 1 order by channel_id limit 1");
if(! $r) {
$r = q("select channel.*, xchan.* from channel left join xchan on channel_hash = xchan_hash
where channel_removed = 0 order by channel_id limit 1");
}
}
}
else {
$ret['message'] = 'Invalid request';
return($ret);
}
if(! $r) {
$ret['message'] = 'Item not found.';
return($ret);
}
$e = $r[0];
$id = $e['channel_id'];
$sys_channel = (intval($e['channel_system']) ? true : false);
$special_channel = (($e['channel_pageflags'] & PAGE_PREMIUM) ? true : false);
$adult_channel = (($e['channel_pageflags'] & PAGE_ADULT) ? true : false);
$censored = (($e['channel_pageflags'] & PAGE_CENSORED) ? true : false);
$searchable = (($e['channel_pageflags'] & PAGE_HIDDEN) ? false : true);
$deleted = (intval($e['xchan_deleted']) ? true : false);
if($deleted || $censored || $sys_channel)
$searchable = false;
$public_forum = false;
$role = get_pconfig($e['channel_id'],'system','permissions_role');
if($role === 'forum' || $role === 'repository') {
$public_forum = true;
}
else {
// check if it has characteristics of a public forum based on custom permissions.
$t = q("select abook_my_perms from abook where abook_channel = %d and abook_self = 1 limit 1",
intval($e['channel_id'])
);
if(($t) && (($t[0]['abook_my_perms'] & PERMS_W_TAGWALL) && (! ($t[0]['abook_my_perms'] & PERMS_W_STREAM))))
$public_forum = true;
}
// This is for birthdays and keywords, but must check access permissions
$p = q("select * from profile where uid = %d and is_default = 1",
intval($e['channel_id'])
);
$profile = array();
if($p) {
if(! intval($p[0]['publish']))
$searchable = false;
$profile['description'] = $p[0]['pdesc'];
$profile['birthday'] = $p[0]['dob'];
if(($profile['birthday'] != '0000-00-00') && (($bd = z_birthday($p[0]['dob'],$e['channel_timezone'])) !== ''))
$profile['next_birthday'] = $bd;
if($age = age($p[0]['dob'],$e['channel_timezone'],''))
$profile['age'] = $age;
$profile['gender'] = $p[0]['gender'];
$profile['marital'] = $p[0]['marital'];
$profile['sexual'] = $p[0]['sexual'];
$profile['locale'] = $p[0]['locality'];
$profile['region'] = $p[0]['region'];
$profile['postcode'] = $p[0]['postal_code'];
$profile['country'] = $p[0]['country_name'];
$profile['about'] = $p[0]['about'];
$profile['homepage'] = $p[0]['homepage'];
$profile['hometown'] = $p[0]['hometown'];
if($p[0]['keywords']) {
$tags = array();
$k = explode(' ',$p[0]['keywords']);
if($k) {
foreach($k as $kk) {
if(trim($kk," \t\n\r\0\x0B,")) {
$tags[] = trim($kk," \t\n\r\0\x0B,");
}
}
}
if($tags)
$profile['keywords'] = $tags;
}
}
$ret['success'] = true;
// Communication details
$ret['guid'] = $e['xchan_guid'];
$ret['guid_sig'] = $e['xchan_guid_sig'];
$ret['key'] = $e['xchan_pubkey'];
$ret['name'] = $e['xchan_name'];
$ret['name_updated'] = $e['xchan_name_date'];
$ret['address'] = $e['xchan_addr'];
$ret['photo_mimetype'] = $e['xchan_photo_mimetype'];
$ret['photo'] = $e['xchan_photo_l'];
$ret['photo_updated'] = $e['xchan_photo_date'];
$ret['url'] = $e['xchan_url'];
$ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']);
$ret['target'] = $ztarget;
$ret['target_sig'] = $zsig;
$ret['searchable'] = $searchable;
$ret['adult_content'] = $adult_channel;
$ret['public_forum'] = $public_forum;
if($deleted)
$ret['deleted'] = $deleted;
// premium or other channel desiring some contact with potential followers before connecting.
// This is a template - %s will be replaced with the follow_url we discover for the return channel.
if($special_channel)
$ret['connect_url'] = z_root() . '/connect/' . $e['channel_address'];
// This is a template for our follow url, %s will be replaced with a webbie
$ret['follow_url'] = z_root() . '/follow?f=&url=%s';
$ztarget_hash = (($ztarget && $zsig)
? make_xchan_hash($ztarget,$zsig)
: '' );
$permissions = get_all_perms($e['channel_id'],$ztarget_hash,false);
if($ztarget_hash) {
$permissions['connected'] = false;
$b = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($ztarget_hash),
intval($e['channel_id'])
);
if($b)
$permissions['connected'] = true;
}
$ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey) : $permissions);
if($permissions['view_profile'])
$ret['profile'] = $profile;
// array of (verified) hubs this channel uses
$x = zot_encode_locations($e);
if($x)
$ret['locations'] = $x;
$ret['site'] = array();
$ret['site']['url'] = z_root();
$ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),$e['channel_prvkey']));
$dirmode = get_config('system','directory_mode');
if(($dirmode === false) || ($dirmode == DIRECTORY_MODE_NORMAL))
$ret['site']['directory_mode'] = 'normal';
if($dirmode == DIRECTORY_MODE_PRIMARY)
$ret['site']['directory_mode'] = 'primary';
elseif($dirmode == DIRECTORY_MODE_SECONDARY)
$ret['site']['directory_mode'] = 'secondary';
elseif($dirmode == DIRECTORY_MODE_STANDALONE)
$ret['site']['directory_mode'] = 'standalone';
if($dirmode != DIRECTORY_MODE_NORMAL)
$ret['site']['directory_url'] = z_root() . '/dirsearch';
// hide detailed site information if you're off the grid
if($dirmode != DIRECTORY_MODE_STANDALONE) {
$register_policy = intval(get_config('system','register_policy'));
if($register_policy == REGISTER_CLOSED)
$ret['site']['register_policy'] = 'closed';
if($register_policy == REGISTER_APPROVE)
$ret['site']['register_policy'] = 'approve';
if($register_policy == REGISTER_OPEN)
$ret['site']['register_policy'] = 'open';
$access_policy = intval(get_config('system','access_policy'));
if($access_policy == ACCESS_PRIVATE)
$ret['site']['access_policy'] = 'private';
if($access_policy == ACCESS_PAID)
$ret['site']['access_policy'] = 'paid';
if($access_policy == ACCESS_FREE)
$ret['site']['access_policy'] = 'free';
if($access_policy == ACCESS_TIERED)
$ret['site']['access_policy'] = 'tiered';
$ret['site']['accounts'] = account_total();
require_once('include/identity.php');
$ret['site']['channels'] = channel_total();
$ret['site']['version'] = PLATFORM_NAME . ' ' . RED_VERSION . '[' . DB_UPDATE_VERSION . ']';
$ret['site']['admin'] = get_config('system','admin_email');
$a = get_app();
$visible_plugins = array();
if(is_array($a->plugins) && count($a->plugins)) {
$r = q("select * from addon where hidden = 0");
if($r)
foreach($r as $rr)
$visible_plugins[] = $rr['name'];
}
$ret['site']['plugins'] = $visible_plugins;
$ret['site']['sitehash'] = get_config('system','location_hash');
$ret['site']['sitename'] = get_config('system','sitename');
$ret['site']['sellpage'] = get_config('system','sellpage');
$ret['site']['location'] = get_config('system','site_location');
$ret['site']['realm'] = get_directory_realm();
}
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 23:55:51 +00:00
check_zotinfo($e,$x,$ret);
consolidate zotfinger and webfinger
2015-09-18 00:51:31 +00:00
call_hooks('zot_finger',$ret);
return($ret);
Merge https://github.com/redmatrix/redmatrix into pending_merge Conflicts: include/items.php include/zot.php
2015-09-22 23:26:28 +00:00
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-19 06:02:49 +00:00
}
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 23:55:51 +00:00
function check_zotinfo($channel,$locations,&$ret) {
improve the sys channel location repair to check key issues and re-installs and/or site moves
2015-09-30 00:21:14 +00:00
// logger('locations: ' . print_r($locations,true),LOGGER_DATA);
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 23:55:51 +00:00
// This function will likely expand as we find more things to detect and fix.
// 1. Because magic-auth is reliant on it, ensure that the system channel has a valid hubloc
// Force this to be the case if anything is found to be wrong with it.
// @FIXME ensure that the system channel exists in the first place and has an xchan
if($channel['channel_system']) {
// the sys channel must have a location (hubloc)
$valid_location = false;
if((count($locations) === 1) && ($locations[0]['primary']) && (! $locations[0]['deleted'])) {
improve the sys channel location repair to check key issues and re-installs and/or site moves
2015-09-30 00:21:14 +00:00
if((rsa_verify($locations[0]['url'],base64url_decode($locations[0]['url_sig']),$channel['channel_pubkey']))
&& ($locations[0]['sitekey'] === get_config('system','pubkey'))
&& ($locations[0]['url'] === z_root()))
$valid_location = true;
else
logger('sys channel: invalid url signature');
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 23:55:51 +00:00
}
improve the sys channel location repair to check key issues and re-installs and/or site moves
2015-09-30 00:21:14 +00:00
if((! $locations) || (! $valid_location)) {
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
2015-09-29 23:55:51 +00:00
logger('System channel locations are not valid. Attempting repair.');
// Don't trust any existing records. Just get rid of them, but only do this
// for the sys channel as normal channels will be trickier.
q("delete from hubloc where hubloc_hash = '%s'",
dbesc($channel['channel_hash'])
);
$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_primary,
hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_network )
values ( '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
dbesc($channel['channel_guid']),
dbesc($channel['channel_guid_sig']),
dbesc($channel['channel_hash']),
dbesc($channel['channel_address'] . '@' . get_app()->get_hostname()),
intval(1),
dbesc(z_root()),
dbesc(base64url_encode(rsa_sign(z_root(),$channel['channel_prvkey']))),
dbesc(get_app()->get_hostname()),
dbesc(z_root() . '/post'),
dbesc(get_config('system','pubkey')),
dbesc('zot')
);
if($r) {
$x = zot_encode_locations($channel);
if($x) {
$ret['locations'] = $x;
}
}
else {
logger('Unable to store sys hub location');
}
}
}
backport item sync
2015-09-22 23:19:08 +00:00
}
filter delivery reports
2015-10-17 20:26:55 +00:00
function delivery_report_is_storable($dr) {
call_hooks('dreport_is_storable',$dr);
// let plugins accept or reject - if neither, continue on
if(array_key_exists('accept',$dr) && intval($dr['accept']))
return true;
if(array_key_exists('reject',$dr) && intval($dr['reject']))
return false;
if(! ($dr['sender']))
return false;
// Is the sender one of our channels?
$c = q("select channel_id from channel where channel_hash = '%s' limit 1",
dbesc($dr['sender'])
);
if(! $c)
return false;
// is the recipient one of our connections, or do we want to store every report?
$r = explode(' ', $dr['recipient']);
$rxchan = $r[0];
$pcf = get_pconfig($c[0]['channel_id'],'system','dreport_store_all');
if($pcf)
return true;
$r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($rxchan),
intval($c[0]['channel_id'])
);
if($r)
return true;
return false;
}
Reference in a new issue Copy permalink