Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:55:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse source
This commit is contained in:
zotlabs 2017-04-26 20:11:12 -07:00
commit 88149f56bb
12 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Zotlabs/Module/Wfinger.php
View file

@ -107,7 +107,7 @@ class Wfinger extends \Zotlabs\Web\Controller {
[
'rel' => 'http://schemas.google.com/g/2010#updates-from',
'type' => 'application/atom+xml',
'href' => z_root() . '/feed/' . $r[0]['channel_address'] . '?f=&compat=1'
'href' => z_root() . '/feed/' . $r[0]['channel_address'] . '/?compat=1'
],
[

2
Zotlabs/Module/Xrd.php
View file

@ -57,7 +57,7 @@ class Xrd extends \Zotlabs\Web\Controller {
'$aliases' => $aliases,
'$profile_url' => z_root() . '/channel/' . $r[0]['channel_address'],
'$hcard_url' => z_root() . '/hcard/' . $r[0]['channel_address'],
'$atom' => z_root() . '/feed/' . $r[0]['channel_address'] . '?f=&compat=1',
'$atom' => z_root() . '/feed/' . $r[0]['channel_address'] . '/?compat=1',
'$zot_post' => z_root() . '/post/' . $r[0]['channel_address'],
'$poco_url' => z_root() . '/poco/' . $r[0]['channel_address'],
'$photo' => z_root() . '/photo/profile/l/' . $r[0]['channel_id'],

2
boot.php
View file

@ -53,7 +53,7 @@ define ( 'PLATFORM_NAME', 'red' );
define ( 'STD_VERSION', '5.3' );
define ( 'ZOT_REVISION', '1.2' );
define ( 'DB_UPDATE_VERSION', 1189 );
define ( 'DB_UPDATE_VERSION', 1190 );
define ( 'PROJECT_BASE', __DIR__ );

2
images/emoji/README Normal file
View file

@ -0,0 +1,2 @@
These files supplied by emojione. License is CC BY 4.0. Attribution is required for commercial use.
See http://emojione.com

9
include/conversation.php
View file

@ -1533,6 +1533,15 @@ function prepare_page($item) {
// the template will get passed an unobscured title.
$body = prepare_body($item, true);
if(App::$page['template'] == 'none') {
$tpl = 'page_display_empty.tpl';
return replace_macros(get_markup_template($tpl), array(
'$body' => $body['html']
));
}
$tpl = get_pconfig($item['uid'], 'system', 'pagetemplate');
if (! $tpl)
$tpl = 'page_display.tpl';

6
include/message.php
View file

@ -188,9 +188,10 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
$body = str_rot47(base64url_encode($body));
$sig = ''; // placeholder
$mimetype = ''; //placeholder
$r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply )
VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
$r = q("INSERT INTO mail ( account_id, conv_guid, mail_obscured, channel_id, from_xchan, to_xchan, mail_mimetype, title, body, sig, attach, mid, parent_mid, created, expires, mail_isreply )
VALUES ( %d, '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d )",
intval($channel['channel_account_id']),
dbesc($conv_guid),
intval(1),
@ -198,6 +199,7 @@ function send_message($uid = 0, $recipient = '', $body = '', $subject = '', $rep
dbesc($channel['channel_hash']),
dbesc($recipient),
dbesc($subject),
dbesc(($mimetype)? $mimetype : 'text/bbcode'),
dbesc($body),
dbesc($sig),
dbesc($jattach),

2
install/schema_mysql.sql
View file

@ -717,6 +717,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
`to_xchan` char(191) NOT NULL DEFAULT '',
`account_id` int(10) unsigned NOT NULL DEFAULT '0',
`channel_id` int(10) unsigned NOT NULL DEFAULT '0',
`mail_mimetype` char(64) NOT NULL DEFAULT 'text/bbcode',
`title` text NOT NULL,
`body` mediumtext NOT NULL,
`sig` text NOT NULL,
@ -729,6 +730,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
`mail_seen` tinyint(4) NOT NULL DEFAULT '0',
`mail_recalled` tinyint(4) NOT NULL DEFAULT '0',
`mail_obscured` smallint(6) NOT NULL DEFAULT '0',
`mail_raw` tinyint(4) NOT NULL DEFAULT '0',
`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
`expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY (`id`),

2
install/schema_postgres.sql
View file

@ -710,6 +710,7 @@ CREATE TABLE "mail" (
"to_xchan" text NOT NULL DEFAULT '',
"account_id" bigint NOT NULL DEFAULT '0',
"channel_id" bigint NOT NULL DEFAULT '0',
"mail_mimetype char(64) NOT NULL DEFAULT '0',
"title" text NOT NULL,
"body" text NOT NULL,
"sig" text NOT NULL,
@ -722,6 +723,7 @@ CREATE TABLE "mail" (
"mail_seen" smallint NOT NULL DEFAULT '0',
"mail_recalled" smallint NOT NULL DEFAULT '0',
"mail_obscured" smallint NOT NULL DEFAULT '0',
"mail_raw" smallint NOT NULL DEFAULT '0',
"created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY ("id")

13
install/update.php
View file

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1189 );
define( 'UPDATE_VERSION' , 1190 );
/**
*
@ -2521,3 +2521,14 @@ function update_r1188() {
}
function update_r1189() {
$r1 = q("alter table mail add mail_mimetype char(64) not null default 'text/bbcode' ");
$r2 = q("alter table mail add mail_raw int(4) not null default '0' ");
if($r1 && $r2)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

1
view/tpl/page_display_empty.tpl Normal file
View file

@ -0,0 +1 @@
{{$body}}