archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 2626: ability to upload a new watermark

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@14546 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2012-04-29 23:58:44 +00:00
commit a129632a26
3 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
admin/include/configuration_watermark_process.inc.php
View file

@ -29,6 +29,30 @@ if( !defined("PHPWG_ROOT_PATH") )
$errors = array();
$pwatermark = $_POST['w'];
// step 0 - manage upload if any
if (isset($_FILES['watermarkImage']) and !empty($_FILES['watermarkImage']['tmp_name']))
{
list($width, $height, $type) = getimagesize($_FILES['watermarkImage']['tmp_name']);
if (IMAGETYPE_PNG != $type)
{
$errors['watermarkImage'] = 'PNG';
}
else
{
$upload_dir = PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'watermarks';
include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
prepare_directory($upload_dir);
$new_name = get_filename_wo_extension($_FILES['watermarkImage']['name']).'.png';
$file_path = $upload_dir.'/'.$new_name;
move_uploaded_file($_FILES['watermarkImage']['tmp_name'], $file_path);
$pwatermark['file'] = substr($file_path, strlen(PHPWG_ROOT_PATH));
}
}
// step 1 - sanitize HTML input
switch ($pwatermark['position'])
{