Merge remote branch 'upstream/master'
This commit is contained in:
zottel
commit
2cd3ec7b98
4
boot.php
4
boot.php
|
|
@ -9,9 +9,9 @@ require_once('include/nav.php');
|
||||||
require_once('include/cache.php');
|
require_once('include/cache.php');
|
||||||
|
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '3.0.1344' );
|
define ( 'FRIENDICA_VERSION', '3.0.1347' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1143 );
|
define ( 'DB_UPDATE_VERSION', 1144 );
|
||||||
|
|
||||||
define ( 'EOL', "<br />\r\n" );
|
define ( 'EOL', "<br />\r\n" );
|
||||||
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
|
||||||
|
|
|
||||||
19
convert_innodb.sql
Normal file
19
convert_innodb.sql
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE `profile` DROP INDEX `pub_keywords` ;
|
||||||
|
ALTER TABLE `profile` DROP INDEX `prv_keywords` ;
|
||||||
|
|
||||||
|
ALTER TABLE `item` DROP INDEX `title` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `body` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `allow_cid` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `allow_gid` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `deny_cid` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `deny_gid` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `tag` ;
|
||||||
|
ALTER TABLE `item` DROP INDEX `file` ;
|
||||||
|
|
||||||
|
|
||||||
|
SELECT CONCAT('ALTER TABLE ',table_schema,'.',table_name,' engine=InnoDB;')
|
||||||
|
FROM information_schema.tables
|
||||||
|
WHERE engine = 'MyISAM';
|
||||||
|
|
||||||
|
|
@ -1028,6 +1028,7 @@ CREATE TABLE IF NOT EXISTS `user` (
|
||||||
`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
`account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||||
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||||
`service_class` char(32) NOT NULL,
|
`service_class` char(32) NOT NULL,
|
||||||
|
`def_gid` int(11) NOT NULL DEFAULT '0',
|
||||||
`allow_cid` mediumtext NOT NULL,
|
`allow_cid` mediumtext NOT NULL,
|
||||||
`allow_gid` mediumtext NOT NULL,
|
`allow_gid` mediumtext NOT NULL,
|
||||||
`deny_cid` mediumtext NOT NULL,
|
`deny_cid` mediumtext NOT NULL,
|
||||||
|
|
|
||||||
|
|
@ -38,164 +38,167 @@ function delivery_run($argv, $argc){
|
||||||
|
|
||||||
$cmd = $argv[1];
|
$cmd = $argv[1];
|
||||||
$item_id = intval($argv[2]);
|
$item_id = intval($argv[2]);
|
||||||
$contact_id = intval($argv[3]);
|
|
||||||
|
|
||||||
// Some other process may have delivered this item already.
|
for($x = 3; $x < $argc; $x ++) {
|
||||||
|
|
||||||
$r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
|
$contact_id = intval($argv[x]);
|
||||||
dbesc($cmd),
|
|
||||||
dbesc($item_id),
|
|
||||||
dbesc($contact_id)
|
|
||||||
);
|
|
||||||
if(! count($r)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$maxsysload = intval(get_config('system','maxloadavg'));
|
// Some other process may have delivered this item already.
|
||||||
if($maxsysload < 1)
|
|
||||||
$maxsysload = 50;
|
|
||||||
if(function_exists('sys_getloadavg')) {
|
|
||||||
$load = sys_getloadavg();
|
|
||||||
if(intval($load[0]) > $maxsysload) {
|
|
||||||
logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// It's ours to deliver. Remove it from the queue.
|
$r = q("select * from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
|
||||||
|
dbesc($cmd),
|
||||||
q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
|
dbesc($item_id),
|
||||||
dbesc($cmd),
|
dbesc($contact_id)
|
||||||
dbesc($item_id),
|
|
||||||
dbesc($contact_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
if((! $item_id) || (! $contact_id))
|
|
||||||
return;
|
|
||||||
|
|
||||||
$expire = false;
|
|
||||||
$top_level = false;
|
|
||||||
$recipients = array();
|
|
||||||
$url_recipients = array();
|
|
||||||
|
|
||||||
$normal_mode = true;
|
|
||||||
|
|
||||||
$recipients[] = $contact_id;
|
|
||||||
|
|
||||||
if($cmd === 'expire') {
|
|
||||||
$normal_mode = false;
|
|
||||||
$expire = true;
|
|
||||||
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
|
|
||||||
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
|
|
||||||
intval($item_id)
|
|
||||||
);
|
);
|
||||||
$uid = $item_id;
|
if(! count($r)) {
|
||||||
$item_id = 0;
|
continue;
|
||||||
if(! count($items))
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
// find ancestors
|
$maxsysload = intval(get_config('system','maxloadavg'));
|
||||||
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
|
if($maxsysload < 1)
|
||||||
intval($item_id)
|
$maxsysload = 50;
|
||||||
);
|
if(function_exists('sys_getloadavg')) {
|
||||||
|
$load = sys_getloadavg();
|
||||||
if((! count($r)) || (! intval($r[0]['parent']))) {
|
if(intval($load[0]) > $maxsysload) {
|
||||||
return;
|
logger('system: load ' . $load . ' too high. Delivery deferred to next queue run.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$target_item = $r[0];
|
// It's ours to deliver. Remove it from the queue.
|
||||||
$parent_id = intval($r[0]['parent']);
|
|
||||||
$uid = $r[0]['uid'];
|
|
||||||
$updated = $r[0]['edited'];
|
|
||||||
|
|
||||||
if(! $parent_id)
|
q("delete from deliverq where cmd = '%s' and item = %d and contact = %d limit 1",
|
||||||
return;
|
dbesc($cmd),
|
||||||
|
dbesc($item_id),
|
||||||
|
dbesc($contact_id)
|
||||||
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
|
|
||||||
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
|
|
||||||
intval($parent_id)
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! count($items)) {
|
if((! $item_id) || (! $contact_id))
|
||||||
return;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$icontacts = null;
|
$expire = false;
|
||||||
$contacts_arr = array();
|
$top_level = false;
|
||||||
foreach($items as $item)
|
$recipients = array();
|
||||||
if(! in_array($item['contact-id'],$contacts_arr))
|
$url_recipients = array();
|
||||||
$contacts_arr[] = intval($item['contact-id']);
|
|
||||||
if(count($contacts_arr)) {
|
$normal_mode = true;
|
||||||
$str_contacts = implode(',',$contacts_arr);
|
|
||||||
$icontacts = q("SELECT * FROM `contact`
|
$recipients[] = $contact_id;
|
||||||
WHERE `id` IN ( $str_contacts ) "
|
|
||||||
|
if($cmd === 'expire') {
|
||||||
|
$normal_mode = false;
|
||||||
|
$expire = true;
|
||||||
|
$items = q("SELECT * FROM `item` WHERE `uid` = %d AND `wall` = 1
|
||||||
|
AND `deleted` = 1 AND `changed` > UTC_TIMESTAMP() - INTERVAL 30 MINUTE",
|
||||||
|
intval($item_id)
|
||||||
);
|
);
|
||||||
|
$uid = $item_id;
|
||||||
|
$item_id = 0;
|
||||||
|
if(! count($items))
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
if( ! ($icontacts && count($icontacts)))
|
else {
|
||||||
return;
|
|
||||||
|
|
||||||
// avoid race condition with deleting entries
|
// find ancestors
|
||||||
|
$r = q("SELECT * FROM `item` WHERE `id` = %d and visible = 1 and moderated = 0 LIMIT 1",
|
||||||
|
intval($item_id)
|
||||||
|
);
|
||||||
|
|
||||||
if($items[0]['deleted']) {
|
if((! count($r)) || (! intval($r[0]['parent']))) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$target_item = $r[0];
|
||||||
|
$parent_id = intval($r[0]['parent']);
|
||||||
|
$uid = $r[0]['uid'];
|
||||||
|
$updated = $r[0]['edited'];
|
||||||
|
|
||||||
|
if(! $parent_id)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
|
||||||
|
$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
|
||||||
|
FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d and visible = 1 and moderated = 0 ORDER BY `id` ASC",
|
||||||
|
intval($parent_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(! count($items)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$icontacts = null;
|
||||||
|
$contacts_arr = array();
|
||||||
foreach($items as $item)
|
foreach($items as $item)
|
||||||
$item['deleted'] = 1;
|
if(! in_array($item['contact-id'],$contacts_arr))
|
||||||
|
$contacts_arr[] = intval($item['contact-id']);
|
||||||
|
if(count($contacts_arr)) {
|
||||||
|
$str_contacts = implode(',',$contacts_arr);
|
||||||
|
$icontacts = q("SELECT * FROM `contact`
|
||||||
|
WHERE `id` IN ( $str_contacts ) "
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if( ! ($icontacts && count($icontacts)))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// avoid race condition with deleting entries
|
||||||
|
|
||||||
|
if($items[0]['deleted']) {
|
||||||
|
foreach($items as $item)
|
||||||
|
$item['deleted'] = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
|
||||||
|
logger('delivery: top level post');
|
||||||
|
$top_level = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if((count($items) == 1) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
|
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
|
||||||
logger('delivery: top level post');
|
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
|
||||||
$top_level = true;
|
`user`.`page-flags`, `user`.`prvnets`
|
||||||
}
|
FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
|
||||||
}
|
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
|
if(! count($r))
|
||||||
`user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
|
continue;
|
||||||
`user`.`page-flags`, `user`.`prvnets`
|
|
||||||
FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
|
|
||||||
WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(! count($r))
|
$owner = $r[0];
|
||||||
return;
|
|
||||||
|
|
||||||
$owner = $r[0];
|
$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
|
||||||
|
|
||||||
$walltowall = ((($top_level) && ($owner['id'] != $items[0]['contact-id'])) ? true : false);
|
$public_message = true;
|
||||||
|
|
||||||
$public_message = true;
|
// fill this in with a single salmon slap if applicable
|
||||||
|
|
||||||
// fill this in with a single salmon slap if applicable
|
$slap = '';
|
||||||
|
|
||||||
$slap = '';
|
require_once('include/group.php');
|
||||||
|
|
||||||
require_once('include/group.php');
|
$parent = $items[0];
|
||||||
|
|
||||||
$parent = $items[0];
|
// This is IMPORTANT!!!!
|
||||||
|
|
||||||
// This is IMPORTANT!!!!
|
// We will only send a "notify owner to relay" or followup message if the referenced post
|
||||||
|
// originated on our system by virtue of having our hostname somewhere
|
||||||
|
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
|
||||||
|
// if $parent['wall'] == 1 we will already have the parent message in our array
|
||||||
|
// and we will relay the whole lot.
|
||||||
|
|
||||||
|
// expire sends an entire group of expire messages and cannot be forwarded.
|
||||||
|
// However the conversation owner will be a part of the conversation and will
|
||||||
|
// be notified during this run.
|
||||||
|
// Other DFRN conversation members will be alerted during polled updates.
|
||||||
|
|
||||||
// We will only send a "notify owner to relay" or followup message if the referenced post
|
// Diaspora members currently are not notified of expirations, and other networks have
|
||||||
// originated on our system by virtue of having our hostname somewhere
|
// either limited or no ability to process deletions. We should at least fix Diaspora
|
||||||
// in the URI, AND it was a comment (not top_level) AND the parent originated elsewhere.
|
// by stringing togther an array of retractions and sending them onward.
|
||||||
// if $parent['wall'] == 1 we will already have the parent message in our array
|
|
||||||
// and we will relay the whole lot.
|
|
||||||
|
|
||||||
// expire sends an entire group of expire messages and cannot be forwarded.
|
|
||||||
// However the conversation owner will be a part of the conversation and will
|
|
||||||
// be notified during this run.
|
|
||||||
// Other DFRN conversation members will be alerted during polled updates.
|
|
||||||
|
|
||||||
// Diaspora members currently are not notified of expirations, and other networks have
|
|
||||||
// either limited or no ability to process deletions. We should at least fix Diaspora
|
|
||||||
// by stringing togther an array of retractions and sending them onward.
|
|
||||||
|
|
||||||
|
|
||||||
$localhost = $a->get_hostname();
|
$localhost = $a->get_hostname();
|
||||||
if(strpos($localhost,':'))
|
if(strpos($localhost,':'))
|
||||||
$localhost = substr($localhost,0,strpos($localhost,':'));
|
$localhost = substr($localhost,0,strpos($localhost,':'));
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
@ -205,174 +208,71 @@ function delivery_run($argv, $argc){
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
|
if((! $top_level) && ($parent['wall'] == 0) && (! $expire) && (stristr($target_item['uri'],$localhost))) {
|
||||||
logger('relay denied for delivery agent.');
|
logger('relay denied for delivery agent.');
|
||||||
|
|
||||||
/* no relay allowed for direct contact delivery */
|
/* no relay allowed for direct contact delivery */
|
||||||
return;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if((strlen($parent['allow_cid']))
|
if((strlen($parent['allow_cid']))
|
||||||
|| (strlen($parent['allow_gid']))
|
|| (strlen($parent['allow_gid']))
|
||||||
|| (strlen($parent['deny_cid']))
|
|| (strlen($parent['deny_cid']))
|
||||||
|| (strlen($parent['deny_gid']))) {
|
|| (strlen($parent['deny_gid']))) {
|
||||||
$public_message = false; // private recipients, not public
|
$public_message = false; // private recipients, not public
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
|
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
|
||||||
intval($contact_id)
|
intval($contact_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(count($r))
|
if(count($r))
|
||||||
$contact = $r[0];
|
$contact = $r[0];
|
||||||
|
|
||||||
$hubxml = feed_hublinks();
|
$hubxml = feed_hublinks();
|
||||||
|
|
||||||
logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
|
logger('notifier: slaps: ' . print_r($slaps,true), LOGGER_DATA);
|
||||||
|
|
||||||
require_once('include/salmon.php');
|
require_once('include/salmon.php');
|
||||||
|
|
||||||
if($contact['self'])
|
if($contact['self'])
|
||||||
return;
|
continue;
|
||||||
|
|
||||||
$deliver_status = 0;
|
$deliver_status = 0;
|
||||||
|
|
||||||
switch($contact['network']) {
|
switch($contact['network']) {
|
||||||
|
|
||||||
case NETWORK_DFRN :
|
case NETWORK_DFRN :
|
||||||
logger('notifier: dfrndelivery: ' . $contact['name']);
|
logger('notifier: dfrndelivery: ' . $contact['name']);
|
||||||
|
|
||||||
$feed_template = get_markup_template('atom_feed.tpl');
|
$feed_template = get_markup_template('atom_feed.tpl');
|
||||||
$mail_template = get_markup_template('atom_mail.tpl');
|
$mail_template = get_markup_template('atom_mail.tpl');
|
||||||
|
|
||||||
$atom = '';
|
$atom = '';
|
||||||
|
|
||||||
|
|
||||||
$birthday = feed_birthday($owner['uid'],$owner['timezone']);
|
$birthday = feed_birthday($owner['uid'],$owner['timezone']);
|
||||||
|
|
||||||
if(strlen($birthday))
|
if(strlen($birthday))
|
||||||
$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
|
$birthday = '<dfrn:birthday>' . xmlify($birthday) . '</dfrn:birthday>';
|
||||||
|
|
||||||
$atom .= replace_macros($feed_template, array(
|
$atom .= replace_macros($feed_template, array(
|
||||||
'$version' => xmlify(FRIENDICA_VERSION),
|
'$version' => xmlify(FRIENDICA_VERSION),
|
||||||
'$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
|
'$feed_id' => xmlify($a->get_baseurl() . '/profile/' . $owner['nickname'] ),
|
||||||
'$feed_title' => xmlify($owner['name']),
|
'$feed_title' => xmlify($owner['name']),
|
||||||
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
|
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', $updated . '+00:00' , ATOM_TIME)) ,
|
||||||
'$hub' => $hubxml,
|
'$hub' => $hubxml,
|
||||||
'$salmon' => '', // private feed, we don't use salmon here
|
'$salmon' => '', // private feed, we don't use salmon here
|
||||||
'$name' => xmlify($owner['name']),
|
'$name' => xmlify($owner['name']),
|
||||||
'$profile_page' => xmlify($owner['url']),
|
'$profile_page' => xmlify($owner['url']),
|
||||||
'$photo' => xmlify($owner['photo']),
|
'$photo' => xmlify($owner['photo']),
|
||||||
'$thumb' => xmlify($owner['thumb']),
|
'$thumb' => xmlify($owner['thumb']),
|
||||||
'$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
|
'$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , ATOM_TIME)) ,
|
||||||
'$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) ,
|
'$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , ATOM_TIME)) ,
|
||||||
'$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) ,
|
'$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) ,
|
||||||
'$birthday' => $birthday,
|
'$birthday' => $birthday,
|
||||||
'$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
|
'$community' => (($owner['page-flags'] == PAGE_COMMUNITY) ? '<dfrn:community>1</dfrn:community>' : '')
|
||||||
));
|
));
|
||||||
|
|
||||||
foreach($items as $item) {
|
|
||||||
if(! $item['parent'])
|
|
||||||
continue;
|
|
||||||
|
|
||||||
// private emails may be in included in public conversations. Filter them.
|
|
||||||
if(($public_message) && $item['private'])
|
|
||||||
continue;
|
|
||||||
|
|
||||||
$item_contact = get_item_contact($item,$icontacts);
|
|
||||||
if(! $item_contact)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if($normal_mode) {
|
|
||||||
if($item_id == $item['id'] || $item['id'] == $item['parent'])
|
|
||||||
$atom .= atom_entry($item,'text',null,$owner,true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
$atom .= atom_entry($item,'text',null,$owner,true);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
$atom .= '</feed>' . "\r\n";
|
|
||||||
|
|
||||||
logger('notifier: ' . $atom, LOGGER_DATA);
|
|
||||||
$basepath = implode('/', array_slice(explode('/',$contact['url']),0,3));
|
|
||||||
|
|
||||||
// perform local delivery if we are on the same site
|
|
||||||
|
|
||||||
if(link_compare($basepath,$a->get_baseurl())) {
|
|
||||||
|
|
||||||
$nickname = basename($contact['url']);
|
|
||||||
if($contact['issued-id'])
|
|
||||||
$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
|
|
||||||
else
|
|
||||||
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
|
|
||||||
|
|
||||||
$x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
|
|
||||||
`contact`.`pubkey` AS `cpubkey`,
|
|
||||||
`contact`.`prvkey` AS `cprvkey`,
|
|
||||||
`contact`.`thumb` AS `thumb`,
|
|
||||||
`contact`.`url` as `url`,
|
|
||||||
`contact`.`name` as `senderName`,
|
|
||||||
`user`.*
|
|
||||||
FROM `contact`
|
|
||||||
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
|
||||||
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
|
||||||
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
|
|
||||||
$sql_extra
|
|
||||||
AND `user`.`account_expired` = 0 LIMIT 1",
|
|
||||||
dbesc(NETWORK_DFRN),
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(count($x)) {
|
|
||||||
if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
|
|
||||||
q("update contact set writable = 1 where id = %d limit 1",
|
|
||||||
intval($x[0]['id'])
|
|
||||||
);
|
|
||||||
$x[0]['writable'] = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
$ssl_policy = get_config('system','ssl_policy');
|
|
||||||
fix_contact_ssl_policy($x[0],$ssl_policy);
|
|
||||||
|
|
||||||
// If we are setup as a soapbox we aren't accepting input from this person
|
|
||||||
|
|
||||||
if($x[0]['page-flags'] == PAGE_SOAPBOX)
|
|
||||||
break;
|
|
||||||
|
|
||||||
require_once('library/simplepie/simplepie.inc');
|
|
||||||
logger('mod-delivery: local delivery');
|
|
||||||
local_delivery($x[0],$atom);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(! was_recently_delayed($contact['id']))
|
|
||||||
$deliver_status = dfrn_deliver($owner,$contact,$atom);
|
|
||||||
else
|
|
||||||
$deliver_status = (-1);
|
|
||||||
|
|
||||||
logger('notifier: dfrn_delivery returns ' . $deliver_status);
|
|
||||||
|
|
||||||
if($deliver_status == (-1)) {
|
|
||||||
logger('notifier: delivery failed: queuing message');
|
|
||||||
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NETWORK_OSTATUS :
|
|
||||||
|
|
||||||
// Do not send to otatus if we are not configured to send to public networks
|
|
||||||
if($owner['prvnets'])
|
|
||||||
break;
|
|
||||||
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
|
||||||
break;
|
|
||||||
|
|
||||||
// only send salmon if public - e.g. if it's ok to notify
|
|
||||||
// a public hub, it's ok to send a salmon
|
|
||||||
|
|
||||||
if(($public_message) && (! $expire)) {
|
|
||||||
$slaps = array();
|
|
||||||
|
|
||||||
foreach($items as $item) {
|
foreach($items as $item) {
|
||||||
if(! $item['parent'])
|
if(! $item['parent'])
|
||||||
|
|
@ -386,156 +286,260 @@ function delivery_run($argv, $argc){
|
||||||
if(! $item_contact)
|
if(! $item_contact)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
|
if($normal_mode) {
|
||||||
$slaps[] = atom_entry($item,'html',null,$owner,true);
|
if($item_id == $item['id'] || $item['id'] == $item['parent'])
|
||||||
|
$atom .= atom_entry($item,'text',null,$owner,true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$atom .= atom_entry($item,'text',null,$owner,true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('notifier: slapdelivery: ' . $contact['name']);
|
$atom .= '</feed>' . "\r\n";
|
||||||
foreach($slaps as $slappy) {
|
|
||||||
if($contact['notify']) {
|
logger('notifier: ' . $atom, LOGGER_DATA);
|
||||||
if(! was_recently_delayed($contact['id']))
|
$basepath = implode('/', array_slice(explode('/',$contact['url']),0,3));
|
||||||
$deliver_status = slapper($owner,$contact['notify'],$slappy);
|
|
||||||
else
|
|
||||||
$deliver_status = (-1);
|
|
||||||
|
|
||||||
if($deliver_status == (-1)) {
|
// perform local delivery if we are on the same site
|
||||||
// queue message for redelivery
|
|
||||||
add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
|
if(link_compare($basepath,$a->get_baseurl())) {
|
||||||
|
|
||||||
|
$nickname = basename($contact['url']);
|
||||||
|
if($contact['issued-id'])
|
||||||
|
$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($contact['issued-id']));
|
||||||
|
else
|
||||||
|
$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($contact['dfrn-id']));
|
||||||
|
|
||||||
|
$x = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
|
||||||
|
`contact`.`pubkey` AS `cpubkey`,
|
||||||
|
`contact`.`prvkey` AS `cprvkey`,
|
||||||
|
`contact`.`thumb` AS `thumb`,
|
||||||
|
`contact`.`url` as `url`,
|
||||||
|
`contact`.`name` as `senderName`,
|
||||||
|
`user`.*
|
||||||
|
FROM `contact`
|
||||||
|
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
|
AND `contact`.`network` = '%s' AND `user`.`nickname` = '%s'
|
||||||
|
$sql_extra
|
||||||
|
AND `user`.`account_expired` = 0 LIMIT 1",
|
||||||
|
dbesc(NETWORK_DFRN),
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(count($x)) {
|
||||||
|
if($owner['page-flags'] == PAGE_COMMUNITY && ! $x[0]['writable']) {
|
||||||
|
q("update contact set writable = 1 where id = %d limit 1",
|
||||||
|
intval($x[0]['id'])
|
||||||
|
);
|
||||||
|
$x[0]['writable'] = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
$ssl_policy = get_config('system','ssl_policy');
|
||||||
|
fix_contact_ssl_policy($x[0],$ssl_policy);
|
||||||
|
|
||||||
|
// If we are setup as a soapbox we aren't accepting input from this person
|
||||||
|
|
||||||
|
if($x[0]['page-flags'] == PAGE_SOAPBOX)
|
||||||
|
break;
|
||||||
|
|
||||||
|
require_once('library/simplepie/simplepie.inc');
|
||||||
|
logger('mod-delivery: local delivery');
|
||||||
|
local_delivery($x[0],$atom);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! was_recently_delayed($contact['id']))
|
||||||
|
$deliver_status = dfrn_deliver($owner,$contact,$atom);
|
||||||
|
else
|
||||||
|
$deliver_status = (-1);
|
||||||
|
|
||||||
|
logger('notifier: dfrn_delivery returns ' . $deliver_status);
|
||||||
|
|
||||||
|
if($deliver_status == (-1)) {
|
||||||
|
logger('notifier: delivery failed: queuing message');
|
||||||
|
add_to_queue($contact['id'],NETWORK_DFRN,$atom);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NETWORK_OSTATUS :
|
||||||
|
|
||||||
|
// Do not send to otatus if we are not configured to send to public networks
|
||||||
|
if($owner['prvnets'])
|
||||||
|
break;
|
||||||
|
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
||||||
|
break;
|
||||||
|
|
||||||
|
// only send salmon if public - e.g. if it's ok to notify
|
||||||
|
// a public hub, it's ok to send a salmon
|
||||||
|
|
||||||
|
if(($public_message) && (! $expire)) {
|
||||||
|
$slaps = array();
|
||||||
|
|
||||||
|
foreach($items as $item) {
|
||||||
|
if(! $item['parent'])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// private emails may be in included in public conversations. Filter them.
|
||||||
|
if(($public_message) && $item['private'])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
$item_contact = get_item_contact($item,$icontacts);
|
||||||
|
if(! $item_contact)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
|
||||||
|
$slaps[] = atom_entry($item,'html',null,$owner,true);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger('notifier: slapdelivery: ' . $contact['name']);
|
||||||
|
foreach($slaps as $slappy) {
|
||||||
|
if($contact['notify']) {
|
||||||
|
if(! was_recently_delayed($contact['id']))
|
||||||
|
$deliver_status = slapper($owner,$contact['notify'],$slappy);
|
||||||
|
else
|
||||||
|
$deliver_status = (-1);
|
||||||
|
|
||||||
|
if($deliver_status == (-1)) {
|
||||||
|
// queue message for redelivery
|
||||||
|
add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NETWORK_MAIL :
|
|
||||||
case NETWORK_MAIL2:
|
|
||||||
|
|
||||||
if(get_config('system','dfrn_only'))
|
|
||||||
break;
|
|
||||||
// WARNING: does not currently convert to RFC2047 header encodings, etc.
|
|
||||||
|
|
||||||
$addr = $contact['addr'];
|
|
||||||
if(! strlen($addr))
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if($cmd === 'wall-new' || $cmd === 'comment-new') {
|
case NETWORK_MAIL :
|
||||||
|
case NETWORK_MAIL2:
|
||||||
|
|
||||||
$it = null;
|
if(get_config('system','dfrn_only'))
|
||||||
if($cmd === 'wall-new')
|
break;
|
||||||
$it = $items[0];
|
// WARNING: does not currently convert to RFC2047 header encodings, etc.
|
||||||
else {
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
$addr = $contact['addr'];
|
||||||
intval($argv[2]),
|
if(! strlen($addr))
|
||||||
|
break;
|
||||||
|
|
||||||
|
if($cmd === 'wall-new' || $cmd === 'comment-new') {
|
||||||
|
|
||||||
|
$it = null;
|
||||||
|
if($cmd === 'wall-new')
|
||||||
|
$it = $items[0];
|
||||||
|
else {
|
||||||
|
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
|
intval($argv[2]),
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$it = $r[0];
|
||||||
|
}
|
||||||
|
if(! $it)
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
if(count($r))
|
if(! count($local_user))
|
||||||
$it = $r[0];
|
break;
|
||||||
}
|
|
||||||
if(! $it)
|
|
||||||
break;
|
|
||||||
|
|
||||||
|
$reply_to = '';
|
||||||
|
$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
if($r1 && $r1[0]['reply_to'])
|
||||||
|
$reply_to = $r1[0]['reply_to'];
|
||||||
|
|
||||||
$local_user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
|
$subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
if(! count($local_user))
|
|
||||||
break;
|
|
||||||
|
|
||||||
$reply_to = '';
|
|
||||||
$r1 = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
if($r1 && $r1[0]['reply_to'])
|
|
||||||
$reply_to = $r1[0]['reply_to'];
|
|
||||||
|
|
||||||
$subject = (($it['title']) ? email_header_encode($it['title'],'UTF-8') : t("\x28no subject\x29")) ;
|
// only expose our real email address to true friends
|
||||||
|
|
||||||
// only expose our real email address to true friends
|
if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
|
||||||
|
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
|
||||||
|
else
|
||||||
|
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
|
||||||
|
|
||||||
if(($contact['rel'] == CONTACT_IS_FRIEND) && (! $contact['blocked']))
|
if($reply_to)
|
||||||
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . $local_user[0]['email'] . '>' . "\n";
|
$headers .= 'Reply-to: ' . $reply_to . "\n";
|
||||||
else
|
|
||||||
$headers = 'From: ' . email_header_encode($local_user[0]['username'],'UTF-8') . ' <' . t('noreply') . '@' . $a->get_hostname() . '>' . "\n";
|
|
||||||
|
|
||||||
if($reply_to)
|
// for testing purposes: Collect exported mails
|
||||||
$headers .= 'Reply-to: ' . $reply_to . "\n";
|
// $file = tempnam("/tmp/friendica/", "mail-out-");
|
||||||
|
// file_put_contents($file, json_encode($it));
|
||||||
|
|
||||||
|
$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
|
||||||
|
|
||||||
// for testing purposes: Collect exported mails
|
//logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
|
||||||
// $file = tempnam("/tmp/friendica/", "mail-out-");
|
//logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
|
||||||
// file_put_contents($file, json_encode($it));
|
//logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
|
||||||
|
|
||||||
$headers .= 'Message-Id: <' . iri2msgid($it['uri']). '>' . "\n";
|
if($it['uri'] !== $it['parent-uri']) {
|
||||||
|
$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
|
||||||
|
if(!strlen($it['title'])) {
|
||||||
|
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
|
||||||
|
dbesc($it['parent-uri']));
|
||||||
|
|
||||||
//logger("Mail: uri: ".$it['uri']." parent-uri ".$it['parent-uri'], LOGGER_DEBUG);
|
if(count($r) AND ($r[0]['title'] != ''))
|
||||||
//logger("Mail: Data: ".print_r($it, true), LOGGER_DEBUG);
|
$subject = $r[0]['title'];
|
||||||
//logger("Mail: Data: ".print_r($it, true), LOGGER_DATA);
|
}
|
||||||
|
if(strncasecmp($subject,'RE:',3))
|
||||||
if($it['uri'] !== $it['parent-uri']) {
|
$subject = 'Re: '.$subject;
|
||||||
$headers .= 'References: <' . iri2msgid($it['parent-uri']) . '>' . "\n";
|
|
||||||
if(!strlen($it['title'])) {
|
|
||||||
$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' LIMIT 1",
|
|
||||||
dbesc($it['parent-uri']));
|
|
||||||
|
|
||||||
if(count($r) AND ($r[0]['title'] != ''))
|
|
||||||
$subject = $r[0]['title'];
|
|
||||||
}
|
}
|
||||||
if(strncasecmp($subject,'RE:',3))
|
email_send($addr, $subject, $headers, $it);
|
||||||
$subject = 'Re: '.$subject;
|
|
||||||
}
|
}
|
||||||
email_send($addr, $subject, $headers, $it);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NETWORK_DIASPORA :
|
|
||||||
if($public_message)
|
|
||||||
$loc = 'public batch ' . $contact['batch'];
|
|
||||||
else
|
|
||||||
$loc = $contact['name'];
|
|
||||||
|
|
||||||
logger('delivery: diaspora batch deliver: ' . $loc);
|
|
||||||
|
|
||||||
if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if((! $contact['pubkey']) && (! $public_message))
|
case NETWORK_DIASPORA :
|
||||||
|
if($public_message)
|
||||||
|
$loc = 'public batch ' . $contact['batch'];
|
||||||
|
else
|
||||||
|
$loc = $contact['name'];
|
||||||
|
|
||||||
|
logger('delivery: diaspora batch deliver: ' . $loc);
|
||||||
|
|
||||||
|
if(get_config('system','dfrn_only') || (! get_config('system','diaspora_enabled')) || (! $normal_mode))
|
||||||
|
break;
|
||||||
|
|
||||||
|
if((! $contact['pubkey']) && (! $public_message))
|
||||||
|
break;
|
||||||
|
|
||||||
|
if($target_item['verb'] === ACTIVITY_DISLIKE) {
|
||||||
|
// unsupported
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
|
||||||
|
logger('delivery: diaspora retract: ' . $loc);
|
||||||
|
// diaspora delete,
|
||||||
|
diaspora_send_retraction($target_item,$owner,$contact,$public_message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
elseif($target_item['parent'] != $target_item['id']) {
|
||||||
|
|
||||||
|
logger('delivery: diaspora relay: ' . $loc);
|
||||||
|
|
||||||
|
// we are the relay - send comments, likes and unlikes to our conversants
|
||||||
|
diaspora_send_relay($target_item,$owner,$contact,$public_message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
elseif(($top_level) && (! $walltowall)) {
|
||||||
|
// currently no workable solution for sending walltowall
|
||||||
|
logger('delivery: diaspora status: ' . $loc);
|
||||||
|
diaspora_send_status($target_item,$owner,$contact,$public_message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger('delivery: diaspora unknown mode: ' . $contact['name']);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if($target_item['verb'] === ACTIVITY_DISLIKE) {
|
case NETWORK_FEED :
|
||||||
// unsupported
|
case NETWORK_FACEBOOK :
|
||||||
|
if(get_config('system','dfrn_only'))
|
||||||
|
break;
|
||||||
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
|
|
||||||
logger('delivery: diaspora retract: ' . $loc);
|
|
||||||
// diaspora delete,
|
|
||||||
diaspora_send_retraction($target_item,$owner,$contact,$public_message);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
elseif($target_item['parent'] != $target_item['id']) {
|
|
||||||
|
|
||||||
logger('delivery: diaspora relay: ' . $loc);
|
|
||||||
|
|
||||||
// we are the relay - send comments, likes and unlikes to our conversants
|
|
||||||
diaspora_send_relay($target_item,$owner,$contact,$public_message);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
elseif(($top_level) && (! $walltowall)) {
|
|
||||||
// currently no workable solution for sending walltowall
|
|
||||||
logger('delivery: diaspora status: ' . $loc);
|
|
||||||
diaspora_send_status($target_item,$owner,$contact,$public_message);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger('delivery: diaspora unknown mode: ' . $contact['name']);
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NETWORK_FEED :
|
|
||||||
case NETWORK_FACEBOOK :
|
|
||||||
if(get_config('system','dfrn_only'))
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -569,6 +569,14 @@ function diaspora_request($importer,$xml) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$g = q("select def_gid from user where uid = %d limit 1",
|
||||||
|
intval($importer['uid'])
|
||||||
|
);
|
||||||
|
if($g && intval($g[0]['def_gid'])) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add_member($importer['uid'],'',$contact_record['id'],$g[0]['def_gid']);
|
||||||
|
}
|
||||||
|
|
||||||
if($importer['page-flags'] == PAGE_NORMAL) {
|
if($importer['page-flags'] == PAGE_NORMAL) {
|
||||||
|
|
||||||
$hash = random_string() . (string) time(); // Generate a confirm_key
|
$hash = random_string() . (string) time(); // Generate a confirm_key
|
||||||
|
|
|
||||||
|
|
@ -97,8 +97,9 @@ function group_rmv_member($uid,$name,$member) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function group_add_member($uid,$name,$member) {
|
function group_add_member($uid,$name,$member,$gid = 0) {
|
||||||
$gid = group_byname($uid,$name);
|
if(! $gid)
|
||||||
|
$gid = group_byname($uid,$name);
|
||||||
if((! $gid) || (! $uid) || (! $member))
|
if((! $gid) || (! $uid) || (! $member))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
@ -154,6 +155,32 @@ function group_public_members($gid) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function mini_group_select($uid,$gid = 0) {
|
||||||
|
|
||||||
|
$grps = array();
|
||||||
|
$o = '';
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
$grps[] = array('name' => '', 'id' => '0', 'selected' => '');
|
||||||
|
if(count($r)) {
|
||||||
|
foreach($r as $rr) {
|
||||||
|
$grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
logger('groups: ' . print_r($grps,true));
|
||||||
|
|
||||||
|
$o = replace_macros(get_markup_template('group_selection.tpl'), array(
|
||||||
|
'$label' => t('Default privacy group for new contacts'),
|
||||||
|
'$groups' => $grps
|
||||||
|
));
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
|
function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -959,6 +959,8 @@ function tag_deliver($uid,$item_id) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
|
||||||
|
$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
|
||||||
|
|
||||||
|
|
||||||
$i = q("select * from item where id = %d and uid = %d limit 1",
|
$i = q("select * from item where id = %d and uid = %d limit 1",
|
||||||
intval($item_id),
|
intval($item_id),
|
||||||
|
|
@ -1008,9 +1010,10 @@ function tag_deliver($uid,$item_id) {
|
||||||
'otype' => 'item'
|
'otype' => 'item'
|
||||||
));
|
));
|
||||||
|
|
||||||
if(! $community_page)
|
if((! $community_page) && (! prvgroup))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
// tgroup delivery - setup a second delivery chain
|
// tgroup delivery - setup a second delivery chain
|
||||||
// prevent delivery looping - only proceed
|
// prevent delivery looping - only proceed
|
||||||
// if the message originated elsewhere and is a top-level post
|
// if the message originated elsewhere and is a top-level post
|
||||||
|
|
@ -1031,8 +1034,11 @@ function tag_deliver($uid,$item_id) {
|
||||||
|
|
||||||
$private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
|
$private = ($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0;
|
||||||
|
|
||||||
q("update item set wall = 1, origin = 1, forum_mode = 1, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
|
$forum_mode = (($prvgroup) ? 2 : 1);
|
||||||
|
|
||||||
|
q("update item set wall = 1, origin = 1, forum_mode = %d, `owner-name` = '%s', `owner-link` = '%s', `owner-avatar` = '%s',
|
||||||
`private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' where id = %d limit 1",
|
`private` = %d, `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' where id = %d limit 1",
|
||||||
|
intval($forum_mode),
|
||||||
dbesc($c[0]['name']),
|
dbesc($c[0]['name']),
|
||||||
dbesc($c[0]['url']),
|
dbesc($c[0]['url']),
|
||||||
dbesc($c[0]['thumb']),
|
dbesc($c[0]['thumb']),
|
||||||
|
|
@ -2194,7 +2200,7 @@ function local_delivery($importer,$data) {
|
||||||
if($is_reply) {
|
if($is_reply) {
|
||||||
$community = false;
|
$community = false;
|
||||||
|
|
||||||
if($importer['page-flags'] == PAGE_COMMUNITY) {
|
if($importer['page-flags'] == PAGE_COMMUNITY || $importer['page-flags'] == PAGE_PRVGROUP ) {
|
||||||
$sql_extra = '';
|
$sql_extra = '';
|
||||||
$community = true;
|
$community = true;
|
||||||
logger('local_delivery: possible community reply');
|
logger('local_delivery: possible community reply');
|
||||||
|
|
@ -2221,8 +2227,8 @@ function local_delivery($importer,$data) {
|
||||||
if($r && count($r))
|
if($r && count($r))
|
||||||
$is_a_remote_comment = true;
|
$is_a_remote_comment = true;
|
||||||
|
|
||||||
// Does this have the characteristics of a community comment?
|
// Does this have the characteristics of a community or private group comment?
|
||||||
// If it's a reply to a wall post on a community page it's a
|
// If it's a reply to a wall post on a community/prvgroup page it's a
|
||||||
// valid community comment. Also forum_mode makes it valid for sure.
|
// valid community comment. Also forum_mode makes it valid for sure.
|
||||||
// If neither, it's not.
|
// If neither, it's not.
|
||||||
|
|
||||||
|
|
@ -2711,6 +2717,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
||||||
);
|
);
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
|
||||||
|
if(intval($r[0]['def_gid'])) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add_member($r[0]['uid'],'',$contact_record['id'],$r[0]['def_gid']);
|
||||||
|
}
|
||||||
|
|
||||||
if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) {
|
if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) {
|
||||||
$email_tpl = get_intltext_template('follow_notify_eml.tpl');
|
$email_tpl = get_intltext_template('follow_notify_eml.tpl');
|
||||||
$email = replace_macros($email_tpl, array(
|
$email = replace_macros($email_tpl, array(
|
||||||
|
|
|
||||||
|
|
@ -876,3 +876,167 @@ function fix_contact_ssl_policy(&$contact,$new_policy) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* xml2array() will convert the given XML text to an array in the XML structure.
|
||||||
|
* Link: http://www.bin-co.com/php/scripts/xml2array/
|
||||||
|
* Portions significantly re-written by mike@macgirvin.com for Friendica (namespaces, lowercase tags, get_attribute default changed, more...)
|
||||||
|
* Arguments : $contents - The XML text
|
||||||
|
* $namespaces - true or false include namespace information in the returned array as array elements.
|
||||||
|
* $get_attributes - 1 or 0. If this is 1 the function will get the attributes as well as the tag values - this results in a different array structure in the return value.
|
||||||
|
* $priority - Can be 'tag' or 'attribute'. This will change the way the resulting array sturcture. For 'tag', the tags are given more importance.
|
||||||
|
* Return: The parsed XML in an array form. Use print_r() to see the resulting array structure.
|
||||||
|
* Examples: $array = xml2array(file_get_contents('feed.xml'));
|
||||||
|
* $array = xml2array(file_get_contents('feed.xml', true, 1, 'attribute'));
|
||||||
|
*/
|
||||||
|
|
||||||
|
function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') {
|
||||||
|
if(!$contents) return array();
|
||||||
|
|
||||||
|
if(!function_exists('xml_parser_create')) {
|
||||||
|
logger('xml2array: parser function missing');
|
||||||
|
return array();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
libxml_use_internal_errors(true);
|
||||||
|
libxml_clear_errors();
|
||||||
|
|
||||||
|
if($namespaces)
|
||||||
|
$parser = @xml_parser_create_ns("UTF-8",':');
|
||||||
|
else
|
||||||
|
$parser = @xml_parser_create();
|
||||||
|
|
||||||
|
if(! $parser) {
|
||||||
|
logger('xml2array: xml_parser_create: no resource');
|
||||||
|
return array();
|
||||||
|
}
|
||||||
|
|
||||||
|
xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, "UTF-8");
|
||||||
|
// http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
|
||||||
|
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
|
||||||
|
xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
|
||||||
|
@xml_parse_into_struct($parser, trim($contents), $xml_values);
|
||||||
|
@xml_parser_free($parser);
|
||||||
|
|
||||||
|
if(! $xml_values) {
|
||||||
|
logger('xml2array: libxml: parse error: ' . $contents, LOGGER_DATA);
|
||||||
|
foreach(libxml_get_errors() as $err)
|
||||||
|
logger('libxml: parse: ' . $err->code . " at " . $err->line . ":" . $err->column . " : " . $err->message, LOGGER_DATA);
|
||||||
|
libxml_clear_errors();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Initializations
|
||||||
|
$xml_array = array();
|
||||||
|
$parents = array();
|
||||||
|
$opened_tags = array();
|
||||||
|
$arr = array();
|
||||||
|
|
||||||
|
$current = &$xml_array; // Reference
|
||||||
|
|
||||||
|
// Go through the tags.
|
||||||
|
$repeated_tag_index = array(); // Multiple tags with same name will be turned into an array
|
||||||
|
foreach($xml_values as $data) {
|
||||||
|
unset($attributes,$value); // Remove existing values, or there will be trouble
|
||||||
|
|
||||||
|
// This command will extract these variables into the foreach scope
|
||||||
|
// tag(string), type(string), level(int), attributes(array).
|
||||||
|
extract($data); // We could use the array by itself, but this cooler.
|
||||||
|
|
||||||
|
$result = array();
|
||||||
|
$attributes_data = array();
|
||||||
|
|
||||||
|
if(isset($value)) {
|
||||||
|
if($priority == 'tag') $result = $value;
|
||||||
|
else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
|
||||||
|
}
|
||||||
|
|
||||||
|
//Set the attributes too.
|
||||||
|
if(isset($attributes) and $get_attributes) {
|
||||||
|
foreach($attributes as $attr => $val) {
|
||||||
|
if($priority == 'tag') $attributes_data[$attr] = $val;
|
||||||
|
else $result['@attributes'][$attr] = $val; // Set all the attributes in a array called 'attr'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// See tag status and do the needed.
|
||||||
|
if($namespaces && strpos($tag,':')) {
|
||||||
|
$namespc = substr($tag,0,strrpos($tag,':'));
|
||||||
|
$tag = strtolower(substr($tag,strlen($namespc)+1));
|
||||||
|
$result['@namespace'] = $namespc;
|
||||||
|
}
|
||||||
|
$tag = strtolower($tag);
|
||||||
|
|
||||||
|
if($type == "open") { // The starting of the tag '<tag>'
|
||||||
|
$parent[$level-1] = &$current;
|
||||||
|
if(!is_array($current) or (!in_array($tag, array_keys($current)))) { // Insert New tag
|
||||||
|
$current[$tag] = $result;
|
||||||
|
if($attributes_data) $current[$tag. '_attr'] = $attributes_data;
|
||||||
|
$repeated_tag_index[$tag.'_'.$level] = 1;
|
||||||
|
|
||||||
|
$current = &$current[$tag];
|
||||||
|
|
||||||
|
} else { // There was another element with the same tag name
|
||||||
|
|
||||||
|
if(isset($current[$tag][0])) { // If there is a 0th element it is already an array
|
||||||
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
|
||||||
|
$repeated_tag_index[$tag.'_'.$level]++;
|
||||||
|
} else { // This section will make the value an array if multiple tags with the same name appear together
|
||||||
|
$current[$tag] = array($current[$tag],$result); // This will combine the existing item and the new item together to make an array
|
||||||
|
$repeated_tag_index[$tag.'_'.$level] = 2;
|
||||||
|
|
||||||
|
if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
|
||||||
|
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
|
||||||
|
unset($current[$tag.'_attr']);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
$last_item_index = $repeated_tag_index[$tag.'_'.$level]-1;
|
||||||
|
$current = &$current[$tag][$last_item_index];
|
||||||
|
}
|
||||||
|
|
||||||
|
} elseif($type == "complete") { // Tags that ends in 1 line '<tag />'
|
||||||
|
//See if the key is already taken.
|
||||||
|
if(!isset($current[$tag])) { //New Key
|
||||||
|
$current[$tag] = $result;
|
||||||
|
$repeated_tag_index[$tag.'_'.$level] = 1;
|
||||||
|
if($priority == 'tag' and $attributes_data) $current[$tag. '_attr'] = $attributes_data;
|
||||||
|
|
||||||
|
} else { // If taken, put all things inside a list(array)
|
||||||
|
if(isset($current[$tag][0]) and is_array($current[$tag])) { // If it is already an array...
|
||||||
|
|
||||||
|
// ...push the new element into that array.
|
||||||
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
|
||||||
|
|
||||||
|
if($priority == 'tag' and $get_attributes and $attributes_data) {
|
||||||
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
|
||||||
|
}
|
||||||
|
$repeated_tag_index[$tag.'_'.$level]++;
|
||||||
|
|
||||||
|
} else { // If it is not an array...
|
||||||
|
$current[$tag] = array($current[$tag],$result); //...Make it an array using using the existing value and the new value
|
||||||
|
$repeated_tag_index[$tag.'_'.$level] = 1;
|
||||||
|
if($priority == 'tag' and $get_attributes) {
|
||||||
|
if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
|
||||||
|
|
||||||
|
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
|
||||||
|
unset($current[$tag.'_attr']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if($attributes_data) {
|
||||||
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$repeated_tag_index[$tag.'_'.$level]++; // 0 and 1 indexes are already taken
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} elseif($type == 'close') { // End of tag '</tag>'
|
||||||
|
$current = &$parent[$level-1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return($xml_array);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -220,7 +220,7 @@ function notifier_run($argv, $argc){
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(($cmd === 'uplink') && (intval($parent['forum_mode'])) && (! $top_level)) {
|
if(($cmd === 'uplink') && (intval($parent['forum_mode']) == 1) && (! $top_level)) {
|
||||||
$relay_to_owner = true;
|
$relay_to_owner = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -265,10 +265,10 @@ function notifier_run($argv, $argc){
|
||||||
$deny_people = expand_acl($parent['deny_cid']);
|
$deny_people = expand_acl($parent['deny_cid']);
|
||||||
$deny_groups = expand_groups(expand_acl($parent['deny_gid']));
|
$deny_groups = expand_groups(expand_acl($parent['deny_gid']));
|
||||||
|
|
||||||
// if our parent is a forum, uplink to the origional author causing
|
// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
|
||||||
// a delivery fork
|
// a delivery fork. private groups (forum_mode == 2) do not uplink
|
||||||
|
|
||||||
if(intval($parent['forum_mode']) && (! $top_level) && ($cmd !== 'uplink')) {
|
if((intval($parent['forum_mode']) == 1) && (! $top_level) && ($cmd !== 'uplink')) {
|
||||||
proc_run('php','include/notifier','uplink',$item_id);
|
proc_run('php','include/notifier','uplink',$item_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -478,6 +478,12 @@ function notifier_run($argv, $argc){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
|
||||||
|
if($deliveries_per_process <= 0)
|
||||||
|
$deliveries_per_process = 1;
|
||||||
|
|
||||||
|
$this_batch = array();
|
||||||
|
|
||||||
foreach($r as $contact) {
|
foreach($r as $contact) {
|
||||||
if($contact['self'])
|
if($contact['self'])
|
||||||
continue;
|
continue;
|
||||||
|
|
@ -486,6 +492,7 @@ function notifier_run($argv, $argc){
|
||||||
// we will deliver single recipient types of message and email receipients here.
|
// we will deliver single recipient types of message and email receipients here.
|
||||||
|
|
||||||
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
||||||
|
// deliveries per process not yet implemented, 1 delivery per process.
|
||||||
proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
|
proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
|
||||||
if($interval)
|
if($interval)
|
||||||
@time_sleep_until(microtime(true) + (float) $interval);
|
@time_sleep_until(microtime(true) + (float) $interval);
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
//
|
//
|
||||||
var gLngMaxStateLength=0;
|
var gLngMaxStateLength=0;
|
||||||
var gLngMaxCountryLength=0;
|
var gLngMaxCountryLength=0;
|
||||||
var gLngNumberCountries=252;
|
var gLngNumberCountries=253;
|
||||||
var gLngNumberStates=0;
|
var gLngNumberStates=0;
|
||||||
var gLngSelectedCountry=0;
|
var gLngSelectedCountry=0;
|
||||||
var gLngSelectedState=0;
|
var gLngSelectedState=0;
|
||||||
|
|
@ -17,7 +17,7 @@ var gArCountryInfo;
|
||||||
var gArStateInfo;
|
var gArStateInfo;
|
||||||
// NOTE:
|
// NOTE:
|
||||||
// Some editors may exhibit problems viewing 2803 characters...
|
// Some editors may exhibit problems viewing 2803 characters...
|
||||||
var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe";
|
var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe|Friendicaland"
|
||||||
var aStates = new Array();
|
var aStates = new Array();
|
||||||
|
|
||||||
aStates[0]="";
|
aStates[0]="";
|
||||||
|
|
@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
|
||||||
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
|
aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
|
||||||
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
|
aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
|
||||||
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
|
aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
|
||||||
|
aStates[253]="Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Oradons Friendica|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
|
||||||
/*
|
/*
|
||||||
* gArCountryInfo
|
* gArCountryInfo
|
||||||
* (0) Country name
|
* (0) Country name
|
||||||
|
|
|
||||||
|
|
@ -500,6 +500,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$g = q("select def_gid from user where uid = %d limit 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
if($contact && $g && intval($g[0]['def_gid'])) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add_member($uid,'',$contact[0]['id'],$g[0]['def_gid']);
|
||||||
|
}
|
||||||
|
|
||||||
// Let's send our user to the contact editor in case they want to
|
// Let's send our user to the contact editor in case they want to
|
||||||
// do anything special with this new friend.
|
// do anything special with this new friend.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -370,6 +370,14 @@ function dfrn_request_post(&$a) {
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$contact_id = $r[0]['id'];
|
$contact_id = $r[0]['id'];
|
||||||
|
|
||||||
|
$g = q("select def_gid from user where uid = %d limit 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
if($g && intval($g[0]['def_gid'])) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
|
||||||
|
}
|
||||||
|
|
||||||
$photo = avatar_img($addr);
|
$photo = avatar_img($addr);
|
||||||
|
|
||||||
$r = q("UPDATE `contact` SET
|
$r = q("UPDATE `contact` SET
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,9 @@ function dirfind_init(&$a) {
|
||||||
function dirfind_content(&$a) {
|
function dirfind_content(&$a) {
|
||||||
|
|
||||||
$search = notags(trim($_REQUEST['search']));
|
$search = notags(trim($_REQUEST['search']));
|
||||||
|
|
||||||
|
if(strpos($search,'@') === 0)
|
||||||
|
$search = substr($search,1);
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,7 @@ function follow_init(&$a) {
|
||||||
dbesc($ret['poll'])
|
dbesc($ret['poll'])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
// update contact
|
// update contact
|
||||||
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
||||||
|
|
@ -165,6 +166,15 @@ function follow_init(&$a) {
|
||||||
$contact = $r[0];
|
$contact = $r[0];
|
||||||
$contact_id = $r[0]['id'];
|
$contact_id = $r[0]['id'];
|
||||||
|
|
||||||
|
|
||||||
|
$g = q("select def_gid from user where uid = %d limit 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
if($g && intval($g[0]['def_gid'])) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
|
||||||
|
}
|
||||||
|
|
||||||
require_once("Photo.php");
|
require_once("Photo.php");
|
||||||
|
|
||||||
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
|
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
|
||||||
|
|
|
||||||
19
mod/item.php
19
mod/item.php
|
|
@ -218,14 +218,23 @@ function item_post(&$a) {
|
||||||
|
|
||||||
$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
|
$private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
|
||||||
|
|
||||||
if(($parent_item) &&
|
// If this is a comment, set the permissions from the parent.
|
||||||
(($parent_item['private'])
|
|
||||||
|
if($parent_item) {
|
||||||
|
$private = 0;
|
||||||
|
|
||||||
|
if(($parent_item['private'])
|
||||||
|| strlen($parent_item['allow_cid'])
|
|| strlen($parent_item['allow_cid'])
|
||||||
|| strlen($parent_item['allow_gid'])
|
|| strlen($parent_item['allow_gid'])
|
||||||
|| strlen($parent_item['deny_cid'])
|
|| strlen($parent_item['deny_cid'])
|
||||||
|| strlen($parent_item['deny_gid'])
|
|| strlen($parent_item['deny_gid'])) {
|
||||||
)) {
|
$private = 1;
|
||||||
$private = 1;
|
}
|
||||||
|
|
||||||
|
$str_contact_allow = $parent_item['allow_cid'];
|
||||||
|
$str_group_allow = $parent_item['allow_gid'];
|
||||||
|
$str_contact_deny = $parent_item['deny_cid'];
|
||||||
|
$str_group_deny = $parent_item['deny_gid'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
|
$pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0);
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@ function photo_init(&$a) {
|
||||||
}
|
}
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
|
$prvcachecontrol = false;
|
||||||
|
|
||||||
switch($a->argc) {
|
switch($a->argc) {
|
||||||
case 4:
|
case 4:
|
||||||
$person = $a->argv[3];
|
$person = $a->argv[3];
|
||||||
|
|
@ -134,6 +136,7 @@ function photo_init(&$a) {
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$data = file_get_contents('images/nosign.jpg');
|
$data = file_get_contents('images/nosign.jpg');
|
||||||
|
$prvcachecontrol = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -179,8 +182,22 @@ function photo_init(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
header("Content-type: image/jpeg");
|
header("Content-type: image/jpeg");
|
||||||
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
|
|
||||||
header("Cache-Control: max-age=" . (3600*24));
|
if($prvcachecontrol) {
|
||||||
|
|
||||||
|
// it is a private photo that they have no permission to view.
|
||||||
|
// tell the browser not to cache it, in case they authenticate
|
||||||
|
// and subsequently have permission to see it
|
||||||
|
|
||||||
|
header("Cache-Control: no-store, no-cache, must-revalidate");
|
||||||
|
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
|
||||||
|
header("Cache-Control: max-age=" . (3600*24));
|
||||||
|
|
||||||
|
}
|
||||||
echo $data;
|
echo $data;
|
||||||
killme();
|
killme();
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
|
|
|
||||||
|
|
@ -329,7 +329,7 @@ function profile_activity($changed, $value) {
|
||||||
|
|
||||||
if($t == 1 && strlen($value)) {
|
if($t == 1 && strlen($value)) {
|
||||||
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
|
$message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value);
|
||||||
$message .= "\n\n" . sprintf( t(" - Visit %1$s\'s %2$s"), $A, $prof);
|
$message .= "\n\n" . sprintf( t(' - Visit %1$s\'s %2$s'), $A, $prof);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
$message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
|
$message = sprintf( t('%1$s has an updated %2$s, changing %3$s.'), $A, $prof, $changes);
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ function search_content(&$a) {
|
||||||
|
|
||||||
$o = '<div id="live-search"></div>' . "\r\n";
|
$o = '<div id="live-search"></div>' . "\r\n";
|
||||||
|
|
||||||
$o .= '<h3>' . t('Search This Site') . '</h3>';
|
$o .= '<h3>' . t('Search') . '</h3>';
|
||||||
|
|
||||||
if(x($a->data,'search'))
|
if(x($a->data,'search'))
|
||||||
$search = notags(trim($a->data['search']));
|
$search = notags(trim($a->data['search']));
|
||||||
|
|
@ -96,6 +96,16 @@ function search_content(&$a) {
|
||||||
|
|
||||||
$o .= search($search,'search-box','/search',((local_user()) ? true : false));
|
$o .= search($search,'search-box','/search',((local_user()) ? true : false));
|
||||||
|
|
||||||
|
|
||||||
|
if(strpos($search,'#') === 0) {
|
||||||
|
$tag = true;
|
||||||
|
$search = substr($search,1);
|
||||||
|
}
|
||||||
|
if(strpos($search,'@') === 0) {
|
||||||
|
require_once('mod/dirfind.php');
|
||||||
|
return dirfind_content($a);
|
||||||
|
}
|
||||||
|
|
||||||
if(! $search)
|
if(! $search)
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -330,6 +330,7 @@ function settings_post(&$a) {
|
||||||
$openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
|
$openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
|
||||||
$maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
|
$maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0);
|
||||||
$expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
|
$expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0);
|
||||||
|
$def_gid = ((x($_POST,'group-selection')) ? intval($_POST['group-selection']) : 0);
|
||||||
|
|
||||||
|
|
||||||
$expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
|
$expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0);
|
||||||
|
|
@ -355,7 +356,6 @@ function settings_post(&$a) {
|
||||||
$post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
|
$post_joingroup = (($_POST['post_joingroup'] == 1) ? 1: 0);
|
||||||
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
|
$post_profilechange = (($_POST['post_profilechange'] == 1) ? 1: 0);
|
||||||
|
|
||||||
|
|
||||||
$notify = 0;
|
$notify = 0;
|
||||||
|
|
||||||
if(x($_POST,'notify1'))
|
if(x($_POST,'notify1'))
|
||||||
|
|
@ -441,7 +441,20 @@ function settings_post(&$a) {
|
||||||
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
|
set_pconfig(local_user(),'system','post_profilechange', $post_profilechange);
|
||||||
|
|
||||||
|
|
||||||
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1",
|
if($page_flags == PAGE_PRVGROUP) {
|
||||||
|
$hidewall = 1;
|
||||||
|
if((! str_contact_allow) && (! str_group_allow) && (! str_contact_deny) && (! $str_group_deny)) {
|
||||||
|
if($def_gid) {
|
||||||
|
info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL);
|
||||||
|
$str_group_allow = '<' . $def_gid . '>';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
notice( t('Private forum has no privacy permissions and no default privacy group.') . EOL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1",
|
||||||
dbesc($username),
|
dbesc($username),
|
||||||
dbesc($email),
|
dbesc($email),
|
||||||
dbesc($openid),
|
dbesc($openid),
|
||||||
|
|
@ -457,6 +470,7 @@ function settings_post(&$a) {
|
||||||
intval($maxreq),
|
intval($maxreq),
|
||||||
intval($expire),
|
intval($expire),
|
||||||
dbesc($openidserver),
|
dbesc($openidserver),
|
||||||
|
intval($def_gid),
|
||||||
intval($blockwall),
|
intval($blockwall),
|
||||||
intval($hidewall),
|
intval($hidewall),
|
||||||
intval($blocktags),
|
intval($blocktags),
|
||||||
|
|
@ -833,6 +847,13 @@ function settings_content(&$a) {
|
||||||
'$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE,
|
'$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE,
|
||||||
t('Automatically approve all connection/friend requests as friends'),
|
t('Automatically approve all connection/friend requests as friends'),
|
||||||
($a->user['page-flags'] == PAGE_FREELOVE)),
|
($a->user['page-flags'] == PAGE_FREELOVE)),
|
||||||
|
|
||||||
|
'$page_prvgroup' => array('page-flags', t('Private Forum'), PAGE_PRVGROUP,
|
||||||
|
t('Private forum - approved members only [Experimental]'),
|
||||||
|
($a->user['page-flags'] == PAGE_PRVGROUP)),
|
||||||
|
|
||||||
|
'$experimental' => ( (intval(get_config('system','prvgroup_testing'))) ? 'true' : ''),
|
||||||
|
|
||||||
));
|
));
|
||||||
|
|
||||||
$noid = get_config('system','no_openid');
|
$noid = get_config('system','no_openid');
|
||||||
|
|
@ -934,6 +955,9 @@ function settings_content(&$a) {
|
||||||
'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),
|
'photos' => array('expire_photos', t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
require_once('include/group.php');
|
||||||
|
$group_select = mini_group_select(local_user(),$a->user['def_gid']);
|
||||||
|
|
||||||
$o .= replace_macros($stpl,array(
|
$o .= replace_macros($stpl,array(
|
||||||
'$ptitle' => t('Account Settings'),
|
'$ptitle' => t('Account Settings'),
|
||||||
|
|
||||||
|
|
@ -941,7 +965,6 @@ function settings_content(&$a) {
|
||||||
'$baseurl' => $a->get_baseurl(true),
|
'$baseurl' => $a->get_baseurl(true),
|
||||||
'$uid' => local_user(),
|
'$uid' => local_user(),
|
||||||
'$form_security_token' => get_form_security_token("settings"),
|
'$form_security_token' => get_form_security_token("settings"),
|
||||||
|
|
||||||
'$nickname_block' => $prof_addr,
|
'$nickname_block' => $prof_addr,
|
||||||
|
|
||||||
'$h_pass' => t('Password Settings'),
|
'$h_pass' => t('Password Settings'),
|
||||||
|
|
@ -968,6 +991,10 @@ function settings_content(&$a) {
|
||||||
'$suggestme' => $suggestme,
|
'$suggestme' => $suggestme,
|
||||||
'$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
|
'$blockwall'=> $blockwall, // array('blockwall', t('Allow friends to post to your profile page:'), !$blockwall, ''),
|
||||||
'$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
|
'$blocktags'=> $blocktags, // array('blocktags', t('Allow friends to tag your posts:'), !$blocktags, ''),
|
||||||
|
|
||||||
|
'$group_select' => $group_select,
|
||||||
|
|
||||||
|
|
||||||
'$expire' => $expire_arr,
|
'$expire' => $expire_arr,
|
||||||
|
|
||||||
'$profile_in_dir' => $profile_in_dir,
|
'$profile_in_dir' => $profile_in_dir,
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
define( 'UPDATE_VERSION' , 1143 );
|
define( 'UPDATE_VERSION' , 1144 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
@ -1246,5 +1246,12 @@ function update_1142() {
|
||||||
return UPDATE_SUCCESS ;
|
return UPDATE_SUCCESS ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function update_1143() {
|
||||||
|
$r = q("alter table user add def_gid int(11) not null default '0' after service_class");
|
||||||
|
if(! $r)
|
||||||
|
return UPDATE_FAILED ;
|
||||||
|
return UPDATE_SUCCESS ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
550
util/messages.po
550
util/messages.po
File diff suppressed because it is too large
Load diff
8
view/group_selection.tpl
Normal file
8
view/group_selection.tpl
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
<div class="field custom">
|
||||||
|
<label for="group-selection" id="group-selection-lbl">$label</label>
|
||||||
|
<select name="group-selection" id="group-selection" >
|
||||||
|
{{ for $groups as $group }}
|
||||||
|
<option value="$group.id" {{ if $group.selected }}selected="selected"{{ endif }} >$group.name</option>
|
||||||
|
{{ endfor }}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
@ -2,3 +2,6 @@
|
||||||
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
|
{{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
|
||||||
{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
|
{{inc field_radio.tpl with $field=$page_community }}{{endinc}}
|
||||||
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
|
{{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
|
||||||
|
{{ if $experimental }}
|
||||||
|
{{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
|
||||||
|
{{ endif }}
|
||||||
|
|
@ -56,9 +56,12 @@ $suggestme
|
||||||
|
|
||||||
$unkmail
|
$unkmail
|
||||||
|
|
||||||
|
|
||||||
{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
|
{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
|
||||||
|
|
||||||
{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
|
{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
|
||||||
|
|
||||||
|
|
||||||
<div class="field input">
|
<div class="field input">
|
||||||
<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
|
<span class="field_help"><a href="#advanced-expire-popup" id="advanced-expire" class='popupbox' title="$expire.advanced">$expire.label</a></span>
|
||||||
<div style="display: none;">
|
<div style="display: none;">
|
||||||
|
|
@ -90,6 +93,8 @@ $unkmail
|
||||||
<br/>
|
<br/>
|
||||||
<div id="settings-default-perms-end"></div>
|
<div id="settings-default-perms-end"></div>
|
||||||
|
|
||||||
|
$group_select
|
||||||
|
|
||||||
|
|
||||||
<div class="settings-submit-wrapper" >
|
<div class="settings-submit-wrapper" >
|
||||||
<input type="submit" name="submit" class="settings-submit" value="Submit" />
|
<input type="submit" name="submit" class="settings-submit" value="Submit" />
|
||||||
|
|
|
||||||
|
|
@ -22,9 +22,14 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
|
||||||
|
|
||||||
nav #banner #logo-text a { color: #ffffff; }
|
nav #banner #logo-text a { color: #ffffff; }
|
||||||
|
|
||||||
.wall-item-content-wrapper { border: 1px solid #444444; }
|
.wall-item-content-wrapper {
|
||||||
|
border: 1px solid #444444;
|
||||||
|
background: #444;
|
||||||
|
|
||||||
|
}
|
||||||
.wall-item-tools { background-color: #444444; background-image: none;}
|
.wall-item-tools { background-color: #444444; background-image: none;}
|
||||||
.comment-edit-wrapper{ background-color: #333333; }
|
.comment-wwedit-wrapper{ background-color: #333333; }
|
||||||
|
.comment-edit-preview{ color: #000000; }
|
||||||
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
|
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
|
||||||
.photo-top-album-name{ background-color: #333333; }
|
.photo-top-album-name{ background-color: #333333; }
|
||||||
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
|
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
|
||||||
|
|
@ -75,25 +80,77 @@ input#dfrn-url {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#jot-title {
|
#jot-title, #jot-category {
|
||||||
background-color: #333333;
|
background-color: #333333;
|
||||||
border: 1px solid #333333;
|
border: 1px solid #333333;
|
||||||
}
|
}
|
||||||
|
|
||||||
#jot-title::-webkit-input-placeholder{ color: #555555!important;}
|
#jot-title::-webkit-input-placeholder{ color: #555555!important;}
|
||||||
#jot-title:-moz-placeholder{color: #555555!important;}
|
#jot-title:-moz-placeholder{color: #555555!important;}
|
||||||
|
#jot-category::-webkit-input-placeholder{ color: #555555!important;}
|
||||||
|
#jot-category:-moz-placeholder{color: #555555!important;}
|
||||||
|
|
||||||
|
|
||||||
#jot-title:hover,
|
#jot-title:hover,
|
||||||
#jot-title:focus {
|
#jot-title:focus,
|
||||||
|
#jot-category:hover,
|
||||||
|
#jot-category:focus {
|
||||||
border: 1px solid #cccccc;
|
border: 1px solid #cccccc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wall-item-content {
|
|
||||||
max-height: 20000px;
|
|
||||||
overflow: none;
|
|
||||||
}
|
|
||||||
blockquote {
|
blockquote {
|
||||||
background: #ddd;
|
background: #ddd;
|
||||||
color: #000;
|
color: #000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
|
||||||
|
color: #eec;
|
||||||
|
}
|
||||||
|
|
||||||
|
input#acl-search {
|
||||||
|
background-color: #aaa;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.notify-seen {
|
||||||
|
background:#666;
|
||||||
|
}
|
||||||
|
|
||||||
|
#nav-notifications-menu {
|
||||||
|
background: #2e2e2f;
|
||||||
|
}
|
||||||
|
|
||||||
|
#nav-notifications-menu li:hover {
|
||||||
|
background: #444;
|
||||||
|
}
|
||||||
|
|
||||||
|
.acpopupitem{
|
||||||
|
background:#2e2f2e;
|
||||||
|
}
|
||||||
|
|
||||||
|
code {
|
||||||
|
background:#2e2f2e !important;
|
||||||
|
color:#fff !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
blockquote {
|
||||||
|
background:#2e2f2e !important;
|
||||||
|
color:#eec !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-selected, .nets-selected, .fileas-selected, .categories-selected {
|
||||||
|
background:#2e2f2e;
|
||||||
|
}
|
||||||
|
|
||||||
|
#fancybox-content{
|
||||||
|
background:#444;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.wall-item-content {
|
||||||
|
max-height: 20000px;
|
||||||
|
overflow: none;
|
||||||
|
}
|
||||||
|
|
@ -22,7 +22,11 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
|
||||||
|
|
||||||
nav #banner #logo-text a { color: #ffffff; }
|
nav #banner #logo-text a { color: #ffffff; }
|
||||||
|
|
||||||
.wall-item-content-wrapper { border: 1px solid #444444; }
|
.wall-item-content-wrapper {
|
||||||
|
border: 1px solid #444444;
|
||||||
|
background: #444;
|
||||||
|
|
||||||
|
}
|
||||||
.wall-item-tools { background-color: #444444; background-image: none;}
|
.wall-item-tools { background-color: #444444; background-image: none;}
|
||||||
.comment-wwedit-wrapper{ background-color: #333333; }
|
.comment-wwedit-wrapper{ background-color: #333333; }
|
||||||
.comment-edit-preview{ color: #000000; }
|
.comment-edit-preview{ color: #000000; }
|
||||||
|
|
@ -99,7 +103,7 @@ blockquote {
|
||||||
}
|
}
|
||||||
|
|
||||||
.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
|
.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
|
||||||
color: #000000;
|
color: #eec;
|
||||||
}
|
}
|
||||||
|
|
||||||
input#acl-search {
|
input#acl-search {
|
||||||
|
|
@ -118,4 +122,27 @@ input#acl-search {
|
||||||
|
|
||||||
#nav-notifications-menu li:hover {
|
#nav-notifications-menu li:hover {
|
||||||
background: #444;
|
background: #444;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.acpopupitem{
|
||||||
|
background:#2e2f2e;
|
||||||
|
}
|
||||||
|
|
||||||
|
code {
|
||||||
|
background:#2e2f2e !important;
|
||||||
|
color:#fff !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
blockquote {
|
||||||
|
background:#2e2f2e !important;
|
||||||
|
color:#eec !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.group-selected, .nets-selected, .fileas-selected, .categories-selected {
|
||||||
|
background:#2e2f2e;
|
||||||
|
}
|
||||||
|
|
||||||
|
#fancybox-content{
|
||||||
|
background:#444;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -464,7 +464,7 @@ code {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
width: 12em;
|
width: 12em;
|
||||||
background: #2e2f2e;
|
background: #2e2f2e;
|
||||||
color: #2e2f2e;
|
color: #eec;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
padding: 1em;
|
padding: 1em;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
|
|
@ -667,7 +667,7 @@ nav .nav-menu-icon:hover {
|
||||||
}
|
}
|
||||||
|
|
||||||
nav .nav-menu-icon.selected {
|
nav .nav-menu-icon.selected {
|
||||||
background-color: #fff;
|
background-color: #308dbf;
|
||||||
}
|
}
|
||||||
nav .nav-menu-icon img {
|
nav .nav-menu-icon img {
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
|
@ -1434,7 +1434,8 @@ transition: all 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
.wall-item-comment-wrapper textarea {
|
.wall-item-comment-wrapper textarea {
|
||||||
height: 2.0em;
|
height: 2.0em;
|
||||||
width: 100%;
|
/**No idea what's going on here, but at 100%, it's fugly **/
|
||||||
|
width: 98% !important;
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
border: 1px solid #2e2e2f;
|
border: 1px solid #2e2e2f;
|
||||||
|
|
|
||||||
|
|
@ -1216,7 +1216,7 @@ right_aside {
|
||||||
|
|
||||||
/* background: #F1F1F1; */
|
/* background: #F1F1F1; */
|
||||||
}
|
}
|
||||||
right_aside a{color: #1872A2;}
|
right_aside a{color: #88a9d2;}
|
||||||
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
|
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px;
|
||||||
margin-top:30px;}
|
margin-top:30px;}
|
||||||
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ h6{font-size:xx-small;}
|
||||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
#articlemain{width:100%;height:100%;margin:0 auto;}
|
||||||
.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
|
.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
|
||||||
.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
|
.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
|
||||||
[class$="-desc"],[id$="-desc"]{color:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||||
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
||||||
.intro-approve-as-friend-desc{margin-top:10px;}
|
.intro-approve-as-friend-desc{margin-top:10px;}
|
||||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||||
|
|
|
||||||
|
|
@ -301,8 +301,8 @@ h6 {
|
||||||
}
|
}
|
||||||
[class$="-desc"],
|
[class$="-desc"],
|
||||||
[id$="-desc"] {
|
[id$="-desc"] {
|
||||||
color: @bg_colour;
|
color: @main_colour;
|
||||||
// background: @main_colour;
|
background: @bg_colour;
|
||||||
.borders(1px, outset, @main_colour);
|
.borders(1px, outset, @main_colour);
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
// .box_shadow(3px, 3px, 5px);
|
// .box_shadow(3px, 3px, 5px);
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ h6{font-size:xx-small;}
|
||||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
#articlemain{width:100%;height:100%;margin:0 auto;}
|
||||||
.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
|
.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
|
||||||
.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
|
.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
|
||||||
[class$="-desc"],[id$="-desc"]{color:#eeeeec;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||||
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
||||||
.intro-approve-as-friend-desc{margin-top:10px;}
|
.intro-approve-as-friend-desc{margin-top:10px;}
|
||||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||||
|
|
|
||||||
|
|
@ -303,7 +303,7 @@ h6 {
|
||||||
[class$="-desc"],
|
[class$="-desc"],
|
||||||
[id$="-desc"] {
|
[id$="-desc"] {
|
||||||
color: @bg_colour;
|
color: @bg_colour;
|
||||||
// background: @main_colour;
|
background: @main_colour;
|
||||||
.borders(1px, outset, @bg_colour);
|
.borders(1px, outset, @bg_colour);
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
// .box_shadow(3px, 3px, 5px);
|
// .box_shadow(3px, 3px, 5px);
|
||||||
|
|
|
||||||
|
|
@ -1091,6 +1091,11 @@ input#dfrn-url {
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.wall-item-content img {
|
||||||
|
max-width: 700px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.wall-item-title {
|
.wall-item-title {
|
||||||
float: left;
|
float: left;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue