Merge branch 'master' of git://github.com/friendica/friendica
This commit is contained in:
Vasudev Kamath
commit
12474e3c2e
47
INSTALL.txt
47
INSTALL.txt
|
|
@ -222,3 +222,50 @@ Retry the installation. As soon as the database has been created,
|
||||||
|
|
||||||
% chmod 755 .htconfig.php
|
% chmod 755 .htconfig.php
|
||||||
|
|
||||||
|
#####################################################################
|
||||||
|
- Some configurations with "suhosin" security are configured without
|
||||||
|
an ability to run external processes. Friendica requires this ability.
|
||||||
|
Following are some notes provided by one of our members.
|
||||||
|
#####################################################################
|
||||||
|
|
||||||
|
On my server I use the php protection system Suhosin
|
||||||
|
[http://www.hardened-php.net/suhosin/]. One of the things it does is to block
|
||||||
|
certain functions like proc_open, as configured in /etc/php5/conf.d/suhosin.ini:
|
||||||
|
|
||||||
|
suhosin.executor.func.blacklist = proc_open, ...
|
||||||
|
|
||||||
|
For those sites like Friendica that really need these functions they can be
|
||||||
|
enabled, e.g. in /etc/apache2/sites-available/friendica:
|
||||||
|
|
||||||
|
<Directory /var/www/friendica/>
|
||||||
|
php_admin_value suhosin.executor.func.blacklist none
|
||||||
|
php_admin_value suhosin.executor.eval.blacklist none
|
||||||
|
</Directory>
|
||||||
|
|
||||||
|
This enables every function for Friendica if accessed via browser, but not for
|
||||||
|
the cronjob that is called via php command line. I attempted to enable it for
|
||||||
|
cron by using something like
|
||||||
|
|
||||||
|
*/10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php
|
||||||
|
-d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none
|
||||||
|
-f include/poller.php
|
||||||
|
|
||||||
|
This worked well for simple test cases, but the friendica-cron still failed with
|
||||||
|
a fatal error:
|
||||||
|
suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker
|
||||||
|
'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', line 1341)
|
||||||
|
|
||||||
|
After a while I noticed, that include/poller.php calls further php script via
|
||||||
|
proc_open. These scripts themselves also use proc_open and fail, because they
|
||||||
|
are NOT called with -d suhosin.executor.func.blacklist=none.
|
||||||
|
|
||||||
|
So the simple solution is to put the correct parameters into .htconfig.php:
|
||||||
|
// Location of PHP command line processor
|
||||||
|
$a->config['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none
|
||||||
|
-d suhosin.executor.eval.blacklist=none';
|
||||||
|
|
||||||
|
|
||||||
|
This is obvious as soon as you notice that the friendica-cron uses proc_open to
|
||||||
|
execute php-scripts that also use proc_open, but it took me quite some time to
|
||||||
|
find that out. I hope this saves some time for other people using suhosin with
|
||||||
|
function blacklists.
|
||||||
|
|
|
||||||
49
boot.php
49
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.1338' );
|
define ( 'FRIENDICA_VERSION', '3.0.1363' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1143 );
|
define ( 'DB_UPDATE_VERSION', 1148 );
|
||||||
|
|
||||||
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' );
|
||||||
|
|
@ -441,22 +441,19 @@ if(! class_exists('App')) {
|
||||||
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
|
||||||
$scheme = 'https';
|
$scheme = 'https';
|
||||||
|
|
||||||
// We need to populate the $ssl flag across the entire program before turning this on.
|
// Basically, we have $ssl = true on any links which can only be seen by a logged in user
|
||||||
// Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
|
// (and also the login link). Anything seen by an outsider will have it turned off.
|
||||||
// (and also the login link). Anything seen by an outsider will have it turned off.
|
|
||||||
// At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
|
|
||||||
// contact links to this site with "http:" if they are currently using "https:"
|
|
||||||
|
|
||||||
// if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
|
||||||
// if($ssl)
|
if($ssl)
|
||||||
// $scheme = 'https';
|
$scheme = 'https';
|
||||||
// else
|
else
|
||||||
// $scheme = 'http';
|
$scheme = 'http';
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
|
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
|
||||||
return $this->baseurl;
|
return $this->baseurl;
|
||||||
}
|
}
|
||||||
|
|
||||||
function set_baseurl($url) {
|
function set_baseurl($url) {
|
||||||
|
|
@ -511,6 +508,7 @@ if(! class_exists('App')) {
|
||||||
$tpl = file_get_contents('view/head.tpl');
|
$tpl = file_get_contents('view/head.tpl');
|
||||||
$this->page['htmlhead'] = replace_macros($tpl,array(
|
$this->page['htmlhead'] = replace_macros($tpl,array(
|
||||||
'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
|
'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
|
||||||
|
'$local_user' => local_user(),
|
||||||
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
|
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
|
||||||
'$delitem' => t('Delete this item?'),
|
'$delitem' => t('Delete this item?'),
|
||||||
'$comment' => t('Comment'),
|
'$comment' => t('Comment'),
|
||||||
|
|
@ -1323,6 +1321,25 @@ if(! function_exists('proc_run')) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$args = func_get_args();
|
$args = func_get_args();
|
||||||
|
|
||||||
|
$newargs = array();
|
||||||
|
if(! count($args))
|
||||||
|
return;
|
||||||
|
|
||||||
|
// expand any arrays
|
||||||
|
|
||||||
|
foreach($args as $arg) {
|
||||||
|
if(is_array($arg)) {
|
||||||
|
foreach($arg as $n) {
|
||||||
|
$newargs[] = $n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$newargs[] = $arg;
|
||||||
|
}
|
||||||
|
|
||||||
|
$args = $newargs;
|
||||||
|
|
||||||
$arr = array('args' => $args, 'run_cmd' => true);
|
$arr = array('args' => $args, 'run_cmd' => true);
|
||||||
|
|
||||||
call_hooks("proc_run", $arr);
|
call_hooks("proc_run", $arr);
|
||||||
|
|
|
||||||
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';
|
||||||
|
|
||||||
10
database.sql
10
database.sql
|
|
@ -173,6 +173,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
|
||||||
`readonly` tinyint(1) NOT NULL DEFAULT '0',
|
`readonly` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`writable` tinyint(1) NOT NULL DEFAULT '0',
|
`writable` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`forum` tinyint(1) NOT NULL DEFAULT '0',
|
`forum` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
|
`prv` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`hidden` tinyint(1) NOT NULL DEFAULT '0',
|
`hidden` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`archive` tinyint(1) NOT NULL DEFAULT '0',
|
`archive` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`pending` tinyint(1) NOT NULL DEFAULT '1',
|
`pending` tinyint(1) NOT NULL DEFAULT '1',
|
||||||
|
|
@ -819,9 +820,11 @@ CREATE TABLE IF NOT EXISTS `profile` (
|
||||||
`region` char(255) NOT NULL,
|
`region` char(255) NOT NULL,
|
||||||
`postal-code` char(32) NOT NULL,
|
`postal-code` char(32) NOT NULL,
|
||||||
`country-name` char(255) NOT NULL,
|
`country-name` char(255) NOT NULL,
|
||||||
|
`hometown` char(255) NOT NULL,
|
||||||
`gender` char(32) NOT NULL,
|
`gender` char(32) NOT NULL,
|
||||||
`marital` char(255) NOT NULL,
|
`marital` char(255) NOT NULL,
|
||||||
`with` text NOT NULL,
|
`with` text NOT NULL,
|
||||||
|
`howlong` datetime NOT NULL default '0000-00-00 00:00:00',
|
||||||
`sexual` char(255) NOT NULL,
|
`sexual` char(255) NOT NULL,
|
||||||
`politic` char(255) NOT NULL,
|
`politic` char(255) NOT NULL,
|
||||||
`religion` char(255) NOT NULL,
|
`religion` char(255) NOT NULL,
|
||||||
|
|
@ -941,12 +944,14 @@ CREATE TABLE IF NOT EXISTS `session` (
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `sign` (
|
CREATE TABLE IF NOT EXISTS `sign` (
|
||||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
`iid` int(10) unsigned NOT NULL,
|
`iid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
|
`retract_iid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
`signed_text` mediumtext NOT NULL,
|
`signed_text` mediumtext NOT NULL,
|
||||||
`signature` text NOT NULL,
|
`signature` text NOT NULL,
|
||||||
`signer` char(255) NOT NULL,
|
`signer` char(255) NOT NULL,
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `iid` (`iid`)
|
KEY `iid` (`iid`),
|
||||||
|
KEY `retract_iid` (`retract_iid`)
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
@ -1028,6 +1033,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,
|
||||||
|
|
|
||||||
|
|
@ -88,3 +88,6 @@ $a->config['system']['itemcache'] = "";
|
||||||
|
|
||||||
// If enabled, the lockpath is used for a lockfile to check if the poller is running
|
// If enabled, the lockpath is used for a lockfile to check if the poller is running
|
||||||
$a->config['system']['lockpath'] = "";
|
$a->config['system']['lockpath'] = "";
|
||||||
|
|
||||||
|
// If enabled, the MyBB fulltext engine is used
|
||||||
|
// $a->config['system']['use_fulltext_engine'] = true;
|
||||||
|
|
|
||||||
BIN
images/icons.png
BIN
images/icons.png
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
|
@ -209,7 +209,7 @@ function contact_photo_menu($contact) {
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
$args = array('contact' => $contact, 'menu' => $menu);
|
$args = array('contact' => $contact, 'menu' => &$menu);
|
||||||
|
|
||||||
call_hooks('contact_photo_menu', $args);
|
call_hooks('contact_photo_menu', $args);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -87,6 +87,12 @@ class Photo {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function rotate($degrees) {
|
||||||
|
$this->image = imagerotate($this->image,$degrees,0);
|
||||||
|
$this->width = imagesx($this->image);
|
||||||
|
$this->height = imagesy($this->image);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public function scaleImageUp($min) {
|
public function scaleImageUp($min) {
|
||||||
|
|
|
||||||
113
include/api.php
113
include/api.php
|
|
@ -4,26 +4,26 @@
|
||||||
require_once("conversation.php");
|
require_once("conversation.php");
|
||||||
require_once("oauth.php");
|
require_once("oauth.php");
|
||||||
require_once("html2plain.php");
|
require_once("html2plain.php");
|
||||||
/*
|
/*
|
||||||
* Twitter-Like API
|
* Twitter-Like API
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$API = Array();
|
$API = Array();
|
||||||
$called_api = Null;
|
$called_api = Null;
|
||||||
|
|
||||||
function api_date($str){
|
function api_date($str){
|
||||||
//Wed May 23 06:01:13 +0000 2007
|
//Wed May 23 06:01:13 +0000 2007
|
||||||
return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
|
return datetime_convert('UTC', 'UTC', $str, "D M d H:i:s +0000 Y" );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function api_register_func($path, $func, $auth=false){
|
function api_register_func($path, $func, $auth=false){
|
||||||
global $API;
|
global $API;
|
||||||
$API[$path] = array('func'=>$func,
|
$API[$path] = array('func'=>$func,
|
||||||
'auth'=>$auth);
|
'auth'=>$auth);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Simple HTTP Login
|
* Simple HTTP Login
|
||||||
*/
|
*/
|
||||||
|
|
@ -691,24 +691,24 @@
|
||||||
'geo' => '',
|
'geo' => '',
|
||||||
'coordinates' => $lastwall['coord'],
|
'coordinates' => $lastwall['coord'],
|
||||||
'place' => $lastwall['location'],
|
'place' => $lastwall['location'],
|
||||||
'contributors' => ''
|
'contributors' => ''
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return api_apply_template("user", $type, array('$user' => $user_info));
|
return api_apply_template("user", $type, array('$user' => $user_info));
|
||||||
|
|
||||||
}
|
}
|
||||||
api_register_func('api/users/show','api_users_show');
|
api_register_func('api/users/show','api_users_show');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* http://developer.twitter.com/doc/get/statuses/home_timeline
|
* http://developer.twitter.com/doc/get/statuses/home_timeline
|
||||||
*
|
*
|
||||||
* TODO: Optional parameters
|
* TODO: Optional parameters
|
||||||
* TODO: Add reply info
|
* TODO: Add reply info
|
||||||
*/
|
*/
|
||||||
function api_statuses_home_timeline(&$a, $type){
|
function api_statuses_home_timeline(&$a, $type){
|
||||||
if (local_user()===false) return false;
|
if (local_user()===false) return false;
|
||||||
|
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
// get last newtork messages
|
// get last newtork messages
|
||||||
|
|
||||||
|
|
@ -720,7 +720,7 @@
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
||||||
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
|
@ -728,7 +728,7 @@
|
||||||
if ($max_id > 0)
|
if ($max_id > 0)
|
||||||
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
|
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
|
|
@ -747,7 +747,7 @@
|
||||||
|
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
|
||||||
|
|
||||||
$data = array('$statuses' => $ret);
|
$data = array('$statuses' => $ret);
|
||||||
switch($type){
|
switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
|
|
@ -761,7 +761,7 @@
|
||||||
return($as);
|
return($as);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return api_apply_template("timeline", $type, $data);
|
return api_apply_template("timeline", $type, $data);
|
||||||
}
|
}
|
||||||
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
|
api_register_func('api/statuses/home_timeline','api_statuses_home_timeline', true);
|
||||||
|
|
@ -769,7 +769,7 @@
|
||||||
|
|
||||||
function api_statuses_public_timeline(&$a, $type){
|
function api_statuses_public_timeline(&$a, $type){
|
||||||
if (local_user()===false) return false;
|
if (local_user()===false) return false;
|
||||||
|
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
// get last newtork messages
|
// get last newtork messages
|
||||||
|
|
||||||
|
|
@ -781,7 +781,7 @@
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
||||||
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
|
@ -789,7 +789,7 @@
|
||||||
if ($max_id > 0)
|
if ($max_id > 0)
|
||||||
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
|
$sql_extra = 'AND `item`.`id` <= '.intval($max_id);
|
||||||
|
|
||||||
/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
/*$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
|
|
@ -806,17 +806,17 @@
|
||||||
intval($since_id),
|
intval($since_id),
|
||||||
intval($start), intval($count)
|
intval($start), intval($count)
|
||||||
);*/
|
);*/
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
||||||
`user`.`nickname`, `user`.`hidewall`
|
`user`.`nickname`, `user`.`hidewall`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
|
LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
|
||||||
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
||||||
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
|
AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
|
||||||
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
|
||||||
AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
|
AND `item`.`private` = 0 AND `item`.`wall` = 1 AND `user`.`hidewall` = 0
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra
|
$sql_extra
|
||||||
AND `item`.`id`>%d
|
AND `item`.`id`>%d
|
||||||
|
|
@ -827,7 +827,7 @@
|
||||||
|
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
|
||||||
|
|
||||||
$data = array('$statuses' => $ret);
|
$data = array('$statuses' => $ret);
|
||||||
switch($type){
|
switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
|
|
@ -841,7 +841,7 @@
|
||||||
return($as);
|
return($as);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return api_apply_template("timeline", $type, $data);
|
return api_apply_template("timeline", $type, $data);
|
||||||
}
|
}
|
||||||
api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
|
api_register_func('api/statuses/public_timeline','api_statuses_public_timeline', true);
|
||||||
|
|
@ -857,11 +857,11 @@
|
||||||
// params
|
// params
|
||||||
$id = intval($a->argv[3]);
|
$id = intval($a->argv[3]);
|
||||||
|
|
||||||
logger('API: api_statuses_show: '.$id);
|
logger('API: api_statuses_show: '.$id);
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
|
|
@ -875,7 +875,7 @@
|
||||||
);
|
);
|
||||||
|
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
|
||||||
$data = array('$status' => $ret[0]);
|
$data = array('$status' => $ret[0]);
|
||||||
/*switch($type){
|
/*switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
|
|
@ -976,7 +976,7 @@
|
||||||
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
$max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0);
|
||||||
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
//$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0);
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
//$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false);
|
||||||
|
|
@ -985,11 +985,19 @@
|
||||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||||
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
|
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
|
||||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||||
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` regexp '%s' or `tag` regexp '%s' or tag regexp '%s' )) ",
|
|
||||||
dbesc($myurl . '$'),
|
if (get_config('system','use_fulltext_engine'))
|
||||||
dbesc($myurl . '\\]'),
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
|
||||||
dbesc($diasp_url . '\\]')
|
dbesc(protect_sprintf($myurl)),
|
||||||
);
|
dbesc(protect_sprintf($myurl)),
|
||||||
|
dbesc(protect_sprintf($diasp_url))
|
||||||
|
);
|
||||||
|
else
|
||||||
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
||||||
|
dbesc(protect_sprintf('%' . $myurl)),
|
||||||
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
|
);
|
||||||
|
|
||||||
if ($max_id > 0)
|
if ($max_id > 0)
|
||||||
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
|
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
|
||||||
|
|
@ -1013,7 +1021,7 @@
|
||||||
|
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
|
||||||
|
|
||||||
$data = array('$statuses' => $ret);
|
$data = array('$statuses' => $ret);
|
||||||
switch($type){
|
switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
|
|
@ -1027,7 +1035,7 @@
|
||||||
return($as);
|
return($as);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return api_apply_template("timeline", $type, $data);
|
return api_apply_template("timeline", $type, $data);
|
||||||
}
|
}
|
||||||
api_register_func('api/statuses/mentions','api_statuses_mentions', true);
|
api_register_func('api/statuses/mentions','api_statuses_mentions', true);
|
||||||
|
|
@ -1078,14 +1086,14 @@
|
||||||
|
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
|
||||||
|
|
||||||
$data = array('$statuses' => $ret);
|
$data = array('$statuses' => $ret);
|
||||||
switch($type){
|
switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
case "rss":
|
case "rss":
|
||||||
$data = api_rss_extra($a, $data, $user_info);
|
$data = api_rss_extra($a, $data, $user_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
return api_apply_template("timeline", $type, $data);
|
return api_apply_template("timeline", $type, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1094,25 +1102,25 @@
|
||||||
|
|
||||||
function api_favorites(&$a, $type){
|
function api_favorites(&$a, $type){
|
||||||
if (local_user()===false) return false;
|
if (local_user()===false) return false;
|
||||||
|
|
||||||
$user_info = api_get_user($a);
|
$user_info = api_get_user($a);
|
||||||
// in friendica starred item are private
|
// in friendica starred item are private
|
||||||
// return favorites only for self
|
// return favorites only for self
|
||||||
logger('api_favorites: self:' . $user_info['self']);
|
logger('api_favorites: self:' . $user_info['self']);
|
||||||
|
|
||||||
if ($user_info['self']==0) {
|
if ($user_info['self']==0) {
|
||||||
$ret = array();
|
$ret = array();
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
|
||||||
// params
|
// params
|
||||||
$count = (x($_GET,'count')?$_GET['count']:20);
|
$count = (x($_GET,'count')?$_GET['count']:20);
|
||||||
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
$page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0);
|
||||||
if ($page<0) $page=0;
|
if ($page<0) $page=0;
|
||||||
|
|
||||||
$start = $page*$count;
|
$start = $page*$count;
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
|
|
@ -1129,16 +1137,16 @@
|
||||||
);
|
);
|
||||||
|
|
||||||
$ret = api_format_items($r,$user_info);
|
$ret = api_format_items($r,$user_info);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = array('$statuses' => $ret);
|
$data = array('$statuses' => $ret);
|
||||||
switch($type){
|
switch($type){
|
||||||
case "atom":
|
case "atom":
|
||||||
case "rss":
|
case "rss":
|
||||||
$data = api_rss_extra($a, $data, $user_info);
|
$data = api_rss_extra($a, $data, $user_info);
|
||||||
}
|
}
|
||||||
|
|
||||||
return api_apply_template("timeline", $type, $data);
|
return api_apply_template("timeline", $type, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1208,7 +1216,7 @@
|
||||||
$as['link']['type'] = "text/html";
|
$as['link']['type'] = "text/html";
|
||||||
return($as);
|
return($as);
|
||||||
}
|
}
|
||||||
|
|
||||||
function api_format_items($r,$user_info) {
|
function api_format_items($r,$user_info) {
|
||||||
|
|
||||||
//logger('api_format_items: ' . print_r($r,true));
|
//logger('api_format_items: ' . print_r($r,true));
|
||||||
|
|
@ -1223,14 +1231,14 @@
|
||||||
$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
|
$status_user = (($item['cid']==$user_info['id'])?$user_info: api_item_get_user($a,$item));
|
||||||
|
|
||||||
if ($item['parent']!=$item['id']) {
|
if ($item['parent']!=$item['id']) {
|
||||||
$r = q("select id from item where parent=%s and id<%s order by id desc limit 1",
|
$r = q("select id from item where parent=%s and id<%s order by id desc limit 1",
|
||||||
intval($item['parent']), intval($item['id']));
|
intval($item['parent']), intval($item['id']));
|
||||||
if ($r)
|
if ($r)
|
||||||
$in_reply_to_status_id = $r[0]['id'];
|
$in_reply_to_status_id = $r[0]['id'];
|
||||||
else
|
else
|
||||||
$in_reply_to_status_id = $item['parent'];
|
$in_reply_to_status_id = $item['parent'];
|
||||||
|
|
||||||
$r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact
|
$r = q("select `item`.`contact-id`, `contact`.nick, `item`.`author-name` from item, contact
|
||||||
where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id));
|
where `contact`.`id` = `item`.`contact-id` and `item`.id=%d", intval($in_reply_to_status_id));
|
||||||
|
|
||||||
$in_reply_to_screen_name = $r[0]['author-name'];
|
$in_reply_to_screen_name = $r[0]['author-name'];
|
||||||
|
|
@ -1251,6 +1259,9 @@
|
||||||
else
|
else
|
||||||
$statustext = trim($statustitle."\n\n".$statusbody);
|
$statustext = trim($statustitle."\n\n".$statusbody);
|
||||||
|
|
||||||
|
if (($item["network"] == NETWORK_FEED) and (strlen($statustext)> 1000))
|
||||||
|
$statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
|
||||||
|
|
||||||
$status = array(
|
$status = array(
|
||||||
'text' => $statustext,
|
'text' => $statustext,
|
||||||
'truncated' => False,
|
'truncated' => False,
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,13 @@ function nuke_session() {
|
||||||
unset($_SESSION['cid']);
|
unset($_SESSION['cid']);
|
||||||
unset($_SESSION['theme']);
|
unset($_SESSION['theme']);
|
||||||
unset($_SESSION['page_flags']);
|
unset($_SESSION['page_flags']);
|
||||||
|
unset($_SESSION['submanage']);
|
||||||
|
unset($_SESSION['my_url']);
|
||||||
|
unset($_SESSION['my_address']);
|
||||||
|
unset($_SESSION['addr']);
|
||||||
|
unset($_SESSION['return_url']);
|
||||||
|
unset($_SESSION['theme']);
|
||||||
|
unset($_SESSION['page_flags']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -46,6 +53,8 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
|
||||||
$check = get_config('system','paranoia');
|
$check = get_config('system','paranoia');
|
||||||
// extra paranoia - if the IP changed, log them out
|
// extra paranoia - if the IP changed, log them out
|
||||||
if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
|
if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
|
||||||
|
logger('Session address changed. Paranoid setting in effect, blocking session. '
|
||||||
|
. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
|
||||||
nuke_session();
|
nuke_session();
|
||||||
goaway(z_root());
|
goaway(z_root());
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -221,13 +221,18 @@ function bb2diaspora($Text,$preserve_nl = false) {
|
||||||
|
|
||||||
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
|
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
|
||||||
|
|
||||||
$Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text);
|
$Text = preg_replace_callback('/\[(.*?)\]\((.*?)\)/ism','unescape_underscores_in_links',$Text);
|
||||||
|
|
||||||
call_hooks('bb2diaspora',$Text);
|
call_hooks('bb2diaspora',$Text);
|
||||||
|
|
||||||
return $Text;
|
return $Text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function unescape_underscores_in_links($m) {
|
||||||
|
$y = str_replace('\\_','_', $m[2]);
|
||||||
|
return('[' . $m[1] . '](' . $y . ')');
|
||||||
|
}
|
||||||
|
|
||||||
function format_event_diaspora($ev) {
|
function format_event_diaspora($ev) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,8 @@ function bb_unspacefy_and_trim($st) {
|
||||||
|
|
||||||
function bbcode($Text,$preserve_nl = false) {
|
function bbcode($Text,$preserve_nl = false) {
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
|
||||||
// Hide all [noparse] contained bbtags spacefying them
|
// Hide all [noparse] contained bbtags spacefying them
|
||||||
|
|
||||||
$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
|
$Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text);
|
||||||
|
|
@ -114,6 +116,11 @@ function bbcode($Text,$preserve_nl = false) {
|
||||||
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
|
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
|
||||||
//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
|
//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
|
||||||
|
|
||||||
|
// we may need to restrict this further if it picks up too many strays
|
||||||
|
// link acct:user@host to a webfinger profile redirector
|
||||||
|
|
||||||
|
$Text = preg_replace('/acct:(.*?)@(.*?)([ ,])/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=' . "$1@$2"
|
||||||
|
. '" target="extlink" >acct:' . "$1@$2$3" . '</a>',$Text);
|
||||||
|
|
||||||
// Perform MAIL Search
|
// Perform MAIL Search
|
||||||
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
|
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
|
||||||
|
|
@ -226,7 +233,7 @@ function bbcode($Text,$preserve_nl = false) {
|
||||||
$endlessloop = 0;
|
$endlessloop = 0;
|
||||||
while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
|
while ((strpos($Text, "[/quote]")!== false) and (strpos($Text, "[quote=") !== false) and (++$endlessloop < 20))
|
||||||
$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
|
$Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism",
|
||||||
"<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote class=".'"author"'.">$2</blockquote>",
|
"<br /><strong class=".'"author"'.">" . $t_wrote . "</strong><blockquote>$2</blockquote>",
|
||||||
$Text);
|
$Text);
|
||||||
|
|
||||||
// [img=widthxheight]image source[/img]
|
// [img=widthxheight]image source[/img]
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
* Note:
|
* Note:
|
||||||
* Please do not store booleans - convert to 0/1 integer values
|
* Please do not store booleans - convert to 0/1 integer values
|
||||||
* The get_?config() functions return boolean false for keys that are unset,
|
* The get_?config() functions return boolean false for keys that are unset,
|
||||||
* and this could lead to subtle bugs.
|
* and this could lead to subtle bugs.
|
||||||
*
|
*
|
||||||
* There are a few places in the code (such as the admin panel) where boolean
|
* There are a few places in the code (such as the admin panel) where boolean
|
||||||
* configurations need to be fixed as of 10/08/2011.
|
* configurations need to be fixed as of 10/08/2011.
|
||||||
|
|
@ -30,6 +30,9 @@ function load_config($family) {
|
||||||
$a->config[$family][$k] = $rr['v'];
|
$a->config[$family][$k] = $rr['v'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if ($rr['cat'] != 'config') {
|
||||||
|
// Negative caching
|
||||||
|
$a->config[$family] = "!<unset>!";
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
@ -47,6 +50,13 @@ function get_config($family, $key, $instore = false) {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
if(! $instore) {
|
if(! $instore) {
|
||||||
|
// Looking if the whole family isn't set
|
||||||
|
if(isset($a->config[$family])) {
|
||||||
|
if($a->config[$family] === '!<unset>!') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(isset($a->config[$family][$key])) {
|
if(isset($a->config[$family][$key])) {
|
||||||
if($a->config[$family][$key] === '!<unset>!') {
|
if($a->config[$family][$key] === '!<unset>!') {
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -77,11 +87,9 @@ function get_config($family, $key, $instore = false) {
|
||||||
if(! function_exists('set_config')) {
|
if(! function_exists('set_config')) {
|
||||||
function set_config($family,$key,$value) {
|
function set_config($family,$key,$value) {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
// manage array value
|
// manage array value
|
||||||
$dbvalue = (is_array($value)?serialize($value):$value);
|
$dbvalue = (is_array($value)?serialize($value):$value);
|
||||||
$dbvalue = (is_bool($value) ? intval($value) : $value);
|
$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
|
||||||
|
|
||||||
if(get_config($family,$key,true) === false) {
|
if(get_config($family,$key,true) === false) {
|
||||||
$a->config[$family][$key] = $value;
|
$a->config[$family][$key] = $value;
|
||||||
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
|
$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
|
||||||
|
|
@ -89,11 +97,11 @@ function set_config($family,$key,$value) {
|
||||||
dbesc($key),
|
dbesc($key),
|
||||||
dbesc($dbvalue)
|
dbesc($dbvalue)
|
||||||
);
|
);
|
||||||
if($ret)
|
if($ret)
|
||||||
return $value;
|
return $value;
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
|
$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
|
||||||
dbesc($dbvalue),
|
dbesc($dbvalue),
|
||||||
dbesc($family),
|
dbesc($family),
|
||||||
|
|
@ -120,6 +128,9 @@ function load_pconfig($uid,$family) {
|
||||||
$k = $rr['k'];
|
$k = $rr['k'];
|
||||||
$a->config[$uid][$family][$k] = $rr['v'];
|
$a->config[$uid][$family][$k] = $rr['v'];
|
||||||
}
|
}
|
||||||
|
} else if ($rr['cat'] != 'config') {
|
||||||
|
// Negative caching
|
||||||
|
$a->config[$uid][$family] = "!<unset>!";
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
@ -131,6 +142,13 @@ function get_pconfig($uid,$family, $key, $instore = false) {
|
||||||
global $a;
|
global $a;
|
||||||
|
|
||||||
if(! $instore) {
|
if(! $instore) {
|
||||||
|
// Looking if the whole family isn't set
|
||||||
|
if(isset($a->config[$uid][$family])) {
|
||||||
|
if($a->config[$uid][$family] === '!<unset>!') {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(isset($a->config[$uid][$family][$key])) {
|
if(isset($a->config[$uid][$family][$key])) {
|
||||||
if($a->config[$uid][$family][$key] === '!<unset>!') {
|
if($a->config[$uid][$family][$key] === '!<unset>!') {
|
||||||
return false;
|
return false;
|
||||||
|
|
|
||||||
|
|
@ -173,6 +173,13 @@ function localize_item(&$item){
|
||||||
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
|
$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
|
||||||
|
logger('matched');
|
||||||
|
foreach($matches as $mtch) {
|
||||||
|
$item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5] . '[/img][/url]',$item['body']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -495,7 +502,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
|
|
||||||
// On the network page, I am the owner. On the display page it will be the profile owner.
|
// On the network page, I am the owner. On the display page it will be the profile owner.
|
||||||
// This will have been stored in $a->page_contact by our calling page.
|
// This will have been stored in $a->page_contact by our calling page.
|
||||||
// Put this person on the left of the wall-to-wall notice.
|
// Put this person as the wall owner of the wall-to-wall notice.
|
||||||
|
|
||||||
$owner_url = zrl($a->page_contact['url']);
|
$owner_url = zrl($a->page_contact['url']);
|
||||||
$owner_photo = $a->page_contact['thumb'];
|
$owner_photo = $a->page_contact['thumb'];
|
||||||
|
|
@ -503,23 +510,38 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$template = $wallwall;
|
$template = $wallwall;
|
||||||
$commentww = 'ww';
|
$commentww = 'ww';
|
||||||
}
|
}
|
||||||
if((! $item['wall']) && (strlen($item['owner-link'])) && (! link_compare($item['owner-link'],$item['author-link']))) {
|
|
||||||
|
|
||||||
// Could be anybody.
|
if((! $item['wall']) && $item['owner-link']) {
|
||||||
|
|
||||||
$owner_url = $item['owner-link'];
|
$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
|
||||||
$owner_photo = $item['owner-avatar'];
|
$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
|
||||||
$owner_name = $item['owner-name'];
|
$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
|
||||||
$template = $wallwall;
|
if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
|
||||||
$commentww = 'ww';
|
|
||||||
// If it is our contact, use a friendly redirect link
|
// The author url doesn't match the owner (typically the contact)
|
||||||
if((link_compare($item['owner-link'],$item['url']))
|
// and also doesn't match the contact alias.
|
||||||
&& ($item['network'] === NETWORK_DFRN)) {
|
// The name match is a hack to catch several weird cases where URLs are
|
||||||
$owner_url = $redirect_url;
|
// all over the park. It can be tricked, but this prevents you from
|
||||||
$osparkle = ' sparkle';
|
// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
|
||||||
|
// well that it's the same Bob Smith.
|
||||||
|
|
||||||
|
// But it could be somebody else with the same name. It just isn't highly likely.
|
||||||
|
|
||||||
|
|
||||||
|
$owner_url = $item['owner-link'];
|
||||||
|
$owner_photo = $item['owner-avatar'];
|
||||||
|
$owner_name = $item['owner-name'];
|
||||||
|
$template = $wallwall;
|
||||||
|
$commentww = 'ww';
|
||||||
|
// If it is our contact, use a friendly redirect link
|
||||||
|
if((link_compare($item['owner-link'],$item['url']))
|
||||||
|
&& ($item['network'] === NETWORK_DFRN)) {
|
||||||
|
$owner_url = $redirect_url;
|
||||||
|
$osparkle = ' sparkle';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
$owner_url = zrl($owner_url);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
$owner_url = zrl($owner_url);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -292,4 +292,38 @@ function zot_unencapsulate($data,$prvkey) {
|
||||||
$ret['sender'] = $s;
|
$ret['sender'] = $s;
|
||||||
$ret['data'] = aes_unencapsulate($x,$prvkey);
|
$ret['data'] = aes_unencapsulate($x,$prvkey);
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function new_keypair($bits) {
|
||||||
|
|
||||||
|
$openssl_options = array(
|
||||||
|
'digest_alg' => 'sha1',
|
||||||
|
'private_key_bits' => $bits,
|
||||||
|
'encrypt_key' => false
|
||||||
|
);
|
||||||
|
|
||||||
|
$conf = get_config('system','openssl_conf_file');
|
||||||
|
if($conf)
|
||||||
|
$openssl_options['config'] = $conf;
|
||||||
|
|
||||||
|
$result = openssl_pkey_new($openssl_options);
|
||||||
|
|
||||||
|
if(empty($result)) {
|
||||||
|
logger('new_keypair: failed');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get private key
|
||||||
|
|
||||||
|
$response = array('prvkey' => '', 'pubkey' => '');
|
||||||
|
|
||||||
|
openssl_pkey_export($result, $response['prvkey']);
|
||||||
|
|
||||||
|
// Get public key
|
||||||
|
$pkey = openssl_pkey_get_details($result);
|
||||||
|
$response['pubkey'] = $pkey["key"];
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -244,7 +244,7 @@ function timesel($pre,$h,$m) {
|
||||||
// Limited to range of timestamps
|
// Limited to range of timestamps
|
||||||
|
|
||||||
if(! function_exists('relative_date')) {
|
if(! function_exists('relative_date')) {
|
||||||
function relative_date($posted_date) {
|
function relative_date($posted_date,$format = null) {
|
||||||
|
|
||||||
$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
|
$localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date);
|
||||||
|
|
||||||
|
|
@ -274,7 +274,9 @@ function relative_date($posted_date) {
|
||||||
if ($d >= 1) {
|
if ($d >= 1) {
|
||||||
$r = round($d);
|
$r = round($d);
|
||||||
// translators - e.g. 22 hours ago, 1 minute ago
|
// translators - e.g. 22 hours ago, 1 minute ago
|
||||||
return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
|
if(! $format)
|
||||||
|
$format = t('%1$d %2$s ago');
|
||||||
|
return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
|
|
||||||
|
|
@ -32,9 +32,9 @@ class dba {
|
||||||
if (!(strlen($server) && strlen($user))){
|
if (!(strlen($server) && strlen($user))){
|
||||||
$this->connected = false;
|
$this->connected = false;
|
||||||
$this->db = null;
|
$this->db = null;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($install) {
|
if($install) {
|
||||||
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
|
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
|
||||||
if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
|
if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
|
||||||
|
|
@ -71,23 +71,29 @@ class dba {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function q($sql) {
|
public function q($sql) {
|
||||||
|
|
||||||
if((! $this->db) || (! $this->connected))
|
if((! $this->db) || (! $this->connected))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
$this->error = '';
|
$this->error = '';
|
||||||
|
|
||||||
|
//if (get_config("system", "db_log") != "")
|
||||||
|
// @file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Start '.$sql."\n", FILE_APPEND);
|
||||||
|
|
||||||
if($this->mysqli)
|
if($this->mysqli)
|
||||||
$result = @$this->db->query($sql);
|
$result = @$this->db->query($sql);
|
||||||
else
|
else
|
||||||
$result = @mysql_query($sql,$this->db);
|
$result = @mysql_query($sql,$this->db);
|
||||||
|
|
||||||
|
//if (get_config("system", "db_log") != "")
|
||||||
|
// @file_put_contents(get_config("system", "db_log"), datetime_convert().':'.session_id(). ' Stop '."\n", FILE_APPEND);
|
||||||
|
|
||||||
if($this->mysqli) {
|
if($this->mysqli) {
|
||||||
if($this->db->errno)
|
if($this->db->errno)
|
||||||
$this->error = $this->db->error;
|
$this->error = $this->db->error;
|
||||||
}
|
}
|
||||||
elseif(mysql_errno($this->db))
|
elseif(mysql_errno($this->db))
|
||||||
$this->error = mysql_error($this->db);
|
$this->error = mysql_error($this->db);
|
||||||
|
|
||||||
if(strlen($this->error)) {
|
if(strlen($this->error)) {
|
||||||
logger('dba: ' . $this->error);
|
logger('dba: ' . $this->error);
|
||||||
|
|
@ -107,8 +113,8 @@ class dba {
|
||||||
else
|
else
|
||||||
$mesg = mysql_num_rows($result) . ' results' . EOL;
|
$mesg = mysql_num_rows($result) . ' results' . EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
|
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
|
||||||
. (($this->error) ? ' error: ' . $this->error : '')
|
. (($this->error) ? ' error: ' . $this->error : '')
|
||||||
. EOL;
|
. EOL;
|
||||||
|
|
||||||
|
|
@ -146,7 +152,7 @@ class dba {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if($this->debug)
|
if($this->debug)
|
||||||
logger('dba: ' . printable(print_r($r, true)));
|
logger('dba: ' . printable(print_r($r, true)));
|
||||||
return($r);
|
return($r);
|
||||||
|
|
|
||||||
|
|
@ -38,164 +38,168 @@ 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'];
|
||||||
|
|
||||||
|
// The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
|
||||||
|
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 +209,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 +287,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,(($top_level) ? $contact['id'] : 0));
|
||||||
|
}
|
||||||
|
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['uri'] === $target_item['parent-uri'])) {
|
||||||
|
// top-level retraction
|
||||||
|
logger('delivery: diaspora retract: ' . $loc);
|
||||||
|
|
||||||
|
diaspora_send_retraction($target_item,$owner,$contact,$public_message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
elseif($target_item['uri'] !== $target_item['parent-uri']) {
|
||||||
|
// we are the relay - send comments, likes and relayable_retractions to our conversants
|
||||||
|
logger('delivery: diaspora relay: ' . $loc);
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
|
||||||
217
include/diaspora.php
Normal file → Executable file
217
include/diaspora.php
Normal file → Executable file
|
|
@ -83,6 +83,9 @@ function diaspora_dispatch($importer,$msg) {
|
||||||
elseif($xmlbase->signed_retraction) {
|
elseif($xmlbase->signed_retraction) {
|
||||||
$ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg);
|
$ret = diaspora_signed_retraction($importer,$xmlbase->signed_retraction,$msg);
|
||||||
}
|
}
|
||||||
|
elseif($xmlbase->relayable_retraction) {
|
||||||
|
$ret = diaspora_signed_retraction($importer,$xmlbase->relayable_retraction,$msg);
|
||||||
|
}
|
||||||
elseif($xmlbase->photo) {
|
elseif($xmlbase->photo) {
|
||||||
$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
|
$ret = diaspora_photo($importer,$xmlbase->photo,$msg);
|
||||||
}
|
}
|
||||||
|
|
@ -569,6 +572,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
|
||||||
|
|
@ -669,7 +680,7 @@ function diaspora_post($importer,$xml) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// allocate a guid on our system - we aren't fixing any collisions.
|
// allocate a guid on our system - we aren't fixing any collisions.
|
||||||
// we're ignoring them
|
// we're ignoring them
|
||||||
|
|
||||||
$g = q("select * from guid where guid = '%s' limit 1",
|
$g = q("select * from guid where guid = '%s' limit 1",
|
||||||
|
|
@ -836,7 +847,7 @@ function diaspora_reshare($importer,$xml) {
|
||||||
$prefix = '♲ ' . $details . "\n";
|
$prefix = '♲ ' . $details . "\n";
|
||||||
|
|
||||||
|
|
||||||
// allocate a guid on our system - we aren't fixing any collisions.
|
// allocate a guid on our system - we aren't fixing any collisions.
|
||||||
// we're ignoring them
|
// we're ignoring them
|
||||||
|
|
||||||
$g = q("select * from guid where guid = '%s' limit 1",
|
$g = q("select * from guid where guid = '%s' limit 1",
|
||||||
|
|
@ -940,7 +951,7 @@ function diaspora_asphoto($importer,$xml) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// allocate a guid on our system - we aren't fixing any collisions.
|
// allocate a guid on our system - we aren't fixing any collisions.
|
||||||
// we're ignoring them
|
// we're ignoring them
|
||||||
|
|
||||||
$g = q("select * from guid where guid = '%s' limit 1",
|
$g = q("select * from guid where guid = '%s' limit 1",
|
||||||
|
|
@ -1594,22 +1605,28 @@ function diaspora_like($importer,$xml,$msg) {
|
||||||
logger('diaspora_like: duplicate like: ' . $guid);
|
logger('diaspora_like: duplicate like: ' . $guid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// Note: I don't think "Like" objects with positive = "false" are ever actually used
|
||||||
|
// It looks like "RelayableRetractions" are used for "unlike" instead
|
||||||
if($positive === 'false') {
|
if($positive === 'false') {
|
||||||
q("UPDATE `item` SET `deleted` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
logger('diaspora_like: received a like with positive set to "false"...ignoring');
|
||||||
|
/* q("UPDATE `item` SET `deleted` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
intval($r[0]['id']),
|
intval($r[0]['id']),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);*/
|
||||||
// FIXME
|
// FIXME
|
||||||
// send notification via proc_run()
|
// send notification via proc_run()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Note: I don't think "Like" objects with positive = "false" are ever actually used
|
||||||
|
// It looks like "RelayableRetractions" are used for "unlike" instead
|
||||||
if($positive === 'false') {
|
if($positive === 'false') {
|
||||||
logger('diaspora_like: unlike received with no corresponding like');
|
logger('diaspora_like: received a like with positive set to "false"');
|
||||||
|
logger('diaspora_like: unlike received with no corresponding like...ignoring');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$author_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
$signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
||||||
|
|
||||||
$author_signature = base64_decode($author_signature);
|
$author_signature = base64_decode($author_signature);
|
||||||
|
|
||||||
|
|
@ -1627,20 +1644,20 @@ function diaspora_like($importer,$xml,$msg) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! rsa_verify($author_signed_data,$author_signature,$key,'sha256')) {
|
if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) {
|
||||||
logger('diaspora_like: verification failed.');
|
logger('diaspora_like: verification failed.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($parent_author_signature) {
|
if($parent_author_signature) {
|
||||||
|
|
||||||
$owner_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
//$owner_signed_data = $guid . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $diaspora_handle;
|
||||||
|
|
||||||
$parent_author_signature = base64_decode($parent_author_signature);
|
$parent_author_signature = base64_decode($parent_author_signature);
|
||||||
|
|
||||||
$key = $msg['key'];
|
$key = $msg['key'];
|
||||||
|
|
||||||
if(! rsa_verify($owner_signed_data,$parent_author_signature,$key,'sha256')) {
|
if(! rsa_verify($signed_data,$parent_author_signature,$key,'sha256')) {
|
||||||
logger('diaspora_like: owner verification failed.');
|
logger('diaspora_like: owner verification failed.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -1775,38 +1792,89 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
|
||||||
$type = notags(unxmlify($xml->target_type));
|
$type = notags(unxmlify($xml->target_type));
|
||||||
$sig = notags(unxmlify($xml->target_author_signature));
|
$sig = notags(unxmlify($xml->target_author_signature));
|
||||||
|
|
||||||
|
$parent_author_signature = (($xml->parent_author_signature) ? notags(unxmlify($xml->parent_author_signature)) : '');
|
||||||
|
|
||||||
$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
|
$contact = diaspora_get_contact_by_handle($importer['uid'],$diaspora_handle);
|
||||||
if(! $contact) {
|
if(! $contact) {
|
||||||
logger('diaspora_signed_retraction: no contact');
|
logger('diaspora_signed_retraction: no contact');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// this may not yet work for comments. Need to see how the relaying works
|
|
||||||
// and figure out who signs it.
|
|
||||||
|
|
||||||
|
|
||||||
$signed_data = $guid . ';' . $type ;
|
$signed_data = $guid . ';' . $type ;
|
||||||
|
|
||||||
$sig = base64_decode($sig);
|
$sig_decode = base64_decode($sig);
|
||||||
|
|
||||||
$key = $msg['key'];
|
if(strcasecmp($diaspora_handle,$msg['author']) == 0) {
|
||||||
|
$person = $contact;
|
||||||
|
$key = $msg['key'];
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$person = find_diaspora_person_by_handle($diaspora_handle);
|
||||||
|
|
||||||
if(! rsa_verify($signed_data,$sig,$key,'sha256')) {
|
if(is_array($person) && x($person,'pubkey'))
|
||||||
logger('diaspora_signed_retraction: owner verification failed.' . print_r($msg,true));
|
$key = $person['pubkey'];
|
||||||
|
else {
|
||||||
|
logger('diaspora_signed_retraction: unable to find author details');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! rsa_verify($signed_data,$sig_decode,$key,'sha256')) {
|
||||||
|
logger('diaspora_signed_retraction: retraction-owner verification failed.' . print_r($msg,true));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if($type === 'StatusMessage') {
|
if($parent_author_signature) {
|
||||||
|
$parent_author_signature = base64_decode($parent_author_signature);
|
||||||
|
|
||||||
|
$key = $msg['key'];
|
||||||
|
|
||||||
|
if(! rsa_verify($signed_data,$parent_author_signature,$key,'sha256')) {
|
||||||
|
logger('diaspora_signed_retraction: failed to verify person relaying the retraction (e.g. owner of a post relaying a retracted comment');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if($type === 'StatusMessage' || $type === 'Comment' || $type === 'Like') {
|
||||||
$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
|
$r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
|
||||||
dbesc($guid),
|
dbesc($guid),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
if(link_compare($r[0]['author-link'],$contact['url'])) {
|
if(link_compare($r[0]['author-link'],$contact['url'])) {
|
||||||
q("update item set `deleted` = 1, `changed` = '%s' where `id` = %d limit 1",
|
q("update item set `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' where `id` = %d limit 1",
|
||||||
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Now check if the retraction needs to be relayed by us
|
||||||
|
//
|
||||||
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||||
|
$p = q("select origin from item where parent = %d and id = %d limit 1",
|
||||||
|
$r[0]['parent'],
|
||||||
|
$r[0]['parent']
|
||||||
|
);
|
||||||
|
if(count($p)) {
|
||||||
|
if(($p[0]['origin']) && (! $parent_author_signature)) {
|
||||||
|
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
$r[0]['id'],
|
||||||
|
dbesc($signed_data),
|
||||||
|
dbesc($sig),
|
||||||
|
dbesc($diaspora_handle)
|
||||||
|
);
|
||||||
|
|
||||||
|
// the existence of parent_author_signature would have meant the parent_author or owner
|
||||||
|
// is already relaying.
|
||||||
|
logger('diaspora_signed_retraction: relaying relayable_retraction');
|
||||||
|
|
||||||
|
proc_run('php','include/notifier.php','relayable_retraction',$r[0]['id']);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2047,8 +2115,12 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
$theiraddr = $contact['addr'];
|
$theiraddr = $contact['addr'];
|
||||||
|
|
||||||
$p = q("select guid from item where parent = %d limit 1",
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
$item['parent']
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||||
|
$p = q("select guid from item where parent = %d and id = %d limit 1",
|
||||||
|
intval($item['parent']),
|
||||||
|
intval($item['parent'])
|
||||||
);
|
);
|
||||||
if(count($p))
|
if(count($p))
|
||||||
$parent_guid = $p[0]['guid'];
|
$parent_guid = $p[0]['guid'];
|
||||||
|
|
@ -2059,7 +2131,11 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
|
||||||
$tpl = get_markup_template('diaspora_like.tpl');
|
$tpl = get_markup_template('diaspora_like.tpl');
|
||||||
$like = true;
|
$like = true;
|
||||||
$target_type = 'Post';
|
$target_type = 'Post';
|
||||||
$positive = (($item['deleted']) ? 'false' : 'true');
|
// $positive = (($item['deleted']) ? 'false' : 'true');
|
||||||
|
$positive = 'true';
|
||||||
|
|
||||||
|
if(($item['deleted']))
|
||||||
|
logger('diaspora_send_followup: received deleted "like". Those should go to diaspora_send_retraction');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$tpl = get_markup_template('diaspora_comment.tpl');
|
$tpl = get_markup_template('diaspora_comment.tpl');
|
||||||
|
|
@ -2099,41 +2175,51 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
|
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
$theiraddr = $contact['addr'];
|
$theiraddr = $contact['addr'];
|
||||||
|
|
||||||
|
|
||||||
$p = q("select guid from item where parent = %d limit 1",
|
// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
|
||||||
$item['parent']
|
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||||
|
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||||
|
$p = q("select guid from item where parent = %d and id = %d limit 1",
|
||||||
|
intval($item['parent']),
|
||||||
|
intval($item['parent'])
|
||||||
);
|
);
|
||||||
if(count($p))
|
if(count($p))
|
||||||
$parent_guid = $p[0]['guid'];
|
$parent_guid = $p[0]['guid'];
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if($item['verb'] === ACTIVITY_LIKE) {
|
$like = false;
|
||||||
|
$relay_retract = false;
|
||||||
|
$sql_sign_id = 'iid';
|
||||||
|
if( $item['deleted']) {
|
||||||
|
$tpl = get_markup_template('diaspora_relayable_retraction.tpl');
|
||||||
|
$relay_retract = true;
|
||||||
|
$sql_sign_id = 'retract_iid';
|
||||||
|
$target_type = ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
||||||
|
}
|
||||||
|
elseif($item['verb'] === ACTIVITY_LIKE) {
|
||||||
$tpl = get_markup_template('diaspora_like_relay.tpl');
|
$tpl = get_markup_template('diaspora_like_relay.tpl');
|
||||||
$like = true;
|
$like = true;
|
||||||
$target_type = 'Post';
|
$target_type = 'Post';
|
||||||
$positive = (($item['deleted']) ? 'false' : 'true');
|
// $positive = (($item['deleted']) ? 'false' : 'true');
|
||||||
|
$positive = 'true';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$tpl = get_markup_template('diaspora_comment_relay.tpl');
|
$tpl = get_markup_template('diaspora_comment_relay.tpl');
|
||||||
$like = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = $item['body'];
|
$body = $item['body'];
|
||||||
|
|
||||||
$text = html_entity_decode(bb2diaspora($body));
|
$text = html_entity_decode(bb2diaspora($body));
|
||||||
|
|
||||||
// fetch the original signature if somebody sent the post to us to relay
|
|
||||||
// If we are relaying for a reply originating on our own account, there wasn't a 'send to relay'
|
|
||||||
// action. It wasn't needed. In that case create the original signature and the
|
|
||||||
// owner (parent author) signature
|
|
||||||
// comments from other networks will be relayed under our name, with a brief
|
|
||||||
// preamble to describe what's happening and noting the real author
|
|
||||||
|
|
||||||
$r = q("select * from sign where iid = %d limit 1",
|
// fetch the original signature if the relayable was created by a Diaspora
|
||||||
|
// or DFRN user. Relayables for other networks are not supported.
|
||||||
|
|
||||||
|
$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
|
||||||
intval($item['id'])
|
intval($item['id'])
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
|
@ -2144,6 +2230,12 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
|
// Author signature information (for likes, comments, and retractions of likes or comments,
|
||||||
|
// whether from Diaspora or Friendica) must be placed in the `sign` table before this
|
||||||
|
// function is called
|
||||||
|
logger('diaspora_send_relay: original author signature not found, cannot send relayable');
|
||||||
|
return;
|
||||||
|
/*
|
||||||
$itemcontact = q("select * from contact where `id` = %d limit 1",
|
$itemcontact = q("select * from contact where `id` = %d limit 1",
|
||||||
intval($item['contact-id'])
|
intval($item['contact-id'])
|
||||||
);
|
);
|
||||||
|
|
@ -2152,29 +2244,40 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
$prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'),
|
$prefix = sprintf( t('[Relayed] Comment authored by %s from network %s'),
|
||||||
'['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')',
|
'['. $item['author-name'] . ']' . '(' . $item['author-link'] . ')',
|
||||||
network_to_name($itemcontact['network'])) . "\n";
|
network_to_name($itemcontact['network'])) . "\n";
|
||||||
|
// "$body" was assigned to "$text" above. It isn't used after that, so I don't think
|
||||||
|
// the following change will do anything
|
||||||
$body = $prefix . $body;
|
$body = $prefix . $body;
|
||||||
|
|
||||||
|
// I think this comment will fail upon reaching Diaspora, because "$signed_text" is not defined
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
// I'm confused about this "else." Since it sets "$handle = $myaddr," it seems like it should be for the case
|
||||||
|
// where the top-level post owner commented on his own post, i.e. "$itemcontact[0]['self']" is true. But it's
|
||||||
|
// positioned to be for the case where "count($itemcontact)" is 0.
|
||||||
|
|
||||||
|
$handle = $myaddr;
|
||||||
|
|
||||||
if($like)
|
if($like)
|
||||||
$signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $myaddr;
|
$signed_text = $item['guid'] . ';' . $target_type . ';' . $parent_guid . ';' . $positive . ';' . $handle;
|
||||||
|
elseif($relay_retract)
|
||||||
|
$signed_text = $item['guid'] . ';' . $target_type;
|
||||||
else
|
else
|
||||||
$signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $myaddr;
|
$signed_text = $item['guid'] . ';' . $parent_guid . ';' . $text . ';' . $handle;
|
||||||
|
|
||||||
$authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
$authorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
||||||
|
|
||||||
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
q("insert into sign (`" . $sql_sign_id . "`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
intval($item['id']),
|
intval($item['id']),
|
||||||
dbesc($signed_text),
|
dbesc($signed_text),
|
||||||
dbesc(base64_encode($authorsig)),
|
dbesc($authorsig),
|
||||||
dbesc($myaddr)
|
dbesc($handle)
|
||||||
);
|
);
|
||||||
$handle = $myaddr;
|
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// sign it
|
// sign it with the top-level owner's signature
|
||||||
|
|
||||||
$parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
$parentauthorsig = base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'));
|
||||||
|
|
||||||
|
|
@ -2182,14 +2285,15 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
||||||
'$guid' => xmlify($item['guid']),
|
'$guid' => xmlify($item['guid']),
|
||||||
'$parent_guid' => xmlify($parent_guid),
|
'$parent_guid' => xmlify($parent_guid),
|
||||||
'$target_type' =>xmlify($target_type),
|
'$target_type' =>xmlify($target_type),
|
||||||
'$authorsig' => xmlify($orig_sign['signature']),
|
'$authorsig' => xmlify($authorsig),
|
||||||
'$parentsig' => xmlify($parentauthorsig),
|
'$parentsig' => xmlify($parentauthorsig),
|
||||||
'$body' => xmlify($text),
|
'$body' => xmlify($text),
|
||||||
'$positive' => xmlify($positive),
|
'$positive' => xmlify($positive),
|
||||||
'$handle' => xmlify($handle)
|
'$handle' => xmlify($handle)
|
||||||
));
|
));
|
||||||
|
|
||||||
logger('diaspora_relay_comment: base message: ' . $msg, LOGGER_DATA);
|
logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DATA);
|
||||||
|
|
||||||
|
|
||||||
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
||||||
|
|
||||||
|
|
@ -2204,14 +2308,25 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
$myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
|
|
||||||
$signed_text = $item['guid'] . ';' . 'StatusMessage';
|
// Check whether the retraction is for a top-level post or whether it's a relayable
|
||||||
|
if( $item['uri'] !== $item['parent-uri'] ) {
|
||||||
|
|
||||||
|
$tpl = get_markup_template('diaspora_relay_retraction.tpl');
|
||||||
|
$target_type = (($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
$tpl = get_markup_template('diaspora_signed_retract.tpl');
|
||||||
|
$target_type = 'StatusMessage';
|
||||||
|
}
|
||||||
|
|
||||||
|
$signed_text = $item['guid'] . ';' . $target_type;
|
||||||
|
|
||||||
$tpl = get_markup_template('diaspora_signed_retract.tpl');
|
|
||||||
$msg = replace_macros($tpl, array(
|
$msg = replace_macros($tpl, array(
|
||||||
'$guid' => $item['guid'],
|
'$guid' => xmlify($item['guid']),
|
||||||
'$type' => 'StatusMessage',
|
'$type' => xmlify($target_type),
|
||||||
'$handle' => $myaddr,
|
'$handle' => xmlify($myaddr),
|
||||||
'$signature' => base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256'))
|
'$signature' => xmlify(base64_encode(rsa_sign($signed_text,$owner['uprvkey'],'sha256')))
|
||||||
));
|
));
|
||||||
|
|
||||||
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));
|
||||||
|
|
@ -2335,3 +2450,5 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
|
||||||
|
|
||||||
return(($return_code) ? $return_code : (-1));
|
return(($return_code) ? $return_code : (-1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,9 @@ function directory_run($argv, $argc){
|
||||||
|
|
||||||
load_config('system');
|
load_config('system');
|
||||||
|
|
||||||
|
load_hooks();
|
||||||
|
|
||||||
|
|
||||||
$a->set_baseurl(get_config('system','url'));
|
$a->set_baseurl(get_config('system','url'));
|
||||||
|
|
||||||
$dir = get_config('system','directory_submit_url');
|
$dir = get_config('system','directory_submit_url');
|
||||||
|
|
@ -31,7 +34,12 @@ function directory_run($argv, $argc){
|
||||||
if(! strlen($dir))
|
if(! strlen($dir))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
fetch_url($dir . '?url=' . bin2hex($argv[1]));
|
$arr = array('url' => $argv[1]);
|
||||||
|
|
||||||
|
call_hooks('globaldir_update', $arr);
|
||||||
|
|
||||||
|
if(strlen($arr['url']))
|
||||||
|
fetch_url($dir . '?url=' . bin2hex($arr['url']));
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,16 @@ function notification($params) {
|
||||||
|
|
||||||
$banner = t('Friendica Notification');
|
$banner = t('Friendica Notification');
|
||||||
$product = FRIENDICA_PLATFORM;
|
$product = FRIENDICA_PLATFORM;
|
||||||
$siteurl = z_path();
|
$siteurl = $a->get_baseurl(true);
|
||||||
$thanks = t('Thank You,');
|
$thanks = t('Thank You,');
|
||||||
$sitename = get_config('config','sitename');
|
$sitename = get_config('config','sitename');
|
||||||
$site_admin = sprintf( t('%s Administrator'), $sitename);
|
$site_admin = sprintf( t('%s Administrator'), $sitename);
|
||||||
|
|
||||||
$sender_name = $product;
|
$sender_name = $product;
|
||||||
$hostname = $a->get_hostname();
|
$hostname = $a->get_hostname();
|
||||||
|
if(strpos($hostname,':'))
|
||||||
|
$hostname = substr($hostname,0,strpos($hostname,':'));
|
||||||
|
|
||||||
$sender_email = t('noreply') . '@' . $hostname;
|
$sender_email = t('noreply') . '@' . $hostname;
|
||||||
$additional_mail_header = "";
|
$additional_mail_header = "";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ function format_event_html($ev) {
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
function parse_event($h) {
|
function parse_event($h) {
|
||||||
|
|
||||||
require_once('include/Scrape.php');
|
require_once('include/Scrape.php');
|
||||||
|
|
@ -108,7 +108,7 @@ function parse_event($h) {
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
function format_event_bbcode($ev) {
|
function format_event_bbcode($ev) {
|
||||||
|
|
||||||
|
|
@ -162,7 +162,6 @@ function bbtoevent($s) {
|
||||||
$match = '';
|
$match = '';
|
||||||
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
|
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
|
||||||
$ev['adjust'] = $match[1];
|
$ev['adjust'] = $match[1];
|
||||||
$match = '';
|
|
||||||
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
|
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
|
||||||
return $ev;
|
return $ev;
|
||||||
|
|
||||||
|
|
@ -294,10 +293,14 @@ function event_store($arr) {
|
||||||
intval($arr['uid'])
|
intval($arr['uid'])
|
||||||
);
|
);
|
||||||
|
|
||||||
return $r[0]['id'];
|
$item_id = $r[0]['id'];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return 0;
|
$item_id = 0;
|
||||||
|
|
||||||
|
call_hooks("event_updated", $arr['id']);
|
||||||
|
|
||||||
|
return $item_id;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
|
|
@ -361,7 +364,7 @@ function event_store($arr) {
|
||||||
$item_arr['body'] = format_event_bbcode($event);
|
$item_arr['body'] = format_event_bbcode($event);
|
||||||
|
|
||||||
|
|
||||||
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($uri) . '</id>';
|
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
|
||||||
$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
|
$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
|
||||||
$item_arr['object'] .= '</object>' . "\n";
|
$item_arr['object'] .= '</object>' . "\n";
|
||||||
|
|
||||||
|
|
@ -383,6 +386,8 @@ function event_store($arr) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
call_hooks("event_created", $event['id']);
|
||||||
|
|
||||||
return $item_id;
|
return $item_id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
243
include/follow.php
Normal file
243
include/follow.php
Normal file
|
|
@ -0,0 +1,243 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
|
||||||
|
//
|
||||||
|
// Takes a $uid and a url/handle and adds a new contact
|
||||||
|
// Currently if the contact is DFRN, interactive needs to be true, to redirect to the
|
||||||
|
// dfrn_request page.
|
||||||
|
|
||||||
|
// Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc.
|
||||||
|
// Returns an array
|
||||||
|
// $return['success'] boolean true if successful
|
||||||
|
// $return['message'] error text if success is false.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function new_contact($uid,$url,$interactive = false) {
|
||||||
|
|
||||||
|
$result = array('success' => false,'message' => '');
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
|
||||||
|
// remove ajax junk, e.g. Twitter
|
||||||
|
|
||||||
|
$url = str_replace('/#!/','/',$url);
|
||||||
|
|
||||||
|
if(! allowed_url($url)) {
|
||||||
|
$result['message'] = t('Disallowed profile URL.');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! $url) {
|
||||||
|
$result['message'] = t('Connect URL missing.');
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$arr = array('url' => $url, 'contact' => array());
|
||||||
|
|
||||||
|
call_hooks('follow', $arr);
|
||||||
|
|
||||||
|
if(x($arr['contact'],'name'))
|
||||||
|
$ret = $arr['contact'];
|
||||||
|
else
|
||||||
|
$ret = probe_url($url);
|
||||||
|
|
||||||
|
if($ret['network'] === NETWORK_DFRN) {
|
||||||
|
if($interactive) {
|
||||||
|
if(strlen($a->path))
|
||||||
|
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
||||||
|
else
|
||||||
|
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
||||||
|
|
||||||
|
goaway($ret['request'] . "&addr=$myaddr");
|
||||||
|
|
||||||
|
// NOTREACHED
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if(get_config('system','dfrn_only')) {
|
||||||
|
$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
|
||||||
|
$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// This extra param just confuses things, remove it
|
||||||
|
if($ret['network'] === NETWORK_DIASPORA)
|
||||||
|
$ret['url'] = str_replace('?absolute=true','',$ret['url']);
|
||||||
|
|
||||||
|
|
||||||
|
// do we have enough information?
|
||||||
|
|
||||||
|
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
|
||||||
|
$result['message'] .= t('The profile address specified does not provide adequate information.') . EOL;
|
||||||
|
if(! x($ret,'poll'))
|
||||||
|
$result['message'] .= t('No compatible communication protocols or feeds were discovered.') . EOL;
|
||||||
|
if(! x($ret,'name'))
|
||||||
|
$result['message'] .= t('An author or name was not found.') . EOL;
|
||||||
|
if(! x($ret,'url'))
|
||||||
|
$result['message'] .= t('No browser URL could be matched to this address.') . EOL;
|
||||||
|
if(strpos($url,'@') !== false) {
|
||||||
|
$result['message'] .= t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL;
|
||||||
|
$result['message'] .= t('Use mailto: in front of address to force email check.') . EOL;
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
|
||||||
|
$result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
|
||||||
|
$ret['notify'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! $ret['notify']) {
|
||||||
|
$result['message'] .= t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
|
||||||
|
$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
|
||||||
|
|
||||||
|
if($ret['network'] === NETWORK_MAIL) {
|
||||||
|
$writeable = 1;
|
||||||
|
|
||||||
|
}
|
||||||
|
if($ret['network'] === NETWORK_DIASPORA)
|
||||||
|
$writeable = 1;
|
||||||
|
|
||||||
|
// check if we already have a contact
|
||||||
|
// the poll url is more reliable than the profile url, as we may have
|
||||||
|
// indirect links or webfinger links
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
|
||||||
|
intval($uid),
|
||||||
|
dbesc($ret['poll'])
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
if(count($r)) {
|
||||||
|
// update contact
|
||||||
|
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
||||||
|
q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
|
intval(CONTACT_IS_FRIEND),
|
||||||
|
intval($r[0]['id']),
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
|
||||||
|
if($ret['network'] === NETWORK_DIASPORA)
|
||||||
|
$new_relation = CONTACT_IS_FOLLOWER;
|
||||||
|
|
||||||
|
// create contact record
|
||||||
|
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
|
||||||
|
`writable`, `hidden`, `blocked`, `readonly`, `pending` )
|
||||||
|
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
|
||||||
|
intval($uid),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc($ret['url']),
|
||||||
|
dbesc(normalise_link($ret['url'])),
|
||||||
|
dbesc($ret['addr']),
|
||||||
|
dbesc($ret['alias']),
|
||||||
|
dbesc($ret['batch']),
|
||||||
|
dbesc($ret['notify']),
|
||||||
|
dbesc($ret['poll']),
|
||||||
|
dbesc($ret['poco']),
|
||||||
|
dbesc($ret['name']),
|
||||||
|
dbesc($ret['nick']),
|
||||||
|
dbesc($ret['photo']),
|
||||||
|
dbesc($ret['network']),
|
||||||
|
dbesc($ret['pubkey']),
|
||||||
|
intval($new_relation),
|
||||||
|
intval($ret['priority']),
|
||||||
|
intval($writeable),
|
||||||
|
intval($hidden)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
|
dbesc($ret['url']),
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(! count($r)) {
|
||||||
|
$result['message'] .= t('Unable to retrieve contact information.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$contact = $r[0];
|
||||||
|
$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");
|
||||||
|
|
||||||
|
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
|
||||||
|
|
||||||
|
$r = q("UPDATE `contact` SET `photo` = '%s',
|
||||||
|
`thumb` = '%s',
|
||||||
|
`micro` = '%s',
|
||||||
|
`name-date` = '%s',
|
||||||
|
`uri-date` = '%s',
|
||||||
|
`avatar-date` = '%s'
|
||||||
|
WHERE `id` = %d LIMIT 1
|
||||||
|
",
|
||||||
|
dbesc($photos[0]),
|
||||||
|
dbesc($photos[1]),
|
||||||
|
dbesc($photos[2]),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($contact_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
// pull feed and consume it, which should subscribe to the hub.
|
||||||
|
|
||||||
|
proc_run('php',"include/poller.php","$contact_id");
|
||||||
|
|
||||||
|
// create a follow slap
|
||||||
|
|
||||||
|
$tpl = get_markup_template('follow_slap.tpl');
|
||||||
|
$slap = replace_macros($tpl, array(
|
||||||
|
'$name' => $a->user['username'],
|
||||||
|
'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
||||||
|
'$photo' => $a->contact['photo'],
|
||||||
|
'$thumb' => $a->contact['thumb'],
|
||||||
|
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
|
||||||
|
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(),
|
||||||
|
'$title' => '',
|
||||||
|
'$type' => 'text',
|
||||||
|
'$content' => t('following'),
|
||||||
|
'$nick' => $a->user['nickname'],
|
||||||
|
'$verb' => ACTIVITY_FOLLOW,
|
||||||
|
'$ostat_follow' => ''
|
||||||
|
));
|
||||||
|
|
||||||
|
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
||||||
|
intval($uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if(count($r)) {
|
||||||
|
if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
||||||
|
require_once('include/salmon.php');
|
||||||
|
slapper($r[0],$contact['notify'],$slap);
|
||||||
|
}
|
||||||
|
if($contact['network'] == NETWORK_DIASPORA) {
|
||||||
|
require_once('include/diaspora.php');
|
||||||
|
$ret = diaspora_share($a->user,$contact);
|
||||||
|
logger('mod_follow: diaspora_share returns: ' . $ret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$result['success'] = true;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
@ -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) {
|
||||||
|
|
||||||
|
|
|
||||||
174
include/items.php
Normal file → Executable file
174
include/items.php
Normal file → Executable file
|
|
@ -180,6 +180,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
|
||||||
|
|
||||||
foreach($items as $item) {
|
foreach($items as $item) {
|
||||||
|
|
||||||
|
// prevent private email from leaking.
|
||||||
|
if($item['network'] === NETWORK_MAIL)
|
||||||
|
continue;
|
||||||
|
|
||||||
// public feeds get html, our own nodes use bbcode
|
// public feeds get html, our own nodes use bbcode
|
||||||
|
|
||||||
if($public_feed) {
|
if($public_feed) {
|
||||||
|
|
@ -959,6 +963,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 +1014,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 +1038,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']),
|
||||||
|
|
@ -1057,9 +1067,6 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
// if((! strlen($contact['issued-id'])) && (! $contact['duplex']) && (! ($owner['page-flags'] == PAGE_COMMUNITY)))
|
|
||||||
// return 3;
|
|
||||||
|
|
||||||
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
|
||||||
|
|
||||||
if($contact['duplex'] && $contact['dfrn-id'])
|
if($contact['duplex'] && $contact['dfrn-id'])
|
||||||
|
|
@ -1124,6 +1131,9 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
|
$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
|
||||||
$page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
|
$page = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
|
||||||
|
|
||||||
|
if($owner['page-flags'] == PAGE_PRVGROUP)
|
||||||
|
$page = 2;
|
||||||
|
|
||||||
$final_dfrn_id = '';
|
$final_dfrn_id = '';
|
||||||
|
|
||||||
if($perm) {
|
if($perm) {
|
||||||
|
|
@ -1177,7 +1187,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
$postvars['ssl_policy'] = $ssl_policy;
|
$postvars['ssl_policy'] = $ssl_policy;
|
||||||
|
|
||||||
if($page)
|
if($page)
|
||||||
$postvars['page'] = '1';
|
$postvars['page'] = $page;
|
||||||
|
|
||||||
if($rino && $rino_allowed && (! $dissolve)) {
|
if($rino && $rino_allowed && (! $dissolve)) {
|
||||||
$key = substr(random_string(),0,16);
|
$key = substr(random_string(),0,16);
|
||||||
|
|
@ -2194,7 +2204,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 +2231,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 +2721,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(
|
||||||
|
|
@ -2820,7 +2836,7 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
function atom_entry($item,$type,$author,$owner,$comment = false) {
|
function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
|
|
@ -2832,7 +2848,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
|
||||||
|
|
||||||
|
|
||||||
if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
|
if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
|
||||||
$body = fix_private_photos($item['body'],$owner['uid']);
|
$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
|
||||||
else
|
else
|
||||||
$body = $item['body'];
|
$body = $item['body'];
|
||||||
|
|
||||||
|
|
@ -2915,14 +2931,17 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
function fix_private_photos($s,$uid) {
|
function fix_private_photos($s,$uid, $item = null, $cid = 0) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
logger('fix_private_photos');
|
|
||||||
|
|
||||||
if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) {
|
logger('fix_private_photos', LOGGER_DEBUG);
|
||||||
$image = $matches[1];
|
$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
|
||||||
logger('fix_private_photos: found photo ' . $image);
|
|
||||||
if(stristr($image ,$a->get_baseurl() . '/photo/')) {
|
if(preg_match("/\[img(.*?)\](.*?)\[\/img\]/is",$s,$matches)) {
|
||||||
|
$image = $matches[2];
|
||||||
|
logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
|
||||||
|
if(stristr($image , $site . '/photo/')) {
|
||||||
|
$replace = false;
|
||||||
$i = basename($image);
|
$i = basename($image);
|
||||||
$i = str_replace('.jpg','',$i);
|
$i = str_replace('.jpg','',$i);
|
||||||
$x = strpos($i,'-');
|
$x = strpos($i,'-');
|
||||||
|
|
@ -2935,17 +2954,86 @@ function fix_private_photos($s,$uid) {
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
logger('replacing photo');
|
|
||||||
$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
|
// Check to see if we should replace this photo link with an embedded image
|
||||||
|
// 1. No need to do so if the photo is public
|
||||||
|
// 2. If there's a contact-id provided, see if they're in the access list
|
||||||
|
// for the photo. If so, embed it.
|
||||||
|
// 3. Otherwise, if we have an item, see if the item permissions match the photo
|
||||||
|
// permissions, regardless of order but first check to see if they're an exact
|
||||||
|
// match to save some processing overhead.
|
||||||
|
|
||||||
|
// Currently we only embed one private photo per message so as not to hit import
|
||||||
|
// size limits at the receiving end.
|
||||||
|
|
||||||
|
// To embed multiples, we would need to parse out the embedded photos on message
|
||||||
|
// receipt and limit size based only on the text component. Would also need to
|
||||||
|
// ignore all photos during bbcode translation and item localisation, as these
|
||||||
|
// will hit internal regex backtrace limits.
|
||||||
|
|
||||||
|
if(has_permissions($r[0])) {
|
||||||
|
if($cid) {
|
||||||
|
$recips = enumerate_permissions($r[0]);
|
||||||
|
if(in_array($cid, $recips)) {
|
||||||
|
$replace = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
elseif($item) {
|
||||||
|
if(compare_permissions($item,$r[0]))
|
||||||
|
$replace = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if($replace) {
|
||||||
|
logger('fix_private_photos: replacing photo', LOGGER_DEBUG);
|
||||||
|
$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
|
||||||
|
logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return($s);
|
return($s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function has_permissions($obj) {
|
||||||
|
if(($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != ''))
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function compare_permissions($obj1,$obj2) {
|
||||||
|
// first part is easy. Check that these are exactly the same.
|
||||||
|
if(($obj1['allow_cid'] == $obj2['allow_cid'])
|
||||||
|
&& ($obj1['allow_gid'] == $obj2['allow_gid'])
|
||||||
|
&& ($obj1['deny_cid'] == $obj2['deny_cid'])
|
||||||
|
&& ($obj1['deny_gid'] == $obj2['deny_gid']))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// This is harder. Parse all the permissions and compare the resulting set.
|
||||||
|
|
||||||
|
$recipients1 = enumerate_permissions($obj1);
|
||||||
|
$recipients2 = enumerate_permissions($obj2);
|
||||||
|
sort($recipients1);
|
||||||
|
sort($recipients2);
|
||||||
|
if($recipients1 == $recipients2)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// returns an array of contact-ids that are allowed to see this object
|
||||||
|
|
||||||
|
function enumerate_permissions($obj) {
|
||||||
|
require_once('include/group.php');
|
||||||
|
$allow_people = expand_acl($obj['allow_cid']);
|
||||||
|
$allow_groups = expand_groups(expand_acl($obj['allow_gid']));
|
||||||
|
$deny_people = expand_acl($obj['deny_cid']);
|
||||||
|
$deny_groups = expand_groups(expand_acl($obj['deny_gid']));
|
||||||
|
$recipients = array_unique(array_merge($allow_people,$allow_groups));
|
||||||
|
$deny = array_unique(array_merge($deny_people,$deny_groups));
|
||||||
|
$recipients = array_diff($recipients,$deny);
|
||||||
|
return $recipients;
|
||||||
|
}
|
||||||
|
|
||||||
function item_getfeedtags($item) {
|
function item_getfeedtags($item) {
|
||||||
$ret = array();
|
$ret = array();
|
||||||
|
|
@ -2992,13 +3080,20 @@ function item_getfeedattach($item) {
|
||||||
|
|
||||||
function item_expire($uid,$days) {
|
function item_expire($uid,$days) {
|
||||||
|
|
||||||
if((! $uid) || (! $days))
|
if((! $uid) || ($days < 1))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// $expire_network_only = save your own wall posts
|
||||||
|
// and just expire conversations started by others
|
||||||
|
|
||||||
|
$expire_network_only = get_pconfig($uid,'expire','network_only');
|
||||||
|
$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
|
||||||
|
|
||||||
$r = q("SELECT * FROM `item`
|
$r = q("SELECT * FROM `item`
|
||||||
WHERE `uid` = %d
|
WHERE `uid` = %d
|
||||||
AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY
|
AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY
|
||||||
AND `id` = `parent`
|
AND `id` = `parent`
|
||||||
|
$sql_extra
|
||||||
AND `deleted` = 0",
|
AND `deleted` = 0",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($days)
|
intval($days)
|
||||||
|
|
@ -3183,7 +3278,42 @@ function drop_item($id,$interactive = true) {
|
||||||
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d LIMIT 1",
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add a relayable_retraction signature for Diaspora. Note that we can't add a target_author_signature
|
||||||
|
// if the comment was deleted by a remote user. That should be ok, because if a remote user is deleting
|
||||||
|
// the comment, that means we're the home of the post, and Diaspora will only
|
||||||
|
// check the parent_author_signature of retractions that it doesn't have to relay further
|
||||||
|
//
|
||||||
|
// I don't think this function gets called for an "unlike," but I'll check anyway
|
||||||
|
$signed_text = $item['guid'] . ';' . ( ($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
|
||||||
|
|
||||||
|
if(local_user() == $item['uid']) {
|
||||||
|
|
||||||
|
$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
|
||||||
|
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$r = q("SELECT `nick`, `url` FROM `contact` WHERE `id` = '%d' LIMIT 1",
|
||||||
|
$item['contact-id']
|
||||||
|
);
|
||||||
|
if(count($r)) {
|
||||||
|
// The below handle only works for NETWORK_DFRN. I think that's ok, because this function
|
||||||
|
// only handles DFRN deletes
|
||||||
|
$handle_baseurl_start = strpos($r['url'],'://') + 3;
|
||||||
|
$handle_baseurl_length = strpos($r['url'],'/profile') - $handle_baseurl_start;
|
||||||
|
$handle = $r['nick'] . '@' . substr($r['url'], $handle_baseurl_start, $handle_baseurl_length);
|
||||||
|
$authorsig = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(isset($handle))
|
||||||
|
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
intval($item['id']),
|
||||||
|
dbesc($signed_text),
|
||||||
|
dbesc($authorsig),
|
||||||
|
dbesc($handle)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
$drop_id = intval($item['id']);
|
$drop_id = intval($item['id']);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ function nav(&$a) {
|
||||||
|
|
||||||
/* only show friend requests for normal pages. Other page types have automatic friendship. */
|
/* only show friend requests for normal pages. Other page types have automatic friendship. */
|
||||||
|
|
||||||
if($_SESSION['page_flags'] == PAGE_NORMAL) {
|
if($_SESSION['page_flags'] == PAGE_NORMAL || $_SESSION['page_flags'] == PAGE_PRVGROUP) {
|
||||||
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
|
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
|
||||||
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
|
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
|
||||||
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
|
$nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", "");
|
||||||
|
|
|
||||||
|
|
@ -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);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,7 @@ function notifier_run($argv, $argc){
|
||||||
$uid = $r[0]['uid'];
|
$uid = $r[0]['uid'];
|
||||||
$updated = $r[0]['edited'];
|
$updated = $r[0]['edited'];
|
||||||
|
|
||||||
|
// The following seems superfluous. We've already checked for "if (! intval($r[0]['parent']))" a few lines up
|
||||||
if(! $parent_id)
|
if(! $parent_id)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -220,7 +221,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 +266,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -345,7 +346,7 @@ function notifier_run($argv, $argc){
|
||||||
if($mail) {
|
if($mail) {
|
||||||
$public_message = false; // mail is not public
|
$public_message = false; // mail is not public
|
||||||
|
|
||||||
$body = fix_private_photos($item['body'],$owner['uid']);
|
$body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
|
||||||
|
|
||||||
$atom .= replace_macros($mail_template, array(
|
$atom .= replace_macros($mail_template, array(
|
||||||
'$name' => xmlify($owner['name']),
|
'$name' => xmlify($owner['name']),
|
||||||
|
|
@ -478,17 +479,42 @@ function notifier_run($argv, $argc){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach($r as $contact) {
|
|
||||||
|
// This controls the number of deliveries to execute with each separate delivery process.
|
||||||
|
// By default we'll perform one delivery per process. Assuming a hostile shared hosting
|
||||||
|
// provider, this provides the greatest chance of deliveries if processes start getting
|
||||||
|
// killed. We can also space them out with the delivery_interval to also help avoid them
|
||||||
|
// getting whacked.
|
||||||
|
|
||||||
|
// If $deliveries_per_process > 1, we will chain this number of multiple deliveries
|
||||||
|
// together into a single process. This will reduce the overall number of processes
|
||||||
|
// spawned for each delivery, but they will run longer.
|
||||||
|
|
||||||
|
$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
|
||||||
|
if($deliveries_per_process <= 0)
|
||||||
|
$deliveries_per_process = 1;
|
||||||
|
|
||||||
|
$this_batch = array();
|
||||||
|
|
||||||
|
for($x = 0; $x < count($r); $x ++) {
|
||||||
|
$contact = $r[$x];
|
||||||
|
|
||||||
if($contact['self'])
|
if($contact['self'])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// potentially more than one recipient. Start a new process and space them out a bit.
|
// potentially more than one recipient. Start a new process and space them out a bit.
|
||||||
// we will deliver single recipient types of message and email receipients here.
|
// we will deliver single recipient types of message and email recipients here.
|
||||||
|
|
||||||
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
||||||
proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
|
|
||||||
if($interval)
|
$this_batch[] = $contact['id'];
|
||||||
@time_sleep_until(microtime(true) + (float) $interval);
|
|
||||||
|
if(count($this_batch) == $deliveries_per_process) {
|
||||||
|
proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
|
||||||
|
$this_batch = array();
|
||||||
|
if($interval)
|
||||||
|
@time_sleep_until(microtime(true) + (float) $interval);
|
||||||
|
}
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -571,7 +597,7 @@ function notifier_run($argv, $argc){
|
||||||
break;
|
break;
|
||||||
case NETWORK_OSTATUS:
|
case NETWORK_OSTATUS:
|
||||||
|
|
||||||
// Do not send to otatus if we are not configured to send to public networks
|
// Do not send to ostatus if we are not configured to send to public networks
|
||||||
if($owner['prvnets'])
|
if($owner['prvnets'])
|
||||||
break;
|
break;
|
||||||
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
if(get_config('system','ostatus_disabled') || get_config('system','dfrn_only'))
|
||||||
|
|
@ -712,18 +738,19 @@ function notifier_run($argv, $argc){
|
||||||
// unsupported
|
// unsupported
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif(($target_item['deleted']) && ($target_item['verb'] !== ACTIVITY_LIKE)) {
|
elseif(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
|
||||||
// diaspora delete,
|
// send both top-level retractions and relayable retractions for owner to relay
|
||||||
diaspora_send_retraction($target_item,$owner,$contact);
|
diaspora_send_retraction($target_item,$owner,$contact);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif($followup) {
|
elseif($followup) {
|
||||||
// send comments, likes and retractions of likes to owner to relay
|
// send comments and likes to owner to relay
|
||||||
diaspora_send_followup($target_item,$owner,$contact);
|
diaspora_send_followup($target_item,$owner,$contact);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
elseif($target_item['parent'] != $target_item['id']) {
|
elseif($target_item['uri'] !== $target_item['parent-uri']) {
|
||||||
// we are the relay - send comments, likes and unlikes to our conversants
|
// we are the relay - send comments, likes and relayable_retractions
|
||||||
|
// (of comments and likes) to our conversants
|
||||||
diaspora_send_relay($target_item,$owner,$contact);
|
diaspora_send_relay($target_item,$owner,$contact);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -833,6 +860,13 @@ function notifier_run($argv, $argc){
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the item was deleted, clean up the `sign` table
|
||||||
|
if($target_item['deleted']) {
|
||||||
|
$r = q("DELETE FROM sign where `retract_iid` = %d",
|
||||||
|
intval($target_item['id'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
logger('notifier: calling hooks', LOGGER_DEBUG);
|
logger('notifier: calling hooks', LOGGER_DEBUG);
|
||||||
|
|
||||||
if($normal_mode)
|
if($normal_mode)
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
if(! function_exists('get_language')) {
|
if(! function_exists('get_browser_language')) {
|
||||||
function get_language() {
|
function get_browser_language() {
|
||||||
|
|
||||||
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
|
if (x($_SERVER,'HTTP_ACCEPT_LANGUAGE')) {
|
||||||
// break up string into pieces (languages and q factors)
|
// break up string into pieces (languages and q factors)
|
||||||
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
|
preg_match_all('/([a-z]{1,8}(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i',
|
||||||
$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
|
$_SERVER['HTTP_ACCEPT_LANGUAGE'], $lang_parse);
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@ function advanced_profile(&$a) {
|
||||||
|
|
||||||
$val = ((intval($a->profile['dob']))
|
$val = ((intval($a->profile['dob']))
|
||||||
? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
|
? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
|
||||||
: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format)));
|
: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
|
||||||
|
|
||||||
$profile['birthday'] = array( t('Birthday:'), $val);
|
$profile['birthday'] = array( t('Birthday:'), $val);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -39,11 +39,16 @@ function advanced_profile(&$a) {
|
||||||
|
|
||||||
if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
|
if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
|
||||||
|
|
||||||
|
if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
|
||||||
|
$profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
|
||||||
|
}
|
||||||
|
|
||||||
if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
|
if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
|
||||||
|
|
||||||
if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
|
if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
|
||||||
|
|
||||||
|
if($a->profile['hometown']) $profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
|
||||||
|
|
||||||
if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
|
if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
|
||||||
|
|
||||||
if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
|
if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@ function gender_selector($current="",$suffix="") {
|
||||||
$o = '';
|
$o = '';
|
||||||
$select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided'));
|
$select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided'));
|
||||||
|
|
||||||
|
call_hooks('gender_selector', $select);
|
||||||
|
|
||||||
$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
|
$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
|
||||||
foreach($select as $selection) {
|
foreach($select as $selection) {
|
||||||
if($selection !== 'NOTRANSLATION') {
|
if($selection !== 'NOTRANSLATION') {
|
||||||
|
|
@ -20,6 +22,9 @@ function sexpref_selector($current="",$suffix="") {
|
||||||
$o = '';
|
$o = '';
|
||||||
$select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
|
$select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
|
||||||
|
|
||||||
|
|
||||||
|
call_hooks('sexpref_selector', $select);
|
||||||
|
|
||||||
$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
|
$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
|
||||||
foreach($select as $selection) {
|
foreach($select as $selection) {
|
||||||
if($selection !== 'NOTRANSLATION') {
|
if($selection !== 'NOTRANSLATION') {
|
||||||
|
|
@ -36,6 +41,8 @@ function marital_selector($current="",$suffix="") {
|
||||||
$o = '';
|
$o = '';
|
||||||
$select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') );
|
$select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') );
|
||||||
|
|
||||||
|
call_hooks('marital_selector', $select);
|
||||||
|
|
||||||
$o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
|
$o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
|
||||||
foreach($select as $selection) {
|
foreach($select as $selection) {
|
||||||
if($selection !== 'NOTRANSLATION') {
|
if($selection !== 'NOTRANSLATION') {
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
|
||||||
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
|
header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
|
||||||
|
|
||||||
if($login_initial) {
|
if($login_initial) {
|
||||||
$l = get_language();
|
$l = get_browser_language();
|
||||||
|
|
||||||
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
|
q("UPDATE `user` SET `login_date` = '%s', `language` = '%s' WHERE `uid` = %d LIMIT 1",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
|
|
|
||||||
|
|
@ -71,20 +71,24 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
|
||||||
|
|
||||||
$name = $entry->displayName;
|
$name = $entry->displayName;
|
||||||
|
|
||||||
foreach($entry->urls as $url) {
|
if(isset($entry->urls)) {
|
||||||
if($url->type == 'profile') {
|
foreach($entry->urls as $url) {
|
||||||
$profile_url = $url->value;
|
if($url->type == 'profile') {
|
||||||
continue;
|
$profile_url = $url->value;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if($url->type == 'webfinger') {
|
||||||
|
$connect_url = str_replace('acct:' , '', $url->value);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if($url->type == 'webfinger') {
|
}
|
||||||
$connect_url = str_replace('acct:' , '', $url->value);
|
if(isset($entry->photos)) {
|
||||||
continue;
|
foreach($entry->photos as $photo) {
|
||||||
}
|
if($photo->type == 'profile') {
|
||||||
}
|
$profile_photo = $photo->value;
|
||||||
foreach($entry->photos as $photo) {
|
continue;
|
||||||
if($photo->type == 'profile') {
|
}
|
||||||
$profile_photo = $photo->value;
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -646,7 +646,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$o = '<div id="' . $id . '">';
|
$o = '<div id="' . $id . '">';
|
||||||
$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
|
$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
|
||||||
$o .= '<input type="text" name="search" id="search-text" value="' . $s .'" />';
|
$o .= '<input type="text" name="search" id="search-text" placeholder="' . t('Search') . '" value="' . $s .'" />';
|
||||||
$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />';
|
$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />';
|
||||||
if($save)
|
if($save)
|
||||||
$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />';
|
$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />';
|
||||||
|
|
@ -742,6 +742,8 @@ function smilies($s, $sample = false) {
|
||||||
':homebrew',
|
':homebrew',
|
||||||
':coffee',
|
':coffee',
|
||||||
':facepalm',
|
':facepalm',
|
||||||
|
':like',
|
||||||
|
':dislike',
|
||||||
'~friendika',
|
'~friendika',
|
||||||
'~friendica'
|
'~friendica'
|
||||||
|
|
||||||
|
|
@ -778,6 +780,8 @@ function smilies($s, $sample = false) {
|
||||||
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
|
'<img src="' . $a->get_baseurl() . '/images/beer_mug.gif" alt=":homebrew" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
|
'<img src="' . $a->get_baseurl() . '/images/coffee.gif" alt=":coffee" />',
|
||||||
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
||||||
|
'<img src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
|
||||||
|
'<img src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
|
||||||
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
|
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
|
||||||
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
|
'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
|
||||||
);
|
);
|
||||||
|
|
@ -887,6 +891,7 @@ function prepare_body($item,$attach = false) {
|
||||||
} else
|
} else
|
||||||
$s = prepare_text($item['body']);
|
$s = prepare_text($item['body']);
|
||||||
|
|
||||||
|
|
||||||
$prep_arr = array('item' => $item, 'html' => $s);
|
$prep_arr = array('item' => $item, 'html' => $s);
|
||||||
call_hooks('prepare_body', $prep_arr);
|
call_hooks('prepare_body', $prep_arr);
|
||||||
$s = $prep_arr['html'];
|
$s = $prep_arr['html'];
|
||||||
|
|
@ -901,24 +906,30 @@ function prepare_body($item,$attach = false) {
|
||||||
foreach($arr as $r) {
|
foreach($arr as $r) {
|
||||||
$matches = false;
|
$matches = false;
|
||||||
$icon = '';
|
$icon = '';
|
||||||
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
|
$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
|
||||||
if($cnt) {
|
if($cnt) {
|
||||||
$icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/')));
|
foreach($matches as $mtch) {
|
||||||
switch($icontype) {
|
$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
|
||||||
case 'video':
|
switch($icontype) {
|
||||||
case 'audio':
|
case 'video':
|
||||||
case 'image':
|
case 'audio':
|
||||||
case 'text':
|
case 'image':
|
||||||
$icon = '<div class="attachtype icon s22 type-' . $icontype . '"></div>';
|
case 'text':
|
||||||
break;
|
$icon = '<div class="attachtype icon s22 type-' . $icontype . '"></div>';
|
||||||
default:
|
break;
|
||||||
$icon = '<div class="attachtype icon s22 type-unkn"></div>';
|
default:
|
||||||
break;
|
$icon = '<div class="attachtype icon s22 type-unkn"></div>';
|
||||||
}
|
break;
|
||||||
$title = ((strlen(trim($matches[4]))) ? escape_tags(trim($matches[4])) : escape_tags($matches[1]));
|
}
|
||||||
$title .= ' ' . $matches[2] . ' ' . t('bytes');
|
$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
|
||||||
|
$title .= ' ' . $mtch[2] . ' ' . t('bytes');
|
||||||
|
if((local_user() == $item['uid']) && $item['contact-id'] != $a->contact['id'])
|
||||||
|
$the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
|
||||||
|
else
|
||||||
|
$the_url = $mtch[1];
|
||||||
|
|
||||||
$s .= '<a href="' . strip_tags($matches[1]) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
|
$s .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$s .= '<div class="clear"></div></div>';
|
$s .= '<div class="clear"></div></div>';
|
||||||
|
|
|
||||||
327
include/user.php
Normal file
327
include/user.php
Normal file
|
|
@ -0,0 +1,327 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once('include/config.php');
|
||||||
|
require_once('include/network.php');
|
||||||
|
require_once('include/plugin.php');
|
||||||
|
require_once('include/text.php');
|
||||||
|
require_once('include/pgettext.php');
|
||||||
|
require_once('include/datetime.php');
|
||||||
|
|
||||||
|
function create_user($arr) {
|
||||||
|
|
||||||
|
// Required: { username, nickname, email } or { openid_url }
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
$result = array('success' => false, 'user' => null, 'password' => '', 'message' => '');
|
||||||
|
|
||||||
|
$using_invites = get_config('system','invitation_only');
|
||||||
|
$num_invites = get_config('system','number_invites');
|
||||||
|
|
||||||
|
|
||||||
|
$invite_id = ((x($arr,'invite_id')) ? notags(trim($arr['invite_id'])) : '');
|
||||||
|
$username = ((x($arr,'username')) ? notags(trim($arr['username'])) : '');
|
||||||
|
$nickname = ((x($arr,'nickname')) ? notags(trim($arr['nickname'])) : '');
|
||||||
|
$email = ((x($arr,'email')) ? notags(trim($arr['email'])) : '');
|
||||||
|
$openid_url = ((x($arr,'openid_url')) ? notags(trim($arr['openid_url'])) : '');
|
||||||
|
$photo = ((x($arr,'photo')) ? notags(trim($arr['photo'])) : '');
|
||||||
|
$password = ((x($arr,'password')) ? trim($arr['password']) : '');
|
||||||
|
$blocked = ((x($arr,'blocked')) ? intval($arr['blocked']) : 0);
|
||||||
|
$verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0);
|
||||||
|
|
||||||
|
$publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
|
||||||
|
$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
|
||||||
|
|
||||||
|
$tmp_str = $openid_url;
|
||||||
|
|
||||||
|
if($using_invites) {
|
||||||
|
if(! $invite_id) {
|
||||||
|
$result['message'] .= t('An invitation is required.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
|
||||||
|
if(! results($r)) {
|
||||||
|
$result['message'] .= t('Invitation could not be verified.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if((! x($username)) || (! x($email)) || (! x($nickname))) {
|
||||||
|
if($openid_url) {
|
||||||
|
if(! validate_url($tmp_str)) {
|
||||||
|
$result['message'] .= t('Invalid OpenID url') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$_SESSION['register'] = 1;
|
||||||
|
$_SESSION['openid'] = $openid_url;
|
||||||
|
require_once('library/openid.php');
|
||||||
|
$openid = new LightOpenID;
|
||||||
|
$openid->identity = $openid_url;
|
||||||
|
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
||||||
|
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
||||||
|
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
|
||||||
|
goaway($openid->authUrl());
|
||||||
|
// NOTREACHED
|
||||||
|
}
|
||||||
|
|
||||||
|
notice( t('Please enter the required information.') . EOL );
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! validate_url($tmp_str))
|
||||||
|
$openid_url = '';
|
||||||
|
|
||||||
|
|
||||||
|
$err = '';
|
||||||
|
|
||||||
|
// collapse multiple spaces in name
|
||||||
|
$username = preg_replace('/ +/',' ',$username);
|
||||||
|
|
||||||
|
if(mb_strlen($username) > 48)
|
||||||
|
$result['message'] .= t('Please use a shorter name.') . EOL;
|
||||||
|
if(mb_strlen($username) < 3)
|
||||||
|
$result['message'] .= t('Name too short.') . EOL;
|
||||||
|
|
||||||
|
// I don't really like having this rule, but it cuts down
|
||||||
|
// on the number of auto-registrations by Russian spammers
|
||||||
|
|
||||||
|
// Using preg_match was completely unreliable, due to mixed UTF-8 regex support
|
||||||
|
// $no_utf = get_config('system','no_utf');
|
||||||
|
// $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
|
||||||
|
|
||||||
|
// So now we are just looking for a space in the full name.
|
||||||
|
|
||||||
|
$loose_reg = get_config('system','no_regfullname');
|
||||||
|
if(! $loose_reg) {
|
||||||
|
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
|
||||||
|
if(! strpos($username,' '))
|
||||||
|
$result['message'] .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(! allowed_email($email))
|
||||||
|
$result['message'] .= t('Your email domain is not among those allowed on this site.') . EOL;
|
||||||
|
|
||||||
|
if((! valid_email($email)) || (! validate_email($email)))
|
||||||
|
$result['message'] .= t('Not a valid email address.') . EOL;
|
||||||
|
|
||||||
|
// Disallow somebody creating an account using openid that uses the admin email address,
|
||||||
|
// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
|
||||||
|
|
||||||
|
if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
|
||||||
|
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
|
||||||
|
dbesc($email)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$result['message'] .= t('Cannot use that email.') . EOL;
|
||||||
|
}
|
||||||
|
|
||||||
|
$nickname = $arr['nickname'] = strtolower($nickname);
|
||||||
|
|
||||||
|
if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
|
||||||
|
$result['message'] .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
|
||||||
|
$r = q("SELECT `uid` FROM `user`
|
||||||
|
WHERE `nickname` = '%s' LIMIT 1",
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
|
||||||
|
|
||||||
|
// Check deleted accounts that had this nickname. Doesn't matter to us,
|
||||||
|
// but could be a security issue for federated platforms.
|
||||||
|
|
||||||
|
$r = q("SELECT * FROM `userd`
|
||||||
|
WHERE `username` = '%s' LIMIT 1",
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
if(count($r))
|
||||||
|
$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
|
||||||
|
|
||||||
|
if(strlen($result['message'])) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$new_password = ((strlen($password)) ? $password : autoname(6) . mt_rand(100,9999));
|
||||||
|
$new_password_encoded = hash('whirlpool',$new_password);
|
||||||
|
|
||||||
|
$result['password'] = $new_password;
|
||||||
|
|
||||||
|
require_once('include/crypto.php');
|
||||||
|
|
||||||
|
$keys = new_keypair(1024);
|
||||||
|
|
||||||
|
if($keys === false) {
|
||||||
|
$result['message'] .= t('SERIOUS ERROR: Generation of security keys failed.') . EOL;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
$prvkey = $keys['prvkey'];
|
||||||
|
$pubkey = $keys['pubkey'];
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* Create another keypair for signing/verifying
|
||||||
|
* salmon protocol messages. We have to use a slightly
|
||||||
|
* less robust key because this won't be using openssl
|
||||||
|
* but the phpseclib. Since it is PHP interpreted code
|
||||||
|
* it is not nearly as efficient, and the larger keys
|
||||||
|
* will take several minutes each to process.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
$sres = new_keypair(512);
|
||||||
|
$sprvkey = $sres['prvkey'];
|
||||||
|
$spubkey = $sres['pubkey'];
|
||||||
|
|
||||||
|
$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
|
||||||
|
`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
|
||||||
|
VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
|
||||||
|
dbesc(generate_user_guid()),
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($new_password_encoded),
|
||||||
|
dbesc($email),
|
||||||
|
dbesc($openid_url),
|
||||||
|
dbesc($nickname),
|
||||||
|
dbesc($pubkey),
|
||||||
|
dbesc($prvkey),
|
||||||
|
dbesc($spubkey),
|
||||||
|
dbesc($sprvkey),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
intval($verified),
|
||||||
|
intval($blocked)
|
||||||
|
);
|
||||||
|
|
||||||
|
if($r) {
|
||||||
|
$r = q("SELECT * FROM `user`
|
||||||
|
WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($new_password_encoded)
|
||||||
|
);
|
||||||
|
if($r !== false && count($r)) {
|
||||||
|
$u = $r[0];
|
||||||
|
$newuid = intval($r[0]['uid']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$result['message'] .= t('An error occurred during registration. Please try again.') . EOL ;
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* if somebody clicked submit twice very quickly, they could end up with two accounts
|
||||||
|
* due to race condition. Remove this one.
|
||||||
|
*/
|
||||||
|
|
||||||
|
$r = q("SELECT `uid` FROM `user`
|
||||||
|
WHERE `nickname` = '%s' ",
|
||||||
|
dbesc($nickname)
|
||||||
|
);
|
||||||
|
if((count($r) > 1) && $newuid) {
|
||||||
|
$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
|
||||||
|
q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
|
||||||
|
intval($newuid)
|
||||||
|
);
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(x($newuid) !== false) {
|
||||||
|
$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
|
||||||
|
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
|
||||||
|
intval($newuid),
|
||||||
|
t('default'),
|
||||||
|
1,
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
||||||
|
intval($publish),
|
||||||
|
intval($netpublish)
|
||||||
|
|
||||||
|
);
|
||||||
|
if($r === false) {
|
||||||
|
$result['message'] .= t('An error occurred creating your default profile. Please try again.') . EOL;
|
||||||
|
// Start fresh next time.
|
||||||
|
$r = q("DELETE FROM `user` WHERE `uid` = %d",
|
||||||
|
intval($newuid));
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
$r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
|
||||||
|
`request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
|
||||||
|
VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
|
||||||
|
intval($newuid),
|
||||||
|
datetime_convert(),
|
||||||
|
dbesc($username),
|
||||||
|
dbesc($nickname),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
|
||||||
|
dbesc($a->get_baseurl() . "/profile/$nickname"),
|
||||||
|
dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
|
||||||
|
dbesc($a->get_baseurl() . "/poco/$nickname"),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert()),
|
||||||
|
dbesc(datetime_convert())
|
||||||
|
);
|
||||||
|
|
||||||
|
// Create a group with no members. This allows somebody to use it
|
||||||
|
// right away as a default group for new contacts.
|
||||||
|
|
||||||
|
require_once('include/group.php');
|
||||||
|
group_add($newuid, t('Friends'));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// if we have no OpenID photo try to look up an avatar
|
||||||
|
if(! strlen($photo))
|
||||||
|
$photo = avatar_img($email);
|
||||||
|
|
||||||
|
// unless there is no avatar-plugin loaded
|
||||||
|
if(strlen($photo)) {
|
||||||
|
require_once('include/Photo.php');
|
||||||
|
$photo_failure = false;
|
||||||
|
|
||||||
|
$filename = basename($photo);
|
||||||
|
$img_str = fetch_url($photo,true);
|
||||||
|
$img = new Photo($img_str);
|
||||||
|
if($img->is_valid()) {
|
||||||
|
|
||||||
|
$img->scaleImageSquare(175);
|
||||||
|
|
||||||
|
$hash = photo_new_resource();
|
||||||
|
|
||||||
|
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
|
||||||
|
|
||||||
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
|
$img->scaleImage(80);
|
||||||
|
|
||||||
|
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
|
||||||
|
|
||||||
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
|
$img->scaleImage(48);
|
||||||
|
|
||||||
|
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
|
||||||
|
|
||||||
|
if($r === false)
|
||||||
|
$photo_failure = true;
|
||||||
|
|
||||||
|
if(! $photo_failure) {
|
||||||
|
q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
|
||||||
|
dbesc($hash)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
call_hooks('register_account', $newuid);
|
||||||
|
|
||||||
|
$result['success'] = true;
|
||||||
|
$result['user'] = $u;
|
||||||
|
return $result;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -27,7 +27,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
|
||||||
|
|
||||||
@include(".htconfig.php");
|
@include(".htconfig.php");
|
||||||
|
|
||||||
$lang = get_language();
|
$lang = get_browser_language();
|
||||||
|
|
||||||
load_translation_table($lang);
|
load_translation_table($lang);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
|
||||||
/*
|
/*
|
||||||
* gArCountryInfo
|
* gArCountryInfo
|
||||||
* (0) Country name
|
* (0) Country name
|
||||||
|
|
|
||||||
|
|
@ -117,6 +117,9 @@
|
||||||
|
|
||||||
/* nav update event */
|
/* nav update event */
|
||||||
$('nav').bind('nav-update', function(e,data){;
|
$('nav').bind('nav-update', function(e,data){;
|
||||||
|
var invalid = $(data).find('invalid').text();
|
||||||
|
if(invalid == 1) { window.location.href=window.location.href }
|
||||||
|
|
||||||
var net = $(data).find('net').text();
|
var net = $(data).find('net').text();
|
||||||
if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
|
if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') }
|
||||||
$('#net-update').html(net);
|
$('#net-update').html(net);
|
||||||
|
|
@ -211,7 +214,8 @@
|
||||||
function NavUpdate() {
|
function NavUpdate() {
|
||||||
|
|
||||||
if(! stopped) {
|
if(! stopped) {
|
||||||
$.get("ping",function(data) {
|
var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : '');
|
||||||
|
$.get(pingCmd,function(data) {
|
||||||
$(data).find('result').each(function() {
|
$(data).find('result').each(function() {
|
||||||
// send nav-update event
|
// send nav-update event
|
||||||
$('nav').trigger('nav-update', this);
|
$('nav').trigger('nav-update', this);
|
||||||
|
|
|
||||||
1708
library/langdet/Text/LanguageDetect.php
Normal file
1708
library/langdet/Text/LanguageDetect.php
Normal file
File diff suppressed because it is too large
Load diff
57
library/langdet/Text/LanguageDetect/Exception.php
Normal file
57
library/langdet/Text/LanguageDetect/Exception.php
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
<?php
|
||||||
|
class Text_LanguageDetect_Exception extends Exception
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Database file could not be found
|
||||||
|
*/
|
||||||
|
const DB_NOT_FOUND = 10;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Database file found, but not readable
|
||||||
|
*/
|
||||||
|
const DB_NOT_READABLE = 11;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Database file is empty
|
||||||
|
*/
|
||||||
|
const DB_EMPTY = 12;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Database contents is not a PHP array
|
||||||
|
*/
|
||||||
|
const DB_NOT_ARRAY = 13;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Magic quotes are activated
|
||||||
|
*/
|
||||||
|
const MAGIC_QUOTES = 14;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parameter of invalid type passed to method
|
||||||
|
*/
|
||||||
|
const PARAM_TYPE = 20;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Character in parameter is invalid
|
||||||
|
*/
|
||||||
|
const INVALID_CHAR = 21;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Language is not in the database
|
||||||
|
*/
|
||||||
|
const UNKNOWN_LANGUAGE = 30;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error during block detection
|
||||||
|
*/
|
||||||
|
const BLOCK_DETECTION = 40;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Error while clustering languages
|
||||||
|
*/
|
||||||
|
const NO_HIGHEST_KEY = 50;
|
||||||
|
}
|
||||||
341
library/langdet/Text/LanguageDetect/ISO639.php
Normal file
341
library/langdet/Text/LanguageDetect/ISO639.php
Normal file
|
|
@ -0,0 +1,341 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Part of Text_LanguageDetect
|
||||||
|
*
|
||||||
|
* PHP version 5
|
||||||
|
*
|
||||||
|
* @category Text
|
||||||
|
* @package Text_LanguageDetect
|
||||||
|
* @author Christian Weiske <cweiske@php.net>
|
||||||
|
* @copyright 2011 Christian Weiske <cweiske@php.net>
|
||||||
|
* @license http://www.debian.org/misc/bsd.license BSD
|
||||||
|
* @version SVN: $Id$
|
||||||
|
* @link http://pear.php.net/package/Text_LanguageDetect/
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Provides a mapping between the languages from lang.dat and the
|
||||||
|
* ISO 639-1 and ISO-639-2 codes.
|
||||||
|
*
|
||||||
|
* Note that this class contains only languages that exist in lang.dat.
|
||||||
|
*
|
||||||
|
* @category Text
|
||||||
|
* @package Text_LanguageDetect
|
||||||
|
* @author Christian Weiske <cweiske@php.net>
|
||||||
|
* @copyright 2011 Christian Weiske <cweiske@php.net>
|
||||||
|
* @license http://www.debian.org/misc/bsd.license BSD
|
||||||
|
* @link http://www.loc.gov/standards/iso639-2/php/code_list.php
|
||||||
|
*/
|
||||||
|
class Text_LanguageDetect_ISO639
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Maps all language names from the language database to the
|
||||||
|
* ISO 639-1 2-letter language code.
|
||||||
|
*
|
||||||
|
* NULL indicates that there is no 2-letter code.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
public static $nameToCode2 = array(
|
||||||
|
'albanian' => 'sq',
|
||||||
|
'arabic' => 'ar',
|
||||||
|
'azeri' => 'az',
|
||||||
|
'bengali' => 'bn',
|
||||||
|
'bulgarian' => 'bg',
|
||||||
|
'cebuano' => null,
|
||||||
|
'croatian' => 'hr',
|
||||||
|
'czech' => 'cs',
|
||||||
|
'danish' => 'da',
|
||||||
|
'dutch' => 'nl',
|
||||||
|
'english' => 'en',
|
||||||
|
'estonian' => 'et',
|
||||||
|
'farsi' => 'fa',
|
||||||
|
'finnish' => 'fi',
|
||||||
|
'french' => 'fr',
|
||||||
|
'german' => 'de',
|
||||||
|
'hausa' => 'ha',
|
||||||
|
'hawaiian' => null,
|
||||||
|
'hindi' => 'hi',
|
||||||
|
'hungarian' => 'hu',
|
||||||
|
'icelandic' => 'is',
|
||||||
|
'indonesian' => 'id',
|
||||||
|
'italian' => 'it',
|
||||||
|
'kazakh' => 'kk',
|
||||||
|
'kyrgyz' => 'ky',
|
||||||
|
'latin' => 'la',
|
||||||
|
'latvian' => 'lv',
|
||||||
|
'lithuanian' => 'lt',
|
||||||
|
'macedonian' => 'mk',
|
||||||
|
'mongolian' => 'mn',
|
||||||
|
'nepali' => 'ne',
|
||||||
|
'norwegian' => 'no',
|
||||||
|
'pashto' => 'ps',
|
||||||
|
'pidgin' => null,
|
||||||
|
'polish' => 'pl',
|
||||||
|
'portuguese' => 'pt',
|
||||||
|
'romanian' => 'ro',
|
||||||
|
'russian' => 'ru',
|
||||||
|
'serbian' => 'sr',
|
||||||
|
'slovak' => 'sk',
|
||||||
|
'slovene' => 'sl',
|
||||||
|
'somali' => 'so',
|
||||||
|
'spanish' => 'es',
|
||||||
|
'swahili' => 'sw',
|
||||||
|
'swedish' => 'sv',
|
||||||
|
'tagalog' => 'tl',
|
||||||
|
'turkish' => 'tr',
|
||||||
|
'ukrainian' => 'uk',
|
||||||
|
'urdu' => 'ur',
|
||||||
|
'uzbek' => 'uz',
|
||||||
|
'vietnamese' => 'vi',
|
||||||
|
'welsh' => 'cy',
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maps all language names from the language database to the
|
||||||
|
* ISO 639-2 3-letter language code.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
public static $nameToCode3 = array(
|
||||||
|
'albanian' => 'sqi',
|
||||||
|
'arabic' => 'ara',
|
||||||
|
'azeri' => 'aze',
|
||||||
|
'bengali' => 'ben',
|
||||||
|
'bulgarian' => 'bul',
|
||||||
|
'cebuano' => 'ceb',
|
||||||
|
'croatian' => 'hrv',
|
||||||
|
'czech' => 'ces',
|
||||||
|
'danish' => 'dan',
|
||||||
|
'dutch' => 'nld',
|
||||||
|
'english' => 'eng',
|
||||||
|
'estonian' => 'est',
|
||||||
|
'farsi' => 'fas',
|
||||||
|
'finnish' => 'fin',
|
||||||
|
'french' => 'fra',
|
||||||
|
'german' => 'deu',
|
||||||
|
'hausa' => 'hau',
|
||||||
|
'hawaiian' => 'haw',
|
||||||
|
'hindi' => 'hin',
|
||||||
|
'hungarian' => 'hun',
|
||||||
|
'icelandic' => 'isl',
|
||||||
|
'indonesian' => 'ind',
|
||||||
|
'italian' => 'ita',
|
||||||
|
'kazakh' => 'kaz',
|
||||||
|
'kyrgyz' => 'kir',
|
||||||
|
'latin' => 'lat',
|
||||||
|
'latvian' => 'lav',
|
||||||
|
'lithuanian' => 'lit',
|
||||||
|
'macedonian' => 'mkd',
|
||||||
|
'mongolian' => 'mon',
|
||||||
|
'nepali' => 'nep',
|
||||||
|
'norwegian' => 'nor',
|
||||||
|
'pashto' => 'pus',
|
||||||
|
'pidgin' => 'crp',
|
||||||
|
'polish' => 'pol',
|
||||||
|
'portuguese' => 'por',
|
||||||
|
'romanian' => 'ron',
|
||||||
|
'russian' => 'rus',
|
||||||
|
'serbian' => 'srp',
|
||||||
|
'slovak' => 'slk',
|
||||||
|
'slovene' => 'slv',
|
||||||
|
'somali' => 'som',
|
||||||
|
'spanish' => 'spa',
|
||||||
|
'swahili' => 'swa',
|
||||||
|
'swedish' => 'swe',
|
||||||
|
'tagalog' => 'tgl',
|
||||||
|
'turkish' => 'tur',
|
||||||
|
'ukrainian' => 'ukr',
|
||||||
|
'urdu' => 'urd',
|
||||||
|
'uzbek' => 'uzb',
|
||||||
|
'vietnamese' => 'vie',
|
||||||
|
'welsh' => 'cym',
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maps ISO 639-1 2-letter language codes to the language names
|
||||||
|
* in the language database
|
||||||
|
*
|
||||||
|
* Not all languages have a 2 letter code, so some are missing
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
public static $code2ToName = array(
|
||||||
|
'ar' => 'arabic',
|
||||||
|
'az' => 'azeri',
|
||||||
|
'bg' => 'bulgarian',
|
||||||
|
'bn' => 'bengali',
|
||||||
|
'cs' => 'czech',
|
||||||
|
'cy' => 'welsh',
|
||||||
|
'da' => 'danish',
|
||||||
|
'de' => 'german',
|
||||||
|
'en' => 'english',
|
||||||
|
'es' => 'spanish',
|
||||||
|
'et' => 'estonian',
|
||||||
|
'fa' => 'farsi',
|
||||||
|
'fi' => 'finnish',
|
||||||
|
'fr' => 'french',
|
||||||
|
'ha' => 'hausa',
|
||||||
|
'hi' => 'hindi',
|
||||||
|
'hr' => 'croatian',
|
||||||
|
'hu' => 'hungarian',
|
||||||
|
'id' => 'indonesian',
|
||||||
|
'is' => 'icelandic',
|
||||||
|
'it' => 'italian',
|
||||||
|
'kk' => 'kazakh',
|
||||||
|
'ky' => 'kyrgyz',
|
||||||
|
'la' => 'latin',
|
||||||
|
'lt' => 'lithuanian',
|
||||||
|
'lv' => 'latvian',
|
||||||
|
'mk' => 'macedonian',
|
||||||
|
'mn' => 'mongolian',
|
||||||
|
'ne' => 'nepali',
|
||||||
|
'nl' => 'dutch',
|
||||||
|
'no' => 'norwegian',
|
||||||
|
'pl' => 'polish',
|
||||||
|
'ps' => 'pashto',
|
||||||
|
'pt' => 'portuguese',
|
||||||
|
'ro' => 'romanian',
|
||||||
|
'ru' => 'russian',
|
||||||
|
'sk' => 'slovak',
|
||||||
|
'sl' => 'slovene',
|
||||||
|
'so' => 'somali',
|
||||||
|
'sq' => 'albanian',
|
||||||
|
'sr' => 'serbian',
|
||||||
|
'sv' => 'swedish',
|
||||||
|
'sw' => 'swahili',
|
||||||
|
'tl' => 'tagalog',
|
||||||
|
'tr' => 'turkish',
|
||||||
|
'uk' => 'ukrainian',
|
||||||
|
'ur' => 'urdu',
|
||||||
|
'uz' => 'uzbek',
|
||||||
|
'vi' => 'vietnamese',
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maps ISO 639-2 3-letter language codes to the language names
|
||||||
|
* in the language database.
|
||||||
|
*
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
public static $code3ToName = array(
|
||||||
|
'ara' => 'arabic',
|
||||||
|
'aze' => 'azeri',
|
||||||
|
'ben' => 'bengali',
|
||||||
|
'bul' => 'bulgarian',
|
||||||
|
'ceb' => 'cebuano',
|
||||||
|
'ces' => 'czech',
|
||||||
|
'crp' => 'pidgin',
|
||||||
|
'cym' => 'welsh',
|
||||||
|
'dan' => 'danish',
|
||||||
|
'deu' => 'german',
|
||||||
|
'eng' => 'english',
|
||||||
|
'est' => 'estonian',
|
||||||
|
'fas' => 'farsi',
|
||||||
|
'fin' => 'finnish',
|
||||||
|
'fra' => 'french',
|
||||||
|
'hau' => 'hausa',
|
||||||
|
'haw' => 'hawaiian',
|
||||||
|
'hin' => 'hindi',
|
||||||
|
'hrv' => 'croatian',
|
||||||
|
'hun' => 'hungarian',
|
||||||
|
'ind' => 'indonesian',
|
||||||
|
'isl' => 'icelandic',
|
||||||
|
'ita' => 'italian',
|
||||||
|
'kaz' => 'kazakh',
|
||||||
|
'kir' => 'kyrgyz',
|
||||||
|
'lat' => 'latin',
|
||||||
|
'lav' => 'latvian',
|
||||||
|
'lit' => 'lithuanian',
|
||||||
|
'mkd' => 'macedonian',
|
||||||
|
'mon' => 'mongolian',
|
||||||
|
'nep' => 'nepali',
|
||||||
|
'nld' => 'dutch',
|
||||||
|
'nor' => 'norwegian',
|
||||||
|
'pol' => 'polish',
|
||||||
|
'por' => 'portuguese',
|
||||||
|
'pus' => 'pashto',
|
||||||
|
'rom' => 'romanian',
|
||||||
|
'rus' => 'russian',
|
||||||
|
'slk' => 'slovak',
|
||||||
|
'slv' => 'slovene',
|
||||||
|
'som' => 'somali',
|
||||||
|
'spa' => 'spanish',
|
||||||
|
'sqi' => 'albanian',
|
||||||
|
'srp' => 'serbian',
|
||||||
|
'swa' => 'swahili',
|
||||||
|
'swe' => 'swedish',
|
||||||
|
'tgl' => 'tagalog',
|
||||||
|
'tur' => 'turkish',
|
||||||
|
'ukr' => 'ukrainian',
|
||||||
|
'urd' => 'urdu',
|
||||||
|
'uzb' => 'uzbek',
|
||||||
|
'vie' => 'vietnamese',
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the 2-letter ISO 639-1 code for the given language name.
|
||||||
|
*
|
||||||
|
* @param string $lang English language name like "swedish"
|
||||||
|
*
|
||||||
|
* @return string Two-letter language code (e.g. "sv") or NULL if not found
|
||||||
|
*/
|
||||||
|
public static function nameToCode2($lang)
|
||||||
|
{
|
||||||
|
$lang = strtolower($lang);
|
||||||
|
if (!isset(self::$nameToCode2[$lang])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return self::$nameToCode2[$lang];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the 3-letter ISO 639-2 code for the given language name.
|
||||||
|
*
|
||||||
|
* @param string $lang English language name like "swedish"
|
||||||
|
*
|
||||||
|
* @return string Three-letter language code (e.g. "swe") or NULL if not found
|
||||||
|
*/
|
||||||
|
public static function nameToCode3($lang)
|
||||||
|
{
|
||||||
|
$lang = strtolower($lang);
|
||||||
|
if (!isset(self::$nameToCode3[$lang])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return self::$nameToCode3[$lang];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the language name for the given 2-letter ISO 639-1 code.
|
||||||
|
*
|
||||||
|
* @param string $code Two-letter language code (e.g. "sv")
|
||||||
|
*
|
||||||
|
* @return string English language name like "swedish"
|
||||||
|
*/
|
||||||
|
public static function code2ToName($code)
|
||||||
|
{
|
||||||
|
$lang = strtolower($code);
|
||||||
|
if (!isset(self::$code2ToName[$code])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return self::$code2ToName[$code];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the language name for the given 3-letter ISO 639-2 code.
|
||||||
|
*
|
||||||
|
* @param string $code Three-letter language code (e.g. "swe")
|
||||||
|
*
|
||||||
|
* @return string English language name like "swedish"
|
||||||
|
*/
|
||||||
|
public static function code3ToName($code)
|
||||||
|
{
|
||||||
|
$lang = strtolower($code);
|
||||||
|
if (!isset(self::$code3ToName[$code])) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return self::$code3ToName[$code];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
349
library/langdet/Text/LanguageDetect/Parser.php
Normal file
349
library/langdet/Text/LanguageDetect/Parser.php
Normal file
|
|
@ -0,0 +1,349 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class represents a text sample to be parsed.
|
||||||
|
*
|
||||||
|
* @category Text
|
||||||
|
* @package Text_LanguageDetect
|
||||||
|
* @author Nicholas Pisarro
|
||||||
|
* @copyright 2006
|
||||||
|
* @license BSD
|
||||||
|
* @version CVS: $Id: Parser.php 322327 2012-01-15 17:55:59Z cweiske $
|
||||||
|
* @link http://pear.php.net/package/Text_LanguageDetect/
|
||||||
|
* @link http://langdetect.blogspot.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class represents a text sample to be parsed.
|
||||||
|
*
|
||||||
|
* This separates the analysis of a text sample from the primary LanguageDetect
|
||||||
|
* class. After a new profile has been built, the data can be retrieved using
|
||||||
|
* the accessor functions.
|
||||||
|
*
|
||||||
|
* This class is intended to be used by the Text_LanguageDetect class, not
|
||||||
|
* end-users.
|
||||||
|
*
|
||||||
|
* @category Text
|
||||||
|
* @package Text_LanguageDetect
|
||||||
|
* @author Nicholas Pisarro
|
||||||
|
* @copyright 2006
|
||||||
|
* @license BSD
|
||||||
|
* @version release: 0.3.0
|
||||||
|
*/
|
||||||
|
class Text_LanguageDetect_Parser extends Text_LanguageDetect
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* the piece of text being parsed
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
var $_string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* stores the trigram frequencies of the sample
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
var $_trigrams = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* stores the trigram ranks of the sample
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
var $_trigram_ranks = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* stores the unicode blocks of the sample
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var array
|
||||||
|
*/
|
||||||
|
var $_unicode_blocks = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the parser should compile the unicode ranges
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
var $_compile_unicode = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the parser should compile trigrams
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
var $_compile_trigram = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the trigram parser should pad the beginning of the string
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
var $_trigram_pad_start = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether the unicode parser should skip non-alphabetical ascii chars
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @var bool
|
||||||
|
*/
|
||||||
|
var $_unicode_skip_symbols = true;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor
|
||||||
|
*
|
||||||
|
* @access private
|
||||||
|
* @param string $string string to be parsed
|
||||||
|
*/
|
||||||
|
function Text_LanguageDetect_Parser($string) {
|
||||||
|
$this->_string = $string;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if a string is suitable for parsing
|
||||||
|
*
|
||||||
|
* @param string $str input string to test
|
||||||
|
* @return bool true if acceptable, false if not
|
||||||
|
*/
|
||||||
|
public static function validateString($str) {
|
||||||
|
if (!empty($str) && strlen($str) > 3 && preg_match('/\S/', $str)) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* turn on/off trigram counting
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @param bool $bool true for on, false for off
|
||||||
|
*/
|
||||||
|
function prepareTrigram($bool = true)
|
||||||
|
{
|
||||||
|
$this->_compile_trigram = $bool;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* turn on/off unicode block counting
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @param bool $bool true for on, false for off
|
||||||
|
*/
|
||||||
|
function prepareUnicode($bool = true)
|
||||||
|
{
|
||||||
|
$this->_compile_unicode = $bool;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* turn on/off padding the beginning of the sample string
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @param bool $bool true for on, false for off
|
||||||
|
*/
|
||||||
|
function setPadStart($bool = true)
|
||||||
|
{
|
||||||
|
$this->_trigram_pad_start = $bool;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Should the unicode block counter skip non-alphabetical ascii chars?
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @param bool $bool true for on, false for off
|
||||||
|
*/
|
||||||
|
function setUnicodeSkipSymbols($bool = true)
|
||||||
|
{
|
||||||
|
$this->_unicode_skip_symbols = $bool;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the trigram ranks for the text sample
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @return array trigram ranks in the text sample
|
||||||
|
*/
|
||||||
|
function &getTrigramRanks()
|
||||||
|
{
|
||||||
|
return $this->_trigram_ranks;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the trigram freqency table
|
||||||
|
*
|
||||||
|
* only used in testing to make sure the parser is working
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @return array trigram freqencies in the text sample
|
||||||
|
*/
|
||||||
|
function &getTrigramFreqs()
|
||||||
|
{
|
||||||
|
return $this->_trigram;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* returns the array of unicode blocks
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @return array unicode blocks in the text sample
|
||||||
|
*/
|
||||||
|
function &getUnicodeBlocks()
|
||||||
|
{
|
||||||
|
return $this->_unicode_blocks;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Executes the parsing operation
|
||||||
|
*
|
||||||
|
* Be sure to call the set*() functions to set options and the
|
||||||
|
* prepare*() functions first to tell it what kind of data to compute
|
||||||
|
*
|
||||||
|
* Afterwards the get*() functions can be used to access the compiled
|
||||||
|
* information.
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
*/
|
||||||
|
function analyze()
|
||||||
|
{
|
||||||
|
$len = strlen($this->_string);
|
||||||
|
$byte_counter = 0;
|
||||||
|
|
||||||
|
|
||||||
|
// unicode startup
|
||||||
|
if ($this->_compile_unicode) {
|
||||||
|
$blocks = $this->_read_unicode_block_db();
|
||||||
|
$block_count = count($blocks);
|
||||||
|
|
||||||
|
$skipped_count = 0;
|
||||||
|
$unicode_chars = array();
|
||||||
|
}
|
||||||
|
|
||||||
|
// trigram startup
|
||||||
|
if ($this->_compile_trigram) {
|
||||||
|
// initialize them as blank so the parser will skip the first two
|
||||||
|
// (since it skips trigrams with more than 2 contiguous spaces)
|
||||||
|
$a = ' ';
|
||||||
|
$b = ' ';
|
||||||
|
|
||||||
|
// kludge
|
||||||
|
// if it finds a valid trigram to start and the start pad option is
|
||||||
|
// off, then set a variable that will be used to reduce this
|
||||||
|
// trigram after parsing has finished
|
||||||
|
if (!$this->_trigram_pad_start) {
|
||||||
|
$a = $this->_next_char($this->_string, $byte_counter, true);
|
||||||
|
|
||||||
|
if ($a != ' ') {
|
||||||
|
$b = $this->_next_char($this->_string, $byte_counter, true);
|
||||||
|
$dropone = " $a$b";
|
||||||
|
}
|
||||||
|
|
||||||
|
$byte_counter = 0;
|
||||||
|
$a = ' ';
|
||||||
|
$b = ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
while ($byte_counter < $len) {
|
||||||
|
$char = $this->_next_char($this->_string, $byte_counter, true);
|
||||||
|
|
||||||
|
|
||||||
|
// language trigram detection
|
||||||
|
if ($this->_compile_trigram) {
|
||||||
|
if (!($b == ' ' && ($a == ' ' || $char == ' '))) {
|
||||||
|
if (!isset($this->_trigram[$a . $b . $char])) {
|
||||||
|
$this->_trigram[$a . $b . $char] = 1;
|
||||||
|
} else {
|
||||||
|
$this->_trigram[$a . $b . $char]++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$a = $b;
|
||||||
|
$b = $char;
|
||||||
|
}
|
||||||
|
|
||||||
|
// unicode block detection
|
||||||
|
if ($this->_compile_unicode) {
|
||||||
|
if ($this->_unicode_skip_symbols
|
||||||
|
&& strlen($char) == 1
|
||||||
|
&& ($char < 'A' || $char > 'z'
|
||||||
|
|| ($char > 'Z' && $char < 'a'))
|
||||||
|
&& $char != "'") { // does not skip the apostrophe
|
||||||
|
// since it's included in the language
|
||||||
|
// models
|
||||||
|
|
||||||
|
$skipped_count++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// build an array of all the characters
|
||||||
|
if (isset($unicode_chars[$char])) {
|
||||||
|
$unicode_chars[$char]++;
|
||||||
|
} else {
|
||||||
|
$unicode_chars[$char] = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// todo: add byte detection here
|
||||||
|
}
|
||||||
|
|
||||||
|
// unicode cleanup
|
||||||
|
if ($this->_compile_unicode) {
|
||||||
|
foreach ($unicode_chars as $utf8_char => $count) {
|
||||||
|
$search_result = $this->_unicode_block_name(
|
||||||
|
$this->_utf8char2unicode($utf8_char), $blocks, $block_count);
|
||||||
|
|
||||||
|
if ($search_result != -1) {
|
||||||
|
$block_name = $search_result[2];
|
||||||
|
} else {
|
||||||
|
$block_name = '[Malformatted]';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($this->_unicode_blocks[$block_name])) {
|
||||||
|
$this->_unicode_blocks[$block_name] += $count;
|
||||||
|
} else {
|
||||||
|
$this->_unicode_blocks[$block_name] = $count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// trigram cleanup
|
||||||
|
if ($this->_compile_trigram) {
|
||||||
|
// pad the end
|
||||||
|
if ($b != ' ') {
|
||||||
|
if (!isset($this->_trigram["$a$b "])) {
|
||||||
|
$this->_trigram["$a$b "] = 1;
|
||||||
|
} else {
|
||||||
|
$this->_trigram["$a$b "]++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// perl compatibility; Language::Guess does not pad the beginning
|
||||||
|
// kludge
|
||||||
|
if (isset($dropone)) {
|
||||||
|
if ($this->_trigram[$dropone] == 1) {
|
||||||
|
unset($this->_trigram[$dropone]);
|
||||||
|
} else {
|
||||||
|
$this->_trigram[$dropone]--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($this->_trigram)) {
|
||||||
|
$this->_trigram_ranks = $this->_arr_rank($this->_trigram);
|
||||||
|
} else {
|
||||||
|
$this->_trigram_ranks = array();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
|
||||||
|
|
||||||
|
?>
|
||||||
1
library/langdet/data/lang.dat
Normal file
1
library/langdet/data/lang.dat
Normal file
File diff suppressed because one or more lines are too long
1
library/langdet/data/unicode_blocks.dat
Normal file
1
library/langdet/data/unicode_blocks.dat
Normal file
File diff suppressed because one or more lines are too long
35
library/langdet/docs/example_clui.php
Normal file
35
library/langdet/docs/example_clui.php
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* example usage (CLI)
|
||||||
|
*
|
||||||
|
* @package Text_LanguageDetect
|
||||||
|
* @version CVS: $Id: example_clui.php 322305 2012-01-15 00:04:17Z clockwerx $
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once 'Text/LanguageDetect.php';
|
||||||
|
|
||||||
|
$l = new Text_LanguageDetect;
|
||||||
|
|
||||||
|
$stdin = fopen('php://stdin', 'r');
|
||||||
|
|
||||||
|
echo "Supported languages:\n";
|
||||||
|
$langs = $l->getLanguages();
|
||||||
|
sort($langs);
|
||||||
|
echo join(', ', $langs);
|
||||||
|
|
||||||
|
echo "\ntotal ", count($langs), "\n\n";
|
||||||
|
|
||||||
|
while ($line = fgets($stdin)) {
|
||||||
|
$result = $l->detect($line, 4);
|
||||||
|
print_r($result);
|
||||||
|
$blocks = $l->detectUnicodeBlocks($line, true);
|
||||||
|
print_r($blocks);
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose($stdin);
|
||||||
|
unset($l);
|
||||||
|
|
||||||
|
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
|
||||||
|
|
||||||
|
?>
|
||||||
72
library/langdet/docs/example_web.php
Normal file
72
library/langdet/docs/example_web.php
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/**
|
||||||
|
* example usage (web)
|
||||||
|
*
|
||||||
|
* @package Text_LanguageDetect
|
||||||
|
* @version CVS: $Id: example_web.php 205493 2006-01-18 00:26:57Z taak $
|
||||||
|
*/
|
||||||
|
|
||||||
|
// browsers will encode multi-byte characters wrong unless they think the page is utf8-encoded
|
||||||
|
header('Content-type: text/html; charset=utf-8', true);
|
||||||
|
|
||||||
|
require_once 'Text/LanguageDetect.php';
|
||||||
|
|
||||||
|
$l = new Text_LanguageDetect;
|
||||||
|
if (isset($_REQUEST['q'])) {
|
||||||
|
$q = stripslashes($_REQUEST['q']);
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Text_LanguageDetect demonstration</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<h2>Text_LanguageDetect</h2>
|
||||||
|
<?
|
||||||
|
echo "<small>Supported languages:\n";
|
||||||
|
$langs = $l->getLanguages();
|
||||||
|
sort($langs);
|
||||||
|
foreach ($langs as $lang) {
|
||||||
|
echo ucfirst($lang), ', ';
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "<br />total $i</small><br /><br />";
|
||||||
|
|
||||||
|
?>
|
||||||
|
<form method="post">
|
||||||
|
Enter text to identify language (at least a couple of sentences):<br />
|
||||||
|
<textarea name="q" wrap="virtual" cols="80" rows="8"><?= $q ?></textarea>
|
||||||
|
<br />
|
||||||
|
<input type="submit" value="Submit" />
|
||||||
|
</form>
|
||||||
|
<?
|
||||||
|
if (isset($q) && strlen($q)) {
|
||||||
|
$len = $l->utf8strlen($q);
|
||||||
|
if ($len < 20) { // this value picked somewhat arbitrarily
|
||||||
|
echo "Warning: string not very long ($len chars)<br />\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $l->detectConfidence($q);
|
||||||
|
|
||||||
|
if ($result == null) {
|
||||||
|
echo "Text_LanguageDetect cannot identify this piece of text. <br /><br />\n";
|
||||||
|
} else {
|
||||||
|
echo "Text_LanguageDetect thinks this text is written in <b>{$result['language']}</b> ({$result['similarity']}, {$result['confidence']})<br /><br />\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = $l->detectUnicodeBlocks($q, false);
|
||||||
|
if (!empty($result)) {
|
||||||
|
arsort($result);
|
||||||
|
echo "Unicode blocks present: ", join(', ', array_keys($result)), "\n<br /><br />";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
unset($l);
|
||||||
|
|
||||||
|
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
|
||||||
|
|
||||||
|
?>
|
||||||
|
</body></html>
|
||||||
21
library/langdet/docs/iso.php
Normal file
21
library/langdet/docs/iso.php
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Demonstrates how to use ISO language codes.
|
||||||
|
*
|
||||||
|
* The "name mode" changes the way languages are accepted and returned.
|
||||||
|
*/
|
||||||
|
require_once 'Text/LanguageDetect.php';
|
||||||
|
$l = new Text_LanguageDetect();
|
||||||
|
|
||||||
|
|
||||||
|
//will output the ISO 639-1 two-letter language code
|
||||||
|
// "de"
|
||||||
|
$l->setNameMode(2);
|
||||||
|
echo $l->detectSimple('Das ist ein kleiner Text') . "\n";
|
||||||
|
|
||||||
|
//will output the ISO 639-2 three-letter language code
|
||||||
|
// "deu"
|
||||||
|
$l->setNameMode(3);
|
||||||
|
echo $l->detectSimple('Das ist ein kleiner Text') . "\n";
|
||||||
|
|
||||||
|
?>
|
||||||
2056
library/langdet/tests/Text_LanguageDetectTest.php
Normal file
2056
library/langdet/tests/Text_LanguageDetectTest.php
Normal file
File diff suppressed because it is too large
Load diff
72
library/langdet/tests/Text_LanguageDetect_ISO639Test.php
Normal file
72
library/langdet/tests/Text_LanguageDetect_ISO639Test.php
Normal file
|
|
@ -0,0 +1,72 @@
|
||||||
|
<?php
|
||||||
|
set_include_path(
|
||||||
|
__DIR__ . '/../' . PATH_SEPARATOR . get_include_path()
|
||||||
|
);
|
||||||
|
|
||||||
|
require_once 'Text/LanguageDetect/ISO639.php';
|
||||||
|
|
||||||
|
class Text_LanguageDetect_ISO639Test extends PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
public function testNameToCode2()
|
||||||
|
{
|
||||||
|
$this->assertEquals(
|
||||||
|
'de',
|
||||||
|
Text_LanguageDetect_ISO639::nameToCode2('german')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testNameToCode2Fail()
|
||||||
|
{
|
||||||
|
$this->assertNull(
|
||||||
|
Text_LanguageDetect_ISO639::nameToCode2('doesnotexist')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testNameToCode3()
|
||||||
|
{
|
||||||
|
$this->assertEquals(
|
||||||
|
'fra',
|
||||||
|
Text_LanguageDetect_ISO639::nameToCode3('french')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testNameToCode3Fail()
|
||||||
|
{
|
||||||
|
$this->assertNull(
|
||||||
|
Text_LanguageDetect_ISO639::nameToCode3('doesnotexist')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCode2ToName()
|
||||||
|
{
|
||||||
|
$this->assertEquals(
|
||||||
|
'english',
|
||||||
|
Text_LanguageDetect_ISO639::code2ToName('en')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCode2ToNameFail()
|
||||||
|
{
|
||||||
|
$this->assertNull(
|
||||||
|
Text_LanguageDetect_ISO639::code2ToName('nx')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCode3ToName()
|
||||||
|
{
|
||||||
|
$this->assertEquals(
|
||||||
|
'romanian',
|
||||||
|
Text_LanguageDetect_ISO639::code3ToName('rom')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCode3ToNameFail()
|
||||||
|
{
|
||||||
|
$this->assertNull(
|
||||||
|
Text_LanguageDetect_ISO639::code3ToName('nxx')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1 +1 @@
|
||||||
(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
|
(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
|
||||||
|
|
@ -1,174 +1,180 @@
|
||||||
/**
|
/**
|
||||||
* editor_plugin_src.js
|
* editor_plugin_src.js
|
||||||
*
|
*
|
||||||
* Copyright 2011, Moxiecode Systems AB
|
* Copyright 2011, Moxiecode Systems AB
|
||||||
* Released under LGPL License.
|
* Released under LGPL License.
|
||||||
*
|
*
|
||||||
* License: http://tinymce.moxiecode.com/license
|
* License: http://tinymce.moxiecode.com/license
|
||||||
* Contributing: http://tinymce.moxiecode.com/contributing
|
* Contributing: http://tinymce.moxiecode.com/contributing
|
||||||
*/
|
*/
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
tinymce.create('tinymce.plugins.AutolinkPlugin', {
|
tinymce.create('tinymce.plugins.AutolinkPlugin', {
|
||||||
/**
|
/**
|
||||||
* Initializes the plugin, this will be executed after the plugin has been created.
|
* Initializes the plugin, this will be executed after the plugin has been created.
|
||||||
* This call is done before the editor instance has finished it's initialization so use the onInit event
|
* This call is done before the editor instance has finished it's initialization so use the onInit event
|
||||||
* of the editor instance to intercept that event.
|
* of the editor instance to intercept that event.
|
||||||
*
|
*
|
||||||
* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
|
* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
|
||||||
* @param {string} url Absolute URL to where the plugin is located.
|
* @param {string} url Absolute URL to where the plugin is located.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
init : function(ed, url) {
|
init : function(ed, url) {
|
||||||
var t = this;
|
var t = this;
|
||||||
|
|
||||||
// Internet Explorer has built-in automatic linking
|
// Add a key down handler
|
||||||
if (tinyMCE.isIE)
|
ed.onKeyDown.addToTop(function(ed, e) {
|
||||||
return;
|
if (e.keyCode == 13)
|
||||||
|
return t.handleEnter(ed);
|
||||||
// Add a key down handler
|
});
|
||||||
ed.onKeyDown.add(function(ed, e) {
|
|
||||||
if (e.keyCode == 13)
|
// Internet Explorer has built-in automatic linking for most cases
|
||||||
return t.handleEnter(ed);
|
if (tinyMCE.isIE)
|
||||||
});
|
return;
|
||||||
|
|
||||||
ed.onKeyPress.add(function(ed, e) {
|
ed.onKeyPress.add(function(ed, e) {
|
||||||
if (e.which == 41)
|
if (e.which == 41)
|
||||||
return t.handleEclipse(ed);
|
return t.handleEclipse(ed);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add a key up handler
|
// Add a key up handler
|
||||||
ed.onKeyUp.add(function(ed, e) {
|
ed.onKeyUp.add(function(ed, e) {
|
||||||
if (e.keyCode == 32)
|
if (e.keyCode == 32)
|
||||||
return t.handleSpacebar(ed);
|
return t.handleSpacebar(ed);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
handleEclipse : function(ed) {
|
handleEclipse : function(ed) {
|
||||||
this.parseCurrentLine(ed, -1, '(', true);
|
this.parseCurrentLine(ed, -1, '(', true);
|
||||||
},
|
},
|
||||||
|
|
||||||
handleSpacebar : function(ed) {
|
handleSpacebar : function(ed) {
|
||||||
this.parseCurrentLine(ed, 0, '', true);
|
this.parseCurrentLine(ed, 0, '', true);
|
||||||
},
|
},
|
||||||
|
|
||||||
handleEnter : function(ed) {
|
handleEnter : function(ed) {
|
||||||
this.parseCurrentLine(ed, -1, '', false);
|
this.parseCurrentLine(ed, -1, '', false);
|
||||||
},
|
},
|
||||||
|
|
||||||
parseCurrentLine : function(ed, end_offset, delimiter, goback) {
|
parseCurrentLine : function(ed, end_offset, delimiter, goback) {
|
||||||
var r, end, start, endContainer, bookmark, text, matches, prev, len;
|
var r, end, start, endContainer, bookmark, text, matches, prev, len;
|
||||||
|
|
||||||
// We need at least five characters to form a URL,
|
// We need at least five characters to form a URL,
|
||||||
// hence, at minimum, five characters from the beginning of the line.
|
// hence, at minimum, five characters from the beginning of the line.
|
||||||
r = ed.selection.getRng().cloneRange();
|
r = ed.selection.getRng(true).cloneRange();
|
||||||
if (r.startOffset < 5) {
|
if (r.startOffset < 5) {
|
||||||
// During testing, the caret is placed inbetween two text nodes.
|
// During testing, the caret is placed inbetween two text nodes.
|
||||||
// The previous text node contains the URL.
|
// The previous text node contains the URL.
|
||||||
prev = r.endContainer.previousSibling;
|
prev = r.endContainer.previousSibling;
|
||||||
if (prev == null) {
|
if (prev == null) {
|
||||||
if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
|
if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
prev = r.endContainer.firstChild.nextSibling;
|
prev = r.endContainer.firstChild.nextSibling;
|
||||||
}
|
}
|
||||||
len = prev.length;
|
len = prev.length;
|
||||||
r.setStart(prev, len);
|
r.setStart(prev, len);
|
||||||
r.setEnd(prev, len);
|
r.setEnd(prev, len);
|
||||||
|
|
||||||
if (r.endOffset < 5)
|
if (r.endOffset < 5)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
end = r.endOffset;
|
end = r.endOffset;
|
||||||
endContainer = prev;
|
endContainer = prev;
|
||||||
} else {
|
} else {
|
||||||
endContainer = r.endContainer;
|
endContainer = r.endContainer;
|
||||||
|
|
||||||
// Get a text node
|
// Get a text node
|
||||||
if (endContainer.nodeType != 3 && endContainer.firstChild) {
|
if (endContainer.nodeType != 3 && endContainer.firstChild) {
|
||||||
while (endContainer.nodeType != 3 && endContainer.firstChild)
|
while (endContainer.nodeType != 3 && endContainer.firstChild)
|
||||||
endContainer = endContainer.firstChild;
|
endContainer = endContainer.firstChild;
|
||||||
|
|
||||||
r.setStart(endContainer, 0);
|
r.setStart(endContainer, 0);
|
||||||
r.setEnd(endContainer, endContainer.nodeValue.length);
|
r.setEnd(endContainer, endContainer.nodeValue.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (r.endOffset == 1)
|
if (r.endOffset == 1)
|
||||||
end = 2;
|
end = 2;
|
||||||
else
|
else
|
||||||
end = r.endOffset - 1 - end_offset;
|
end = r.endOffset - 1 - end_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
start = end;
|
start = end;
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
// Move the selection one character backwards.
|
// Move the selection one character backwards.
|
||||||
r.setStart(endContainer, end - 2);
|
r.setStart(endContainer, end - 2);
|
||||||
r.setEnd(endContainer, end - 1);
|
r.setEnd(endContainer, end - 1);
|
||||||
end -= 1;
|
end -= 1;
|
||||||
|
|
||||||
// Loop until one of the following is found: a blank space, , delimeter, (end-2) >= 0
|
// Loop until one of the following is found: a blank space, , delimeter, (end-2) >= 0
|
||||||
} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
|
} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
|
||||||
|
|
||||||
if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
|
if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
|
||||||
r.setStart(endContainer, end);
|
r.setStart(endContainer, end);
|
||||||
r.setEnd(endContainer, start);
|
r.setEnd(endContainer, start);
|
||||||
end += 1;
|
end += 1;
|
||||||
} else if (r.startOffset == 0) {
|
} else if (r.startOffset == 0) {
|
||||||
r.setStart(endContainer, 0);
|
r.setStart(endContainer, 0);
|
||||||
r.setEnd(endContainer, start);
|
r.setEnd(endContainer, start);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
r.setStart(endContainer, end);
|
r.setStart(endContainer, end);
|
||||||
r.setEnd(endContainer, start);
|
r.setEnd(endContainer, start);
|
||||||
}
|
}
|
||||||
|
|
||||||
text = r.toString();
|
// Exclude last . from word like "www.site.com."
|
||||||
matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);
|
var text = r.toString();
|
||||||
|
if (text.charAt(text.length - 1) == '.') {
|
||||||
if (matches) {
|
r.setEnd(endContainer, start - 1);
|
||||||
if (matches[1] == 'www.') {
|
}
|
||||||
matches[1] = 'http://www.';
|
|
||||||
} else if (/@$/.test(matches[1])) {
|
text = r.toString();
|
||||||
matches[1] = 'mailto:' + matches[1];
|
matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);
|
||||||
}
|
|
||||||
|
if (matches) {
|
||||||
bookmark = ed.selection.getBookmark();
|
if (matches[1] == 'www.') {
|
||||||
|
matches[1] = 'http://www.';
|
||||||
ed.selection.setRng(r);
|
} else if (/@$/.test(matches[1])) {
|
||||||
tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);
|
matches[1] = 'mailto:' + matches[1];
|
||||||
ed.selection.moveToBookmark(bookmark);
|
}
|
||||||
|
|
||||||
// TODO: Determine if this is still needed.
|
bookmark = ed.selection.getBookmark();
|
||||||
if (tinyMCE.isWebKit) {
|
|
||||||
// move the caret to its original position
|
ed.selection.setRng(r);
|
||||||
ed.selection.collapse(false);
|
tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);
|
||||||
var max = Math.min(endContainer.length, start + 1);
|
ed.selection.moveToBookmark(bookmark);
|
||||||
r.setStart(endContainer, max);
|
|
||||||
r.setEnd(endContainer, max);
|
// TODO: Determine if this is still needed.
|
||||||
ed.selection.setRng(r);
|
if (tinyMCE.isWebKit) {
|
||||||
}
|
// move the caret to its original position
|
||||||
}
|
ed.selection.collapse(false);
|
||||||
},
|
var max = Math.min(endContainer.length, start + 1);
|
||||||
|
r.setStart(endContainer, max);
|
||||||
/**
|
r.setEnd(endContainer, max);
|
||||||
* Returns information about the plugin as a name/value array.
|
ed.selection.setRng(r);
|
||||||
* The current keys are longname, author, authorurl, infourl and version.
|
}
|
||||||
*
|
}
|
||||||
* @return {Object} Name/value array containing information about the plugin.
|
},
|
||||||
*/
|
|
||||||
getInfo : function() {
|
/**
|
||||||
return {
|
* Returns information about the plugin as a name/value array.
|
||||||
longname : 'Autolink',
|
* The current keys are longname, author, authorurl, infourl and version.
|
||||||
author : 'Moxiecode Systems AB',
|
*
|
||||||
authorurl : 'http://tinymce.moxiecode.com',
|
* @return {Object} Name/value array containing information about the plugin.
|
||||||
infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
|
*/
|
||||||
version : tinymce.majorVersion + "." + tinymce.minorVersion
|
getInfo : function() {
|
||||||
};
|
return {
|
||||||
}
|
longname : 'Autolink',
|
||||||
});
|
author : 'Moxiecode Systems AB',
|
||||||
|
authorurl : 'http://tinymce.moxiecode.com',
|
||||||
// Register plugin
|
infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
|
||||||
tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
|
version : tinymce.majorVersion + "." + tinymce.minorVersion
|
||||||
})();
|
};
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Register plugin
|
||||||
|
tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
|
||||||
|
})();
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
|
(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
|
||||||
|
|
@ -79,7 +79,7 @@
|
||||||
vp.h -= 1;
|
vp.h -= 1;
|
||||||
|
|
||||||
// Use fixed position if it exists
|
// Use fixed position if it exists
|
||||||
if (tinymce.isIE6)
|
if (tinymce.isIE6 || document.compatMode == 'BackCompat')
|
||||||
posCss = 'absolute;top:' + vp.y;
|
posCss = 'absolute;top:' + vp.y;
|
||||||
else
|
else
|
||||||
posCss = 'fixed;top:0';
|
posCss = 'fixed;top:0';
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because one or more lines are too long
|
|
@ -261,12 +261,96 @@
|
||||||
selection.collapse(start);
|
selection.collapse(start);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function canDelete(backspace) {
|
||||||
|
var rng, container, offset, nonEditableParent;
|
||||||
|
|
||||||
|
function removeNodeIfNotParent(node) {
|
||||||
|
var parent = container;
|
||||||
|
|
||||||
|
while (parent) {
|
||||||
|
if (parent === node) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
parent = parent.parentNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
dom.remove(node);
|
||||||
|
moveSelection();
|
||||||
|
}
|
||||||
|
|
||||||
|
function isNextPrevTreeNodeNonEditable() {
|
||||||
|
var node, walker, nonEmptyElements = ed.schema.getNonEmptyElements();
|
||||||
|
|
||||||
|
walker = new tinymce.dom.TreeWalker(container, ed.getBody());
|
||||||
|
while (node = (backspace ? walker.prev() : walker.next())) {
|
||||||
|
// Found IMG/INPUT etc
|
||||||
|
if (nonEmptyElements[node.nodeName.toLowerCase()]) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Found text node with contents
|
||||||
|
if (node.nodeType === 3 && tinymce.trim(node.nodeValue).length > 0) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Found non editable node
|
||||||
|
if (getContentEditable(node) === "false") {
|
||||||
|
removeNodeIfNotParent(node);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the content node is within a non editable parent
|
||||||
|
if (getNonEditableParent(node)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selection.isCollapsed()) {
|
||||||
|
rng = selection.getRng(true);
|
||||||
|
container = rng.startContainer;
|
||||||
|
offset = rng.startOffset;
|
||||||
|
container = getParentCaretContainer(container) || container;
|
||||||
|
|
||||||
|
// Is in noneditable parent
|
||||||
|
if (nonEditableParent = getNonEditableParent(container)) {
|
||||||
|
removeNodeIfNotParent(nonEditableParent);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the caret is in the middle of a text node
|
||||||
|
if (container.nodeType == 3 && (backspace ? offset > 0 : offset < container.nodeValue.length)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolve container index
|
||||||
|
if (container.nodeType == 1) {
|
||||||
|
container = container.childNodes[offset] || container;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if previous or next tree node is non editable then block the event
|
||||||
|
if (isNextPrevTreeNodeNonEditable()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
startElement = selection.getStart()
|
startElement = selection.getStart()
|
||||||
endElement = selection.getEnd();
|
endElement = selection.getEnd();
|
||||||
|
|
||||||
// Disable all key presses in contentEditable=false except delete or backspace
|
// Disable all key presses in contentEditable=false except delete or backspace
|
||||||
nonEditableParent = getNonEditableParent(startElement) || getNonEditableParent(endElement);
|
nonEditableParent = getNonEditableParent(startElement) || getNonEditableParent(endElement);
|
||||||
if (nonEditableParent && (keyCode < 112 || keyCode > 124) && keyCode != VK.DELETE && keyCode != VK.BACKSPACE) {
|
if (nonEditableParent && (keyCode < 112 || keyCode > 124) && keyCode != VK.DELETE && keyCode != VK.BACKSPACE) {
|
||||||
|
// Is Ctrl+c, Ctrl+v or Ctrl+x then use default browser behavior
|
||||||
|
if ((tinymce.isMac ? e.metaKey : e.ctrlKey) && (keyCode == 67 || keyCode == 88 || keyCode == 86)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
||||||
// Arrow left/right select the element and collapse left/right
|
// Arrow left/right select the element and collapse left/right
|
||||||
|
|
@ -298,6 +382,7 @@
|
||||||
positionCaretOnElement(nonEditableParent, true);
|
positionCaretOnElement(nonEditableParent, true);
|
||||||
} else {
|
} else {
|
||||||
dom.remove(nonEditableParent);
|
dom.remove(nonEditableParent);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
removeCaretContainer(caretContainer);
|
removeCaretContainer(caretContainer);
|
||||||
|
|
@ -315,23 +400,31 @@
|
||||||
positionCaretOnElement(nonEditableParent, false);
|
positionCaretOnElement(nonEditableParent, false);
|
||||||
} else {
|
} else {
|
||||||
dom.remove(nonEditableParent);
|
dom.remove(nonEditableParent);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
removeCaretContainer(caretContainer);
|
removeCaretContainer(caretContainer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((keyCode == VK.BACKSPACE || keyCode == VK.DELETE) && !canDelete(keyCode == VK.BACKSPACE)) {
|
||||||
|
e.preventDefault();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
ed.onMouseDown.addToTop(function(ed, e){
|
ed.onMouseDown.addToTop(function(ed, e) {
|
||||||
// prevent collapsing selection to caret when clicking in a non-editable section
|
|
||||||
var node = ed.selection.getNode();
|
var node = ed.selection.getNode();
|
||||||
|
|
||||||
if (getContentEditable(node) === "false" && node == e.target) {
|
if (getContentEditable(node) === "false" && node == e.target) {
|
||||||
e.preventDefault();
|
// Expand selection on mouse down we can't block the default event since it's used for drag/drop
|
||||||
|
moveSelection();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ed.onMouseUp.addToTop(moveSelection);
|
ed.onMouseUp.addToTop(moveSelection);
|
||||||
ed.onKeyDown.addToTop(handleKey);
|
ed.onKeyDown.addToTop(handleKey);
|
||||||
ed.onKeyUp.addToTop(moveSelection);
|
ed.onKeyUp.addToTop(moveSelection);
|
||||||
|
|
@ -341,6 +434,31 @@
|
||||||
init : function(ed, url) {
|
init : function(ed, url) {
|
||||||
var editClass, nonEditClass, nonEditableRegExps;
|
var editClass, nonEditClass, nonEditableRegExps;
|
||||||
|
|
||||||
|
// Converts configured regexps to noneditable span items
|
||||||
|
function convertRegExpsToNonEditable(ed, args) {
|
||||||
|
var i = nonEditableRegExps.length, content = args.content, cls = tinymce.trim(nonEditClass);
|
||||||
|
|
||||||
|
// Don't replace the variables when raw is used for example on undo/redo
|
||||||
|
if (args.format == "raw") {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (i--) {
|
||||||
|
content = content.replace(nonEditableRegExps[i], function(match) {
|
||||||
|
var args = arguments, index = args[args.length - 2];
|
||||||
|
|
||||||
|
// Is value inside an attribute then don't replace
|
||||||
|
if (index > 0 && content.charAt(index - 1) == '"') {
|
||||||
|
return match;
|
||||||
|
}
|
||||||
|
|
||||||
|
return '<span class="' + cls + '" data-mce-content="' + ed.dom.encode(args[0]) + '">' + ed.dom.encode(typeof(args[1]) === "string" ? args[1] : args[0]) + '</span>';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
args.content = content;
|
||||||
|
};
|
||||||
|
|
||||||
editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
|
editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
|
||||||
nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
|
nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
|
||||||
|
|
||||||
|
|
@ -354,26 +472,10 @@
|
||||||
handleContentEditableSelection(ed);
|
handleContentEditableSelection(ed);
|
||||||
|
|
||||||
if (nonEditableRegExps) {
|
if (nonEditableRegExps) {
|
||||||
ed.onBeforeSetContent.add(function(ed, args) {
|
ed.selection.onBeforeSetContent.add(convertRegExpsToNonEditable);
|
||||||
var i = nonEditableRegExps.length, content = args.content, cls = tinymce.trim(nonEditClass);
|
ed.onBeforeSetContent.add(convertRegExpsToNonEditable);
|
||||||
|
|
||||||
// Don't replace the variables when raw is used for example on undo/redo
|
|
||||||
if (args.format == "raw") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
while (i--) {
|
|
||||||
content = content.replace(nonEditableRegExps[i], function() {
|
|
||||||
var args = arguments;
|
|
||||||
|
|
||||||
return '<span class="' + cls + '" data-mce-content="' + ed.dom.encode(args[0]) + '">' + ed.dom.encode(typeof(args[1]) === "string" ? args[1] : args[0]) + '</span>';
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
args.content = content;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply contentEditable true/false on elements with the noneditable/editable classes
|
// Apply contentEditable true/false on elements with the noneditable/editable classes
|
||||||
ed.parser.addAttributeFilter('class', function(nodes) {
|
ed.parser.addAttributeFilter('class', function(nodes) {
|
||||||
var i = nodes.length, className, node;
|
var i = nodes.length, className, node;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -359,7 +359,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
|
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
|
||||||
if (tinymce.isIE && document.documentMode >= 9) {
|
if (tinymce.isIE && document.documentMode >= 9 && /<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(o.content)) {
|
||||||
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
|
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
|
||||||
process([[/(?:<br> [\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br> [\s\r\n]+|<br>)*/g, '$1']]);
|
process([[/(?:<br> [\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br> [\s\r\n]+|<br>)*/g, '$1']]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
|
(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]:not(iframe)");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
|
||||||
|
|
@ -22,7 +22,7 @@
|
||||||
var x, i, f, el, v;
|
var x, i, f, el, v;
|
||||||
|
|
||||||
function find(d) {
|
function find(d) {
|
||||||
el = DOM.select(':input:enabled,*[tabindex]');
|
el = DOM.select(':input:enabled,*[tabindex]:not(iframe)');
|
||||||
|
|
||||||
function canSelectRecursive(e) {
|
function canSelectRecursive(e) {
|
||||||
return e.nodeName==="BODY" || (e.type != 'hidden' &&
|
return e.nodeName==="BODY" || (e.type != 'hidden' &&
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ function updateAction() {
|
||||||
do {
|
do {
|
||||||
if (cell == tdElm)
|
if (cell == tdElm)
|
||||||
break;
|
break;
|
||||||
col += cell.getAttribute("colspan");
|
col += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
|
||||||
} while ((cell = nextCell(cell)) != null);
|
} while ((cell = nextCell(cell)) != null);
|
||||||
|
|
||||||
for (var i=0; i<rows.length; i++) {
|
for (var i=0; i<rows.length; i++) {
|
||||||
|
|
@ -152,7 +152,7 @@ function updateAction() {
|
||||||
cell = updateCell(cell, true);
|
cell = updateCell(cell, true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
curr += cell.getAttribute("colspan");
|
curr += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
|
||||||
} while ((cell = nextCell(cell)) != null);
|
} while ((cell = nextCell(cell)) != null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, blockquote, address, pre {display: block; padding-top: 10px; border: 1px dashed #BBB; background: transparent no-repeat}
|
p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, blockquote, address, pre, figure {display: block; padding-top: 10px; border: 1px dashed #BBB; background: transparent no-repeat}
|
||||||
p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, address, pre {margin-left: 3px}
|
p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, address, pre, figure {margin-left: 3px}
|
||||||
section, article, address, hgroup, aside {margin: 1em 0 0 3px}
|
section, article, address, hgroup, aside, figure {margin: 0 0 1em 3px}
|
||||||
|
|
||||||
p {background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}
|
p {background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}
|
||||||
h1 {background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}
|
h1 {background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}
|
||||||
|
|
@ -17,3 +17,5 @@ address {background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH
|
||||||
pre {background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}
|
pre {background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}
|
||||||
hgroup {background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}
|
hgroup {background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}
|
||||||
aside {background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}
|
aside {background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}
|
||||||
|
figure {background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}
|
||||||
|
figcaption {border: 1px dashed #BBB}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks")}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();
|
(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks",false,null,{skip_focus:true})}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
ed.onInit.add(function() {
|
ed.onInit.add(function() {
|
||||||
if (ed.settings.visualblocks_default_state) {
|
if (ed.settings.visualblocks_default_state) {
|
||||||
ed.execCommand('mceVisualBlocks');
|
ed.execCommand('mceVisualBlocks', false, null, {skip_focus : true});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -62,12 +62,8 @@
|
||||||
|
|
||||||
<div class="mceActionPanel">
|
<div class="mceActionPanel">
|
||||||
<input type="submit" id="insert" name="insert" value="{#apply}" />
|
<input type="submit" id="insert" name="insert" value="{#apply}" />
|
||||||
|
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
|
||||||
<div id="preview"></div>
|
<div id="preview_wrapper"><div id="previewblock"><label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" /></div><span id="preview"></span></div>
|
||||||
|
|
||||||
<div id="previewblock">
|
|
||||||
<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -69,6 +69,16 @@
|
||||||
each(previewStyles.split(' '), function(name) {
|
each(previewStyles.split(' '), function(name) {
|
||||||
var value = dom.getStyle(previewElm, name, true);
|
var value = dom.getStyle(previewElm, name, true);
|
||||||
|
|
||||||
|
// If background is transparent then check if the body has a background color we can use
|
||||||
|
if (name == 'background-color' && /transparent|rgba\s*\([^)]+,\s*0\)/.test(value)) {
|
||||||
|
value = dom.getStyle(ed.getBody(), name, true);
|
||||||
|
|
||||||
|
// Ignore white since it's the default color, not the nicest fix
|
||||||
|
if (dom.toHex(value).toLowerCase() == '#ffffff') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Old IE won't calculate the font size so we need to do that manually
|
// Old IE won't calculate the font size so we need to do that manually
|
||||||
if (name == 'font-size') {
|
if (name == 'font-size') {
|
||||||
if (/em|%$/.test(value)) {
|
if (/em|%$/.test(value)) {
|
||||||
|
|
@ -608,7 +618,7 @@
|
||||||
|
|
||||||
// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.
|
// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.
|
||||||
// Maybe actually inherit it from the original textara?
|
// Maybe actually inherit it from the original textara?
|
||||||
n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
|
n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '') + (ed.settings.directionality == "rtl" ? ' mceRtl' : '')});
|
||||||
DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);
|
DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);
|
||||||
|
|
||||||
if (!DOM.boxModel)
|
if (!DOM.boxModel)
|
||||||
|
|
@ -925,7 +935,7 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
_addToolbars : function(c, o) {
|
_addToolbars : function(c, o) {
|
||||||
var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup;
|
var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup, toolbarsExist = false;
|
||||||
|
|
||||||
toolbarGroup = cf.createToolbarGroup('toolbargroup', {
|
toolbarGroup = cf.createToolbarGroup('toolbargroup', {
|
||||||
'name': ed.getLang('advanced.toolbar'),
|
'name': ed.getLang('advanced.toolbar'),
|
||||||
|
|
@ -941,6 +951,7 @@
|
||||||
|
|
||||||
// Create toolbar and add the controls
|
// Create toolbar and add the controls
|
||||||
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
|
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
|
||||||
|
toolbarsExist = true;
|
||||||
tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
|
tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
|
||||||
|
|
||||||
if (s['theme_advanced_buttons' + i + '_add'])
|
if (s['theme_advanced_buttons' + i + '_add'])
|
||||||
|
|
@ -954,6 +965,9 @@
|
||||||
|
|
||||||
o.deltaHeight -= s.theme_advanced_row_height;
|
o.deltaHeight -= s.theme_advanced_row_height;
|
||||||
}
|
}
|
||||||
|
// Handle case when there are no toolbar buttons and ensure editor height is adjusted accordingly
|
||||||
|
if (!toolbarsExist)
|
||||||
|
o.deltaHeight -= s.theme_advanced_row_height;
|
||||||
h.push(toolbarGroup.renderHTML());
|
h.push(toolbarGroup.renderHTML());
|
||||||
h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
|
h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
|
||||||
DOM.setHTML(n, h.join(''));
|
DOM.setHTML(n, h.join(''));
|
||||||
|
|
@ -1112,7 +1126,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (c = cm.get('formatselect')) {
|
if (c = cm.get('formatselect')) {
|
||||||
p = getParent(DOM.isBlock);
|
p = getParent(ed.dom.isBlock);
|
||||||
|
|
||||||
if (p)
|
if (p)
|
||||||
c.select(p.nodeName.toLowerCase());
|
c.select(p.nodeName.toLowerCase());
|
||||||
|
|
@ -1210,7 +1224,7 @@
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Handle prefix
|
// Handle prefix
|
||||||
if (tinymce.isIE && n.scopeName !== 'HTML')
|
if (tinymce.isIE && n.scopeName !== 'HTML' && n.scopeName)
|
||||||
na = n.scopeName + ':' + na;
|
na = n.scopeName + ':' + na;
|
||||||
|
|
||||||
// Remove internal prefix
|
// Remove internal prefix
|
||||||
|
|
@ -1271,7 +1285,7 @@
|
||||||
if (v) {
|
if (v) {
|
||||||
ti += 'class: ' + v + ' ';
|
ti += 'class: ' + v + ' ';
|
||||||
|
|
||||||
if (DOM.isBlock(n) || na == 'img' || na == 'span')
|
if (ed.dom.isBlock(n) || na == 'img' || na == 'span')
|
||||||
na += '.' + v;
|
na += '.' + v;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -104,10 +104,12 @@ var ImageDialog = {
|
||||||
},
|
},
|
||||||
|
|
||||||
updateStyle : function() {
|
updateStyle : function() {
|
||||||
var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
|
var dom = tinyMCEPopup.dom, st = {}, v, f = document.forms[0];
|
||||||
|
|
||||||
if (tinyMCEPopup.editor.settings.inline_styles) {
|
if (tinyMCEPopup.editor.settings.inline_styles) {
|
||||||
st = tinyMCEPopup.dom.parseStyle(this.styleVal);
|
tinymce.each(tinyMCEPopup.dom.parseStyle(this.styleVal), function(value, key) {
|
||||||
|
st[key] = value;
|
||||||
|
});
|
||||||
|
|
||||||
// Handle align
|
// Handle align
|
||||||
v = getSelectValue(f, 'align');
|
v = getSelectValue(f, 'align');
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
/* Generic */
|
/* Generic */
|
||||||
body {
|
body {
|
||||||
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
|
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
|
||||||
background:#F0F0EE;
|
background:#F0F0EE;
|
||||||
color: black;
|
color: black;
|
||||||
padding:0;
|
padding:0;
|
||||||
margin:8px 8px 0 8px;
|
margin:8px 8px 0 8px;
|
||||||
|
|
@ -94,11 +94,12 @@ h3 {font-size:14px;}
|
||||||
#plugintable, #about #plugintable td {border:1px solid #919B9C;}
|
#plugintable, #about #plugintable td {border:1px solid #919B9C;}
|
||||||
#plugintable {width:96%; margin-top:10px;}
|
#plugintable {width:96%; margin-top:10px;}
|
||||||
#pluginscontainer {height:290px; overflow:auto;}
|
#pluginscontainer {height:290px; overflow:auto;}
|
||||||
#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
|
#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
|
||||||
|
#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
|
||||||
|
#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap}
|
||||||
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
|
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
|
||||||
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
|
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
|
||||||
#colorpicker #light div {overflow:hidden;}
|
#colorpicker #light div {overflow:hidden;}
|
||||||
#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
|
|
||||||
#colorpicker .panel_wrapper div.current {height:175px;}
|
#colorpicker .panel_wrapper div.current {height:175px;}
|
||||||
#colorpicker #namedcolors {width:150px;}
|
#colorpicker #namedcolors {width:150px;}
|
||||||
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
|
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@
|
||||||
|
|
||||||
/* Menu */
|
/* Menu */
|
||||||
.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}
|
.highcontrastSkin .mceNoIcons span.mceIcon {width:0;}
|
||||||
.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }
|
.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; direction:ltr}
|
||||||
.highcontrastSkin .mceMenu table {background:white; color: black}
|
.highcontrastSkin .mceMenu table {background:white; color: black}
|
||||||
.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}
|
.highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}
|
||||||
.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}
|
.highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}
|
||||||
|
|
@ -90,6 +90,10 @@
|
||||||
.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
|
.highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
|
||||||
.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
|
.highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
|
||||||
|
|
||||||
|
/* Rtl */
|
||||||
|
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
|
||||||
|
.mceRtl .mceMenuItem .mceText {text-align: right}
|
||||||
|
|
||||||
/* Formats */
|
/* Formats */
|
||||||
.highcontrastSkin .mce_p span.mceText {}
|
.highcontrastSkin .mce_p span.mceText {}
|
||||||
.highcontrastSkin .mce_address span.mceText {font-style:italic}
|
.highcontrastSkin .mce_address span.mceText {font-style:italic}
|
||||||
|
|
|
||||||
|
|
@ -105,11 +105,12 @@ h3 {font-size:14px;}
|
||||||
#plugintable, #about #plugintable td {border:1px solid #919B9C;}
|
#plugintable, #about #plugintable td {border:1px solid #919B9C;}
|
||||||
#plugintable {width:96%; margin-top:10px;}
|
#plugintable {width:96%; margin-top:10px;}
|
||||||
#pluginscontainer {height:290px; overflow:auto;}
|
#pluginscontainer {height:290px; overflow:auto;}
|
||||||
#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
|
#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
|
||||||
|
#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
|
||||||
|
#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap}
|
||||||
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
|
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
|
||||||
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
|
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
|
||||||
#colorpicker #light div {overflow:hidden;}
|
#colorpicker #light div {overflow:hidden;}
|
||||||
#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
|
|
||||||
#colorpicker .panel_wrapper div.current {height:175px;}
|
#colorpicker .panel_wrapper div.current {height:175px;}
|
||||||
#colorpicker #namedcolors {width:150px;}
|
#colorpicker #namedcolors {width:150px;}
|
||||||
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
|
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@
|
||||||
.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
|
.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
|
||||||
|
|
||||||
/* Menu */
|
/* Menu */
|
||||||
.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD}
|
.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD; direction:ltr}
|
||||||
.o2k7Skin .mceNoIcons span.mceIcon {width:0;}
|
.o2k7Skin .mceNoIcons span.mceIcon {width:0;}
|
||||||
.o2k7Skin .mceNoIcons a .mceText {padding-left:10px}
|
.o2k7Skin .mceNoIcons a .mceText {padding-left:10px}
|
||||||
.o2k7Skin .mceMenu table {background:#FFF}
|
.o2k7Skin .mceMenu table {background:#FFF}
|
||||||
|
|
@ -112,6 +112,10 @@
|
||||||
.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
|
.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
|
||||||
.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
|
.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
|
||||||
|
|
||||||
|
/* Rtl */
|
||||||
|
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
|
||||||
|
.mceRtl .mceMenuItem .mceText {text-align: right}
|
||||||
|
|
||||||
/* Formats */
|
/* Formats */
|
||||||
.o2k7Skin .mce_formatPreview a {font-size:10px}
|
.o2k7Skin .mce_formatPreview a {font-size:10px}
|
||||||
.o2k7Skin .mce_p span.mceText {}
|
.o2k7Skin .mce_p span.mceText {}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
5107
library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
vendored
5107
library/tinymce/jscripts/tiny_mce/tiny_mce_src.js
vendored
File diff suppressed because it is too large
Load diff
16
mod/acctlink.php
Normal file
16
mod/acctlink.php
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once('include/Scrape.php');
|
||||||
|
|
||||||
|
function acctlink_init(&$a) {
|
||||||
|
|
||||||
|
if(x($_GET,'addr')) {
|
||||||
|
$addr = trim($_GET['addr']);
|
||||||
|
$res = probe_url($addr);
|
||||||
|
//logger('acctlink: ' . print_r($res,true));
|
||||||
|
if($res['url']) {
|
||||||
|
goaway($res['url']);
|
||||||
|
killme();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -135,7 +135,7 @@ function acl_init(&$a){
|
||||||
foreach($r as $g) {
|
foreach($r as $g) {
|
||||||
$x['photos'][] = $g['micro'];
|
$x['photos'][] = $g['micro'];
|
||||||
$x['links'][] = $g['url'];
|
$x['links'][] = $g['url'];
|
||||||
$x['suggestions'][] = $g['name']; // sprintf( t('%s [%s]'),$g['name'],$g['url']);
|
$x['suggestions'][] = $g['name'];
|
||||||
$x['data'][] = intval($g['id']);
|
$x['data'][] = intval($g['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ function admin_content(&$a) {
|
||||||
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
|
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
|
||||||
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
|
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
|
||||||
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
|
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
|
||||||
'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
|
//'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
|
||||||
);
|
);
|
||||||
|
|
||||||
/* get plugins admin page */
|
/* get plugins admin page */
|
||||||
|
|
@ -115,7 +115,7 @@ function admin_content(&$a) {
|
||||||
$aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
|
$aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
|
||||||
|
|
||||||
$t = get_markup_template("admin_aside.tpl");
|
$t = get_markup_template("admin_aside.tpl");
|
||||||
$a->page['aside'] = replace_macros( $t, array(
|
$a->page['aside'] .= replace_macros( $t, array(
|
||||||
'$admin' => $aside,
|
'$admin' => $aside,
|
||||||
'$h_pending' => t('User registrations waiting for confirmation'),
|
'$h_pending' => t('User registrations waiting for confirmation'),
|
||||||
'$admurl'=> $a->get_baseurl(true)."/admin/"
|
'$admurl'=> $a->get_baseurl(true)."/admin/"
|
||||||
|
|
@ -182,6 +182,7 @@ function admin_page_summary(&$a) {
|
||||||
Array( t('Community/Celebrity Account'), 0),
|
Array( t('Community/Celebrity Account'), 0),
|
||||||
Array( t('Automatic Friend Account'), 0)
|
Array( t('Automatic Friend Account'), 0)
|
||||||
);
|
);
|
||||||
|
|
||||||
$users=0;
|
$users=0;
|
||||||
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
|
foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; }
|
||||||
|
|
||||||
|
|
@ -190,10 +191,22 @@ function admin_page_summary(&$a) {
|
||||||
$r = q("SELECT COUNT(id) as `count` FROM `register`");
|
$r = q("SELECT COUNT(id) as `count` FROM `register`");
|
||||||
$pending = $r[0]['count'];
|
$pending = $r[0]['count'];
|
||||||
|
|
||||||
|
$r = q("select count(*) as total from deliverq where 1");
|
||||||
|
$deliverq = (($r) ? $r[0]['total'] : 0);
|
||||||
|
|
||||||
|
$r = q("select count(*) as total from queue where 1");
|
||||||
|
$queue = (($r) ? $r[0]['total'] : 0);
|
||||||
|
|
||||||
|
// We can do better, but this is a quick queue status
|
||||||
|
|
||||||
|
$queues = array( 'label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue );
|
||||||
|
|
||||||
|
|
||||||
$t = get_markup_template("admin_summary.tpl");
|
$t = get_markup_template("admin_summary.tpl");
|
||||||
return replace_macros($t, array(
|
return replace_macros($t, array(
|
||||||
'$title' => t('Administration'),
|
'$title' => t('Administration'),
|
||||||
'$page' => t('Summary'),
|
'$page' => t('Summary'),
|
||||||
|
'$queues' => $queues,
|
||||||
'$users' => Array( t('Registered users'), $users),
|
'$users' => Array( t('Registered users'), $users),
|
||||||
'$accounts' => $accounts,
|
'$accounts' => $accounts,
|
||||||
'$pending' => Array( t('Pending registrations'), $pending),
|
'$pending' => Array( t('Pending registrations'), $pending),
|
||||||
|
|
@ -417,7 +430,7 @@ function admin_page_site(&$a) {
|
||||||
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
||||||
|
|
||||||
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
|
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
|
||||||
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")),
|
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
|
||||||
'$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
|
'$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
|
||||||
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
|
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
|
||||||
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
|
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ function community_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
||||||
`user`.`nickname`, `user`.`hidewall`
|
`user`.`nickname`, `user`.`hidewall`
|
||||||
|
|
|
||||||
|
|
@ -144,19 +144,12 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
* worried about key leakage than anybody cracking it.
|
* worried about key leakage than anybody cracking it.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
require_once('include/crypto.php');
|
||||||
|
|
||||||
$res = openssl_pkey_new(array(
|
$res = new_keypair(1024);
|
||||||
'digest_alg' => 'sha1',
|
|
||||||
'private_key_bits' => 4096,
|
|
||||||
'encrypt_key' => false )
|
|
||||||
);
|
|
||||||
|
|
||||||
$private_key = '';
|
$private_key = $res['prvkey'];
|
||||||
|
$public_key = $res['pubkey'];
|
||||||
openssl_pkey_export($res, $private_key);
|
|
||||||
|
|
||||||
$pubkey = openssl_pkey_get_details($res);
|
|
||||||
$public_key = $pubkey["key"];
|
|
||||||
|
|
||||||
// Save the private key. Send them the public key.
|
// Save the private key. Send them the public key.
|
||||||
|
|
||||||
|
|
@ -209,6 +202,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
|
|
||||||
if($user[0]['page-flags'] == PAGE_COMMUNITY)
|
if($user[0]['page-flags'] == PAGE_COMMUNITY)
|
||||||
$params['page'] = 1;
|
$params['page'] = 1;
|
||||||
|
if($user[0]['page-flags'] == PAGE_PRVGROUP)
|
||||||
|
$params['page'] = 2;
|
||||||
|
|
||||||
logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
|
logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
|
||||||
|
|
||||||
|
|
@ -500,6 +495,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['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.
|
||||||
|
|
||||||
|
|
@ -534,6 +539,9 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0 );
|
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0 );
|
||||||
$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
$version_id = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
|
||||||
|
|
||||||
|
$forum = (($page == 1) ? 1 : 0);
|
||||||
|
$prv = (($page == 2) ? 1 : 0);
|
||||||
|
|
||||||
logger('dfrn_confirm: requestee contacted: ' . $node);
|
logger('dfrn_confirm: requestee contacted: ' . $node);
|
||||||
|
|
||||||
logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA);
|
logger('dfrn_confirm: request: POST=' . print_r($_POST,true), LOGGER_DATA);
|
||||||
|
|
@ -688,6 +696,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
`pending` = 0,
|
`pending` = 0,
|
||||||
`duplex` = %d,
|
`duplex` = %d,
|
||||||
`forum` = %d,
|
`forum` = %d,
|
||||||
|
`prv` = %d,
|
||||||
`network` = '%s' WHERE `id` = %d LIMIT 1
|
`network` = '%s' WHERE `id` = %d LIMIT 1
|
||||||
",
|
",
|
||||||
dbesc($photos[0]),
|
dbesc($photos[0]),
|
||||||
|
|
@ -698,7 +707,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($duplex),
|
intval($duplex),
|
||||||
intval($page),
|
intval($forum),
|
||||||
|
intval($prv),
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
intval($dfrn_record)
|
intval($dfrn_record)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,9 @@ function dfrn_notify_post(&$a) {
|
||||||
$ssl_policy = ((x($_POST,'ssl_policy')) ? notags(trim($_POST['ssl_policy'])): 'none');
|
$ssl_policy = ((x($_POST,'ssl_policy')) ? notags(trim($_POST['ssl_policy'])): 'none');
|
||||||
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0);
|
$page = ((x($_POST,'page')) ? intval($_POST['page']) : 0);
|
||||||
|
|
||||||
|
$forum = (($page == 1) ? 1 : 0);
|
||||||
|
$prv = (($page == 2) ? 1 : 0);
|
||||||
|
|
||||||
$writable = (-1);
|
$writable = (-1);
|
||||||
if($dfrn_version >= 2.21) {
|
if($dfrn_version >= 2.21) {
|
||||||
$writable = (($perm === 'rw') ? 1 : 0);
|
$writable = (($perm === 'rw') ? 1 : 0);
|
||||||
|
|
@ -88,10 +91,11 @@ function dfrn_notify_post(&$a) {
|
||||||
|
|
||||||
$importer = $r[0];
|
$importer = $r[0];
|
||||||
|
|
||||||
if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $page)) {
|
if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
|
||||||
q("UPDATE `contact` SET `writable` = %d, forum = %d WHERE `id` = %d LIMIT 1",
|
q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d LIMIT 1",
|
||||||
intval(($writable == (-1)) ? $importer['writable'] : $writable),
|
intval(($writable == (-1)) ? $importer['writable'] : $writable),
|
||||||
intval($page),
|
intval($forum),
|
||||||
|
intval($prv),
|
||||||
intval($importer['id'])
|
intval($importer['id'])
|
||||||
);
|
);
|
||||||
if($writable != (-1))
|
if($writable != (-1))
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ function dfrn_request_post(&$a) {
|
||||||
$dfrn_url = notags(trim($_POST['dfrn_url']));
|
$dfrn_url = notags(trim($_POST['dfrn_url']));
|
||||||
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
|
$aes_allow = (((x($_POST,'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
|
||||||
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
|
$confirm_key = ((x($_POST,'confirm_key')) ? $_POST['confirm_key'] : "");
|
||||||
|
$hidden = ((x($_POST,'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
|
||||||
$contact_record = null;
|
$contact_record = null;
|
||||||
|
|
||||||
if(x($dfrn_url)) {
|
if(x($dfrn_url)) {
|
||||||
|
|
@ -98,8 +98,9 @@ function dfrn_request_post(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_array($contact_record)) {
|
if(is_array($contact_record)) {
|
||||||
$r = q("UPDATE `contact` SET `ret-aes` = %d WHERE `id` = %d LIMIT 1",
|
$r = q("UPDATE `contact` SET `ret-aes` = %d, hidden = %d WHERE `id` = %d LIMIT 1",
|
||||||
intval($aes_allow),
|
intval($aes_allow),
|
||||||
|
intval($hidden),
|
||||||
intval($contact_record['id'])
|
intval($contact_record['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -144,8 +145,8 @@ function dfrn_request_post(&$a) {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
|
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`,
|
||||||
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`)
|
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`)
|
||||||
VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
|
VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
datetime_convert(),
|
datetime_convert(),
|
||||||
dbesc($dfrn_url),
|
dbesc($dfrn_url),
|
||||||
|
|
@ -160,7 +161,8 @@ function dfrn_request_post(&$a) {
|
||||||
$parms['dfrn-poll'],
|
$parms['dfrn-poll'],
|
||||||
$parms['dfrn-poco'],
|
$parms['dfrn-poco'],
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
intval($aes_allow)
|
intval($aes_allow),
|
||||||
|
intval($hidden)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -370,6 +372,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
|
||||||
|
|
@ -641,6 +651,8 @@ function dfrn_request_content(&$a) {
|
||||||
$o = replace_macros($tpl,array(
|
$o = replace_macros($tpl,array(
|
||||||
'$dfrn_url' => $dfrn_url,
|
'$dfrn_url' => $dfrn_url,
|
||||||
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
|
'$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
|
||||||
|
'$hidethem' => t('Hide this contact'),
|
||||||
|
'$hidechecked' => '',
|
||||||
'$confirm_key' => $confirm_key,
|
'$confirm_key' => $confirm_key,
|
||||||
'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
|
'$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']),
|
||||||
'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
|
'$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url),
|
||||||
|
|
@ -672,7 +684,7 @@ function dfrn_request_content(&$a) {
|
||||||
$auto_confirm = false;
|
$auto_confirm = false;
|
||||||
|
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
if($r[0]['page-flags'] != PAGE_NORMAL)
|
if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
|
||||||
$auto_confirm = true;
|
$auto_confirm = true;
|
||||||
|
|
||||||
if(! $auto_confirm) {
|
if(! $auto_confirm) {
|
||||||
|
|
|
||||||
|
|
@ -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 = '';
|
||||||
|
|
||||||
|
|
|
||||||
214
mod/follow.php
214
mod/follow.php
|
|
@ -1,6 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
require_once('Scrape.php');
|
require_once('Scrape.php');
|
||||||
|
require_once('include/follow.php');
|
||||||
|
|
||||||
function follow_init(&$a) {
|
function follow_init(&$a) {
|
||||||
|
|
||||||
|
|
@ -11,220 +12,19 @@ function follow_init(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$uid = local_user();
|
$uid = local_user();
|
||||||
$url = $orig_url = notags(trim($_REQUEST['url']));
|
$url = notags(trim($_REQUEST['url']));
|
||||||
$return_url = $_SESSION['return_url'];
|
$return_url = $_SESSION['return_url'];
|
||||||
|
|
||||||
|
|
||||||
// remove ajax junk, e.g. Twitter
|
$result = new_contact($uid,$url,true);
|
||||||
|
|
||||||
$url = str_replace('/#!/','/',$url);
|
if($result['success'] == false) {
|
||||||
|
if($result['message'])
|
||||||
if(! allowed_url($url)) {
|
notice($result['message']);
|
||||||
notice( t('Disallowed profile URL.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(! $url) {
|
|
||||||
notice( t('Connect URL missing.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
$arr = array('url' => $url, 'contact' => array());
|
|
||||||
|
|
||||||
call_hooks('follow', $arr);
|
|
||||||
|
|
||||||
if(x($arr['contact'],'name'))
|
|
||||||
$ret = $arr['contact'];
|
|
||||||
else
|
|
||||||
$ret = probe_url($url);
|
|
||||||
|
|
||||||
if($ret['network'] === NETWORK_DFRN) {
|
|
||||||
if(strlen($a->path))
|
|
||||||
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
|
||||||
else
|
|
||||||
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
|
||||||
|
|
||||||
goaway($ret['request'] . "&addr=$myaddr");
|
|
||||||
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
if(get_config('system','dfrn_only')) {
|
|
||||||
notice( t('This site is not configured to allow communications with other networks.') . EOL);
|
|
||||||
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// This extra param just confuses things, remove it
|
|
||||||
if($ret['network'] === NETWORK_DIASPORA)
|
|
||||||
$ret['url'] = str_replace('?absolute=true','',$ret['url']);
|
|
||||||
|
|
||||||
|
|
||||||
// do we have enough information?
|
|
||||||
|
|
||||||
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
|
|
||||||
notice( t('The profile address specified does not provide adequate information.') . EOL);
|
|
||||||
if(! x($ret,'poll'))
|
|
||||||
notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
|
|
||||||
if(! x($ret,'name'))
|
|
||||||
notice( t('An author or name was not found.') . EOL);
|
|
||||||
if(! x($ret,'url'))
|
|
||||||
notice( t('No browser URL could be matched to this address.') . EOL);
|
|
||||||
if(strpos($url,'@') !== false) {
|
|
||||||
notice( t('Unable to match @-style Identity Address with a known protocol or email contact.') . EOL);
|
|
||||||
notice( t('Use mailto: in front of address to force email check.') . EOL);
|
|
||||||
}
|
|
||||||
goaway($return_url);
|
goaway($return_url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
|
info( t('Contact added') . EOL);
|
||||||
notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
|
|
||||||
$ret['notify'] = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
if(! $ret['notify']) {
|
|
||||||
notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
|
|
||||||
}
|
|
||||||
|
|
||||||
$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
|
|
||||||
$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
|
|
||||||
|
|
||||||
if($ret['network'] === NETWORK_MAIL) {
|
|
||||||
$writeable = 1;
|
|
||||||
|
|
||||||
}
|
|
||||||
if($ret['network'] === NETWORK_DIASPORA)
|
|
||||||
$writeable = 1;
|
|
||||||
|
|
||||||
// check if we already have a contact
|
|
||||||
// the poll url is more reliable than the profile url, as we may have
|
|
||||||
// indirect links or webfinger links
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
|
|
||||||
intval($uid),
|
|
||||||
dbesc($ret['poll'])
|
|
||||||
);
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
// update contact
|
|
||||||
if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
|
|
||||||
q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
|
||||||
intval(CONTACT_IS_FRIEND),
|
|
||||||
intval($r[0]['id']),
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
|
|
||||||
$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
|
|
||||||
if($ret['network'] === NETWORK_DIASPORA)
|
|
||||||
$new_relation = CONTACT_IS_FOLLOWER;
|
|
||||||
|
|
||||||
// create contact record
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
|
|
||||||
`writable`, `hidden`, `blocked`, `readonly`, `pending` )
|
|
||||||
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
|
|
||||||
intval($uid),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc($ret['url']),
|
|
||||||
dbesc(normalise_link($ret['url'])),
|
|
||||||
dbesc($ret['addr']),
|
|
||||||
dbesc($ret['alias']),
|
|
||||||
dbesc($ret['batch']),
|
|
||||||
dbesc($ret['notify']),
|
|
||||||
dbesc($ret['poll']),
|
|
||||||
dbesc($ret['poco']),
|
|
||||||
dbesc($ret['name']),
|
|
||||||
dbesc($ret['nick']),
|
|
||||||
dbesc($ret['photo']),
|
|
||||||
dbesc($ret['network']),
|
|
||||||
dbesc($ret['pubkey']),
|
|
||||||
intval($new_relation),
|
|
||||||
intval($ret['priority']),
|
|
||||||
intval($writeable),
|
|
||||||
intval($hidden)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
|
|
||||||
dbesc($ret['url']),
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(! count($r)) {
|
|
||||||
notice( t('Unable to retrieve contact information.') . EOL);
|
|
||||||
goaway($return_url);
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
$contact = $r[0];
|
|
||||||
$contact_id = $r[0]['id'];
|
|
||||||
|
|
||||||
require_once("Photo.php");
|
|
||||||
|
|
||||||
$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
|
|
||||||
|
|
||||||
$r = q("UPDATE `contact` SET `photo` = '%s',
|
|
||||||
`thumb` = '%s',
|
|
||||||
`micro` = '%s',
|
|
||||||
`name-date` = '%s',
|
|
||||||
`uri-date` = '%s',
|
|
||||||
`avatar-date` = '%s'
|
|
||||||
WHERE `id` = %d LIMIT 1
|
|
||||||
",
|
|
||||||
dbesc($photos[0]),
|
|
||||||
dbesc($photos[1]),
|
|
||||||
dbesc($photos[2]),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($contact_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
// pull feed and consume it, which should subscribe to the hub.
|
|
||||||
|
|
||||||
proc_run('php',"include/poller.php","$contact_id");
|
|
||||||
|
|
||||||
// create a follow slap
|
|
||||||
|
|
||||||
$tpl = get_markup_template('follow_slap.tpl');
|
|
||||||
$slap = replace_macros($tpl, array(
|
|
||||||
'$name' => $a->user['username'],
|
|
||||||
'$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
|
|
||||||
'$photo' => $a->contact['photo'],
|
|
||||||
'$thumb' => $a->contact['thumb'],
|
|
||||||
'$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
|
|
||||||
'$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(),
|
|
||||||
'$title' => '',
|
|
||||||
'$type' => 'text',
|
|
||||||
'$content' => t('following'),
|
|
||||||
'$nick' => $a->user['nickname'],
|
|
||||||
'$verb' => ACTIVITY_FOLLOW,
|
|
||||||
'$ostat_follow' => ''
|
|
||||||
));
|
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
|
||||||
WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
|
|
||||||
intval($uid)
|
|
||||||
);
|
|
||||||
|
|
||||||
if(count($r)) {
|
|
||||||
if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
|
|
||||||
require_once('include/salmon.php');
|
|
||||||
slapper($r[0],$contact['notify'],$slap);
|
|
||||||
}
|
|
||||||
if($contact['network'] == NETWORK_DIASPORA) {
|
|
||||||
require_once('include/diaspora.php');
|
|
||||||
$ret = diaspora_share($a->user,$contact);
|
|
||||||
logger('mod_follow: diaspora_share returns: ' . $ret);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(strstr($return_url,'contacts'))
|
if(strstr($return_url,'contacts'))
|
||||||
goaway($a->get_baseurl() . '/contacts/' . $contact_id);
|
goaway($a->get_baseurl() . '/contacts/' . $contact_id);
|
||||||
|
|
|
||||||
|
|
@ -8,26 +8,10 @@ function hostxrd_init(&$a) {
|
||||||
$pubkey = get_config('system','site_pubkey');
|
$pubkey = get_config('system','site_pubkey');
|
||||||
|
|
||||||
if(! $pubkey) {
|
if(! $pubkey) {
|
||||||
|
$res = new_keypair(1024);
|
||||||
|
|
||||||
// should only have to ever do this once.
|
set_config('system','site_prvkey', $res['prvkey']);
|
||||||
|
set_config('system','site_pubkey', $res['pubkey']);
|
||||||
$res=openssl_pkey_new(array(
|
|
||||||
'digest_alg' => 'sha1',
|
|
||||||
'private_key_bits' => 4096,
|
|
||||||
'encrypt_key' => false ));
|
|
||||||
|
|
||||||
|
|
||||||
$prvkey = '';
|
|
||||||
|
|
||||||
openssl_pkey_export($res, $prvkey);
|
|
||||||
|
|
||||||
// Get public key
|
|
||||||
|
|
||||||
$pkey = openssl_pkey_get_details($res);
|
|
||||||
$pubkey = $pkey["key"];
|
|
||||||
|
|
||||||
set_config('system','site_prvkey', $prvkey);
|
|
||||||
set_config('system','site_pubkey', $pubkey);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$tpl = file_get_contents('view/xrd_host.tpl');
|
$tpl = file_get_contents('view/xrd_host.tpl');
|
||||||
|
|
|
||||||
102
mod/install.php
Normal file → Executable file
102
mod/install.php
Normal file → Executable file
|
|
@ -4,6 +4,12 @@ $install_wizard_pass=1;
|
||||||
|
|
||||||
|
|
||||||
function install_init(&$a){
|
function install_init(&$a){
|
||||||
|
|
||||||
|
// $baseurl/install/testrwrite to test if rewite in .htaccess is working
|
||||||
|
if ($a->argc==2 && $a->argv[1]=="testrewrite") {
|
||||||
|
echo "ok";
|
||||||
|
killme();
|
||||||
|
}
|
||||||
global $install_wizard_pass;
|
global $install_wizard_pass;
|
||||||
if (x($_POST,'pass'))
|
if (x($_POST,'pass'))
|
||||||
$install_wizard_pass = intval($_POST['pass']);
|
$install_wizard_pass = intval($_POST['pass']);
|
||||||
|
|
@ -110,14 +116,7 @@ function install_content(&$a) {
|
||||||
$wizard_status = "";
|
$wizard_status = "";
|
||||||
$install_title = t('Friendica Social Communications Server - Setup');
|
$install_title = t('Friendica Social Communications Server - Setup');
|
||||||
|
|
||||||
if(x($a->data,'txt') && strlen($a->data['txt'])) {
|
|
||||||
$tpl = get_markup_template('install.tpl');
|
|
||||||
return replace_macros($tpl, array(
|
|
||||||
'$title' => $install_title,
|
|
||||||
'$pass' => t('Database connection'),
|
|
||||||
'$text' => manual_config($a),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if(x($a->data,'db_conn_failed')) {
|
if(x($a->data,'db_conn_failed')) {
|
||||||
$install_wizard_pass = 2;
|
$install_wizard_pass = 2;
|
||||||
|
|
@ -128,39 +127,20 @@ function install_content(&$a) {
|
||||||
$wizard_status = t('Could not create table.');
|
$wizard_status = t('Could not create table.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$db_return_text="";
|
||||||
if(x($a->data,'db_installed')) {
|
if(x($a->data,'db_installed')) {
|
||||||
$txt = '<p style="font-size: 130%;">';
|
$txt = '<p style="font-size: 130%;">';
|
||||||
$txt .= t('Your Friendica site database has been installed.') . EOL;
|
$txt .= t('Your Friendica site database has been installed.') . EOL;
|
||||||
$txt .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ;
|
$db_return_text .= $txt;
|
||||||
$txt .= t('Please see the file "INSTALL.txt".') . EOL ;
|
|
||||||
$txt .= '<br />';
|
|
||||||
$txt .= '<a href="' . $a->get_baseurl() . '/register' . '">' . t('Proceed to registration') . '</a>' ;
|
|
||||||
$txt .= '</p>';
|
|
||||||
|
|
||||||
$tpl = get_markup_template('install.tpl');
|
|
||||||
return replace_macros($tpl, array(
|
|
||||||
'$title' => $install_title,
|
|
||||||
'$pass' => t('Proceed with Installation'),
|
|
||||||
'$text' => $txt,
|
|
||||||
));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(x($a->data,'db_failed')) {
|
if(x($a->data,'db_failed')) {
|
||||||
$txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
|
$txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
|
||||||
$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ;
|
$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ;
|
||||||
$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ;
|
$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ;
|
||||||
|
$db_return_text .= $txt;
|
||||||
$tpl = get_markup_template('install.tpl');
|
|
||||||
return replace_macros($tpl, array(
|
|
||||||
'$title' => $install_title,
|
|
||||||
'$pass' => t('Database connection'),
|
|
||||||
'$status' => t('Database import failed.'),
|
|
||||||
'$text' => $txt,
|
|
||||||
));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if($db && $db->connected) {
|
if($db && $db->connected) {
|
||||||
$r = q("SELECT COUNT(*) as `total` FROM `user`");
|
$r = q("SELECT COUNT(*) as `total` FROM `user`");
|
||||||
if($r && count($r) && $r[0]['total']) {
|
if($r && count($r) && $r[0]['total']) {
|
||||||
|
|
@ -174,6 +154,19 @@ function install_content(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(x($a->data,'txt') && strlen($a->data['txt'])) {
|
||||||
|
$tpl = get_markup_template('install.tpl');
|
||||||
|
$db_return_text .= manual_config($a);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($db_return_text!="") {
|
||||||
|
return replace_macros($tpl, array(
|
||||||
|
'$title' => $install_title,
|
||||||
|
'$pass' => "",
|
||||||
|
'$text' => $db_return_text . what_next(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
switch ($install_wizard_pass){
|
switch ($install_wizard_pass){
|
||||||
case 1: { // System check
|
case 1: { // System check
|
||||||
|
|
||||||
|
|
@ -191,14 +184,16 @@ function install_content(&$a) {
|
||||||
|
|
||||||
check_php($phpath, $checks);
|
check_php($phpath, $checks);
|
||||||
|
|
||||||
|
check_htaccess($checks);
|
||||||
|
|
||||||
function check_passed($v, $c){
|
function check_passed($v, $c){
|
||||||
if ($c['required'])
|
if ($c['required'])
|
||||||
$v = $v && $c['status'];
|
$v = $v && $c['status'];
|
||||||
return $v;
|
return $v;
|
||||||
}
|
}
|
||||||
$checkspassed = array_reduce($checks, "check_passed", true);
|
$checkspassed = array_reduce($checks, "check_passed", true);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template('install_checks.tpl');
|
$tpl = get_markup_template('install_checks.tpl');
|
||||||
$o .= replace_macros($tpl, array(
|
$o .= replace_macros($tpl, array(
|
||||||
|
|
@ -321,14 +316,16 @@ function check_php(&$phpath, &$checks) {
|
||||||
$help = "";
|
$help = "";
|
||||||
if(!$passed) {
|
if(!$passed) {
|
||||||
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
||||||
|
$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . EOL ;
|
||||||
|
$help .= EOL . EOL ;
|
||||||
$tpl = get_markup_template('field_input.tpl');
|
$tpl = get_markup_template('field_input.tpl');
|
||||||
$help .= replace_macros($tpl, array(
|
$help .= replace_macros($tpl, array(
|
||||||
'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
|
'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')),
|
||||||
));
|
));
|
||||||
$phpath="";
|
$phpath="";
|
||||||
}
|
}
|
||||||
|
|
||||||
check_add($checks, t('Command line PHP'), $passed, true, $help);
|
check_add($checks, t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
|
||||||
|
|
||||||
if($passed) {
|
if($passed) {
|
||||||
$str = autoname(8);
|
$str = autoname(8);
|
||||||
|
|
@ -385,6 +382,7 @@ function check_funcs(&$checks) {
|
||||||
check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
|
check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! function_exists('curl_init')){
|
if(! function_exists('curl_init')){
|
||||||
$ck_funcs[0]['status']= false;
|
$ck_funcs[0]['status']= false;
|
||||||
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
|
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
|
||||||
|
|
@ -422,11 +420,28 @@ function check_htconfig(&$checks) {
|
||||||
$status=false;
|
$status=false;
|
||||||
$help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL;
|
$help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL;
|
||||||
$help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL;
|
$help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL;
|
||||||
$help .= t('Please check with your site documentation or support people to see if this situation can be corrected.').EOL;
|
$help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL;
|
||||||
$help .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL;
|
$help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check_add($checks, t('.htconfig.php is writable'), $status, false, $help);
|
||||||
|
|
||||||
check_add($checks, t('.htconfig.php is writable'), $status, true, $help);
|
}
|
||||||
|
|
||||||
|
function check_htaccess(&$checks) {
|
||||||
|
$a = get_app();
|
||||||
|
$status = true;
|
||||||
|
$help = "";
|
||||||
|
if (function_exists('curl_init')){
|
||||||
|
$test = fetch_url($a->get_baseurl()."/install/testrewrite");
|
||||||
|
if ($test!="ok") {
|
||||||
|
$status = false;
|
||||||
|
$help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
|
||||||
|
}
|
||||||
|
check_add($checks, t('Url rewrite is working'), $status, true, $help);
|
||||||
|
} else {
|
||||||
|
// cannot check modrewrite if libcurl is not installed
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -465,5 +480,16 @@ function load_database($db) {
|
||||||
return $errors;
|
return $errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function what_next() {
|
||||||
|
$a = get_app();
|
||||||
|
$baseurl = $a->get_baseurl();
|
||||||
|
return
|
||||||
|
t('<h1>What next</h1>')
|
||||||
|
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
|
||||||
|
.t('Please see the file "INSTALL.txt".')
|
||||||
|
."</p><p>"
|
||||||
|
.t("Go to your new Firendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
|
||||||
|
."</p>";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
86
mod/item.php
86
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);
|
||||||
|
|
@ -253,17 +262,17 @@ function item_post(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen($categories)) {
|
if(strlen($categories)) {
|
||||||
// get the "fileas" tags for this post
|
// get the "fileas" tags for this post
|
||||||
$filedas = file_tag_file_to_list($categories, 'file');
|
$filedas = file_tag_file_to_list($categories, 'file');
|
||||||
}
|
}
|
||||||
// save old and new categories, so we can determine what needs to be deleted from pconfig
|
// save old and new categories, so we can determine what needs to be deleted from pconfig
|
||||||
$categories_old = $categories;
|
$categories_old = $categories;
|
||||||
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
|
||||||
$categories_new = $categories;
|
$categories_new = $categories;
|
||||||
if(strlen($filedas)) {
|
if(strlen($filedas)) {
|
||||||
// append the fileas stuff to the new categories list
|
// append the fileas stuff to the new categories list
|
||||||
$categories .= file_tag_list_to_file($filedas, 'file');
|
$categories .= file_tag_list_to_file($filedas, 'file');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Work around doubled linefeeds in Tinymce 3.5b2
|
// Work around doubled linefeeds in Tinymce 3.5b2
|
||||||
|
|
@ -281,18 +290,16 @@ function item_post(&$a) {
|
||||||
$author = null;
|
$author = null;
|
||||||
$self = false;
|
$self = false;
|
||||||
|
|
||||||
if(($_SESSION['uid']) && ($_SESSION['uid'] == $profile_uid)) {
|
if((local_user()) && (local_user() == $profile_uid)) {
|
||||||
$self = true;
|
$self = true;
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||||
intval($_SESSION['uid'])
|
intval($_SESSION['uid'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
elseif(remote_user()) {
|
||||||
if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id']))) {
|
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
intval(remote_user())
|
||||||
intval($_SESSION['visitor_id'])
|
);
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
|
@ -302,7 +309,7 @@ function item_post(&$a) {
|
||||||
|
|
||||||
// get contact info for owner
|
// get contact info for owner
|
||||||
|
|
||||||
if($profile_uid == $_SESSION['uid']) {
|
if($profile_uid == local_user()) {
|
||||||
$contact_record = $author;
|
$contact_record = $author;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
@ -313,8 +320,6 @@ function item_post(&$a) {
|
||||||
$contact_record = $r[0];
|
$contact_record = $r[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$post_type = notags(trim($_REQUEST['type']));
|
$post_type = notags(trim($_REQUEST['type']));
|
||||||
|
|
||||||
if($post_type === 'net-comment') {
|
if($post_type === 'net-comment') {
|
||||||
|
|
@ -350,13 +355,15 @@ function item_post(&$a) {
|
||||||
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
|
||||||
if(! strlen($image_uri))
|
if(! strlen($image_uri))
|
||||||
continue;
|
continue;
|
||||||
$srch = '<' . intval($contact_record['id']) . '>';
|
$srch = '<' . intval($contact_id) . '>';
|
||||||
|
|
||||||
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
|
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
|
||||||
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
|
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($srch),
|
dbesc($srch),
|
||||||
dbesc($image_uri),
|
dbesc($image_uri),
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! count($r))
|
if(! count($r))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
@ -446,6 +453,7 @@ function item_post(&$a) {
|
||||||
|
|
||||||
$tagged = array();
|
$tagged = array();
|
||||||
|
|
||||||
|
$private_forum = false;
|
||||||
|
|
||||||
if(count($tags)) {
|
if(count($tags)) {
|
||||||
foreach($tags as $tag) {
|
foreach($tags as $tag) {
|
||||||
|
|
@ -464,11 +472,22 @@ function item_post(&$a) {
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
|
$success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag);
|
||||||
if($success)
|
if($success['replaced'])
|
||||||
$tagged[] = $tag;
|
$tagged[] = $tag;
|
||||||
|
if(is_array($success['contact']) && intval($success['contact']['prv'])) {
|
||||||
|
$private_forum = true;
|
||||||
|
$private_id = $success['contact']['id'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(($private_forum) && (! $parent) && (! $private)) {
|
||||||
|
// we tagged a private forum in a top level post and the message was public.
|
||||||
|
// Restrict it.
|
||||||
|
$private = 1;
|
||||||
|
$str_contact_allow = '<' . $private_id . '>';
|
||||||
|
}
|
||||||
|
|
||||||
$attachments = '';
|
$attachments = '';
|
||||||
$match = false;
|
$match = false;
|
||||||
|
|
||||||
|
|
@ -718,16 +737,16 @@ function item_post(&$a) {
|
||||||
if($datarray['verb'] === ACTIVITY_LIKE)
|
if($datarray['verb'] === ACTIVITY_LIKE)
|
||||||
$signed_text = $datarray['guid'] . ';' . 'Post' . ';' . $parent_item['guid'] . ';' . 'true' . ';' . $myaddr;
|
$signed_text = $datarray['guid'] . ';' . 'Post' . ';' . $parent_item['guid'] . ';' . 'true' . ';' . $myaddr;
|
||||||
else
|
else
|
||||||
$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
|
$signed_text = $datarray['guid'] . ';' . $parent_item['guid'] . ';' . $signed_body . ';' . $myaddr;
|
||||||
|
|
||||||
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
|
$authorsig = base64_encode(rsa_sign($signed_text,$a->user['prvkey'],'sha256'));
|
||||||
|
|
||||||
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
intval($post_id),
|
intval($post_id),
|
||||||
dbesc($signed_text),
|
dbesc($signed_text),
|
||||||
dbesc(base64_encode($authorsig)),
|
dbesc(base64_encode($authorsig)),
|
||||||
dbesc($myaddr)
|
dbesc($myaddr)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
@ -886,6 +905,7 @@ function item_content(&$a) {
|
||||||
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
||||||
|
|
||||||
$replaced = false;
|
$replaced = false;
|
||||||
|
$r = null;
|
||||||
|
|
||||||
//is it a hash tag?
|
//is it a hash tag?
|
||||||
if(strpos($tag,'#') === 0) {
|
if(strpos($tag,'#') === 0) {
|
||||||
|
|
@ -1016,5 +1036,5 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $replaced;
|
return array('replaced' => $replaced, 'contact' => $r[0]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
125
mod/like.php
Normal file → Executable file
125
mod/like.php
Normal file → Executable file
|
|
@ -104,7 +104,8 @@ function like_content(&$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
|
|
||||||
|
$r = q("SELECT * FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
|
||||||
AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
|
AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
|
||||||
dbesc($activity),
|
dbesc($activity),
|
||||||
intval($contact['id']),
|
intval($contact['id']),
|
||||||
|
|
@ -112,13 +113,70 @@ function like_content(&$a) {
|
||||||
dbesc($item_id)
|
dbesc($item_id)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
$like_item = $r[0];
|
||||||
|
|
||||||
// Already voted, undo it
|
// Already voted, undo it
|
||||||
$r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
|
$r = q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($r[0]['id'])
|
intval($like_item['id'])
|
||||||
);
|
);
|
||||||
|
|
||||||
proc_run('php',"include/notifier.php","like","$post_id");
|
// Clean up the `sign` table
|
||||||
|
$r = q("DELETE FROM `sign` WHERE `iid` = %d",
|
||||||
|
intval($like_item['id'])
|
||||||
|
);
|
||||||
|
|
||||||
|
// Save the author information for the unlike in case we need to relay to Diaspora
|
||||||
|
// Note that we can only create a signature for a user of the local server. We don't have
|
||||||
|
// a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it
|
||||||
|
// means we are the relay, and for relayable_retractions, Diaspora
|
||||||
|
// only checks the parent_author_signature if it doesn't have to relay further
|
||||||
|
//
|
||||||
|
// If $item['resource-id'] exists, it means the item is a photo. Diaspora doesn't support
|
||||||
|
// likes on photos, so don't bother.
|
||||||
|
|
||||||
|
if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
|
||||||
|
$signed_text = $like_item['guid'] . ';' . 'Like';
|
||||||
|
|
||||||
|
if( $contact['network'] === NETWORK_DIASPORA)
|
||||||
|
$diaspora_handle = $contact['addr'];
|
||||||
|
else { // Only works for NETWORK_DFRN
|
||||||
|
$contact_baseurl_start = strpos($contact['url'],'://') + 3;
|
||||||
|
$contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
|
||||||
|
$contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
|
||||||
|
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
|
||||||
|
|
||||||
|
// Get contact's private key if he's a user of the local Friendica server
|
||||||
|
$r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
|
||||||
|
dbesc($contact['url'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r) {
|
||||||
|
$contact_uid = $r['uid'];
|
||||||
|
$r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
|
||||||
|
intval($contact_uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r)
|
||||||
|
$authorsig = base64_encode(rsa_sign($signed_text,$r['prvkey'],'sha256'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(! isset($authorsig))
|
||||||
|
$authorsig = '';
|
||||||
|
|
||||||
|
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
intval($like_item['id']),
|
||||||
|
dbesc($signed_text),
|
||||||
|
dbesc($authorsig),
|
||||||
|
dbesc($diaspora_handle)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
|
||||||
|
$like_item_id = $like_item['id'];
|
||||||
|
proc_run('php',"include/notifier.php","like","$like_item_id");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -191,6 +249,65 @@ EOT;
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Save the author information for the like in case we need to relay to Diaspora
|
||||||
|
// Note that we can only create a signature for a user of the local server. We don't have
|
||||||
|
// a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it
|
||||||
|
// means we are the relay, and for relayable_retractions, Diaspora
|
||||||
|
// only checks the parent_author_signature if it doesn't have to relay further
|
||||||
|
|
||||||
|
if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
|
||||||
|
if( $contact['network'] === NETWORK_DIASPORA)
|
||||||
|
$diaspora_handle = $contact['addr'];
|
||||||
|
else { // Only works for NETWORK_DFRN
|
||||||
|
$contact_baseurl_start = strpos($contact['url'],'://') + 3;
|
||||||
|
$contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
|
||||||
|
$contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
|
||||||
|
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
|
||||||
|
|
||||||
|
// Get contact's private key if he's a user of the local Friendica server
|
||||||
|
$r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
|
||||||
|
dbesc($contact['url'])
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r) {
|
||||||
|
$contact_uid = $r['uid'];
|
||||||
|
$r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
|
||||||
|
intval($contact_uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if( $r)
|
||||||
|
$contact_uprvkey = $r['prvkey'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("SELECT guid, parent FROM `item` WHERE id = %d LIMIT 1",
|
||||||
|
intval($post_id)
|
||||||
|
);
|
||||||
|
if( $r) {
|
||||||
|
$p = q("SELECT guid FROM `item` WHERE id = %d AND parent = %d LIMIT 1",
|
||||||
|
intval($r[0]['parent']),
|
||||||
|
intval($r[0]['parent'])
|
||||||
|
);
|
||||||
|
if( $p) {
|
||||||
|
$signed_text = $r[0]['guid'] . ';Post;' . $p[0]['guid'] . ';true;' . $diaspora_handle;
|
||||||
|
|
||||||
|
if(isset($contact_uprvkey))
|
||||||
|
$authorsig = base64_encode(rsa_sign($signed_text,$contact_uprvkey,'sha256'));
|
||||||
|
else
|
||||||
|
$authorsig = '';
|
||||||
|
|
||||||
|
q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||||
|
intval($post_id),
|
||||||
|
dbesc($signed_text),
|
||||||
|
dbesc($authorsig),
|
||||||
|
dbesc($diaspora_handle)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$arr['id'] = $post_id;
|
$arr['id'] = $post_id;
|
||||||
|
|
||||||
call_hooks('post_local_end', $arr);
|
call_hooks('post_local_end', $arr);
|
||||||
|
|
@ -199,4 +316,4 @@ EOT;
|
||||||
|
|
||||||
killme();
|
killme();
|
||||||
// return; // NOTREACHED
|
// return; // NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,8 @@ function message_content(&$a) {
|
||||||
'$parent' => '',
|
'$parent' => '',
|
||||||
'$upload' => t('Upload photo'),
|
'$upload' => t('Upload photo'),
|
||||||
'$insert' => t('Insert web link'),
|
'$insert' => t('Insert web link'),
|
||||||
'$wait' => t('Please wait')
|
'$wait' => t('Please wait'),
|
||||||
|
'$submit' => t('Submit')
|
||||||
));
|
));
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) {
|
||||||
return login(false);
|
return login(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$arr = array('query' => $a->query_string);
|
||||||
|
|
||||||
|
call_hooks('network_content_init', $arr);
|
||||||
|
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
// item filter tabs
|
// item filter tabs
|
||||||
|
|
@ -157,7 +161,7 @@ function network_content(&$a, $update = 0) {
|
||||||
$all_active = 'active';
|
$all_active = 'active';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$postord_active = '';
|
$postord_active = '';
|
||||||
|
|
||||||
if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {
|
if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') {
|
||||||
|
|
@ -398,10 +402,22 @@ function network_content(&$a, $update = 0) {
|
||||||
|
|
||||||
if(x($_GET,'search')) {
|
if(x($_GET,'search')) {
|
||||||
$search = escape_tags($_GET['search']);
|
$search = escape_tags($_GET['search']);
|
||||||
$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
|
if (get_config('system','use_fulltext_engine')) {
|
||||||
dbesc(protect_sprintf('%' . $search . '%')),
|
if(strpos($search,'#') === 0)
|
||||||
dbesc(protect_sprintf('%]' . $search . '[%'))
|
$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
||||||
);
|
dbesc(protect_sprintf($search))
|
||||||
|
);
|
||||||
|
else
|
||||||
|
$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
||||||
|
dbesc(protect_sprintf($search)),
|
||||||
|
dbesc(protect_sprintf($search))
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
$sql_extra .= sprintf(" AND ( `item`.`body` like '%s' OR `item`.`tag` like '%s' ) ",
|
||||||
|
dbesc(protect_sprintf('%' . $search . '%')),
|
||||||
|
dbesc(protect_sprintf('%]' . $search . '[%'))
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(strlen($file)) {
|
if(strlen($file)) {
|
||||||
$sql_extra .= file_tag_file_query('item',unxmlify($file));
|
$sql_extra .= file_tag_file_query('item',unxmlify($file));
|
||||||
|
|
@ -410,15 +426,22 @@ function network_content(&$a, $update = 0) {
|
||||||
if($conv) {
|
if($conv) {
|
||||||
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
|
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
|
||||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||||
$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
|
$myurl = str_replace('www.','',$myurl);
|
||||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||||
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
if (get_config('system','use_fulltext_engine'))
|
||||||
dbesc(protect_sprintf('%s' . $myurl)),
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (MATCH(`author-link`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
|
||||||
dbesc(protect_sprintf('%' . $myurl . '\\]%')),
|
dbesc(protect_sprintf($myurl)),
|
||||||
dbesc(protect_sprintf('%' . $diasp_url . '\\]%'))
|
dbesc(protect_sprintf($myurl)),
|
||||||
);
|
dbesc(protect_sprintf($diasp_url))
|
||||||
}
|
);
|
||||||
|
else
|
||||||
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
||||||
|
dbesc(protect_sprintf('%' . $myurl)),
|
||||||
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
|
);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
if($update) {
|
if($update) {
|
||||||
|
|
||||||
|
|
@ -511,7 +534,7 @@ function network_content(&$a, $update = 0) {
|
||||||
$parents_str = implode(', ', $parents_arr);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
|
|
||||||
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item`, `contact`
|
FROM `item`, `contact`
|
||||||
|
|
|
||||||
|
|
@ -80,8 +80,9 @@ function notes_content(&$a,$update = false) {
|
||||||
|
|
||||||
$r = q("SELECT COUNT(*) AS `total`
|
$r = q("SELECT COUNT(*) AS `total`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
|
||||||
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
|
||||||
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
|
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
|
||||||
$sql_extra ",
|
$sql_extra ",
|
||||||
intval(local_user())
|
intval(local_user())
|
||||||
|
|
@ -95,8 +96,9 @@ function notes_content(&$a,$update = false) {
|
||||||
|
|
||||||
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
|
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
and `item`.`moderated` = 0 AND `item`.`type` = 'note'
|
||||||
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
|
||||||
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
|
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
|
||||||
$sql_extra
|
$sql_extra
|
||||||
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
|
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
|
||||||
|
|
@ -115,7 +117,7 @@ function notes_content(&$a,$update = false) {
|
||||||
$parents_str = implode(', ', $parents_arr);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
|
|
||||||
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
|
||||||
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -287,6 +287,7 @@ function photos_post(&$a) {
|
||||||
|
|
||||||
if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
|
if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
|
||||||
|
|
||||||
|
|
||||||
$desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
|
$desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
|
||||||
$rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
|
$rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
|
||||||
$item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
|
$item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0);
|
||||||
|
|
@ -300,7 +301,61 @@ function photos_post(&$a) {
|
||||||
|
|
||||||
if(! strlen($albname))
|
if(! strlen($albname))
|
||||||
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
|
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
|
||||||
|
|
||||||
|
|
||||||
|
if((x($_POST,'rotate') !== false) && (intval($_POST['rotate']) == 1)) {
|
||||||
|
logger('rotate');
|
||||||
|
|
||||||
|
$r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
|
||||||
|
dbesc($resource_id),
|
||||||
|
intval($page_owner_uid)
|
||||||
|
);
|
||||||
|
if(count($r)) {
|
||||||
|
$ph = new Photo($r[0]['data']);
|
||||||
|
if($ph->is_valid()) {
|
||||||
|
$ph->rotate(270);
|
||||||
|
|
||||||
|
$width = $ph->getWidth();
|
||||||
|
$height = $ph->getHeight();
|
||||||
|
|
||||||
|
$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
|
||||||
|
dbesc($ph->imageString()),
|
||||||
|
intval($height),
|
||||||
|
intval($width),
|
||||||
|
dbesc($resource_id),
|
||||||
|
intval($page_owner_uid)
|
||||||
|
);
|
||||||
|
|
||||||
|
if($width > 640 || $height > 640) {
|
||||||
|
$ph->scaleImage(640);
|
||||||
|
$width = $ph->getWidth();
|
||||||
|
$height = $ph->getHeight();
|
||||||
|
|
||||||
|
$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 1 limit 1",
|
||||||
|
dbesc($ph->imageString()),
|
||||||
|
intval($height),
|
||||||
|
intval($width),
|
||||||
|
dbesc($resource_id),
|
||||||
|
intval($page_owner_uid)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if($width > 320 || $height > 320) {
|
||||||
|
$ph->scaleImage(320);
|
||||||
|
$width = $ph->getWidth();
|
||||||
|
$height = $ph->getHeight();
|
||||||
|
|
||||||
|
$x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 2 limit 1",
|
||||||
|
dbesc($ph->imageString()),
|
||||||
|
intval($height),
|
||||||
|
intval($width),
|
||||||
|
dbesc($resource_id),
|
||||||
|
intval($page_owner_uid)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
|
$p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
|
||||||
dbesc($resource_id),
|
dbesc($resource_id),
|
||||||
|
|
@ -977,9 +1032,16 @@ function photos_content(&$a) {
|
||||||
|
|
||||||
$tpl = get_markup_template('photo_album.tpl');
|
$tpl = get_markup_template('photo_album.tpl');
|
||||||
if(count($r))
|
if(count($r))
|
||||||
|
$twist = 'rotright';
|
||||||
foreach($r as $rr) {
|
foreach($r as $rr) {
|
||||||
|
if($twist == 'rotright')
|
||||||
|
$twist = 'rotleft';
|
||||||
|
else
|
||||||
|
$twist = 'rotright';
|
||||||
|
|
||||||
$o .= replace_macros($tpl,array(
|
$o .= replace_macros($tpl,array(
|
||||||
'$id' => $rr['id'],
|
'$id' => $rr['id'],
|
||||||
|
'$twist' => ' ' . $twist . rand(2,4),
|
||||||
'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
||||||
'$phototitle' => t('View Photo'),
|
'$phototitle' => t('View Photo'),
|
||||||
'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
|
'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
|
||||||
|
|
@ -1098,7 +1160,7 @@ function photos_content(&$a) {
|
||||||
$photo = array(
|
$photo = array(
|
||||||
'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg',
|
'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg',
|
||||||
'title'=> t('View Full Size'),
|
'title'=> t('View Full Size'),
|
||||||
'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg'
|
'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '?f=&_u=' . datetime_convert('','','','ymdhis')
|
||||||
);
|
);
|
||||||
|
|
||||||
if($nextlink)
|
if($nextlink)
|
||||||
|
|
@ -1178,6 +1240,7 @@ function photos_content(&$a) {
|
||||||
$edit_tpl = get_markup_template('photo_edit.tpl');
|
$edit_tpl = get_markup_template('photo_edit.tpl');
|
||||||
$edit = replace_macros($edit_tpl, array(
|
$edit = replace_macros($edit_tpl, array(
|
||||||
'$id' => $ph[0]['id'],
|
'$id' => $ph[0]['id'],
|
||||||
|
'$rotate' => t('Rotate CW'),
|
||||||
'$album' => template_escape($ph[0]['album']),
|
'$album' => template_escape($ph[0]['album']),
|
||||||
'$newalbum' => t('New album name'),
|
'$newalbum' => t('New album name'),
|
||||||
'$nickname' => $a->data['user']['nickname'],
|
'$nickname' => $a->data['user']['nickname'],
|
||||||
|
|
@ -1400,9 +1463,16 @@ function photos_content(&$a) {
|
||||||
|
|
||||||
$photos = array();
|
$photos = array();
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
$twist = 'rotright';
|
||||||
foreach($r as $rr) {
|
foreach($r as $rr) {
|
||||||
|
if($twist == 'rotright')
|
||||||
|
$twist = 'rotleft';
|
||||||
|
else
|
||||||
|
$twist = 'rotright';
|
||||||
|
|
||||||
$photos[] = array(
|
$photos[] = array(
|
||||||
'id' => $rr['id'],
|
'id' => $rr['id'],
|
||||||
|
'twist' => ' ' . $twist . rand(2,4),
|
||||||
'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
||||||
'title' => t('View Photo'),
|
'title' => t('View Photo'),
|
||||||
'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
|
'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,16 @@ function ping_init(&$a) {
|
||||||
<result>";
|
<result>";
|
||||||
|
|
||||||
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
|
||||||
|
|
||||||
if(local_user()){
|
if(local_user()){
|
||||||
|
|
||||||
|
// Different login session than the page that is calling us.
|
||||||
|
|
||||||
|
if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
|
||||||
|
echo '<invalid>1</invalid></result>';
|
||||||
|
killme();
|
||||||
|
}
|
||||||
|
|
||||||
$firehose = intval(get_pconfig(local_user(),'system','notify_full'));
|
$firehose = intval(get_pconfig(local_user(),'system','notify_full'));
|
||||||
|
|
||||||
$t = q("select count(*) as total from notify where uid = %d and seen = 0",
|
$t = q("select count(*) as total from notify where uid = %d and seen = 0",
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,7 @@ function profile_content(&$a, $update = 0) {
|
||||||
$parents_str = implode(', ', $parents_arr);
|
$parents_str = implode(', ', $parents_arr);
|
||||||
|
|
||||||
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`,
|
||||||
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
|
||||||
FROM `item`, `contact`
|
FROM `item`, `contact`
|
||||||
|
|
|
||||||
|
|
@ -62,9 +62,15 @@ function profiles_post(&$a) {
|
||||||
$pub_keywords = notags(trim($_POST['pub_keywords']));
|
$pub_keywords = notags(trim($_POST['pub_keywords']));
|
||||||
$prv_keywords = notags(trim($_POST['prv_keywords']));
|
$prv_keywords = notags(trim($_POST['prv_keywords']));
|
||||||
$marital = notags(trim($_POST['marital']));
|
$marital = notags(trim($_POST['marital']));
|
||||||
|
$howlong = notags(trim($_POST['howlong']));
|
||||||
|
|
||||||
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
|
$with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
|
||||||
|
|
||||||
|
if(! strlen($howlong))
|
||||||
|
$howlong = '0000-00-00 00:00:00';
|
||||||
|
else
|
||||||
|
$howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
|
||||||
|
|
||||||
// linkify the relationship target if applicable
|
// linkify the relationship target if applicable
|
||||||
|
|
||||||
$withchanged = false;
|
$withchanged = false;
|
||||||
|
|
@ -120,6 +126,7 @@ function profiles_post(&$a) {
|
||||||
|
|
||||||
$sexual = notags(trim($_POST['sexual']));
|
$sexual = notags(trim($_POST['sexual']));
|
||||||
$homepage = notags(trim($_POST['homepage']));
|
$homepage = notags(trim($_POST['homepage']));
|
||||||
|
$hometown = notags(trim($_POST['hometown']));
|
||||||
$politic = notags(trim($_POST['politic']));
|
$politic = notags(trim($_POST['politic']));
|
||||||
$religion = notags(trim($_POST['religion']));
|
$religion = notags(trim($_POST['religion']));
|
||||||
|
|
||||||
|
|
@ -146,7 +153,7 @@ function profiles_post(&$a) {
|
||||||
$value = $marital;
|
$value = $marital;
|
||||||
}
|
}
|
||||||
if($withchanged) {
|
if($withchanged) {
|
||||||
$changes[] = '♥ ' . t('Romantic Partner');
|
$changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
|
||||||
$value = strip_tags($with);
|
$value = strip_tags($with);
|
||||||
}
|
}
|
||||||
if($work != $orig[0]['work']) {
|
if($work != $orig[0]['work']) {
|
||||||
|
|
@ -176,9 +183,18 @@ function profiles_post(&$a) {
|
||||||
$changes[] = t('Interests');
|
$changes[] = t('Interests');
|
||||||
$value = $interest;
|
$value = $interest;
|
||||||
}
|
}
|
||||||
if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
|
if($address != $orig[0]['address']) {
|
||||||
|
$changes[] = t('Address');
|
||||||
|
// New address not sent in notifications, potential privacy issues
|
||||||
|
// in case this leaks to unintended recipients. Yes, it's in the public
|
||||||
|
// profile but that doesn't mean we have to broadcast it to everybody.
|
||||||
|
}
|
||||||
|
if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
|
||||||
|| $country_name != $orig[0]['country-name']) {
|
|| $country_name != $orig[0]['country-name']) {
|
||||||
$changes[] = t('Location');
|
$changes[] = t('Location');
|
||||||
|
$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
|
||||||
|
$comma2 = (($region && $country_name) ? ', ' : '');
|
||||||
|
$value = $locality . $comma1 . $region . $comma2 . $country_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
profile_activity($changes,$value);
|
profile_activity($changes,$value);
|
||||||
|
|
@ -198,8 +214,10 @@ function profiles_post(&$a) {
|
||||||
`country-name` = '%s',
|
`country-name` = '%s',
|
||||||
`marital` = '%s',
|
`marital` = '%s',
|
||||||
`with` = '%s',
|
`with` = '%s',
|
||||||
|
`howlong` = '%s',
|
||||||
`sexual` = '%s',
|
`sexual` = '%s',
|
||||||
`homepage` = '%s',
|
`homepage` = '%s',
|
||||||
|
`hometown` = '%s',
|
||||||
`politic` = '%s',
|
`politic` = '%s',
|
||||||
`religion` = '%s',
|
`religion` = '%s',
|
||||||
`pub_keywords` = '%s',
|
`pub_keywords` = '%s',
|
||||||
|
|
@ -228,8 +246,10 @@ function profiles_post(&$a) {
|
||||||
dbesc($country_name),
|
dbesc($country_name),
|
||||||
dbesc($marital),
|
dbesc($marital),
|
||||||
dbesc($with),
|
dbesc($with),
|
||||||
|
dbesc($howlong),
|
||||||
dbesc($sexual),
|
dbesc($sexual),
|
||||||
dbesc($homepage),
|
dbesc($homepage),
|
||||||
|
dbesc($hometown),
|
||||||
dbesc($politic),
|
dbesc($politic),
|
||||||
dbesc($religion),
|
dbesc($religion),
|
||||||
dbesc($pub_keywords),
|
dbesc($pub_keywords),
|
||||||
|
|
@ -329,7 +349,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);
|
||||||
|
|
@ -549,8 +569,10 @@ function profiles_content(&$a) {
|
||||||
'$lbl_marital' => t('<span class="heart">♥</span> Marital Status:'),
|
'$lbl_marital' => t('<span class="heart">♥</span> Marital Status:'),
|
||||||
'$lbl_with' => t("Who: \x28if applicable\x29"),
|
'$lbl_with' => t("Who: \x28if applicable\x29"),
|
||||||
'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
|
'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
|
||||||
|
'$lbl_howlong' => t('Since [date]:'),
|
||||||
'$lbl_sexual' => t('Sexual Preference:'),
|
'$lbl_sexual' => t('Sexual Preference:'),
|
||||||
'$lbl_homepage' => t('Homepage URL:'),
|
'$lbl_homepage' => t('Homepage URL:'),
|
||||||
|
'$lbl_hometown' => t('Hometown:'),
|
||||||
'$lbl_politic' => t('Political Views:'),
|
'$lbl_politic' => t('Political Views:'),
|
||||||
'$lbl_religion' => t('Religious Views:'),
|
'$lbl_religion' => t('Religious Views:'),
|
||||||
'$lbl_pubkey' => t('Public Keywords:'),
|
'$lbl_pubkey' => t('Public Keywords:'),
|
||||||
|
|
@ -586,9 +608,11 @@ function profiles_content(&$a) {
|
||||||
'$gender' => gender_selector($r[0]['gender']),
|
'$gender' => gender_selector($r[0]['gender']),
|
||||||
'$marital' => marital_selector($r[0]['marital']),
|
'$marital' => marital_selector($r[0]['marital']),
|
||||||
'$with' => strip_tags($r[0]['with']),
|
'$with' => strip_tags($r[0]['with']),
|
||||||
|
'$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])),
|
||||||
'$sexual' => sexpref_selector($r[0]['sexual']),
|
'$sexual' => sexpref_selector($r[0]['sexual']),
|
||||||
'$about' => $r[0]['about'],
|
'$about' => $r[0]['about'],
|
||||||
'$homepage' => $r[0]['homepage'],
|
'$homepage' => $r[0]['homepage'],
|
||||||
|
'$hometown' => $r[0]['hometown'],
|
||||||
'$politic' => $r[0]['politic'],
|
'$politic' => $r[0]['politic'],
|
||||||
'$religion' => $r[0]['religion'],
|
'$religion' => $r[0]['religion'],
|
||||||
'$pub_keywords' => $r[0]['pub_keywords'],
|
'$pub_keywords' => $r[0]['pub_keywords'],
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ function redir_init(&$a) {
|
||||||
|
|
||||||
// traditional DFRN
|
// traditional DFRN
|
||||||
|
|
||||||
if(local_user() && $a->argc == 2 && intval($a->argv[1])) {
|
if(local_user() && $a->argc > 1 && intval($a->argv[1])) {
|
||||||
|
|
||||||
$cid = $a->argv[1];
|
$cid = $a->argv[1];
|
||||||
|
|
||||||
|
|
|
||||||
350
mod/register.php
350
mod/register.php
|
|
@ -43,347 +43,49 @@ function register_post(&$a) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
$using_invites = get_config('system','invitation_only');
|
require_once('include/user.php');
|
||||||
$num_invites = get_config('system','number_invites');
|
|
||||||
|
|
||||||
|
$arr = $_POST;
|
||||||
|
|
||||||
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
|
$arr['blocked'] = $blocked;
|
||||||
$username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : '');
|
$arr['verified'] = $verified;
|
||||||
$nickname = ((x($_POST,'nickname')) ? notags(trim($_POST['nickname'])) : '');
|
|
||||||
$email = ((x($_POST,'email')) ? notags(trim($_POST['email'])) : '');
|
|
||||||
$openid_url = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : '');
|
|
||||||
$photo = ((x($_POST,'photo')) ? notags(trim($_POST['photo'])) : '');
|
|
||||||
$publish = ((x($_POST,'profile_publish_reg') && intval($_POST['profile_publish_reg'])) ? 1 : 0);
|
|
||||||
|
|
||||||
$netpublish = ((strlen(get_config('system','directory_submit_url'))) ? $publish : 0);
|
$result = create_user($arr);
|
||||||
|
|
||||||
$tmp_str = $openid_url;
|
|
||||||
|
|
||||||
if($using_invites) {
|
if(! $result['success']) {
|
||||||
if(! $invite_id) {
|
notice($result['message']);
|
||||||
notice( t('An invitation is required.') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$r = q("select * from register where `hash` = '%s' limit 1", dbesc($invite_id));
|
|
||||||
if(! results($r)) {
|
|
||||||
notice( t('Invitation could not be verified.') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if((! x($username)) || (! x($email)) || (! x($nickname))) {
|
|
||||||
if($openid_url) {
|
|
||||||
if(! validate_url($tmp_str)) {
|
|
||||||
notice( t('Invalid OpenID url') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$_SESSION['register'] = 1;
|
|
||||||
$_SESSION['openid'] = $openid_url;
|
|
||||||
require_once('library/openid.php');
|
|
||||||
$openid = new LightOpenID;
|
|
||||||
$openid->identity = $openid_url;
|
|
||||||
$openid->returnUrl = $a->get_baseurl() . '/openid';
|
|
||||||
$openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
|
|
||||||
$openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
|
|
||||||
goaway($openid->authUrl());
|
|
||||||
// NOTREACHED
|
|
||||||
}
|
|
||||||
|
|
||||||
notice( t('Please enter the required information.') . EOL );
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! validate_url($tmp_str))
|
$user = $result['user'];
|
||||||
$openid_url = '';
|
|
||||||
|
|
||||||
|
|
||||||
$err = '';
|
|
||||||
|
|
||||||
// collapse multiple spaces in name
|
|
||||||
$username = preg_replace('/ +/',' ',$username);
|
|
||||||
|
|
||||||
if(mb_strlen($username) > 48)
|
|
||||||
$err .= t('Please use a shorter name.') . EOL;
|
|
||||||
if(mb_strlen($username) < 3)
|
|
||||||
$err .= t('Name too short.') . EOL;
|
|
||||||
|
|
||||||
// I don't really like having this rule, but it cuts down
|
|
||||||
// on the number of auto-registrations by Russian spammers
|
|
||||||
|
|
||||||
// Using preg_match was completely unreliable, due to mixed UTF-8 regex support
|
|
||||||
// $no_utf = get_config('system','no_utf');
|
|
||||||
// $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' );
|
|
||||||
|
|
||||||
// So now we are just looking for a space in the full name.
|
|
||||||
|
|
||||||
$loose_reg = get_config('system','no_regfullname');
|
|
||||||
if(! $loose_reg) {
|
|
||||||
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
|
|
||||||
if(! strpos($username,' '))
|
|
||||||
$err .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if(! allowed_email($email))
|
|
||||||
$err .= t('Your email domain is not among those allowed on this site.') . EOL;
|
|
||||||
|
|
||||||
if((! valid_email($email)) || (! validate_email($email)))
|
|
||||||
$err .= t('Not a valid email address.') . EOL;
|
|
||||||
|
|
||||||
// Disallow somebody creating an account using openid that uses the admin email address,
|
|
||||||
// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
|
|
||||||
|
|
||||||
if((x($a->config,'admin_email')) && (strcasecmp($email,$a->config['admin_email']) == 0) && strlen($openid_url)) {
|
|
||||||
$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
|
|
||||||
dbesc($email)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$err .= t('Cannot use that email.') . EOL;
|
|
||||||
}
|
|
||||||
|
|
||||||
$nickname = $_POST['nickname'] = strtolower($nickname);
|
|
||||||
|
|
||||||
if(! preg_match("/^[a-z][a-z0-9\-\_]*$/",$nickname))
|
|
||||||
$err .= t('Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.') . EOL;
|
|
||||||
$r = q("SELECT `uid` FROM `user`
|
|
||||||
WHERE `nickname` = '%s' LIMIT 1",
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$err .= t('Nickname is already registered. Please choose another.') . EOL;
|
|
||||||
|
|
||||||
// Check deleted accounts that had this nickname. Doesn't matter to us,
|
|
||||||
// but could be a security issue for federated platforms.
|
|
||||||
|
|
||||||
$r = q("SELECT * FROM `userd`
|
|
||||||
WHERE `username` = '%s' LIMIT 1",
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
if(count($r))
|
|
||||||
$err .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
|
|
||||||
|
|
||||||
if(strlen($err)) {
|
|
||||||
notice( $err );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$new_password = autoname(6) . mt_rand(100,9999);
|
|
||||||
$new_password_encoded = hash('whirlpool',$new_password);
|
|
||||||
|
|
||||||
$res=openssl_pkey_new(array(
|
|
||||||
'digest_alg' => 'sha1',
|
|
||||||
'private_key_bits' => 4096,
|
|
||||||
'encrypt_key' => false ));
|
|
||||||
|
|
||||||
// Get private key
|
|
||||||
|
|
||||||
if(empty($res)) {
|
|
||||||
notice( t('SERIOUS ERROR: Generation of security keys failed.') . EOL);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$prvkey = '';
|
|
||||||
|
|
||||||
openssl_pkey_export($res, $prvkey);
|
|
||||||
|
|
||||||
// Get public key
|
|
||||||
|
|
||||||
$pkey = openssl_pkey_get_details($res);
|
|
||||||
$pubkey = $pkey["key"];
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* Create another keypair for signing/verifying
|
|
||||||
* salmon protocol messages. We have to use a slightly
|
|
||||||
* less robust key because this won't be using openssl
|
|
||||||
* but the phpseclib. Since it is PHP interpreted code
|
|
||||||
* it is not nearly as efficient, and the larger keys
|
|
||||||
* will take several minutes each to process.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
$sres=openssl_pkey_new(array(
|
|
||||||
'digest_alg' => 'sha1',
|
|
||||||
'private_key_bits' => 512,
|
|
||||||
'encrypt_key' => false ));
|
|
||||||
|
|
||||||
// Get private key
|
|
||||||
|
|
||||||
$sprvkey = '';
|
|
||||||
|
|
||||||
openssl_pkey_export($sres, $sprvkey);
|
|
||||||
|
|
||||||
// Get public key
|
|
||||||
|
|
||||||
$spkey = openssl_pkey_get_details($sres);
|
|
||||||
$spubkey = $spkey["key"];
|
|
||||||
|
|
||||||
$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
|
|
||||||
`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
|
|
||||||
VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC' )",
|
|
||||||
dbesc(generate_user_guid()),
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($new_password_encoded),
|
|
||||||
dbesc($email),
|
|
||||||
dbesc($openid_url),
|
|
||||||
dbesc($nickname),
|
|
||||||
dbesc($pubkey),
|
|
||||||
dbesc($prvkey),
|
|
||||||
dbesc($spubkey),
|
|
||||||
dbesc($sprvkey),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
intval($verified),
|
|
||||||
intval($blocked)
|
|
||||||
);
|
|
||||||
|
|
||||||
if($r) {
|
|
||||||
$r = q("SELECT `uid` FROM `user`
|
|
||||||
WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($new_password_encoded)
|
|
||||||
);
|
|
||||||
if($r !== false && count($r))
|
|
||||||
$newuid = intval($r[0]['uid']);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
notice( t('An error occurred during registration. Please try again.') . EOL );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* if somebody clicked submit twice very quickly, they could end up with two accounts
|
|
||||||
* due to race condition. Remove this one.
|
|
||||||
*/
|
|
||||||
|
|
||||||
$r = q("SELECT `uid` FROM `user`
|
|
||||||
WHERE `nickname` = '%s' ",
|
|
||||||
dbesc($nickname)
|
|
||||||
);
|
|
||||||
if((count($r) > 1) && $newuid) {
|
|
||||||
$err .= t('Nickname is already registered. Please choose another.') . EOL;
|
|
||||||
q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
|
|
||||||
intval($newuid)
|
|
||||||
);
|
|
||||||
notice ($err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(x($newuid) !== false) {
|
|
||||||
$r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
|
|
||||||
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
|
|
||||||
intval($newuid),
|
|
||||||
'default',
|
|
||||||
1,
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
|
||||||
intval($publish),
|
|
||||||
intval($netpublish)
|
|
||||||
|
|
||||||
);
|
|
||||||
if($r === false) {
|
|
||||||
notice( t('An error occurred creating your default profile. Please try again.') . EOL );
|
|
||||||
// Start fresh next time.
|
|
||||||
$r = q("DELETE FROM `user` WHERE `uid` = %d",
|
|
||||||
intval($newuid));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
|
|
||||||
`request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
|
|
||||||
VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
|
|
||||||
intval($newuid),
|
|
||||||
datetime_convert(),
|
|
||||||
dbesc($username),
|
|
||||||
dbesc($nickname),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/profile/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
|
|
||||||
dbesc($a->get_baseurl() . "/profile/$nickname"),
|
|
||||||
dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
|
|
||||||
dbesc($a->get_baseurl() . "/poco/$nickname"),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert()),
|
|
||||||
dbesc(datetime_convert())
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// if we have no OpenID photo try to look up an avatar
|
|
||||||
if(! strlen($photo))
|
|
||||||
$photo = avatar_img($email);
|
|
||||||
|
|
||||||
// unless there is no avatar-plugin loaded
|
|
||||||
if(strlen($photo)) {
|
|
||||||
require_once('include/Photo.php');
|
|
||||||
$photo_failure = false;
|
|
||||||
|
|
||||||
$filename = basename($photo);
|
|
||||||
$img_str = fetch_url($photo,true);
|
|
||||||
$img = new Photo($img_str);
|
|
||||||
if($img->is_valid()) {
|
|
||||||
|
|
||||||
$img->scaleImageSquare(175);
|
|
||||||
|
|
||||||
$hash = photo_new_resource();
|
|
||||||
|
|
||||||
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
|
|
||||||
|
|
||||||
if($r === false)
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
$img->scaleImage(80);
|
|
||||||
|
|
||||||
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
|
|
||||||
|
|
||||||
if($r === false)
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
$img->scaleImage(48);
|
|
||||||
|
|
||||||
$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
|
|
||||||
|
|
||||||
if($r === false)
|
|
||||||
$photo_failure = true;
|
|
||||||
|
|
||||||
if(! $photo_failure) {
|
|
||||||
q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
|
|
||||||
dbesc($hash)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
|
if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
|
||||||
$url = $a->get_baseurl() . "/profile/$nickname";
|
$url = $a->get_baseurl() . '/profile/' . $user['nickname'];
|
||||||
proc_run('php',"include/directory.php","$url");
|
proc_run('php',"include/directory.php","$url");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$using_invites = get_config('system','invitation_only');
|
||||||
|
$num_invites = get_config('system','number_invites');
|
||||||
|
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
|
||||||
|
|
||||||
call_hooks('register_account', $newuid);
|
|
||||||
|
|
||||||
if( $a->config['register_policy'] == REGISTER_OPEN ) {
|
if( $a->config['register_policy'] == REGISTER_OPEN ) {
|
||||||
|
|
||||||
if($using_invites && $invite_id) {
|
if($using_invites && $invite_id) {
|
||||||
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
||||||
set_pconfig($newuid,'system','invites_remaining',$num_invites);
|
set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
|
||||||
}
|
}
|
||||||
|
|
||||||
$email_tpl = get_intltext_template("register_open_eml.tpl");
|
$email_tpl = get_intltext_template("register_open_eml.tpl");
|
||||||
$email_tpl = replace_macros($email_tpl, array(
|
$email_tpl = replace_macros($email_tpl, array(
|
||||||
'$sitename' => $a->config['sitename'],
|
'$sitename' => $a->config['sitename'],
|
||||||
'$siteurl' => $a->get_baseurl(),
|
'$siteurl' => $a->get_baseurl(),
|
||||||
'$username' => $username,
|
'$username' => $user['username'],
|
||||||
'$email' => $email,
|
'$email' => $user['email'],
|
||||||
'$password' => $new_password,
|
'$password' => $result['password'],
|
||||||
'$uid' => $newuid ));
|
'$uid' => $user['uid'] ));
|
||||||
|
|
||||||
$res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
|
$res = mail($user['email'], sprintf(t('Registration details for %s'), $a->config['sitename']),
|
||||||
$email_tpl,
|
$email_tpl,
|
||||||
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||||
|
|
@ -408,8 +110,8 @@ function register_post(&$a) {
|
||||||
$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
|
$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language` ) VALUES ( '%s', '%s', %d, '%s', '%s' ) ",
|
||||||
dbesc($hash),
|
dbesc($hash),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($newuid),
|
intval($user['uid']),
|
||||||
dbesc($new_password),
|
dbesc($result['password']),
|
||||||
dbesc($lang)
|
dbesc($lang)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -423,17 +125,17 @@ function register_post(&$a) {
|
||||||
|
|
||||||
if($using_invites && $invite_id) {
|
if($using_invites && $invite_id) {
|
||||||
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
||||||
set_pconfig($newuid,'system','invites_remaining',$num_invites);
|
set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
|
||||||
}
|
}
|
||||||
|
|
||||||
$email_tpl = get_intltext_template("register_verify_eml.tpl");
|
$email_tpl = get_intltext_template("register_verify_eml.tpl");
|
||||||
$email_tpl = replace_macros($email_tpl, array(
|
$email_tpl = replace_macros($email_tpl, array(
|
||||||
'$sitename' => $a->config['sitename'],
|
'$sitename' => $a->config['sitename'],
|
||||||
'$siteurl' => $a->get_baseurl(),
|
'$siteurl' => $a->get_baseurl(),
|
||||||
'$username' => $username,
|
'$username' => $user['username'],
|
||||||
'$email' => $email,
|
'$email' => $user['email'],
|
||||||
'$password' => $new_password,
|
'$password' => $result['password'],
|
||||||
'$uid' => $newuid,
|
'$uid' => $user['uid'],
|
||||||
'$hash' => $hash
|
'$hash' => $hash
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ function search_content(&$a) {
|
||||||
notice( t('Public access denied.') . EOL);
|
notice( t('Public access denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
nav_set_selected('search');
|
nav_set_selected('search');
|
||||||
|
|
||||||
require_once("include/bbcode.php");
|
require_once("include/bbcode.php");
|
||||||
|
|
@ -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,13 +96,29 @@ 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;
|
||||||
|
|
||||||
if($tag)
|
if (get_config('system','use_fulltext_engine')) {
|
||||||
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . preg_quote($search) . '\\['));
|
if($tag)
|
||||||
else
|
$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.dbesc(protect_sprintf($search)));
|
||||||
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(preg_quote($search)));
|
else
|
||||||
|
$sql_extra = sprintf(" AND MATCH (`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) ", dbesc(protect_sprintf($search)));
|
||||||
|
} else {
|
||||||
|
if($tag)
|
||||||
|
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
|
||||||
|
else
|
||||||
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -130,7 +146,7 @@ function search_content(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
|
||||||
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
|
||||||
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
|
||||||
`user`.`nickname`
|
`user`.`nickname`
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ function get_theme_config_file($theme){
|
||||||
}
|
}
|
||||||
|
|
||||||
function settings_init(&$a) {
|
function settings_init(&$a) {
|
||||||
|
|
||||||
// These lines provide the javascript needed by the acl selector
|
// These lines provide the javascript needed by the acl selector
|
||||||
|
|
||||||
$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
|
$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
|
||||||
|
|
@ -86,6 +87,7 @@ EOT;
|
||||||
$tabtpl = get_markup_template("generic_links_widget.tpl");
|
$tabtpl = get_markup_template("generic_links_widget.tpl");
|
||||||
$a->page['aside'] = replace_macros($tabtpl, array(
|
$a->page['aside'] = replace_macros($tabtpl, array(
|
||||||
'$title' => t('Settings'),
|
'$title' => t('Settings'),
|
||||||
|
'$class' => 'settings-widget',
|
||||||
'$items' => $tabs,
|
'$items' => $tabs,
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
@ -330,14 +332,14 @@ 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);
|
||||||
$expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
|
$expire_notes = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes']) : 0);
|
||||||
$expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
|
$expire_starred = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
|
||||||
$expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
|
$expire_photos = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos']) : 0);
|
||||||
|
$expire_network_only = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only']) : 0);
|
||||||
|
|
||||||
|
|
||||||
$allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
|
$allow_location = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
|
||||||
$publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
|
$publish = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
|
||||||
|
|
@ -355,7 +357,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'))
|
||||||
|
|
@ -434,6 +435,7 @@ function settings_post(&$a) {
|
||||||
set_pconfig(local_user(),'expire','notes', $expire_notes);
|
set_pconfig(local_user(),'expire','notes', $expire_notes);
|
||||||
set_pconfig(local_user(),'expire','starred', $expire_starred);
|
set_pconfig(local_user(),'expire','starred', $expire_starred);
|
||||||
set_pconfig(local_user(),'expire','photos', $expire_photos);
|
set_pconfig(local_user(),'expire','photos', $expire_photos);
|
||||||
|
set_pconfig(local_user(),'expire','network_only', $expire_network_only);
|
||||||
|
|
||||||
set_pconfig(local_user(),'system','suggestme', $suggestme);
|
set_pconfig(local_user(),'system','suggestme', $suggestme);
|
||||||
set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
|
set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
|
||||||
|
|
@ -441,7 +443,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 +472,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),
|
||||||
|
|
@ -797,6 +813,9 @@ function settings_content(&$a) {
|
||||||
$expire_photos = get_pconfig(local_user(), 'expire','photos');
|
$expire_photos = get_pconfig(local_user(), 'expire','photos');
|
||||||
$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
|
$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
|
||||||
|
|
||||||
|
$expire_network_only = get_pconfig(local_user(), 'expire','network_only');
|
||||||
|
$expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
|
||||||
|
|
||||||
|
|
||||||
$suggestme = get_pconfig(local_user(), 'system','suggestme');
|
$suggestme = get_pconfig(local_user(), 'system','suggestme');
|
||||||
$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
|
$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
|
||||||
|
|
@ -818,21 +837,27 @@ function settings_content(&$a) {
|
||||||
|
|
||||||
$pageset_tpl = get_markup_template('pagetypes.tpl');
|
$pageset_tpl = get_markup_template('pagetypes.tpl');
|
||||||
$pagetype = replace_macros($pageset_tpl,array(
|
$pagetype = replace_macros($pageset_tpl,array(
|
||||||
'$page_normal' => array('page-flags', t('Normal Account'), PAGE_NORMAL,
|
'$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
|
||||||
t('This account is a normal personal profile'),
|
t('This account is a normal personal profile'),
|
||||||
($a->user['page-flags'] == PAGE_NORMAL)),
|
($a->user['page-flags'] == PAGE_NORMAL)),
|
||||||
|
|
||||||
'$page_soapbox' => array('page-flags', t('Soapbox Account'), PAGE_SOAPBOX,
|
'$page_soapbox' => array('page-flags', t('Soapbox Page'), PAGE_SOAPBOX,
|
||||||
t('Automatically approve all connection/friend requests as read-only fans'),
|
t('Automatically approve all connection/friend requests as read-only fans'),
|
||||||
($a->user['page-flags'] == PAGE_SOAPBOX)),
|
($a->user['page-flags'] == PAGE_SOAPBOX)),
|
||||||
|
|
||||||
'$page_community' => array('page-flags', t('Community/Celebrity Account'), PAGE_COMMUNITY,
|
'$page_community' => array('page-flags', t('Community Forum/Celebrity Account'), PAGE_COMMUNITY,
|
||||||
t('Automatically approve all connection/friend requests as read-write fans'),
|
t('Automatically approve all connection/friend requests as read-write fans'),
|
||||||
($a->user['page-flags'] == PAGE_COMMUNITY)),
|
($a->user['page-flags'] == PAGE_COMMUNITY)),
|
||||||
|
|
||||||
'$page_freelove' => array('page-flags', t('Automatic Friend Account'), PAGE_FREELOVE,
|
'$page_freelove' => array('page-flags', t('Automatic Friend Page'), 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 [Experimental]'), PAGE_PRVGROUP,
|
||||||
|
t('Private forum - approved members only'),
|
||||||
|
($a->user['page-flags'] == PAGE_PRVGROUP)),
|
||||||
|
|
||||||
|
|
||||||
));
|
));
|
||||||
|
|
||||||
$noid = get_config('system','no_openid');
|
$noid = get_config('system','no_openid');
|
||||||
|
|
@ -932,8 +957,12 @@ function settings_content(&$a) {
|
||||||
'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
|
'notes' => array('expire_notes', t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
|
||||||
'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
|
'starred' => array('expire_starred', t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
|
||||||
'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'))),
|
||||||
|
'network_only' => array('expire_network_only', t("Only expire posts by others:"), $expire_network_only, '', 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 +970,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 +996,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,
|
||||||
|
|
@ -993,7 +1025,8 @@ function settings_content(&$a) {
|
||||||
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
|
'$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''),
|
||||||
|
|
||||||
|
|
||||||
'$h_advn' => t('Advanced Page Settings'),
|
'$h_advn' => t('Advanced Account/Page Type Settings'),
|
||||||
|
'$h_descadvn' => t('Change the behaviour of this account for special situations'),
|
||||||
'$pagetype' => $pagetype,
|
'$pagetype' => $pagetype,
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue