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

replacement of PhpWebGallery folder representative by pwg_representative and

Browse source 
high by pwg_high


git-svn-id: http://piwigo.org/svn/trunk@563 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
z0rglub 2004-10-09 11:30:23 +00:00
parent bfe13288a1
commit 9b1a330905
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/create_listing_file.php
View file

@ -229,7 +229,7 @@ function get_representative_files($dir)
global $conf; global $conf;
$pictures = array(); $pictures = array();
if ($opendir = @opendir($dir.'/representative')) if ($opendir = @opendir($dir.'/pwg_representative'))
{ {
while ($file = readdir($opendir)) while ($file = readdir($opendir))
{ {
@ -259,8 +259,8 @@ function get_dirs($basedir, $indent, $level)
if ($file != '.' if ($file != '.'
and $file != '..' and $file != '..'
and $file != 'thumbnail' and $file != 'thumbnail'
and $file != 'high' and $file != 'pwg_high'
and $file != 'representative' and $file != 'pwg_representative'
and is_dir ($basedir.'/'.$file)) and is_dir ($basedir.'/'.$file))
{ {
array_push($fs_dirs, $file); array_push($fs_dirs, $file);

9
admin/include/functions.php
View file

@ -128,7 +128,7 @@ function get_representative_files($dir)
global $conf; global $conf;
$pictures = array(); $pictures = array();
if ($opendir = @opendir($dir.'/representative')) if ($opendir = @opendir($dir.'/pwg_representative'))
{ {
while ($file = readdir($opendir)) while ($file = readdir($opendir))
{ {
@ -740,7 +740,8 @@ function is_user_allowed( $category_id, $restrictions )
/** /**
* returns an array containing sub-directories which can be a category * returns an array containing sub-directories which can be a category
* *
* directories nammed "thumbnail", "high" or "representative" are omitted * directories nammed "thumbnail", "pwg_high" or "pwg_representative" are
* omitted
* *
* @param string $basedir * @param string $basedir
* @return array * @return array
@ -756,8 +757,8 @@ function get_category_directories( $basedir )
if ($file != '.' if ($file != '.'
and $file != '..' and $file != '..'
and $file != 'thumbnail' and $file != 'thumbnail'
and $file != 'high' and $file != 'pwg_high'
and $file != 'representative' and $file != 'pwg_representative'
and is_dir($basedir.'/'.$file)) and is_dir($basedir.'/'.$file))
{ {
array_push( $sub_dirs, $file ); array_push( $sub_dirs, $file );

6
picture.php
View file

@ -153,7 +153,7 @@ foreach (array('prev', 'current', 'next') as $i)
if (isset($row['representative_ext']) and $row['representative_ext'] =! '') if (isset($row['representative_ext']) and $row['representative_ext'] =! '')
{ {
$picture[$i]['src'] = $cat_directory.'representative/'; $picture[$i]['src'] = $cat_directory.'pwg_representative/';
$picture[$i]['src'].= $file_wo_ext.'.'.$row['representative_ext']; $picture[$i]['src'].= $file_wo_ext.'.'.$row['representative_ext'];
} }
else else
@ -168,9 +168,9 @@ foreach (array('prev', 'current', 'next') as $i)
// high quality picture // high quality picture
if ($i == 'current') if ($i == 'current')
{ {
if (@fopen($cat_directory.'high/'.$row['file'], 'r')) if (@fopen($cat_directory.'pwg_high/'.$row['file'], 'r'))
{ {
$picture[$i]['high'] = $cat_directory.'high/'.$row['file']; $picture[$i]['high'] = $cat_directory.'pwg_high/'.$row['file'];
} }
} }
} }