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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-05-17 18:19:49 -07:00
commit f985c08d12
2 changed files with 105 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
include/attach.php
View File

@ -4,10 +4,11 @@
* *
* @brief File/attach API with the potential for revision control. * @brief File/attach API with the potential for revision control.
* *
* @TODO: a filesystem storage abstraction which maintains security (and 'data' contains a system filename * @TODO A filesystem storage abstraction which maintains security (and 'data'
* which is inaccessible from the web). This could get around PHP storage limits and store videos and larger * contains a system filename which is inaccessible from the web). This could
* items, using fread or OS methods or native code to read/write or chunk it through. * get around PHP storage limits and store videos and larger items, using fread
* Also an 'append' option to the storage function might be a useful addition. * or OS methods or native code to read/write or chunk it through.
* @todo Also an 'append' option to the storage function might be a useful addition.
*/ */
require_once('include/permissions.php'); require_once('include/permissions.php');
@ -123,7 +124,7 @@ function z_mime_content_type($filename) {
* @param string $hash (optional) * @param string $hash (optional)
* @param string $filename (optional) * @param string $filename (optional)
* @param string $filetype (optional) * @param string $filetype (optional)
* @return assoziative array with: * @return associative array with:
* * \e boolean \b success * * \e boolean \b success
* * \e int|boolean \b results amount of found results, or false * * \e int|boolean \b results amount of found results, or false
* * \e string \b message with error messages if any * * \e string \b message with error messages if any
@ -161,7 +162,7 @@ function attach_count_files($channel_id, $observer, $hash = '', $filename = '',
/** /**
* @brief Returns a list of files/attachments. * @brief Returns a list of files/attachments.
* *
* @param $channel_id * @param $channel_id
* @param $observer * @param $observer
* @param $hash (optional) * @param $hash (optional)
@ -170,10 +171,10 @@ function attach_count_files($channel_id, $observer, $hash = '', $filename = '',
* @param $orderby * @param $orderby
* @param $start * @param $start
* @param $entries * @param $entries
* @return array * @return associative array with:
* $ret['success'] boolean * * \e boolean \b success
* $ret['results'] array with results, or false * * \e array|boolean \b results array with results, or false
* $ret['message'] string with error messages if any * * \e string \b message with error messages if any
*/ */
function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '', $orderby = 'created desc', $start = 0, $entries = 0) { function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $filetype = '', $orderby = 'created desc', $start = 0, $entries = 0) {
@ -213,11 +214,11 @@ function attach_list_files($channel_id, $observer, $hash = '', $filename = '', $
/** /**
* @brief Find an attachment by hash and revision. * @brief Find an attachment by hash and revision.
* *
* Returns the entire attach structure including data. * Returns the entire attach structure including data.
* *
* This could exhaust memory so most useful only when immediately sending the data. * This could exhaust memory so most useful only when immediately sending the data.
* *
* @param string $hash * @param string $hash
* @param int $rev Revision * @param int $rev Revision
* @return array * @return array
@ -275,7 +276,7 @@ function attach_by_hash($hash, $rev = 0) {
* @see attach_by_hash() * @see attach_by_hash()
* @param $hash * @param $hash
* @param $rev revision default 0 * @param $rev revision default 0
* @return array Everything except data. * @return associative array with everything except data
* * \e boolean \b success boolean true or false * * \e boolean \b success boolean true or false
* * \e string \b message (optional) only when success is false * * \e string \b message (optional) only when success is false
* * \e array \b data array of attach DB entry without data component * * \e array \b data array of attach DB entry without data component
@ -326,12 +327,18 @@ function attach_by_hash_nodata($hash, $rev = 0) {
} }
/** /**
* @brief * @brief Stores an attachment from a POST file upload.
* *
* @param $channel channel array of owner * This function stores an attachment. It can be a new one, a replacement or a
* @param $observer_hash hash of current observer * new revision depending on value set in \e $options.
* @param $options (optional) *
* @param $arr (optional) * @note Requires an input field \e userfile and does not accept multiple files
* in one request.
*
* @param array $channel channel array of owner
* @param string $observer_hash hash of current observer
* @param string $options (optional) one of update, replace, revision
* @param array $arr (optional) associative array
*/ */
function attach_store($channel, $observer_hash, $options = '', $arr = null) { function attach_store($channel, $observer_hash, $options = '', $arr = null) {
@ -366,7 +373,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
if($options === 'replace') { if($options === 'replace') {
/** @BUG $replace is undefined here */ /** @BUG $replace is undefined here */
$x = q("select id, hash, filesize from attach where id = %d and uid = %d limit 1", $x = q("select id, hash, filesize from attach where id = %d and uid = %d limit 1",
intval($replace), intval($replace),
intval($channel_id) intval($channel_id)
); );
@ -457,7 +464,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
); );
} }
elseif($options === 'update') { elseif($options === 'update') {
$r = q("update attach set filename = '%s', filetype = '%s', edited = '%s', $r = q("update attach set filename = '%s', filetype = '%s', edited = '%s',
allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d", allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s' where id = %d and uid = %d",
dbesc((array_key_exists('filename',$arr)) ? $arr['filename'] : $x[0]['filename']), dbesc((array_key_exists('filename',$arr)) ? $arr['filename'] : $x[0]['filename']),
dbesc((array_key_exists('filetype',$arr)) ? $arr['filetype'] : $x[0]['filetype']), dbesc((array_key_exists('filetype',$arr)) ? $arr['filetype'] : $x[0]['filetype']),
@ -551,7 +558,7 @@ function z_readdir($channel_id, $observer_hash, $pathname, $parent_hash = '') {
intval(ATTACH_FLAG_DIR) intval(ATTACH_FLAG_DIR)
); );
if(! $r) { if(! $r) {
$ret['message'] = t('Path not available.'); $ret['message'] = t('Path not available.');
return $ret; return $ret;
} }
@ -621,7 +628,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
// Check for duplicate name. // Check for duplicate name.
// Check both the filename and the hash as we will be making use of both. // Check both the filename and the hash as we will be making use of both.
$r = q("select hash from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1", $r = q("select hash from attach where ( filename = '%s' or hash = '%s' ) and folder = '%s' and uid = %d limit 1",
dbesc($arr['filename']), dbesc($arr['filename']),
dbesc($arr['hash']), dbesc($arr['hash']),
@ -644,7 +651,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
$sql_options = permissions_sql($channel['channel_id']); $sql_options = permissions_sql($channel['channel_id']);
do { do {
$r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0 $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0
$sql_options limit 1", $sql_options limit 1",
intval($channel['channel_id']), intval($channel['channel_id']),
dbesc($lfile), dbesc($lfile),
@ -660,7 +667,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
$lpath = $r[0]['hash'] . '/' . $lpath; $lpath = $r[0]['hash'] . '/' . $lpath;
$lfile = $r[0]['folder']; $lfile = $r[0]['folder'];
} while ( ($r[0]['folder']) && ($r[0]['flags'] & ATTACH_FLAG_DIR)) ; } while ( ($r[0]['folder']) && ($r[0]['flags'] & ATTACH_FLAG_DIR)) ;
$path = $basepath . '/' . $lpath; $path = $basepath . '/' . $lpath;
} }
else else
$path = $basepath . '/'; $path = $basepath . '/';
@ -716,7 +723,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
/** /**
* @brief Changes permissions of a file. * @brief Changes permissions of a file.
* *
* @param int $channel_id * @param int $channel_id
* @param array $resource * @param array $resource
* @param string $allow_cid * @param string $allow_cid
@ -841,7 +848,7 @@ function attach_delete($channel_id, $resource) {
* @warning This function cannot be used with mod/dav as it always returns a * @warning This function cannot be used with mod/dav as it always returns a
* path valid under mod/cloud. * path valid under mod/cloud.
* *
* @param array $arr assoziative array with: * @param array $arr associative array with:
* * \e int \b uid the channel's uid * * \e int \b uid the channel's uid
* * \e string \b folder * * \e string \b folder
* * \e string \b filename * * \e string \b filename
@ -866,7 +873,7 @@ function get_cloudpath($arr) {
$lfile = $arr['folder']; $lfile = $arr['folder'];
do { do {
$r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0 $r = q("select filename, hash, flags, folder from attach where uid = %d and hash = '%s' and ( flags & %d )>0
limit 1", limit 1",
intval($arr['uid']), intval($arr['uid']),
dbesc($lfile), dbesc($lfile),
@ -961,7 +968,7 @@ function find_filename_by_hash($channel_id, $attachHash) {
} }
/** /**
* *
* @param $in * @param $in
* @param $out * @param $out
*/ */
@ -1210,6 +1217,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
$ret = array(); $ret = array();
$parent_arr = array(); $parent_arr = array();
$count_values = array();
$poster = get_app()->get_observer(); $poster = get_app()->get_observer();
//turn allow_gid into allow_cid's //turn allow_gid into allow_cid's
@ -1317,11 +1325,10 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
return $ret; return $ret;
} }
/** /**
* @brief Returns members of a group * @brief Returns members of a group.
* *
* @param $group_id * @param int $group_id id of the group to look up
*/ */
function in_group($group_id) { function in_group($group_id) {
$group_members = array(); $group_members = array();

66
include/environment.php Normal file
View File

@ -0,0 +1,66 @@
<?php
/**
* @file include/environment.php
* @brief Functions related to system/environment tasks.
*
* This file contains some functions to check the environment/system.
*/
/**
* @brief Get some upload related limits from php.ini.
*
* This function returns values from php.ini like \b post_max_size,
* \b max_file_uploads, \b upload_max_filesize.
*
* @return array associative array
* * \e int \b post_max_size the maximum size of a complete POST in bytes
* * \e int \b upload_max_filesize the maximum size of one file in bytes
* * \e int \b max_file_uploads maximum number of files in one POST
* * \e int \b max_upload_filesize min(post_max_size, upload_max_filesize)
*/
function getPhpiniUploadLimits() {
$ret = array();
// max size of the complete POST
$ret['post_max_size'] = phpiniSizeToBytes(ini_get('post_max_size'));
// max size of one file
$ret['upload_max_filesize'] = phpiniSizeToBytes(ini_get('upload_max_filesize'));
// catch a configuration error where post_max_size < upload_max_filesize
$ret['max_upload_filesize'] = min(
$ret['post_max_size'],
$ret['upload_max_filesize']
);
// maximum number of files in one POST
$ret['max_file_uploads'] = intval(ini_get('max_file_uploads'));
return $ret;
}
/**
* @brief Parses php_ini size settings to bytes.
*
* This function parses common size setting from php.ini files to bytes.
* e.g. post_max_size = 8M ==> 8388608
*
* \note This method does not recognise other human readable formats like
* 8MB, etc.
*
* @todo Make this function more universal useable. MB, T, etc.
*
* @param string $val value from php.ini e.g. 2M, 8M
* @return int size in bytes
*/
function phpiniSizeToBytes($val) {
$val = trim($val);
$unit = strtolower($val[strlen($val)-1]);
switch($unit) {
case 'g':
$val *= 1024;
case 'm':
$val *= 1024;
case 'k':
$val *= 1024;
}
return (int)$val;
}