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

start work on photo directories

Browse Source
This commit is contained in:
redmatrix 2015-06-16 19:05:09 -07:00
parent 65661b7ec3
commit 39309ad45c
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/attach.php
View File

@ -349,9 +349,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$sql_options = ''; $sql_options = '';
$source = (($arr) ? $arr['source'] : ''); $source = (($arr) ? $arr['source'] : '');
$album = (($arr) ? $arr['album'] : ''); $album = (($arr) ? $arr['album'] : '');
$newalbum = (($arr) ? $arr['newalbum'] : '');
$hash = (($arr && $arr['hash']) ? $arr['hash'] : null); $hash = (($arr && $arr['hash']) ? $arr['hash'] : null);
logger('arr: ' . print_r($arr,true)); // logger('arr: ' . print_r($arr,true));
// This is currently used only in mod/wall_attach // This is currently used only in mod/wall_attach
@ -449,6 +450,21 @@ logger('arr: ' . print_r($arr,true));
$is_photo = 1; $is_photo = 1;
} }
if($is_photo) {
if($newalbum) {
$x = z_readdir($channel_id, $observer_hash, filepath_macro($newalbum));
}
elseif($album) {
$x = z_readdir($channel_id, $observer_hash, filepath_macro($album));
}
if(! $x['success']) {
// recursively create the directory path
}
}
$created = datetime_convert(); $created = datetime_convert();
@ -471,7 +487,7 @@ logger('arr: ' . print_r($arr,true));
intval($x[0]['aid']), intval($x[0]['aid']),
intval($channel_id), intval($channel_id),
dbesc($x[0]['hash']), dbesc($x[0]['hash']),
dbesc(get_observer_hash()), dbesc($observer_hash),
dbesc($filename), dbesc($filename),
dbesc($mimetype), dbesc($mimetype),
intval($filesize), intval($filesize),
@ -1393,3 +1409,15 @@ function in_group($group_id) {
return $group_members; return $group_members;
} }
function filepath_macro($s) {
return str_replace(
array( '%Y', '%M', '%D' ),
array( datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'),
datetime_convert('UTC',date_default_timezone_get(),'now', 'm'),
datetime_convert('UTC',date_default_timezone_get(),'now', 'd')
), $s);
}