Change from upstream for AHPN

.gitignore

@@ -3,3 +3,6 @@ login.txt
 *.swp
 gallery2-data
 mysqldata
+modules/bulkexcelupload
+themes/bootstrap_matrix
+modules/mapv3/images/routes

.htaccess-sample

@@ -0,0 +1,56 @@
+#{gallerySection}
+
+RewriteEngine On
+# Redirect all requests to HTTPS
+RewriteCond %{HTTPS} "!=on"
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+
+RedirectMatch 404 \.(md|txt|ini|Dockerfile|git|htaccess|inc)
+RedirectMatch 404 (docker|config\.php|phpinfo|README|LICENSE)
+
+# BEGIN Url Rewrite section
+# (Automatically generated.  Do not edit this section)
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+
+    RewriteBase /
+
+    RewriteCond %{REQUEST_FILENAME} -f [OR]
+    RewriteCond %{REQUEST_FILENAME} -d [OR]
+    RewriteCond %{REQUEST_FILENAME} gallery\_remote2\.php
+    RewriteCond %{REQUEST_URI} !/main\.php$
+    RewriteRule .   -   [L]
+
+    RewriteCond %{QUERY_STRING} g2_view=core.DownloadItem
+    RewriteCond %{QUERY_STRING} g2_itemId=([0-9]+)
+    RewriteCond %{HTTP:Referer} !^[a-zA-Z0-9\+\.\-]+://%{SERVER_NAME}/   [NC]
+    RewriteCond %{HTTP:Referer} !^$
+    RewriteRule .   /main.php?g2_view=watermark.DownloadItem&g2_itemId=%1   [L]
+    RewriteCond %{THE_REQUEST} /sitemap(\?.|\ .)
+    RewriteCond %{REQUEST_URI} !/main\.php$
+    RewriteRule .   /main.php?g2_view=sitemap.Sitemap   [QSA,L]
+    RewriteCond %{THE_REQUEST} /mapa/(G{1}[0-9]+)*(\?.|\ .)
+    RewriteCond %{REQUEST_URI} !/main\.php$
+    RewriteRule .   /main.php?g2_view=mapv3.ShowMap&g2_Group=%1   [QSA,L]
+    RewriteCond %{THE_REQUEST} /fotografia/([^?]+)(\?.|\ .)
+    RewriteCond %{REQUEST_URI} !/main\.php$
+    RewriteRule .   /main.php?g2_path=%1   [QSA,L]
+    RewriteCond %{THE_REQUEST} /paraules/([^?/]+)(\?.|\ .)
+    RewriteCond %{REQUEST_URI} !/main\.php$
+    RewriteRule .   /main.php?g2_view=keyalbum.KeywordAlbum&g2_keyword=%1   [QSA,L]
+</IfModule>
+
+# END Url Rewrite section
+
+<ifmodule mod_expires.c>
+    ExpiresActive On
+    ExpiresDefault A30600
+</ifmodule>
+<filesmatch ".(jpg|JPG|gif|GIF|png|css|ico|js|gz|gzip|swf)$">
+    <ifmodule mod_headers.c>
+        Header append Cache-Control "public"
+    </ifmodule>
+    <ifmodule mod_expires.c>
+        ExpiresDefault "access plus 7 day"
+    </ifmodule>
+</filesmatch>

DEVELOPMENT.md

@@ -145,6 +145,21 @@ for `ca_ES` locale. Add a line like it using your locale:
     && sed -i -e 's/# ca_ES ISO-8859-1/ca_ES ISO-8859-1/' /etc/locale.gen \
 ```
 
+## Copy volumes
+
+You can create a backup copy of the `mysqldata` and `gallery2-data` volumes to start afresh.
+
+There is a `copy-volumes.sh` script that allows you to create a copy of the volume.
+
+In case you would like to reset the state to the one in the vanilla volumes, you just need to copy data from the
+vanilla volumes to the new volumes.
+
+You will need to add the volume as an external volume in docker-compose config file:
+```yaml
+  gallery2-php8_mysqldata-fresh:
+    external: true
+```
+
 # Release management
 
 Tools for release management are on folder `lib/tools/release`.

docker-compose.yaml

@@ -19,7 +19,7 @@ services:
       PHP_IDE_CONFIG: "serverName=docker"
     volumes:
       - .:/app
-      - ./gallery2-data:/gallery2-data
+      - gallery2-data:/gallery2-data
       - ./docker/php.ini:/usr/local/etc/php/conf.d/custom.ini
       - ./docker/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
     links:
@@ -32,6 +32,10 @@ services:
       MYSQL_PASSWORD: 'secret'
       MYSQL_DATABASE: 'gallery2'
     volumes:
-      - ./mysqldata:/var/lib/mysql
+      - mysqldata:/var/lib/mysql
     ports:
       - "13306:3306"
+
+volumes:
+  mysqldata: { }
+  gallery2-data: { }

docker/copy-volumes.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -u
+set -a
+
+SOURCE_VOLUME=$1
+TARGET_VOLUME=$2
+
+docker container run --rm -it -v $SOURCE_VOLUME:/from -v $TARGET_VOLUME:/to alpine ash -c "cd /from ; cp -av . /to"

ga.js.sample

@@ -0,0 +1,20 @@
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-XXXXYYYY-1"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'UA-XXXXYYYY-1');
+</script>
+
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-ABCDEFGHIJ"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-ABCDEFGHIJ');
+</script>
+

install/steps/AuthenticateStep.class

@@ -39,7 +39,7 @@ class AuthenticateStep extends InstallStep {
 
     function processRequest() {
 	if (!empty($_GET['downloadLogin'])) {
-	    GallerySetupUtilities::generateTextFileForDownload('login.txt', $this->_uniqueKey);
+	    GallerySetupUtilities::generateTextFileForDownload('login.txt', $this::_uniqueKey);
 	    return false;
 	}
 

install/steps/CreateConfigFileStep.class

@@ -36,7 +36,7 @@ class CreateConfigFileStep extends InstallStep {
     function processRequest() {
 	if (!empty($_GET['downloadConfig'])) {
 	    GallerySetupUtilities::generateTextFileForDownload(
-		'config.php', $this->_getConfigContents());
+		'config.php', $this::_getConfigContents());
 	    return false;
 	}
 
@@ -132,7 +132,7 @@ class CreateConfigFileStep extends InstallStep {
 	$this->_firstTime = false;
     }
 
-    function _getConfigContents() {
+    static function _getConfigContents() {
 	global $galleryStub;
 	$configDir = $_SESSION['configPath'];
 	$baseDir = dirname(dirname(dirname(__FILE__)));

install/steps/DatabaseSetupStep.class

@@ -71,9 +71,9 @@ class DatabaseSetupStep extends InstallStep {
 	    $this->_config['type'] = 'mysqli';
 	    $mysqltType = 'mysqli';
 	}
-	if ($this->_config['type'] == 'pdo_sqlite') {    
-	    $this->_config['database'] = 
-	    	'sqlite:' . $galleryStub->getConfig('data.gallery.base') . 'gallery2.db';   
+	if ($this->_config['type'] == 'pdo_sqlite') {
+	    $this->_config['database'] =
+	    	'sqlite:' . $galleryStub->getConfig('data.gallery.base') . 'gallery2.db';
         }
 	switch ($this->_config['type']) {
 	    case 'mysql':
@@ -154,15 +154,16 @@ class DatabaseSetupStep extends InstallStep {
 		require_once(dirname(__FILE__) . '/../../lib/adodb/adodb.inc.php');
 
 		$this->_captureStart();
-		$this->_db =& ADONewConnection($this->_config['type']);
+		$ADOConnection = ADONewConnection($this->_config['type']);
+		$this->_db =& $ADOConnection;
 		$this->_captureEnd();
 
 		if (empty($this->_db)) {
 		    $templateData['errors'][] = sprintf(
 			_('Unable to create a database connection of type %s'),
 			$this->_config['type']);
 		}
-                
+
 		if (empty($templateData['errors'])) {
 		    $this->_captureStart();
 		    $this->_db->debug = true;
@@ -616,7 +617,7 @@ class DatabaseSetupStep extends InstallStep {
 	    $GLOBALS['gallery']->setConfig('plugins.dirname',
 					   $galleryStub->getConfig('plugins.dirname'));
 	    $GLOBALS['gallery']->setConfig('data.gallery.version', $configPath . 'versions.dat');
-	    $GLOBALS['gallery']->setConfig('data.gallery.locale', $configPath . 'locale' 
+	    $GLOBALS['gallery']->setConfig('data.gallery.locale', $configPath . 'locale'
 					   . DIRECTORY_SEPARATOR);
 	}
 	global $gallery;

lib/support/GallerySetupUtilities.class

@@ -290,13 +290,14 @@ class GallerySetupUtilities {
      * @param string $name the file's name
      * @param string $contents the file's contents
      */
-    function generateTextFileForDownload($name, $contents) {
-	header('Content-Type: text/plain');
-	header('Content-Length: ' . strlen($contents));
-	header("Content-Description: Download $name to your computer.");
-	header("Content-Disposition: attachment; filename=$name");
-	print $contents;
-    }
+	static function generateTextFileForDownload($name, $contents)
+	{
+		header('Content-Type: text/plain');
+		header('Content-Length: ' . strlen($contents));
+		header("Content-Description: Download $name to your computer.");
+		header("Content-Disposition: attachment; filename=$name");
+		print $contents;
+	}
 
     /**
      * Cleanly start up our session.

lib/tools/bin/.htaccess

@@ -0,0 +1,2 @@
+Order allow,deny
+Deny from all

lib/tools/bin/GNUmakefile.GalleryStorage

@@ -0,0 +1,42 @@
+CLASSDIR ?= ..
+TOOLDIR ?= ../../../../lib/tools
+TMPDIR ?= tmp
+RXP ?= $(shell which rxp 2>/dev/null)
+XMLLINT ?= $(shell which xmllint 2>/dev/null)
+XMLFILES = $(wildcard xml-src/*.xml)
+PHP ?= php
+
+all: validate tmp dbxml sql
+
+tmp:
+	@if [ ! -d tmp ]; then mkdir tmp; fi
+	@if [ ! -d tmp/classxml ]; then mkdir tmp/classxml; fi
+	@if [ ! -d tmp/dbxml ]; then mkdir tmp/dbxml; fi
+
+dbxml:
+	@if [ "x" != "$(wildcard $(CLASSDIR)/*.class)x" ]; then \
+		perl $(TOOLDIR)/bin/extractClassXml.pl --dtd=$(TOOLDIR)/dtd/GalleryClass2.1.dtd --quiet --out-dir=tmp/classxml $(CLASSDIR)/*.class; \
+	else \
+		echo "No .class files to parse!"; \
+	fi
+	@if [ "x" != "$(XMLFILES)x" ]; then cp xml-src/*.xml tmp/dbxml; fi
+	$(PHP) -q -C -f $(TOOLDIR)/bin/generate-dbxml.php
+
+sql:
+	$(PHP) -q -C -f $(TOOLDIR)/bin/generate-sql.php
+
+clean:
+	rm -rf tmp
+
+validate:
+	@if [ "x" != "$(XMLFILES)x" ]; then \
+		if [ -x "$(XMLLINT)" ]; then \
+			xmllint --valid --noout $(XMLFILES); \
+		elif [ -x "$(RXP)" ]; then \
+			for xmlfile in $(XMLFILES); do \
+				rxp -sV $$xmlfile; \
+			done \
+		else \
+			echo "No available XML validators (need xmllint or rxp)"; \
+		fi \
+	fi

lib/tools/bin/GNUmakefile.classes

@@ -0,0 +1,26 @@
+RXP ?= $(shell which rxp 2>/dev/null)
+XMLLINT ?= $(shell which xmllint 2>/dev/null)
+PHP ?= php
+CLASSES = $(shell ls *.class 2>/dev/null)
+
+all: Entities.inc
+	if [ -f Maps.xml ]; then $(MAKE) Maps.inc; fi
+	if [ -f GalleryStorage/GNUmakefile ]; then cd GalleryStorage && $(MAKE); fi
+
+%:
+	if [ -f GalleryStorage/GNUmakefile ]; then cd GalleryStorage && $(MAKE) $@; fi
+
+Maps.inc: Maps.xml ../../../lib/tools/bin/maps.tpl
+	@if [ -x "$(XMLLINT)" ]; then \
+		xmllint --valid --noout Maps.xml; \
+	elif [ -x "$(RXP)" ]; then \
+		for xmlfile in $(XMLFILES); do \
+			rxp -sV Maps.xml; \
+		done \
+	else \
+		echo "No available XML validators (need xmllint or rxp)"; \
+	fi
+	$(PHP) -q -C ../../../lib/tools/bin/generate-maps.php
+
+Entities.inc: $(CLASSES) ../../../lib/tools/bin/entities.tpl
+	$(PHP) -q -C ../../../lib/tools/bin/generate-entities.php

lib/tools/bin/XmlParser.inc

@@ -0,0 +1,84 @@
+<?php
+/*
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 Bharat Mediratta
+ *
+ * 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; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * 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., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * XmlParser class adapted from a version by Monte Ohrt (monte at NOT-SP-AM dot ohrt dot com)
+ * published at http://php.net/xml
+ */
+class XmlParser {
+	public $_xmlObject;
+	public $_output = array();
+
+	public function __construct() {
+		$this->_xmlObject = xml_parser_create();
+		xml_set_object($this->_xmlObject, $this);
+		xml_set_character_data_handler($this->_xmlObject, 'dataHandler');
+		xml_set_element_handler($this->_xmlObject, 'startHandler', 'endHandler');
+	}
+
+	public function parse($path) {
+		$data = file_get_contents($path);
+
+		if ($data === false) {
+			die('Cannot open XML data file: ' . $path);
+		}
+
+		if (!xml_parse($this->_xmlObject, $data, 1)) {
+			die(
+				sprintf(
+					'XML error: %s at line %d',
+					xml_error_string(xml_get_error_code($this->_xmlObject)),
+					xml_get_current_line_number($this->_xmlObject)
+				)
+			);
+			xml_parser_free($this->_xmlObject);
+		}
+
+		return $this->_output;
+	}
+
+	public function startHandler($parser, $name, $attribs) {
+		$content = array(
+			'name' => $name,
+		);
+
+		if (!empty($attribs)) {
+			$content['attrs'] = $attribs;
+		}
+		array_push($this->_output, $content);
+	}
+
+	public function dataHandler($parser, $data) {
+		if (isset($data)) {
+			$outputIndex                            = count($this->_output) - 1;
+			$this->_output[$outputIndex]['content'] = $data;
+		}
+	}
+
+	public function endHandler($parser, $name) {
+		if (count($this->_output) > 1) {
+			$data                                   = array_pop($this->_output);
+			$outputIndex                            = count($this->_output) - 1;
+			$this->_output[$outputIndex]['child'][] = $data;
+		}
+	}
+
+	public function cleanUp() {
+		xml_parser_free($this->_xmlObject);
+	}
+}