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

fix to wall_upload photos default permissions to use cid rather than uid.

This commit is contained in:
friendica 2012-04-08 16:19:45 -07:00
parent 5c04469755
commit 977625a53b
5 changed files with 338 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1305' ); define ( 'FRIENDICA_VERSION', '2.3.1306' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1137 ); define ( 'DB_UPDATE_VERSION', 1137 );

2
mod/item.php
View File

@ -351,7 +351,7 @@ function item_post(&$a) {
$image_uri = substr($image_uri,0, strpos($image_uri,'-')); $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if(! strlen($image_uri)) if(! strlen($image_uri))
continue; continue;
$srch = '<' . intval($profile_uid) . '>'; $srch = '<' . intval($contact_record['id']) . '>';
$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' $r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
AND `resource-id` = '%s' AND `uid` = %d LIMIT 1", AND `resource-id` = '%s' AND `uid` = %d LIMIT 1",
dbesc($srch), dbesc($srch),

5
mod/wall_attach.php
View File

@ -7,7 +7,7 @@ function wall_attach_post(&$a) {
if($a->argc > 1) { if($a->argc > 1) {
$nick = $a->argv[1]; $nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) if(! count($r))
@ -21,6 +21,7 @@ function wall_attach_post(&$a) {
$visitor = 0; $visitor = 0;
$page_owner_uid = $r[0]['uid']; $page_owner_uid = $r[0]['uid'];
$page_owner_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname']; $page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -73,7 +74,7 @@ function wall_attach_post(&$a) {
dbesc($filedata), dbesc($filedata),
dbesc($created), dbesc($created),
dbesc($created), dbesc($created),
dbesc('<' . $page_owner_uid . '>'), dbesc('<' . $page_owner_cid . '>'),
dbesc(''), dbesc(''),
dbesc(''), dbesc(''),
dbesc('') dbesc('')

8
mod/wall_upload.php
View File

@ -6,7 +6,7 @@ function wall_upload_post(&$a) {
if($a->argc > 1) { if($a->argc > 1) {
$nick = $a->argv[1]; $nick = $a->argv[1];
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($r)) if(! count($r))
@ -16,10 +16,13 @@ function wall_upload_post(&$a) {
else else
return; return;
$can_post = false; $can_post = false;
$visitor = 0; $visitor = 0;
$page_owner_uid = $r[0]['uid']; $page_owner_uid = $r[0]['uid'];
$default_cid = $r[0]['id'];
$page_owner_nick = $r[0]['nickname']; $page_owner_nick = $r[0]['nickname'];
$community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -34,6 +37,7 @@ function wall_upload_post(&$a) {
if(count($r)) { if(count($r)) {
$can_post = true; $can_post = true;
$visitor = remote_user(); $visitor = remote_user();
$default_cid = $visitor;
} }
} }
} }
@ -76,7 +80,7 @@ function wall_upload_post(&$a) {
$smallest = 0; $smallest = 0;
$defperm = '<' . $page_owner_uid . '>'; $defperm = '<' . $default_cid . '>';
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm); $r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);

628
util/messages.po
View File

File diff suppressed because it is too large Load Diff