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

Fixed Issue ID 0000494: Stats do not currently include Uploads

Browse source 
Fixed: Error when thumbnail directory not exists
Fixed: Apply current translation norme
Fixed: Improvement style sheet (like other PWG sheet)


git-svn-id: http://piwigo.org/svn/trunk@1631 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2006-12-03 22:32:02 +00:00
commit 4c7e7fb0fb
5 changed files with 195 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/thumbnail.php
View file

@ -107,17 +107,9 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext)
$destWidth,$destHeight,$srcWidth,$srcHeight ); $destWidth,$destHeight,$srcWidth,$srcHeight );
} }
$tndir = $dirname.'/thumbnail'; if (($tndir = mkget_thumbnail_dir($dirname, $page['errors'])) == false)
if (!is_dir($tndir))
{ {
if (!is_writable($dirname)) return false;
{
array_push($page['errors'],
'['.$dirname.'] : '.$lang['no_write_access']);
return false;
}
umask(0000);
mkdir($tndir, 0777);
} }
$dest_file = $tndir.'/'.$conf['prefix_thumbnail']; $dest_file = $tndir.'/'.$conf['prefix_thumbnail'];

28
include/functions.inc.php
View file

@ -215,6 +215,34 @@ function get_dirs($directory)
return $sub_dirs; return $sub_dirs;
} }
/**
* returns thumbnail directory name of input diretoty name
* make thumbnail directory is necessary
* set error messages on array messages
*
* @param:
* string $dirname
* arrayy $errors
* @return bool false on error else string directory name
*/
function mkget_thumbnail_dir($dirname, &$errors)
{
$tndir = $dirname.'/thumbnail';
if (!is_dir($tndir))
{
if (!is_writable($dirname))
{
array_push($errors,
'['.$dirname.'] : '.l10n('no_write_access'));
return false;
}
umask(0000);
mkdir($tndir, 0777);
}
return $tndir;
}
// The get_picture_size function return an array containing : // The get_picture_size function return an array containing :
// - $picture_size[0] : final width // - $picture_size[0] : final width
// - $picture_size[1] : final height // - $picture_size[1] : final height

1
template/yoga/content.css
View file

@ -5,6 +5,7 @@
} }
BODY#theCommentsPage #content, BODY#theCommentsPage #content,
BODY#theUploadPage #content,
BODY#theRegisterPage #content, BODY#theRegisterPage #content,
BODY#theIdentificationPage #content, BODY#theIdentificationPage #content,
BODY#theProfilePage #content, BODY#theProfilePage #content,

195
template/yoga/upload.tpl
View file

@ -1,93 +1,102 @@
<h2>{L_TITLE}</h2> <div id="content">
<!-- BEGIN upload_not_successful -->
<form enctype="multipart/form-data" method="post" action="{F_ACTION}"> <div class="titrePage">
<table style="width:80%;margin-left:auto;margin-right:auto;"> <ul class="categoryActions">
<!-- BEGIN errors --> <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
<tr> </ul>
<td colspan="2"> <h2>{lang:upload_title}</h2>
<div class="errors"> </div>
<ul>
<!-- BEGIN error --> <!-- BEGIN upload_not_successful -->
<li>{upload_not_successful.errors.error.ERROR}</li> <form enctype="multipart/form-data" method="post" action="{F_ACTION}">
<!-- END error --> <table style="width:80%;margin-left:auto;margin-right:auto;">
</ul> <!-- BEGIN errors -->
</div> <tr>
</td> <td colspan="2">
</tr> <div class="errors">
<!-- END errors --> <ul>
<tr> <!-- BEGIN error -->
<td colspan="2" class="menu"> <li>{upload_not_successful.errors.error.ERROR}</li>
<div style="text-align:center;">{ADVISE_TITLE}</div> <!-- END error -->
<ul> </ul>
<!-- BEGIN advise --> </div>
<li>{upload_not_successful.advise.ADVISE}</li> </td>
<!-- END advise --> </tr>
</ul> <!-- END errors -->
</td> <tr>
</tr> <td colspan="2" class="menu">
<tr> <div style="text-align:center;">{ADVISE_TITLE}</div>
<td colspan="2" align="center" style="padding:10px;"> <ul>
<input name="picture" type="file" value="" /> <!-- BEGIN advise -->
</td> <li>{upload_not_successful.advise.ADVISE}</li>
</tr> <!-- END advise -->
<!-- BEGIN fields --> </ul>
<!-- username --> </td>
<tr> </tr>
<td class="menu">{L_USERNAME} <span style="color:red;">*</span></td> <tr>
<td align="center" style="padding:10px;"> <td colspan="2" align="center" style="padding:10px;">
<input name="username" type="text" value="{NAME}" /> <input name="picture" type="file" value="" />
</td> </td>
</tr> </tr>
<!-- mail address --> <!-- BEGIN fields -->
<tr> <!-- username -->
<td class="menu">{L_EMAIL} <span style="color:red;">*</span></td> <tr>
<td align="center" style="padding:10px;"> <td class="menu">{lang:upload_username} <span style="color:red;">*</span></td>
<input name="mail_address" type="text" value="{EMAIL}" /> <td align="left" style="padding:10px;">
</td> <input name="username" type="text" value="{NAME}" />
</tr> </td>
<!-- name of the picture --> </tr>
<tr> <!-- mail address -->
<td class="menu">{L_NAME_IMG}</td> <tr>
<td align="center" style="padding:10px;"> <td class="menu">{lang:mail_address} <span style="color:red;">*</span></td>
<input name="name" type="text" value="{NAME_IMG}" /> <td align="left" style="padding:10px;">
</td> <input name="mail_address" type="text" value="{EMAIL}" />
</tr> </td>
<!-- author --> </tr>
<tr> <!-- name of the picture -->
<td class="menu">{L_AUTHOR}</td> <tr>
<td align="center" style="padding:10px;"> <td class="menu">{lang:upload_name}</td>
<input name="author" type="text" value="{AUTHOR_IMG}" /> <td align="left" style="padding:10px;">
</td> <input name="name" type="text" value="{NAME_IMG}" />
</tr> </td>
<!-- date of creation --> </tr>
<tr> <!-- author -->
<td class="menu">{L_CREATION_DATE}</td> <tr>
<td align="center" style="padding:10px;"> <td class="menu">{lang:upload_author}</td>
<input name="date_creation" type="text" value="{DATE_IMG}" /> <td align="left" style="padding:10px;">
</td> <input name="author" type="text" value="{AUTHOR_IMG}" />
</tr> </td>
<!-- comment --> </tr>
<tr> <!-- date of creation -->
<td class="menu">{L_COMMENT}</td> <tr>
<td align="center" style="padding:10px;"> <td class="menu">{lang:upload_creation_date}</td>
<textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea> <td align="left" style="padding:10px;">
</td> <input name="date_creation" type="text" value="{DATE_IMG}" />
</tr> </td>
<!-- END fields --> </tr>
<tr> <!-- comment -->
<td colspan="2" align="center"> <tr>
<input name="submit" type="submit" value="{L_SUBMIT}" class="bouton" /> <td class="menu">{lang:comment}</td>
</td> <td align="left" style="padding:10px;">
</tr> <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
</table> </td>
</form> </tr>
<!-- END upload_not_successful --> <!-- END fields -->
<!-- BEGIN upload_successful --> <tr>
{L_UPLOAD_DONE}<br /> <td colspan="2" align="center">
<!-- END upload_successful --> <input name="submit" type="submit" value="{lang:submit}" class="bouton" />
<div style="text-align:center;"> </td>
<a href="{U_RETURN}">[ {L_RETURN} ]</a> </tr>
</div> </table>
<!-- BEGIN note --> </form>
<div style="text-align:left;"><span style="color:red;">*</span> : {L_MANDATORY}</div> <!-- END upload_not_successful -->
<!-- END note --> <!-- BEGIN upload_successful -->
{lang:upload_successful}<br />
<div style="text-align:center;">
<a href="{U_RETURN}">[ {lang:home} ]</a>
</div>
<!-- END upload_successful -->
<!-- BEGIN note -->
<div style="text-align:left;"><span style="color:red;">*</span> : {lang:mandatory}</div>
<!-- END note -->
</div> <!-- content -->

110
upload.php
View file

@ -27,6 +27,13 @@
define('PHPWG_ROOT_PATH','./'); define('PHPWG_ROOT_PATH','./');
include_once( PHPWG_ROOT_PATH.'include/common.inc.php' ); include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
$username = !empty($_POST['username'])?$_POST['username']:$user['username'];
$mail_address = !empty($_POST['mail_address'])?$_POST['mail_address']:@$user['mail_address'];
$name = !empty($_POST['name'])?$_POST['name']:'';
$author = !empty($_POST['author'])?$_POST['author']:'';
$date_creation = !empty($_POST['date_creation'])?$_POST['date_creation']:'';
$comment = !empty($_POST['comment'])?$_POST['comment']:'';
//------------------------------------------------------------------- functions //------------------------------------------------------------------- functions
// The validate_upload function checks if the image of the given path is valid. // The validate_upload function checks if the image of the given path is valid.
// A picture is valid when : // A picture is valid when :
@ -40,7 +47,7 @@ include_once( PHPWG_ROOT_PATH.'include/common.inc.php' );
function validate_upload( $temp_name, $my_max_file_size, function validate_upload( $temp_name, $my_max_file_size,
$image_max_width, $image_max_height ) $image_max_width, $image_max_height )
{ {
global $conf, $lang; global $conf, $lang, $page, $mail_address;
$result = array(); $result = array();
$result['error'] = array(); $result['error'] = array();
@ -48,7 +55,7 @@ function validate_upload( $temp_name, $my_max_file_size,
$extension = get_extension( $_FILES['picture']['name'] ); $extension = get_extension( $_FILES['picture']['name'] );
if (!in_array($extension, $conf['picture_ext'])) if (!in_array($extension, $conf['picture_ext']))
{ {
array_push( $result['error'], $lang['upload_advise_filetype'] ); array_push( $result['error'], l10n('upload_advise_filetype') );
return $result; return $result;
} }
if ( !isset( $_FILES['picture'] ) ) if ( !isset( $_FILES['picture'] ) )
@ -59,7 +66,7 @@ function validate_upload( $temp_name, $my_max_file_size,
else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 ) else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 )
{ {
array_push( $result['error'], array_push( $result['error'],
$lang['upload_advise_filesize'].$my_max_file_size.' KB' ); l10n('upload_advise_filesize').$my_max_file_size.' KB' );
} }
else else
{ {
@ -67,7 +74,7 @@ function validate_upload( $temp_name, $my_max_file_size,
// upload de la photo sous un nom temporaire // upload de la photo sous un nom temporaire
if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) ) if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) )
{ {
array_push( $result['error'], $lang['upload_cannot_upload'] ); array_push( $result['error'], l10n('upload_cannot_upload') );
} }
else else
{ {
@ -77,14 +84,14 @@ function validate_upload( $temp_name, $my_max_file_size,
and $size[0] > $image_max_width ) and $size[0] > $image_max_width )
{ {
array_push( $result['error'], array_push( $result['error'],
$lang['upload_advise_width'].$image_max_width.' px' ); l10n('upload_advise_width').$image_max_width.' px' );
} }
if ( isset( $image_max_height ) if ( isset( $image_max_height )
and $image_max_height != "" and $image_max_height != ""
and $size[1] > $image_max_height ) and $size[1] > $image_max_height )
{ {
array_push( $result['error'], array_push( $result['error'],
$lang['upload_advise_height'].$image_max_height.' px' ); l10n('upload_advise_height').$image_max_height.' px' );
} }
// $size[2] == 1 means GIF // $size[2] == 1 means GIF
// $size[2] == 2 means JPG // $size[2] == 2 means JPG
@ -95,7 +102,7 @@ function validate_upload( $temp_name, $my_max_file_size,
case 2 : $result['type'] = 'jpg'; break; case 2 : $result['type'] = 'jpg'; break;
case 3 : $result['type'] = 'png'; break; case 3 : $result['type'] = 'png'; break;
default : default :
array_push( $result['error'], $lang['upload_advise_filetype'] ); array_push( $result['error'], l10n('upload_advise_filetype') );
} }
} }
} }
@ -108,6 +115,13 @@ function validate_upload( $temp_name, $my_max_file_size,
{ {
@chmod( $temp_name, 0644); @chmod( $temp_name, 0644);
} }
//------------------------------------------------------------ log informations
pwg_log('upload',
get_cat_display_name($page['cat_name']),
$_FILES['picture']['name'].
' ['.$mail_address.'] '.'['.($result ? 'OK' : 'KO').']');
return $result; return $result;
} }
@ -145,21 +159,21 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
$path = $page['cat_dir'].$_FILES['picture']['name']; $path = $page['cat_dir'].$_FILES['picture']['name'];
if ( @is_file( $path ) ) if ( @is_file( $path ) )
{ {
array_push( $error, $lang['upload_file_exists'] ); array_push( $error, l10n('upload_file_exists') );
} }
// test de la présence des champs obligatoires // test de la présence des champs obligatoires
if ( empty($_FILES['picture']['name'])) if ( empty($_FILES['picture']['name']))
{ {
array_push( $error, $lang['upload_filenotfound'] ); array_push( $error, l10n('upload_filenotfound') );
} }
if ( !ereg( "([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)", if ( !ereg( "([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)",
$_POST['mail_address'] ) ) $_POST['mail_address'] ) )
{ {
array_push( $error, $lang['reg_err_mail_address'] ); array_push( $error, l10n('reg_err_mail_address') );
} }
if ( empty($_POST['username']) ) if ( empty($_POST['username']) )
{ {
array_push( $error, $lang['upload_err_username'] ); array_push( $error, l10n('upload_err_username') );
} }
$date_creation = ''; $date_creation = '';
@ -173,7 +187,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
} }
else else
{ {
array_push( $error, $lang['err_date'] ); array_push( $error, l10n('err_date') );
} }
} }
// creation of the "infos" field : // creation of the "infos" field :
@ -188,7 +202,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) ) if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) )
{ {
array_push( $error, $lang['update_wrong_dirname'] ); array_push( $error, l10n('update_wrong_dirname') );
} }
if ( sizeof( $error ) == 0 ) if ( sizeof( $error ) == 0 )
@ -228,15 +242,19 @@ if ( isset( $_POST['submit'] ) and isset( $_GET['waiting_id'] ) )
$row = mysql_fetch_array( $result ); $row = mysql_fetch_array( $result );
$file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") ); $file = substr ( $row['file'], 0, strrpos ( $row['file'], ".") );
$extension = get_extension( $_FILES['picture']['name'] ); $extension = get_extension( $_FILES['picture']['name'] );
$path = $page['cat_dir'].'thumbnail/';
$path.= $conf['prefix_thumbnail'].$file.'.'.$extension; if (($path = mkget_thumbnail_dir($page['cat_dir'], $error)) != false)
$result = validate_upload( $path, $conf['upload_maxfilesize'],
$conf['upload_maxwidth_thumbnail'],
$conf['upload_maxheight_thumbnail'] );
for ( $j = 0; $j < sizeof( $result['error'] ); $j++ )
{ {
array_push( $error, $result['error'][$j] ); $path.= '/'.$conf['prefix_thumbnail'].$file.'.'.$extension;
$result = validate_upload( $path, $conf['upload_maxfilesize'],
$conf['upload_maxwidth_thumbnail'],
$conf['upload_maxheight_thumbnail'] );
for ( $j = 0; $j < sizeof( $result['error'] ); $j++ )
{
array_push( $error, $result['error'][$j] );
}
} }
if ( sizeof( $error ) == 0 ) if ( sizeof( $error ) == 0 )
{ {
$query = 'update '.WAITING_TABLE; $query = 'update '.WAITING_TABLE;
@ -251,7 +269,8 @@ if ( isset( $_POST['submit'] ) and isset( $_GET['waiting_id'] ) )
// //
// Start output of page // Start output of page
// //
$title= $lang['upload_title']; $title= l10n('upload_title');
$page['body_id'] = 'theUploadPage';
include(PHPWG_ROOT_PATH.'include/page_header.php'); include(PHPWG_ROOT_PATH.'include/page_header.php');
$template->set_filenames(array('upload'=>'upload.tpl')); $template->set_filenames(array('upload'=>'upload.tpl'));
@ -263,23 +282,18 @@ $u_form.= '&amp;waiting_id='.$page['waiting_id'];
if ( isset( $page['waiting_id'] ) ) if ( isset( $page['waiting_id'] ) )
{ {
$advise_title=$lang['upload_advise_thumbnail'].$_FILES['picture']['name']; $advise_title=l10n('upload_advise_thumbnail').$_FILES['picture']['name'];
} }
else else
{ {
$advise_title = $lang['upload_advise']; $advise_title = l10n('upload_advise');
$advise_title.= get_cat_display_name($page['cat_name']); $advise_title.= get_cat_display_name($page['cat_name']);
} }
$username = !empty($_POST['username'])?$_POST['username']:$user['username'];
$mail_address = !empty($_POST['mail_address'])?$_POST['mail_address']:@$user['mail_address'];
$name = !empty($_POST['name'])?$_POST['name']:'';
$author = !empty($_POST['author'])?$_POST['author']:'';
$date_creation = !empty($_POST['date_creation'])?$_POST['date_creation']:'';
$comment = !empty($_POST['comment'])?$_POST['comment']:'';
$template->assign_vars( $template->assign_vars(
array( array(
'U_HOME' => make_index_url(),
'ADVISE_TITLE' => $advise_title, 'ADVISE_TITLE' => $advise_title,
'NAME' => $username, 'NAME' => $username,
'EMAIL' => $mail_address, 'EMAIL' => $mail_address,
@ -288,19 +302,6 @@ $template->assign_vars(
'DATE_IMG' => $date_creation, 'DATE_IMG' => $date_creation,
'COMMENT_IMG' => $comment, 'COMMENT_IMG' => $comment,
'L_TITLE' => $lang['upload_title'],
'L_USERNAME' => $lang['upload_username'],
'L_EMAIL' => $lang['mail_address'],
'L_NAME_IMG' => $lang['upload_name'],
'L_SUBMIT' => $lang['submit'],
'L_AUTHOR' => $lang['upload_author'],
'L_CREATION_DATE' => $lang['upload_creation_date'],
'L_COMMENT' => $lang['comment'],
'L_RETURN' => $lang['home'],
'L_RETURN_HINT' => $lang['home_hint'],
'L_UPLOAD_DONE' => $lang['upload_successful'],
'L_MANDATORY' => $lang['mandatory'],
'F_ACTION' => $u_form, 'F_ACTION' => $u_form,
'U_RETURN' => make_index_url(array('category' => $page['cat'])), 'U_RETURN' => make_index_url(array('category' => $page['cat'])),
@ -323,7 +324,7 @@ if ( sizeof( $error ) != 0 )
//--------------------------------------------------------------------- advises //--------------------------------------------------------------------- advises
if ( !empty($conf['upload_maxfilesize']) ) if ( !empty($conf['upload_maxfilesize']) )
{ {
$content = $lang['upload_advise_filesize']; $content = l10n('upload_advise_filesize');
$content.= $conf['upload_maxfilesize'].' KB'; $content.= $conf['upload_maxfilesize'].' KB';
$template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content)); $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
} }
@ -332,45 +333,46 @@ if ( sizeof( $error ) != 0 )
{ {
if ( $conf['upload_maxwidth_thumbnail'] != '' ) if ( $conf['upload_maxwidth_thumbnail'] != '' )
{ {
$content = $lang['upload_advise_width']; $content = l10n('upload_advise_width');
$content.= $conf['upload_maxwidth_thumbnail'].' px'; $content.= $conf['upload_maxwidth_thumbnail'].' px';
$template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content)); $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
} }
if ( $conf['upload_maxheight_thumbnail'] != '' ) if ( $conf['upload_maxheight_thumbnail'] != '' )
{ {
$content = $lang['upload_advise_height']; $content = l10n('upload_advise_height');
$content.= $conf['upload_maxheight_thumbnail'].' px'; $content.= $conf['upload_maxheight_thumbnail'].' px';
$template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content)); $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
} }
} }
else else
{ {
if ( $conf['upload_maxwidth'] != '' ) if ( $conf['upload_maxwidth'] != '' )
{ {
$content = $lang['upload_advise_width']; $content = l10n('upload_advise_width');
$content.= $conf['upload_maxwidth'].' px'; $content.= $conf['upload_maxwidth'].' px';
$template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content)); $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
} }
if ( $conf['upload_maxheight'] != '' ) if ( $conf['upload_maxheight'] != '' )
{ {
$content = $lang['upload_advise_height']; $content = l10n('upload_advise_height');
$content.= $conf['upload_maxheight'].' px'; $content.= $conf['upload_maxheight'].' px';
$template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content)); $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$content));
} }
} }
$template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>$lang['upload_advise_filetype'])); $template->assign_block_vars('upload_not_successful.advise',array('ADVISE'=>l10n('upload_advise_filetype')));
//----------------------------------------- optionnal username and mail address //----------------------------------------- optionnal username and mail address
if ( !isset( $page['waiting_id'] ) ) if ( !isset( $page['waiting_id'] ) )
{ {
$template->assign_block_vars('upload_not_successful.fields',array()); $template->assign_block_vars('upload_not_successful.fields',array());
$template->assign_block_vars('note',array()); $template->assign_block_vars('note',array());
} }
} }
else else
{ {
$template->assign_block_vars('upload_successful',array()); $template->assign_block_vars('upload_successful',array());
} }
//----------------------------------------------------------- html code display //----------------------------------------------------------- html code display
$template->parse('upload'); $template->parse('upload');
include(PHPWG_ROOT_PATH.'include/page_tail.php'); include(PHPWG_ROOT_PATH.'include/page_tail.php');