collectiveaccess · gautiermichelin · Jan 20, 2021 · Jan 20, 2021 · Jan 20, 2021 · Jan 20, 2021
diff --git a/.gitignore b/.gitignore
@@ -14,8 +14,7 @@ setup.php
 *.swp
 .vagrant/
 /import/*
-/vendor/*
-/app/lib/core/Parsers/dompdf/lib/fonts/*fm.php
+/app/lib/Parsers/dompdf/lib/fonts/*fm.php
 /app/log/log*.txt
 /app/log/*.log
 /themes/default/css/local.css

diff --git a/.htaccess b/.htaccess
@@ -11,7 +11,7 @@ Allow from all
 <FilesMatch "^(index|service|tilepic)\.php$">
         Allow from all
 </FilesMatch>
-<FilesMatch "^.*\.(css|gif|jpg|png|js|woff|woff2|ttf|swf|map|tif|tiff|m4v|xml|ply|stl|html|json|mp3|wav|aiff|tiff|obj|bmp|mp4|pdf|svg)$">
+<FilesMatch "^.*\.(css|gif|jpg|png|js|woff|woff2|ttf|swf|map|tif|m4v|xml|ply|stl|html|json|mp3|wav|aiff|tiff|obj|bmp|mp4|pdf|svg|ico|txt)$">
         Allow from all
 </FilesMatch>
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,18 @@
 language: php
-sudo: required
-dist: trusty
+os: linux
+dist: bionic
 
 addons:
   apt:
     packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
+      - mysql-server-5.7
+      - mysql-client-core-5.7
+      - mysql-client-5.7
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 
 env:
@@ -21,13 +21,14 @@ env:
 
 install:
   # Initialise the database instance for the test
-  - mysql -uroot -e 'create database ca_test;'
-  - mysql -uroot -e "grant all on ca_test.* to 'ca_test'@'localhost' identified by 'password';"
+  - sudo mysql -uroot -e 'create database ca_test;'
+  - sudo mysql -uroot -e "grant all on ca_test.* to 'ca_test'@'localhost' identified by 'password';"
   # Set environment variables
   - export COLLECTIVEACCESS_HOME="$(pwd)"
   - export PATH="$PATH:$COLLECTIVEACCESS_HOME/support/bin"
   # Create setup.php
   - ln -s .travis.setup.php setup.php
+  - composer self-update
   - composer update
   # Install the testing profile
   - support/bin/caUtils install --hostname=localhost --setup="$(pwd)/tests/setup-tests.php" --skip-roles --profile-name=$PROFILE [email protected] > install.log

diff --git a/README.md b/README.md
@@ -1,76 +1,70 @@
-# README: Providence version 1.7.8
-
-[![Build Status](https://secure.travis-ci.org/collectiveaccess/providence.png?branch=master)](http://travis-ci.org/collectiveaccess/providence)
+# README: Providence version 1.7.17
 
 ### About CollectiveAccess
 
 CollectiveAccess is a web-based suite of applications providing a framework for management, description, and discovery of complex digital and physical collections in museum, archival, and research contexts. It is comprised of two applications. Providence is the “back-end” cataloging component of CollectiveAccess. It is highly configurable and supports a variety of metadata standards, data types, and media formats. Pawtucket2 is CollectiveAccess' general purpose public-access publishing tool. It provides an easy way to create web sites around data managed with Providence. (You can learn more about Pawtucket2 at https://github.com/collectiveaccess/pawtucket2)
 
 CollectiveAccess is freely available under the open source GNU Public License version 3.
 
-### About CollectiveAccess 1.7.8
-
-Version 1.7.8 is a maintenance release with a handful of bug fixes. It is the first release compatible with PHP 7.2. Note that it has not been fully tested with PHP 7.3 or MySQL 8.0.
+### About CollectiveAccess 1.7.17
 
+Version 1.7.17 is a maintenance release with these bug fixes and minor improvements:
+* Add option to display nested type hierarchies as indented list in menus rather than nested menus.
+* Fix fatal error in library checkout due to incorrect type checking in display template parser.
 
-### Installation
+Note that this version is not yet compatible with PHP version 8. Please use versions 7.3 or 7.4.
 
-First make sure your server meets all of the [requirements](https://docs.collectiveaccess.org/wiki/Requirements). Then follow the [installation instructions](https://docs.collectiveaccess.org/wiki/Installing_Providence). 
 
-### Updating from Providence version 1.7 or later
-
-NOTE: The update process is relatively safe and rarely, if ever, causes data loss. That said BACKUP YOUR EXISTING DATABASE AND CONFIGURATION prior to updating. You almost certainly will not need it, but if you do you'll be glad it's there.
+### Installation
 
-To update from a version 1.7.x installation decompress the CollectiveAccess Providence 1.7.8 tar.gz or zip file, and replace the files in your existing installation with those in the update. Take care to preserve your media directory, local configuration directory (`app/conf/local`), any local print templates (`app/printTemplates`) and your setup.php file.
+First make sure your server meets all of the [requirements](https://manual.collectiveaccess.org/setup/systemReq.html). Then follow the [installation instructions](https://manual.collectiveaccess.org/setup/Installation.html). 
 
-Once the updated files are in place navigate in your web browser to the login screen. You will see this message:
 
-```
-Your database is out-of-date. Please install all schema migrations starting with migration #xxx. Click here to automatically apply the required updates, or see the update HOW-TO for instructions on applying database updates manually.
-```
-
-The migration number may vary depending upon the version you're upgrading from. Click on the `here` link to begin the database update process. 
+### Updating from a previous version
 
+NOTE: The update process is relatively safe and rarely, if ever, causes data loss. That said BACKUP YOUR EXISTING DATABASE AND CONFIGURATION prior to updating. You almost certainly will not need the backup, but if you do you'll be glad it's there.
 
-### Updating from Providence version 1.6 or earlier
+To update, decompress the CollectiveAccess Providence 1.7.17 tar.gz or zip file and replace the files in your existing installation with those in the update. Take care to preserve your media directory (`media/`), local configuration directory (`app/conf/local/`), any local print templates (`app/printTemplates/`) and your setup.php file.
 
-NOTE: The update process is relatively safe and rarely, if ever, causes data loss. That said BACKUP YOUR EXISTING DATABASE AND CONFIGURATION prior to updating. You almost certainly will not need it, but if you do you'll be glad it's there.
-
-To update from a version 1.6.x or older installation decompress the CollectiveAccess Providence 1.7.8 tar.gz or zip file, and replace the files in your existing installation with those in the update. Take care to preserve your media directory, local configuration directory (`app/conf/local`), and any local print templates (`app/printTemplates`). 
-
-Next rename your existing setup.php to something else (Eg. `setup.php-old`). Then copy the version 1.7.8 setup.php template in `setup.php-dist` to `setup.php`. Edit this file with your database login information, system name and other basic settings. You can reuse the settings in your old setup.php file as-is. Only the format of the setup.php file has changed. 
+If you are updating from a version prior to 1.7, you must recreate your existing setup.php as the format has changed. Rename the existing setup.php to `setup.php-old` and copy the version 1.7.17 setup.php template in `setup.php-dist` to `setup.php`. Edit this file with your database login information, system name and other basic settings. You can reuse the settings in your existing setup.php file as-is. Only the format of setup.php has changed. If you are updating from version 1.7.x you do not need to change your setup.php file.
 
 Once the updated files are in place navigate in your web browser to the login screen. You will see this message:
 
 ```
-Your database is out-of-date. Please install all schema migrations starting with migration #xxx. Click here to automatically apply the required updates, or see the update HOW-TO for instructions on applying database updates manually.
+Your database is out-of-date. Please install all schema migrations starting with migration #xxx. Click here to automatically apply the required updates.
 ```
 
-The migration number will vary depending upon the precise version you have installed, but in all cases will be less than 127.
-
-Click on the `here` link to begin the database update process. The process may take several minutes with older installations requiring additional time. 
+The migration number may vary depending upon the version you're upgrading from. Click on the `here` link to begin the database update process. 
 
 Version 1.7 introduced zoomable page media for multipage documents such as PDFs, Microsoft Word or Powerpoint. Systems migrated from pre-1.7 versions of CollectiveAccess will not have these zoomable media versions available causing the built-in document viewer to fail. If your system includes multipage documents you should regenerate the media using the command-line `caUtils` utility in `support/bin`. The command to run (assuming your current working directory is `support/`) is:
 
 ```
 bin/caUtils reprocess-media 
 ```
 
-Be sure to run it as a user that has write permissions on all media.
+Be sure to run it as a user that has write permissions on all media. You do not need to reprocess media if you are updating from a 1.7.x system.
+
+
+### Installing development versions
+
+The latest development version is always available in the `develop` branch (https://github.com/collectiveaccess/providence/tree/develop). Other feature-specific development versions are in branches prefixed with `dev/`. To install a development branch follow these steps:
+
+1. clone this repository into the location where you wish it to run using `git clone https://github.com/collectiveaccess/providence`.
+2. by default, the newly cloned repository will use the main branch, which contains code for the current release. Choose the `develop` branch by running from within the cloned repository `git checkout develop`.
+3. install the PHP package manager [Composer](https://getcomposer.org) if you do not already have it installed on your server.
+4. run `composer` from the root of the cloned repository with `composer.phar install`. This will download and install all required 3rd party software libraries. 
+5. follow the release version installation instructions to complete the installation.
 
 
 ### Useful Links
 
 * Web site: https://collectiveaccess.org
-* Documentation: https://docs.collectiveaccess.org
+* Documentation: https://manual.collectiveaccess.org
 * Demo: https://demo.collectiveaccess.org/
-* Installation instructions: https://docs.collectiveaccess.org/wiki/Installing_Providence
-* Upgrade instructions: https://docs.collectiveaccess.org/wiki/Upgrading_Providence
-* Release Notes:  
-  * https://docs.collectiveaccess.org/wiki/Release_Notes_for_Providence_1.7
-  * https://docs.collectiveaccess.org/wiki/Release_Notes_for_Providence_1.7.8
-* Forum: https://www.collectiveaccess.org/support/forum
-* Bug Tracker: https://clangers.collectiveaccess.org
+* System requirements: https://manual.collectiveaccess.org/setup/systemReq.html
+* Forum: https://www.collectiveaccess.org/support
+
+To report issues please use GitHub issues.
 
 
 ### Other modules

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,5 @@
+# Security Policy
+
+ ## Reporting a Vulnerability
+
+ Please report security issues to `[email protected]`
diff --git a/Vagrantfile b/Vagrantfile
@@ -49,7 +49,8 @@ Vagrant.configure(2) do |config|
     apt-get -y install mysql-client mysql-server
     apt-get -q -y -o Dpkg::Options::=--force-confold install curl apache2
     apt-get -q -y -o Dpkg::Options::=--force-confold install php7.2 libapache2-mod-php7.2 php7.2-curl php7.2-mysql
-    apt-get -q -y -o Dpkg::Options::=--force-confold install php7.2-xml php7.2-zip php7.2-gd php7.2-json php7.2-imap
+    apt-get -q -y -o Dpkg::Options::=--force-confold install php7.2-xml php7.2-zip php7.2-gd 
+    apt-get -q -y -o Dpkg::Options::=--force-confold install php7.2-redis php7.2-json php7.2-imap
     apt-get -q -y -o Dpkg::Options::=--force-confold install htop screen vim apachetop vnstat git
     apt-get -q -y -o Dpkg::Options::=--force-confold install ffmpeg graphicsmagick python-pdfminer
     apt-get -q -y -o Dpkg::Options::=--force-confold install ghostscript dcraw xpdf mediainfo exiftool phantomjs