clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

photos were not working in private mail

This commit is contained in:
Friendika 2011-06-30 19:02:11 -07:00
parent 9aeccaaa9e
commit cdddfca0b5
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -6,7 +6,7 @@ ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.2.1027' ); define ( 'FRIENDIKA_VERSION', '2.2.1027' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1070 ); define ( 'DB_UPDATE_VERSION', 1071 );
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' );

2
database.sql
View File

@ -243,7 +243,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
`from-url` char(255) NOT NULL, `from-url` char(255) NOT NULL,
`contact-id` char(255) NOT NULL, `contact-id` char(255) NOT NULL,
`title` char(255) NOT NULL, `title` char(255) NOT NULL,
`body` text NOT NULL, `body` mediumtext NOT NULL,
`seen` tinyint(1) NOT NULL, `seen` tinyint(1) NOT NULL,
`replied` tinyint(1) NOT NULL, `replied` tinyint(1) NOT NULL,
`uri` char(255) NOT NULL, `uri` char(255) NOT NULL,

4
include/notifier.php
View File

@ -238,6 +238,8 @@ function notifier_run($argv, $argc){
if($cmd === 'mail') { if($cmd === 'mail') {
$notify_hub = false; // mail is not public $notify_hub = false; // mail is not public
$body = fix_private_photos($item['body'],$owner['uid']);
$atom .= replace_macros($mail_template, array( $atom .= replace_macros($mail_template, array(
'$name' => xmlify($owner['name']), '$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']), '$profile_page' => xmlify($owner['url']),
@ -245,7 +247,7 @@ function notifier_run($argv, $argc){
'$item_id' => xmlify($item['uri']), '$item_id' => xmlify($item['uri']),
'$subject' => xmlify($item['title']), '$subject' => xmlify($item['title']),
'$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)), '$created' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$content' => xmlify($item['body']), '$content' => xmlify($body),
'$parent_id' => xmlify($item['parent-uri']) '$parent_id' => xmlify($item['parent-uri'])
)); ));
} }

9
update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1070 ); define( 'UPDATE_VERSION' , 1071 );
/** /**
* *
@ -565,3 +565,10 @@ function update_1069() {
q("ALTER TABLE `fsuggest` ADD `request` CHAR( 255 ) NOT NULL AFTER `url` "); q("ALTER TABLE `fsuggest` ADD `request` CHAR( 255 ) NOT NULL AFTER `url` ");
q("ALTER TABLE `fcontact` ADD `request` CHAR( 255 ) NOT NULL AFTER `photo` "); q("ALTER TABLE `fcontact` ADD `request` CHAR( 255 ) NOT NULL AFTER `photo` ");
} }
// mail body needs to accomodate private photos
function update_1070() {
q("ALTER TABLE `mail` CHANGE `body` `body` MEDIUMTEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ");
}