Merge developments for 0.9.4 into master

CHANGELOG.md

@@ -1,4 +1,44 @@
 # Zoph Changelog #
+##Zoph 0.9.4##
+###18 Sept 2016###
+
+Zoph 0.9.4 is the new stable release. It is recommended for everyone to upgrade to this release
+###Features###
+* Geocoding: Zoph now also searches Wikipedia
+* [Issue#67](https://github.com/jeroenrnl/zoph/issues/67) Changed the colour scheme definition to use a nice interface to select the colour
+* [Issue#23](https://github.com/jeroenrnl/zoph/issues/23) An admin user can now define default prefences for new users
+* [Issue#24](https://github.com/jeroenrnl/zoph/issues/24) Added an option to automatically propagate permissions to newly created albums
+* [Issue#78](https://github.com/jeroenrnl/zoph/issues/78) Removed Yahoo, Cloudmade mapping as they no longer offer their services to the public
+* [Issue#78](https://github.com/jeroenrnl/zoph/issues/78) Removed Openlayers mapping, as Zophs implementation was buggy and did not work anymore.
+* [Issue#47](https://github.com/jeroenrnl/zoph/issues/47) Photos can now be deleted from disk (moved to a trash dir)
+* [Issue#67](https://github.com/jeroenrnl/zoph/issues/67) Added some new colour schemes
+
+###Bugs###
+* Fixed an issue with album pulldown when editing group access rights
+* Fixed an issue where the circles page would sometimes report $title not found
+* Fixed an issue with changing views on circle page
+* Fixed an issue that caused errors in Firefox when using the configuration page
+* fixed collapsable details for time and rating
+* [Issue#78](https://github.com/jeroenrnl/zoph/issues/78) Fixed a case where an admin user was sometimes not allowed to see a person or a place
+
+###Other improvements###
+* [Issue#77](https://github.com/jeroenrnl/zoph/issues/77) Lots of fixes in the German translation by Thomas Weiland (@HonkXL)
+* Moved group display to template
+* Moved group delete (confirm) into template
+* Moved group edit to a template
+* [Issue#79](https://github.com/jeroenrnl/zoph/issues/79) Modify recursive creation of directories, so Zoph can function in an open_basedir enverironment.
+* [Issue#66](https://github.com/jeroenrnl/zoph/issues/66) Cleanup of CSS
+* Some modernization of the looks of Zoph
+* [Issue#85](https://github.com/jeroenrnl/zoph/issues/85) Modified import process to show clearer error message
+* [Issue#66](https://github.com/jeroenrnl/zoph/issues/66) Added a reset CSS
+* [Issue#81](https://github.com/jeroenrnl/zoph/issues/81) Documentation updates
+* Some fixes for UnitTests
+* Additional tests
+* Refactor of group_permissions class into permissions class
+* Refactor prefs class
+* Moved preferences page to template
+* Modified prefs template to use labels instead of definition lists
+
 ##Zoph 0.9.3##
 ###10 jun 2016###
 

INSTALL.md

@@ -56,8 +56,59 @@ $ mkdir /var/www/html/zoph
 ```
 $ cp -r php/* /var/www/html/zoph/
 ```
-##Configure the PHP templates##
+###Set accessrights###
+
+For better security, you probably want to set accessrights on your Zoph files. (You may want to do this after testing whether Zoph works, in that case you know what caused it when it seizes working after this change)
+
+First, you need to figure out which user Apache is running under. Usually this is apache for both user and group. To determine this, check httpd.conf or use
+
+```
+ps -ef | grep httpd
+```
+
+You should probably make all files owned by the user apache and the group apache. You can do than with
+
+```
+chown -R apache:apache /var/www/html/zoph 
+```
+You can either make them only readable by this user/group (more security): *440*, readable by all users: *444*, or readable and writable by all users: *666*. The last case means that you don't need root access to edit config.inc.php or to make changes to the other php files (such as upgrades to a new version). Keep in mind that giving write access to the .php files effectively gives control over Zoph. If you have other users on your system, you should choose the first option. Also, your mysql password is in `/etc/zoph.ini`, so if you've users on your system that are not allowed to know it, you should protect it against reading as well. The directories should have execute rights: *550* for max security or *777* for access for all users.
 
+To do this, first go to the directory directly above your Zoph directory, in this example /var/www/html
+
+```
+cd /var/www/html
+chmod [dir] zoph
+cd zoph
+find -type f | xargs chmod [file]
+find -type d | xargs chmod [dir]
+```
+replace [dir] with the accesspattern you've chosen for directories above and replace [file] with the one for files.
+
+> #:exclamation: Warning :exclamation:
+> Double check whether you are using the correct directory and if you have typed it correctly, if you would 
+> accidently type `/[space]var/www/html/zoph` or something, you would change all files on your entire system to 
+> apache/apache as owner - not good).
+
+
+###Access rights for your photos###
+In many cases you can simply leave the access rights on you photo directories on default.
+However, if you use both the CLI and the webinterface to access your photos, you may want to change to a more advanced way of managing accessrights, using the [setgid](https://en.wikipedia.org/wiki/Setgid#setgid_on_directories]) feature in Linux and most other POSIX Operating Systems.
+
+* Create a new Unix group (in example "photo")
+    groupadd photo
+* Add all users that use the CLI and/or are allowed to modify the photos on disk to this group (in this example, the user is called 'jeroen')
+    useradd -g photo jeroen
+* Additionally, the apache user is added to this group, on my system, this user is called 'apache', but 'www-data' is also often used.
+    useradd -g photo apache
+* Change the ownership of the photo directory to your user and the group photo
+    chown jeroen:photo /data/images
+* Set the permissions on this directory as you wish, for example *775* (full rights for user and group, read rights for other) or *770* (full rights for user and group, no access for others).
+    chmod 775 /data/images
+* Now set 'setgid' on the dir, this causes new files and directories to be created with the group 'photo'.
+    chmod g+s /data/images
+
+
+##Configure the PHP templates##
 Some configuration options can be set in php/config.inc.php file. Usually you will not have to change anything there. Most configuration can be done from the web interface of Zoph. For more information, see http://en.wikibooks.org/wiki/Zoph/Configuration.
 
 ##Install the CLI scripts##

README.md

@@ -1,4 +1,4 @@
-# Zoph 0.9.3 Readme #
+# Zoph 0.9.4 Readme #
 
 ## Introduction ##
 
@@ -24,15 +24,15 @@ your photos, search them, or control access to them, take a look at Zoph.
 
 ## Installation ##
 
-Read the REQUIREMENTS.md, INSTALL.md docs.  If you are upgrading
-skip to the UPGRADE.md document.
+Read the the [Requirements](REQUIREMENTS.md), [Installation guide](INSTALL.md) docs.  If you are upgrading
+from a previous version, read the [Upgrade Instructions](UPGRADE.md) document.
 
-More documentation can be found on http://en.wikibooks.org/wiki/zoph
+More documentation can be found in the [Zoph Wikibook](http://en.wikibooks.org/wiki/zoph)
 
 ## Copying ##
 
 Zoph is free software.  It is released under the GPL license. Please 
-read the file COPYING for more details
+read the file [license](COPYING) for more details
 
 ## Feedback ##
 

REQUIREMENTS.md

@@ -33,17 +33,14 @@ Settings you may need to change in php.ini:
 ###max_input_time###
 This is the time Zoph is allowed by PHP to spend waiting for the file to be uploaded. Depending on the size of your files and the speed of your server's connection, 30 seconds (the default) is usually enough to process single images, if you are uploading zip or tar files, you may want to increase this to 60 or 120 seconds.
 
-max_execution_time
+###max_execution_time###
 This is the time Zoph is allowed by PHP to run. Depending on the speed of your webserver, Zoph could spend quite a lot of time resizing an image. 30 seconds may not be enough, especially if you have a camera with a lot of megapixels.
 
 ###memory_limit###
 This is the amount of memory PHP allows Zoph to use. Especially if you have large images, the default (8 or 16 Megabyte) may not be enough. If you have sufficient memory in your server, setting it to 128M is perfectly safe.
-
-If you are using the web importer you may need to increase the max_execution_time, upload_max_filesize, post_max_size and max_input_time in php.ini defined in php.ini. See MAX_UPLOAD on the Configuration page.
-
-If you are using the watermarking feature, you probably need to increase the memory_limit setting. See WATERMARKING on the Configuration page.
-
-The e-mail photo feature may require increasing the memory_limit setting. See EMAIL_PHOTOS on the Configuration page.
+* If you are using the web importer you may need to increase the `max_execution_time`, `upload_max_filesize`, `post_max_size` and `max_input_time`  defined in php.ini.
+* If you are using the watermarking feature, you probably need to increase the `memory_limit` setting. Please note that enabling this function uses a rather large amount of memory on the webserver. PHP by default allows a script to use a maximum of 8MB memory. You should probably increase this by changing `memory_limit` in php.ini. A rough estimation of how much memory it will use is 6 times the number of megapixels in your camera. For example, if you have a 5 megapixel camera, change the line in php.ini to `memory_limit=30M`
+* The e-mail photo feature may require increasing the `memory_limit` setting. Since Zoph needs to convert the photo into Base64 encoding for mail, it requires quite a large amount of memory if you try to send full size images and you may need to adjust `memory_limit` in php.ini, you should give it at least about 4 times the size of your largest image.
 
 ##MySQL##
 * Current versions are developped with MySQL 5.6