mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-29 04:39:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature 2831: simple way to protect urls of originals

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@20516 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2013-02-02 07:09:52 +00:00
parent 21c97f3858
commit 5b22fcea0e
4 changed files with 34 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/common.inc.php
View file

@ -266,5 +266,10 @@ add_event_handler('render_comment_content', 'render_comment_content');
add_event_handler('render_comment_author', 'strip_tags');
add_event_handler('render_tag_url', 'str2url');
add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1);
if ( !empty($conf['original_url_protection']) )
{
add_event_handler('get_element_url', 'get_element_url_protection_handler', EVENT_HANDLER_PRIORITY_NEUTRAL, 2 );
add_event_handler('get_src_image_url', 'get_src_image_url_protection_handler', EVENT_HANDLER_PRIORITY_NEUTRAL, 2 );
}
trigger_action('init');
?>

4
include/config_default.inc.php
View file

@ -777,4 +777,8 @@ $conf['derivative_default_size'] = 'medium';
//Maximum Ajax requests at once, for thumbnails on-the-fly generation
$conf['max_requests']=3;
// one of '', 'images', 'all'
//TODO: Put this in admin and also manage .htaccess in #sites and upload folders
$conf['original_url_protection'] = '';
?>

2
include/derivative.inc.php
View file

@ -106,7 +106,7 @@ final class SrcImage
function get_url()
{
$url = get_root_url().$this->rel_path;
if ($this->flags & self::IS_ORIGINAL)
if ( !($this->flags & self::IS_MIMETYPE) )
{
$url = trigger_event('get_src_image_url', $url, $this);
}

21
include/functions_html.inc.php
View file

@ -593,4 +593,25 @@ function get_thumbnail_title($info, $title, $comment)
return $title;
}
/** optional event handler to protect src image urls */
function get_src_image_url_protection_handler($url, $src_image)
{
return get_action_url($src_image->id, $src_image->is_original() ? 'e' : 'r', false);
}
/** optional event handler to protect element urls */
function get_element_url_protection_handler($url, $infos)
{
global $conf;
if ('images'==$conf['original_url_protection'])
{// protect only images and not other file types (for example large movies that we don't want to send through our file proxy)
$ext = get_extension($infos['path']);
if (!in_array($ext, $conf['picture_ext']))
{
return $url;
}
}
return get_action_url($infos['id'], 'e', false);
}
?>