iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Filename must use the same characters as the directories

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@160 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub
2003-09-22 20:45:44 +00:00
parent fd5a3516a9
commit 1d7758f029
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
admin/update.php
View File

@@ -219,35 +219,44 @@ function insert_local_image( $rep, $category_id )
$result = mysql_query( $query );
if ( mysql_num_rows( $result ) == 0 )
{
$picture = array();
$picture['file'] = $file;
$picture['tn_ext'] = $tn_ext;
$picture['date'] = date( 'Y-m-d', filemtime ( $rep.'/'.$file ) );
$picture['filesize'] = floor( filesize( $rep.'/'.$file ) / 1024);
$image_size = @getimagesize( $rep.'/'.$file );
$picture['width'] = $image_size[0];
$picture['height'] = $image_size[1];
if ( $waiting['validated'] == 'true' )
// the name of the file must not use acentuated characters or
// blank space..
if ( preg_match( '/^[a-zA-Z0-9-_.]+$/', $file ) )
{
// retrieving infos from the XML description of
// $waiting['infos']
$infos = nl2br( $waiting['infos'] );
$picture['author'] = getAttribute( $infos, 'author' );
$picture['comment'] = getAttribute( $infos, 'comment' );
$unixtime = getAttribute( $infos, 'date_creation' );
$picture['date_creation'] = '';
if ( $unixtime != '' )
$picture = array();
$picture['file'] = $file;
$picture['tn_ext'] = $tn_ext;
$picture['date'] = date( 'Y-m-d', filemtime($rep.'/'.$file) );
$picture['filesize'] = floor( filesize($rep.'/'.$file) / 1024);
$image_size = @getimagesize( $rep.'/'.$file );
$picture['width'] = $image_size[0];
$picture['height'] = $image_size[1];
if ( $waiting['validated'] == 'true' )
{
$picture['date_creation'] = date( 'Y-m-d', $unixtime );
// retrieving infos from the XML description of
// $waiting['infos']
$infos = nl2br( $waiting['infos'] );
$picture['author'] = getAttribute( $infos, 'author' );
$picture['comment'] = getAttribute( $infos, 'comment');
$unixtime = getAttribute( $infos, 'date_creation' );
$picture['date_creation'] = '';
if ( $unixtime != '' )
$picture['date_creation'] = date( 'Y-m-d', $unixtime );
$picture['name'] = getAttribute( $infos, 'name' );
// deleting the waiting element
$query = 'DELETE FROM '.PREFIX_TABLE.'waiting';
$query.= ' WHERE id = '.$waiting['id'];
$query.= ';';
mysql_query( $query );
}
$picture['name'] = getAttribute( $infos, 'name' );
// deleting the waiting element
$query = 'DELETE FROM '.PREFIX_TABLE.'waiting';
$query.= ' WHERE id = '.$waiting['id'];
$query.= ';';
mysql_query( $query );
array_push( $pictures, $picture );
}
array_push( $pictures, $picture );
else
{
$output.= '<span style="color:red;">"'.$file.'" : ';
$output.= $lang['update_wrong_dirname'].'</span><br />';
}
}
}
else

2
language/english.php
View File

@@ -558,7 +558,7 @@ Once this file deleted , follow this instructions :
$lang['infoimage_addtoall'] = 'add to all';
$lang['infoimage_removefromall'] = 'remove from all';
$lang['infoimage_associate'] = 'Associate to the category';
$lang['update_wrong_dirname'] = 'The name of the directory must be composed of letters, figures, "-", "_" or "."';
$lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
$lang['stats_last_days'] = 'last days';
$lang['stats_pages_seen'] = 'pages seen';
$lang['stats_visitors'] = 'guests';

2
language/francais.php
View File

@@ -561,7 +561,7 @@ if ( $isadmin )
$lang['update_only_cat'] = 'mettre à jour les catégories, mais pas les images';
$lang['update_all'] = 'mettre tout à jour';
// start version 1.3
$lang['update_wrong_dirname'] = 'le nom du répertoire ne doit être composé que de lettres, de chiffres et "-", "_" ou ".".';
$lang['update_wrong_dirname'] = 'le nom des fichiers et répertoires ne doivent être composé que de lettres, de chiffres et "-", "_" ou ".".';
// end version 1.3
// page de génération miniatures