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

make new os_storage flag work

Browse Source
This commit is contained in:
redmatrix 2015-06-14 15:59:11 -07:00
parent b7be79c5e7
commit 23f7f60bf7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/attach.php
View File

@ -35,7 +35,7 @@ function attach_init(&$a) {
} }
header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"'); header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"');
if($r['data']['flags'] & ATTACH_FLAG_OS ) { if(intval($r['data']['os_storage'])) {
$fname = dbunescbin($r['data']['data']); $fname = dbunescbin($r['data']['data']);
$istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname,'rb'); $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $fname,'rb');
$ostream = fopen('php://output','wb'); $ostream = fopen('php://output','wb');

4
mod/photo.php
View File

@ -69,6 +69,8 @@ function photo_init(&$a) {
$data = dbunescbin($r[0]['data']); $data = dbunescbin($r[0]['data']);
$mimetype = $r[0]['type']; $mimetype = $r[0]['type'];
} }
if(intval($r[0]['os_storage']))
$data = file_get_contents($data);
if(! isset($data)) { if(! isset($data)) {
$data = file_get_contents($default); $data = file_get_contents($default);
$mimetype = 'image/png'; $mimetype = 'image/png';
@ -142,6 +144,8 @@ function photo_init(&$a) {
if($r && $allowed) { if($r && $allowed) {
$data = dbunescbin($r[0]['data']); $data = dbunescbin($r[0]['data']);
$mimetype = $r[0]['type']; $mimetype = $r[0]['type'];
if(intval($r[0]['os_storage']))
$data = file_get_contents($data);
} }
else { else {