Merge branch '2.8'

1 files changed, 211 insertions, 211 deletions

diff --git a/admin/site_reader_local.php b/admin/site_reader_local.php
index c157b38c7..79fac4b74 100644
--- a/admin/site_reader_local.php
+++ b/admin/site_reader_local.php
@@ -1,212 +1,212 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based photo gallery                                    |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// provides data for site synchronization from the local file system
-class LocalSiteReader
-{
-
-var $site_url;
-
-function LocalSiteReader($url)
-{
-  $this->site_url = $url;
-  global $conf;
-  if (!isset($conf['flip_file_ext']))
-  {
-    $conf['flip_file_ext'] = array_flip($conf['file_ext']);
-  }
-  if (!isset($conf['flip_picture_ext']))
-  {
-    $conf['flip_picture_ext'] = array_flip($conf['picture_ext']);
-  }
-}
-
-/**
- * Is this local site ok ?
- *
- * @return true on success, false otherwise
- */
-function open()
-{
-  global $errors;
-
-  if (!is_dir($this->site_url))
-  {
-    $errors[] = array(
-      'path' => $this->site_url,
-      'type' => 'PWG-ERROR-NO-FS'
-      );
-
-    return false;
-  }
-
-  return true;
-}
-
-// retrieve file system sub-directories fulldirs
-function get_full_directories($basedir)
-{
-  $fs_fulldirs = get_fs_directories($basedir);
-  return $fs_fulldirs;
-}
-
-/**
- * Returns an array with all file system files according to $conf['file_ext']
- * and $conf['picture_ext']
- * @param string $path recurse in this directory
- * @return array like "pic.jpg"=>array('representative_ext'=>'jpg' ... )
- */
-function get_elements($path)
-{
-  global $conf;
-
-  $subdirs = array();
-  $fs = array();
-  if (is_dir($path) && $contents = opendir($path) )
-  {
-    while (($node = readdir($contents)) !== false)
-    {
-      if ($node == '.' or $node == '..') continue;
-
-      if (is_file($path.'/'.$node))
-      {
-        $extension = get_extension($node);
-        $filename_wo_ext = get_filename_wo_extension($node);
-
-        if ( isset($conf['flip_file_ext'][$extension]) )
-        {
-          $representative_ext = null;
-          if (! isset($conf['flip_picture_ext'][$extension]) )
-          {
-            $representative_ext = $this->get_representative_ext($path, $filename_wo_ext);
-          }
-
-          $fs[ $path.'/'.$node ] = array('representative_ext' => $representative_ext);
-
-          if ($conf['enable_formats'])
-          {
-            $fs[ $path.'/'.$node ]['formats'] = $this->get_formats($path, $filename_wo_ext);
-          }
-        }
-      }
-      else if (is_dir($path.'/'.$node)
-               and $node != 'pwg_high'
-               and $node != 'pwg_representative'
-               and $node != 'pwg_format'
-               and $node != 'thumbnail' )
-      {
-        $subdirs[] = $node;
-      }
-    } //end while readdir
-    closedir($contents);
-
-    foreach ($subdirs as $subdir)
-    {
-      $tmp_fs = $this->get_elements($path.'/'.$subdir);
-      $fs = array_merge($fs, $tmp_fs);
-    }
-    ksort($fs);
-  } //end if is_dir
-  return $fs;
-}
-
-// returns the name of the attributes that are supported for
-// files update/synchronization
-function get_update_attributes()
-{
-  return array('representative_ext');
-}
-
-function get_element_update_attributes($file)
-{
-  global $conf;
-  $data = array();
-
-  $filename = basename($file);
-  $extension = get_extension($filename);
-
-  $representative_ext = null;
-  if (! isset($conf['flip_picture_ext'][$extension]) )
-  {
-    $dirname = dirname($file);
-    $filename_wo_ext = get_filename_wo_extension($filename);
-    $representative_ext = $this->get_representative_ext($dirname, $filename_wo_ext);
-  }
-
-  $data['representative_ext'] = $representative_ext;
-  return $data;
-}
-
-// returns the name of the attributes that are supported for
-// metadata update/synchronization according to configuration
-function get_metadata_attributes()
-{
-  return get_sync_metadata_attributes();
-}
-
-// returns a hash of attributes (metadata+filesize+width,...) for file
-function get_element_metadata($infos)
-{
-  return get_sync_metadata($infos);
-}
-
-
-//-------------------------------------------------- private functions --------
-function get_representative_ext($path, $filename_wo_ext)
-{
-  global $conf;
-  $base_test = $path.'/pwg_representative/'.$filename_wo_ext.'.';
-  foreach ($conf['picture_ext'] as $ext)
-  {
-    $test = $base_test.$ext;
-    if (is_file($test))
-    {
-      return $ext;
-    }
-  }
-  return null;
-}
-
-function get_formats($path, $filename_wo_ext)
-{
-  global $conf;
-
-  $formats = array();
-  
-  $base_test = $path.'/pwg_format/'.$filename_wo_ext.'.';
-  
-  foreach ($conf['format_ext'] as $ext)
-  {
-    $test = $base_test.$ext;
-    
-    if (is_file($test))
-    {
-      $formats[$ext] = floor(filesize($test) / 1024);
-    }
-  }
-  
-  return $formats;
-}
-
-}
+<?php

+// +-----------------------------------------------------------------------+

+// | Piwigo - a PHP based photo gallery                                    |

+// +-----------------------------------------------------------------------+

+// | Copyright(C) 2008-2016 Piwigo Team                  http://piwigo.org |

+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |

+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |

+// +-----------------------------------------------------------------------+

+// | This program is free software; you can redistribute it and/or modify  |

+// | it under the terms of the GNU General Public License as published by  |

+// | the Free Software Foundation                                          |

+// |                                                                       |

+// | This program is distributed in the hope that it will be useful, but   |

+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |

+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |

+// | General Public License for more details.                              |

+// |                                                                       |

+// | You should have received a copy of the GNU General Public License     |

+// | along with this program; if not, write to the Free Software           |

+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |

+// | USA.                                                                  |

+// +-----------------------------------------------------------------------+

+

+// provides data for site synchronization from the local file system

+class LocalSiteReader

+{

+

+var $site_url;

+

+function __construct($url)

+{

+  $this->site_url = $url;

+  global $conf;

+  if (!isset($conf['flip_file_ext']))

+  {

+    $conf['flip_file_ext'] = array_flip($conf['file_ext']);

+  }

+  if (!isset($conf['flip_picture_ext']))

+  {

+    $conf['flip_picture_ext'] = array_flip($conf['picture_ext']);

+  }

+}

+

+/**

+ * Is this local site ok ?

+ *

+ * @return true on success, false otherwise

+ */

+function open()

+{

+  global $errors;

+

+  if (!is_dir($this->site_url))

+  {

+    $errors[] = array(

+      'path' => $this->site_url,

+      'type' => 'PWG-ERROR-NO-FS'

+      );

+

+    return false;

+  }

+

+  return true;

+}

+

+// retrieve file system sub-directories fulldirs

+function get_full_directories($basedir)

+{

+  $fs_fulldirs = get_fs_directories($basedir);

+  return $fs_fulldirs;

+}

+

+/**

+ * Returns an array with all file system files according to $conf['file_ext']

+ * and $conf['picture_ext']

+ * @param string $path recurse in this directory

+ * @return array like "pic.jpg"=>array('representative_ext'=>'jpg' ... )

+ */

+function get_elements($path)

+{

+  global $conf;

+

+  $subdirs = array();

+  $fs = array();

+  if (is_dir($path) && $contents = opendir($path) )

+  {

+    while (($node = readdir($contents)) !== false)

+    {

+      if ($node == '.' or $node == '..') continue;

+

+      if (is_file($path.'/'.$node))

+      {

+        $extension = get_extension($node);

+        $filename_wo_ext = get_filename_wo_extension($node);

+

+        if ( isset($conf['flip_file_ext'][$extension]) )

+        {

+          $representative_ext = null;

+          if (! isset($conf['flip_picture_ext'][$extension]) )

+          {

+            $representative_ext = $this->get_representative_ext($path, $filename_wo_ext);

+          }

+

+          $fs[ $path.'/'.$node ] = array('representative_ext' => $representative_ext);

+

+          if ($conf['enable_formats'])

+          {

+            $fs[ $path.'/'.$node ]['formats'] = $this->get_formats($path, $filename_wo_ext);

+          }

+        }

+      }

+      else if (is_dir($path.'/'.$node)

+               and $node != 'pwg_high'

+               and $node != 'pwg_representative'

+               and $node != 'pwg_format'

+               and $node != 'thumbnail' )

+      {

+        $subdirs[] = $node;

+      }

+    } //end while readdir

+    closedir($contents);

+

+    foreach ($subdirs as $subdir)

+    {

+      $tmp_fs = $this->get_elements($path.'/'.$subdir);

+      $fs = array_merge($fs, $tmp_fs);

+    }

+    ksort($fs);

+  } //end if is_dir

+  return $fs;

+}

+

+// returns the name of the attributes that are supported for

+// files update/synchronization

+function get_update_attributes()

+{

+  return array('representative_ext');

+}

+

+function get_element_update_attributes($file)

+{

+  global $conf;

+  $data = array();

+

+  $filename = basename($file);

+  $extension = get_extension($filename);

+

+  $representative_ext = null;

+  if (! isset($conf['flip_picture_ext'][$extension]) )

+  {

+    $dirname = dirname($file);

+    $filename_wo_ext = get_filename_wo_extension($filename);

+    $representative_ext = $this->get_representative_ext($dirname, $filename_wo_ext);

+  }

+

+  $data['representative_ext'] = $representative_ext;

+  return $data;

+}

+

+// returns the name of the attributes that are supported for

+// metadata update/synchronization according to configuration

+function get_metadata_attributes()

+{

+  return get_sync_metadata_attributes();

+}

+

+// returns a hash of attributes (metadata+filesize+width,...) for file

+function get_element_metadata($infos)

+{

+  return get_sync_metadata($infos);

+}

+

+

+//-------------------------------------------------- private functions --------

+function get_representative_ext($path, $filename_wo_ext)

+{

+  global $conf;

+  $base_test = $path.'/pwg_representative/'.$filename_wo_ext.'.';

+  foreach ($conf['picture_ext'] as $ext)

+  {

+    $test = $base_test.$ext;

+    if (is_file($test))

+    {

+      return $ext;

+    }

+  }

+  return null;

+}

+

+function get_formats($path, $filename_wo_ext)

+{

+  global $conf;

+

+  $formats = array();

+  

+  $base_test = $path.'/pwg_format/'.$filename_wo_ext.'.';

+  

+  foreach ($conf['format_ext'] as $ext)

+  {

+    $test = $base_test.$ext;

+    

+    if (is_file($test))

+    {

+      $formats[$ext] = floor(filesize($test) / 1024);

+    }

+  }

+  

+  return $formats;

+}

+

+}

 ?>
\ No newline at end of file