replacement of PhpWebGallery folder representative by pwg_representative and

high by pwg_high


git-svn-id: http://piwigo.org/svn/trunk@563 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 11 insertions, 10 deletions

diff --git a/admin/create_listing_file.php b/admin/create_listing_file.php
index 48108afc8..e0de87a88 100644
--- a/admin/create_listing_file.php
+++ b/admin/create_listing_file.php
@@ -229,7 +229,7 @@ function get_representative_files($dir)
   global $conf;
 
   $pictures = array();
-  if ($opendir = @opendir($dir.'/representative'))
+  if ($opendir = @opendir($dir.'/pwg_representative'))
   {
     while ($file = readdir($opendir))
     {
@@ -259,8 +259,8 @@ function get_dirs($basedir, $indent, $level)
       if ($file != '.'
           and $file != '..'
           and $file != 'thumbnail'
-          and $file != 'high'
-          and $file != 'representative'
+          and $file != 'pwg_high'
+          and $file != 'pwg_representative'
           and is_dir ($basedir.'/'.$file))
       {
         array_push($fs_dirs, $file);
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 3feebdb22..b17a52f99 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -128,7 +128,7 @@ function get_representative_files($dir)
   global $conf;
 
   $pictures = array();
-  if ($opendir = @opendir($dir.'/representative'))
+  if ($opendir = @opendir($dir.'/pwg_representative'))
   {
     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
  *
- * directories nammed "thumbnail", "high" or "representative" are omitted
+ * directories nammed "thumbnail", "pwg_high" or "pwg_representative" are
+ * omitted
  *
  * @param string $basedir
  * @return array
@@ -756,8 +757,8 @@ function get_category_directories( $basedir )
       if ($file != '.'
           and $file != '..'
           and $file != 'thumbnail'
-          and $file != 'high'
-          and $file != 'representative'
+          and $file != 'pwg_high'
+          and $file != 'pwg_representative'
           and is_dir($basedir.'/'.$file))
       {
         array_push( $sub_dirs, $file );
diff --git a/picture.php b/picture.php
index e55fde22f..a94b7ff68 100644
--- a/picture.php
+++ b/picture.php
@@ -153,7 +153,7 @@ foreach (array('prev', 'current', 'next') as $i)
 
   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'];
   }
   else
@@ -168,9 +168,9 @@ foreach (array('prev', 'current', 'next') as $i)
     // high quality picture
     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'];
       }
     }
   }