Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
280b72b9e6
40 changed files with 1920 additions and 953 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -9,6 +9,7 @@ favicon.*
|
||||||
home.html
|
home.html
|
||||||
addon
|
addon
|
||||||
*~
|
*~
|
||||||
|
robots.txt
|
||||||
|
|
||||||
#ignore documentation, it should be newly built
|
#ignore documentation, it should be newly built
|
||||||
doc/api
|
doc/api
|
||||||
|
|
|
||||||
31
boot.php
31
boot.php
|
|
@ -14,8 +14,7 @@ require_once('include/features.php');
|
||||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||||
define ( 'FRIENDICA_VERSION', '3.1.1618' );
|
define ( 'FRIENDICA_VERSION', '3.1.1618' );
|
||||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||||
define ( 'DB_UPDATE_VERSION', 1159 );
|
define ( 'DB_UPDATE_VERSION', 1162 );
|
||||||
|
|
||||||
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' );
|
||||||
|
|
||||||
|
|
@ -204,10 +203,12 @@ define ( 'NOTIFY_SYSTEM', 0x8000 );
|
||||||
|
|
||||||
define ( 'TERM_UNKNOWN', 0 );
|
define ( 'TERM_UNKNOWN', 0 );
|
||||||
define ( 'TERM_HASHTAG', 1 );
|
define ( 'TERM_HASHTAG', 1 );
|
||||||
define ( 'TERM_MENTION', 2 );
|
define ( 'TERM_MENTION', 2 );
|
||||||
define ( 'TERM_CATEGORY', 3 );
|
define ( 'TERM_CATEGORY', 3 );
|
||||||
define ( 'TERM_PCATEGORY', 4 );
|
define ( 'TERM_PCATEGORY', 4 );
|
||||||
define ( 'TERM_FILE', 5 );
|
define ( 'TERM_FILE', 5 );
|
||||||
|
define ( 'TERM_SAVEDSEARCH', 6 );
|
||||||
|
define ( 'TERM_CONVERSATION', 7 );
|
||||||
|
|
||||||
define ( 'TERM_OBJ_POST', 1 );
|
define ( 'TERM_OBJ_POST', 1 );
|
||||||
define ( 'TERM_OBJ_PHOTO', 2 );
|
define ( 'TERM_OBJ_PHOTO', 2 );
|
||||||
|
|
@ -355,7 +356,8 @@ if(! class_exists('App')) {
|
||||||
public $identities;
|
public $identities;
|
||||||
public $is_mobile;
|
public $is_mobile;
|
||||||
public $is_tablet;
|
public $is_tablet;
|
||||||
|
public $performance = array();
|
||||||
|
|
||||||
public $nav_sel;
|
public $nav_sel;
|
||||||
|
|
||||||
public $category;
|
public $category;
|
||||||
|
|
@ -403,7 +405,7 @@ if(! class_exists('App')) {
|
||||||
|
|
||||||
private $cached_profile_image;
|
private $cached_profile_image;
|
||||||
private $cached_profile_picdate;
|
private $cached_profile_picdate;
|
||||||
|
|
||||||
function __construct() {
|
function __construct() {
|
||||||
|
|
||||||
global $default_timezone, $argv, $argc;
|
global $default_timezone, $argv, $argc;
|
||||||
|
|
@ -412,6 +414,14 @@ if(! class_exists('App')) {
|
||||||
|
|
||||||
date_default_timezone_set($this->timezone);
|
date_default_timezone_set($this->timezone);
|
||||||
|
|
||||||
|
$this->performance["start"] = microtime(true);
|
||||||
|
$this->performance["database"] = 0;
|
||||||
|
$this->performance["network"] = 0;
|
||||||
|
$this->performance["rendering"] = 0;
|
||||||
|
$this->performance["parser"] = 0;
|
||||||
|
$this->performance["marktime"] = 0;
|
||||||
|
$this->performance["markstart"] = microtime(true);
|
||||||
|
|
||||||
$this->config = array();
|
$this->config = array();
|
||||||
$this->page = array();
|
$this->page = array();
|
||||||
$this->pager= array();
|
$this->pager= array();
|
||||||
|
|
@ -719,6 +729,17 @@ if(! class_exists('App')) {
|
||||||
return $this->rdelim[$engine];
|
return $this->rdelim[$engine];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function save_timestamp($stamp, $value) {
|
||||||
|
$duration = (float)(microtime(true)-$stamp);
|
||||||
|
|
||||||
|
$this->performance[$value] += (float)$duration;
|
||||||
|
$this->performance["marktime"] += (float)$duration;
|
||||||
|
}
|
||||||
|
|
||||||
|
function mark_timestamp($mark) {
|
||||||
|
//$this->performance["markstart"] -= microtime(true) - $this->performance["marktime"];
|
||||||
|
$this->performance["markstart"] = microtime(true) - $this->performance["markstart"] - $this->performance["marktime"];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
43
database.sql
43
database.sql
|
|
@ -560,6 +560,7 @@ CREATE TABLE IF NOT EXISTS `item` (
|
||||||
`deleted` tinyint(1) NOT NULL DEFAULT '0',
|
`deleted` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`origin` tinyint(1) NOT NULL DEFAULT '0',
|
`origin` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`forum_mode` tinyint(1) NOT NULL DEFAULT '0',
|
`forum_mode` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
|
`mention` tinyint(1) NOT NULL DEFAULT '0',
|
||||||
`last-child` tinyint(1) unsigned NOT NULL DEFAULT '1',
|
`last-child` tinyint(1) unsigned NOT NULL DEFAULT '1',
|
||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `uri` (`uri`),
|
KEY `uri` (`uri`),
|
||||||
|
|
@ -589,6 +590,8 @@ CREATE TABLE IF NOT EXISTS `item` (
|
||||||
KEY `uid_commented` (`uid`, `commented`),
|
KEY `uid_commented` (`uid`, `commented`),
|
||||||
KEY `uid_created` (`uid`, `created`),
|
KEY `uid_created` (`uid`, `created`),
|
||||||
KEY `uid_unseen` (`uid`, `unseen`),
|
KEY `uid_unseen` (`uid`, `unseen`),
|
||||||
|
KEY `mention` (`mention`),
|
||||||
|
KEY `resource-id` (`resource-id`),
|
||||||
KEY `event_id` (`event-id`),
|
KEY `event_id` (`event-id`),
|
||||||
FULLTEXT KEY `title` (`title`),
|
FULLTEXT KEY `title` (`title`),
|
||||||
FULLTEXT KEY `body` (`body`),
|
FULLTEXT KEY `body` (`body`),
|
||||||
|
|
@ -1030,18 +1033,22 @@ CREATE TABLE IF NOT EXISTS `spam` (
|
||||||
--
|
--
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `term` (
|
CREATE TABLE IF NOT EXISTS `term` (
|
||||||
`tid` INT UNSIGNED NOT NULL AUTO_INCREMENT,
|
`tid` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
`oid` INT UNSIGNED NOT NULL ,
|
`aid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
`otype` TINYINT( 3 ) UNSIGNED NOT NULL ,
|
`uid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
`type` TINYINT( 3 ) UNSIGNED NOT NULL ,
|
`oid` int(10) unsigned NOT NULL,
|
||||||
`term` CHAR( 255 ) NOT NULL ,
|
`otype` tinyint(3) unsigned NOT NULL,
|
||||||
`url` CHAR( 255 ) NOT NULL,
|
`type` tinyint(3) unsigned NOT NULL,
|
||||||
|
`term` char(255) NOT NULL,
|
||||||
|
`url` char(255) NOT NULL,
|
||||||
PRIMARY KEY (`tid`),
|
PRIMARY KEY (`tid`),
|
||||||
KEY `oid` ( `oid` ),
|
KEY `oid` (`oid`),
|
||||||
KEY `otype` ( `otype` ),
|
KEY `otype` (`otype`),
|
||||||
KEY `type` ( `type` ),
|
KEY `type` (`type`),
|
||||||
KEY `term` ( `term` )
|
KEY `term` (`term`),
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
KEY `uid` (`uid`),
|
||||||
|
KEY `aid` (`aid`)
|
||||||
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
||||||
|
|
@ -1133,3 +1140,17 @@ CREATE TABLE IF NOT EXISTS `userd` (
|
||||||
`username` char(255) NOT NULL,
|
`username` char(255) NOT NULL,
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||||
|
|
||||||
|
-- --------------------------------------------------------
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Table structure for table `tag`
|
||||||
|
--
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS `tag` (
|
||||||
|
`iid` int(11) NOT NULL,
|
||||||
|
`tag` char(255) NOT NULL,
|
||||||
|
`link` char(255) NOT NULL,
|
||||||
|
PRIMARY KEY (`iid`, `tag`),
|
||||||
|
KEY `tag` (`tag`)
|
||||||
|
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,7 @@ Friendica Documentation and Resources
|
||||||
**External Resources**
|
**External Resources**
|
||||||
|
|
||||||
* [Main Website](http://friendica.com)
|
* [Main Website](http://friendica.com)
|
||||||
* [Forums](http://groups.google.com/group/friendica)
|
* [Mailing List Archive](http://librelist.com/browser/friendica/)
|
||||||
* [Developer Forums](http://groups.google.com/group/friendica-dev)
|
|
||||||
|
|
||||||
**About**
|
**About**
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,7 @@ Friendica - Dokumentation und Ressourcen
|
||||||
**Externe Ressourcen**
|
**Externe Ressourcen**
|
||||||
|
|
||||||
* [Haupt-Webseite](http://friendica.com)
|
* [Haupt-Webseite](http://friendica.com)
|
||||||
* [Foren](http://groups.google.com/group/friendica)
|
* [Mailing Liste](http://librelist.com/browser/friendica/)
|
||||||
* [Entwickler-Foren](http://groups.google.com/group/friendica-dev)
|
|
||||||
* [Deutsches Friendica-Wiki](http://wiki.toktan.org/doku.php)
|
* [Deutsches Friendica-Wiki](http://wiki.toktan.org/doku.php)
|
||||||
|
|
||||||
**Über diese Seite**
|
**Über diese Seite**
|
||||||
|
|
|
||||||
|
|
@ -346,7 +346,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
$network = null;
|
$network = null;
|
||||||
$diaspora = false;
|
$diaspora = false;
|
||||||
$diaspora_base = '';
|
$diaspora_base = '';
|
||||||
$diaspora_guid = '';
|
$diaspora_guid = '';
|
||||||
$diaspora_key = '';
|
$diaspora_key = '';
|
||||||
$has_lrdd = false;
|
$has_lrdd = false;
|
||||||
$email_conversant = false;
|
$email_conversant = false;
|
||||||
|
|
@ -485,7 +485,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($mode == PROBE_NORMAL) {
|
if($mode == PROBE_NORMAL) {
|
||||||
if(strlen($zot)) {
|
if(strlen($zot)) {
|
||||||
|
|
@ -531,7 +531,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
}
|
}
|
||||||
if(strpos($url,'@'))
|
if(strpos($url,'@'))
|
||||||
$addr = str_replace('acct:', '', $url);
|
$addr = str_replace('acct:', '', $url);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
|
if($network !== NETWORK_ZOT && $network !== NETWORK_DFRN && $network !== NETWORK_MAIL) {
|
||||||
if($diaspora)
|
if($diaspora)
|
||||||
|
|
@ -544,13 +544,13 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
$vcard = scrape_vcard($hcard);
|
$vcard = scrape_vcard($hcard);
|
||||||
|
|
||||||
// Google doesn't use absolute url in profile photos
|
// Google doesn't use absolute url in profile photos
|
||||||
|
|
||||||
if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
|
if((x($vcard,'photo')) && substr($vcard['photo'],0,1) == '/') {
|
||||||
$h = @parse_url($hcard);
|
$h = @parse_url($hcard);
|
||||||
if($h)
|
if($h)
|
||||||
$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
|
$vcard['photo'] = $h['scheme'] . '://' . $h['host'] . $vcard['photo'];
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
|
logger('probe_url: scrape_vcard: ' . print_r($vcard,true), LOGGER_DATA);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -561,7 +561,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
|
||||||
$vcard['nick'] = $addr_parts[0];
|
$vcard['nick'] = $addr_parts[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
if($twitter) {
|
if($twitter) {
|
||||||
logger('twitter: setup');
|
logger('twitter: setup');
|
||||||
$tid = basename($url);
|
$tid = basename($url);
|
||||||
$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
|
$tapi = 'https://api.twitter.com/1/statuses/user_timeline.rss';
|
||||||
|
|
|
||||||
|
|
@ -521,13 +521,13 @@
|
||||||
$txt = $purifier->purify($txt);
|
$txt = $purifier->purify($txt);
|
||||||
}
|
}
|
||||||
$txt = html2bbcode($txt);
|
$txt = html2bbcode($txt);
|
||||||
|
|
||||||
$a->argv[1]=$user_info['screen_name']; //should be set to username?
|
$a->argv[1]=$user_info['screen_name']; //should be set to username?
|
||||||
|
|
||||||
$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
|
$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
|
||||||
require_once('mod/wall_upload.php');
|
require_once('mod/wall_upload.php');
|
||||||
$bebop = wall_upload_post($a);
|
$bebop = wall_upload_post($a);
|
||||||
|
|
||||||
//now that we have the img url in bbcode we can add it to the status and insert the wall item.
|
//now that we have the img url in bbcode we can add it to the status and insert the wall item.
|
||||||
$_REQUEST['body']=$txt."\n\n".$bebop;
|
$_REQUEST['body']=$txt."\n\n".$bebop;
|
||||||
require_once('mod/item.php');
|
require_once('mod/item.php');
|
||||||
|
|
@ -634,7 +634,7 @@
|
||||||
|
|
||||||
if (count($lastwall)>0){
|
if (count($lastwall)>0){
|
||||||
$lastwall = $lastwall[0];
|
$lastwall = $lastwall[0];
|
||||||
|
|
||||||
$in_reply_to_status_id = '';
|
$in_reply_to_status_id = '';
|
||||||
$in_reply_to_user_id = '';
|
$in_reply_to_user_id = '';
|
||||||
$in_reply_to_screen_name = '';
|
$in_reply_to_screen_name = '';
|
||||||
|
|
@ -642,9 +642,9 @@
|
||||||
$in_reply_to_status_id=$lastwall['parent'];
|
$in_reply_to_status_id=$lastwall['parent'];
|
||||||
$in_reply_to_user_id = $lastwall['reply_uid'];
|
$in_reply_to_user_id = $lastwall['reply_uid'];
|
||||||
$in_reply_to_screen_name = $lastwall['reply_author'];
|
$in_reply_to_screen_name = $lastwall['reply_author'];
|
||||||
}
|
}
|
||||||
$status_info = array(
|
$status_info = array(
|
||||||
'text' => html2plain(bbcode($lastwall['body']), 0),
|
'text' => html2plain(bbcode($lastwall['body'], false, false, true), 0),
|
||||||
'truncated' => false,
|
'truncated' => false,
|
||||||
'created_at' => api_date($lastwall['created']),
|
'created_at' => api_date($lastwall['created']),
|
||||||
'in_reply_to_status_id' => $in_reply_to_status_id,
|
'in_reply_to_status_id' => $in_reply_to_status_id,
|
||||||
|
|
@ -699,11 +699,11 @@
|
||||||
$in_reply_to_status_id=$lastwall['parent'];
|
$in_reply_to_status_id=$lastwall['parent'];
|
||||||
$in_reply_to_user_id = $lastwall['reply_uid'];
|
$in_reply_to_user_id = $lastwall['reply_uid'];
|
||||||
$in_reply_to_screen_name = $lastwall['reply_author'];
|
$in_reply_to_screen_name = $lastwall['reply_author'];
|
||||||
}
|
}
|
||||||
$user_info['status'] = array(
|
$user_info['status'] = array(
|
||||||
'created_at' => api_date($lastwall['created']),
|
'created_at' => api_date($lastwall['created']),
|
||||||
'id' => $lastwall['contact-id'],
|
'id' => $lastwall['contact-id'],
|
||||||
'text' => html2plain(bbcode($lastwall['body']), 0),
|
'text' => html2plain(bbcode($lastwall['body'], false, false, true), 0),
|
||||||
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
|
'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'),
|
||||||
'truncated' => false,
|
'truncated' => false,
|
||||||
'in_reply_to_status_id' => $in_reply_to_status_id,
|
'in_reply_to_status_id' => $in_reply_to_status_id,
|
||||||
|
|
@ -1042,21 +1042,27 @@
|
||||||
|
|
||||||
$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(array('www.','.'),array('','\\.'),$myurl);
|
||||||
|
$myurl = str_replace('www.','',$myurl);
|
||||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||||
|
|
||||||
if (get_config('system','use_fulltext_engine'))
|
/* if (get_config('system','use_fulltext_engine'))
|
||||||
$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))) ",
|
$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($myurl)),
|
dbesc(protect_sprintf($myurl)),
|
||||||
dbesc(protect_sprintf($diasp_url))
|
dbesc(protect_sprintf($diasp_url))
|
||||||
);
|
);
|
||||||
else
|
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' )) ",
|
$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('%' . $myurl . ']%')),
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
);
|
);
|
||||||
|
*/
|
||||||
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)",
|
||||||
|
dbesc(protect_sprintf($myurl)),
|
||||||
|
dbesc(protect_sprintf($myurl))
|
||||||
|
);
|
||||||
|
|
||||||
if ($max_id > 0)
|
if ($max_id > 0)
|
||||||
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
|
$sql_extra .= ' AND `item`.`id` <= '.intval($max_id);
|
||||||
|
|
@ -1299,11 +1305,11 @@
|
||||||
$ret['text'] = bbcode($item['body']);
|
$ret['text'] = bbcode($item['body']);
|
||||||
}
|
}
|
||||||
elseif ($_GET["getText"] == "plain") {
|
elseif ($_GET["getText"] == "plain") {
|
||||||
$ret['text'] = html2plain(bbcode($item['body']), 0);
|
$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$ret['text'] = $item['title']."\n".html2plain(bbcode($item['body']), 0);
|
$ret['text'] = $item['title']."\n".html2plain(bbcode($item['body'], false, false, true), 0);
|
||||||
}
|
}
|
||||||
if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") {
|
if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") {
|
||||||
unset($ret['sender']);
|
unset($ret['sender']);
|
||||||
|
|
@ -1347,7 +1353,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Workaround for ostatus messages where the title is identically to the body
|
// Workaround for ostatus messages where the title is identically to the body
|
||||||
$statusbody = trim(html2plain(bbcode($item['body']), 0));
|
$statusbody = trim(html2plain(bbcode($item['body'], false, false, true), 0));
|
||||||
$statustitle = trim($item['title']);
|
$statustitle = trim($item['title']);
|
||||||
|
|
||||||
if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
|
if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
|
||||||
|
|
|
||||||
|
|
@ -278,10 +278,39 @@ function bb_ShareAttributes($match) {
|
||||||
return($text);
|
return($text);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function bb_ShareAttributesSimple($match) {
|
||||||
|
|
||||||
|
$attributes = $match[1];
|
||||||
|
|
||||||
|
$author = "";
|
||||||
|
preg_match("/author='(.*?)'/ism", $attributes, $matches);
|
||||||
|
if ($matches[1] != "")
|
||||||
|
$author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
|
||||||
|
|
||||||
|
preg_match('/author="(.*?)"/ism', $attributes, $matches);
|
||||||
|
if ($matches[1] != "")
|
||||||
|
$author = $matches[1];
|
||||||
|
|
||||||
|
$profile = "";
|
||||||
|
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
|
||||||
|
if ($matches[1] != "")
|
||||||
|
$profile = $matches[1];
|
||||||
|
|
||||||
|
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
|
||||||
|
if ($matches[1] != "")
|
||||||
|
$profile = $matches[1];
|
||||||
|
|
||||||
|
$text = "<br />".html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8').' <a href="'.$profile.'">'.$author."</a>: <br />»".$match[2]."«";
|
||||||
|
|
||||||
|
return($text);
|
||||||
|
}
|
||||||
|
|
||||||
// BBcode 2 HTML was written by WAY2WEB.net
|
// BBcode 2 HTML was written by WAY2WEB.net
|
||||||
// extended to work with Mistpark/Friendica - Mike Macgirvin
|
// extended to work with Mistpark/Friendica - Mike Macgirvin
|
||||||
|
|
||||||
function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = false) {
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
|
|
@ -340,13 +369,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
$Text = str_replace("\r\n","\n", $Text);
|
$Text = str_replace("\r\n","\n", $Text);
|
||||||
|
|
||||||
// removing multiplicated newlines
|
// removing multiplicated newlines
|
||||||
// $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]");
|
if (get_config("system", "remove_multiplicated_lines")) {
|
||||||
// $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
|
$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]");
|
||||||
// do {
|
$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]");
|
||||||
// $oldtext = $Text;
|
do {
|
||||||
// $Text = str_replace($search, $replace, $Text);
|
$oldtext = $Text;
|
||||||
// } while ($oldtext != $Text);
|
$Text = str_replace($search, $replace, $Text);
|
||||||
|
} while ($oldtext != $Text);
|
||||||
|
}
|
||||||
|
|
||||||
$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
|
$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
|
||||||
|
|
||||||
|
|
@ -515,7 +545,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
|
$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
|
||||||
|
|
||||||
// Shared content
|
// Shared content
|
||||||
$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
|
if (!$simplehtml)
|
||||||
|
$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text);
|
||||||
|
else
|
||||||
|
$Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributesSimple",$Text);
|
||||||
|
|
||||||
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
|
$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
|
||||||
$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
|
$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
|
||||||
|
|
@ -617,7 +650,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
|
|
||||||
// Clean up the HTML by loading and saving the HTML with the DOM
|
// Clean up the HTML by loading and saving the HTML with the DOM
|
||||||
// Only do it when it has to be done - for performance reasons
|
// Only do it when it has to be done - for performance reasons
|
||||||
if (!$tryoembed) {
|
// Update: Now it is done every time - since bad structured html can break a whole page
|
||||||
|
//if (!$tryoembed) {
|
||||||
$doc = new DOMDocument();
|
$doc = new DOMDocument();
|
||||||
$doc->preserveWhiteSpace = false;
|
$doc->preserveWhiteSpace = false;
|
||||||
|
|
||||||
|
|
@ -632,10 +666,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
|
||||||
$Text = str_replace('<br></li>','</li>', $Text);
|
$Text = str_replace('<br></li>','</li>', $Text);
|
||||||
|
|
||||||
$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
|
$Text = mb_convert_encoding($Text, "UTF-8", 'HTML-ENTITIES');
|
||||||
}
|
//}
|
||||||
|
|
||||||
call_hooks('bbcode',$Text);
|
call_hooks('bbcode',$Text);
|
||||||
|
|
||||||
|
$a->save_timestamp($stamp1, "parser");
|
||||||
|
|
||||||
return $Text;
|
return $Text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -369,7 +369,6 @@ function visible_activity($item) {
|
||||||
if(!function_exists('conversation')) {
|
if(!function_exists('conversation')) {
|
||||||
function conversation(&$a, $items, $mode, $update, $preview = false) {
|
function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
|
|
||||||
|
|
||||||
require_once('include/bbcode.php');
|
require_once('include/bbcode.php');
|
||||||
|
|
||||||
$ssl_state = ((local_user()) ? true : false);
|
$ssl_state = ((local_user()) ? true : false);
|
||||||
|
|
@ -524,7 +523,26 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$tags=array();
|
$tags=array();
|
||||||
$hashtags = array();
|
$hashtags = array();
|
||||||
$mentions = array();
|
$mentions = array();
|
||||||
foreach(explode(',',$item['tag']) as $tag){
|
|
||||||
|
$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
|
||||||
|
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
|
||||||
|
|
||||||
|
foreach($taglist as $tag) {
|
||||||
|
|
||||||
|
if ($tag["url"] == "")
|
||||||
|
$tag["url"] = $searchpath.strtolower($tag["term"]);
|
||||||
|
|
||||||
|
if ($tag["type"] == TERM_HASHTAG) {
|
||||||
|
$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
|
||||||
|
$prefix = "#";
|
||||||
|
} elseif ($tag["type"] == TERM_MENTION) {
|
||||||
|
$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
|
||||||
|
$prefix = "@";
|
||||||
|
}
|
||||||
|
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
|
||||||
|
}
|
||||||
|
|
||||||
|
/*foreach(explode(',',$item['tag']) as $tag){
|
||||||
$tag = trim($tag);
|
$tag = trim($tag);
|
||||||
if ($tag!="") {
|
if ($tag!="") {
|
||||||
$t = bbcode($tag);
|
$t = bbcode($tag);
|
||||||
|
|
@ -534,7 +552,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
elseif($t[0] == '@')
|
elseif($t[0] == '@')
|
||||||
$mentions[] = $t;
|
$mentions[] = $t;
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
$sp = false;
|
$sp = false;
|
||||||
$profile_link = best_link_url($item,$sp);
|
$profile_link = best_link_url($item,$sp);
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,9 @@ class dba {
|
||||||
public $error = false;
|
public $error = false;
|
||||||
|
|
||||||
function __construct($server,$user,$pass,$db,$install = false) {
|
function __construct($server,$user,$pass,$db,$install = false) {
|
||||||
|
global $a;
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$server = trim($server);
|
$server = trim($server);
|
||||||
$user = trim($user);
|
$user = trim($user);
|
||||||
|
|
@ -64,6 +67,8 @@ class dba {
|
||||||
if(! $install)
|
if(! $install)
|
||||||
system_unavailable();
|
system_unavailable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$a->save_timestamp($stamp1, "network");
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getdb() {
|
public function getdb() {
|
||||||
|
|
@ -78,18 +83,19 @@ class dba {
|
||||||
|
|
||||||
$this->error = '';
|
$this->error = '';
|
||||||
|
|
||||||
if(x($a->config,'system') && x($a->config['system'],'db_log'))
|
$stamp1 = microtime(true);
|
||||||
$stamp1 = microtime(true);
|
|
||||||
|
|
||||||
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);
|
||||||
|
|
||||||
|
$stamp2 = microtime(true);
|
||||||
|
$duration = (float)($stamp2-$stamp1);
|
||||||
|
|
||||||
if(x($a->config,'system') && x($a->config['system'],'db_log')) {
|
if(x($a->config,'system') && x($a->config['system'],'db_log')) {
|
||||||
$stamp2 = microtime(true);
|
if (($duration > $a->config["system"]["db_loglimit"])) {
|
||||||
$duration = round($stamp2-$stamp1, 3);
|
$duration = round($duration, 3);
|
||||||
if ($duration > $a->config["system"]["db_loglimit"]) {
|
|
||||||
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
|
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
|
||||||
@file_put_contents($a->config["system"]["db_log"], $duration."\t".
|
@file_put_contents($a->config["system"]["db_log"], $duration."\t".
|
||||||
basename($backtrace[1]["file"])."\t".
|
basename($backtrace[1]["file"])."\t".
|
||||||
|
|
@ -162,6 +168,7 @@ class dba {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$a->save_timestamp($stamp1, "database");
|
||||||
|
|
||||||
if($this->debug)
|
if($this->debug)
|
||||||
logger('dba: ' . printable(print_r($r, true)));
|
logger('dba: ' . printable(print_r($r, true)));
|
||||||
|
|
|
||||||
|
|
@ -559,7 +559,7 @@ function diaspora_decode($importer,$xml) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function diaspora_request($importer,$xml) {
|
function diaspora_request($importer,$xml) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
@ -569,7 +569,7 @@ function diaspora_request($importer,$xml) {
|
||||||
|
|
||||||
if(! $sender_handle || ! $recipient_handle)
|
if(! $sender_handle || ! $recipient_handle)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
$contact = diaspora_get_contact_by_handle($importer['uid'],$sender_handle);
|
$contact = diaspora_get_contact_by_handle($importer['uid'],$sender_handle);
|
||||||
|
|
||||||
if($contact) {
|
if($contact) {
|
||||||
|
|
@ -754,6 +754,20 @@ function diaspora_request($importer,$xml) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function diaspora_post_allow($importer,$contact) {
|
function diaspora_post_allow($importer,$contact) {
|
||||||
|
|
||||||
|
// perhaps we were already sharing with this person. Now they're sharing with us.
|
||||||
|
// That makes us friends.
|
||||||
|
// Normally this should have handled by getting a request - but this could get lost
|
||||||
|
if($contact['rel'] == CONTACT_IS_FOLLOWER && $importer['page-flags'] != PAGE_COMMUNITY) {
|
||||||
|
q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||||
|
intval(CONTACT_IS_FRIEND),
|
||||||
|
intval($contact['id']),
|
||||||
|
intval($importer['uid'])
|
||||||
|
);
|
||||||
|
$contact['rel'] = CONTACT_IS_FRIEND;
|
||||||
|
logger('diaspora_post_allow: defining user '.$contact["nick"].' as friend');
|
||||||
|
}
|
||||||
|
|
||||||
if(($contact['blocked']) || ($contact['readonly']) || ($contact['archive']))
|
if(($contact['blocked']) || ($contact['readonly']) || ($contact['archive']))
|
||||||
return false;
|
return false;
|
||||||
if($contact['rel'] == CONTACT_IS_SHARING || $contact['rel'] == CONTACT_IS_FRIEND)
|
if($contact['rel'] == CONTACT_IS_SHARING || $contact['rel'] == CONTACT_IS_FRIEND)
|
||||||
|
|
|
||||||
|
|
@ -48,9 +48,9 @@ function new_contact($uid,$url,$interactive = false) {
|
||||||
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
|
||||||
else
|
else
|
||||||
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
|
||||||
|
|
||||||
goaway($ret['request'] . "&addr=$myaddr");
|
goaway($ret['request'] . "&addr=$myaddr");
|
||||||
|
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -61,7 +61,7 @@ function new_contact($uid,$url,$interactive = false) {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,10 @@ require_once('include/oembed.php');
|
||||||
require_once('include/salmon.php');
|
require_once('include/salmon.php');
|
||||||
require_once('include/crypto.php');
|
require_once('include/crypto.php');
|
||||||
require_once('include/Photo.php');
|
require_once('include/Photo.php');
|
||||||
|
require_once('include/tags.php');
|
||||||
|
require_once('include/text.php');
|
||||||
require_once('include/email.php');
|
require_once('include/email.php');
|
||||||
|
require_once('include/ostatus_conversation.php');
|
||||||
|
|
||||||
function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
|
function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
|
||||||
|
|
||||||
|
|
@ -26,7 +29,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// default permissions - anonymous user
|
// default permissions - anonymous user
|
||||||
|
|
||||||
|
|
@ -238,7 +241,7 @@ function construct_activity_object($item) {
|
||||||
$r->link = str_replace('&','&', $r->link);
|
$r->link = str_replace('&','&', $r->link);
|
||||||
$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
|
$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
|
||||||
$o .= $r->link;
|
$o .= $r->link;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
|
$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
|
||||||
}
|
}
|
||||||
|
|
@ -270,7 +273,7 @@ function construct_activity_target($item) {
|
||||||
$r->link = str_replace('&','&', $r->link);
|
$r->link = str_replace('&','&', $r->link);
|
||||||
$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
|
$r->link = preg_replace('/\<link(.*?)\"\>/','<link$1"/>',$r->link);
|
||||||
$o .= $r->link;
|
$o .= $r->link;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
|
$o .= '<link rel="alternate" type="text/html" href="' . xmlify($r->link) . '" />' . "\r\n";
|
||||||
}
|
}
|
||||||
|
|
@ -670,7 +673,7 @@ function get_atom_elements($feed,$item) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// translate OStatus unfollow to activity streams if it happened to get selected
|
// translate OStatus unfollow to activity streams if it happened to get selected
|
||||||
|
|
||||||
if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
|
if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
|
||||||
$res['verb'] = ACTIVITY_UNFOLLOW;
|
$res['verb'] = ACTIVITY_UNFOLLOW;
|
||||||
|
|
||||||
|
|
@ -721,7 +724,7 @@ function get_atom_elements($feed,$item) {
|
||||||
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
|
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
|
||||||
$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
|
$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
|
||||||
$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
|
$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
|
||||||
}
|
}
|
||||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
|
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
|
||||||
$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
|
$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
|
||||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
|
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
|
||||||
|
|
@ -759,7 +762,7 @@ function get_atom_elements($feed,$item) {
|
||||||
$child = $rawobj[0]['child'];
|
$child = $rawobj[0]['child'];
|
||||||
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
|
if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
|
||||||
$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
|
$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
|
||||||
}
|
}
|
||||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
|
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
|
||||||
$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
|
$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
|
||||||
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
|
if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
|
||||||
|
|
@ -829,15 +832,30 @@ function get_atom_elements($feed,$item) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Search for ostatus conversation url
|
||||||
|
$links = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["entry"][0]["child"]["http://www.w3.org/2005/Atom"]["link"];
|
||||||
|
|
||||||
|
if (is_array($links)) {
|
||||||
|
foreach ($links as $link) {
|
||||||
|
$conversation = array_shift($link["attribs"]);
|
||||||
|
|
||||||
|
if ($conversation["rel"] == "ostatus:conversation") {
|
||||||
|
$res["ostatus_conversation"] = $conversation["href"];
|
||||||
|
logger('get_atom_elements: found conversation url '.$res["ostatus_conversation"]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
$arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
|
$arr = array('feed' => $feed, 'item' => $item, 'result' => $res);
|
||||||
|
|
||||||
call_hooks('parse_atom', $arr);
|
call_hooks('parse_atom', $arr);
|
||||||
|
|
||||||
//if (($res["title"] != "") or (strpos($res["body"], "RT @") > 0)) {
|
//if (($res["title"] != "") or (strpos($res["body"], "RT @") > 0)) {
|
||||||
//if (strpos($res["body"], "RT @") !== false) {
|
//if (strpos($res["body"], "RT @") !== false) {
|
||||||
// $debugfile = tempnam("/home/ike/log", "item-res2-");
|
/*if (strpos($res["body"], "@") !== false) {
|
||||||
// file_put_contents($debugfile, serialize($arr));
|
$debugfile = tempnam("/var/www/virtual/pirati.ca/phptmp/", "item-res2-");
|
||||||
//}
|
file_put_contents($debugfile, serialize($arr));
|
||||||
|
}*/
|
||||||
|
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
@ -876,13 +894,22 @@ function item_store($arr,$force_parent = false) {
|
||||||
unset($arr['dsprsig']);
|
unset($arr['dsprsig']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if an OStatus conversation url was passed in, it is stored and then
|
||||||
|
// removed from the array.
|
||||||
|
$ostatus_conversation = null;
|
||||||
|
|
||||||
|
if (isset($arr["ostatus_conversation"])) {
|
||||||
|
$ostatus_conversation = $arr["ostatus_conversation"];
|
||||||
|
unset($arr["ostatus_conversation"]);
|
||||||
|
}
|
||||||
|
|
||||||
if(x($arr, 'gravity'))
|
if(x($arr, 'gravity'))
|
||||||
$arr['gravity'] = intval($arr['gravity']);
|
$arr['gravity'] = intval($arr['gravity']);
|
||||||
elseif($arr['parent-uri'] === $arr['uri'])
|
elseif($arr['parent-uri'] === $arr['uri'])
|
||||||
$arr['gravity'] = 0;
|
$arr['gravity'] = 0;
|
||||||
elseif(activity_match($arr['verb'],ACTIVITY_POST))
|
elseif(activity_match($arr['verb'],ACTIVITY_POST))
|
||||||
$arr['gravity'] = 6;
|
$arr['gravity'] = 6;
|
||||||
else
|
else
|
||||||
$arr['gravity'] = 6; // extensible catchall
|
$arr['gravity'] = 6; // extensible catchall
|
||||||
|
|
||||||
if(! x($arr,'type'))
|
if(! x($arr,'type'))
|
||||||
|
|
@ -898,8 +925,23 @@ function item_store($arr,$force_parent = false) {
|
||||||
require_once('library/langdet/Text/LanguageDetect.php');
|
require_once('library/langdet/Text/LanguageDetect.php');
|
||||||
$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
|
$naked_body = preg_replace('/\[(.+?)\]/','',$arr['body']);
|
||||||
$l = new Text_LanguageDetect;
|
$l = new Text_LanguageDetect;
|
||||||
$lng = $l->detectConfidence($naked_body);
|
//$lng = $l->detectConfidence($naked_body);
|
||||||
$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
|
//$arr['postopts'] = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
|
||||||
|
$lng = $l->detect($naked_body, 3);
|
||||||
|
|
||||||
|
if (sizeof($lng) > 0) {
|
||||||
|
$postopts = "";
|
||||||
|
|
||||||
|
foreach ($lng as $language => $score) {
|
||||||
|
if ($postopts == "")
|
||||||
|
$postopts = "lang=";
|
||||||
|
else
|
||||||
|
$postopts .= ":";
|
||||||
|
|
||||||
|
$postopts .= $language.";".$score;
|
||||||
|
}
|
||||||
|
$arr['postopts'] = $postopts;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0);
|
$arr['wall'] = ((x($arr,'wall')) ? intval($arr['wall']) : 0);
|
||||||
|
|
@ -952,9 +994,9 @@ function item_store($arr,$force_parent = false) {
|
||||||
$deny_cid = $arr['deny_cid'];
|
$deny_cid = $arr['deny_cid'];
|
||||||
$deny_gid = $arr['deny_gid'];
|
$deny_gid = $arr['deny_gid'];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
// find the parent and snarf the item id and ACL's
|
// find the parent and snarf the item id and ACLs
|
||||||
// and anything else we need to inherit
|
// and anything else we need to inherit
|
||||||
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
|
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d ORDER BY `id` ASC LIMIT 1",
|
||||||
|
|
@ -1017,7 +1059,7 @@ function item_store($arr,$force_parent = false) {
|
||||||
logger('item_store: item parent was not found - ignoring item');
|
logger('item_store: item parent was not found - ignoring item');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
$parent_deleted = 0;
|
$parent_deleted = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1058,8 +1100,8 @@ function item_store($arr,$force_parent = false) {
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$current_post = $r[0]['id'];
|
$current_post = $r[0]['id'];
|
||||||
logger('item_store: created item ' . $current_post);
|
logger('item_store: created item ' . $current_post);
|
||||||
}
|
create_tags_from_item($r[0]['id']);
|
||||||
else {
|
} else {
|
||||||
logger('item_store: could not locate created item');
|
logger('item_store: could not locate created item');
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -1072,7 +1114,7 @@ function item_store($arr,$force_parent = false) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
|
if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))
|
||||||
$parent_id = $current_post;
|
$parent_id = $current_post;
|
||||||
|
|
||||||
if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
|
if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
|
||||||
|
|
@ -1093,6 +1135,11 @@ function item_store($arr,$force_parent = false) {
|
||||||
intval($parent_deleted),
|
intval($parent_deleted),
|
||||||
intval($current_post)
|
intval($current_post)
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($current_post);
|
||||||
|
|
||||||
|
// Complete ostatus threads
|
||||||
|
if ($ostatus_conversation)
|
||||||
|
complete_conversation($current_post, $ostatus_conversation);
|
||||||
|
|
||||||
$arr['id'] = $current_post;
|
$arr['id'] = $current_post;
|
||||||
$arr['parent'] = $parent_id;
|
$arr['parent'] = $parent_id;
|
||||||
|
|
@ -1136,6 +1183,18 @@ function item_store($arr,$force_parent = false) {
|
||||||
|
|
||||||
tag_deliver($arr['uid'],$current_post);
|
tag_deliver($arr['uid'],$current_post);
|
||||||
|
|
||||||
|
// Store the fresh generated item into the cache
|
||||||
|
$cachefile = get_cachefile($arr["guid"]."-".hash("md5", $arr['body']));
|
||||||
|
|
||||||
|
if (($cachefile != '') AND !file_exists($cachefile)) {
|
||||||
|
$s = prepare_text($arr['body']);
|
||||||
|
$a = get_app();
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
file_put_contents($cachefile, $s);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
logger('item_store: put item '.$current_post.' into cachefile '.$cachefile);
|
||||||
|
}
|
||||||
|
|
||||||
return $current_post;
|
return $current_post;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1272,7 +1331,7 @@ function tag_deliver($uid,$item_id) {
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
proc_run('php','include/notifier.php','tgroup',$item_id);
|
proc_run('php','include/notifier.php','tgroup',$item_id);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1343,7 +1402,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
if($contact['duplex'] && $contact['dfrn-id'])
|
if($contact['duplex'] && $contact['dfrn-id'])
|
||||||
$idtosend = '0:' . $orig_id;
|
$idtosend = '0:' . $orig_id;
|
||||||
if($contact['duplex'] && $contact['issued-id'])
|
if($contact['duplex'] && $contact['issued-id'])
|
||||||
$idtosend = '1:' . $orig_id;
|
$idtosend = '1:' . $orig_id;
|
||||||
|
|
||||||
$rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
|
$rino = ((function_exists('mcrypt_encrypt')) ? 1 : 0);
|
||||||
|
|
||||||
|
|
@ -1361,7 +1420,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
break;
|
break;
|
||||||
case SSL_POLICY_SELFSIGN:
|
case SSL_POLICY_SELFSIGN:
|
||||||
$ssl_policy = 'self';
|
$ssl_policy = 'self';
|
||||||
break;
|
break;
|
||||||
case SSL_POLICY_NONE:
|
case SSL_POLICY_NONE:
|
||||||
default:
|
default:
|
||||||
$ssl_policy = 'none';
|
$ssl_policy = 'none';
|
||||||
|
|
@ -1414,7 +1473,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
||||||
intval(($perm == 'rw') ? 1 : 0),
|
intval(($perm == 'rw') ? 1 : 0),
|
||||||
intval($contact['id'])
|
intval($contact['id'])
|
||||||
);
|
);
|
||||||
$contact['writable'] = (string) 1 - intval($contact['writable']);
|
$contact['writable'] = (string) 1 - intval($contact['writable']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1558,7 +1617,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
logger('consume_feed: empty input');
|
logger('consume_feed: empty input');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$feed = new SimplePie();
|
$feed = new SimplePie();
|
||||||
$feed->set_raw_data($xml);
|
$feed->set_raw_data($xml);
|
||||||
if($datedir)
|
if($datedir)
|
||||||
|
|
@ -1594,7 +1653,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
|
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
|
||||||
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
|
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
|
||||||
$new_name = $elems['name'][0]['data'];
|
$new_name = $elems['name'][0]['data'];
|
||||||
}
|
}
|
||||||
if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
|
if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
|
||||||
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
|
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
|
||||||
$photo_url = $elems['link'][0]['attribs']['']['href'];
|
$photo_url = $elems['link'][0]['attribs']['']['href'];
|
||||||
|
|
@ -1637,12 +1696,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
intval($contact['uid'])
|
intval($contact['uid'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$img->scaleImageSquare(175);
|
$img->scaleImageSquare(175);
|
||||||
|
|
||||||
$hash = $resource_id;
|
$hash = $resource_id;
|
||||||
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 4);
|
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 4);
|
||||||
|
|
||||||
$img->scaleImage(80);
|
$img->scaleImage(80);
|
||||||
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 5);
|
$r = $img->store($contact['uid'], $contact['id'], $hash, basename($photo_url), 'Contact Photos', 5);
|
||||||
|
|
||||||
|
|
@ -1651,7 +1710,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
||||||
WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
|
dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
|
||||||
|
|
@ -1701,7 +1760,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
* to contain a sparkle link and perhaps a photo.
|
* to contain a sparkle link and perhaps a photo.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
|
$bdtext = sprintf( t('%s\'s birthday'), $contact['name']);
|
||||||
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ) ;
|
$bdtext2 = sprintf( t('Happy Birthday %s'), ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' ) ;
|
||||||
|
|
||||||
|
|
@ -1718,7 +1777,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($bdtext2),
|
dbesc($bdtext2),
|
||||||
dbesc('birthday')
|
dbesc('birthday')
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
// update bdyear
|
// update bdyear
|
||||||
|
|
||||||
|
|
@ -1810,6 +1869,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc(implode(',',$newtags)),
|
dbesc(implode(',',$newtags)),
|
||||||
intval($i[0]['id'])
|
intval($i[0]['id'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($i[0]['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1824,6 +1884,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($item['uri']),
|
dbesc($item['uri']),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item['uri'], $importer['uid']);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
|
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
|
||||||
|
|
@ -1834,6 +1895,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($uri),
|
dbesc($uri),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($uri, $importer['uid']);
|
||||||
if($item['last-child']) {
|
if($item['last-child']) {
|
||||||
// ensure that last-child is set in case the comment that had it just got wiped.
|
// ensure that last-child is set in case the comment that had it just got wiped.
|
||||||
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
||||||
|
|
@ -1947,6 +2009,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($item_id),
|
dbesc($item_id),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item_id, $importer['uid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// update last-child if it changes
|
// update last-child if it changes
|
||||||
|
|
@ -1988,7 +2051,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($parent_uri)
|
dbesc($parent_uri)
|
||||||
);
|
);
|
||||||
if($r && count($r))
|
if($r && count($r))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
||||||
|
|
@ -2011,6 +2074,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
|
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag),
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($r[0]['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2094,6 +2158,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
dbesc($item_id),
|
dbesc($item_id),
|
||||||
intval($importer['uid'])
|
intval($importer['uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item_id, $importer['uid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// update last-child if it changes
|
// update last-child if it changes
|
||||||
|
|
@ -2231,7 +2296,7 @@ function local_delivery($importer,$data) {
|
||||||
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
|
if($elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated']) {
|
||||||
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
|
$name_updated = $elems['name'][0]['attribs'][NAMESPACE_DFRN]['updated'];
|
||||||
$new_name = $elems['name'][0]['data'];
|
$new_name = $elems['name'][0]['data'];
|
||||||
}
|
}
|
||||||
if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
|
if((x($elems,'link')) && ($elems['link'][0]['attribs']['']['rel'] === 'photo') && ($elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated'])) {
|
||||||
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
|
$photo_timestamp = datetime_convert('UTC','UTC',$elems['link'][0]['attribs'][NAMESPACE_DFRN]['updated']);
|
||||||
$photo_url = $elems['link'][0]['attribs']['']['href'];
|
$photo_url = $elems['link'][0]['attribs']['']['href'];
|
||||||
|
|
@ -2270,12 +2335,12 @@ function local_delivery($importer,$data) {
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$img->scaleImageSquare(175);
|
$img->scaleImageSquare(175);
|
||||||
|
|
||||||
$hash = $resource_id;
|
$hash = $resource_id;
|
||||||
$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 4);
|
$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 4);
|
||||||
|
|
||||||
$img->scaleImage(80);
|
$img->scaleImage(80);
|
||||||
$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 5);
|
$r = $img->store($importer['importer_uid'], $importer['id'], $hash, basename($photo_url), 'Contact Photos', 5);
|
||||||
|
|
||||||
|
|
@ -2284,7 +2349,7 @@ function local_delivery($importer,$data) {
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s'
|
||||||
WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
|
dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()),
|
||||||
|
|
@ -2343,17 +2408,17 @@ function local_delivery($importer,$data) {
|
||||||
/** relocated user must have original key pair */
|
/** relocated user must have original key pair */
|
||||||
/*$newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
|
/*$newloc['pubkey'] = notags(unxmlify($base['pubkey'][0]['data']));
|
||||||
$newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));*/
|
$newloc['prvkey'] = notags(unxmlify($base['prvkey'][0]['data']));*/
|
||||||
|
|
||||||
logger("items:relocate contact ".print_r($newloc, true).print_r($importer, true), LOGGER_DEBUG);
|
logger("items:relocate contact ".print_r($newloc, true).print_r($importer, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
// update contact
|
// update contact
|
||||||
$r = q("SELECT photo, url FROM contact WHERE id=%d AND uid=%d;",
|
$r = q("SELECT photo, url FROM contact WHERE id=%d AND uid=%d;",
|
||||||
intval($importer['id']),
|
intval($importer['id']),
|
||||||
intval($importer['importer_uid']));
|
intval($importer['importer_uid']));
|
||||||
if ($r === false)
|
if ($r === false)
|
||||||
return 1;
|
return 1;
|
||||||
$old = $r[0];
|
$old = $r[0];
|
||||||
|
|
||||||
$x = q("UPDATE contact SET
|
$x = q("UPDATE contact SET
|
||||||
name = '%s',
|
name = '%s',
|
||||||
photo = '%s',
|
photo = '%s',
|
||||||
|
|
@ -2396,7 +2461,7 @@ function local_delivery($importer,$data) {
|
||||||
if ($x === false)
|
if ($x === false)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
// merge with current record, current contents have priority
|
// merge with current record, current contents have priority
|
||||||
// update record, set url-updated
|
// update record, set url-updated
|
||||||
|
|
@ -2470,7 +2535,7 @@ function local_delivery($importer,$data) {
|
||||||
|
|
||||||
|
|
||||||
$hash = random_string();
|
$hash = random_string();
|
||||||
|
|
||||||
$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
|
$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` )
|
||||||
VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
|
VALUES( %d, %d, %d, '%s', '%s', '%s', %d )",
|
||||||
intval($fsugg['uid']),
|
intval($fsugg['uid']),
|
||||||
|
|
@ -2524,7 +2589,7 @@ function local_delivery($importer,$data) {
|
||||||
$msg['uri'] = notags(unxmlify($base['id'][0]['data']));
|
$msg['uri'] = notags(unxmlify($base['id'][0]['data']));
|
||||||
$msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
|
$msg['parent-uri'] = notags(unxmlify($base['in-reply-to'][0]['data']));
|
||||||
$msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
|
$msg['created'] = datetime_convert(notags(unxmlify('UTC','UTC',$base['sentdate'][0]['data'])));
|
||||||
|
|
||||||
dbesc_array($msg);
|
dbesc_array($msg);
|
||||||
|
|
||||||
$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
|
$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
|
||||||
|
|
@ -2548,12 +2613,12 @@ function local_delivery($importer,$data) {
|
||||||
'verb' => ACTIVITY_POST,
|
'verb' => ACTIVITY_POST,
|
||||||
'otype' => 'mail'
|
'otype' => 'mail'
|
||||||
);
|
);
|
||||||
|
|
||||||
notification($notif_params);
|
notification($notif_params);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
// NOTREACHED
|
// NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
||||||
$community_page = 0;
|
$community_page = 0;
|
||||||
$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
|
$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'community');
|
||||||
|
|
@ -2567,7 +2632,7 @@ function local_delivery($importer,$data) {
|
||||||
);
|
);
|
||||||
$importer['forum'] = (string) $community_page;
|
$importer['forum'] = (string) $community_page;
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
|
logger('local_delivery: feed item count = ' . $feed->get_item_quantity());
|
||||||
|
|
||||||
// process any deleted entries
|
// process any deleted entries
|
||||||
|
|
@ -2677,14 +2742,14 @@ function local_delivery($importer,$data) {
|
||||||
if(count($i)) {
|
if(count($i)) {
|
||||||
|
|
||||||
// For tags, the owner cannot remove the tag on the author's copy of the post.
|
// For tags, the owner cannot remove the tag on the author's copy of the post.
|
||||||
|
|
||||||
$owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
|
$owner_remove = (($item['contact-id'] == $i[0]['contact-id']) ? true: false);
|
||||||
$author_remove = (($item['origin'] && $item['self']) ? true : false);
|
$author_remove = (($item['origin'] && $item['self']) ? true : false);
|
||||||
$author_copy = (($item['origin']) ? true : false);
|
$author_copy = (($item['origin']) ? true : false);
|
||||||
|
|
||||||
if($owner_remove && $author_copy)
|
if($owner_remove && $author_copy)
|
||||||
continue;
|
continue;
|
||||||
if($author_remove || $owner_remove) {
|
if($author_remove || $owner_remove) {
|
||||||
$tags = explode(',',$i[0]['tag']);
|
$tags = explode(',',$i[0]['tag']);
|
||||||
$newtags = array();
|
$newtags = array();
|
||||||
if(count($tags)) {
|
if(count($tags)) {
|
||||||
|
|
@ -2696,6 +2761,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc(implode(',',$newtags)),
|
dbesc(implode(',',$newtags)),
|
||||||
intval($i[0]['id'])
|
intval($i[0]['id'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($i[0]['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2710,6 +2776,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($item['uri']),
|
dbesc($item['uri']),
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item['uri'], $importer['importer_uid']);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
|
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
|
||||||
|
|
@ -2720,6 +2787,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($uri),
|
dbesc($uri),
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($uri, $importer['importer_uid']);
|
||||||
if($item['last-child']) {
|
if($item['last-child']) {
|
||||||
// ensure that last-child is set in case the comment that had it just got wiped.
|
// ensure that last-child is set in case the comment that had it just got wiped.
|
||||||
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
|
||||||
|
|
@ -2727,7 +2795,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($item['parent-uri']),
|
dbesc($item['parent-uri']),
|
||||||
intval($item['uid'])
|
intval($item['uid'])
|
||||||
);
|
);
|
||||||
// who is the last child now?
|
// who is the last child now?
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
|
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d
|
||||||
ORDER BY `created` DESC LIMIT 1",
|
ORDER BY `created` DESC LIMIT 1",
|
||||||
dbesc($item['parent-uri']),
|
dbesc($item['parent-uri']),
|
||||||
|
|
@ -2737,7 +2805,7 @@ function local_delivery($importer,$data) {
|
||||||
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'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if this is a relayed delete, propagate it to other recipients
|
// if this is a relayed delete, propagate it to other recipients
|
||||||
|
|
||||||
|
|
@ -2831,11 +2899,11 @@ function local_delivery($importer,$data) {
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$iid = $r[0]['id'];
|
$iid = $r[0]['id'];
|
||||||
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
|
if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) {
|
||||||
|
|
||||||
// do not accept (ignore) an earlier edit than one we currently have.
|
// do not accept (ignore) an earlier edit than one we currently have.
|
||||||
if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
|
if(datetime_convert('UTC','UTC',$datarray['edited']) < $r[0]['edited'])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
logger('received updated comment' , LOGGER_DEBUG);
|
logger('received updated comment' , LOGGER_DEBUG);
|
||||||
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($datarray['title']),
|
dbesc($datarray['title']),
|
||||||
|
|
@ -2845,6 +2913,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($item_id),
|
dbesc($item_id),
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item_id, $importer['importer_uid']);
|
||||||
|
|
||||||
proc_run('php',"include/notifier.php","comment-import",$iid);
|
proc_run('php',"include/notifier.php","comment-import",$iid);
|
||||||
|
|
||||||
|
|
@ -2881,14 +2950,14 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($datarray['verb']),
|
dbesc($datarray['verb']),
|
||||||
dbesc($datarray['parent-uri']),
|
dbesc($datarray['parent-uri']),
|
||||||
dbesc($datarray['parent-uri'])
|
dbesc($datarray['parent-uri'])
|
||||||
|
|
||||||
);
|
);
|
||||||
if($r && count($r))
|
if($r && count($r))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
|
||||||
|
|
||||||
$xo = parse_xml_string($datarray['object'],false);
|
$xo = parse_xml_string($datarray['object'],false);
|
||||||
$xt = parse_xml_string($datarray['target'],false);
|
$xt = parse_xml_string($datarray['target'],false);
|
||||||
|
|
||||||
|
|
@ -2901,9 +2970,9 @@ function local_delivery($importer,$data) {
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
if(! count($tagp))
|
if(! count($tagp))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// extract tag, if not duplicate, and this user allows tags, add to parent item
|
// extract tag, if not duplicate, and this user allows tags, add to parent item
|
||||||
|
|
||||||
if($xo->id && $xo->content) {
|
if($xo->id && $xo->content) {
|
||||||
$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
|
$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
|
||||||
|
|
@ -2917,9 +2986,10 @@ function local_delivery($importer,$data) {
|
||||||
intval($tagp[0]['id']),
|
intval($tagp[0]['id']),
|
||||||
dbesc(datetime_convert())
|
dbesc(datetime_convert())
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($tagp[0]['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -2936,7 +3006,7 @@ function local_delivery($importer,$data) {
|
||||||
$parent = $r[0]['parent'];
|
$parent = $r[0]['parent'];
|
||||||
$parent_uri = $r[0]['parent-uri'];
|
$parent_uri = $r[0]['parent-uri'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if(! $is_like) {
|
if(! $is_like) {
|
||||||
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
|
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
|
|
@ -2954,7 +3024,7 @@ function local_delivery($importer,$data) {
|
||||||
if($posted_id && $parent) {
|
if($posted_id && $parent) {
|
||||||
|
|
||||||
proc_run('php',"include/notifier.php","comment-import","$posted_id");
|
proc_run('php',"include/notifier.php","comment-import","$posted_id");
|
||||||
|
|
||||||
if((! $is_like) && (! $importer['self'])) {
|
if((! $is_like) && (! $importer['self'])) {
|
||||||
|
|
||||||
require_once('include/enotify.php');
|
require_once('include/enotify.php');
|
||||||
|
|
@ -3017,6 +3087,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($item_id),
|
dbesc($item_id),
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item_id, $importer['importer_uid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// update last-child if it changes
|
// update last-child if it changes
|
||||||
|
|
@ -3053,7 +3124,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($parent_uri)
|
dbesc($parent_uri)
|
||||||
);
|
);
|
||||||
if($r && count($r))
|
if($r && count($r))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3068,24 +3139,25 @@ function local_delivery($importer,$data) {
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
if(! count($r))
|
if(! count($r))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// extract tag, if not duplicate, add to parent item
|
// extract tag, if not duplicate, add to parent item
|
||||||
if($xo->content) {
|
if($xo->content) {
|
||||||
if(! (stristr($r[0]['tag'],trim($xo->content)))) {
|
if(! (stristr($r[0]['tag'],trim($xo->content)))) {
|
||||||
q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
|
q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1",
|
||||||
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
|
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
|
||||||
intval($r[0]['id'])
|
intval($r[0]['id'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($r[0]['id']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$posted_id = item_store($datarray);
|
$posted_id = item_store($datarray);
|
||||||
|
|
||||||
// find out if our user is involved in this conversation and wants to be notified.
|
// find out if our user is involved in this conversation and wants to be notified.
|
||||||
|
|
||||||
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
|
if(!x($datarray['type']) || $datarray['type'] != 'activity') {
|
||||||
|
|
||||||
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
|
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
|
||||||
|
|
@ -3099,11 +3171,11 @@ function local_delivery($importer,$data) {
|
||||||
// first make sure this isn't our own post coming back to us from a wall-to-wall event
|
// first make sure this isn't our own post coming back to us from a wall-to-wall event
|
||||||
if(! link_compare($datarray['author-link'],$importer_url)) {
|
if(! link_compare($datarray['author-link'],$importer_url)) {
|
||||||
|
|
||||||
|
|
||||||
foreach($myconv as $conv) {
|
foreach($myconv as $conv) {
|
||||||
|
|
||||||
// now if we find a match, it means we're in this conversation
|
// now if we find a match, it means we're in this conversation
|
||||||
|
|
||||||
if(! link_compare($conv['author-link'],$importer_url))
|
if(! link_compare($conv['author-link'],$importer_url))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
@ -3191,6 +3263,7 @@ function local_delivery($importer,$data) {
|
||||||
dbesc($item_id),
|
dbesc($item_id),
|
||||||
intval($importer['importer_uid'])
|
intval($importer['importer_uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($item_id, $importer['importer_uid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
// update last-child if it changes
|
// update last-child if it changes
|
||||||
|
|
@ -3314,7 +3387,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
||||||
// send email notification to owner?
|
// send email notification to owner?
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
||||||
// create contact record
|
// create contact record
|
||||||
|
|
||||||
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
|
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
|
||||||
|
|
@ -3337,7 +3410,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
||||||
if(count($r))
|
if(count($r))
|
||||||
$contact_record = $r[0];
|
$contact_record = $r[0];
|
||||||
|
|
||||||
// create notification
|
// create notification
|
||||||
$hash = random_string();
|
$hash = random_string();
|
||||||
|
|
||||||
if(is_array($contact_record)) {
|
if(is_array($contact_record)) {
|
||||||
|
|
@ -3375,7 +3448,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
|
||||||
'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
|
||||||
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
. 'Content-type: text/plain; charset=UTF-8' . "\n"
|
||||||
. 'Content-transfer-encoding: 8bit' );
|
. 'Content-transfer-encoding: 8bit' );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -3445,7 +3518,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
|
||||||
post_url($url,$params);
|
post_url($url,$params);
|
||||||
|
|
||||||
logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG);
|
logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -3778,16 +3851,16 @@ function item_expire($uid,$days) {
|
||||||
|
|
||||||
$expire_items = get_pconfig($uid, 'expire','items');
|
$expire_items = get_pconfig($uid, 'expire','items');
|
||||||
$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
|
$expire_items = (($expire_items===false)?1:intval($expire_items)); // default if not set: 1
|
||||||
|
|
||||||
$expire_notes = get_pconfig($uid, 'expire','notes');
|
$expire_notes = get_pconfig($uid, 'expire','notes');
|
||||||
$expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
|
$expire_notes = (($expire_notes===false)?1:intval($expire_notes)); // default if not set: 1
|
||||||
|
|
||||||
$expire_starred = get_pconfig($uid, 'expire','starred');
|
$expire_starred = get_pconfig($uid, 'expire','starred');
|
||||||
$expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
|
$expire_starred = (($expire_starred===false)?1:intval($expire_starred)); // default if not set: 1
|
||||||
|
|
||||||
$expire_photos = get_pconfig($uid, 'expire','photos');
|
$expire_photos = get_pconfig($uid, 'expire','photos');
|
||||||
$expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
|
$expire_photos = (($expire_photos===false)?0:intval($expire_photos)); // default if not set: 0
|
||||||
|
|
||||||
logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
|
logger('expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
|
||||||
|
|
||||||
foreach($r as $item) {
|
foreach($r as $item) {
|
||||||
|
|
@ -3910,6 +3983,7 @@ function drop_item($id,$interactive = true) {
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
intval($item['id'])
|
intval($item['id'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($item['id']);
|
||||||
|
|
||||||
// clean up categories and tags so they don't end up as orphans
|
// clean up categories and tags so they don't end up as orphans
|
||||||
|
|
||||||
|
|
@ -3975,6 +4049,7 @@ function drop_item($id,$interactive = true) {
|
||||||
dbesc($item['parent-uri']),
|
dbesc($item['parent-uri']),
|
||||||
intval($item['uid'])
|
intval($item['uid'])
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($item['parent-uri'], $item['uid']);
|
||||||
// ignore the result
|
// ignore the result
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
@ -3984,7 +4059,7 @@ function drop_item($id,$interactive = true) {
|
||||||
dbesc($item['parent-uri']),
|
dbesc($item['parent-uri']),
|
||||||
intval($item['uid'])
|
intval($item['uid'])
|
||||||
);
|
);
|
||||||
// who is the last child now?
|
// who is the last child now?
|
||||||
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
|
$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `uid` = %d ORDER BY `edited` DESC LIMIT 1",
|
||||||
dbesc($item['parent-uri']),
|
dbesc($item['parent-uri']),
|
||||||
intval($item['uid'])
|
intval($item['uid'])
|
||||||
|
|
@ -4016,7 +4091,7 @@ function drop_item($id,$interactive = true) {
|
||||||
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
|
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
|
||||||
//NOTREACHED
|
//NOTREACHED
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,12 @@
|
||||||
if(! function_exists('fetch_url')) {
|
if(! function_exists('fetch_url')) {
|
||||||
function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_content=Null) {
|
function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_content=Null) {
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
$ch = @curl_init($url);
|
$ch = @curl_init($url);
|
||||||
if(($redirects > 8) || (! $ch))
|
if(($redirects > 8) || (! $ch))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@curl_setopt($ch, CURLOPT_HEADER, true);
|
@curl_setopt($ch, CURLOPT_HEADER, true);
|
||||||
|
|
@ -78,9 +80,17 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
||||||
}
|
}
|
||||||
|
|
||||||
if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
|
if($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
|
||||||
$matches = array();
|
$new_location_info = @parse_url($curl_info["redirect_url"]);
|
||||||
preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
|
$old_location_info = @parse_url($curl_info["url"]);
|
||||||
$newurl = trim(array_pop($matches));
|
|
||||||
|
$newurl = $curl_info["redirect_url"];
|
||||||
|
|
||||||
|
if (($new_location_info["path"] == "") AND ($new_location_info["host"] != ""))
|
||||||
|
$newurl = $new_location_info["scheme"]."://".$new_location_info["host"].$old_location_info["path"];
|
||||||
|
|
||||||
|
//$matches = array();
|
||||||
|
//preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
|
||||||
|
//$newurl = trim(array_pop($matches));
|
||||||
if(strpos($newurl,'/') === 0)
|
if(strpos($newurl,'/') === 0)
|
||||||
$newurl = $url . $newurl;
|
$newurl = $url . $newurl;
|
||||||
$url_parsed = @parse_url($newurl);
|
$url_parsed = @parse_url($newurl);
|
||||||
|
|
@ -95,6 +105,9 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
||||||
$body = substr($s,strlen($header));
|
$body = substr($s,strlen($header));
|
||||||
$a->set_curl_headers($header);
|
$a->set_curl_headers($header);
|
||||||
@curl_close($ch);
|
@curl_close($ch);
|
||||||
|
|
||||||
|
$a->save_timestamp($stamp1, "network");
|
||||||
|
|
||||||
return($body);
|
return($body);
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
@ -102,6 +115,9 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
|
||||||
|
|
||||||
if(! function_exists('post_url')) {
|
if(! function_exists('post_url')) {
|
||||||
function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0) {
|
function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0) {
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$ch = curl_init($url);
|
$ch = curl_init($url);
|
||||||
if(($redirects > 8) || (! $ch))
|
if(($redirects > 8) || (! $ch))
|
||||||
|
|
@ -184,6 +200,9 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
|
||||||
$a->set_curl_headers($header);
|
$a->set_curl_headers($header);
|
||||||
|
|
||||||
curl_close($ch);
|
curl_close($ch);
|
||||||
|
|
||||||
|
$a->save_timestamp($stamp1, "network");
|
||||||
|
|
||||||
return($body);
|
return($body);
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
@ -293,9 +312,9 @@ function webfinger_dfrn($s,&$hcard) {
|
||||||
if($link['@attributes']['rel'] === NAMESPACE_DFRN)
|
if($link['@attributes']['rel'] === NAMESPACE_DFRN)
|
||||||
$profile_link = $link['@attributes']['href'];
|
$profile_link = $link['@attributes']['href'];
|
||||||
if($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB)
|
if($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB)
|
||||||
$profile_link = 'stat:' . $link['@attributes']['template'];
|
$profile_link = 'stat:' . $link['@attributes']['template'];
|
||||||
if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
|
if($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
|
||||||
$hcard = $link['@attributes']['href'];
|
$hcard = $link['@attributes']['href'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $profile_link;
|
return $profile_link;
|
||||||
|
|
@ -361,6 +380,7 @@ function lrdd($uri, $debug = false) {
|
||||||
logger('lrdd: constructed url: ' . $url);
|
logger('lrdd: constructed url: ' . $url);
|
||||||
|
|
||||||
$xml = fetch_url($url);
|
$xml = fetch_url($url);
|
||||||
|
|
||||||
$headers = $a->get_curl_headers();
|
$headers = $a->get_curl_headers();
|
||||||
|
|
||||||
if (! $xml)
|
if (! $xml)
|
||||||
|
|
@ -410,7 +430,7 @@ function lrdd($uri, $debug = false) {
|
||||||
elseif(x($link['@attributes'],'href'))
|
elseif(x($link['@attributes'],'href'))
|
||||||
$href = $link['@attributes']['href'];
|
$href = $link['@attributes']['href'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if((! isset($tpl)) || (! strpos($tpl,'{uri}')))
|
if((! isset($tpl)) || (! strpos($tpl,'{uri}')))
|
||||||
|
|
@ -429,7 +449,7 @@ function lrdd($uri, $debug = false) {
|
||||||
|
|
||||||
$lines = explode("\n",$headers);
|
$lines = explode("\n",$headers);
|
||||||
if(count($lines)) {
|
if(count($lines)) {
|
||||||
foreach($lines as $line) {
|
foreach($lines as $line) {
|
||||||
if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
|
if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
|
||||||
return(fetch_xrd_links($matches[1]));
|
return(fetch_xrd_links($matches[1]));
|
||||||
break;
|
break;
|
||||||
|
|
@ -475,7 +495,7 @@ function lrdd($uri, $debug = false) {
|
||||||
|
|
||||||
$lines = explode("\n",$headers);
|
$lines = explode("\n",$headers);
|
||||||
if(count($lines)) {
|
if(count($lines)) {
|
||||||
foreach($lines as $line) {
|
foreach($lines as $line) {
|
||||||
// TODO alter the following regex to support multiple relations (space separated)
|
// TODO alter the following regex to support multiple relations (space separated)
|
||||||
if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
|
if((stristr($line,'link:')) && preg_match('/<([^>].*)>.*rel\=[\'\"]lrdd[\'\"]/',$line,$matches)) {
|
||||||
$pagelink = $matches[1];
|
$pagelink = $matches[1];
|
||||||
|
|
@ -591,14 +611,14 @@ function fetch_xrd_links($url) {
|
||||||
|
|
||||||
if(! function_exists('validate_url')) {
|
if(! function_exists('validate_url')) {
|
||||||
function validate_url(&$url) {
|
function validate_url(&$url) {
|
||||||
|
|
||||||
// no naked subdomains (allow localhost for tests)
|
// no naked subdomains (allow localhost for tests)
|
||||||
if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
|
if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
|
||||||
return false;
|
return false;
|
||||||
if(substr($url,0,4) != 'http')
|
if(substr($url,0,4) != 'http')
|
||||||
$url = 'http://' . $url;
|
$url = 'http://' . $url;
|
||||||
$h = @parse_url($url);
|
$h = @parse_url($url);
|
||||||
|
|
||||||
if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
|
if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
@ -829,8 +849,11 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
|
||||||
$i = fetch_url($scaled);
|
$i = fetch_url($scaled);
|
||||||
|
|
||||||
$cachefile = get_cachefile(hash("md5", $scaled));
|
$cachefile = get_cachefile(hash("md5", $scaled));
|
||||||
if ($cachefile != '')
|
if ($cachefile != '') {
|
||||||
|
$stamp1 = microtime(true);
|
||||||
file_put_contents($cachefile, $i);
|
file_put_contents($cachefile, $i);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
}
|
||||||
|
|
||||||
// guess mimetype from headers or filename
|
// guess mimetype from headers or filename
|
||||||
$type = guess_image_type($mtch[1],true);
|
$type = guess_image_type($mtch[1],true);
|
||||||
|
|
@ -920,7 +943,7 @@ function fix_contact_ssl_policy(&$contact,$new_policy) {
|
||||||
* Return: The parsed XML in an array form. Use print_r() to see the resulting array structure.
|
* 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'));
|
* Examples: $array = xml2array(file_get_contents('feed.xml'));
|
||||||
* $array = xml2array(file_get_contents('feed.xml', true, 1, 'attribute'));
|
* $array = xml2array(file_get_contents('feed.xml', true, 1, 'attribute'));
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') {
|
function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') {
|
||||||
if(!$contents) return array();
|
if(!$contents) return array();
|
||||||
|
|
@ -978,7 +1001,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
|
||||||
|
|
||||||
$result = array();
|
$result = array();
|
||||||
$attributes_data = array();
|
$attributes_data = array();
|
||||||
|
|
||||||
if(isset($value)) {
|
if(isset($value)) {
|
||||||
if($priority == 'tag') $result = $value;
|
if($priority == 'tag') $result = $value;
|
||||||
else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
|
else $result['value'] = $value; // Put the value in a assoc array if we are in the 'Attribute' mode
|
||||||
|
|
@ -994,7 +1017,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
|
||||||
|
|
||||||
// See tag status and do the needed.
|
// See tag status and do the needed.
|
||||||
if($namespaces && strpos($tag,':')) {
|
if($namespaces && strpos($tag,':')) {
|
||||||
$namespc = substr($tag,0,strrpos($tag,':'));
|
$namespc = substr($tag,0,strrpos($tag,':'));
|
||||||
$tag = strtolower(substr($tag,strlen($namespc)+1));
|
$tag = strtolower(substr($tag,strlen($namespc)+1));
|
||||||
$result['@namespace'] = $namespc;
|
$result['@namespace'] = $namespc;
|
||||||
}
|
}
|
||||||
|
|
@ -1017,7 +1040,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
|
||||||
} else { // This section will make the value an array if multiple tags with the same name appear together
|
} 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
|
$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;
|
$repeated_tag_index[$tag.'_'.$level] = 2;
|
||||||
|
|
||||||
if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
|
if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
|
||||||
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
|
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
|
||||||
unset($current[$tag.'_attr']);
|
unset($current[$tag.'_attr']);
|
||||||
|
|
@ -1040,7 +1063,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
|
||||||
|
|
||||||
// ...push the new element into that array.
|
// ...push the new element into that array.
|
||||||
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
|
||||||
|
|
||||||
if($priority == 'tag' and $get_attributes and $attributes_data) {
|
if($priority == 'tag' and $get_attributes and $attributes_data) {
|
||||||
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
|
||||||
}
|
}
|
||||||
|
|
@ -1051,11 +1074,11 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
|
||||||
$repeated_tag_index[$tag.'_'.$level] = 1;
|
$repeated_tag_index[$tag.'_'.$level] = 1;
|
||||||
if($priority == 'tag' and $get_attributes) {
|
if($priority == 'tag' and $get_attributes) {
|
||||||
if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
|
if(isset($current[$tag.'_attr'])) { // The attribute of the last(0th) tag must be moved as well
|
||||||
|
|
||||||
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
|
$current[$tag]['0_attr'] = $current[$tag.'_attr'];
|
||||||
unset($current[$tag.'_attr']);
|
unset($current[$tag.'_attr']);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($attributes_data) {
|
if($attributes_data) {
|
||||||
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
|
$current[$tag][$repeated_tag_index[$tag.'_'.$level] . '_attr'] = $attributes_data;
|
||||||
}
|
}
|
||||||
|
|
@ -1068,6 +1091,6 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
|
||||||
$current = &$parent[$level-1];
|
$current = &$parent[$level-1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return($xml_array);
|
return($xml_array);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
173
include/ostatus_conversation.php
Normal file
173
include/ostatus_conversation.php
Normal file
|
|
@ -0,0 +1,173 @@
|
||||||
|
<?php
|
||||||
|
define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
|
||||||
|
|
||||||
|
function check_conversations() {
|
||||||
|
$last = get_config('system','ostatus_last_poll');
|
||||||
|
|
||||||
|
$poll_interval = intval(get_config('system','ostatus_poll_interval'));
|
||||||
|
if(! $poll_interval)
|
||||||
|
$poll_interval = OSTATUS_DEFAULT_POLL_INTERVAL;
|
||||||
|
|
||||||
|
if($last) {
|
||||||
|
$next = $last + ($poll_interval * 60);
|
||||||
|
if($next > time()) {
|
||||||
|
logger('complete_conversation: poll intervall not reached');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
logger('complete_conversation: cron_start');
|
||||||
|
|
||||||
|
$start = date("Y-m-d H:i:s", time() - 86400);
|
||||||
|
$conversations = q("SELECT * FROM `term` WHERE `type` = 7 AND `term` > '%s'",
|
||||||
|
dbesc($start));
|
||||||
|
foreach ($conversations AS $conversation) {
|
||||||
|
$id = $conversation['oid'];
|
||||||
|
$url = $conversation['url'];
|
||||||
|
complete_conversation($id, $url);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger('complete_conversation: cron_end');
|
||||||
|
|
||||||
|
set_config('system','ostatus_last_poll', time());
|
||||||
|
}
|
||||||
|
|
||||||
|
function complete_conversation($itemid, $conversation_url, $only_add_conversation = false) {
|
||||||
|
global $a;
|
||||||
|
|
||||||
|
//logger('complete_conversation: completing conversation url '.$conversation_url.' for id '.$itemid);
|
||||||
|
|
||||||
|
$messages = q("SELECT `uid`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
|
||||||
|
if (!$messages)
|
||||||
|
return;
|
||||||
|
$message = $messages[0];
|
||||||
|
|
||||||
|
// Store conversation url if not done before
|
||||||
|
$conversation = q("SELECT `url` FROM `term` WHERE `uid` = %d AND `oid` = %d AND `otype` = %d AND `type` = %d",
|
||||||
|
intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION));
|
||||||
|
|
||||||
|
if (!$conversation) {
|
||||||
|
$r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`) VALUES (%d, %d, %d, %d, '%s', '%s')",
|
||||||
|
intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval(TERM_CONVERSATION), dbesc(datetime_convert()), dbesc($conversation_url));
|
||||||
|
logger('complete_conversation: Storing conversation url '.$conversation_url.' for id '.$itemid);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($only_add_conversation)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Get the parent
|
||||||
|
$parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||||
|
intval($message["uid"]), intval($message["parent"]));
|
||||||
|
if (!$parents)
|
||||||
|
return;
|
||||||
|
$parent = $parents[0];
|
||||||
|
|
||||||
|
require_once('include/html2bbcode.php');
|
||||||
|
require_once('include/items.php');
|
||||||
|
|
||||||
|
$conv = str_replace("/conversation/", "/api/statusnet/conversation/", $conversation_url).".as";
|
||||||
|
|
||||||
|
logger('complete_conversation: fetching conversation url '.$conv.' for '.$itemid);
|
||||||
|
$conv_as = fetch_url($conv);
|
||||||
|
|
||||||
|
if ($conv_as) {
|
||||||
|
$conv_as = str_replace(',"statusnet:notice_info":', ',"statusnet_notice_info":', $conv_as);
|
||||||
|
$conv_as = json_decode($conv_as);
|
||||||
|
|
||||||
|
$first_id = "";
|
||||||
|
$items = array_reverse($conv_as->items);
|
||||||
|
|
||||||
|
foreach ($items as $single_conv) {
|
||||||
|
if ($first_id == "") {
|
||||||
|
$first_id = $single_conv->id;
|
||||||
|
|
||||||
|
$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
|
||||||
|
intval($message["uid"]), dbesc($first_id));
|
||||||
|
if ($new_parents) {
|
||||||
|
$parent = $new_parents[0];
|
||||||
|
logger('complete_conversation: adopting new parent '.$parent["id"].' for '.$itemid);
|
||||||
|
} else {
|
||||||
|
$parent["id"] = 0;
|
||||||
|
$parent["uri"] = $first_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isset($single_conv->context->inReplyTo->id))
|
||||||
|
$parent_uri = $single_conv->context->inReplyTo->id;
|
||||||
|
else
|
||||||
|
$parent_uri = $parent["uri"];
|
||||||
|
|
||||||
|
if ($parent["id"] != 0) {
|
||||||
|
$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
|
||||||
|
intval($message["uid"]), dbesc($single_conv->id));
|
||||||
|
if ($message_exists) {
|
||||||
|
$existing_message = $message_exists[0];
|
||||||
|
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d LIMIT 1",
|
||||||
|
intval($parent["id"]),
|
||||||
|
dbesc($parent["uri"]),
|
||||||
|
dbesc($parent_uri),
|
||||||
|
intval($existing_message["id"]));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$arr = array();
|
||||||
|
$arr["uri"] = $single_conv->id;
|
||||||
|
$arr["plink"] = $single_conv->id;
|
||||||
|
$arr["uid"] = $message["uid"];
|
||||||
|
$arr["contact-id"] = $parent["contact-id"]; // To-Do
|
||||||
|
if ($parent["id"] != 0)
|
||||||
|
$arr["parent"] = $parent["id"];
|
||||||
|
$arr["parent-uri"] = $parent["uri"];
|
||||||
|
$arr["thr-parent"] = $parent_uri;
|
||||||
|
$arr["created"] = $single_conv->published;
|
||||||
|
$arr["edited"] = $single_conv->published;
|
||||||
|
//$arr["owner-name"] = $single_conv->actor->contact->displayName;
|
||||||
|
$arr["owner-name"] = $single_conv->actor->contact->preferredUsername;
|
||||||
|
$arr["owner-link"] = $single_conv->actor->id;
|
||||||
|
$arr["owner-avatar"] = $single_conv->actor->image->url;
|
||||||
|
//$arr["author-name"] = $single_conv->actor->contact->displayName;
|
||||||
|
$arr["author-name"] = $single_conv->actor->contact->preferredUsername;
|
||||||
|
$arr["author-link"] = $single_conv->actor->id;
|
||||||
|
$arr["author-avatar"] = $single_conv->actor->image->url;
|
||||||
|
$arr["body"] = html2bbcode($single_conv->content);
|
||||||
|
$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
|
||||||
|
if ($arr["app"] == "")
|
||||||
|
$arr["app"] = $single_conv->provider->displayName;
|
||||||
|
$arr["verb"] = $parent["verb"];
|
||||||
|
$arr["visible"] = $parent["visible"];
|
||||||
|
$arr["location"] = $single_conv->location->displayName;
|
||||||
|
$arr["coord"] = trim($single_conv->location->lat." ".$single_conv->location->lon);
|
||||||
|
|
||||||
|
if ($arr["location"] == "")
|
||||||
|
unset($arr["location"]);
|
||||||
|
|
||||||
|
if ($arr["coord"] == "")
|
||||||
|
unset($arr["coord"]);
|
||||||
|
|
||||||
|
$newitem = item_store($arr);
|
||||||
|
|
||||||
|
// Add the conversation entry (but don't fetch the whole conversation)
|
||||||
|
complete_conversation($newitem, $conversation_url, true);
|
||||||
|
|
||||||
|
// If the newly created item is the top item then change the parent settings of the thread
|
||||||
|
if ($newitem AND ($arr["uri"] == $first_id)) {
|
||||||
|
logger('complete_conversation: setting new parent to id '.$newitem);
|
||||||
|
$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
|
||||||
|
intval($message["uid"]), intval($newitem));
|
||||||
|
if ($new_parents) {
|
||||||
|
$parent = $new_parents[0];
|
||||||
|
logger('complete_conversation: done changing parents to parent '.$newitem);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*logger('complete_conversation: changing parents to parent '.$newitem.' old parent: '.$parent["id"].' new uri: '.$arr["uri"]);
|
||||||
|
$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s' WHERE `parent` = %d",
|
||||||
|
intval($newitem),
|
||||||
|
dbesc($arr["uri"]),
|
||||||
|
intval($parent["id"]));
|
||||||
|
logger('complete_conversation: done changing parents to parent '.$newitem.' '.print_r($r, true));*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
|
@ -8,7 +8,7 @@ function uninstall_plugin($plugin){
|
||||||
q("DELETE FROM `addon` WHERE `name` = '%s' ",
|
q("DELETE FROM `addon` WHERE `name` = '%s' ",
|
||||||
dbesc($plugin)
|
dbesc($plugin)
|
||||||
);
|
);
|
||||||
|
|
||||||
@include_once('addon/' . $plugin . '/' . $plugin . '.php');
|
@include_once('addon/' . $plugin . '/' . $plugin . '.php');
|
||||||
if(function_exists($plugin . '_uninstall')) {
|
if(function_exists($plugin . '_uninstall')) {
|
||||||
$func = $plugin . '_uninstall';
|
$func = $plugin . '_uninstall';
|
||||||
|
|
@ -28,9 +28,9 @@ function install_plugin($plugin) {
|
||||||
if(function_exists($plugin . '_install')) {
|
if(function_exists($plugin . '_install')) {
|
||||||
$func = $plugin . '_install';
|
$func = $plugin . '_install';
|
||||||
$func();
|
$func();
|
||||||
|
|
||||||
$plugin_admin = (function_exists($plugin."_plugin_admin")?1:0);
|
$plugin_admin = (function_exists($plugin."_plugin_admin")?1:0);
|
||||||
|
|
||||||
$r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`, `plugin_admin`) VALUES ( '%s', 1, %d , %d ) ",
|
$r = q("INSERT INTO `addon` (`name`, `installed`, `timestamp`, `plugin_admin`) VALUES ( '%s', 1, %d , %d ) ",
|
||||||
dbesc($plugin),
|
dbesc($plugin),
|
||||||
intval($t),
|
intval($t),
|
||||||
|
|
@ -158,6 +158,8 @@ function load_hooks() {
|
||||||
|
|
||||||
if(! function_exists('call_hooks')) {
|
if(! function_exists('call_hooks')) {
|
||||||
function call_hooks($name, &$data = null) {
|
function call_hooks($name, &$data = null) {
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
|
if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
|
||||||
|
|
@ -173,7 +175,7 @@ function call_hooks($name, &$data = null) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// remove orphan hooks
|
// remove orphan hooks
|
||||||
q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
|
q("delete from hook where hook = '%s' and file = '%s' and function = '%s' limit 1",
|
||||||
dbesc($name),
|
dbesc($name),
|
||||||
dbesc($hook[0]),
|
dbesc($hook[0]),
|
||||||
dbesc($hook[1])
|
dbesc($hook[1])
|
||||||
|
|
@ -181,7 +183,6 @@ function call_hooks($name, &$data = null) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -199,18 +200,24 @@ function call_hooks($name, &$data = null) {
|
||||||
|
|
||||||
if (! function_exists('get_plugin_info')){
|
if (! function_exists('get_plugin_info')){
|
||||||
function get_plugin_info($plugin){
|
function get_plugin_info($plugin){
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
|
||||||
$info=Array(
|
$info=Array(
|
||||||
'name' => $plugin,
|
'name' => $plugin,
|
||||||
'description' => "",
|
'description' => "",
|
||||||
'author' => array(),
|
'author' => array(),
|
||||||
'version' => ""
|
'version' => ""
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!is_file("addon/$plugin/$plugin.php")) return $info;
|
if (!is_file("addon/$plugin/$plugin.php")) return $info;
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
$f = file_get_contents("addon/$plugin/$plugin.php");
|
$f = file_get_contents("addon/$plugin/$plugin.php");
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
|
||||||
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
||||||
|
|
||||||
if ($r){
|
if ($r){
|
||||||
$ll = explode("\n", $m[0]);
|
$ll = explode("\n", $m[0]);
|
||||||
foreach( $ll as $l ) {
|
foreach( $ll as $l ) {
|
||||||
|
|
@ -230,10 +237,10 @@ function get_plugin_info($plugin){
|
||||||
$info[$k]=$v;
|
$info[$k]=$v;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return $info;
|
return $info;
|
||||||
}}
|
}}
|
||||||
|
|
@ -242,7 +249,7 @@ function get_plugin_info($plugin){
|
||||||
/*
|
/*
|
||||||
* parse theme comment in search of theme infos.
|
* parse theme comment in search of theme infos.
|
||||||
* like
|
* like
|
||||||
*
|
*
|
||||||
* * Name: My Theme
|
* * Name: My Theme
|
||||||
* * Description: My Cool Theme
|
* * Description: My Cool Theme
|
||||||
* * Version: 1.2.3
|
* * Version: 1.2.3
|
||||||
|
|
@ -270,11 +277,14 @@ function get_theme_info($theme){
|
||||||
$info['unsupported'] = true;
|
$info['unsupported'] = true;
|
||||||
|
|
||||||
if (!is_file("view/theme/$theme/theme.php")) return $info;
|
if (!is_file("view/theme/$theme/theme.php")) return $info;
|
||||||
|
|
||||||
|
$a = get_app();
|
||||||
|
$stamp1 = microtime(true);
|
||||||
$f = file_get_contents("view/theme/$theme/theme.php");
|
$f = file_get_contents("view/theme/$theme/theme.php");
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
|
||||||
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
||||||
|
|
||||||
|
|
||||||
if ($r){
|
if ($r){
|
||||||
$ll = explode("\n", $m[0]);
|
$ll = explode("\n", $m[0]);
|
||||||
foreach( $ll as $l ) {
|
foreach( $ll as $l ) {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ function poller_run(&$argv, &$argc){
|
||||||
if(is_null($a)) {
|
if(is_null($a)) {
|
||||||
$a = new App;
|
$a = new App;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_null($db)) {
|
if(is_null($db)) {
|
||||||
@include(".htconfig.php");
|
@include(".htconfig.php");
|
||||||
require_once("include/dba.php");
|
require_once("include/dba.php");
|
||||||
|
|
@ -57,21 +57,21 @@ function poller_run(&$argv, &$argc){
|
||||||
load_hooks();
|
load_hooks();
|
||||||
|
|
||||||
logger('poller: start');
|
logger('poller: start');
|
||||||
|
|
||||||
// run queue delivery process in the background
|
// run queue delivery process in the background
|
||||||
|
|
||||||
proc_run('php',"include/queue.php");
|
proc_run('php',"include/queue.php");
|
||||||
|
|
||||||
// run diaspora photo queue process in the background
|
// run diaspora photo queue process in the background
|
||||||
|
|
||||||
proc_run('php',"include/dsprphotoq.php");
|
proc_run('php',"include/dsprphotoq.php");
|
||||||
|
|
||||||
// expire any expired accounts
|
// expire any expired accounts
|
||||||
|
|
||||||
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
|
q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
|
||||||
AND `account_expires_on` != '0000-00-00 00:00:00'
|
AND `account_expires_on` != '0000-00-00 00:00:00'
|
||||||
AND `account_expires_on` < UTC_TIMESTAMP() ");
|
AND `account_expires_on` < UTC_TIMESTAMP() ");
|
||||||
|
|
||||||
// delete user and contact records for recently removed accounts
|
// delete user and contact records for recently removed accounts
|
||||||
|
|
||||||
$r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
|
$r = q("SELECT * FROM `user` WHERE `account_removed` = 1 AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
|
||||||
|
|
@ -81,12 +81,13 @@ function poller_run(&$argv, &$argc){
|
||||||
q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
|
q("DELETE FROM `user` WHERE `uid` = %d", intval($user['uid']));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$abandon_days = intval(get_config('system','account_abandon_days'));
|
$abandon_days = intval(get_config('system','account_abandon_days'));
|
||||||
if($abandon_days < 1)
|
if($abandon_days < 1)
|
||||||
$abandon_days = 0;
|
$abandon_days = 0;
|
||||||
|
|
||||||
|
// Check OStatus conversations
|
||||||
|
check_conversations();
|
||||||
|
|
||||||
// once daily run birthday_updates and then expire in background
|
// once daily run birthday_updates and then expire in background
|
||||||
|
|
||||||
|
|
|
||||||
127
include/tags.php
Normal file
127
include/tags.php
Normal file
|
|
@ -0,0 +1,127 @@
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
require_once("boot.php");
|
||||||
|
if(@is_null($a)) {
|
||||||
|
$a = new App;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(is_null($db)) {
|
||||||
|
@include(".htconfig.php");
|
||||||
|
require_once("dba.php");
|
||||||
|
$db = new dba($db_host, $db_user, $db_pass, $db_data);
|
||||||
|
unset($db_host, $db_user, $db_pass, $db_data);
|
||||||
|
};
|
||||||
|
|
||||||
|
$a->set_baseurl("https://pirati.ca");
|
||||||
|
*/
|
||||||
|
|
||||||
|
function create_tags_from_item($itemid) {
|
||||||
|
global $a;
|
||||||
|
|
||||||
|
$profile_base = $a->get_baseurl();
|
||||||
|
$profile_data = parse_url($profile_base);
|
||||||
|
$profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
|
||||||
|
$profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";
|
||||||
|
|
||||||
|
$searchpath = $a->get_baseurl()."/search?tag=";
|
||||||
|
|
||||||
|
$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `title`, `body`, `tag` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
|
||||||
|
|
||||||
|
if (!$messages)
|
||||||
|
return;
|
||||||
|
|
||||||
|
$message = $messages[0];
|
||||||
|
|
||||||
|
// Clean up all tags
|
||||||
|
q("DELETE FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d)",
|
||||||
|
intval(TERM_OBJ_POST),
|
||||||
|
intval($itemid),
|
||||||
|
intval(TERM_HASHTAG),
|
||||||
|
intval(TERM_MENTION));
|
||||||
|
|
||||||
|
if ($message["deleted"])
|
||||||
|
return;
|
||||||
|
|
||||||
|
$cachefile = get_cachefile($message["guid"]."-".hash("md5", $message['body']));
|
||||||
|
|
||||||
|
if (($cachefile != '') AND !file_exists($cachefile)) {
|
||||||
|
$s = prepare_text($message['body']);
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
file_put_contents($cachefile, $s);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
logger('create_tags_from_item: put item '.$message["id"].' into cachefile '.$cachefile);
|
||||||
|
}
|
||||||
|
|
||||||
|
$taglist = explode(",", $message["tag"]);
|
||||||
|
|
||||||
|
$tags = "";
|
||||||
|
foreach ($taglist as $tag)
|
||||||
|
if ((substr(trim($tag), 0, 1) == "#") OR (substr(trim($tag), 0, 1) == "@"))
|
||||||
|
$tags .= " ".trim($tag);
|
||||||
|
else
|
||||||
|
$tags .= " #".trim($tag);
|
||||||
|
|
||||||
|
$data = " ".$message["title"]." ".$message["body"]." ".$tags." ";
|
||||||
|
|
||||||
|
$tags = array();
|
||||||
|
|
||||||
|
$pattern = "/\W\#([^\[].*?)[\s'\".,:;\?!\[\]\/]/ism";
|
||||||
|
if (preg_match_all($pattern, $data, $matches))
|
||||||
|
foreach ($matches[1] as $match)
|
||||||
|
$tags["#".strtolower($match)] = ""; // $searchpath.strtolower($match);
|
||||||
|
|
||||||
|
$pattern = "/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism";
|
||||||
|
if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
|
||||||
|
foreach ($matches as $match)
|
||||||
|
$tags[$match[1].strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2];
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($tags as $tag=>$link) {
|
||||||
|
|
||||||
|
if (substr(trim($tag), 0, 1) == "#") {
|
||||||
|
$type = TERM_HASHTAG;
|
||||||
|
$term = substr($tag, 1);
|
||||||
|
} elseif (substr(trim($tag), 0, 1) == "@") {
|
||||||
|
$type = TERM_MENTION;
|
||||||
|
$term = substr($tag, 1);
|
||||||
|
} else { // This shouldn't happen
|
||||||
|
$type = TERM_HASHTAG;
|
||||||
|
$term = $tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
$r = q("INSERT INTO `term` (`uid`, `oid`, `otype`, `type`, `term`, `url`) VALUES (%d, %d, %d, %d, '%s', '%s')",
|
||||||
|
intval($message["uid"]), intval($itemid), intval(TERM_OBJ_POST), intval($type), dbesc($term), dbesc($link));
|
||||||
|
|
||||||
|
// Search for mentions
|
||||||
|
if ((substr($tag, 0, 1) == '@') AND (strpos($link, $profile_base_friendica) OR strpos($link, $profile_base_diaspora))) {
|
||||||
|
$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
|
||||||
|
foreach ($users AS $user) {
|
||||||
|
if ($user["uid"] == $message["uid"])
|
||||||
|
q("UPDATE `item` SET `mention` = 1 WHERE `id` = %d", intval($itemid));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function create_tags_from_itemuri($itemuri, $uid) {
|
||||||
|
$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
|
||||||
|
|
||||||
|
foreach ($messages as $message)
|
||||||
|
create_tags_from_item($message["id"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_items() {
|
||||||
|
//$messages = q("SELECT `id` FROM `item` where tag !='' ORDER BY `created` DESC limit 10");
|
||||||
|
$messages = q("SELECT `id` FROM `item` where tag !=''");
|
||||||
|
|
||||||
|
foreach ($messages as $message)
|
||||||
|
create_tags_from_item($message["id"]);
|
||||||
|
}
|
||||||
|
|
||||||
|
//print_r($tags);
|
||||||
|
//print_r($hashtags);
|
||||||
|
//print_r($mentions);
|
||||||
|
//update_items();
|
||||||
|
//create_tags_from_item(265194);
|
||||||
|
//create_tags_from_itemuri("infoagent@diasp.org:cce94abd104c06e8", 2);
|
||||||
|
?>
|
||||||
103
include/text.php
103
include/text.php
|
|
@ -6,16 +6,17 @@
|
||||||
// returns substituted string.
|
// returns substituted string.
|
||||||
// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other.
|
// WARNING: this is pretty basic, and doesn't properly handle search strings that are substrings of each other.
|
||||||
// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing,
|
// For instance if 'test' => "foo" and 'testing' => "bar", testing could become either bar or fooing,
|
||||||
// depending on the order in which they were declared in the array.
|
// depending on the order in which they were declared in the array.
|
||||||
|
|
||||||
require_once("include/template_processor.php");
|
require_once("include/template_processor.php");
|
||||||
require_once("include/friendica_smarty.php");
|
require_once("include/friendica_smarty.php");
|
||||||
|
|
||||||
if(! function_exists('replace_macros')) {
|
if(! function_exists('replace_macros')) {
|
||||||
function replace_macros($s,$r) {
|
function replace_macros($s,$r) {
|
||||||
global $t;
|
global $t;
|
||||||
|
|
||||||
// $ts = microtime();
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
if($a->theme['template_engine'] === 'smarty3') {
|
if($a->theme['template_engine'] === 'smarty3') {
|
||||||
|
|
@ -34,12 +35,12 @@ function replace_macros($s,$r) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$r = $t->replace($s,$r);
|
$r = $t->replace($s,$r);
|
||||||
|
|
||||||
$output = template_unescape($r);
|
$output = template_unescape($r);
|
||||||
}
|
}
|
||||||
// $tt = microtime() - $ts;
|
$a = get_app();
|
||||||
// $a = get_app();
|
$a->save_timestamp($stamp1, "rendering");
|
||||||
// $a->page['debug'] .= "$tt <br>\n";
|
|
||||||
return $output;
|
return $output;
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
@ -438,15 +439,26 @@ function load_view_file($s) {
|
||||||
$lang = 'en';
|
$lang = 'en';
|
||||||
$b = basename($s);
|
$b = basename($s);
|
||||||
$d = dirname($s);
|
$d = dirname($s);
|
||||||
if(file_exists("$d/$lang/$b"))
|
if(file_exists("$d/$lang/$b")) {
|
||||||
return file_get_contents("$d/$lang/$b");
|
$stamp1 = microtime(true);
|
||||||
|
$content = file_get_contents("$d/$lang/$b");
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
return $content;
|
||||||
|
}
|
||||||
|
|
||||||
$theme = current_theme();
|
$theme = current_theme();
|
||||||
|
|
||||||
if(file_exists("$d/theme/$theme/$b"))
|
if(file_exists("$d/theme/$theme/$b")) {
|
||||||
return file_get_contents("$d/theme/$theme/$b");
|
$stamp1 = microtime(true);
|
||||||
|
$content = file_get_contents("$d/theme/$theme/$b");
|
||||||
return file_get_contents($s);
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
return $content;
|
||||||
|
}
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
$content = file_get_contents($s);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
return $content;
|
||||||
}}
|
}}
|
||||||
|
|
||||||
if(! function_exists('get_intltext_template')) {
|
if(! function_exists('get_intltext_template')) {
|
||||||
|
|
@ -461,17 +473,28 @@ function get_intltext_template($s) {
|
||||||
if(! isset($lang))
|
if(! isset($lang))
|
||||||
$lang = 'en';
|
$lang = 'en';
|
||||||
|
|
||||||
if(file_exists("view/$lang$engine/$s"))
|
if(file_exists("view/$lang$engine/$s")) {
|
||||||
return file_get_contents("view/$lang$engine/$s");
|
$stamp1 = microtime(true);
|
||||||
elseif(file_exists("view/en$engine/$s"))
|
$content = file_get_contents("view/$lang$engine/$s");
|
||||||
return file_get_contents("view/en$engine/$s");
|
$a->save_timestamp($stamp1, "file");
|
||||||
else
|
return $content;
|
||||||
return file_get_contents("view$engine/$s");
|
} elseif(file_exists("view/en$engine/$s")) {
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
$content = file_get_contents("view/en$engine/$s");
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
return $content;
|
||||||
|
} else {
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
$content = file_get_contents("view$engine/$s");
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
return $content;
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
if(! function_exists('get_markup_template')) {
|
if(! function_exists('get_markup_template')) {
|
||||||
function get_markup_template($s, $root = '') {
|
function get_markup_template($s, $root = '') {
|
||||||
// $ts = microtime();
|
$stamp1 = microtime(true);
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
|
|
||||||
if($a->theme['template_engine'] === 'smarty3') {
|
if($a->theme['template_engine'] === 'smarty3') {
|
||||||
|
|
@ -479,19 +502,20 @@ function get_markup_template($s, $root = '') {
|
||||||
|
|
||||||
$template = new FriendicaSmarty();
|
$template = new FriendicaSmarty();
|
||||||
$template->filename = $template_file;
|
$template->filename = $template_file;
|
||||||
|
$a->save_timestamp($stamp1, "rendering");
|
||||||
|
|
||||||
// $tt = microtime() - $ts;
|
|
||||||
// $a->page['debug'] .= "$tt <br>\n";
|
|
||||||
return $template;
|
return $template;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$template_file = get_template_file($a, $s, $root);
|
$template_file = get_template_file($a, $s, $root);
|
||||||
// $file_contents = file_get_contents($template_file);
|
$a->save_timestamp($stamp1, "rendering");
|
||||||
// $tt = microtime() - $ts;
|
|
||||||
// $a->page['debug'] .= "$tt <br>\n";
|
$stamp1 = microtime(true);
|
||||||
// return $file_contents;
|
$content = file_get_contents($template_file);
|
||||||
return file_get_contents($template_file);
|
$a->save_timestamp($stamp1, "file");
|
||||||
}
|
return $content;
|
||||||
|
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
|
|
||||||
if(! function_exists("get_template_file")) {
|
if(! function_exists("get_template_file")) {
|
||||||
|
|
@ -547,8 +571,10 @@ function logger($msg,$level = 0) {
|
||||||
|
|
||||||
if((! $debugging) || (! $logfile) || ($level > $loglevel))
|
if((! $debugging) || (! $logfile) || ($level > $loglevel))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
$stamp1 = microtime(true);
|
||||||
@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND);
|
@file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
return;
|
return;
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
@ -574,11 +600,12 @@ function get_tags($s) {
|
||||||
$ret = array();
|
$ret = array();
|
||||||
|
|
||||||
// ignore anything in a code block
|
// ignore anything in a code block
|
||||||
|
|
||||||
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
|
$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
|
||||||
|
|
||||||
// ignore anything in a bbtag
|
// Force line feeds at bbtags
|
||||||
|
$s = str_replace(array("[", "]"), array("\n[", "]\n"), $s);
|
||||||
|
|
||||||
|
// ignore anything in a bbtag
|
||||||
$s = preg_replace('/\[(.*?)\]/sm','',$s);
|
$s = preg_replace('/\[(.*?)\]/sm','',$s);
|
||||||
|
|
||||||
// Match full names against @tags including the space between first and last
|
// Match full names against @tags including the space between first and last
|
||||||
|
|
@ -1030,14 +1057,20 @@ function prepare_body($item,$attach = false) {
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
call_hooks('prepare_body_init', $item);
|
call_hooks('prepare_body_init', $item);
|
||||||
|
|
||||||
$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
|
//$cachefile = get_cachefile($item["guid"]."-".strtotime($item["edited"])."-".hash("crc32", $item['body']));
|
||||||
|
$cachefile = get_cachefile($item["guid"]."-".hash("md5", $item['body']));
|
||||||
|
|
||||||
if (($cachefile != '')) {
|
if (($cachefile != '')) {
|
||||||
if (file_exists($cachefile))
|
if (file_exists($cachefile)) {
|
||||||
|
$stamp1 = microtime(true);
|
||||||
$s = file_get_contents($cachefile);
|
$s = file_get_contents($cachefile);
|
||||||
else {
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
} else {
|
||||||
$s = prepare_text($item['body']);
|
$s = prepare_text($item['body']);
|
||||||
|
$stamp1 = microtime(true);
|
||||||
file_put_contents($cachefile, $s);
|
file_put_contents($cachefile, $s);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
logger('prepare_body: put item '.$item["id"].' into cachefile '.$cachefile);
|
||||||
}
|
}
|
||||||
} else
|
} else
|
||||||
$s = prepare_text($item['body']);
|
$s = prepare_text($item['body']);
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
|
||||||
|
|
||||||
|
|
||||||
$lang = get_browser_language();
|
$lang = get_browser_language();
|
||||||
|
|
||||||
load_translation_table($lang);
|
load_translation_table($lang);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
106
mod/admin.php
106
mod/admin.php
|
|
@ -20,7 +20,7 @@ function admin_post(&$a){
|
||||||
|
|
||||||
if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
|
if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// urls
|
// urls
|
||||||
|
|
@ -54,7 +54,7 @@ function admin_post(&$a){
|
||||||
}
|
}
|
||||||
info(t('Theme settings updated.'));
|
info(t('Theme settings updated.'));
|
||||||
if(is_ajax()) return;
|
if(is_ajax()) return;
|
||||||
|
|
||||||
goaway($a->get_baseurl(true) . '/admin/themes/' . $theme );
|
goaway($a->get_baseurl(true) . '/admin/themes/' . $theme );
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
|
|
@ -100,9 +100,9 @@ function admin_content(&$a) {
|
||||||
'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 */
|
||||||
|
|
||||||
$r = q("SELECT * FROM `addon` WHERE `plugin_admin`=1");
|
$r = q("SELECT * FROM `addon` WHERE `plugin_admin`=1");
|
||||||
$aside['plugins_admin']=Array();
|
$aside['plugins_admin']=Array();
|
||||||
foreach ($r as $h){
|
foreach ($r as $h){
|
||||||
|
|
@ -111,7 +111,7 @@ function admin_content(&$a) {
|
||||||
// temp plugins with admin
|
// temp plugins with admin
|
||||||
$a->plugins_admin[] = $plugin;
|
$a->plugins_admin[] = $plugin;
|
||||||
}
|
}
|
||||||
|
|
||||||
$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");
|
||||||
|
|
@ -130,7 +130,6 @@ function admin_content(&$a) {
|
||||||
* Page content
|
* Page content
|
||||||
*/
|
*/
|
||||||
$o = '';
|
$o = '';
|
||||||
|
|
||||||
// urls
|
// urls
|
||||||
if ($a->argc > 1){
|
if ($a->argc > 1){
|
||||||
switch ($a->argv[1]){
|
switch ($a->argv[1]){
|
||||||
|
|
@ -161,7 +160,7 @@ function admin_content(&$a) {
|
||||||
} else {
|
} else {
|
||||||
$o = admin_page_summary($a);
|
$o = admin_page_summary($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_ajax()) {
|
if(is_ajax()) {
|
||||||
echo $o;
|
echo $o;
|
||||||
killme();
|
killme();
|
||||||
|
|
@ -274,12 +273,14 @@ function admin_page_site_post(&$a){
|
||||||
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
|
$diaspora_enabled = ((x($_POST,'diaspora_enabled')) ? True : False);
|
||||||
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
|
$ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
|
||||||
$new_share = ((x($_POST,'new_share')) ? True : False);
|
$new_share = ((x($_POST,'new_share')) ? True : False);
|
||||||
|
$hide_help = ((x($_POST,'hide_help')) ? True : False);
|
||||||
$use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False);
|
$use_fulltext_engine = ((x($_POST,'use_fulltext_engine')) ? True : False);
|
||||||
$itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : '');
|
$itemcache = ((x($_POST,'itemcache')) ? notags(trim($_POST['itemcache'])) : '');
|
||||||
$itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0);
|
$itemcache_duration = ((x($_POST,'itemcache_duration')) ? intval($_POST['itemcache_duration']) : 0);
|
||||||
$lockpath = ((x($_POST,'lockpath')) ? notags(trim($_POST['lockpath'])) : '');
|
$lockpath = ((x($_POST,'lockpath')) ? notags(trim($_POST['lockpath'])) : '');
|
||||||
$temppath = ((x($_POST,'temppath')) ? notags(trim($_POST['temppath'])) : '');
|
$temppath = ((x($_POST,'temppath')) ? notags(trim($_POST['temppath'])) : '');
|
||||||
$basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : '');
|
$basepath = ((x($_POST,'basepath')) ? notags(trim($_POST['basepath'])) : '');
|
||||||
|
$singleuser = ((x($_POST,'singleuser')) ? notags(trim($_POST['singleuser'])) : '');
|
||||||
|
|
||||||
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
|
if($ssl_policy != intval(get_config('system','ssl_policy'))) {
|
||||||
if($ssl_policy == SSL_POLICY_FULL) {
|
if($ssl_policy == SSL_POLICY_FULL) {
|
||||||
|
|
@ -341,7 +342,12 @@ function admin_page_site_post(&$a){
|
||||||
del_config('system','mobile-theme');
|
del_config('system','mobile-theme');
|
||||||
} else {
|
} else {
|
||||||
set_config('system','mobile-theme', $theme_mobile);
|
set_config('system','mobile-theme', $theme_mobile);
|
||||||
}
|
}
|
||||||
|
if ( $singleuser === '---' ) {
|
||||||
|
del_config('system','singleuser');
|
||||||
|
} else {
|
||||||
|
set_config('system','singleuser', $singleuser);
|
||||||
|
}
|
||||||
set_config('system','maximagesize', $maximagesize);
|
set_config('system','maximagesize', $maximagesize);
|
||||||
set_config('system','max_image_length', $maximagelength);
|
set_config('system','max_image_length', $maximagelength);
|
||||||
set_config('system','jpeg_quality', $jpegimagequality);
|
set_config('system','jpeg_quality', $jpegimagequality);
|
||||||
|
|
@ -380,6 +386,7 @@ function admin_page_site_post(&$a){
|
||||||
set_config('system','diaspora_enabled', $diaspora_enabled);
|
set_config('system','diaspora_enabled', $diaspora_enabled);
|
||||||
|
|
||||||
set_config('system','new_share', $new_share);
|
set_config('system','new_share', $new_share);
|
||||||
|
set_config('system','hide_help', $hide_help);
|
||||||
set_config('system','use_fulltext_engine', $use_fulltext_engine);
|
set_config('system','use_fulltext_engine', $use_fulltext_engine);
|
||||||
set_config('system','itemcache', $itemcache);
|
set_config('system','itemcache', $itemcache);
|
||||||
set_config('system','itemcache_duration', $itemcache_duration);
|
set_config('system','itemcache_duration', $itemcache_duration);
|
||||||
|
|
@ -426,19 +433,26 @@ function admin_page_site(&$a) {
|
||||||
if (file_exists($file . '/mobile')) {
|
if (file_exists($file . '/mobile')) {
|
||||||
$theme_choices_mobile[$f] = $theme_name;
|
$theme_choices_mobile[$f] = $theme_name;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$theme_choices[$f] = $theme_name;
|
$theme_choices[$f] = $theme_name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* get user names to make the install a personal install of X */
|
||||||
|
$user_names = array();
|
||||||
|
$user_names['---'] = t('Multi user instance');
|
||||||
|
$users = q("SELECT username, nickname FROM `user`");
|
||||||
|
foreach ($users as $user) {
|
||||||
|
$user_names[$user['nickname']] = $user['username'];
|
||||||
|
}
|
||||||
|
|
||||||
/* Banner */
|
/* Banner */
|
||||||
$banner = get_config('system','banner');
|
$banner = get_config('system','banner');
|
||||||
if($banner == false)
|
if($banner == false)
|
||||||
$banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
|
$banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
|
||||||
$banner = htmlspecialchars($banner);
|
$banner = htmlspecialchars($banner);
|
||||||
|
|
||||||
//echo "<pre>"; var_dump($lang_choices); die("</pre>");
|
//echo "<pre>"; var_dump($lang_choices); die("</pre>");
|
||||||
|
|
||||||
/* Register policy */
|
/* Register policy */
|
||||||
|
|
@ -474,6 +488,8 @@ function admin_page_site(&$a) {
|
||||||
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
|
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
|
||||||
'$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
|
'$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
|
||||||
'$new_share' => array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")),
|
'$new_share' => array('new_share', t("'Share' element"), get_config('system','new_share'), t("Activates the bbcode element 'share' for repeating items.")),
|
||||||
|
'$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
|
||||||
|
'$singleuser' => array('singleuser', t("Single user instance"), get_config('system','singleuser'), t("Make this instance multi-user or single-user for the named user"), $user_names),
|
||||||
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
||||||
'$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
|
'$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
|
||||||
'$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
|
'$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
|
||||||
|
|
@ -763,7 +779,7 @@ function admin_page_users(&$a){
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_plugins(&$a){
|
function admin_page_plugins(&$a){
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Single plugin
|
* Single plugin
|
||||||
*/
|
*/
|
||||||
|
|
@ -773,9 +789,9 @@ function admin_page_plugins(&$a){
|
||||||
notice( t("Item not found.") );
|
notice( t("Item not found.") );
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET,"a") && $_GET['a']=="t"){
|
if (x($_GET,"a") && $_GET['a']=="t"){
|
||||||
check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
|
check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
|
||||||
|
|
||||||
// Toggle plugin status
|
// Toggle plugin status
|
||||||
$idx = array_search($plugin, $a->plugins);
|
$idx = array_search($plugin, $a->plugins);
|
||||||
|
|
@ -800,52 +816,53 @@ function admin_page_plugins(&$a){
|
||||||
} else {
|
} else {
|
||||||
$status="off"; $action= t("Enable");
|
$status="off"; $action= t("Enable");
|
||||||
}
|
}
|
||||||
|
|
||||||
$readme=Null;
|
$readme=Null;
|
||||||
if (is_file("addon/$plugin/README.md")){
|
if (is_file("addon/$plugin/README.md")){
|
||||||
$readme = file_get_contents("addon/$plugin/README.md");
|
$readme = file_get_contents("addon/$plugin/README.md");
|
||||||
$readme = Markdown($readme);
|
$readme = Markdown($readme);
|
||||||
} else if (is_file("addon/$plugin/README")){
|
} else if (is_file("addon/$plugin/README")){
|
||||||
$readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
|
$readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$admin_form="";
|
$admin_form="";
|
||||||
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){
|
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)){
|
||||||
@require_once("addon/$plugin/$plugin.php");
|
@require_once("addon/$plugin/$plugin.php");
|
||||||
$func = $plugin.'_plugin_admin';
|
$func = $plugin.'_plugin_admin';
|
||||||
$func($a, $admin_form);
|
$func($a, $admin_form);
|
||||||
}
|
}
|
||||||
|
|
||||||
$t = get_markup_template("admin_plugins_details.tpl");
|
$t = get_markup_template("admin_plugins_details.tpl");
|
||||||
|
|
||||||
return replace_macros($t, array(
|
return replace_macros($t, array(
|
||||||
'$title' => t('Administration'),
|
'$title' => t('Administration'),
|
||||||
'$page' => t('Plugins'),
|
'$page' => t('Plugins'),
|
||||||
'$toggle' => t('Toggle'),
|
'$toggle' => t('Toggle'),
|
||||||
'$settings' => t('Settings'),
|
'$settings' => t('Settings'),
|
||||||
'$baseurl' => $a->get_baseurl(true),
|
'$baseurl' => $a->get_baseurl(true),
|
||||||
|
|
||||||
'$plugin' => $plugin,
|
'$plugin' => $plugin,
|
||||||
'$status' => $status,
|
'$status' => $status,
|
||||||
'$action' => $action,
|
'$action' => $action,
|
||||||
'$info' => get_plugin_info($plugin),
|
'$info' => get_plugin_info($plugin),
|
||||||
'$str_author' => t('Author: '),
|
'$str_author' => t('Author: '),
|
||||||
'$str_maintainer' => t('Maintainer: '),
|
'$str_maintainer' => t('Maintainer: '),
|
||||||
|
|
||||||
'$admin_form' => $admin_form,
|
'$admin_form' => $admin_form,
|
||||||
'$function' => 'plugins',
|
'$function' => 'plugins',
|
||||||
'$screenshot' => '',
|
'$screenshot' => '',
|
||||||
'$readme' => $readme,
|
'$readme' => $readme,
|
||||||
|
|
||||||
'$form_security_token' => get_form_security_token("admin_themes"),
|
'$form_security_token' => get_form_security_token("admin_themes"),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List plugins
|
* List plugins
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$plugins = array();
|
$plugins = array();
|
||||||
$files = glob("addon/*/");
|
$files = glob("addon/*/");
|
||||||
if($files) {
|
if($files) {
|
||||||
|
|
@ -857,7 +874,7 @@ function admin_page_plugins(&$a){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$t = get_markup_template("admin_plugins.tpl");
|
$t = get_markup_template("admin_plugins.tpl");
|
||||||
return replace_macros($t, array(
|
return replace_macros($t, array(
|
||||||
'$title' => t('Administration'),
|
'$title' => t('Administration'),
|
||||||
|
|
@ -928,7 +945,7 @@ function rebuild_theme_table($themes) {
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Themes admin page
|
* Themes admin page
|
||||||
*
|
*
|
||||||
|
|
@ -936,7 +953,7 @@ function rebuild_theme_table($themes) {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function admin_page_themes(&$a){
|
function admin_page_themes(&$a){
|
||||||
|
|
||||||
$allowed_themes_str = get_config('system','allowed_themes');
|
$allowed_themes_str = get_config('system','allowed_themes');
|
||||||
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
$allowed_themes_raw = explode(',',$allowed_themes_str);
|
||||||
$allowed_themes = array();
|
$allowed_themes = array();
|
||||||
|
|
@ -972,9 +989,9 @@ function admin_page_themes(&$a){
|
||||||
notice( t("Item not found.") );
|
notice( t("Item not found.") );
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_GET,"a") && $_GET['a']=="t"){
|
if (x($_GET,"a") && $_GET['a']=="t"){
|
||||||
check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
|
check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
|
||||||
|
|
||||||
// Toggle theme status
|
// Toggle theme status
|
||||||
|
|
||||||
|
|
@ -1002,28 +1019,27 @@ function admin_page_themes(&$a){
|
||||||
} else {
|
} else {
|
||||||
$status="off"; $action= t("Enable");
|
$status="off"; $action= t("Enable");
|
||||||
}
|
}
|
||||||
|
|
||||||
$readme=Null;
|
$readme=Null;
|
||||||
if (is_file("view/theme/$theme/README.md")){
|
if (is_file("view/theme/$theme/README.md")){
|
||||||
$readme = file_get_contents("view/theme/$theme/README.md");
|
$readme = file_get_contents("view/theme/$theme/README.md");
|
||||||
$readme = Markdown($readme);
|
$readme = Markdown($readme);
|
||||||
} else if (is_file("view/theme/$theme/README")){
|
} else if (is_file("view/theme/$theme/README")){
|
||||||
$readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
|
$readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
|
||||||
}
|
}
|
||||||
|
|
||||||
$admin_form="";
|
$admin_form="";
|
||||||
if (is_file("view/theme/$theme/config.php")){
|
if (is_file("view/theme/$theme/config.php")){
|
||||||
require_once("view/theme/$theme/config.php");
|
require_once("view/theme/$theme/config.php");
|
||||||
if(function_exists("theme_admin")){
|
if(function_exists("theme_admin")){
|
||||||
$admin_form = theme_admin($a);
|
$admin_form = theme_admin($a);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
|
$screenshot = array( get_theme_screenshot($theme), t('Screenshot'));
|
||||||
if(! stristr($screenshot[0],$theme))
|
if(! stristr($screenshot[0],$theme))
|
||||||
$screenshot = null;
|
$screenshot = null;
|
||||||
|
|
||||||
$t = get_markup_template("admin_plugins_details.tpl");
|
$t = get_markup_template("admin_plugins_details.tpl");
|
||||||
return replace_macros($t, array(
|
return replace_macros($t, array(
|
||||||
|
|
@ -1032,7 +1048,7 @@ function admin_page_themes(&$a){
|
||||||
'$toggle' => t('Toggle'),
|
'$toggle' => t('Toggle'),
|
||||||
'$settings' => t('Settings'),
|
'$settings' => t('Settings'),
|
||||||
'$baseurl' => $a->get_baseurl(true),
|
'$baseurl' => $a->get_baseurl(true),
|
||||||
|
|
||||||
'$plugin' => $theme,
|
'$plugin' => $theme,
|
||||||
'$status' => $status,
|
'$status' => $status,
|
||||||
'$action' => $action,
|
'$action' => $action,
|
||||||
|
|
@ -1046,21 +1062,19 @@ function admin_page_themes(&$a){
|
||||||
|
|
||||||
'$form_security_token' => get_form_security_token("admin_themes"),
|
'$form_security_token' => get_form_security_token("admin_themes"),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* List themes
|
* List themes
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$xthemes = array();
|
$xthemes = array();
|
||||||
if($themes) {
|
if($themes) {
|
||||||
foreach($themes as $th) {
|
foreach($themes as $th) {
|
||||||
$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$t = get_markup_template("admin_plugins.tpl");
|
$t = get_markup_template("admin_plugins.tpl");
|
||||||
return replace_macros($t, array(
|
return replace_macros($t, array(
|
||||||
'$title' => t('Administration'),
|
'$title' => t('Administration'),
|
||||||
|
|
|
||||||
|
|
@ -64,23 +64,25 @@ function community_content(&$a, $update = 0) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
//$r = q("SELECT distinct(`item`.`uri`)
|
||||||
|
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `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`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` FORCE INDEX (`received`) 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 group by `item`.`uri`
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self`
|
||||||
ORDER BY `received` DESC LIMIT %d, %d ",
|
ORDER BY `received` DESC LIMIT %d, %d ",
|
||||||
intval($a->pager['start']),
|
intval($a->pager['start']),
|
||||||
intval($a->pager['itemspage'])
|
intval($a->pager['itemspage'])
|
||||||
|
|
||||||
);
|
);
|
||||||
|
// group by `item`.`uri`
|
||||||
|
|
||||||
if(! count($r)) {
|
if(! count($r)) {
|
||||||
info( t('No results.') . EOL);
|
info( t('No results.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -160,16 +160,26 @@ function content_content(&$a, $update = 0) {
|
||||||
|
|
||||||
$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
|
$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
|
||||||
$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
|
$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
|
||||||
|
$sql_table = "`item`";
|
||||||
|
|
||||||
if(x($_GET,'search')) {
|
if(x($_GET,'search')) {
|
||||||
$search = escape_tags($_GET['search']);
|
$search = escape_tags($_GET['search']);
|
||||||
if (get_config('system','use_fulltext_engine')) {
|
|
||||||
|
if(strpos($search,'#') === 0) {
|
||||||
|
$tag = true;
|
||||||
|
$search = substr($search,1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_config('system','only_tag_search'))
|
||||||
|
$tag = true;
|
||||||
|
|
||||||
|
/*if (get_config('system','use_fulltext_engine')) {
|
||||||
if(strpos($search,'#') === 0)
|
if(strpos($search,'#') === 0)
|
||||||
$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('%s' in boolean mode)) ",
|
||||||
dbesc(protect_sprintf($search))
|
dbesc(protect_sprintf($search))
|
||||||
);
|
);
|
||||||
else
|
else
|
||||||
$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
$sql_extra .= sprintf(" AND (MATCH(`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode)) ",
|
||||||
dbesc(protect_sprintf($search)),
|
dbesc(protect_sprintf($search)),
|
||||||
dbesc(protect_sprintf($search))
|
dbesc(protect_sprintf($search))
|
||||||
);
|
);
|
||||||
|
|
@ -178,7 +188,19 @@ function content_content(&$a, $update = 0) {
|
||||||
dbesc(protect_sprintf('%' . $search . '%')),
|
dbesc(protect_sprintf('%' . $search . '%')),
|
||||||
dbesc(protect_sprintf('%]' . $search . '[%'))
|
dbesc(protect_sprintf('%]' . $search . '[%'))
|
||||||
);
|
);
|
||||||
|
}*/
|
||||||
|
|
||||||
|
if($tag) {
|
||||||
|
$sql_extra = sprintf(" AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d ",
|
||||||
|
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
|
||||||
|
$sql_table = "`term` LEFT JOIN `item` ON `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` ";
|
||||||
|
} else {
|
||||||
|
if (get_config('system','use_fulltext_engine'))
|
||||||
|
$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
|
||||||
|
else
|
||||||
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($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));
|
||||||
|
|
@ -189,38 +211,39 @@ function content_content(&$a, $update = 0) {
|
||||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||||
$myurl = str_replace('www.','',$myurl);
|
$myurl = str_replace('www.','',$myurl);
|
||||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||||
if (get_config('system','use_fulltext_engine'))
|
/*if (get_config('system','use_fulltext_engine'))
|
||||||
$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))) ",
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from $sql_table where (MATCH(`author-link`, `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($myurl)),
|
dbesc(protect_sprintf($myurl)),
|
||||||
dbesc(protect_sprintf($diasp_url))
|
dbesc(protect_sprintf($diasp_url))
|
||||||
);
|
);
|
||||||
else
|
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' )) ",
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from $sql_table where ( `author-link` like '%s' or `tag` like '%s' or tag like '%s' )) ",
|
||||||
dbesc(protect_sprintf('%' . $myurl)),
|
dbesc(protect_sprintf('%' . $myurl)),
|
||||||
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
);
|
);*/
|
||||||
|
|
||||||
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)",
|
||||||
|
dbesc(protect_sprintf($myurl)),
|
||||||
|
dbesc(protect_sprintf($myurl))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
|
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if($nouveau) {
|
if($nouveau) {
|
||||||
// "New Item View" - show all items unthreaded in reverse created date order
|
// "New Item View" - show all items unthreaded in reverse created date order
|
||||||
|
|
||||||
$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`.`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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
|
||||||
AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
||||||
$simple_update
|
$simple_update
|
||||||
AND `contact`.`id` = `item`.`contact-id`
|
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra $sql_nets
|
$sql_extra $sql_nets
|
||||||
ORDER BY `item`.`received` DESC $pager_sql ",
|
ORDER BY `item`.`received` DESC $pager_sql ",
|
||||||
|
|
@ -241,7 +264,7 @@ function content_content(&$a, $update = 0) {
|
||||||
$start = dba_timer();
|
$start = dba_timer();
|
||||||
|
|
||||||
$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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||||
AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
AND `item`.`parent` = `item`.`id`
|
AND `item`.`parent` = `item`.`id`
|
||||||
|
|
@ -268,9 +291,9 @@ function content_content(&$a, $update = 0) {
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||||
AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id`
|
AND `item`.`moderated` = 0
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
AND `item`.`parent` IN ( %s )
|
AND `item`.`parent` IN ( %s )
|
||||||
$sql_extra ",
|
$sql_extra ",
|
||||||
|
|
@ -287,7 +310,7 @@ function content_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
logger('parent dba_timer: ' . sprintf('%01.4f',$first - $start));
|
logger('parent dba_timer: ' . sprintf('%01.4f',$first - $start));
|
||||||
logger('child dba_timer: ' . sprintf('%01.4f',$second - $first));
|
logger('child dba_timer: ' . sprintf('%01.4f',$second - $first));
|
||||||
|
|
||||||
|
|
@ -298,7 +321,7 @@ function content_content(&$a, $update = 0) {
|
||||||
|
|
||||||
$o = render_content($a,$items,$mode,false);
|
$o = render_content($a,$items,$mode,false);
|
||||||
|
|
||||||
|
|
||||||
header('Content-type: application/json');
|
header('Content-type: application/json');
|
||||||
echo json_encode($o);
|
echo json_encode($o);
|
||||||
killme();
|
killme();
|
||||||
|
|
|
||||||
48
mod/item.php
48
mod/item.php
|
|
@ -19,6 +19,7 @@ require_once('include/crypto.php');
|
||||||
require_once('include/enotify.php');
|
require_once('include/enotify.php');
|
||||||
require_once('include/email.php');
|
require_once('include/email.php');
|
||||||
require_once('library/langdet/Text/LanguageDetect.php');
|
require_once('library/langdet/Text/LanguageDetect.php');
|
||||||
|
require_once('include/tags.php');
|
||||||
|
|
||||||
function item_post(&$a) {
|
function item_post(&$a) {
|
||||||
|
|
||||||
|
|
@ -236,9 +237,23 @@ function item_post(&$a) {
|
||||||
|
|
||||||
if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
|
if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
|
||||||
$l = new Text_LanguageDetect;
|
$l = new Text_LanguageDetect;
|
||||||
$lng = $l->detectConfidence($naked_body);
|
//$lng = $l->detectConfidence($naked_body);
|
||||||
|
//$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
|
||||||
|
|
||||||
$postopts = (($lng['language']) ? 'lang=' . $lng['language'] . ';' . $lng['confidence'] : '');
|
$lng = $l->detect($naked_body, 3);
|
||||||
|
|
||||||
|
if (sizeof($lng) > 0) {
|
||||||
|
$postopts = "";
|
||||||
|
|
||||||
|
foreach ($lng as $language => $score) {
|
||||||
|
if ($postopts == "")
|
||||||
|
$postopts = "lang=";
|
||||||
|
else
|
||||||
|
$postopts .= ":";
|
||||||
|
|
||||||
|
$postopts .= $language.";".$score;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
|
logger('mod_item: detect language' . print_r($lng,true) . $naked_body, LOGGER_DATA);
|
||||||
}
|
}
|
||||||
|
|
@ -675,6 +690,7 @@ function item_post(&$a) {
|
||||||
intval($post_id),
|
intval($post_id),
|
||||||
intval($profile_uid)
|
intval($profile_uid)
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($post_id, $profile_uid);
|
||||||
|
|
||||||
// update filetags in pconfig
|
// update filetags in pconfig
|
||||||
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
||||||
|
|
@ -740,10 +756,22 @@ function item_post(&$a) {
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
$post_id = $r[0]['id'];
|
$post_id = $r[0]['id'];
|
||||||
logger('mod_item: saved item ' . $post_id);
|
logger('mod_item: saved item ' . $post_id);
|
||||||
|
create_tags_from_item($post_id);
|
||||||
|
|
||||||
// update filetags in pconfig
|
// update filetags in pconfig
|
||||||
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
|
||||||
|
|
||||||
|
// Store the fresh generated item into the cache
|
||||||
|
$cachefile = get_cachefile($datarray["guid"]."-".hash("md5", $datarray['body']));
|
||||||
|
|
||||||
|
if (($cachefile != '') AND !file_exists($cachefile)) {
|
||||||
|
$s = prepare_text($datarray['body']);
|
||||||
|
$stamp1 = microtime(true);
|
||||||
|
file_put_contents($cachefile, $s);
|
||||||
|
$a->save_timestamp($stamp1, "file");
|
||||||
|
logger('mod_item: put item '.$r[0]['id'].' into cachefile '.$cachefile);
|
||||||
|
}
|
||||||
|
|
||||||
if($parent) {
|
if($parent) {
|
||||||
|
|
||||||
// This item is the last leaf and gets the comment box, clear any ancestors
|
// This item is the last leaf and gets the comment box, clear any ancestors
|
||||||
|
|
@ -872,14 +900,20 @@ function item_post(&$a) {
|
||||||
} else {
|
} else {
|
||||||
$subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
|
$subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
|
||||||
}
|
}
|
||||||
$headers = 'From: ' . email_header_encode($a->user['username'],'UTF-8') . ' <' . $a->user['email'] . '>' . "\n";
|
|
||||||
$headers .= 'MIME-Version: 1.0' . "\n";
|
|
||||||
$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";
|
|
||||||
$headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n";
|
|
||||||
$link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
|
$link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
|
||||||
$html = prepare_body($datarray);
|
$html = prepare_body($datarray);
|
||||||
$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
|
$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
|
||||||
@mail($addr, $subject, $message, $headers);
|
include_once('include/html2plain.php');
|
||||||
|
$params = array (
|
||||||
|
'fromName' => $a->user['username'],
|
||||||
|
'fromEmail' => $a->user['email'],
|
||||||
|
'toEmail' => $addr,
|
||||||
|
'replyTo' => $a->user['email'],
|
||||||
|
'messageSubject' => $subject,
|
||||||
|
'htmlVersion' => $message,
|
||||||
|
'textVersion' => html2plain($html.$disclaimer),
|
||||||
|
);
|
||||||
|
enotify::send($params);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ function network_init(&$a) {
|
||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$is_a_date_query = false;
|
$is_a_date_query = false;
|
||||||
|
|
||||||
if($a->argc > 1) {
|
if($a->argc > 1) {
|
||||||
|
|
@ -17,12 +17,12 @@ function network_init(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// convert query string to array and remove first element (which is friendica args)
|
// convert query string to array and remove first element (which is friendica args)
|
||||||
$query_array = array();
|
$query_array = array();
|
||||||
parse_str($a->query_string, $query_array);
|
parse_str($a->query_string, $query_array);
|
||||||
array_shift($query_array);
|
array_shift($query_array);
|
||||||
|
|
||||||
// fetch last used network view and redirect if needed
|
// fetch last used network view and redirect if needed
|
||||||
if(! $is_a_date_query) {
|
if(! $is_a_date_query) {
|
||||||
$sel_tabs = network_query_get_sel_tab($a);
|
$sel_tabs = network_query_get_sel_tab($a);
|
||||||
|
|
@ -141,11 +141,11 @@ function network_init(&$a) {
|
||||||
|
|
||||||
if(x($_GET['nets']) && $_GET['nets'] === 'all')
|
if(x($_GET['nets']) && $_GET['nets'] === 'all')
|
||||||
unset($_GET['nets']);
|
unset($_GET['nets']);
|
||||||
|
|
||||||
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
|
$group_id = (($a->argc > 1 && is_numeric($a->argv[1])) ? intval($a->argv[1]) : 0);
|
||||||
|
|
||||||
set_pconfig(local_user(), 'network.view', 'group.selected', $group_id);
|
set_pconfig(local_user(), 'network.view', 'group.selected', $group_id);
|
||||||
|
|
||||||
require_once('include/group.php');
|
require_once('include/group.php');
|
||||||
require_once('include/contact_widgets.php');
|
require_once('include/contact_widgets.php');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
|
|
@ -321,7 +321,7 @@ function network_query_get_sel_net() {
|
||||||
if(x($_GET,'nets')) {
|
if(x($_GET,'nets')) {
|
||||||
$network = $_GET['nets'];
|
$network = $_GET['nets'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $network;
|
return $network;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -382,14 +382,14 @@ function network_content(&$a, $update = 0) {
|
||||||
// item filter tabs
|
// item filter tabs
|
||||||
// TODO: fix this logic, reduce duplication
|
// TODO: fix this logic, reduce duplication
|
||||||
//$a->page['content'] .= '<div class="tabs-wrapper">';
|
//$a->page['content'] .= '<div class="tabs-wrapper">';
|
||||||
|
|
||||||
list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
|
list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
|
||||||
// if no tabs are selected, defaults to comments
|
// if no tabs are selected, defaults to comments
|
||||||
if ($no_active=='active') $all_active='active';
|
if ($no_active=='active') $all_active='active';
|
||||||
//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
|
//echo "<pre>"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
|
||||||
|
|
||||||
$cmd = (($datequery) ? '' : $a->cmd);
|
$cmd = (($datequery) ? '' : $a->cmd);
|
||||||
$len_naked_cmd = strlen(str_replace('/new','',$cmd));
|
$len_naked_cmd = strlen(str_replace('/new','',$cmd));
|
||||||
|
|
||||||
// tabs
|
// tabs
|
||||||
$tabs = array(
|
$tabs = array(
|
||||||
|
|
@ -435,10 +435,10 @@ function network_content(&$a, $update = 0) {
|
||||||
// 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
|
// 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1'
|
||||||
// 'sel'=> $spam_active,
|
// 'sel'=> $spam_active,
|
||||||
// 'title' => t('Posts flagged as SPAM'),
|
// 'title' => t('Posts flagged as SPAM'),
|
||||||
// ),
|
// ),
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if(feature_enabled(local_user(),'personal_tab')) {
|
if(feature_enabled(local_user(),'personal_tab')) {
|
||||||
$tabs[] = array(
|
$tabs[] = array(
|
||||||
'label' => t('Personal'),
|
'label' => t('Personal'),
|
||||||
|
|
@ -500,7 +500,7 @@ function network_content(&$a, $update = 0) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$contact_id = $a->cid;
|
$contact_id = $a->cid;
|
||||||
|
|
||||||
|
|
@ -573,11 +573,11 @@ function network_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// We don't have to deal with ACL's on this page. You're looking at everything
|
// We don't have to deal with ACLs on this page. You're looking at everything
|
||||||
// that belongs to you, hence you can see all of it. We will filter by group if
|
// that belongs to you, hence you can see all of it. We will filter by group if
|
||||||
// desired.
|
// desired.
|
||||||
|
|
||||||
|
|
||||||
$sql_options = (($star) ? " and starred = 1 " : '');
|
$sql_options = (($star) ? " and starred = 1 " : '');
|
||||||
$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
|
$sql_options .= (($bmark) ? " and bookmark = 1 " : '');
|
||||||
|
|
||||||
|
|
@ -647,16 +647,26 @@ function network_content(&$a, $update = 0) {
|
||||||
|
|
||||||
$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
|
$sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` ");
|
||||||
$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
|
$sql_extra3 = (($nouveau) ? '' : $sql_extra3);
|
||||||
|
$sql_table = "`item`";
|
||||||
|
|
||||||
if(x($_GET,'search')) {
|
if(x($_GET,'search')) {
|
||||||
$search = escape_tags($_GET['search']);
|
$search = escape_tags($_GET['search']);
|
||||||
if (get_config('system','use_fulltext_engine')) {
|
|
||||||
|
if(strpos($search,'#') === 0) {
|
||||||
|
$tag = true;
|
||||||
|
$search = substr($search,1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (get_config('system','only_tag_search'))
|
||||||
|
$tag = true;
|
||||||
|
|
||||||
|
/*if (get_config('system','use_fulltext_engine')) {
|
||||||
if(strpos($search,'#') === 0)
|
if(strpos($search,'#') === 0)
|
||||||
$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
$sql_extra .= sprintf(" AND (MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
||||||
dbesc(protect_sprintf($search))
|
dbesc(protect_sprintf($search))
|
||||||
);
|
);
|
||||||
else
|
else
|
||||||
$sql_extra .= sprintf(" AND (MATCH(`item`.`body`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode)) ",
|
$sql_extra .= sprintf(" AND (MATCH(`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode)) ",
|
||||||
dbesc(protect_sprintf($search)),
|
dbesc(protect_sprintf($search)),
|
||||||
dbesc(protect_sprintf($search))
|
dbesc(protect_sprintf($search))
|
||||||
);
|
);
|
||||||
|
|
@ -665,6 +675,17 @@ function network_content(&$a, $update = 0) {
|
||||||
dbesc(protect_sprintf('%' . $search . '%')),
|
dbesc(protect_sprintf('%' . $search . '%')),
|
||||||
dbesc(protect_sprintf('%]' . $search . '[%'))
|
dbesc(protect_sprintf('%]' . $search . '[%'))
|
||||||
);
|
);
|
||||||
|
}*/
|
||||||
|
|
||||||
|
if($tag) {
|
||||||
|
$sql_extra = sprintf(" AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d ",
|
||||||
|
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
|
||||||
|
$sql_table = "`term` LEFT JOIN `item` ON `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` ";
|
||||||
|
} else {
|
||||||
|
if (get_config('system','use_fulltext_engine'))
|
||||||
|
$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
|
||||||
|
else
|
||||||
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(strlen($file)) {
|
if(strlen($file)) {
|
||||||
|
|
@ -676,8 +697,10 @@ function network_content(&$a, $update = 0) {
|
||||||
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
$myurl = substr($myurl,strpos($myurl,'://')+3);
|
||||||
$myurl = str_replace('www.','',$myurl);
|
$myurl = str_replace('www.','',$myurl);
|
||||||
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
$diasp_url = str_replace('/profile/','/u/',$myurl);
|
||||||
if (get_config('system','use_fulltext_engine'))
|
/*if (get_config('system','use_fulltext_engine'))
|
||||||
$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))) ",
|
$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))) ",
|
||||||
|
//$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where (`author-link` IN ('https://%s', 'http://%s') OR MATCH(`tag`) AGAINST ('".'"%s"'."' in boolean mode) or MATCH(tag) AGAINST ('".'"%s"'."' in boolean mode))) ",
|
||||||
|
//$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)",
|
||||||
dbesc(protect_sprintf($myurl)),
|
dbesc(protect_sprintf($myurl)),
|
||||||
dbesc(protect_sprintf($myurl)),
|
dbesc(protect_sprintf($myurl)),
|
||||||
dbesc(protect_sprintf($diasp_url))
|
dbesc(protect_sprintf($diasp_url))
|
||||||
|
|
@ -687,8 +710,12 @@ function network_content(&$a, $update = 0) {
|
||||||
dbesc(protect_sprintf('%' . $myurl)),
|
dbesc(protect_sprintf('%' . $myurl)),
|
||||||
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
dbesc(protect_sprintf('%' . $myurl . ']%')),
|
||||||
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
dbesc(protect_sprintf('%' . $diasp_url . ']%'))
|
||||||
);
|
);*/
|
||||||
|
|
||||||
|
$sql_extra .= sprintf(" AND `item`.`parent` IN (SELECT distinct(`parent`) from item where `author-link` IN ('https://%s', 'http://%s') OR `mention`)",
|
||||||
|
dbesc(protect_sprintf($myurl)),
|
||||||
|
dbesc(protect_sprintf($myurl))
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($update) {
|
if($update) {
|
||||||
|
|
@ -700,7 +727,7 @@ function network_content(&$a, $update = 0) {
|
||||||
else {
|
else {
|
||||||
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
|
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
|
||||||
$r = q("SELECT COUNT(*) AS `total`
|
$r = q("SELECT COUNT(*) AS `total`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra2 $sql_extra3
|
$sql_extra2 $sql_extra3
|
||||||
|
|
@ -731,11 +758,10 @@ function network_content(&$a, $update = 0) {
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
|
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1
|
||||||
AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
AND `item`.`deleted` = 0 and `item`.`moderated` = 0
|
||||||
$simple_update
|
$simple_update
|
||||||
AND `contact`.`id` = `item`.`contact-id`
|
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra $sql_nets
|
$sql_extra $sql_nets
|
||||||
ORDER BY `item`.`received` DESC $pager_sql ",
|
ORDER BY `item`.`received` DESC $pager_sql ",
|
||||||
|
|
@ -758,7 +784,7 @@ function network_content(&$a, $update = 0) {
|
||||||
|
|
||||||
if($update) {
|
if($update) {
|
||||||
$r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
|
$r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
|
||||||
(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
|
(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE ."' OR item.verb = '" . ACTIVITY_DISLIKE . "')
|
||||||
and `item`.`moderated` = 0 and `item`.`unseen` = 1
|
and `item`.`moderated` = 0 and `item`.`unseen` = 1
|
||||||
|
|
@ -769,7 +795,7 @@ function network_content(&$a, $update = 0) {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||||
AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
AND `item`.`parent` = `item`.`id`
|
AND `item`.`parent` = `item`.`id`
|
||||||
|
|
@ -794,9 +820,9 @@ function network_content(&$a, $update = 0) {
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `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 $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||||
AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id`
|
AND `item`.`moderated` = 0
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
AND `item`.`parent` IN ( %s )
|
AND `item`.`parent` IN ( %s )
|
||||||
$sql_extra ",
|
$sql_extra ",
|
||||||
|
|
@ -818,7 +844,7 @@ function network_content(&$a, $update = 0) {
|
||||||
// We aren't going to try and figure out at the item, group, and page
|
// We aren't going to try and figure out at the item, group, and page
|
||||||
// level which items you've seen and which you haven't. If you're looking
|
// level which items you've seen and which you haven't. If you're looking
|
||||||
// at the top level network page just mark everything seen.
|
// at the top level network page just mark everything seen.
|
||||||
|
|
||||||
|
|
||||||
// The $update_unseen is a bit unreliable if you have stuff coming into your stream from a new contact -
|
// The $update_unseen is a bit unreliable if you have stuff coming into your stream from a new contact -
|
||||||
// and other feeds that bring in stuff from the past. One can't find it all.
|
// and other feeds that bring in stuff from the past. One can't find it all.
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ function photo_init(&$a) {
|
||||||
intval($resolution)
|
intval($resolution)
|
||||||
);
|
);
|
||||||
if(count($r)) {
|
if(count($r)) {
|
||||||
|
|
||||||
$sql_extra = permissions_sql($r[0]['uid']);
|
$sql_extra = permissions_sql($r[0]['uid']);
|
||||||
|
|
||||||
// Now we'll see if we can access the photo
|
// Now we'll see if we can access the photo
|
||||||
|
|
@ -169,10 +169,13 @@ function photo_init(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($customres) && $customres > 0 && $customres < 500) {
|
// Resize only if its not a GIF
|
||||||
|
if ($mime != "image/gif") {
|
||||||
$ph = new Photo($data, $mimetype);
|
$ph = new Photo($data, $mimetype);
|
||||||
if($ph->is_valid()) {
|
if($ph->is_valid()) {
|
||||||
$ph->scaleImageSquare($customres);
|
if(isset($customres) && $customres > 0 && $customres < 500) {
|
||||||
|
$ph->scaleImageSquare($customres);
|
||||||
|
}
|
||||||
$data = $ph->imageString();
|
$data = $ph->imageString();
|
||||||
$mimetype = $ph->getType();
|
$mimetype = $ph->getType();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ require_once('include/acl_selectors.php');
|
||||||
require_once('include/bbcode.php');
|
require_once('include/bbcode.php');
|
||||||
require_once('include/security.php');
|
require_once('include/security.php');
|
||||||
require_once('include/redir.php');
|
require_once('include/redir.php');
|
||||||
|
require_once('include/tags.php');
|
||||||
|
|
||||||
function photos_init(&$a) {
|
function photos_init(&$a) {
|
||||||
|
|
||||||
|
|
@ -252,6 +252,7 @@ function photos_post(&$a) {
|
||||||
dbesc($rr['parent-uri']),
|
dbesc($rr['parent-uri']),
|
||||||
intval($page_owner_uid)
|
intval($page_owner_uid)
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($rr['parent-uri'], $page_owner_uid);
|
||||||
|
|
||||||
$drop_id = intval($rr['id']);
|
$drop_id = intval($rr['id']);
|
||||||
|
|
||||||
|
|
@ -321,6 +322,7 @@ function photos_post(&$a) {
|
||||||
dbesc($i[0]['uri']),
|
dbesc($i[0]['uri']),
|
||||||
intval($page_owner_uid)
|
intval($page_owner_uid)
|
||||||
);
|
);
|
||||||
|
create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
|
||||||
|
|
||||||
$url = $a->get_baseurl();
|
$url = $a->get_baseurl();
|
||||||
$drop_id = intval($i[0]['id']);
|
$drop_id = intval($i[0]['id']);
|
||||||
|
|
@ -381,7 +383,7 @@ function photos_post(&$a) {
|
||||||
$ph->scaleImage(640);
|
$ph->scaleImage(640);
|
||||||
$width = $ph->getWidth();
|
$width = $ph->getWidth();
|
||||||
$height = $ph->getHeight();
|
$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",
|
$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()),
|
dbesc($ph->imageString()),
|
||||||
intval($height),
|
intval($height),
|
||||||
|
|
@ -403,7 +405,7 @@ function photos_post(&$a) {
|
||||||
dbesc($resource_id),
|
dbesc($resource_id),
|
||||||
intval($page_owner_uid)
|
intval($page_owner_uid)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -605,6 +607,7 @@ function photos_post(&$a) {
|
||||||
intval($item_id),
|
intval($item_id),
|
||||||
intval($page_owner_uid)
|
intval($page_owner_uid)
|
||||||
);
|
);
|
||||||
|
create_tags_from_item($item_id);
|
||||||
|
|
||||||
$best = 0;
|
$best = 0;
|
||||||
foreach($p as $scales) {
|
foreach($p as $scales) {
|
||||||
|
|
@ -880,8 +883,8 @@ function photos_post(&$a) {
|
||||||
intval($item_id)
|
intval($item_id)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($visible)
|
if($visible)
|
||||||
proc_run('php', "include/notifier.php", 'wall-new', $item_id);
|
proc_run('php', "include/notifier.php", 'wall-new', $item_id);
|
||||||
|
|
||||||
call_hooks('photo_post_end',intval($item_id));
|
call_hooks('photo_post_end',intval($item_id));
|
||||||
|
|
@ -1418,7 +1421,7 @@ function photos_content(&$a) {
|
||||||
intval($a->pager['itemspage'])
|
intval($a->pager['itemspage'])
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
if((local_user()) && (local_user() == $link_item['uid'])) {
|
if((local_user()) && (local_user() == $link_item['uid'])) {
|
||||||
q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
|
q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
|
||||||
intval($link_item['parent']),
|
intval($link_item['parent']),
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ function search_saved_searches() {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$tpl = get_markup_template("saved_searches_aside.tpl");
|
$tpl = get_markup_template("saved_searches_aside.tpl");
|
||||||
|
|
||||||
$o .= replace_macros($tpl, array(
|
$o .= replace_macros($tpl, array(
|
||||||
|
|
@ -32,7 +32,7 @@ function search_saved_searches() {
|
||||||
'$searchbox' => '',
|
'$searchbox' => '',
|
||||||
'$saved' => $saved,
|
'$saved' => $saved,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
|
|
@ -124,7 +124,10 @@ function search_content(&$a) {
|
||||||
if(! $search)
|
if(! $search)
|
||||||
return $o;
|
return $o;
|
||||||
|
|
||||||
if (get_config('system','use_fulltext_engine')) {
|
if (get_config('system','only_tag_search'))
|
||||||
|
$tag = true;
|
||||||
|
|
||||||
|
/*if (get_config('system','use_fulltext_engine')) {
|
||||||
if($tag)
|
if($tag)
|
||||||
$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.dbesc(protect_sprintf($search)));
|
$sql_extra = sprintf(" AND MATCH (`item`.`tag`) AGAINST ('".'"%s"'."' in boolean mode) ", '#'.dbesc(protect_sprintf($search)));
|
||||||
else
|
else
|
||||||
|
|
@ -134,11 +137,25 @@ function search_content(&$a) {
|
||||||
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
|
$sql_extra = sprintf(" AND `item`.`tag` REGEXP '%s' ", dbesc('\\]' . protect_sprintf(preg_quote($search)) . '\\['));
|
||||||
else
|
else
|
||||||
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
||||||
|
}*/
|
||||||
|
|
||||||
|
if($tag) {
|
||||||
|
//$sql_extra = sprintf(" AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d",
|
||||||
|
// dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
|
||||||
|
//$sql_table = "`term` LEFT JOIN `item` ON `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` ";
|
||||||
|
|
||||||
|
$sql_extra = sprintf(" AND EXISTS (SELECT * FROM `term` WHERE `item`.`id` = `term`.`oid` AND `item`.`uid` = `term`.`uid` AND `term`.`term` = '%s' AND `term`.`otype` = %d AND `term`.`type` = %d) GROUP BY `item`.`uri` ",
|
||||||
|
dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG));
|
||||||
|
$sql_table = "`item` FORCE INDEX (`uri`) ";
|
||||||
|
} else {
|
||||||
|
if (get_config('system','use_fulltext_engine')) {
|
||||||
|
$sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));
|
||||||
|
} else {
|
||||||
|
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
|
||||||
|
}
|
||||||
|
$sql_table = "`item`";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Here is the way permissions work in the search module...
|
// Here is the way permissions work in the search module...
|
||||||
// Only public posts can be shown
|
// Only public posts can be shown
|
||||||
// OR your own posts if you are a logged in member
|
// OR your own posts if you are a logged in member
|
||||||
|
|
@ -146,14 +163,15 @@ function search_content(&$a) {
|
||||||
|
|
||||||
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
|
if( (! get_config('alt_pager', 'global')) && (! get_pconfig(local_user(),'system','alt_pager')) ) {
|
||||||
$r = q("SELECT distinct(`item`.`uri`) as `total`
|
$r = q("SELECT distinct(`item`.`uri`) as `total`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
|
FROM $sql_table LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 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`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
|
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0)
|
||||||
OR ( `item`.`uid` = %d ))
|
OR ( `item`.`uid` = %d ))
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra group by `item`.`uri` ",
|
$sql_extra ",
|
||||||
intval(local_user())
|
intval(local_user())
|
||||||
);
|
);
|
||||||
|
// $sql_extra group by `item`.`uri` ",
|
||||||
|
|
||||||
if(count($r))
|
if(count($r))
|
||||||
$a->set_pager_total(count($r));
|
$a->set_pager_total(count($r));
|
||||||
|
|
@ -164,25 +182,25 @@ function search_content(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT distinct(`item`.`uri`), `item`.*, `item`.`id` AS `item_id`,
|
$r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
|
||||||
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `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`.`uid`, `user`.`hidewall`
|
`user`.`nickname`, `user`.`uid`, `user`.`hidewall`
|
||||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM $sql_table 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`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
|
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
|
||||||
OR ( `item`.`uid` = %d ))
|
OR ( `item`.`uid` = %d ))
|
||||||
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
$sql_extra
|
$sql_extra
|
||||||
group by `item`.`uri`
|
|
||||||
ORDER BY `received` DESC LIMIT %d , %d ",
|
ORDER BY `received` DESC LIMIT %d , %d ",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
intval($a->pager['start']),
|
intval($a->pager['start']),
|
||||||
intval($a->pager['itemspage'])
|
intval($a->pager['itemspage'])
|
||||||
|
|
||||||
);
|
);
|
||||||
|
// group by `item`.`uri`
|
||||||
|
|
||||||
if(! count($r)) {
|
if(! count($r)) {
|
||||||
info( t('No results.') . EOL);
|
info( t('No results.') . EOL);
|
||||||
|
|
|
||||||
|
|
@ -3,3 +3,4 @@ Site speed can be improved when the following indexes are set. They cannot be se
|
||||||
CREATE INDEX `uid_commented` ON `item` (`uid`, `commented`);
|
CREATE INDEX `uid_commented` ON `item` (`uid`, `commented`);
|
||||||
CREATE INDEX `uid_created` ON `item` (`uid`, `created`);
|
CREATE INDEX `uid_created` ON `item` (`uid`, `created`);
|
||||||
CREATE INDEX `uid_unseen` ON `item` (`uid`, `unseen`);
|
CREATE INDEX `uid_unseen` ON `item` (`uid`, `unseen`);
|
||||||
|
CREATE INDEX `resource-id` ON `item` (`resource-id`);
|
||||||
|
|
|
||||||
|
|
@ -127,6 +127,7 @@ class Conversation extends BaseObject {
|
||||||
* _ false on failure
|
* _ false on failure
|
||||||
*/
|
*/
|
||||||
public function get_template_data($alike, $dlike) {
|
public function get_template_data($alike, $dlike) {
|
||||||
|
global $a;
|
||||||
$result = array();
|
$result = array();
|
||||||
|
|
||||||
foreach($this->threads as $item) {
|
foreach($this->threads as $item) {
|
||||||
|
|
@ -140,6 +141,7 @@ class Conversation extends BaseObject {
|
||||||
$result[] = $item_data;
|
$result[] = $item_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//$a->mark_timestamp();
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -146,10 +146,30 @@ class Item extends BaseObject {
|
||||||
call_hooks('render_location',$locate);
|
call_hooks('render_location',$locate);
|
||||||
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
|
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
|
||||||
|
|
||||||
|
$searchpath = $a->get_baseurl()."/search?tag=";
|
||||||
$tags=array();
|
$tags=array();
|
||||||
$hashtags = array();
|
$hashtags = array();
|
||||||
$mentions = array();
|
$mentions = array();
|
||||||
foreach(explode(',',$item['tag']) as $tag){
|
|
||||||
|
$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
|
||||||
|
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
|
||||||
|
|
||||||
|
foreach($taglist as $tag) {
|
||||||
|
|
||||||
|
if ($tag["url"] == "")
|
||||||
|
$tag["url"] = $searchpath.strtolower($tag["term"]);
|
||||||
|
|
||||||
|
if ($tag["type"] == TERM_HASHTAG) {
|
||||||
|
$hashtags[] = "#<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
|
||||||
|
$prefix = "#";
|
||||||
|
} elseif ($tag["type"] == TERM_MENTION) {
|
||||||
|
$mentions[] = "@<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
|
||||||
|
$prefix = "@";
|
||||||
|
}
|
||||||
|
$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"external-link\">".$tag["term"]."</a>";
|
||||||
|
}
|
||||||
|
|
||||||
|
/*foreach(explode(',',$item['tag']) as $tag){
|
||||||
$tag = trim($tag);
|
$tag = trim($tag);
|
||||||
if ($tag!="") {
|
if ($tag!="") {
|
||||||
$t = bbcode($tag);
|
$t = bbcode($tag);
|
||||||
|
|
@ -159,8 +179,7 @@ class Item extends BaseObject {
|
||||||
elseif($t[0] == '@')
|
elseif($t[0] == '@')
|
||||||
$mentions[] = $t;
|
$mentions[] = $t;
|
||||||
}
|
}
|
||||||
|
}*/
|
||||||
}
|
|
||||||
|
|
||||||
$like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
|
$like = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
|
||||||
$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
|
$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
|
||||||
|
|
@ -171,10 +190,10 @@ class Item extends BaseObject {
|
||||||
* Maybe we should establish a way to be notified about conversation changes
|
* Maybe we should establish a way to be notified about conversation changes
|
||||||
*/
|
*/
|
||||||
$this->check_wall_to_wall();
|
$this->check_wall_to_wall();
|
||||||
|
|
||||||
if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
|
if($this->is_wall_to_wall() && ($this->get_owner_url() == $this->get_redirect_url()))
|
||||||
$osparkle = ' sparkle';
|
$osparkle = ' sparkle';
|
||||||
|
|
||||||
if($this->is_toplevel()) {
|
if($this->is_toplevel()) {
|
||||||
if($conv->get_profile_owner() == local_user()) {
|
if($conv->get_profile_owner() == local_user()) {
|
||||||
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
||||||
|
|
@ -214,8 +233,28 @@ class Item extends BaseObject {
|
||||||
localize_item($item);
|
localize_item($item);
|
||||||
|
|
||||||
if ($item["postopts"]) {
|
if ($item["postopts"]) {
|
||||||
$langdata = explode(";", $item["postopts"]);
|
//$langdata = explode(";", $item["postopts"]);
|
||||||
$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
|
//$langstr = substr($langdata[0], 5)." (".round($langdata[1]*100, 1)."%)";
|
||||||
|
$langstr = "";
|
||||||
|
if (substr($item["postopts"], 0, 5) == "lang=") {
|
||||||
|
$postopts = substr($item["postopts"], 5);
|
||||||
|
|
||||||
|
$languages = explode(":", $postopts);
|
||||||
|
|
||||||
|
if (sizeof($languages) == 1) {
|
||||||
|
$languages = array();
|
||||||
|
$languages[] = $postopts;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($languages as $language) {
|
||||||
|
$langdata = explode(";", $language);
|
||||||
|
if ($langstr != "")
|
||||||
|
$langstr .= ", ";
|
||||||
|
|
||||||
|
//$langstr .= $langdata[0]." (".round($langdata[1]*100, 1)."%)";
|
||||||
|
$langstr .= round($langdata[1]*100, 1)."% ".$langdata[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = prepare_body($item,true);
|
$body = prepare_body($item,true);
|
||||||
|
|
@ -244,14 +283,14 @@ class Item extends BaseObject {
|
||||||
|
|
||||||
'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
|
'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
|
||||||
'tags' => $tags,
|
'tags' => $tags,
|
||||||
'hashtags' => $hashtags,
|
'hashtags' => $hashtags,
|
||||||
'mentions' => $mentions,
|
'mentions' => $mentions,
|
||||||
'txt_cats' => t('Categories:'),
|
'txt_cats' => t('Categories:'),
|
||||||
'txt_folders' => t('Filed under:'),
|
'txt_folders' => t('Filed under:'),
|
||||||
'has_cats' => ((count($categories)) ? 'true' : ''),
|
'has_cats' => ((count($categories)) ? 'true' : ''),
|
||||||
'has_folders' => ((count($folders)) ? 'true' : ''),
|
'has_folders' => ((count($folders)) ? 'true' : ''),
|
||||||
'categories' => $categories,
|
'categories' => $categories,
|
||||||
'folders' => $folders,
|
'folders' => $folders,
|
||||||
'body' => $body_e,
|
'body' => $body_e,
|
||||||
'text' => $text_e,
|
'text' => $text_e,
|
||||||
'id' => $this->get_id(),
|
'id' => $this->get_id(),
|
||||||
|
|
@ -322,12 +361,12 @@ class Item extends BaseObject {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->is_toplevel()) {
|
if ($this->is_toplevel()) {
|
||||||
$result['total_comments_num'] = "$total_children";
|
$result['total_comments_num'] = "$total_children";
|
||||||
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
|
$result['total_comments_text'] = tt('comment', 'comments', $total_children);
|
||||||
}
|
}
|
||||||
|
|
||||||
$result['private'] = $item['private'];
|
$result['private'] = $item['private'];
|
||||||
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
|
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');
|
||||||
|
|
||||||
|
|
|
||||||
43
update.php
43
update.php
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
define( 'UPDATE_VERSION' , 1159 );
|
define( 'UPDATE_VERSION' , 1162 );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
@ -1382,8 +1382,6 @@ function update_1157() {
|
||||||
|
|
||||||
if($r)
|
if($r)
|
||||||
return UPDATE_SUCCESS;
|
return UPDATE_SUCCESS;
|
||||||
|
|
||||||
return UPDATE_FAILED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function update_1158() {
|
function update_1158() {
|
||||||
|
|
@ -1402,3 +1400,42 @@ function update_1158() {
|
||||||
return UPDATE_FAILED;
|
return UPDATE_FAILED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function update_1159() {
|
||||||
|
$r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
|
ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
|
||||||
|
ADD INDEX (`uid`),
|
||||||
|
ADD INDEX (`aid`)");
|
||||||
|
|
||||||
|
if(!$r)
|
||||||
|
return UPDATE_FAILED;
|
||||||
|
|
||||||
|
require_once('include/tags.php');
|
||||||
|
update_items();
|
||||||
|
|
||||||
|
return UPDATE_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_1160() {
|
||||||
|
set_config('system', 'maintenance', 1);
|
||||||
|
|
||||||
|
// Wait for 15 seconds for current requests to
|
||||||
|
// clear before locking up the database
|
||||||
|
sleep(15);
|
||||||
|
|
||||||
|
$r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
|
||||||
|
set_config('system', 'maintenance', 0);
|
||||||
|
|
||||||
|
if(!$r)
|
||||||
|
return UPDATE_FAILED;
|
||||||
|
|
||||||
|
return UPDATE_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
function update_1161() {
|
||||||
|
$r = q("ALTER TABLE `pconfig` ADD INDEX (`cat`)");
|
||||||
|
|
||||||
|
if(!$r)
|
||||||
|
return UPDATE_FAILED;
|
||||||
|
|
||||||
|
return UPDATE_SUCCESS;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,6 +51,8 @@
|
||||||
{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
|
{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
|
||||||
{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
|
{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
|
||||||
{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
|
{{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
|
||||||
|
{{ inc field_checkbox.tpl with $field=$hide_help }}{{ endinc }}
|
||||||
|
{{ inc field_select.tpl with $field=$singleuser }}{{ endinc }}
|
||||||
|
|
||||||
|
|
||||||
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
|
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
|
||||||
|
|
|
||||||
1218
view/pl/messages.po
1218
view/pl/messages.po
File diff suppressed because it is too large
Load diff
|
|
@ -48,7 +48,7 @@ $a->strings["Event Starts:"] = "Rozpoczęcie wydarzenia:";
|
||||||
$a->strings["Required"] = "Wymagany";
|
$a->strings["Required"] = "Wymagany";
|
||||||
$a->strings["Finish date/time is not known or not relevant"] = "Data/czas zakończenia nie jest znana lub jest nieistotna";
|
$a->strings["Finish date/time is not known or not relevant"] = "Data/czas zakończenia nie jest znana lub jest nieistotna";
|
||||||
$a->strings["Event Finishes:"] = "Zakończenie wydarzenia:";
|
$a->strings["Event Finishes:"] = "Zakończenie wydarzenia:";
|
||||||
$a->strings["Adjust for viewer timezone"] = "";
|
$a->strings["Adjust for viewer timezone"] = "Dopasuj dla strefy czasowej widza";
|
||||||
$a->strings["Description:"] = "Opis:";
|
$a->strings["Description:"] = "Opis:";
|
||||||
$a->strings["Location:"] = "Lokalizacja";
|
$a->strings["Location:"] = "Lokalizacja";
|
||||||
$a->strings["Title:"] = "Tytuł:";
|
$a->strings["Title:"] = "Tytuł:";
|
||||||
|
|
@ -74,7 +74,9 @@ $a->strings["Contact information unavailable"] = "Informacje o kontakcie nie dos
|
||||||
$a->strings["Profile Photos"] = "Zdjęcia profilowe";
|
$a->strings["Profile Photos"] = "Zdjęcia profilowe";
|
||||||
$a->strings["Album not found."] = "Album nie znaleziony";
|
$a->strings["Album not found."] = "Album nie znaleziony";
|
||||||
$a->strings["Delete Album"] = "Usuń album";
|
$a->strings["Delete Album"] = "Usuń album";
|
||||||
|
$a->strings["Do you really want to delete this photo album and all its photos?"] = "";
|
||||||
$a->strings["Delete Photo"] = "Usuń zdjęcie";
|
$a->strings["Delete Photo"] = "Usuń zdjęcie";
|
||||||
|
$a->strings["Do you really want to delete this photo?"] = "";
|
||||||
$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
|
$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "";
|
||||||
$a->strings["a photo"] = "zdjęcie";
|
$a->strings["a photo"] = "zdjęcie";
|
||||||
$a->strings["Image exceeds size limit of "] = "obrazek przekracza limit rozmiaru";
|
$a->strings["Image exceeds size limit of "] = "obrazek przekracza limit rozmiaru";
|
||||||
|
|
@ -90,6 +92,10 @@ $a->strings["New album name: "] = "Nazwa nowego albumu:";
|
||||||
$a->strings["or existing album name: "] = "lub istniejąca nazwa albumu:";
|
$a->strings["or existing album name: "] = "lub istniejąca nazwa albumu:";
|
||||||
$a->strings["Do not show a status post for this upload"] = "Nie pokazuj postów statusu dla tego wysłania";
|
$a->strings["Do not show a status post for this upload"] = "Nie pokazuj postów statusu dla tego wysłania";
|
||||||
$a->strings["Permissions"] = "Uprawnienia";
|
$a->strings["Permissions"] = "Uprawnienia";
|
||||||
|
$a->strings["Show to Groups"] = "";
|
||||||
|
$a->strings["Show to Contacts"] = "";
|
||||||
|
$a->strings["Private Photo"] = "";
|
||||||
|
$a->strings["Public Photo"] = "";
|
||||||
$a->strings["Edit Album"] = "Edytuj album";
|
$a->strings["Edit Album"] = "Edytuj album";
|
||||||
$a->strings["Show Newest First"] = "Najpierw pokaż najnowsze";
|
$a->strings["Show Newest First"] = "Najpierw pokaż najnowsze";
|
||||||
$a->strings["Show Oldest First"] = "Najpierw pokaż najstarsze";
|
$a->strings["Show Oldest First"] = "Najpierw pokaż najstarsze";
|
||||||
|
|
@ -109,6 +115,8 @@ $a->strings["New album name"] = "Nazwa nowego albumu";
|
||||||
$a->strings["Caption"] = "Zawartość";
|
$a->strings["Caption"] = "Zawartość";
|
||||||
$a->strings["Add a Tag"] = "Dodaj tag";
|
$a->strings["Add a Tag"] = "Dodaj tag";
|
||||||
$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
|
$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
|
||||||
|
$a->strings["Private photo"] = "";
|
||||||
|
$a->strings["Public photo"] = "";
|
||||||
$a->strings["I like this (toggle)"] = "Lubię to (zmień)";
|
$a->strings["I like this (toggle)"] = "Lubię to (zmień)";
|
||||||
$a->strings["I don't like this (toggle)"] = "Nie lubię (zmień)";
|
$a->strings["I don't like this (toggle)"] = "Nie lubię (zmień)";
|
||||||
$a->strings["Share"] = "Podziel się";
|
$a->strings["Share"] = "Podziel się";
|
||||||
|
|
@ -131,7 +139,6 @@ $a->strings["Installed plugins/addons/apps:"] = "";
|
||||||
$a->strings["No installed plugins/addons/apps"] = "Brak zainstalowanych pluginów/dodatków/aplikacji";
|
$a->strings["No installed plugins/addons/apps"] = "Brak zainstalowanych pluginów/dodatków/aplikacji";
|
||||||
$a->strings["Item not found"] = "Artykuł nie znaleziony";
|
$a->strings["Item not found"] = "Artykuł nie znaleziony";
|
||||||
$a->strings["Edit post"] = "Edytuj post";
|
$a->strings["Edit post"] = "Edytuj post";
|
||||||
$a->strings["Post to Email"] = "Wyślij poprzez email";
|
|
||||||
$a->strings["Edit"] = "Edytuj";
|
$a->strings["Edit"] = "Edytuj";
|
||||||
$a->strings["Upload photo"] = "Wyślij zdjęcie";
|
$a->strings["Upload photo"] = "Wyślij zdjęcie";
|
||||||
$a->strings["upload photo"] = "dodaj zdjęcie";
|
$a->strings["upload photo"] = "dodaj zdjęcie";
|
||||||
|
|
@ -254,7 +261,7 @@ $a->strings["Error: GD graphics PHP module with JPEG support required but not in
|
||||||
$a->strings["Error: openssl PHP module required but not installed."] = "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany.";
|
$a->strings["Error: openssl PHP module required but not installed."] = "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany.";
|
||||||
$a->strings["Error: mysqli PHP module required but not installed."] = "Błąd: mysqli PHP wymagany moduł, lecz nie zainstalowany.";
|
$a->strings["Error: mysqli PHP module required but not installed."] = "Błąd: mysqli PHP wymagany moduł, lecz nie zainstalowany.";
|
||||||
$a->strings["Error: mb_string PHP module required but not installed."] = "Błąd: moduł PHP mb_string jest wymagany ale nie jest zainstalowany";
|
$a->strings["Error: mb_string PHP module required but not installed."] = "Błąd: moduł PHP mb_string jest wymagany ale nie jest zainstalowany";
|
||||||
$a->strings["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."] = "";
|
$a->strings["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."] = "Instalator WWW musi być w stanie utworzyć plik o nazwie \". Htconfig.php\" i nie jest w stanie tego zrobić.";
|
||||||
$a->strings["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."] = "";
|
$a->strings["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."] = "";
|
||||||
$a->strings["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."] = "";
|
$a->strings["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."] = "";
|
||||||
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
|
$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
|
||||||
|
|
@ -326,8 +333,8 @@ $a->strings["starred"] = "";
|
||||||
$a->strings["add tag"] = "dodaj tag";
|
$a->strings["add tag"] = "dodaj tag";
|
||||||
$a->strings["save to folder"] = "zapisz w folderze";
|
$a->strings["save to folder"] = "zapisz w folderze";
|
||||||
$a->strings["to"] = "do";
|
$a->strings["to"] = "do";
|
||||||
$a->strings["Wall-to-Wall"] = "";
|
$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
|
||||||
$a->strings["via Wall-To-Wall:"] = "";
|
$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
|
||||||
$a->strings["Welcome to %s"] = "Witamy w %s";
|
$a->strings["Welcome to %s"] = "Witamy w %s";
|
||||||
$a->strings["Invalid request identifier."] = "Niewłaściwy identyfikator wymagania.";
|
$a->strings["Invalid request identifier."] = "Niewłaściwy identyfikator wymagania.";
|
||||||
$a->strings["Discard"] = "Odrzuć";
|
$a->strings["Discard"] = "Odrzuć";
|
||||||
|
|
@ -380,6 +387,7 @@ $a->strings["Contact has been ignored"] = "Kontakt jest ignorowany";
|
||||||
$a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany";
|
$a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany";
|
||||||
$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany";
|
$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany";
|
||||||
$a->strings["Contact has been unarchived"] = "";
|
$a->strings["Contact has been unarchived"] = "";
|
||||||
|
$a->strings["Do you really want to delete this contact?"] = "";
|
||||||
$a->strings["Contact has been removed."] = "Kontakt został usunięty.";
|
$a->strings["Contact has been removed."] = "Kontakt został usunięty.";
|
||||||
$a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
|
$a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
|
||||||
$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
|
$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
|
||||||
|
|
@ -572,6 +580,9 @@ $a->strings["Maximum Friend Requests/Day:"] = "Maksymalna liczba zaproszeń do g
|
||||||
$a->strings["(to prevent spam abuse)"] = "(aby zapobiec spamowaniu)";
|
$a->strings["(to prevent spam abuse)"] = "(aby zapobiec spamowaniu)";
|
||||||
$a->strings["Default Post Permissions"] = "Domyślne prawa dostępu wiadomości";
|
$a->strings["Default Post Permissions"] = "Domyślne prawa dostępu wiadomości";
|
||||||
$a->strings["(click to open/close)"] = "(kliknij by otworzyć/zamknąć)";
|
$a->strings["(click to open/close)"] = "(kliknij by otworzyć/zamknąć)";
|
||||||
|
$a->strings["Default Private Post"] = "";
|
||||||
|
$a->strings["Default Public Post"] = "";
|
||||||
|
$a->strings["Default Permissions for New Posts"] = "";
|
||||||
$a->strings["Maximum private messages per day from unknown people:"] = "";
|
$a->strings["Maximum private messages per day from unknown people:"] = "";
|
||||||
$a->strings["Notification Settings"] = "Ustawienia powiadomień";
|
$a->strings["Notification Settings"] = "Ustawienia powiadomień";
|
||||||
$a->strings["By default post a status message when:"] = "";
|
$a->strings["By default post a status message when:"] = "";
|
||||||
|
|
@ -754,8 +765,11 @@ $a->strings["No profile"] = "Brak profilu";
|
||||||
$a->strings["Remove My Account"] = "Usuń konto";
|
$a->strings["Remove My Account"] = "Usuń konto";
|
||||||
$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Kompletne usunięcie konta. Jeżeli zostanie wykonane, konto nie może zostać odzyskane.";
|
$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Kompletne usunięcie konta. Jeżeli zostanie wykonane, konto nie może zostać odzyskane.";
|
||||||
$a->strings["Please enter your password for verification:"] = "Wprowadź hasło w celu weryfikacji.";
|
$a->strings["Please enter your password for verification:"] = "Wprowadź hasło w celu weryfikacji.";
|
||||||
|
$a->strings["Nothing new here"] = "Brak nowych zdarzeń";
|
||||||
|
$a->strings["Clear notifications"] = "";
|
||||||
$a->strings["New Message"] = "Nowa wiadomość";
|
$a->strings["New Message"] = "Nowa wiadomość";
|
||||||
$a->strings["Unable to locate contact information."] = "Niezdolny do uzyskania informacji kontaktowych.";
|
$a->strings["Unable to locate contact information."] = "Niezdolny do uzyskania informacji kontaktowych.";
|
||||||
|
$a->strings["Do you really want to delete this message?"] = "";
|
||||||
$a->strings["Message deleted."] = "Wiadomość usunięta.";
|
$a->strings["Message deleted."] = "Wiadomość usunięta.";
|
||||||
$a->strings["Conversation removed."] = "Rozmowa usunięta.";
|
$a->strings["Conversation removed."] = "Rozmowa usunięta.";
|
||||||
$a->strings["No messages."] = "Brak wiadomości.";
|
$a->strings["No messages."] = "Brak wiadomości.";
|
||||||
|
|
@ -786,7 +800,7 @@ $a->strings["Admin"] = "Administator";
|
||||||
$a->strings["Plugin Features"] = "Polecane wtyczki";
|
$a->strings["Plugin Features"] = "Polecane wtyczki";
|
||||||
$a->strings["User registrations waiting for confirmation"] = "Rejestracje użytkownika czekają na potwierdzenie.";
|
$a->strings["User registrations waiting for confirmation"] = "Rejestracje użytkownika czekają na potwierdzenie.";
|
||||||
$a->strings["Normal Account"] = "Konto normalne";
|
$a->strings["Normal Account"] = "Konto normalne";
|
||||||
$a->strings["Soapbox Account"] = "";
|
$a->strings["Soapbox Account"] = "Konto Soapbox";
|
||||||
$a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy";
|
$a->strings["Community/Celebrity Account"] = "Konto społeczności/gwiazdy";
|
||||||
$a->strings["Automatic Friend Account"] = "Automatyczny przyjaciel konta";
|
$a->strings["Automatic Friend Account"] = "Automatyczny przyjaciel konta";
|
||||||
$a->strings["Blog Account"] = "";
|
$a->strings["Blog Account"] = "";
|
||||||
|
|
@ -867,7 +881,7 @@ $a->strings["Verify SSL"] = "Weryfikacja SSL";
|
||||||
$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "";
|
$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "";
|
||||||
$a->strings["Proxy user"] = "Użytkownik proxy";
|
$a->strings["Proxy user"] = "Użytkownik proxy";
|
||||||
$a->strings["Proxy URL"] = "URL Proxy";
|
$a->strings["Proxy URL"] = "URL Proxy";
|
||||||
$a->strings["Network timeout"] = "";
|
$a->strings["Network timeout"] = "Network timeout";
|
||||||
$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "";
|
$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "";
|
||||||
$a->strings["Delivery interval"] = "";
|
$a->strings["Delivery interval"] = "";
|
||||||
$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "";
|
$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "";
|
||||||
|
|
@ -1066,6 +1080,7 @@ $a->strings["bb2dia2bb: "] = "";
|
||||||
$a->strings["bb2md2html2bb: "] = "";
|
$a->strings["bb2md2html2bb: "] = "";
|
||||||
$a->strings["Source input (Diaspora format): "] = "";
|
$a->strings["Source input (Diaspora format): "] = "";
|
||||||
$a->strings["diaspora2bb: "] = "";
|
$a->strings["diaspora2bb: "] = "";
|
||||||
|
$a->strings["Do you really want to delete this suggestion?"] = "";
|
||||||
$a->strings["Friend Suggestions"] = "Osoby, które możesz znać";
|
$a->strings["Friend Suggestions"] = "Osoby, które możesz znać";
|
||||||
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "";
|
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "";
|
||||||
$a->strings["Ignore/Hide"] = "Ignoruj/Ukryj";
|
$a->strings["Ignore/Hide"] = "Ignoruj/Ukryj";
|
||||||
|
|
@ -1078,8 +1093,10 @@ $a->strings["Status:"] = "Status";
|
||||||
$a->strings["Homepage:"] = "Strona główna:";
|
$a->strings["Homepage:"] = "Strona główna:";
|
||||||
$a->strings["About:"] = "O:";
|
$a->strings["About:"] = "O:";
|
||||||
$a->strings["No entries (some entries may be hidden)."] = "Brak odwiedzin (niektóre odwiedziny mogą być ukryte).";
|
$a->strings["No entries (some entries may be hidden)."] = "Brak odwiedzin (niektóre odwiedziny mogą być ukryte).";
|
||||||
|
$a->strings["Total invitation limit exceeded."] = "";
|
||||||
$a->strings["%s : Not a valid email address."] = "%s : Niepoprawny adres email.";
|
$a->strings["%s : Not a valid email address."] = "%s : Niepoprawny adres email.";
|
||||||
$a->strings["Please join us on Friendica"] = "Dołącz do nas na Friendica";
|
$a->strings["Please join us on Friendica"] = "Dołącz do nas na Friendica";
|
||||||
|
$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "";
|
||||||
$a->strings["%s : Message delivery failed."] = "%s : Dostarczenie wiadomości nieudane.";
|
$a->strings["%s : Message delivery failed."] = "%s : Dostarczenie wiadomości nieudane.";
|
||||||
$a->strings["%d message sent."] = array(
|
$a->strings["%d message sent."] = array(
|
||||||
0 => "%d wiadomość wysłana.",
|
0 => "%d wiadomość wysłana.",
|
||||||
|
|
@ -1408,7 +1425,7 @@ $a->strings["You won!"] = "Wygrałeś!";
|
||||||
$a->strings["\"Cat\" game!"] = "Gra \"Kot\"!";
|
$a->strings["\"Cat\" game!"] = "Gra \"Kot\"!";
|
||||||
$a->strings["I won!"] = "Wygrałem!";
|
$a->strings["I won!"] = "Wygrałem!";
|
||||||
$a->strings["Randplace Settings"] = "Ustawienia Randplace";
|
$a->strings["Randplace Settings"] = "Ustawienia Randplace";
|
||||||
$a->strings["Enable Randplace Plugin"] = "";
|
$a->strings["Enable Randplace Plugin"] = "Włącz Randplace Plugin";
|
||||||
$a->strings["Post to Dreamwidth"] = "Opublikuj na Dreamwidth";
|
$a->strings["Post to Dreamwidth"] = "Opublikuj na Dreamwidth";
|
||||||
$a->strings["Dreamwidth Post Settings"] = "";
|
$a->strings["Dreamwidth Post Settings"] = "";
|
||||||
$a->strings["Enable dreamwidth Post Plugin"] = "";
|
$a->strings["Enable dreamwidth Post Plugin"] = "";
|
||||||
|
|
@ -1550,7 +1567,7 @@ $a->strings["Post to StatusNet"] = "Wyślij do sieci StatusNet";
|
||||||
$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Proszę się skontaktować z administratorem strony. <br /> API URL nie jest poprawne";
|
$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Proszę się skontaktować z administratorem strony. <br /> API URL nie jest poprawne";
|
||||||
$a->strings["We could not contact the StatusNet API with the Path you entered."] = "";
|
$a->strings["We could not contact the StatusNet API with the Path you entered."] = "";
|
||||||
$a->strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane";
|
$a->strings["StatusNet settings updated."] = "Ustawienia StatusNet zaktualizowane";
|
||||||
$a->strings["StatusNet Posting Settings"] = "";
|
$a->strings["StatusNet Posting Settings"] = "Ustawienia StatusNet";
|
||||||
$a->strings["Globally Available StatusNet OAuthKeys"] = "";
|
$a->strings["Globally Available StatusNet OAuthKeys"] = "";
|
||||||
$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "";
|
$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "";
|
||||||
$a->strings["Provide your own OAuth Credentials"] = "";
|
$a->strings["Provide your own OAuth Credentials"] = "";
|
||||||
|
|
@ -1563,11 +1580,11 @@ $a->strings["Log in with StatusNet"] = "Zaloguj się przez StatusNet";
|
||||||
$a->strings["Copy the security code from StatusNet here"] = "Tutaj skopiuj kod bezpieczeństwa z StatusNet";
|
$a->strings["Copy the security code from StatusNet here"] = "Tutaj skopiuj kod bezpieczeństwa z StatusNet";
|
||||||
$a->strings["Cancel Connection Process"] = "Anuluj proces łączenia";
|
$a->strings["Cancel Connection Process"] = "Anuluj proces łączenia";
|
||||||
$a->strings["Current StatusNet API is"] = "Aktualnym StatusNet API jest";
|
$a->strings["Current StatusNet API is"] = "Aktualnym StatusNet API jest";
|
||||||
$a->strings["Cancel StatusNet Connection"] = "";
|
$a->strings["Cancel StatusNet Connection"] = "Anuluj połączenie StatusNet";
|
||||||
$a->strings["Currently connected to: "] = "Obecnie połączone z:";
|
$a->strings["Currently connected to: "] = "Obecnie połączone z:";
|
||||||
$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
|
$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
|
||||||
$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
|
$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
|
||||||
$a->strings["Allow posting to StatusNet"] = "";
|
$a->strings["Allow posting to StatusNet"] = "Pozwól zamieszczać posty na StatusNet";
|
||||||
$a->strings["Send public postings to StatusNet by default"] = "";
|
$a->strings["Send public postings to StatusNet by default"] = "";
|
||||||
$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "";
|
$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "";
|
||||||
$a->strings["Shortening method that optimizes the post"] = "";
|
$a->strings["Shortening method that optimizes the post"] = "";
|
||||||
|
|
@ -1629,6 +1646,8 @@ $a->strings["Shortening method that optimizes the tweet"] = "";
|
||||||
$a->strings["Send linked #-tags and @-names to Twitter"] = "";
|
$a->strings["Send linked #-tags and @-names to Twitter"] = "";
|
||||||
$a->strings["Consumer key"] = "Klucz konsumenta";
|
$a->strings["Consumer key"] = "Klucz konsumenta";
|
||||||
$a->strings["Consumer secret"] = "Sekret konsumenta";
|
$a->strings["Consumer secret"] = "Sekret konsumenta";
|
||||||
|
$a->strings["Name of the Twitter Application"] = "";
|
||||||
|
$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
|
||||||
$a->strings["IRC Settings"] = "Ustawienia IRC";
|
$a->strings["IRC Settings"] = "Ustawienia IRC";
|
||||||
$a->strings["Channel(s) to auto connect (comma separated)"] = "";
|
$a->strings["Channel(s) to auto connect (comma separated)"] = "";
|
||||||
$a->strings["Popular Channels (comma separated)"] = "";
|
$a->strings["Popular Channels (comma separated)"] = "";
|
||||||
|
|
@ -1908,7 +1927,8 @@ $a->strings["Profiles"] = "Profile";
|
||||||
$a->strings["Manage/Edit Profiles"] = "";
|
$a->strings["Manage/Edit Profiles"] = "";
|
||||||
$a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
|
$a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
|
||||||
$a->strings["Site setup and configuration"] = "Konfiguracja i ustawienia instancji";
|
$a->strings["Site setup and configuration"] = "Konfiguracja i ustawienia instancji";
|
||||||
$a->strings["Nothing new here"] = "Brak nowych zdarzeń";
|
$a->strings["Navigation"] = "";
|
||||||
|
$a->strings["Site map"] = "";
|
||||||
$a->strings["Add New Contact"] = "Dodaj nowy kontakt";
|
$a->strings["Add New Contact"] = "Dodaj nowy kontakt";
|
||||||
$a->strings["Enter address or web location"] = "Wpisz adres lub lokalizację sieciową";
|
$a->strings["Enter address or web location"] = "Wpisz adres lub lokalizację sieciową";
|
||||||
$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Przykład: bob@przykład.com, http://przykład.com/barbara";
|
$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Przykład: bob@przykład.com, http://przykład.com/barbara";
|
||||||
|
|
@ -2033,7 +2053,7 @@ $a->strings["This site is not configured to allow communications with other netw
|
||||||
$a->strings["No compatible communication protocols or feeds were discovered."] = "";
|
$a->strings["No compatible communication protocols or feeds were discovered."] = "";
|
||||||
$a->strings["The profile address specified does not provide adequate information."] = "Dany adres profilu nie dostarcza odpowiednich informacji.";
|
$a->strings["The profile address specified does not provide adequate information."] = "Dany adres profilu nie dostarcza odpowiednich informacji.";
|
||||||
$a->strings["An author or name was not found."] = "Autor lub nazwa nie zostało znalezione.";
|
$a->strings["An author or name was not found."] = "Autor lub nazwa nie zostało znalezione.";
|
||||||
$a->strings["No browser URL could be matched to this address."] = "";
|
$a->strings["No browser URL could be matched to this address."] = "Przeglądarka WWW nie może odnaleźć podanego adresu";
|
||||||
$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "";
|
$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "";
|
||||||
$a->strings["Use mailto: in front of address to force email check."] = "";
|
$a->strings["Use mailto: in front of address to force email check."] = "";
|
||||||
$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Określony adres profilu należy do sieci, która została wyłączona na tej stronie.";
|
$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Określony adres profilu należy do sieci, która została wyłączona na tej stronie.";
|
||||||
|
|
@ -2042,6 +2062,7 @@ $a->strings["Unable to retrieve contact information."] = "Nie można otrzymać i
|
||||||
$a->strings["following"] = "następujący";
|
$a->strings["following"] = "następujący";
|
||||||
$a->strings["A new person is sharing with you at "] = "";
|
$a->strings["A new person is sharing with you at "] = "";
|
||||||
$a->strings["You have a new follower at "] = "";
|
$a->strings["You have a new follower at "] = "";
|
||||||
|
$a->strings["Do you really want to delete this item?"] = "";
|
||||||
$a->strings["Archives"] = "Archiwum";
|
$a->strings["Archives"] = "Archiwum";
|
||||||
$a->strings["An invitation is required."] = "Wymagane zaproszenie.";
|
$a->strings["An invitation is required."] = "Wymagane zaproszenie.";
|
||||||
$a->strings["Invitation could not be verified."] = "Zaproszenie niezweryfikowane.";
|
$a->strings["Invitation could not be verified."] = "Zaproszenie niezweryfikowane.";
|
||||||
|
|
@ -2093,7 +2114,11 @@ $a->strings["Please enter an audio link/URL:"] = "Podaj link do muzyki";
|
||||||
$a->strings["Tag term:"] = "";
|
$a->strings["Tag term:"] = "";
|
||||||
$a->strings["Where are you right now?"] = "Gdzie teraz jesteś?";
|
$a->strings["Where are you right now?"] = "Gdzie teraz jesteś?";
|
||||||
$a->strings["Delete item(s)?"] = "";
|
$a->strings["Delete item(s)?"] = "";
|
||||||
|
$a->strings["Post to Email"] = "Wyślij poprzez email";
|
||||||
$a->strings["permissions"] = "zezwolenia";
|
$a->strings["permissions"] = "zezwolenia";
|
||||||
|
$a->strings["Post to Groups"] = "";
|
||||||
|
$a->strings["Post to Contacts"] = "";
|
||||||
|
$a->strings["Private post"] = "";
|
||||||
$a->strings["Click here to upgrade."] = "Kliknij tu, aby zaktualizować.";
|
$a->strings["Click here to upgrade."] = "Kliknij tu, aby zaktualizować.";
|
||||||
$a->strings["This action exceeds the limits set by your subscription plan."] = "";
|
$a->strings["This action exceeds the limits set by your subscription plan."] = "";
|
||||||
$a->strings["This action is not available under your subscription plan."] = "";
|
$a->strings["This action is not available under your subscription plan."] = "";
|
||||||
|
|
@ -2115,7 +2140,7 @@ $a->strings["Requested account is not available."] = "";
|
||||||
$a->strings["Edit profile"] = "Edytuj profil";
|
$a->strings["Edit profile"] = "Edytuj profil";
|
||||||
$a->strings["Message"] = "Wiadomość";
|
$a->strings["Message"] = "Wiadomość";
|
||||||
$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
|
$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
|
||||||
$a->strings["g A l F d"] = "";
|
$a->strings["g A l F d"] = "g A I F d";
|
||||||
$a->strings["F d"] = "";
|
$a->strings["F d"] = "";
|
||||||
$a->strings["[today]"] = "[dziś]";
|
$a->strings["[today]"] = "[dziś]";
|
||||||
$a->strings["Birthday Reminders"] = "Przypomnienia o urodzinach";
|
$a->strings["Birthday Reminders"] = "Przypomnienia o urodzinach";
|
||||||
|
|
|
||||||
|
|
@ -52,10 +52,12 @@
|
||||||
{{include file="field_input.tpl" field=$sitename}}
|
{{include file="field_input.tpl" field=$sitename}}
|
||||||
{{include file="field_textarea.tpl" field=$banner}}
|
{{include file="field_textarea.tpl" field=$banner}}
|
||||||
{{include file="field_select.tpl" field=$language}}
|
{{include file="field_select.tpl" field=$language}}
|
||||||
{{include file="field_select.tpl" field=$theme}}
|
{{include file="field_select.tpl" field=$theme}}
|
||||||
{{include file="field_select.tpl" field=$theme_mobile}}
|
{{include file="field_select.tpl" field=$theme_mobile}}
|
||||||
{{include file="field_select.tpl" field=$ssl_policy}}
|
{{include file="field_select.tpl" field=$ssl_policy}}
|
||||||
{{include file="field_checkbox.tpl" field=$new_share}}
|
{{include file="field_checkbox.tpl" field=$new_share}}
|
||||||
|
{{include file="field_checkbox.tpl" field=$hide_help}}
|
||||||
|
{{include file="field_select.tpl" field=$singleuser}}
|
||||||
|
|
||||||
|
|
||||||
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
|
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
style.css
|
style.css
|
||||||
Smoothly
|
Smoothly
|
||||||
|
|
||||||
Created by alex@friendica.pixelbits.de on 2013-01-11
|
Created by alex@friendica.pixelbits.de on 2013-02-21
|
||||||
|
|
||||||
** Colors **
|
** Colors **
|
||||||
Blue links - #1873a2
|
Blue links - #1873a2
|
||||||
|
|
@ -202,6 +202,12 @@ section {
|
||||||
clear: both;
|
clear: both;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.login-extra-links {
|
||||||
|
width: 100%;
|
||||||
|
margin-left: 145px;
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
|
|
||||||
#login-extra-links a {
|
#login-extra-links a {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
|
|
@ -215,7 +221,7 @@ section {
|
||||||
}
|
}
|
||||||
|
|
||||||
#login_standard {
|
#login_standard {
|
||||||
width: 250px;
|
width: 260px;
|
||||||
float: left;
|
float: left;
|
||||||
border: 1px solid #7C7D7B;
|
border: 1px solid #7C7D7B;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
|
|
@ -256,7 +262,7 @@ section {
|
||||||
}
|
}
|
||||||
|
|
||||||
#login-submit-button {
|
#login-submit-button {
|
||||||
width: 271px;
|
width: 280px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.login-form,
|
.login-form,
|
||||||
|
|
@ -3522,7 +3528,7 @@ margin-left: 0px;
|
||||||
/* ========= */
|
/* ========= */
|
||||||
|
|
||||||
#adminpage {
|
#adminpage {
|
||||||
width: 80%;
|
width: 90%;
|
||||||
}
|
}
|
||||||
|
|
||||||
#pending-update {
|
#pending-update {
|
||||||
|
|
@ -3630,13 +3636,25 @@ margin-left: 0px;
|
||||||
/* =============== */
|
/* =============== */
|
||||||
|
|
||||||
.field {
|
.field {
|
||||||
width: 90%;
|
margin-bottom: 10px;
|
||||||
|
overflow: auto;
|
||||||
|
padding-bottom: 0px;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field.radio .field_help {
|
||||||
|
margin-left: 205px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field .field_help {
|
||||||
|
color: #666666;
|
||||||
|
display: block;
|
||||||
|
margin-left: 200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.field label {
|
.field label {
|
||||||
float: left;
|
float: left;
|
||||||
min-width: 120px;
|
width: 200px;
|
||||||
margin: 5px 10px 0 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.field checkbox {
|
.field checkbox {
|
||||||
|
|
@ -3646,17 +3664,13 @@ margin-left: 0px;
|
||||||
|
|
||||||
.field input,
|
.field input,
|
||||||
.field textarea {
|
.field textarea {
|
||||||
width: 220px;
|
width: 400px;
|
||||||
border: 1px solid #CDCDCD;
|
border: 1px solid #CDCDCD;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
-moz-border-radius: 5px;
|
-moz-border-radius: 5px;
|
||||||
-webkit-border-radius: 5px;
|
-webkit-border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.field textarea {
|
|
||||||
height: 100px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.field password {
|
.field password {
|
||||||
height: 100px;
|
height: 100px;
|
||||||
margin-left: 150px;
|
margin-left: 150px;
|
||||||
|
|
@ -4346,6 +4360,12 @@ div #datebrowse-sidebar.widget {
|
||||||
margin:10px 10px 0 0;
|
margin:10px 10px 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#id_maxreq,
|
||||||
|
#id_cntunkmail,
|
||||||
|
#id_expire {
|
||||||
|
width: 75px;
|
||||||
|
}
|
||||||
|
|
||||||
#id_post_newfriend,
|
#id_post_newfriend,
|
||||||
#id_post_joingroup,
|
#id_post_joingroup,
|
||||||
#id_post_profilechange,
|
#id_post_profilechange,
|
||||||
|
|
@ -4358,7 +4378,7 @@ div #datebrowse-sidebar.widget {
|
||||||
#id_notify7,
|
#id_notify7,
|
||||||
#id_notify8,
|
#id_notify8,
|
||||||
#id_allow_location {
|
#id_allow_location {
|
||||||
margin: 6px 0 0 0;
|
margin: 6px 0 0 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#settings-form {}
|
#settings-form {}
|
||||||
|
|
@ -4374,6 +4394,7 @@ div #datebrowse-sidebar.widget {
|
||||||
}
|
}
|
||||||
|
|
||||||
#settings-notifications {
|
#settings-notifications {
|
||||||
|
width: 400px;
|
||||||
border: 1px solid #7C7D7B;
|
border: 1px solid #7C7D7B;
|
||||||
box-shadow: 0 0 8px #BDBDBD;
|
box-shadow: 0 0 8px #BDBDBD;
|
||||||
-moz-box-shadow: 3px 3px 4px #959494;
|
-moz-box-shadow: 3px 3px 4px #959494;
|
||||||
|
|
@ -4426,3 +4447,38 @@ div #datebrowse-sidebar.widget {
|
||||||
width: auto !important;
|
width: auto !important;
|
||||||
margin-bottom: 5px !important;
|
margin-bottom: 5px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.onoff {
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-heading {
|
||||||
|
margin: 25px 0 25px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#id_itemcache,
|
||||||
|
#id_basepath,
|
||||||
|
#id_temppath,
|
||||||
|
#id_lockpath,
|
||||||
|
#id_proxyuser,
|
||||||
|
#id_proxy,
|
||||||
|
#id_allowed_email,
|
||||||
|
#id_allowed_sites,
|
||||||
|
#id_directory_submit_url,
|
||||||
|
#id_register_text {
|
||||||
|
width: 440px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#id_itemcache_duration,
|
||||||
|
#id_abandon_days,
|
||||||
|
#id_maxloadavg,
|
||||||
|
#id_poll_interval,
|
||||||
|
#id_delivery_interval,
|
||||||
|
#id_timeout,
|
||||||
|
#id_jpegimagequality,
|
||||||
|
#id_maximagelength,
|
||||||
|
#id_maximagesize,
|
||||||
|
#id_max_daily_registrations {
|
||||||
|
width: 75px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
/*
|
/*
|
||||||
* Name: Smoothly
|
* Name: Smoothly
|
||||||
* Description: Like coffee with milk. Theme optimized for iPad[2].
|
* Description: Like coffee with milk. Theme optimized for iPad[2].
|
||||||
* Version: Version 0.132
|
* Version: Version 0.21
|
||||||
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
* Author: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||||
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
* Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
|
||||||
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
* Screenshot: <a href="screenshot.png">Screenshot</a>
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{{ else }}
|
{{ else }}
|
||||||
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles/$profid" ></a></div>
|
<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="$editprofile" href="profiles" ></a></div>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1020,6 +1020,9 @@ section {
|
||||||
max-width: 766px;
|
max-width: 766px;
|
||||||
padding: 10px 10px 10px 10px;
|
padding: 10px 10px 10px 10px;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
|
border-bottom: 1px solid lightgray;
|
||||||
|
border-right: 1px solid lightgray;
|
||||||
|
border-left: 1px solid lightgray;
|
||||||
}
|
}
|
||||||
/* wall item */
|
/* wall item */
|
||||||
.tread-wrapper {
|
.tread-wrapper {
|
||||||
|
|
@ -1091,6 +1094,7 @@ border-bottom: 1px solid #D2D2D2;
|
||||||
max-width: 660px;
|
max-width: 660px;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
line-height: 1.36;
|
line-height: 1.36;
|
||||||
|
padding-bottom: 6px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.wall-item-container .wall-item-content img {
|
.wall-item-container .wall-item-content img {
|
||||||
|
|
@ -1304,14 +1308,16 @@ border-bottom: 1px solid #D2D2D2;
|
||||||
.wall-item-tags {
|
.wall-item-tags {
|
||||||
padding-top: 1px;
|
padding-top: 1px;
|
||||||
padding-bottom: 2px;
|
padding-bottom: 2px;
|
||||||
|
/*display: none;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
.tag {
|
.tag {
|
||||||
color: rgb(153,153,153);
|
color: rgb(153,153,153);
|
||||||
padding-left: 3px;
|
/*padding-left: 3px;
|
||||||
font-size: 10px;
|
font-size: 10px;*/
|
||||||
}
|
}
|
||||||
.tag a {
|
.tag a {
|
||||||
padding-right: 8px;
|
/*padding-right: 8px;*/
|
||||||
color: rgb(153,153,153);
|
color: rgb(153,153,153);
|
||||||
}
|
}
|
||||||
.wwto {
|
.wwto {
|
||||||
|
|
@ -1724,7 +1730,7 @@ div.pager, .birthday-notice, ul.tabs a, #jot-preview-link, .comment-edit-submit-
|
||||||
background: linear-gradient(top, #ffffff 0%,#ececf2 100%);*/
|
background: linear-gradient(top, #ffffff 0%,#ececf2 100%);*/
|
||||||
}
|
}
|
||||||
|
|
||||||
#event-notice:hover, ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
|
#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, ul.tabs a:hover, #jot-preview-link:hover, .comment-edit-submit-wrapper .fakelink:hover {
|
||||||
color: black;
|
color: black;
|
||||||
background-color: #e5e5e5;
|
background-color: #e5e5e5;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue