harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

little fixes of hopefully nil significance

Browse Source
This commit is contained in:
friendica 2014-03-16 20:34:21 -07:00
parent 6f9fde997b
commit ecb2e52a74
6 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/api.php
View File

@ -533,12 +533,6 @@ require_once('include/items.php');
api_register_func('api/red/channel/export/basic','api_export_basic', true); api_register_func('api/red/channel/export/basic','api_export_basic', true);
function api_channel_stream(&$a, $type) { function api_channel_stream(&$a, $type) {
if(api_user() === false) { if(api_user() === false) {
logger('api_channel_stream: no user'); logger('api_channel_stream: no user');
@ -700,12 +694,12 @@ require_once('include/items.php');
function red_item_new(&$a, $type) { function red_item_new(&$a, $type) {
if (api_user() === false) { if (api_user() === false) {
logger('api_statuses_update: no user'); logger('api_red_item_new: no user');
return false; return false;
} }
logger('api_statuses_update: REQUEST ' . print_r($_REQUEST,true)); logger('api_red_item_new: REQUEST ' . print_r($_REQUEST,true));
logger('api_statuses_update: FILES ' . print_r($_FILES,true)); logger('api_red_item_new: FILES ' . print_r($_FILES,true));
// set this so that the item_post() function is quiet and doesn't redirect or emit json // set this so that the item_post() function is quiet and doesn't redirect or emit json
@ -1698,7 +1692,7 @@ require_once('include/items.php');
'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => 'false', 'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => 'false',
'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl, 'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
'shorturllength' => '30', 'shorturllength' => '30',
'friendica' => array( 'redmatrix' => array(
'RED_PLATFORM' => RED_PLATFORM, 'RED_PLATFORM' => RED_PLATFORM,
'RED_VERSION' => RED_VERSION, 'RED_VERSION' => RED_VERSION,
'ZOT_REVISION' => ZOT_REVISION, 'ZOT_REVISION' => ZOT_REVISION,

9
include/bbcode.php
View File

@ -229,9 +229,12 @@ function bb_location($match) {
function bbiframe($match) { function bbiframe($match) {
$a = get_app(); $a = get_app();
if(strpos($match[1],get_app()->get_hostname()))
return '<a href="' . $match[1] . '">' . $match[1] . '</a>'; // use sandbox mode to prevent malicious goings on rather than host restriction
return '<iframe src="' . $match[1] . '" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="' . $match[1] . '">' . $match[1] . '</a></iframe>'; // if(strpos($match[1],get_app()->get_hostname()))
// return '<a href="' . $match[1] . '">' . $match[1] . '</a>';
return '<iframe sandbox="allow-same-origin allow-top-navigation" src="' . $match[1] . '" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="' . $match[1] . '">' . $match[1] . '</a></iframe>';
} }
function bb_ShareAttributesSimple($match) { function bb_ShareAttributesSimple($match) {

2
include/oembed.php
View File

@ -165,7 +165,7 @@ function oembed_iframe($src,$width,$height) {
$a = get_app(); $a = get_app();
$s = $a->get_baseurl()."/oembed/".base64url_encode($src); $s = $a->get_baseurl()."/oembed/".base64url_encode($src);
return '<iframe height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>'; return '<iframe sandbox="allow-same-origin allow-top-navigation" height="' . $height . '" width="' . $width . '" src="' . $s . '" frameborder="no" >' . t('Embedded content') . '</iframe>';
} }

4
include/reddav.php
View File

@ -708,7 +708,7 @@ function RedFileData($file, &$auth,$test = false) {
$r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited from attach $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited from attach
where folder = '%s' and filename = '%s' and uid = %d $perms group by filename limit 1", where folder = '%s' and filename = '%s' and uid = %d $perms group by filename limit 1",
dbesc($folder), dbesc($folder),
basename($file), dbesc(basename($file)),
intval($channel_id) intval($channel_id)
); );
@ -719,7 +719,7 @@ function RedFileData($file, &$auth,$test = false) {
$r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited from attach $r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, created, edited from attach
where folder = '%s' and filename = '%s' and uid = %d group by filename limit 1", where folder = '%s' and filename = '%s' and uid = %d group by filename limit 1",
dbesc($folder), dbesc($folder),
basename($file), dbesc(basename($file)),
intval($channel_id) intval($channel_id)
); );
if($r) if($r)

5
include/text.php
View File

@ -278,6 +278,11 @@ function hex2bin($s) {
if(! (is_string($s) && strlen($s))) if(! (is_string($s) && strlen($s)))
return ''; return '';
if(strlen($s) & 1) {
logger('hex2bin: illegal hex string: ' . $s);
return $s;
}
if(! ctype_xdigit($s)) { if(! ctype_xdigit($s)) {
return($s); return($s);
} }

3
mod/oembed.php
View File

@ -19,8 +19,7 @@ function oembed_init(&$a){
else { else {
echo "<html><body>"; echo "<html><body>";
$url = base64url_decode(argv(1)); $j = oembed_fetch_url(base64url_decode(argv(1)));
$j = oembed_fetch_url($url);
echo $j->html; echo $j->html;
// logger('mod-oembed ' . $j->html, LOGGER_ALL); // logger('mod-oembed ' . $j->html, LOGGER_ALL);
echo "</body></html>"; echo "</body></html>";