--- zoph-0.8.0.1.orig/sql/zoph_update-0.8-sid.sql +++ zoph-0.8.0.1/sql/zoph_update-0.8-sid.sql @@ -0,0 +1,102 @@ +# +# Zoph 0.7 -> 0.8 update +# +# This file is part of Zoph. +# +# Zoph 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. +# +# Zoph 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 Zoph; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +# +# As of version 0.7.1 I am planning to release a few interim "feature" releases +# between two 'major' (0.7 and 0.8) releases, to make the 'time to market' for +# a new release shorter. +# If you upgrade to 0.7.1, be prepared to comment the changes for 0.7.1 once +# you upgrade to 0.7.2 or 0.8. +# + +## done within sid 0.7.1-1 on Thu, 10 Apr 2008 (eb) +## +## Changes for 0.7.1 +## +# +#alter table zoph_users add column download char(1) NOT NULL DEFAULT '0' +# after import; +# +#alter table zoph_albums add column sortname char(32) +# after album_description; +#alter table zoph_categories add column sortname char(32) +# after category_description; +#alter table zoph_prefs add column child_sortorder +# enum('name', 'sortname', 'oldest', 'newest', +# 'first', 'last', 'lowest', 'highest', 'average') +# default 'sortname' after autothumb; + +# +# Changes for 0.7.2 +# + +CREATE TABLE zoph_pageset ( + pageset_id int(11) NOT NULL auto_increment, + title varchar(128), + show_orig enum('never', 'first', 'last', 'all') NOT NULL DEFAULT 'all', + orig_pos enum('top', 'bottom') NOT NULL DEFAULT 'top', + date datetime, + user int(11) , + timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (pageset_id)); + +CREATE TABLE zoph_pages ( + page_id int(11) NOT NULL auto_increment, + title varchar(128), + text blob, + date datetime, + timestamp timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (page_id)); + +CREATE TABLE zoph_pages_pageset ( + pageset_id int(11) NOT NULL, + page_id int(11) NOT NULL, + page_order int(5) unsigned ); + +ALTER TABLE zoph_albums + ADD COLUMN pageset int(11) DEFAULT NULL after coverphoto; + +ALTER TABLE zoph_categories + ADD COLUMN pageset int(11) DEFAULT NULL after coverphoto; + +ALTER TABLE zoph_places + ADD COLUMN pageset int(11) DEFAULT NULL after coverphoto; + +ALTER TABLE zoph_people + ADD COLUMN pageset int(11) DEFAULT NULL after coverphoto; + +# +# Changes for 0.7.3 +# +ALTER TABLE zoph_places ADD COLUMN lat float(10,6); +ALTER TABLE zoph_places ADD COLUMN lon float(10,6); +ALTER TABLE zoph_places ADD COLUMN mapzoom tinyint unsigned; + +ALTER TABLE zoph_photos ADD COLUMN lat float(10,6); +ALTER TABLE zoph_photos ADD COLUMN lon float(10,6); +ALTER TABLE zoph_photos ADD COLUMN mapzoom tinyint unsigned; + +ALTER TABLE zoph_photos ADD COLUMN time_corr smallint NOT NULL default 0 after time; +ALTER TABLE zoph_places ADD COLUMN timezone varchar(50) default NULL; + +# Change description from BLOB to TEXT +ALTER TABLE zoph_photos MODIFY COLUMN description TEXT; + +# Make title for albums and categories longer +ALTER TABLE zoph_albums MODIFY COLUMN album varchar(64) NOT NULL default ''; +ALTER TABLE zoph_categories MODIFY COLUMN category varchar(64) NOT NULL default ''; --- zoph-0.8.0.1.orig/debian/changelog +++ zoph-0.8.0.1/debian/changelog @@ -0,0 +1,289 @@ +zoph (0.8.0.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update zoph to PHP 5.4: fix "Call-time pass-by-reference" errors. + Affected files are: php/code.inc.php, php/admin.inc.php, php/util.inc.php + and php/image_service.php (Closes: #658876) + + -- Mònica Ramírez Arceda Fri, 27 Apr 2012 22:44:54 +0200 + +zoph (0.8.0.1-1) unstable; urgency=low + + * new upstream release + * fixes CVE-2008-6837 and CVE-2008-6838 (Closes: #535188) + * bumped standards to 3.8.3 (no changes needed) + + -- Edelhard Becker Mon, 05 Oct 2009 22:33:15 +0200 + +zoph (0.7.5-1) unstable; urgency=low + + * new upstream release + * bumped standards to 3.8.1 (no changes needed) + * bumped dh compat to 7 (no changes needed) + * removed empty preinst/prerm (lintian warning) + * cleaned up dependencies to make it installable with all httpds that + support PHP (Closes: #514683) + * fixed lintian warnings about dh_clean -k and copyright + + -- Edelhard Becker Tue, 31 Mar 2009 17:48:03 +0200 + +zoph (0.7.3-2) unstable; urgency=low + + * remove "{..,..}" bashism from debian/rules (Closes: #495658) + + -- Edelhard Becker Fri, 22 Aug 2008 20:45:26 +0200 + +zoph (0.7.3-1) unstable; urgency=low + + * new upstream release + * updated README.Debian for the lenny release with instructions to upgrade + from etch + * add a paragraph to NEWS to remind stable users of database update + + -- Edelhard Becker Tue, 12 Aug 2008 23:00:14 +0200 + +zoph (0.7.1-2) unstable; urgency=low + + * really fix 417259 now (check for existence of wwwconfig-commen in remove + *and* purge part of postrm; Closes: #417259) + + -- Edelhard Becker Mon, 11 Aug 2008 13:27:26 +0200 + +zoph (0.7.1-1) unstable; urgency=low + + * new upstream release + * install missing javascript files (Closes: #473062) + * bumped standards to 3.7.3 (no changes needed) + * moved homepage from description to control field + * changed doc-base section to Data Management + + -- Edelhard Becker Thu, 10 Apr 2008 16:42:47 +0200 + +zoph (0.7.0.2-2) unstable; urgency=low + + * added patch from stable/etch addressing #417259: + Only call wwwconfig-common tools when they are actually still + installed, fixing possible problems when purging the package + after removal of wwwconfig-common. + Thanks Michael and Marc for NMU. + + -- Edelhard Becker Sun, 02 Sep 2007 10:22:49 +0200 + +zoph (0.7.0.2-1) unstable; urgency=low + + * new upstream release + * fixes SQL injection vulnerability CVE-2007-3905 (Closes: #435711) + + -- Edelhard Becker Sat, 01 Sep 2007 12:35:52 +0200 + +zoph (0.6-2) unstable; urgency=low + + * prefer apache2 over apache in Depends: and allow PHP5 (Closes: #376687) + + -- Edelhard Becker Tue, 26 Sep 2006 00:55:28 +0200 + +zoph (0.6-1) unstable; urgency=low + + * New upstream release + * USE_IMAGE_SERVICE is now 1 by default (Closes: #364054) + * added watch file + * updated to policy 3.7.2 (no changes needed) + * made package lintian-clean + * add php-pear to Suggests: (needed for mailing photos) + + -- Edelhard Becker Sun, 24 Sep 2006 17:31:22 +0200 + +zoph (0.5.1-1) unstable; urgency=low + + * New upstream release + + -- Edelhard Becker Mon, 13 Mar 2006 21:13:24 +0100 + +zoph (0.5-1) unstable; urgency=low + + * New upstream release + + -- Edelhard Becker Thu, 2 Mar 2006 14:18:18 +0100 + +zoph (0.4+0.5pre4-1) unstable; urgency=low + + * New upstream release + + -- Edelhard Becker Mon, 20 Feb 2006 21:28:58 +0100 + +zoph (0.4+0.5pre3-1) unstable; urgency=low + + * New upstream release + * upstream included our manpages + + -- Edelhard Becker Thu, 9 Feb 2006 20:30:17 +0100 + +zoph (0.4+0.5pre2-1) unstable; urgency=low + + * New upstream release + * bumped standards to 3.6.2 (no changes needed) + * updated man pages with upcoming return values and --help flag + * debian/control: changed dependency to + libapache-mod-php4 | libapache2-mod-php4 + + -- Edelhard Becker Wed, 25 Jan 2006 16:40:31 +0100 + +zoph (0.4+0.5pre1-1) unstable; urgency=low + + * New upstream release: + - more restrictive permissions (Closes: #326649) + - zophImport exits without changes to the database and image dir when any + of album/location/category/person does not exist (Closes: #284539) + - zophImport now has --copy and --verbose options that prevent surprises + about missing source images (Closes: #211312, #218491) + * php/css.php: added path /etc/zoph to config.inc.php + * removed language pack from package (it's included by upstream) and z.ps + + -- Edelhard Becker Wed, 25 Jan 2006 14:55:11 +0100 + +zoph (0.4-3) unstable; urgency=low + + * upload to unstable + * make NEWS.Debian more explicit about what do do + * README: s/actual/up to date/ + + -- Edelhard Becker Mon, 23 Jan 2006 14:56:50 +0100 + +zoph (0.4-2) experimental; urgency=low + + * debian/postinst: make changes for apache2 (apache-modconf is not available + and application configs are loaded via link in conf.d) + * debian/{control,copyright}: added Jeroen Roos to authors + + -- Edelhard Becker Tue, 22 Nov 2005 19:01:46 +0100 + +zoph (0.4-1) experimental; urgency=low + + * New upstream release (Closes: #339843) + * new configuration options db_host and db_prefix, see zophrc.sample + * added link to the new documentation wiki to the man pages and README and + updated the README + * debian/rules: added php/*.html + + -- Edelhard Becker Mon, 21 Nov 2005 01:41:40 +0100 + +zoph (0.3.3-14) unstable; urgency=low + + * Thomas Hardings scripts updated to V1.6 + + -- Edelhard Becker Tue, 16 Aug 2005 00:28:12 +0200 + +zoph (0.3.3-13) unstable; urgency=low + + * added /usr/share/doc/zoph/contrib directory with user supplied add-ons, + starting with Thomas Hardings bash interactive upload script + * cleaned lintian warnings (escape accented chars in zophExport.1, made + postinst bash script to allow bashisms, seperate user and group with ':' + in chown) + + -- Edelhard Becker Tue, 9 Aug 2005 17:04:28 +0200 + +zoph (0.3.3-12) unstable; urgency=low + + * removed dependency on mysql-server, thanks Matthias (Closes: #301857) + * added a note on how to enable the php4 mysql extension, thanks Bill for + #302285. + + -- Edelhard Becker Tue, 5 Apr 2005 01:29:32 +0200 + +zoph (0.3.3-11) unstable; urgency=low + + * replace jpegtran by exiftran as suggested by Brian May in a follow-up to + #284815 in the manpage, suggest exiftran in debian/control and add + --thumbnail description + * cleaned bashisms in post{inst,rm} + + -- Edelhard Becker Fri, 11 Feb 2005 01:35:00 +0100 + +zoph (0.3.3-10) unstable; urgency=low + + * command in post{inst,rm} made zoph uninstallable when apache2 is not found + on the system + + -- Edelhard Becker Wed, 15 Dec 2004 01:55:48 +0100 + +zoph (0.3.3-9) unstable; urgency=low + + * checked that it works with apache2 also, updated the Depends + (Closes: #220288) + * depend on virtual-mysql-server, remove dependency on mysql-common + (Closes: #282243) + * move the database name and passwords out of /usr/bin/zoph{Im,Ex}port and + read them from $HOME/.zophrc instead; provide a zophrc.sample to start + with and document the changes in README.Debian (Closes: #284543) + * zoph doesn't rotate images automagically when importing photos; document + Brian Mays solution for doing this afterwards (Closes: #284815, thanks + Brian for this tip and the other reports) + + -- Edelhard Becker Sun, 12 Dec 2004 22:52:35 +0100 + +zoph (0.3.3-8) unstable; urgency=low + + * really do the raise to optional + + -- Edelhard Becker Sun, 2 May 2004 20:02:03 +0200 + +zoph (0.3.3-7) unstable; urgency=low + + * added language pack zoph_lang-1.13.tar.gz into the package + * changed dependency from php4-gd2 to php4-gd (Closes: #243713) + * php4-gd is priority optional, so we can raise to optional again + * bumped standards to 3.6.1 (no changes) + + -- Edelhard Becker Sun, 2 May 2004 19:06:16 +0200 + +zoph (0.3.3-6) unstable; urgency=low + + * lowered priority since php4-gd2 is extra (policy Sec. 2.5) + + -- Edelhard Becker Fri, 24 Oct 2003 12:57:43 +0200 + +zoph (0.3.3-5) unstable; urgency=low + + * replaced inclusion of header.inc.php by 'print $rtplang->lang_header();' + as suggested by bug submitter Alexander Kogan, thanks Alexander; + (Closes: #216844) + + -- Edelhard Becker Thu, 23 Oct 2003 21:34:00 +0200 + +zoph (0.3.3-4) unstable; urgency=low + + * include header.inc.php from slideshow.php (Closes: #209309) + + -- Edelhard Becker Tue, 9 Sep 2003 15:39:22 +0200 + +zoph (0.3.3-3) unstable; urgency=low + + * changed maintainer to my debian account + * bumped standards to 3.6.0 (no changes) + * added language pack zoph_lang-1.12.tar.gz into the package + * added php4-gd2 dependency (Closes: #193992). + * removed the double UN???_CMD definitions from config.inc.php as reported + by Daniel Bonniot + * added Daniel's report upgrading from his own installation of 0.3.2 to the + README.Debian, thanks Daniel + * change owner of default image dir (/var/lib/zoph) to www-data.www-data + + -- Edelhard Becker Mon, 1 Sep 2003 16:28:24 +0200 + +zoph (0.3.3-2) unstable; urgency=low + + * improved documentation + * first upload (Closes: bug#176618). + + -- Edelhard Becker Wed, 26 Feb 2003 16:51:16 +0100 + +zoph (0.3.3-1) unstable; urgency=low + + * Initial Release. + * shuffled around some files and paths to make them more FHS/Debian like + * patched sources so initially there's a running demo (only the database has + to be created manually) + + -- Edelhard Becker Mon, 13 Jan 2003 21:38:46 +0100 + --- zoph-0.8.0.1.orig/debian/postrm +++ zoph-0.8.0.1/debian/postrm @@ -0,0 +1,78 @@ +#! /bin/sh +# postrm script for zoph +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + set +e + dpkg -s apache2 > /dev/null 2>&1 + if [ "$?" = "0" ]; then + server=apache2 + else + server=apache + fi + set -e + includefile=/etc/zoph/apache.conf + case "$1" in + purge) + # remove zoph directives + if [ -r /usr/share/wwwconfig-common/apache-uninclude_all.sh ]; then + . /usr/share/wwwconfig-common/apache-uninclude_all.sh + if [ "$status" = "purge" ] ; then + restart="$restart $server" + fi + fi + ;; + remove) + # comment out zoph directives + if [ -r /usr/share/wwwconfig-common/apache-cominclude_all.sh ]; then + . /usr/share/wwwconfig-common/apache-cominclude_all.sh + if [ "$status" = "comment" ] ; then + restart="$restart $server" + fi + fi + ;; + esac + + # reistart servers if necessary + if [ -r /usr/share/wwwconfig-common/restart.sh ]; then + servers="apache-ssl apache apache2" + . /usr/share/wwwconfig-common/restart.sh + fi + + # remove zoph config if purging + if [ $1 = "purge" ] ; then + rm -rf /etc/zoph + fi + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- zoph-0.8.0.1.orig/debian/compat +++ zoph-0.8.0.1/debian/compat @@ -0,0 +1 @@ +7 --- zoph-0.8.0.1.orig/debian/watch +++ zoph-0.8.0.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/pre/~pre/" \ + http://sf.net/zoph/ zoph-(.*)\.tar\.gz --- zoph-0.8.0.1.orig/debian/rules +++ zoph-0.8.0.1/debian/rules @@ -0,0 +1,77 @@ +#!/usr/bin/make -f +#export DH_VERBOSE=1 + +DESTDIR=$(CURDIR)/debian/zoph +BINDIR=$(DESTDIR)/usr/bin +CGIBINDIR=$(DESTDIR)/usr/share/zoph +IMAGEDIR=$(DESTDIR)/var/lib/zoph +CONFDIR=$(DESTDIR)/etc/zoph + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +clean: + dh_testdir + dh_testroot + dh_clean + rm -f man/zophImport.1 man/zophExport.1 + +build: + +install: + dh_testdir + dh_testroot + dh_prep + dh_installdirs + install -m 755 -d $(CONFDIR) + install -m 755 -d $(CGIBINDIR)/js $(CGIBINDIR)/lang $(BINDIR) + install -m 755 -d $(CGIBINDIR)/images/icons/default $(CGIBINDIR)/images/smileys + install -m 777 -d $(IMAGEDIR) + install -m 644 etc/zoph/apache.conf $(CONFDIR) + install -m 644 php/config.inc.php $(CONFDIR) + install -m 644 php/*.php $(CGIBINDIR) + install -m 644 php/*.html $(CGIBINDIR) + install -m 644 php/images/*.gif php/images/*.png $(CGIBINDIR)/images + install -m 644 php/images/icons/default/* $(CGIBINDIR)/images/icons/default + install -m 644 php/images/smileys/* $(CGIBINDIR)/images/smileys + install -m 644 php/js/* $(CGIBINDIR)/js + install -m 644 lang/* $(CGIBINDIR)/lang + install -m 644 bin/zophrc.sample $(CURDIR)/debian + rm -rf $(CGIBINDIR)/config.inc.php + install -m 755 bin/zophImport.pl $(BINDIR)/zophImport + install -m 755 bin/zophExport.pl $(BINDIR)/zophExport + +binary-arch: + +binary-indep: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples +# dh_installmime + gunzip -cd man/zophImport.pl.1.gz > man/zophImport.1 + gunzip -cd man/zophExport.pl.1.gz > man/zophExport.1 + dh_installman man/zophImport.1 man/zophExport.1 +# dh_undocumented + dh_installchangelogs CHANGELOG +# dh_link +# dh_strip + dh_compress -X.sql + dh_fixperms + dh_installdeb + dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep +.PHONY: clean build binary-indep install --- zoph-0.8.0.1.orig/debian/control +++ zoph-0.8.0.1/debian/control @@ -0,0 +1,33 @@ +Source: zoph +Section: web +Priority: optional +Maintainer: Edelhard Becker +Build-Depends: debhelper (>= 7) +Standards-Version: 3.8.3 +Homepage: http://www.zoph.org/ + +Package: zoph +Architecture: all +Depends: apache2 | httpd, php5-mysql, php5-gd, wwwconfig-common, perl, libdbi-perl, libimage-size-perl, libdbd-mysql-perl, jhead, imagemagick, unzip +Suggests: exiftran, php-pear +Description: Web based digital image presentation and management system + "Zoph Organizes PHotos" is a web based photo management system written using + PHP and backed by MySQL, not just yet-another-web-album. + . + Database features: photos can have lots of meta data (EXIF info, title, + photographer, location, description, rating, people in the photo); each photo + can appear in zero or more albums; each photo can appear in zero or more + categories; albums and categories are both hierarchical; searches can be + performed using all this data; access privileges for each user. + . + Additional features: slideshows; lightboxes; "email this photo"; basic + reporting (most photographed people, places, etc.); user interface in several + languages. + . + Administration: photos, albums, categories, people, places and users can be + easily administered using the web interface; import photos from the web or by + using a Perl script; export photos to generate static galleries with album or + bins (both available as Debian packages). + . + Authors: Jason Geiger and Jeroen Roos + --- zoph-0.8.0.1.orig/debian/zophrc.sample +++ zoph-0.8.0.1/debian/zophrc.sample @@ -0,0 +1,32 @@ +#----------------------------------------- +# Configuration file for Zoph +#----------------------------------------- +# +# Rename this file to .zophrc and place it in your home directory. +# +# All settings must match the settings with the same name in config.inc.php +# +# edit these to reflect your database +$db_host = 'localhost'; # hostname or hostname:port +$db_name = 'zoph'; +$db_user = 'zoph_rw'; +$db_pass = 'zoph_rw'; +$db_prefix = 'zoph_'; + +# +# set this to your image directory +# +$image_dir = '/var/lib/zoph/'; + +# +# Change these to override default settings +# (these settings do not have a matching setting in config.inc.php) +# +$datedDirs = 0; +$copy = 0; +$hierarchical = 0; +$verbose = 0; +$resolveSymlinks = 0; + +# Perl does not like it when this file ends with a "= 0" +1; --- zoph-0.8.0.1.orig/debian/copyright +++ zoph-0.8.0.1/debian/copyright @@ -0,0 +1,51 @@ +This package was debianized by Edelhard Becker on Sun, 12 +Jan 2003 18:04:03 +0100, based on the work by Mark Cooper. + +It was downloaded from http://www.zoph.org/ + +Upstream Authors: Jason Geiger and + Jeroen Roos (zoph AT zoph DOT org) +Zoph is Copyright 2002-2007, Jason Geiger and Jeroen Roos + +Zoph makes use of the following packages, for which I thank their authors +for making available: + + HTML Mime Mail class by Richard Heyes + http://www.phpguru.org/mime.mail.html + + PHP Calendar class by David Wilkinson + http://www.cascade.org.uk/software/php/calendar/index.php + + Rycks Translation Project by Eric Seigne + http://cvs.rycks.com/cgi-bin/cvsweb/rtpclass/?cvsroot=RTP + + For a list of individuals who have contributed fixes, improvements or + translations, click on the 'about' tab within Zoph. + + +Copyright: from 0.4 on, zoph is licensed as GPL v2: + + You are free to distribute this software under the terms of the GNU General + Public License. On Debian systems, the complete text of the GNU General + Public License can be found in the file `/usr/share/common-licenses/GPL-2'. + +Up to version 0.3.3 zoph had the BSD license: + + Redistribution and use in source and binary forms, with or without + modification, are permitted under the terms of the BSD License. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +On Debian GNU/Linux systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. + --- zoph-0.8.0.1.orig/debian/NEWS +++ zoph-0.8.0.1/debian/NEWS @@ -0,0 +1,19 @@ +zoph (0.7.3-1) unstable; urgency=low + + When upgrading from Etch to Lenny, follow the instructions in section "B:" + in README.Debian to update your database. + + -- Edelhard Becker Tue, 12 Aug 2008 22:57:48 +0200 + +zoph (0.4-3) unstable; urgency=low + + This release adds two new configuration options: db_host (which can be + host:port) and db_prefix (which is "zoph_" by default). + + If you update from any previous release, you must add both variables to your + local setup (i.e. your $HOME/.zophrc) and update your database by running + zoph_update-.sql, see /usr/share/doc/zoph/README.Debian for the + details. + + -- Edelhard Becker Mon, 23 Jan 2006 14:56:50 +0100 + --- zoph-0.8.0.1.orig/debian/zoph.doc-base +++ zoph-0.8.0.1/debian/zoph.doc-base @@ -0,0 +1,11 @@ +Document: zoph +Title: Debian zoph documentation overview +Author: Edelhard Becker +Abstract: Zoph (Zoph Organizes PHotos) is not another web album but a web based + photo management system written using PHP and backed by MySQL. +Section: Data Management + +Format: HTML +Index: /usr/share/doc/zoph/index.html +Files: /usr/share/doc/zoph/*.html + --- zoph-0.8.0.1.orig/debian/docs +++ zoph-0.8.0.1/debian/docs @@ -0,0 +1,5 @@ +docs/* +sql/* +contrib +debian/zophrc.sample +debian/contrib --- zoph-0.8.0.1.orig/debian/README.Debian +++ zoph-0.8.0.1/debian/README.Debian @@ -0,0 +1,90 @@ + +zoph for Debian +--------------- + +For this debian package some paths and filenames were adjusted from the +upstream source. If you had never installed zoph before, goto A: First time +install. If you are upgrading from an older version or from a self-installed +upstream package, BACK YOUR MySQL DATABASE UP and go to B: or C: for upgrading +between stable releases or while running unstable. +Finally go to http://en.wikibooks.org/wiki/Zoph/Configuration to tweak any +new options introduced into zoph. + +A: First time install +===================== + + As root, after apt-get-installing the package, do the following steps: + + $ mysqladmin create zoph + $ mysql zoph < /usr/share/doc/zoph/zoph.sql + $ mysql + mysql> GRANT select, insert, update, delete ON zoph.* TO zoph_rw@localhost IDENTIFIED BY 'zoph_rw'; + mysql> GRANT all ON zoph.* TO zoph_admin@localhost IDENTIFIED BY 'zoph_admin'; + mysql> quit + + Each user that wants to use the zoph{Im,Ex}port scripts has to install a + .zophrc file with the database name and passwords. The file + /usr/share/doc/zoph/zophrc.sample contains the necessary statements with + the default passwords used in this README. Adjust the values as needed for + your installation and do a 'chmod 600 ~/.zophrc'. + + Point your browser to http://localhost/zoph/logon.php and login as user + 'admin', password 'admin' and follow the steps in the manual + http://localhost/doc/zoph/manual.html. + + Beware: this is a demo install and highly insecure. Everybody can access the + pictures under /var/lib/zoph and you use default passwords. To tighten the + system, change database and user passwords (see manual). You might even + create a dedicated zoph user who owns the image directory. + +B: Upgrading from Debian "Etch" (0.6-2.1etch1) to Debian "Lenny" +================================================================ + + B1: + --- + Backup your current zoph database: + + $ mysqldump -u zoph_admin --password=zoph_admin zoph > zoph-`date +%Y%m%d`.sql + + + B2: + --- + If you don't have an up to date backup of your MySQL databases, goto B1! + + Now update the database, first to 0.7, then to the 0.8prerelease + delivered with Lenny: + + $ mysql -u zoph_admin --password=zoph_admin zoph < /usr/share/doc/zoph/zoph_update-0.7.sql + $ mysql -u zoph_admin --password=zoph_admin zoph < /usr/share/doc/zoph/zoph_update-0.8.sql + + If you upgrade from any older version, run all mysql update scripts + sequentially. And finally make sure you have all the necessary settings in + your $HOME/.zophrc (see /usr/share/doc/zoph/zophrc.sample). + +C: Upgrading from previous unstable (0.7.1) +=========================================== + + If you don't have an up to date backup of your MySQL databases, goto B1! + + Now update the database: + + $ mysql -u zoph_admin --password=zoph_admin zoph < /usr/share/doc/zoph/zoph_update-0.8-sid.sql + +Upgrading from upstream sources to this Debian package +====================================================== + + Install/upgrade and edit the config variables you know from your initial + install. Remember these changes: + - zophImport.pl moved from /usr/local/bin/ to /usr/bin/zophImport + - zophExport.pl moved from /usr/local/bin/ to /usr/bin/zophExport + - the passwords and database name are stored in $HOME/.zophrc + - the config.inc.php moved to /etc/zoph/ + - and all the other php files are in /usr/share/zoph/ + If you are upgrading from an older release, refer to + http://localhost/doc/zoph/upgrading.html. + +Upstream docs +============= + +All zoph documentation is available on http://en.wikibooks.org/wiki/Zoph . + --- zoph-0.8.0.1.orig/debian/postinst +++ zoph-0.8.0.1/debian/postinst @@ -0,0 +1,104 @@ +#! /bin/bash +# postinst script for zoph +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + + set +e + dpkg -s apache2 > /dev/null 2>&1 + if [ "$?" = "0" ]; then + server=apache2 + else + server=apache + fi + set -e + + # apache-php needs apache-modconf which isn't available for apache2 + if [ "$server" = "apache" ] + then + # ensure php is enabled + phpver=php4 + phpini=/etc/php4/$server/php.ini + . /usr/share/wwwconfig-common/apache-php.sh + if [ "$status" = "uncomment" ] ; then + restart="$server $restart" + fi + fi + + # ensure php indexes are allowed + index=index.php + . /usr/share/wwwconfig-common/apache-index_all.sh + if [ "$status" = "added" ] ; then + restart="$server $restart" + fi + + if [ "$server" = "apache" ] + then + # include zoph directive into httpd.conf + includefile=/etc/zoph/apache.conf + . /usr/share/wwwconfig-common/apache-include_all.sh + if [ "$status" = "uncomment" -o "$status" = "include" ] ; then + restart="$server $restart" + fi + else + # apache2 uses files in conf.d + if [ ! -f /etc/apache2/conf.d/zoph ] + then + ln -s /etc/zoph/apache.conf /etc/apache2/conf.d/zoph + restart="$server $restart" + fi + fi + + # restart servers if necessary + servers="apache-ssl apache apache2" + . /usr/share/wwwconfig-common/restart.sh + + # change ownership of default image dir + chown www-data:www-data /var/lib/zoph + + # protect the passwords + chgrp www-data /etc/zoph/apache.conf /etc/zoph/config.inc.php + chmod 640 /etc/zoph/config.inc.php + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- zoph-0.8.0.1.orig/debian/contrib/load_photos/INSTALL +++ zoph-0.8.0.1/debian/contrib/load_photos/INSTALL @@ -0,0 +1,9 @@ + +su + +apt-get install qiv exiftran jhead gimp || urpmi qiv exiftran jhead gimp +make install +make addgrpphoto + +exit + --- zoph-0.8.0.1.orig/debian/contrib/load_photos/CHANGES +++ zoph-0.8.0.1/debian/contrib/load_photos/CHANGES @@ -0,0 +1,12 @@ +V1.6 2005/08/15 + - use qiv as window if --noroot option is given + - suppression of error message about .xvpics deletion + - display a more usefull help + - makefile for installation + +V1.5 2005/08/14 + - display only directories where the user can write + (assumes user have 'photo' group) + - rename photos to be copied safely in incoming directory + - rename photos to be safely imported in destination directory + --- zoph-0.8.0.1.orig/debian/contrib/load_photos/addgrpphoto.sh +++ zoph-0.8.0.1/debian/contrib/load_photos/addgrpphoto.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +for i in `awk -F\: '{print $1":"$3}' /etc/passwd | + grep -e ':\(\(|1|2\)[0-9][0-9][0-9][0-9]$\|[1-9][0-9][0-9][0-9]$\)' | + awk -F: '{print $1}'` +do + usermod -G `groups $i | sed -e 's/[[:print:]]*: //;s/ /,/g'`,photo $i +done --- zoph-0.8.0.1.orig/debian/contrib/load_photos/load_photos +++ zoph-0.8.0.1/debian/contrib/load_photos/load_photos @@ -0,0 +1,585 @@ +#!/bin/bash + +#V 1.6 +# front-end to zophImport +# Copyright (C) 2005, Thomas HARDING. thomas.harding@laposte.net +# +# 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 +# +# + +############ +# +# CONFIG +# +PHOTOS_ROOT=/var/lib/zoph +ZOPH_PASSWD='zoph_rw' +ZOPH_DB='zoph' +PHOTO_EDITOR="gimp" +LANGUAGE_PATH=/usr/share/zoph/lang +if [ -d /mnt/removable ] ; then + MOUNT_POINT="/mnt/removable" +else + MOUNT_POINT='/usbdisk' +fi + +# +# messages +# +OTHER='Other' +ALBUM_MSG="Select album" +ALBUM_TYPE_MSG="Type the name of the album" +CATEGORY_MSG="Select category" +CATEGORY_TYPE_MSG="Type the name of the category" +DIRECTORY_MSG="Select directory" +DIRECTORY_TYPE_MSG="Type the name of directory" +DIRECTORY_INSANE_MSG="Cannot create directory with spaces." +USE_DATEDIRS_MSG="file photos by date? [Y/n]" +ROTATE_MSG="rotate? [y/N]" +KEEP_MSG="keep? [Y/n]" +WORK="job " +MAIL_MSG="A message will be sent to you as work will be finished:\n1dot per photo\nDO NOT SWITCH OFF COMPUTER BEFORE HAVE RECEIPT THE MESSAGE" +MAIL="Message from load_photos: " +MAIL2="Photos loaded!" +NO_EXIF_DATE_MSG="No date information in exif tags,\ +images will be not file by date." +DATE_MSG="date:" +ADD_COMMENT_MSG="Would you add a comment? [N/d=>default/comment]\\nDefault : " +DATE_OF_PHOTO_MSG="(photo date)" +EDIT_MSG="Tidy photo?" +NO_PHOTO_MSG="There is no photo to load" + +############# +# +# PROGRAM +# + +# +# set messages language +# +LANGUAGE=$( echo $LANG | awk -F_ '{ print $1 }') +if [[ "$LANGUAGE" != en ]] ; then + if [ -f $LANGUAGE_PATH/${LANGUAGE}_load_photos ] ; then + . $LANGUAGE_PATH/${LANGUAGE}_load_photos + fi +fi + +# +# load personal settings +# + +if [ -f ~/.load_photos ] ; then + . ~/.load_photos +fi + + +# +# load arguments from command line +# +i=0 +IFS='\' +until [ -z "$1" ] +do + case $1 in + -h|--help) +cat <<-END + +USAGE + +$(basename $0) [--nodatedDirs][--noload][--nopath][--nocomment] + [--nocontrol][--noroot][--comment "Blah blah"] + [-zophImport_Option \"blah blah\"][-other-option][...] + + --nodatedDirs causes photos will be not filed by date + + --noload will only load photos presents in + /var/lib/zoph/incoming + + --nopath photos will be let in place + + --nocomment no comment in jpeg comment section + + --nocontrol photos will not be displayed, all photos + will be load + + --noroot photos will be displayed in a window instead + of root window (not it can be harmfull, + depending of your focus setting) + + --comment type your comment yourself, no question about + it will be dispalayed + + other options : all options of zophImport, + see zophImport manpage + +FILES + /usr/share/zoph/lang/lc_load_photos (lc is your language code) + ~/.load_photos : personal settings + + +END + exit 0 ;; + --datedDirs) DATEDIR="$1" + shift ;; + --nodatedDirs) NODATEDIRS=1 + shift ;; + --noload) NOLOAD=1 + shift ;; + --nopath) NOPATH=1 + shift ;; + --noroot) NOROOT=1 + shift ;; + --nocomment) DISABLE_COMMENT=1 + shift ;; + --comment) COMMENT="$2" + shift 2 ;; + --nocontrol) NOCONTROL=1 + shift ;; + --photographer) PHOTOGRAPHER=1 + OPTS[$i]="$1" + PHOTOGRAPHER_C="$2" + (( i += 1 )) + shift ;; + --category) OPTS[$i]="$1" + # fix quotes for mysql + CATEGORY_SANE=$( echo $2 | sed -e "s/'/\\\\'/g" ) + (( i += 1 )) + CATEGORY_FILLED="1" + shift ;; + --album) OPTS[$i]="$1" + ALBUM_SANE=$( echo $2 | sed -e "s/'/\\\\'/g" ) + (( i += 1 )) + ALBUM_FILLED="1" + shift ;; + --path) OPTS[$i]="$1" + OPTS[$(( i += 1 ))]="$2" + INDEX=$i + DIRECTORY="$2" + (( i += 1 )) + DIRECTORY_FILLED="1" + shift 2 ;; + + -*) OPTS[$i]="$1" ; (( i += 1 )) ; shift ;; + + *) #fix quotes to pass argument through "at", + #whish trigger off a shell + OPTS[$i]=$( echo "$1" | sed -e 's/\"/\\\"/g' ) + OPTS[$i]="\"${OPTS[$i]}\"" ; + (( i += 1 )) ; shift ;; + esac +done + + + +IFS=" +" +if [[ $DATEDIR == '' && $NODATEDIRS == '' ]];then +echo "$USE_DATEDIRS_MSG" +read i +echo ${i:=y} > /dev/null +if [[ $i == y ]]; then DATEDIR='--datedDirs'; fi +fi + +# +#Select album +# +if [[ $ALBUM_FILLED != 1 ]] ; then + k="0" + ALBUMS[$k]="INIT" + k=1 + while [[ ${ALBUMS[$(( k - 1 ))]} != '' ]];do + ALBUMS[$k]=$(echo "SELECT album FROM albums + WHERE album NOT IN ('Album Root') + LIMIT ${k},1" | + mysql -uzoph_rw -p$ZOPH_PASSWD $ZOPH_DB | + sed -e '1d;' + ) + (( k += 1 )) + done + ALBUMS[$(( k - 1))]=$OTHER + unset ALBUMS[0] + unset ALBUMS[$k] + + echo $ALBUM_MSG + select ALBUM in ${ALBUMS[@]} ; do + if [[ $ALBUM != '' ]]; then break; fi + done + ALBUM[1]=$ALBUM + if [[ ${ALBUM[1]} == $OTHER ]]; then + echo $ALBUM_TYPE_MSG + read ALBUM[1] + fi + + ALBUM[1]="\"$(echo ${ALBUM[1]} | sed -e 's/"/\\\"/g')\"" + ALBUM[0]="--album" + echo ${ALBUM[@]} +fi +unset k + +if [ -z "$ALBUM_SANE" ] ; then + ALBUM_SANE=$( echo ${ALBUM[1]} | sed -e "s/'/\\\\'/g;s/^\"//;s/\"$//;" ) +fi + + +#create album if not exists, and you have typed only one +if [[ $(echo $ALBUM_SANE | grep -E ',' -) == '' ]] ; then + EXIST_ALBUM=$(echo "SELECT album FROM albums WHERE album = '$ALBUM_SANE'" | + mysql -uzoph_rw $ZOPH_DB -p$ZOPH_PASSWD ) + + if [[ $EXIST_ALBUM == '' ]]; then + echo "Create album $ALBUM_SANE" + echo "INSERT INTO albums (album,parent_album_id) VALUES ('$ALBUM_SANE',1)" | + mysql -uzoph_rw $ZOPH_DB -p$ZOPH_PASSWD +fi +fi + +# +#select Category +# +if [[ $CATEGORY_FILLED != 1 ]] ; then + k="0" + CATEGORIES[$k]="INIT" + k=1 + while [[ ${CATEGORIES[$(( k - 1 ))]} != '' ]];do + CATEGORIES[$k]=$(echo "SELECT category FROM categories + LIMIT ${k},1" | + mysql -uzoph_rw -p$ZOPH_PASSWD $ZOPH_DB | + sed -e '1d;') + (( k += 1 )) + done + CATEGORIES[$(( k - 1))]=$OTHER + unset CATEGORIES[0] + unset CATEGORIES[$k] + + echo $CATEGORY_MSG + + select CATEGORY in "${CATEGORIES[@]}"; do + if [[ $CATEGORY != '' ]] ; then break ; fi + done + + CATEGORY[1]=$CATEGORY + if [[ ${CATEGORY[1]} == $OTHER ]] ; then + echo $CATEGORY_TYPE_MSG + read CATEGORY[1] + fi + + CATEGORY[1]="\"$(echo $CATEGORY | sed -e 's/"/\\\"/g')\"" + CATEGORY[0]="--category" + echo ${CATEGORY[@]} +fi +unset k +if [ -z "$CATEGORY_SANE" ] ; then + CATEGORY_SANE=$( echo ${CATEGORY[1]} | sed -e "s/'/\\\\'/g;s/^\"//;s/\"$//;" ) +fi + +#Create category if you have typed only one +if [[ $(echo $CATEGORY_SANE | grep -E ',' -) == '' ]] ; then + EXIST_CATEGORY=$(echo "SELECT category FROM categories + WHERE category = '$CATEGORY_SANE'" | + mysql -uzoph_rw $ZOPH_DB -p$ZOPH_PASSWD) + + if [[ $EXIST_CATEGORY == '' ]]; then + echo "Create Category $CATEGORY_SANE" + echo "INSERT INTO categories (category,parent_category_id) + VALUES ('$CATEGORY_SANE',1)" | mysql -uzoph_rw $ZOPH_DB -p$ZOPH_PASSWD + fi +fi + +cd $PHOTOS_ROOT + +# +#Fill directory name +# +if [[ $DIRECTORY_FILLED != 1 && $NOPATH != 1 ]]; then + FIND_CMD="find . -type d -group photo -perm -770 -o -type d -uid $UID" + DIRECTORIES="$( $FIND_CMD | sed -e 's/^\.\///; + s/.*mid//; + s/.*thumb//; + s/.*incoming.*//; + s/.*[0-9]\{1,4\}.[0-9]\{1,2\}.[0-9]\{1,2\}//; + s/^\.$//; + s/lost+found//;') $OTHER" + + echo $DIRECTORY_MSG + + select DIRECTORY in $DIRECTORIES; do + if [[ $DIRECTORY != '' ]] ; then break ; fi + done + DIRECTORY[1]=$DIRECTORY + if [[ ${DIRECTORY[1]} == $OTHER ]] ; then + # Ask directory name while it contains spaces + SANE=1 + while [[ $SANE != 0 ]]; do + echo $DIRECTORY_TYPE_MSG + read DIRECTORY[1] + if [[ $(echo ${DIRECTORY[1]} | grep -E '(\ |\t)' -) == '' ]] ; then + SANE=0 + else + echo $DIRECTORY_INSANE_MSG + fi + done + + fi + DIRECTORY[0]="--path" + echo ${DIRECTORY[@]} +elif [[ $NOPATH != 1 ]]; then + if [[ $(echo ${OPTS[$INDEX]} | grep -E '(\ |\t|\n)' -) == '' ]] ; then + SANE=1 + while [[ $SANE != 0 ]]; do + echo $DIRECTORY_TYPE_MSG + read OPTS[$INDEX] + if [[ $(echo ${OPTS[$INDEX]} | grep -E '(\ |\t|\n)' -) == '' ]] ; then + SANE=0 + DIRECTORY[1]=${OPTS[$INDEX]} + else + echo $DIRECTORY_INSANE_MSG + fi + done + fi + DIRECTORY[0]="--path" +fi + +#make directory +UMASK=$(umask) +umask 0002 +mkdir -p ${DIRECTORY[1]} +umask $UMASK + +# +#fill photographer name +# +if [[ $PHOTOGRAPHER != 1 ]];then + PHOTOGRAPHER_C="$( awk -F: {'print $3":"$5'} /etc/passwd | + grep -e "^$UID:" | + awk -F: '{ print $2 }' | + awk -F, '{ print $1 }' )" + PHOTOGRAPHER[1]="\"${PHOTOGRAPHER_C}\"" + PHOTOGRAPHER[0]="--photographer" +echo ${PHOTOGRAPHER[@]} +fi + +# +#fill comment +# +if [[ -z "$COMMENT" && -z "$DISABLE_COMMENT" ]] ; then + echo -ne $ADD_COMMENT_MSG "© ${PHOTOGRAPHER_C}, $(date +%Y) $DATE_OF_PHOTO_MSG\n" + read COMMENT + case $COMMENT in + d) COMMENT="© ${PHOTOGRAPHER_C}, $(date +%Y) " ;; + n|"") DISABLE_COMMENT=1 ;; + *) true ;; + esac +fi + +# +#copy and control photos, rotate if needed, edit if needed, unset --datedDirs if needed +# + +if [[ -z "$NOLOAD" ]] ; then + + #mount the camera + if [[ "$(mount | grep $MOUNT_POINT)" == '' ]]; then + mount $MOUNT_POINT || { echo "L'appareil n'est pas branché" && exit 1 ;} + fi + + FILES=$( find $MOUNT_POINT -type f -name '*.jpg' -o -name '*.JPG' ) + + i=0 + while [[ "$(ls -d incoming/$i 2>/dev/null)" == "incoming/$i" ]]; do + (( i += 1 )) + done + #create an incoming directory as needed + UMASK=$(umask) + umask 0002 + mkdir -p incoming/$i 2>/dev/null + umask $UMASK + DIRDEST=incoming/$i/ + #copy safely photos in incoming directory + o=0 + for j in $FILES ; do + SUFFIX=$(basename $j) + SUFFIX=${SUFFIX/[^.]*./.} + + l=(A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) + m=0 + for p in ${VERIFY[@]} ; do + q=$( basename $j ) + if [[ $p == $q ]] ; then + k=${DIRDEST}${q/${SUFFIX}/}${l[$m]}${n}$SUFFIX + (( m += 1 )) + if [[ $m == 25 ]] ; then + (( n += 1 )) + m=0 + fi + fi + done + VERIFY[$o]=$( basename $j ) + (( o += 1 )) + echo ${k:=${DIRDEST}} > /dev/null + echo -n . + cp $j $k + unset n + unset k + + done +echo -ne "\n" + + DIR=incoming/$i/ + + #umount the camera + umount $MOUNT_POINT +else + DIR="incoming/" +fi + + + +for j in $(ls $DIR) ; do + + if [ -x "$( which jhead )" ]; then + EXIFTAGDATE=$(jhead ${DIR}$j | + grep -E "Date/Time" | + awk -F: '{ print $2":"$3":"$4":"$5":"$6 }' | + sed -e 's/^[[:space:]]*//;s/[[:space:]]/-/g') + echo "$j - $DATE_MSG $EXIFTAGDATE" + if [ -z $EXIFTAGDATE ] ; then + echo "$NO_EXIF_DATE_MSG" ; DATEDIR='' + if [ -z $DISABLE_COMMENT ]; then + exiftran -ic "${COMMENT} $(date "+%Y:%m:%d-%T")" ${DIR}$j 2>/dev/null + fi + else + if [ -z "$DISABLE_COMMENT" ]; then + exiftran -ic "${COMMENT} $EXIFTAGDATE" ${DIR}$j 2>/dev/null + fi + fi + fi +done + + +# rename photos to be imported safely +for j in $(ls $DIR) ; do + + SUFFIX=$(basename $j) + SUFFIX=${SUFFIX/[^.]*./.} + + k=$j + l=(a b c d e f g h i j k l m n o p q r s t u v w x y z) + m=0 + DATE=$(jhead ${DIR}/${j} | grep "Date/Time" |\ + awk -F: '{print $2 "." $3 "." $4 }' | awk '{print $1}') + if [ -n $DATEDIR ]; then + echo -ne "${DATE}\t" + while [ -f ${DIRECTORY[1]}/${DATE}/$k ] ; do + mv ${DIR}/$k ${DIR}/${j/${SUFFIX}/}${l[$m]}${n}$SUFFIX + k=${j/.jpg/}${l[$m]}$n.jpg + (( m += 1 )) + if [[ $m == 25 ]] ; then + (( n += 1 )) + m=0 + fi + + done + j=$k + else + while [ -f ${DIRECTORY[1]}/$k ] ; do + mv ${DIR}$k ${DIR}${j/${SUFFIX}/}${l[$m]}${n}$SUFFIX + k=${j/.jpg/}${l[$m]}.jpg + (( m += 1 )) + if [[ $m == 25 ]] ; then + (( n += 1 )) + m=0 + fi + + done + j=$k + fi + unset n + +#display, rotate, edit photo + if [ -z "$NOCONTROL" ] ; then + if [[ $NOROOT == 1 ]] ; then + qiv -w 400 -scale_down -e $DIR/$j & + else + qiv -x -m $DIR/$j + fi + echo $j + echo $KEEP_MSG + unset KEEP + read KEEP + echo ${KEEP:=y} >/dev/null + if [[ $KEEP == 'n' ]]; then + rm ${DIR}$j + killall qiv 2>/dev/null + else + + echo $ROTATE_MSG + unset ROTATE + read ROTATE + killall qiv 2>/dev/null + echo ${ROTATE:=n} > /dev/null + if [[ $ROTATE == 'y' ]]; then + exiftran -ip2 ${DIR}$j 2>/dev/null + if [[ $NOROOT == 1 ]] ; then + qiv -w 400 -scale_down -e $DIR/$j & + else + qiv -x -m $DIR/$j + fi + fi + echo $EDIT_MSG + unset EDIT + read EDIT + killall qiv 2>/dev/null + echo ${EDIT:=n} > /dev/null + if [[ $EDIT != n ]] ; then + cp ${DIR}$j ${DIR}${j}.save + $PHOTO_EDITOR ${DIR}$j + jhead -te ${DIR}${j}.save ${DIR}$j + rm ${DIR}${j}.save + fi + fi + fi + +done + + +# +# execute zophImport via "at", to let the user quit immediately +# +if [[ -n $(ls ${PHOTOS_ROOT}/${DIR}) ]] ; then +IFS='\' +echo umask 0002 \; \ +echo -n $MAIL \; \ +zophImport "${OPTS[@]} ${ALBUM[@]} ${CATEGORY[@]} ${DIRECTORY[@]} ${PHOTOGRAPHER[@]}" \ + $DATEDIR ${PHOTOS_ROOT}/${DIR}* \; \ +if [ -d ${PHOTOS_ROOT}/${DIR}.xvpics ] \; then \ +rm -r ${PHOTOS_ROOT}/${DIR}.xvpics \; \ +fi \; \ +if [ "$DIR" != "incoming/" ] \; then \ +rmdir ${PHOTOS_ROOT}/$DIR \; \ +fi \; \ +echo $MAIL2 | +at now + 1 minutes 2>/dev/null +IFS=' +' +# +# display work message +# +clear +echo -n $WORK +atq +echo -e $MAIL_MSG + +else + echo $NO_PHOTO_MSG +fi --- zoph-0.8.0.1.orig/debian/contrib/load_photos/en_load_photos +++ zoph-0.8.0.1/debian/contrib/load_photos/en_load_photos @@ -0,0 +1,24 @@ +# Set to your language... +OTHER='Other' +ALBUM_MSG="Select album" +ALBUM_TYPE_MSG="Type the name of the album" +CATEGORY_MSG="Select category" +CATEGORY_TYPE_MSG="Type the name of the category" +DIRECTORY_MSG="Select directory" +DIRECTORY_TYPE_MSG="Type the name of directory" +DIRECTORY_INSANE_MSG="Cannot create directory with spaces." +USE_DATEDIRS_MSG="file photos by date ? [Y/n]" +ROTATE_MSG="rotate ? [y/N]" +KEEP_MSG="keep ? [Y/n]" +WORK="job " +MAIL_MSG="A message will be sent to you as work will be finished:\n1dot per photo\nDO NOT SWITCH OFF COMPUTER BEFORE HAVE RECEIPT THE MESSAGE" +MAIL="Message from load_photos: " +MAIL2="Photos loaded!" +NO_EXIF_DATE_MSG="No date information in exif tags,\ +images will be not file by date." +DATE_MSG="date:" +ADD_COMMENT_MSG="Would you add a comment? [N/d=>default/comment]\\nDefault : " +DATE_OF_PHOTO_MSG="(photo date)" +EDIT_MSG="Tidy photo ?" + + --- zoph-0.8.0.1.orig/debian/contrib/load_photos/copyright +++ zoph-0.8.0.1/debian/contrib/load_photos/copyright @@ -0,0 +1,16 @@ +Added to the zoph package by Edelhard Becker +on Tue, 09 Aug 2005 16:07:46 +0200 + +It was downloaded from http://tom.harding.free.fr/downloads/ + +Upstream Author: Thomas Harding + +Copyright: Thomas Harding + + 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; version 2 dated June, 1991. + +On Debian GNU/Linux systems, the complete text of the GNU General Public +License can be found in the `/usr/share/common-licenses' directory. + --- zoph-0.8.0.1.orig/debian/contrib/load_photos/_README +++ zoph-0.8.0.1/debian/contrib/load_photos/_README @@ -0,0 +1,17 @@ + load_photos is a bash interactive front-end to zophImport, the photo + loader of zoph, web based photos album. + + + It permit to everyone to load photos in the family album, as so as + to use all zophImport options. + + load_photos use qiv to display images, exiftran to fix them as portrait, + jhead to extract and keep exif informations, gimp to tidy photos, + at to make in backround the (so) long importation work. + + load_photos is I10n (Internationalized) in, at time, + (I think bad) English and French. + + syntax: load_photos --help + + installation: see INSTALL --- zoph-0.8.0.1.orig/debian/contrib/load_photos/index.html +++ zoph-0.8.0.1/debian/contrib/load_photos/index.html @@ -0,0 +1,43 @@ + + + + Index of /downloads/load_photos + + +

Index of /downloads/load_photos

+
      Name                    Last modified       Size  Description
+

+[DIR] Parent Directory        15-Aug-2005 14:32      -  
+[   ] CHANGES                 15-Aug-2005 22:10     1k  
+[   ] INSTALL                 15-Aug-2005 22:20     1k  
+[   ] LICENSE                 15-Aug-2005 13:58    18k  
+[   ] Makefile                15-Aug-2005 22:20     1k  
+[   ] _README                 15-Aug-2005 13:58     1k  
+[TXT] addgrpphoto.sh          15-Aug-2005 22:10     1k  
+[   ] en_load_photos          15-Aug-2005 13:58     1k  
+[   ] fr_load_photos          15-Aug-2005 22:35     1k  
+[   ] load_photos             15-Aug-2005 23:39    14k  
+[   ] load_photos_V1.4        15-Aug-2005 13:58    11k  
+[   ] load_photos_V1.5        15-Aug-2005 13:58    12k  
+[   ] load_photos_V1.6        15-Aug-2005 23:39    14k  
+
+
+	load_photos is a bash interactive front-end to zophImport, the photo
+	loader of zoph, web based photos album.
+	<URL:http://zoph.sourceforge.net/demo/zoph.php>
+	
+	It permit to everyone to load photos in the family album, as so as
+	to use all zophImport options.
+	
+	load_photos use qiv to display images, exiftran to fix them as portrait,
+	jhead to extract and keep exif informations, gimp to tidy photos,
+	at to make in backround the (so) long importation work.
+
+	load_photos is I10n (Internationalized) in, at time, 
+	(I think bad) English and French.
+
+	syntax: load_photos --help
+	
+	installation: see INSTALL
+
+ --- zoph-0.8.0.1.orig/debian/contrib/load_photos/Makefile +++ zoph-0.8.0.1/debian/contrib/load_photos/Makefile @@ -0,0 +1,17 @@ + +all: + echo -e "targets:\n\tinstall\n\taddgrpphoto" + +install: + cp load_photos /usr/local/bin/ + chmod 755 /usr/local/bin/load_photos + cp {en,fr}_load_photos /usr/share/zoph/lang/ + mkdir /var/lib/zoph/incoming + groupadd photo + chgrp photo /var/lib/zoph + chmod g+sw /var/lib/zoph + groupmod -G photo www-data + +addgrpphoto: + chmod +x addgrpphoto.sh + ./addgrpphoto.sh --- zoph-0.8.0.1.orig/debian/contrib/load_photos/fr_load_photos +++ zoph-0.8.0.1/debian/contrib/load_photos/fr_load_photos @@ -0,0 +1,23 @@ +# Set to your language... +OTHER='Autre' +ALBUM_MSG="Sélectionnez l'album" +ALBUM_TYPE_MSG="Tapez le nom de l'album" +CATEGORY_MSG="Sélectionnez la catégorie" +CATEGORY_TYPE_MSG="Tapez le nom de la catégorie" +DIRECTORY_MSG="Sélectionnez le répertoire" +DIRECTORY_TYPE_MSG="Tapez le nom du répertoire" +DIRECTORY_INSANE_MSG="Refus de créer un répertoire avec des espaces." +USE_DATEDIRS_MSG="Classer les photos par date ?[Y/n]" +ROTATE_MSG="Passer en portrait ?[y/N]" +KEEP_MSG="Conserver ?[Y/n]" +WORK="travail " +MAIL_MSG="Un message sera envoyé à la fin du travail :\n un point par photo\nNE COUPEZ PAS L'ORDINATEUR AVANT D'AVOIR RECU LE MESSAGE" +MAIL="message de charge_photos : " +MAIL2="Photos chargées !" +NO_EXIF_DATE_MSG="Pas d'information de date dans les champs exif,\ +les images ne seront pas classées par date." +DATE_MSG="date :" +ADD_COMMENT_MSG="Voulez-vous ajouter un commentaire ?[N/d=>defaut/commentaire]\\nDéfaut : " +DATE_OF_PHOTO_MSG="(date de la photo)" +EDIT_MSG="Retoucher la photo?" +NO_PHOTO_MSG="Il n'y a pas de photos à charger" --- zoph-0.8.0.1.orig/php/logon.php +++ zoph-0.8.0.1/php/logon.php @@ -15,7 +15,7 @@ * along with Zoph; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - require_once("config.inc.php"); + require_once("/etc/zoph/config.inc.php"); require_once("variables.inc.php"); require_once("util.inc.php"); --- zoph-0.8.0.1.orig/php/css.php +++ zoph-0.8.0.1/php/css.php @@ -18,7 +18,7 @@ header("Content-Type: text/css"); if(isset($_GET['logged_on'])) { - require_once("config.inc.php"); + require_once("/etc/zoph/config.inc.php"); require_once("zoph_table.inc.php"); require_once("user.inc.php"); echo "/* This is the default CSS, the user is not logged on */"; --- zoph-0.8.0.1.orig/php/util.inc.php +++ zoph-0.8.0.1/php/util.inc.php @@ -657,7 +657,7 @@ } } -function watermark_image($orig, $watermark, $positionX = "center", $positionY = "center", $transparency = 50) { +function watermark_image(&$orig, $watermark, $positionX = "center", $positionY = "center", $transparency = 50) { $wm=imagecreatefromgif($watermark); --- zoph-0.8.0.1.orig/php/code.inc.php +++ zoph-0.8.0.1/php/code.inc.php @@ -23,7 +23,7 @@ var $find; var $replace; - function replace($replaces, $find, $replace) { + function replace(&$replaces, $find, $replace) { $this->find=$find; $this->replace=$replace; array_push($replaces, $this); @@ -33,7 +33,7 @@ var $smiley; var $file; var $description; - function smiley($smileys, $smiley, $file, $description) { + function smiley(&$smileys, $smiley, $file, $description) { $this->smiley=$smiley; $this->file=$file; $this->description=$description; @@ -52,7 +52,7 @@ var $close=true; // True if this tags needs closure, // false if it does not - function tag($tags, $find, $replace, $regexp = null, $param = null,$close=true) { + function tag(&$tags, $find, $replace, $regexp = null, $param = null,$close=true) { $this->find=$find; $this->replace=$replace; $this->regexp=$regexp; @@ -253,48 +253,48 @@ function get_smileys_array() { $smileys=array(); - new smiley(&$smileys, ":D", "icon_biggrin.gif","Very Happy"); - new smiley(&$smileys, ":-D", "icon_biggrin.gif","Very Happy"); - new smiley(&$smileys, ":grin:", "icon_biggrin.gif","Very Happy"); - new smiley(&$smileys, ":)", "icon_smile.gif","Smile"); - new smiley(&$smileys, ":-)", "icon_smile.gif","Smile"); - new smiley(&$smileys, ":smile:", "icon_smile.gif","Smile"); - new smiley(&$smileys, ":(", "icon_sad.gif","Sad"); - new smiley(&$smileys, ":-(", "icon_sad.gif","Sad"); - new smiley(&$smileys, ":sad:", "icon_sad.gif","Sad"); - new smiley(&$smileys, ":o", "icon_surprised.gif","Surprised"); - new smiley(&$smileys, ":-o", "icon_surprised.gif","Surprised"); - new smiley(&$smileys, ":eek:", "icon_surprised.gif","Surprised"); - new smiley(&$smileys, ":shock:", "icon_eek.gif","Shocked"); - new smiley(&$smileys, ":?", "icon_confused.gif","Confused"); - new smiley(&$smileys, ":-?", "icon_confused.gif","Confused"); - new smiley(&$smileys, ":???:", "icon_confused.gif","Confused"); - new smiley(&$smileys, "8)", "icon_cool.gif","Cool"); - new smiley(&$smileys, "8-)", "icon_cool.gif","Cool"); - new smiley(&$smileys, ":cool:", "icon_cool.gif","Cool"); - new smiley(&$smileys, ":lol:", "icon_lol.gif","Laughing"); - new smiley(&$smileys, ":x", "icon_mad.gif","Mad"); - new smiley(&$smileys, ":-x", "icon_mad.gif","Mad"); - new smiley(&$smileys, ":mad:", "icon_mad.gif","Mad"); - new smiley(&$smileys, ":P", "icon_razz.gif","Razz"); - new smiley(&$smileys, ":-P", "icon_razz.gif","Razz"); - new smiley(&$smileys, ":razz:", "icon_razz.gif","Razz"); - new smiley(&$smileys, ":oops:", "icon_redface.gif","Embarassed"); - new smiley(&$smileys, ":cry:", "icon_cry.gif","Crying or Very sad"); - new smiley(&$smileys, ":evil:", "icon_evil.gif","Evil or Very Mad"); - new smiley(&$smileys, ":twisted:", "icon_twisted.gif","Twisted Evil"); - new smiley(&$smileys, ":roll:", "icon_rolleyes.gif","Rolling Eyes"); - new smiley(&$smileys, ":wink:", "icon_wink.gif","Wink"); - new smiley(&$smileys, ";)", "icon_wink.gif","Wink"); - new smiley(&$smileys, ";-)", "icon_wink.gif","Wink"); - new smiley(&$smileys, ":!:", "icon_exclaim.gif","Exclamation"); - new smiley(&$smileys, ":?:", "icon_question.gif","Question"); - new smiley(&$smileys, ":idea:", "icon_idea.gif","Idea"); - new smiley(&$smileys, ":arrow:", "icon_arrow.gif","Arrow"); - new smiley(&$smileys, ":|", "icon_neutral.gif","Neutral"); - new smiley(&$smileys, ":-|", "icon_neutral.gif","Neutral"); - new smiley(&$smileys, ":neutral:", "icon_neutral.gif","Neutral"); - new smiley(&$smileys, ":mrgreen:", "icon_mrgreen.gif","Mr. Green"); + new smiley($smileys, ":D", "icon_biggrin.gif","Very Happy"); + new smiley($smileys, ":-D", "icon_biggrin.gif","Very Happy"); + new smiley($smileys, ":grin:", "icon_biggrin.gif","Very Happy"); + new smiley($smileys, ":)", "icon_smile.gif","Smile"); + new smiley($smileys, ":-)", "icon_smile.gif","Smile"); + new smiley($smileys, ":smile:", "icon_smile.gif","Smile"); + new smiley($smileys, ":(", "icon_sad.gif","Sad"); + new smiley($smileys, ":-(", "icon_sad.gif","Sad"); + new smiley($smileys, ":sad:", "icon_sad.gif","Sad"); + new smiley($smileys, ":o", "icon_surprised.gif","Surprised"); + new smiley($smileys, ":-o", "icon_surprised.gif","Surprised"); + new smiley($smileys, ":eek:", "icon_surprised.gif","Surprised"); + new smiley($smileys, ":shock:", "icon_eek.gif","Shocked"); + new smiley($smileys, ":?", "icon_confused.gif","Confused"); + new smiley($smileys, ":-?", "icon_confused.gif","Confused"); + new smiley($smileys, ":???:", "icon_confused.gif","Confused"); + new smiley($smileys, "8)", "icon_cool.gif","Cool"); + new smiley($smileys, "8-)", "icon_cool.gif","Cool"); + new smiley($smileys, ":cool:", "icon_cool.gif","Cool"); + new smiley($smileys, ":lol:", "icon_lol.gif","Laughing"); + new smiley($smileys, ":x", "icon_mad.gif","Mad"); + new smiley($smileys, ":-x", "icon_mad.gif","Mad"); + new smiley($smileys, ":mad:", "icon_mad.gif","Mad"); + new smiley($smileys, ":P", "icon_razz.gif","Razz"); + new smiley($smileys, ":-P", "icon_razz.gif","Razz"); + new smiley($smileys, ":razz:", "icon_razz.gif","Razz"); + new smiley($smileys, ":oops:", "icon_redface.gif","Embarassed"); + new smiley($smileys, ":cry:", "icon_cry.gif","Crying or Very sad"); + new smiley($smileys, ":evil:", "icon_evil.gif","Evil or Very Mad"); + new smiley($smileys, ":twisted:", "icon_twisted.gif","Twisted Evil"); + new smiley($smileys, ":roll:", "icon_rolleyes.gif","Rolling Eyes"); + new smiley($smileys, ":wink:", "icon_wink.gif","Wink"); + new smiley($smileys, ";)", "icon_wink.gif","Wink"); + new smiley($smileys, ";-)", "icon_wink.gif","Wink"); + new smiley($smileys, ":!:", "icon_exclaim.gif","Exclamation"); + new smiley($smileys, ":?:", "icon_question.gif","Question"); + new smiley($smileys, ":idea:", "icon_idea.gif","Idea"); + new smiley($smileys, ":arrow:", "icon_arrow.gif","Arrow"); + new smiley($smileys, ":|", "icon_neutral.gif","Neutral"); + new smiley($smileys, ":-|", "icon_neutral.gif","Neutral"); + new smiley($smileys, ":neutral:", "icon_neutral.gif","Neutral"); + new smiley($smileys, ":mrgreen:", "icon_mrgreen.gif","Mr. Green"); return $smileys; } @@ -302,34 +302,34 @@ // Watch the order of these... putting & at the end of the array // will make you end up with things like "&lt;"... $replaces=array(); - new replace(&$replaces, "(", "("); # Needed to revert anti - new replace(&$replaces, ")", ")"); # SQL injection-code - new replace(&$replaces, "&", "&"); - new replace(&$replaces, "<", "<"); - new replace(&$replaces, ">", ">"); - new replace(&$replaces, "\n", "
"); + new replace($replaces, "(", "("); # Needed to revert anti + new replace($replaces, ")", ")"); # SQL injection-code + new replace($replaces, "&", "&"); + new replace($replaces, "<", "<"); + new replace($replaces, ">", ">"); + new replace($replaces, "\n", "
"); return $replaces; } function get_tags_array() { $tags=array(); - new tag(&$tags, "b", "b"); - new tag(&$tags, "i", "i"); - new tag(&$tags, "u", "u"); - new tag(&$tags, "h1", "h1"); - new tag(&$tags, "h2", "h2"); - new tag(&$tags, "h3", "h3"); - new tag(&$tags, "color", "span", "", "style=\"color: [param];\""); - new tag(&$tags, "font", "span", "", "style=\"font-family: [param];\""); - new tag(&$tags, "br", "br", null, null, false); - new tag(&$tags, "background", "div", "", "class='background' style=\"background: [param];\""); - new tag(&$tags, "photo", "a", "", "href=\"photo.php?photo_id=[param]\""); - new tag(&$tags, "album", "a", "", "href=\"album.php?album_id=[param]\""); - new tag(&$tags, "person", "a", "", "href=\"people.php?person_id=[param]\""); - new tag(&$tags, "cat", "a", "", "href=\"category.php?category_id=[param]\""); - new tag(&$tags, "link", "a", "", "href=\"[param]\""); - new tag(&$tags, "place", "a", "", "href=\"places.php?parent_place_id=[param]\""); - new tag(&$tags, "thumb", "img", "", "src=\"image_service.php?photo_id=[param]&type=thumb\"", false); - new tag(&$tags, "mid", "img", "", "src=\"image_service.php?photo_id=[param]&type=mid\"", false); + new tag($tags, "b", "b"); + new tag($tags, "i", "i"); + new tag($tags, "u", "u"); + new tag($tags, "h1", "h1"); + new tag($tags, "h2", "h2"); + new tag($tags, "h3", "h3"); + new tag($tags, "color", "span", "", "style=\"color: [param];\""); + new tag($tags, "font", "span", "", "style=\"font-family: [param];\""); + new tag($tags, "br", "br", null, null, false); + new tag($tags, "background", "div", "", "class='background' style=\"background: [param];\""); + new tag($tags, "photo", "a", "", "href=\"photo.php?photo_id=[param]\""); + new tag($tags, "album", "a", "", "href=\"album.php?album_id=[param]\""); + new tag($tags, "person", "a", "", "href=\"people.php?person_id=[param]\""); + new tag($tags, "cat", "a", "", "href=\"category.php?category_id=[param]\""); + new tag($tags, "link", "a", "", "href=\"[param]\""); + new tag($tags, "place", "a", "", "href=\"places.php?parent_place_id=[param]\""); + new tag($tags, "thumb", "img", "", "src=\"image_service.php?photo_id=[param]&type=thumb\"", false); + new tag($tags, "mid", "img", "", "src=\"image_service.php?photo_id=[param]&type=mid\"", false); return $tags; } --- zoph-0.8.0.1.orig/php/config.inc.php +++ zoph-0.8.0.1/php/config.inc.php @@ -21,7 +21,7 @@ define('DB_HOST', 'localhost'); define('DB_NAME', 'zoph'); define('DB_USER', 'zoph_rw'); - define('DB_PASS', 'pass'); + define('DB_PASS', 'zoph_rw'); define('DB_PREFIX', 'zoph_'); // prefix for tables, '' for none // Define how Zoph looks by choosing a stylesheet and iconset. @@ -29,7 +29,7 @@ define('ICONSET', 'default'); define('USE_IMAGE_SERVICE', 1); - define('IMAGE_DIR', "/data/images/"); + define('IMAGE_DIR', "/var/lib/zoph/"); // Only needed when imaga service is off: // define('WEB_IMAGE_DIR', "/images/"); // from webserver doc root @@ -135,10 +135,10 @@ define('MAX_UPLOAD', 10000000); // commands to use to expand uploaded archives. set to 0 to disable. - define('UNZIP_CMD', 0); - //define('UNZIP_CMD', 'unzip'); - define('UNTAR_CMD', 0); - //define('UNTAR_CMD', 'tar xvf'); + //define('UNZIP_CMD', 0); + define('UNZIP_CMD', 'unzip'); + //define('UNTAR_CMD', 0); + define('UNTAR_CMD', 'tar xvf'); // Enable downloading of a set of photos in a ZIP file. // Warning: the downloaded photos are NOT watermarked. @@ -178,7 +178,7 @@ // Maximum number of people that can be added to a photo at once. // Each user can set his own preference through the pref screen, with // The number below as max. - define('MAX_PEOPLE_SLOTS', 1); + define('MAX_PEOPLE_SLOTS', 10); define('THUMB_SIZE', 120); define('MID_SIZE', 480); --- zoph-0.8.0.1.orig/php/admin.inc.php +++ zoph-0.8.0.1/php/admin.inc.php @@ -24,7 +24,7 @@ var $desc; var $icon; - function admin($adminpage, $name, $desc, $url, $icon) { + function admin(&$adminpage, $name, $desc, $url, $icon) { $this->name=$name; $this->url=$url; $this->desc=$desc; @@ -56,9 +56,9 @@ function get_admin_array() { $adminpage=array(); - new admin(&$adminpage, "users", "create or modify user accounts", "users.php", "users.png"); - new admin(&$adminpage, "groups", "create or modify user groups", "groups.php", "groups.png"); - new admin(&$adminpage, "pages", "create or modify zoph pages", "pages.php", "pages.png"); - new admin(&$adminpage, "pagesets", "create or modify pagesets", "pagesets.php", "pagesets.png"); + new admin($adminpage, "users", "create or modify user accounts", "users.php", "users.png"); + new admin($adminpage, "groups", "create or modify user groups", "groups.php", "groups.png"); + new admin($adminpage, "pages", "create or modify zoph pages", "pages.php", "pages.png"); + new admin($adminpage, "pagesets", "create or modify pagesets", "pagesets.php", "pagesets.png"); return $adminpage; } --- zoph-0.8.0.1.orig/php/image_service.php +++ zoph-0.8.0.1/php/image_service.php @@ -49,7 +49,7 @@ if (WATERMARKING && $watermark_file && !$type) { $image_path .= $name; $image=imagecreatefromjpeg($image_path); - watermark_image(&$image, $watermark_file, WM_POSX, WM_POSY, WM_TRANS); + watermark_image($image, $watermark_file, WM_POSX, WM_POSY, WM_TRANS); header("Content-type: image/jpeg"); imagejpeg($image); imagedestroy($image); --- zoph-0.8.0.1.orig/php/include.inc.php +++ zoph-0.8.0.1/php/include.inc.php @@ -18,7 +18,7 @@ require_once("variables.inc.php"); - require_once("config.inc.php"); + require_once("/etc/zoph/config.inc.php"); require_once("util.inc.php"); require_once("validator.inc.php"); --- zoph-0.8.0.1.orig/contrib/zoph-0.3.3.postgres.diff +++ zoph-0.8.0.1/contrib/zoph-0.3.3.postgres.diff @@ -0,0 +1,1814 @@ +diff -Nru zoph-0.3.3/INSTALL zoph.new/INSTALL +--- zoph-0.3.3/INSTALL 2002-12-13 23:05:49.000000000 +0000 ++++ zoph.new/INSTALL 2003-07-17 22:04:44.000000000 +0100 +@@ -6,7 +6,7 @@ + The following need to be installed before Zoph will function. For + details on installing these, read the REQUIREMENTS document. + +- - MySQL 3.23 ++ - MySQL 3.23 or PostgreSQL + - Apache + - PHP 4 + - Perl 5 +@@ -21,8 +21,15 @@ + + 2.1 Create a database and import the tables + ++ Mysql: ++ + $ mysqladmin -u root -p create zoph +- $ mysql -u root -p zoph < sql/zoph.sql ++ $ mysql -u root -p zoph < sql/mysql/zoph.sql ++ ++ PostgresSQL: ++ $ createdb zoph ++ $ psql zoph < /usr/share/postgresql/contrib/pgcrypto.sql ++ $ psql zoph < sql/posgres/zoph.sql + + 2.2 Create users for zoph + +@@ -30,11 +37,17 @@ + zoph_admin is used when I work directly in mysql so I don't + have to use root. + ++ MySQL: ++ + $ mysql -u root -p + mysql> grant select, insert, update, delete on zoph.* to zoph_rw@localhost identified by 'PASSWORD'; + + mysql> grant all on zoph.* to zoph_admin identified by 'PASSWORD'; + ++ PostgreSQL: ++ ++ users should have been granted rights by the import. ++ + 3. Configure the PHP templates + + The values to be configured are in the php/config.inc.php file. +@@ -45,6 +58,10 @@ + - DB_NAME : zoph (unless you used something else above) + - DB_USER : zoph_rw, using the above example + - DB_PASS : the password you set ++ - DB_TYPE : type of database, currently: 'mysql' or 'postgres' ++ ++ - USE_MYSQL_PASSWORD : set this to use password() function of MySQL, otherwise ++ zoph will use an md5 hash for the password + + - USE_IMAGE_SERVICE : see the section on the image service below. + the default is no (0). +diff -Nru zoph-0.3.3/php/album.inc.php zoph.new/php/album.inc.php +--- zoph-0.3.3/php/album.inc.php 2002-12-10 21:30:48.000000000 +0000 ++++ zoph.new/php/album.inc.php 2003-07-17 19:45:13.000000000 +0100 +@@ -202,18 +202,18 @@ + "where ap.user_id = '" . escape_string($user->get("user_id")) . + "' and ap.album_id = pa.album_id" . + " and pa.album_id = al.album_id " . +- "group by al.album_id " . ++ "group by al.album_id,al.parent_album_id,al.album,al.album_description " . + "order by count desc, al.album " . +- "limit 0, $TOP_N"; ++ "limit $TOP_N"; + } + else { + $sql = + "select al.*, count(*) as count " . + "from albums as al, photo_albums as pa " . + "where pa.album_id = al.album_id " . +- "group by al.album_id " . ++ "group by al.album_id,al.parent_album_id,al.album,al.album_description " . + "order by count desc, al.album " . +- "limit 0, $TOP_N"; ++ "limit $TOP_N"; + } + + return get_popular_results("album", $sql); +diff -Nru zoph-0.3.3/php/auth.inc.php zoph.new/php/auth.inc.php +--- zoph-0.3.3/php/auth.inc.php 2002-12-10 21:30:48.000000000 +0000 ++++ zoph.new/php/auth.inc.php 2003-07-17 21:48:06.000000000 +0100 +@@ -9,10 +9,8 @@ + + $_action = getvar("_action"); + +- mysql_pconnect(DB_HOST, DB_USER, DB_PASS) +- or die("Unable to connect to MySQL"); +- mysql_select_db(DB_NAME) +- or die("Unable to select database"); ++ zophdb_pconnect(DB_NAME, DB_HOST, DB_USER, DB_PASS) ++ or die("Unable to connect to the Database"); + + if (minimum_version('4.1.0')) { + $user = $_SESSION['user']; +@@ -25,14 +23,14 @@ + $pword = getvar("pword"); + + $query = +- "select user_id from users where user_name = '" . +- escape_string($uname) . "' and " . +- "password = password('" . escape_string($pword) . "')"; ++ "select user_id from users where user_name = '" . ++ escape_string($uname) . "' and "; ++ $query .= zophdb_password($pword); + +- $result = mysql_query($query); ++ $result = zophdb_query($query); + +- if(mysql_num_rows($result) == 1) { +- $row = mysql_fetch_array($result); ++ if(zophdb_num_rows($result) == 1) { ++ $row = zophdb_fetch_array($result); + + $user = new user($row["user_id"]); + } +diff -Nru zoph-0.3.3/php/category.inc.php zoph.new/php/category.inc.php +--- zoph-0.3.3/php/category.inc.php 2002-12-10 21:30:48.000000000 +0000 ++++ zoph.new/php/category.inc.php 2003-07-17 19:45:30.000000000 +0100 +@@ -140,16 +140,16 @@ + " and pc.category_id = cat.category_id " . + "group by cat.category_id " . + "order by count desc, cat.category " . +- "limit 0, $TOP_N"; ++ "limit $TOP_N"; + } + else { + $sql = + "select cat.*, count(*) as count " . + "from categories as cat, photo_categories as pc " . + "where pc.category_id = cat.category_id " . +- "group by cat.category_id " . ++ "group by cat.category_id,cat.parent_category_id,cat.category,cat.category_description " . + "order by count desc, cat.category " . +- "limit 0, $TOP_N"; ++ "limit $TOP_N"; + } + + return get_popular_results("category", $sql); +diff -Nru zoph-0.3.3/php/config.inc.php zoph.new/php/config.inc.php +--- zoph-0.3.3/php/config.inc.php 2003-06-10 22:28:32.000000000 +0100 ++++ zoph.new/php/config.inc.php 2003-07-17 19:30:35.000000000 +0100 +@@ -1,6 +1,7 @@ + ".$tmp_name."
\n"; + $file = IMAGE_DIR . $path . '/' . $name; +- ++print_r($HTTP_POST_FILES); + if (move_uploaded_file($tmp_name, $file)) { + echo translate("Received file") . ": $file
\n"; + +@@ -246,7 +247,7 @@ + + $cmd = 'cd ' . escapeshellarg($tmp_path) . ' && ' . + $expand . ' ' . escapeshellarg($file) . ' 2>&1'; +- //echo "$cmd
\n"; ++ echo "$cmd
\n"; + + echo "

\n

\n";
+                     system($cmd);
+diff -Nru zoph-0.3.3/php/include.inc.php zoph.new/php/include.inc.php
+--- zoph-0.3.3/php/include.inc.php	2002-12-10 21:30:49.000000000 +0000
++++ zoph.new/php/include.inc.php	2003-07-17 21:05:24.000000000 +0100
+@@ -6,6 +6,15 @@
+ 
+     require_once("rtplang.class.php");
+ 
++    switch (DB_TYPE) {
++	case 'postgres':
++	  require_once("zophdb.postgres.inc.php");
++		break;
++	case 'mysql':
++		require_once("zophdb.mysql.inc.php");
++		break;
++	}
++
+     require_once("zoph_table.inc.php");
+     require_once("zoph_tree_table.inc.php");
+ 
+diff -Nru zoph-0.3.3/php/person.inc.php zoph.new/php/person.inc.php
+--- zoph-0.3.3/php/person.inc.php	2002-12-10 21:30:49.000000000 +0000
++++ zoph.new/php/person.inc.php	2003-07-17 19:45:44.000000000 +0100
+@@ -236,16 +236,16 @@
+             " and pp.person_id = ppl.person_id " .
+             "group by ppl.person_id " .
+             "order by count desc, ppl.last_name, ppl.first_name " .
+-            "limit 0, $TOP_N";
++            "limit $TOP_N";
+     }
+     else {
+         $sql =
+-            "select ppl.*, count(*) as count " .
++            "select ppl.person_id,ppl.first_name,ppl.last_name, count(*) as count " .
+             "from people as ppl, photo_people as pp " .
+             "where ppl.person_id = pp.person_id " .
+-            "group by ppl.person_id " .
++            "group by ppl.person_id,ppl.first_name,ppl.last_name " .
+             "order by count desc, ppl.last_name, ppl.first_name " .
+-            "limit 0, $TOP_N";
++            "limit $TOP_N";
+     }
+ 
+     return get_popular_results("person", $sql);
+diff -Nru zoph-0.3.3/php/photo.inc.php zoph.new/php/photo.inc.php
+--- zoph-0.3.3/php/photo.inc.php	2002-12-10 21:30:49.000000000 +0000
++++ zoph.new/php/photo.inc.php	2003-07-17 19:45:58.000000000 +0100
+@@ -27,7 +27,7 @@
+                 " and pa.album_id = ap.album_id" .
+                 " and ap.user_id = '" . escape_string($user->get("user_id")) . "'" .
+                 " and ap.access_level >= p.level " .
+-                "limit 0, 1";
++                "limit 1";
+         }
+         else {
+             $sql =
+@@ -378,11 +378,11 @@
+ 
+     if (DEBUG) { echo "$query
\n"; }
+ 
+-    $result = mysql_query($query)
+-        or die_with_mysql_error("Rating grouping failed");
++    $result = zophdb_query($query)
++        or die_with_zophdb_error("Rating grouping failed");
+ 
+     $max_count = 0;
+-    while ($row = mysql_fetch_array($result)) {
++    while ($row = zophdb_fetch_array($result)) {
+         if ($row[0]) { $rating = $row[0]; }
+         else { $rating = "null"; }
+ 
+diff -Nru zoph-0.3.3/php/photo_search.inc.php zoph.new/php/photo_search.inc.php
+--- zoph-0.3.3/php/photo_search.inc.php	2002-12-10 21:30:50.000000000 +0000
++++ zoph.new/php/photo_search.inc.php	2003-07-17 19:50:17.000000000 +0100
+@@ -30,9 +30,11 @@
+         $order = "ph." . $vars["_order"] . " $dir";
+         if ($order == "ph.date") { $order .= ", ph.time $dir"; }
+         $order .= ", ph.photo_id $dir";
++	$select .= ", ph.".$vars["_order"];
+     }
+     else {
+         $order = "ph.date $dir, ph.time $dir, ph.photo_id $dir";
++	$select .= ", ph.date, ph.time";
+     }
+ 
+     while (list($key, $val) = each($vars)) {
+@@ -198,13 +200,31 @@
+             $num_photos = 1;
+ 
+             // don't bother with order
+-            $query =
+-                "select $select from $from_clause $where limit $offset, $rows";
++	    // need to determine type of database due to syntax differences in limit clause
++	    switch (DB_TYPE) {
++		case 'postgres':
++	            $query =
++        	        "select $select from $from_clause $where limit $rows offset $offset";
++		    break;
++		case 'mysql':
++	            $query =
++        	        "select $select from $from_clause $where limit $offset, $rows";
++		    break;
++	  	}
+         }
+         else {
+-            $query =
+-                "select $select from $from_clause $where order by $order " .
+-                "limit $offset, $rows";
++	    switch (DB_TYPE) {
++		case 'postgres':
++            		$query =
++		                "select $select from $from_clause $where order by $order " .
++		                "limit $rows offset $offset";
++		    break;
++		case 'mysql':
++		        $query =
++        		        "select $select from $from_clause $where order by $order " .
++		                "limit $offset, $rows";
++		    break;
++		}
+         }
+         //echo $query;
+ 
+diff -Nru zoph-0.3.3/php/place.inc.php zoph.new/php/place.inc.php
+--- zoph-0.3.3/php/place.inc.php	2002-12-10 21:30:50.000000000 +0000
++++ zoph.new/php/place.inc.php	2003-07-17 19:46:18.000000000 +0100
+@@ -141,16 +141,16 @@
+             " and ph.location_id = plc.place_id " .
+             "group by plc.place_id " .
+             "order by count desc, plc.title, plc.city " .
+-            "limit 0, $TOP_N";
++            "limit $TOP_N";
+     }
+     else {
+         $sql =
+-            "select plc.*, count(*) as count " .
++            "select plc.place_id,plc.title,plc.city, count(*) as count " .
+             "from places as plc, photos as ph " .
+             "where plc.place_id = ph.location_id " .
+-            "group by plc.place_id " .
++            "group by plc.place_id,plc.title,plc.city " .
+             "order by count desc, plc.title, plc.city " .
+-            "limit 0, $TOP_N";
++            "limit $TOP_N";
+     }
+ 
+     return get_popular_results("place", $sql);
+diff -Nru zoph-0.3.3/php/user.inc.php zoph.new/php/user.inc.php
+--- zoph-0.3.3/php/user.inc.php	2002-12-10 21:30:50.000000000 +0000
++++ zoph.new/php/user.inc.php	2003-07-17 19:46:26.000000000 +0100
+@@ -60,7 +60,7 @@
+             " and ph.photo_id = '" . escape_string($photo_id) . "'" .
+             " and ap.access_level >= ph.level " .
+             "order by ap.access_level desc, writable desc " .
+-            "limit 0, 1";
++            "limit 1";
+ 
+         $aps = get_records_from_query("album_permissions", $sql);
+         if ($aps && sizeof($aps) >= 1) {
+diff -Nru zoph-0.3.3/php/zoph_table.inc.php zoph.new/php/zoph_table.inc.php
+--- zoph-0.3.3/php/zoph_table.inc.php	2002-12-10 21:30:51.000000000 +0000
++++ zoph.new/php/zoph_table.inc.php	2003-07-17 21:50:10.000000000 +0100
+@@ -92,11 +92,11 @@
+ 
+         if (DEBUG) { echo "$sql
\n"; }
+ 
+-        $result = mysql_query($sql)
+-            or die_with_mysql_error("Lookup failed:", $sql);
++        $result = zophdb_query($sql)
++            or die_with_zophdb_error("Lookup failed:", $sql);
+ 
+-        if (mysql_num_rows($result) == 1) {
+-            $row = mysql_fetch_assoc($result);
++        if (zophdb_num_rows($result) == 1) {
++            $row = zophdb_fetch_assoc($result);
+ 
+             $this->fields = array();
+ 
+@@ -113,8 +113,8 @@
+     /*
+      * Inserts a record.  The default behavior is to ignore the
+      * primary key field(s) with the assumption that these will
+-     * be generated by mysql (auto_increment).  Passing a non null
+-     * parameter causes these fields to be manually inserted.
++     * be generated by the database (auto_increment).  Passing a non
++     * null parameter causes these fields to be manually inserted.
+      */
+     function insert($keep_key = null) {
+ 
+@@ -126,6 +126,7 @@
+         while (list($name, $value) = each($this->fields)) {
+ 
+             if ($this->primary_keys && !$keep_key && $this->is_key($name)) {
++		$pk=$name;
+                 continue;
+             }
+ 
+@@ -137,7 +138,7 @@
+             $names .= $name;
+ 
+             if ($name == "password") {
+-                $values .= "password('" . escape_string($value) . "')";
++                $values .= zophdb_password($value);
+             }
+             else if ($value != "null") {
+                 $values .= "'" . escape_string($value) . "'";
+@@ -152,9 +153,13 @@
+ 
+         if (DEBUG) { echo "$sql
\n"; }
+ 
+-        mysql_query($sql) or die_with_mysql_error("Insert failed:", $sql);
++        zophdb_query($sql) or die_with_zophdb_error("Insert failed:", $sql);
+ 
+-        $id = mysql_insert_id();
++        if (!$keep_key) {
++		$id = zophdb_insert_id($pk,$this->table_name);
++ 	} else {
++		$id = 0;
++	}
+ 
+         if ($this->primary_keys && count($this->primary_keys) == 1) {
+             $this->fields[$this->primary_keys[0]] = $id;
+@@ -187,14 +192,14 @@
+ 
+         if (DEBUG) { echo "$sql
\n"; }
+ 
+-        mysql_query($sql) or die_with_mysql_error("Delete failed:", $sql);
++        zophdb_query($sql) or die_with_zophdb_error("Delete failed:", $sql);
+ 
+         if ($extra_tables) {
+             foreach ($extra_tables as $table) {
+                 $sql = "delete from $table where $constraints";
+                 if (DEBUG) { echo "$sql
\n"; }
+-                mysql_query($sql) or
+-                    die_with_mysql_error("Delete from $table failed:", $sql);
++                zophdb_query($sql) or
++                    die_with_zophdb_error("Delete from $table failed:", $sql);
+             }
+         }
+     }
+@@ -224,7 +229,8 @@
+             if ($values) { $values .= ", "; }
+ 
+             if ($name == "password") {
+-                $values .= "$name = password('" . escape_string($value) . "')";
++
++                $values .= "$name = ".zophdb_password($value);
+             }
+             else if ($value != "null") {
+                 $values .= "$name = '" . escape_string($value) . "'";
+@@ -240,7 +246,7 @@
+ 
+         if (DEBUG) { echo "$sql
\n"; }
+ 
+-        mysql_query($sql) or die_with_mysql_error("Update failed:", $sql);
++        zophdb_query($sql) or die_with_zophdb_error("Update failed:", $sql);
+ 
+     }
+ 
+@@ -285,7 +291,7 @@
+     function get_edit_array() {
+         if (!$this->fields) { return; }
+ 
+-        $field_lengths = get_field_lengths($this->table_name);
++        $field_lengths = zophdb_get_field_lengths($this->table_name);
+ 
+         $keys = array_keys($field_lengths);
+         sort($keys);
+@@ -325,10 +331,10 @@
+ function get_count_from_query($sql) {
+     if (DEBUG > 1) { echo "$sql
\n"; }
+ 
+-    $result = mysql_query($sql)
+-        or die_with_mysql_error("Unable to get count", $sql);
++    $result = zophdb_query($sql)
++        or die_with_zophdb_error("Unable to get count", $sql);
+ 
+-    return mysql_result($result, 0, 0);
++    return zophdb_result($result, 0, 0);
+ }
+ 
+ /*
+@@ -387,11 +393,11 @@
+ 
+     if (DEBUG > 1) { echo "$sql
\n"; }
+ 
+-    $result = mysql_query($sql)
+-        or die_with_mysql_error("Unable to get records", $sql);
++    $result = zophdb_query($sql)
++        or die_with_zophdb_error("Unable to get records", $sql);
+ 
+     if ($min) {
+-        mysql_data_seek($result, $min);
++        zophdb_data_seek($result, $min);
+     }
+ 
+     if ($num) {
+@@ -400,7 +406,7 @@
+ 
+     $objs = array();
+     if ($class != null) {
+-        while ((!$limit || $num-- > 0) && $row = mysql_fetch_assoc($result)) {
++        while ((!$limit || $num-- > 0) && $row = zophdb_fetch_assoc($result)) {
+             $obj = new $class;
+             $obj->set_fields($row);
+             $objs[] = $obj;
+@@ -408,12 +414,12 @@
+     }
+     else {
+         // use to grab ids, for example
+-        while ((!$limit || $num-- > 0) && $row = mysql_fetch_row($result)) {
++        while ((!$limit || $num-- > 0) && $row = zophdb_fetch_row($result)) {
+             $objs[] = $row[0];
+         }
+     }
+ 
+-    mysql_free_result($result);
++    zophdb_free_result($result);
+     return $objs;
+ }
+ 
+@@ -485,7 +491,7 @@
+ 
+ /*
+  * Escapes various characters in the given string using the
+- * mysql_escape_string function.
++ * zophdb_escape_string function.
+  */
+ function escape_string($str) {
+ 
+@@ -494,7 +500,7 @@
+         $str = stripslashes($str);
+     }
+ 
+-    return mysql_escape_string($str);
++    return zophdb_escape_string($str);
+ 
+ }
+ 
+@@ -505,17 +511,17 @@
+ function execute_query($sql, $silent = 0) {
+     if (DEBUG > 1) { echo "$sql
\n"; }
+     if ($silent) {
+-        mysql_query($sql);
++        zophdb_query($sql);
+     }
+     else {
+-        mysql_query($sql) or die_with_mysql_error("Something went wrong", $sql);
++        zophdb_query($sql) or die_with_zophdb_error("Something went wrong", $sql);
+     }
+ }
+ 
+-function die_with_mysql_error($msg, $sql = "") {
++function die_with_zophdb_error($msg, $sql = "") {
+     $msg =
+         "
$msg
\n" .
+-        "" . mysql_error() . "
\n";
++        "" . zophdb_error() . "
\n";
+ 
+     if ($sql) {
+         $msg .= "
$sql
\n";
+@@ -541,16 +547,5 @@
+     );
+ }
+ 
+-function get_field_lengths($table_name) {
+-
+-    $db_fields = mysql_list_fields(DB_NAME, $table_name);
+-    $columns = mysql_num_fields($db_fields);
+-    for ($i = 0; $i < $columns; $i++) {
+-        $field_lengths[mysql_field_name($db_fields, $i)] =
+-            mysql_field_len($db_fields, $i);
+-    }
+-
+-    return $field_lengths;
+-}
+ 
+ ?>
+diff -Nru zoph-0.3.3/php/zophdb.mysql.inc.php zoph.new/php/zophdb.mysql.inc.php
+--- zoph-0.3.3/php/zophdb.mysql.inc.php	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/php/zophdb.mysql.inc.php	2003-07-17 21:48:30.000000000 +0100
+@@ -0,0 +1,80 @@
++$query
\n";
++	return mysql_query($query);
++}
++
++function zophdb_num_rows($result) {
++	return mysql_num_rows($result);
++}
++
++function zophdb_fetch_array($result) {
++	return mysql_fetch_array($result);
++}
++
++function zophdb_error() {
++	return mysql_error();
++}
++
++function zophdb_get_field_lengths($table_name) {
++
++    $db_fields = mysql_list_fields(DB_NAME, $table_name);
++    $columns = mysql_num_fields($db_fields);
++    for ($i = 0; $i < $columns; $i++) {
++        $field_lengths[mysql_field_name($db_fields, $i)] =
++            mysql_field_len($db_fields, $i);
++    }
++
++    return $field_lengths;
++}
++
++function zophdb_fetch_assoc($result) {
++	return mysql_fetch_assoc($result);
++}
++
++function zophdb_insert_id($pk,$table) {
++	return mysql_insert_id();
++}
++
++function zophdb_result($result,$i,$j) {
++	return mysql_result($result,$i,$j);
++}
++
++function zophdb_data_seek($result, $min) {
++	return mysql_result_offset($result, $min);
++}
++
++function zophdb_fetch_row($result) {
++	return mysql_fetch_row($result);
++}
++
++function zophdb_free_result($result) {
++	return mysql_free_result($result);
++}
++
++function zophdb_escape_string($str) {
++	return mysql_escape_string($str);
++}
++
++function zophdb_password($str) {
++  if (MYSQL_USE_PASSWORD) {
++    return "password('".escape_string($str)."')";
++  } else {
++    return "md5('".escape_string($str)."')";
++  }
++}
++
++?>
+diff -Nru zoph-0.3.3/php/zophdb.postgres.inc.php zoph.new/php/zophdb.postgres.inc.php
+--- zoph-0.3.3/php/zophdb.postgres.inc.php	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/php/zophdb.postgres.inc.php	2003-07-17 21:48:10.000000000 +0100
+@@ -0,0 +1,93 @@
++$query
\n";
++	return pg_query($query);
++}
++
++function zophdb_num_rows($result) {
++	return pg_num_rows($result);
++}
++
++function zophdb_fetch_array($result) {
++	return pg_fetch_array($result);
++}
++
++function zophdb_error() {
++	return pg_last_error();
++}
++
++function zophdb_list_fields($dbname, $tablename) {
++	
++}
++
++function zophdb_get_field_lengths($tablename) {
++
++	$res=pg_query("select * from $tablename limit 1");
++	$numfields = pg_num_fields($res);
++	for ($i = 0; $i < $numfields; $i++) {
++	        $field_lengths[$i] = pg_fieldsize($res,$i);
++	}
++	return $field_lengths;
++}
++
++/*
++function zophdb_get_field_lengths($table_name) {
++
++    $db_fields = zophdb_list_fields(DB_NAME, $table_name);
++    $columns = zophdb_num_fields($db_fields);
++    for ($i = 0; $i < $columns; $i++) {
++        $field_lengths[zophdb_field_name($db_fields, $i)] =
++            zophdb_field_len($db_fields, $i);
++    }
++
++    return $field_lengths;
++}
++*/
++
++
++function zophdb_fetch_assoc($result) {
++	return pg_fetch_assoc($result);
++}
++
++function zophdb_insert_id($pk,$table) {
++	$seq_name = $table."_".$pk."_seq";
++	$result = pg_query("SELECT currval('$seq_name')");
++	$row = pg_fetch_row($result);
++	return $row[0];
++}
++
++function zophdb_result($result,$i,$j) {
++	return pg_fetch_result($result,$i,$j);
++}
++
++function zophdb_data_seek($result, $min) {
++	return pg_result_offset($result, $min);
++}
++
++function zophdb_fetch_row($result) {
++	return pg_fetch_array($result);
++}
++
++function zophdb_free_result($result) {
++	return pg_free_result($result);
++}
++
++function zophdb_escape_string($str) {
++	return pg_escape_string($str);
++}
++
++function zophdb_password($str) {
++  return "digest('".escape_string($str)."','md5')";
++}
++
++?>
+diff -Nru zoph-0.3.3/sql/mysql/zoph.mysql.sql zoph.new/sql/mysql/zoph.mysql.sql
+--- zoph-0.3.3/sql/mysql/zoph.mysql.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/mysql/zoph.mysql.sql	2003-07-17 20:01:15.000000000 +0100
+@@ -0,0 +1,243 @@
++-- MySQL dump 8.21
++--
++-- Host: localhost    Database: zoph
++---------------------------------------------------------
++-- Server version	3.23.49-log
++
++--
++-- Table structure for table 'album_permissions'
++--
++
++CREATE TABLE album_permissions (
++  user_id int(11) NOT NULL default '0',
++  album_id int(11) NOT NULL default '0',
++  access_level tinyint(4) NOT NULL default '0',
++  writable char(1) NOT NULL default '0',
++  PRIMARY KEY  (user_id,album_id),
++  KEY ap_access_level (access_level)
++) TYPE=MyISAM;
++
++--
++-- Table structure for table 'albums'
++--
++
++CREATE TABLE albums (
++  album_id int(11) NOT NULL auto_increment,
++  parent_album_id int(11) NOT NULL default '0',
++  album varchar(32) NOT NULL default '',
++  album_description varchar(255) default NULL,
++  PRIMARY KEY  (album_id),
++  KEY album_parent_id (parent_album_id)
++) TYPE=MyISAM;
++
++INSERT INTO albums VALUES (1,0,'Album Root',NULL);
++
++--
++-- Table structure for table 'categories'
++--
++
++CREATE TABLE categories (
++  category_id int(11) NOT NULL auto_increment,
++  parent_category_id int(11) NOT NULL default '0',
++  category varchar(32) NOT NULL default '',
++  category_description varchar(255) default NULL,
++  PRIMARY KEY  (category_id),
++  KEY cat_parent_id (parent_category_id)
++) TYPE=MyISAM;
++
++INSERT INTO categories VALUES (1,0,'Category Root',NULL);
++
++--
++-- Table structure for table 'color_schemes'
++--
++
++CREATE TABLE color_schemes (
++  color_scheme_id int(11) NOT NULL auto_increment,
++  name varchar(64) NOT NULL default '',
++  page_bg_color varchar(6) default NULL,
++  text_color varchar(6) default NULL,
++  link_color varchar(6) default NULL,
++  vlink_color varchar(6) default NULL,
++  table_bg_color varchar(6) default NULL,
++  table_border_color varchar(6) default NULL,
++  breadcrumb_bg_color varchar(6) default NULL,
++  title_bg_color varchar(6) default NULL,
++  tab_bg_color varchar(6) default NULL,
++  tab_font_color varchar(6) default NULL,
++  selected_tab_bg_color varchar(6) default NULL,
++  selected_tab_font_color varchar(6) default NULL,
++  title_font_color varchar(6) default NULL,
++  PRIMARY KEY  (color_scheme_id)
++) TYPE=MyISAM;
++
++INSERT INTO color_schemes VALUES (1,'default','ffffff','000000','111111','444444','ffffff','000000','ffffff','f0f0f0','000000','ffffff','c0c0c0','000000','000000');
++INSERT INTO color_schemes VALUES (2,'blugram','909090','000000','111111','333333','eef0f0','000000','cce0e0','dde0cc','ccd0bb','000000','bbd0d0','000000','000000');
++INSERT INTO color_schemes VALUES (3,'dow','444444','000000','000055','000033','cccccc','000000','aaaaaa','2222aa','2222aa','ffffff','cccccc','000000','ffffff');
++INSERT INTO color_schemes VALUES (4,'hoenig','FFEFD6','5C1F00','330000','330000','FFFBF5','000000','FFF7EB','FFE7C2','FFE7C2','5C1F00','FFD799','000000','993300');
++INSERT INTO color_schemes VALUES (5,'forest','336633','000000','000000','000000','99CC99','000000','669966','663300','663300','E0E0E0','996633','FFFFFF','99CC99');
++INSERT INTO color_schemes VALUES (6,'black','000000','FFFFFF','FFFFFF','FFFFFF','000000','FFFFFF','000000','666666','666666','FFFFFF','999999','FFFFFF','FFFFFF');
++INSERT INTO color_schemes VALUES (7,'beach','646D7E','000000','000000','000000','F9EEE2','000000','9AADC7','C6DEFF','617C58','D0D0D0','8BB381','000000','646D7E');
++
++--
++-- Table structure for table 'people'
++--
++
++CREATE TABLE people (
++  person_id int(11) NOT NULL auto_increment,
++  first_name varchar(32) default NULL,
++  last_name varchar(32) default NULL,
++  middle_name varchar(32) default NULL,
++  called varchar(16) default NULL,
++  gender char(1) default NULL,
++  dob date default NULL,
++  dod date default NULL,
++  home_id int(11) default NULL,
++  work_id int(11) default NULL,
++  father_id int(11) default NULL,
++  mother_id int(11) default NULL,
++  spouse_id int(11) default NULL,
++  notes varchar(255) default NULL,
++  PRIMARY KEY  (person_id),
++  KEY person_last_name (last_name(10)),
++  KEY person_first_name (first_name(10))
++) TYPE=MyISAM;
++
++INSERT INTO people VALUES (1,'Unknown','Person',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
++
++--
++-- Table structure for table 'photo_albums'
++--
++
++CREATE TABLE photo_albums (
++  photo_id int(11) NOT NULL default '0',
++  album_id int(11) NOT NULL default '0',
++  PRIMARY KEY  (photo_id,album_id)
++) TYPE=MyISAM;
++
++--
++-- Table structure for table 'photo_categories'
++--
++
++CREATE TABLE photo_categories (
++  photo_id int(11) NOT NULL default '0',
++  category_id int(11) NOT NULL default '0',
++  PRIMARY KEY  (photo_id,category_id)
++) TYPE=MyISAM;
++
++--
++-- Table structure for table 'photo_people'
++--
++
++CREATE TABLE photo_people (
++  photo_id int(11) NOT NULL default '0',
++  person_id int(11) NOT NULL default '0',
++  position int(11) default NULL,
++  PRIMARY KEY  (photo_id,person_id)
++) TYPE=MyISAM;
++
++--
++-- Table structure for table 'photos'
++--
++
++CREATE TABLE photos (
++  photo_id int(11) NOT NULL auto_increment,
++  name varchar(128) default NULL,
++  path varchar(255) default NULL,
++  width int(11) default NULL,
++  height int(11) default NULL,
++  size int(11) default NULL,
++  title varchar(64) default NULL,
++  photographer_id int(11) default NULL,
++  location_id int(11) default NULL,
++  view varchar(64) default NULL,
++  rating tinyint(4) default NULL,
++  description blob,
++  date varchar(10) default NULL,
++  time varchar(8) default NULL,
++  camera_make varchar(32) default NULL,
++  camera_model varchar(32) default NULL,
++  flash_used char(1) default NULL,
++  focal_length varchar(64) default NULL,
++  exposure varchar(64) default NULL,
++  compression varchar(64) default NULL,
++  aperture varchar(16) default NULL,
++  level tinyint(4) NOT NULL default '1',
++  iso_equiv varchar(8) default NULL,
++  metering_mode varchar(16) default NULL,
++  focus_dist varchar(16) default NULL,
++  ccd_width varchar(16) default NULL,
++  comment varchar(128) default NULL,
++  timestamp timestamp(14) NOT NULL,
++  PRIMARY KEY  (photo_id),
++  KEY photo_photog_id (photographer_id),
++  KEY photo_loc_id (location_id),
++  KEY photo_rating (rating),
++  KEY photo_level (level)
++) TYPE=MyISAM;
++
++--
++-- Table structure for table 'places'
++--
++
++CREATE TABLE places (
++  place_id int(11) NOT NULL auto_increment,
++  contact_type int(11) NOT NULL default '0',
++  title varchar(64) NOT NULL default '',
++  address varchar(64) default NULL,
++  address2 varchar(64) default NULL,
++  city varchar(32) default NULL,
++  state varchar(32) default NULL,
++  zip varchar(10) default NULL,
++  country varchar(32) default NULL,
++  notes varchar(255) default NULL,
++  PRIMARY KEY  (place_id),
++  KEY place_city (city(10)),
++  KEY place_title (title(10))
++) TYPE=MyISAM;
++
++--
++-- Table structure for table 'prefs'
++--
++
++CREATE TABLE prefs (
++  user_id int(11) NOT NULL default '0',
++  show_breadcrumbs char(1) NOT NULL default '1',
++  num_breadcrumbs smallint(5) unsigned NOT NULL default '8',
++  num_rows tinyint(3) unsigned NOT NULL default '3',
++  num_cols tinyint(3) unsigned NOT NULL default '4',
++  max_pager_size tinyint(3) unsigned NOT NULL default '10',
++  random_photo_min_rating tinyint(3) unsigned NOT NULL default '0',
++  reports_top_n smallint(5) unsigned NOT NULL default '5',
++  color_scheme_id int(11) NOT NULL default '1',
++  slideshow_time smallint(6) NOT NULL default '5',
++  language char(2) default NULL,
++  recent_photo_days smallint(6) NOT NULL default '7',
++  auto_edit char(1) NOT NULL default '0',
++  camera_info char(1) NOT NULL default '1',
++  desc_thumbnails char(1) NOT NULL default '0',
++  PRIMARY KEY  (user_id)
++) TYPE=MyISAM;
++
++INSERT INTO prefs VALUES (1,'1',8,3,4,10,0,5,1,5,NULL,7,'0','1','0');
++
++--
++-- Table structure for table 'users'
++--
++
++CREATE TABLE users (
++  user_id int(11) NOT NULL auto_increment,
++  person_id int(11) NOT NULL default '0',
++  user_class char(1) NOT NULL default '1',
++  user_name varchar(16) NOT NULL default '',
++  password varchar(32) default NULL,
++  browse_people char(1) NOT NULL default '0',
++  browse_places char(1) NOT NULL default '0',
++  detailed_people char(1) NOT NULL default '0',
++  detailed_places char(1) NOT NULL default '0',
++  import char(1) NOT NULL default '0',
++  lightbox_id int(11) default NULL,
++  PRIMARY KEY  (user_id)
++) TYPE=MyISAM;
++
++INSERT INTO users VALUES (1,1,'0','admin',password('admin'),'1','1','1','1','1',NULL);
++
+diff -Nru zoph-0.3.3/sql/mysql/zoph_update-0.2.1.sql zoph.new/sql/mysql/zoph_update-0.2.1.sql
+--- zoph-0.3.3/sql/mysql/zoph_update-0.2.1.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/mysql/zoph_update-0.2.1.sql	2003-07-17 20:01:15.000000000 +0100
+@@ -0,0 +1,27 @@
++#
++# focal length was not long enough for some cameras
++#
++alter table photos modify focal_length varchar(64);
++
++#
++# let these descriptions be larger too
++#
++alter table albums modify album_description varchar(255);
++alter table categories modify category_description varchar(255);
++
++#
++# a couple new photo fields
++#
++alter table photos add focus_dist varchar(16);
++alter table photos add ccd_width varchar(16);
++alter table photos add comment varchar(128);
++
++#
++# forgot to make this not null
++#
++alter table users modify detailed_people char(1) not null default '0';
++
++#
++# change state from char(2) to varchar(32) so it can be more versatile
++#
++alter table places modify state varchar(32);
+diff -Nru zoph-0.3.3/sql/mysql/zoph_update-0.3.1.sql zoph.new/sql/mysql/zoph_update-0.3.1.sql
+--- zoph-0.3.3/sql/mysql/zoph_update-0.3.1.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/mysql/zoph_update-0.3.1.sql	2003-07-17 20:01:15.000000000 +0100
+@@ -0,0 +1,33 @@
++#
++# Zoph 0.3 -> 0.3.1 update
++# 30 Sep 2002
++#
++
++#
++# create a pref for an always edit mode
++#
++alter table prefs add auto_edit char(1) not null default '0';
++
++#
++# create a pref for whether to display camera info
++#
++alter table prefs add camera_info char(1) not null default '1';
++
++#
++# create a field to define a lightbox for a user
++#
++alter table users add lightbox_id int;
++
++#
++# These tables were accidentally included in zoph.sql 0.3
++#
++drop table contact_types;
++drop table email_addresses;
++drop table links;
++drop table people_email_addresses;
++drop table people_phone_numbers;
++drop table people_places;
++drop table phone_numbers;
++drop table photo_links;
++drop table places_phone_numbers;
++drop table related_photos;
+diff -Nru zoph-0.3.3/sql/mysql/zoph_update-0.3.2.sql zoph.new/sql/mysql/zoph_update-0.3.2.sql
+--- zoph-0.3.3/sql/mysql/zoph_update-0.3.2.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/mysql/zoph_update-0.3.2.sql	2003-07-17 20:01:15.000000000 +0100
+@@ -0,0 +1,13 @@
++#
++# Zoph 0.3.1 -> 0.3.2 update
++# 17 Oct 2002
++#
++
++#
++# four new color schemes if you want them
++#
++INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('hoenig','FFEFD6','5C1F00','330000','330000','FFFBF5','000000','FFF7EB','FFE7C2','FFE7C2','5C1F00','FFD799','000000','993300');
++INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('forest','336633','000000','000000','000000','99CC99','000000','669966','663300','663300','E0E0E0','996633','FFFFFF','99CC99');
++INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('black','000000','FFFFFF','FFFFFF','FFFFFF','000000','FFFFFF','000000','666666','666666','FFFFFF','999999','FFFFFF','FFFFFF');
++INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('beach','646D7E','000000','000000','000000','F9EEE2','000000','9AADC7','C6DEFF','617C58','D0D0D0','8BB381','000000','646D7E');
++
+diff -Nru zoph-0.3.3/sql/mysql/zoph_update-0.3.3.sql zoph.new/sql/mysql/zoph_update-0.3.3.sql
+--- zoph-0.3.3/sql/mysql/zoph_update-0.3.3.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/mysql/zoph_update-0.3.3.sql	2003-07-17 20:01:15.000000000 +0100
+@@ -0,0 +1,9 @@
++#
++# Zoph 0.3.2 -> 0.3.3 update
++# 18 Nov 2002
++#
++
++#
++# create a pref for displaying descriptions under thumbnails
++#
++alter table prefs add desc_thumbnails char(1) not null default '0';
+diff -Nru zoph-0.3.3/sql/mysql/zoph_update-0.3.sql zoph.new/sql/mysql/zoph_update-0.3.sql
+--- zoph-0.3.3/sql/mysql/zoph_update-0.3.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/mysql/zoph_update-0.3.sql	2003-07-17 20:01:15.000000000 +0100
+@@ -0,0 +1,30 @@
++#
++# Zoph 0.2.1 -> 0.3 update
++# 20 Sep 2002
++#
++
++#
++# increase size of name and path photo fields
++#
++alter table photos modify name varchar(128);
++alter table photos modify path varchar(255);
++
++#
++# create timestamp field
++#
++alter table photos add timestamp timestamp(14);
++
++#
++# create a language pref field
++#
++alter table prefs add language char(2);
++
++#
++# create a field for the number of days used by the view recent links
++#
++alter table prefs add recent_photo_days smallint not null default 7;
++
++#
++# create a import permission field
++#
++alter table users add import char(1) not null default '0';
+diff -Nru zoph-0.3.3/sql/postgres/zoph.postgres.sql zoph.new/sql/postgres/zoph.postgres.sql
+--- zoph-0.3.3/sql/postgres/zoph.postgres.sql	1970-01-01 01:00:00.000000000 +0100
++++ zoph.new/sql/postgres/zoph.postgres.sql	2003-07-17 22:00:53.000000000 +0100
+@@ -0,0 +1,284 @@
++--
++-- Table structure for table 'album_permissions'
++--
++
++CREATE TABLE album_permissions (
++  user_id int NOT NULL default '0',
++  album_id int NOT NULL default '0',
++  access_level smallint NOT NULL default '0',
++  writable char(1) NOT NULL default '0',
++  PRIMARY KEY  (user_id,album_id)
++);
++
++CREATE INDEX ap_access_level ON album_permissions (access_level);
++
++--
++-- Table structure for table 'albums'
++--
++
++CREATE TABLE albums (
++  album_id SERIAL,
++  parent_album_id int NOT NULL default '0',
++  album varchar(32) NOT NULL default '',
++  album_description varchar(255) default NULL,
++  PRIMARY KEY  (album_id)
++);
++
++CREATE INDEX album_parent_id ON albums(parent_album_id);
++
++INSERT INTO albums VALUES (1,0,'Album Root',NULL);
++
++--
++-- Table structure for table 'categories'
++--
++
++CREATE TABLE categories (
++  category_id SERIAL,
++  parent_category_id int NOT NULL default '0',
++  category varchar(32) NOT NULL default '',
++  category_description varchar(255) default NULL,
++  PRIMARY KEY  (category_id)
++);
++
++CREATE INDEX cat_parent_id on categories(parent_category_id);
++
++INSERT INTO categories VALUES (1,0,'Category Root',NULL);
++
++--
++-- Table structure for table 'color_schemes'
++--
++
++CREATE TABLE color_schemes (
++  color_scheme_id SERIAL,
++  name varchar(64) NOT NULL default '',
++  page_bg_color varchar(6) default NULL,
++  text_color varchar(6) default NULL,
++  link_color varchar(6) default NULL,
++  vlink_color varchar(6) default NULL,
++  table_bg_color varchar(6) default NULL,
++  table_border_color varchar(6) default NULL,
++  breadcrumb_bg_color varchar(6) default NULL,
++  title_bg_color varchar(6) default NULL,
++  tab_bg_color varchar(6) default NULL,
++  tab_font_color varchar(6) default NULL,
++  selected_tab_bg_color varchar(6) default NULL,
++  selected_tab_font_color varchar(6) default NULL,
++  title_font_color varchar(6) default NULL,
++  PRIMARY KEY  (color_scheme_id)
++);
++
++INSERT INTO color_schemes VALUES (1,'default','ffffff','000000','111111','444444','ffffff','000000','ffffff','f0f0f0','000000','ffffff','c0c0c0','000000','000000');
++INSERT INTO color_schemes VALUES (2,'blugram','909090','000000','111111','333333','eef0f0','000000','cce0e0','dde0cc','ccd0bb','000000','bbd0d0','000000','000000');
++INSERT INTO color_schemes VALUES (3,'dow','444444','000000','000055','000033','cccccc','000000','aaaaaa','2222aa','2222aa','ffffff','cccccc','000000','ffffff');
++INSERT INTO color_schemes VALUES (4,'hoenig','FFEFD6','5C1F00','330000','330000','FFFBF5','000000','FFF7EB','FFE7C2','FFE7C2','5C1F00','FFD799','000000','993300');
++INSERT INTO color_schemes VALUES (5,'forest','336633','000000','000000','000000','99CC99','000000','669966','663300','663300','E0E0E0','996633','FFFFFF','99CC99');
++INSERT INTO color_schemes VALUES (6,'black','000000','FFFFFF','FFFFFF','FFFFFF','000000','FFFFFF','000000','666666','666666','FFFFFF','999999','FFFFFF','FFFFFF');
++INSERT INTO color_schemes VALUES (7,'beach','646D7E','000000','000000','000000','F9EEE2','000000','9AADC7','C6DEFF','617C58','D0D0D0','8BB381','000000','646D7E');
++
++--
++-- Table structure for table 'people'
++--
++
++CREATE TABLE people (
++  person_id SERIAL,
++  first_name varchar(32) default NULL,
++  last_name varchar(32) default NULL,
++  middle_name varchar(32) default NULL,
++  called varchar(16) default NULL,
++  gender char(1) default NULL,
++  dob date default NULL,
++  dod date default NULL,
++  home_id int default NULL,
++  work_id int default NULL,
++  father_id int default NULL,
++  mother_id int default NULL,
++  spouse_id int default NULL,
++  notes varchar(255) default NULL,
++  PRIMARY KEY  (person_id)
++);
++
++CREATE INDEX person_last_name ON people(last_name);
++CREATE INDEX person_first_name ON people(first_name);
++
++INSERT INTO people VALUES (1,'Unknown','Person',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
++
++--
++-- Table structure for table 'photo_albums'
++--
++
++CREATE TABLE photo_albums (
++  photo_id int NOT NULL default '0',
++  album_id int NOT NULL default '0',
++  PRIMARY KEY  (photo_id,album_id)
++);
++
++--
++-- Table structure for table 'photo_categories'
++--
++
++CREATE TABLE photo_categories (
++  photo_id int NOT NULL default '0',
++  category_id int NOT NULL default '0',
++  PRIMARY KEY  (photo_id,category_id)
++);
++
++--
++-- Table structure for table 'photo_people'
++--
++
++CREATE TABLE photo_people (
++  photo_id int NOT NULL default '0',
++  person_id int NOT NULL default '0',
++  position int default NULL,
++  PRIMARY KEY  (photo_id,person_id)
++);
++
++--
++-- Table structure for table 'photos'
++--
++
++CREATE TABLE photos (
++  photo_id SERIAL,
++  name varchar(128) default NULL,
++  path varchar(255) default NULL,
++  width int default NULL,
++  height int default NULL,
++  size int default NULL,
++  title varchar(64) default NULL,
++  photographer_id int default NULL,
++  location_id int default NULL,
++  view varchar(64) default NULL,
++  rating smallint default NULL,
++  description text,
++  date varchar(10) default NULL,
++  time varchar(8) default NULL,
++  camera_make varchar(32) default NULL,
++  camera_model varchar(32) default NULL,
++  flash_used char(1) default NULL,
++  focal_length varchar(64) default NULL,
++  exposure varchar(64) default NULL,
++  compression varchar(64) default NULL,
++  aperture varchar(16) default NULL,
++  level smallint NOT NULL default '1',
++  iso_equiv varchar(8) default NULL,
++  metering_mode varchar(16) default NULL,
++  focus_dist varchar(16) default NULL,
++  ccd_width varchar(16) default NULL,
++  comment varchar(128) default NULL,
++  timestamp timestamp NOT NULL default now(),
++  PRIMARY KEY  (photo_id)
++);
++
++CREATE INDEX photo_photog_id ON photos (photographer_id);
++CREATE INDEX photo_loc_id ON photos (location_id);
++CREATE INDEX photo_rating ON photos (rating);
++CREATE INDEX photo_level ON photos (level);
++
++--
++-- Table structure for table 'places'
++--
++
++CREATE TABLE places (
++  place_id SERIAL,
++  contact_type int NOT NULL default '0',
++  title varchar(64) NOT NULL default '',
++  address varchar(64) default NULL,
++  address2 varchar(64) default NULL,
++  city varchar(32) default NULL,
++  state varchar(32) default NULL,
++  zip varchar(10) default NULL,
++  country varchar(32) default NULL,
++  notes varchar(255) default NULL,
++  PRIMARY KEY  (place_id)
++);
++
++CREATE INDEX place_city ON places (city);
++CREATE INDEX place_title ON places (title);
++
++--
++-- Table structure for table 'prefs'
++--
++
++CREATE TABLE prefs (
++  user_id int NOT NULL default '0',
++  show_breadcrumbs char(1) NOT NULL default '1',
++  num_breadcrumbs smallint NOT NULL default '8',
++  num_rows smallint NOT NULL default '3',
++  num_cols smallint NOT NULL default '4',
++  max_pager_size smallint NOT NULL default '10',
++  random_photo_min_rating smallint NOT NULL default '0',
++  reports_top_n smallint NOT NULL default '5',
++  color_scheme_id int NOT NULL default '1',
++  slideshow_time smallint NOT NULL default '5',
++  language char(2) default NULL,
++  recent_photo_days smallint NOT NULL default '7',
++  auto_edit char(1) NOT NULL default '0',
++  camera_info char(1) NOT NULL default '1',
++  desc_thumbnails char(1) NOT NULL default '0',
++  PRIMARY KEY  (user_id)
++);
++
++INSERT INTO prefs VALUES (1,'1',8,3,4,10,0,5,1,5,NULL,7,'0','1','0');
++
++--
++-- Table structure for table 'users'
++--
++
++CREATE TABLE users (
++  user_id SERIAL,
++  person_id int NOT NULL default '0',
++  user_class char(1) NOT NULL default '1',
++  user_name varchar(16) NOT NULL default '',
++  password bytea default NULL,
++  browse_people char(1) NOT NULL default '0',
++  browse_places char(1) NOT NULL default '0',
++  detailed_people char(1) NOT NULL default '0',
++  detailed_places char(1) NOT NULL default '0',
++  import char(1) NOT NULL default '0',
++  lightbox_id int default NULL,
++  PRIMARY KEY  (user_id)
++);
++
++INSERT INTO users VALUES (1,1,'0','admin',digest('admin','md5'),'1','1','1','1','1',NULL);
++
++grant select, insert, update, delete on album_permissions,
++	albums,
++	albums_album_id_seq,
++	categories,
++	categories_category_id_seq,
++	color_schemes,
++	color_schemes_color_scheme_id_seq,
++	people,
++	people_person_id_seq,
++	photo_albums,
++	photo_categories,
++	photo_people,
++	photos,
++	photos_photo_id_seq,
++	places,
++	places_place_id_seq,
++	prefs,
++	users,
++	users_user_id_seq 
++		to zoph_rw;
++
++grant all on album_permissions,
++	albums,
++	albums_album_id_seq,
++	categories,
++	categories_category_id_seq,
++	color_schemes,
++	color_schemes_color_scheme_id_seq,
++	people,
++	people_person_id_seq,
++	photo_albums,
++	photo_categories,
++	photo_people,
++	photos,
++	photos_photo_id_seq,
++	places,
++	places_place_id_seq,
++	prefs,
++	users,
++	users_user_id_seq 
++		to zoph_admin;
+diff -Nru zoph-0.3.3/sql/zoph.sql zoph.new/sql/zoph.sql
+--- zoph-0.3.3/sql/zoph.sql	2002-12-13 23:28:50.000000000 +0000
++++ zoph.new/sql/zoph.sql	1970-01-01 01:00:00.000000000 +0100
+@@ -1,243 +0,0 @@
+--- MySQL dump 8.21
+---
+--- Host: localhost    Database: zoph
+----------------------------------------------------------
+--- Server version	3.23.49-log
+-
+---
+--- Table structure for table 'album_permissions'
+---
+-
+-CREATE TABLE album_permissions (
+-  user_id int(11) NOT NULL default '0',
+-  album_id int(11) NOT NULL default '0',
+-  access_level tinyint(4) NOT NULL default '0',
+-  writable char(1) NOT NULL default '0',
+-  PRIMARY KEY  (user_id,album_id),
+-  KEY ap_access_level (access_level)
+-) TYPE=MyISAM;
+-
+---
+--- Table structure for table 'albums'
+---
+-
+-CREATE TABLE albums (
+-  album_id int(11) NOT NULL auto_increment,
+-  parent_album_id int(11) NOT NULL default '0',
+-  album varchar(32) NOT NULL default '',
+-  album_description varchar(255) default NULL,
+-  PRIMARY KEY  (album_id),
+-  KEY album_parent_id (parent_album_id)
+-) TYPE=MyISAM;
+-
+-INSERT INTO albums VALUES (1,0,'Album Root',NULL);
+-
+---
+--- Table structure for table 'categories'
+---
+-
+-CREATE TABLE categories (
+-  category_id int(11) NOT NULL auto_increment,
+-  parent_category_id int(11) NOT NULL default '0',
+-  category varchar(32) NOT NULL default '',
+-  category_description varchar(255) default NULL,
+-  PRIMARY KEY  (category_id),
+-  KEY cat_parent_id (parent_category_id)
+-) TYPE=MyISAM;
+-
+-INSERT INTO categories VALUES (1,0,'Category Root',NULL);
+-
+---
+--- Table structure for table 'color_schemes'
+---
+-
+-CREATE TABLE color_schemes (
+-  color_scheme_id int(11) NOT NULL auto_increment,
+-  name varchar(64) NOT NULL default '',
+-  page_bg_color varchar(6) default NULL,
+-  text_color varchar(6) default NULL,
+-  link_color varchar(6) default NULL,
+-  vlink_color varchar(6) default NULL,
+-  table_bg_color varchar(6) default NULL,
+-  table_border_color varchar(6) default NULL,
+-  breadcrumb_bg_color varchar(6) default NULL,
+-  title_bg_color varchar(6) default NULL,
+-  tab_bg_color varchar(6) default NULL,
+-  tab_font_color varchar(6) default NULL,
+-  selected_tab_bg_color varchar(6) default NULL,
+-  selected_tab_font_color varchar(6) default NULL,
+-  title_font_color varchar(6) default NULL,
+-  PRIMARY KEY  (color_scheme_id)
+-) TYPE=MyISAM;
+-
+-INSERT INTO color_schemes VALUES (1,'default','ffffff','000000','111111','444444','ffffff','000000','ffffff','f0f0f0','000000','ffffff','c0c0c0','000000','000000');
+-INSERT INTO color_schemes VALUES (2,'blugram','909090','000000','111111','333333','eef0f0','000000','cce0e0','dde0cc','ccd0bb','000000','bbd0d0','000000','000000');
+-INSERT INTO color_schemes VALUES (3,'dow','444444','000000','000055','000033','cccccc','000000','aaaaaa','2222aa','2222aa','ffffff','cccccc','000000','ffffff');
+-INSERT INTO color_schemes VALUES (4,'hoenig','FFEFD6','5C1F00','330000','330000','FFFBF5','000000','FFF7EB','FFE7C2','FFE7C2','5C1F00','FFD799','000000','993300');
+-INSERT INTO color_schemes VALUES (5,'forest','336633','000000','000000','000000','99CC99','000000','669966','663300','663300','E0E0E0','996633','FFFFFF','99CC99');
+-INSERT INTO color_schemes VALUES (6,'black','000000','FFFFFF','FFFFFF','FFFFFF','000000','FFFFFF','000000','666666','666666','FFFFFF','999999','FFFFFF','FFFFFF');
+-INSERT INTO color_schemes VALUES (7,'beach','646D7E','000000','000000','000000','F9EEE2','000000','9AADC7','C6DEFF','617C58','D0D0D0','8BB381','000000','646D7E');
+-
+---
+--- Table structure for table 'people'
+---
+-
+-CREATE TABLE people (
+-  person_id int(11) NOT NULL auto_increment,
+-  first_name varchar(32) default NULL,
+-  last_name varchar(32) default NULL,
+-  middle_name varchar(32) default NULL,
+-  called varchar(16) default NULL,
+-  gender char(1) default NULL,
+-  dob date default NULL,
+-  dod date default NULL,
+-  home_id int(11) default NULL,
+-  work_id int(11) default NULL,
+-  father_id int(11) default NULL,
+-  mother_id int(11) default NULL,
+-  spouse_id int(11) default NULL,
+-  notes varchar(255) default NULL,
+-  PRIMARY KEY  (person_id),
+-  KEY person_last_name (last_name(10)),
+-  KEY person_first_name (first_name(10))
+-) TYPE=MyISAM;
+-
+-INSERT INTO people VALUES (1,'Unknown','Person',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+-
+---
+--- Table structure for table 'photo_albums'
+---
+-
+-CREATE TABLE photo_albums (
+-  photo_id int(11) NOT NULL default '0',
+-  album_id int(11) NOT NULL default '0',
+-  PRIMARY KEY  (photo_id,album_id)
+-) TYPE=MyISAM;
+-
+---
+--- Table structure for table 'photo_categories'
+---
+-
+-CREATE TABLE photo_categories (
+-  photo_id int(11) NOT NULL default '0',
+-  category_id int(11) NOT NULL default '0',
+-  PRIMARY KEY  (photo_id,category_id)
+-) TYPE=MyISAM;
+-
+---
+--- Table structure for table 'photo_people'
+---
+-
+-CREATE TABLE photo_people (
+-  photo_id int(11) NOT NULL default '0',
+-  person_id int(11) NOT NULL default '0',
+-  position int(11) default NULL,
+-  PRIMARY KEY  (photo_id,person_id)
+-) TYPE=MyISAM;
+-
+---
+--- Table structure for table 'photos'
+---
+-
+-CREATE TABLE photos (
+-  photo_id int(11) NOT NULL auto_increment,
+-  name varchar(128) default NULL,
+-  path varchar(255) default NULL,
+-  width int(11) default NULL,
+-  height int(11) default NULL,
+-  size int(11) default NULL,
+-  title varchar(64) default NULL,
+-  photographer_id int(11) default NULL,
+-  location_id int(11) default NULL,
+-  view varchar(64) default NULL,
+-  rating tinyint(4) default NULL,
+-  description blob,
+-  date varchar(10) default NULL,
+-  time varchar(8) default NULL,
+-  camera_make varchar(32) default NULL,
+-  camera_model varchar(32) default NULL,
+-  flash_used char(1) default NULL,
+-  focal_length varchar(64) default NULL,
+-  exposure varchar(64) default NULL,
+-  compression varchar(64) default NULL,
+-  aperture varchar(16) default NULL,
+-  level tinyint(4) NOT NULL default '1',
+-  iso_equiv varchar(8) default NULL,
+-  metering_mode varchar(16) default NULL,
+-  focus_dist varchar(16) default NULL,
+-  ccd_width varchar(16) default NULL,
+-  comment varchar(128) default NULL,
+-  timestamp timestamp(14) NOT NULL,
+-  PRIMARY KEY  (photo_id),
+-  KEY photo_photog_id (photographer_id),
+-  KEY photo_loc_id (location_id),
+-  KEY photo_rating (rating),
+-  KEY photo_level (level)
+-) TYPE=MyISAM;
+-
+---
+--- Table structure for table 'places'
+---
+-
+-CREATE TABLE places (
+-  place_id int(11) NOT NULL auto_increment,
+-  contact_type int(11) NOT NULL default '0',
+-  title varchar(64) NOT NULL default '',
+-  address varchar(64) default NULL,
+-  address2 varchar(64) default NULL,
+-  city varchar(32) default NULL,
+-  state varchar(32) default NULL,
+-  zip varchar(10) default NULL,
+-  country varchar(32) default NULL,
+-  notes varchar(255) default NULL,
+-  PRIMARY KEY  (place_id),
+-  KEY place_city (city(10)),
+-  KEY place_title (title(10))
+-) TYPE=MyISAM;
+-
+---
+--- Table structure for table 'prefs'
+---
+-
+-CREATE TABLE prefs (
+-  user_id int(11) NOT NULL default '0',
+-  show_breadcrumbs char(1) NOT NULL default '1',
+-  num_breadcrumbs smallint(5) unsigned NOT NULL default '8',
+-  num_rows tinyint(3) unsigned NOT NULL default '3',
+-  num_cols tinyint(3) unsigned NOT NULL default '4',
+-  max_pager_size tinyint(3) unsigned NOT NULL default '10',
+-  random_photo_min_rating tinyint(3) unsigned NOT NULL default '0',
+-  reports_top_n smallint(5) unsigned NOT NULL default '5',
+-  color_scheme_id int(11) NOT NULL default '1',
+-  slideshow_time smallint(6) NOT NULL default '5',
+-  language char(2) default NULL,
+-  recent_photo_days smallint(6) NOT NULL default '7',
+-  auto_edit char(1) NOT NULL default '0',
+-  camera_info char(1) NOT NULL default '1',
+-  desc_thumbnails char(1) NOT NULL default '0',
+-  PRIMARY KEY  (user_id)
+-) TYPE=MyISAM;
+-
+-INSERT INTO prefs VALUES (1,'1',8,3,4,10,0,5,1,5,NULL,7,'0','1','0');
+-
+---
+--- Table structure for table 'users'
+---
+-
+-CREATE TABLE users (
+-  user_id int(11) NOT NULL auto_increment,
+-  person_id int(11) NOT NULL default '0',
+-  user_class char(1) NOT NULL default '1',
+-  user_name varchar(16) NOT NULL default '',
+-  password varchar(32) default NULL,
+-  browse_people char(1) NOT NULL default '0',
+-  browse_places char(1) NOT NULL default '0',
+-  detailed_people char(1) NOT NULL default '0',
+-  detailed_places char(1) NOT NULL default '0',
+-  import char(1) NOT NULL default '0',
+-  lightbox_id int(11) default NULL,
+-  PRIMARY KEY  (user_id)
+-) TYPE=MyISAM;
+-
+-INSERT INTO users VALUES (1,1,'0','admin',password('admin'),'1','1','1','1','1',NULL);
+-
+diff -Nru zoph-0.3.3/sql/zoph_update-0.2.1.sql zoph.new/sql/zoph_update-0.2.1.sql
+--- zoph-0.3.3/sql/zoph_update-0.2.1.sql	2002-06-22 01:43:45.000000000 +0100
++++ zoph.new/sql/zoph_update-0.2.1.sql	1970-01-01 01:00:00.000000000 +0100
+@@ -1,27 +0,0 @@
+-#
+-# focal length was not long enough for some cameras
+-#
+-alter table photos modify focal_length varchar(64);
+-
+-#
+-# let these descriptions be larger too
+-#
+-alter table albums modify album_description varchar(255);
+-alter table categories modify category_description varchar(255);
+-
+-#
+-# a couple new photo fields
+-#
+-alter table photos add focus_dist varchar(16);
+-alter table photos add ccd_width varchar(16);
+-alter table photos add comment varchar(128);
+-
+-#
+-# forgot to make this not null
+-#
+-alter table users modify detailed_people char(1) not null default '0';
+-
+-#
+-# change state from char(2) to varchar(32) so it can be more versatile
+-#
+-alter table places modify state varchar(32);
+diff -Nru zoph-0.3.3/sql/zoph_update-0.3.1.sql zoph.new/sql/zoph_update-0.3.1.sql
+--- zoph-0.3.3/sql/zoph_update-0.3.1.sql	2002-09-30 17:15:41.000000000 +0100
++++ zoph.new/sql/zoph_update-0.3.1.sql	1970-01-01 01:00:00.000000000 +0100
+@@ -1,33 +0,0 @@
+-#
+-# Zoph 0.3 -> 0.3.1 update
+-# 30 Sep 2002
+-#
+-
+-#
+-# create a pref for an always edit mode
+-#
+-alter table prefs add auto_edit char(1) not null default '0';
+-
+-#
+-# create a pref for whether to display camera info
+-#
+-alter table prefs add camera_info char(1) not null default '1';
+-
+-#
+-# create a field to define a lightbox for a user
+-#
+-alter table users add lightbox_id int;
+-
+-#
+-# These tables were accidentally included in zoph.sql 0.3
+-#
+-drop table contact_types;
+-drop table email_addresses;
+-drop table links;
+-drop table people_email_addresses;
+-drop table people_phone_numbers;
+-drop table people_places;
+-drop table phone_numbers;
+-drop table photo_links;
+-drop table places_phone_numbers;
+-drop table related_photos;
+diff -Nru zoph-0.3.3/sql/zoph_update-0.3.2.sql zoph.new/sql/zoph_update-0.3.2.sql
+--- zoph-0.3.3/sql/zoph_update-0.3.2.sql	2002-10-17 18:46:09.000000000 +0100
++++ zoph.new/sql/zoph_update-0.3.2.sql	1970-01-01 01:00:00.000000000 +0100
+@@ -1,13 +0,0 @@
+-#
+-# Zoph 0.3.1 -> 0.3.2 update
+-# 17 Oct 2002
+-#
+-
+-#
+-# four new color schemes if you want them
+-#
+-INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('hoenig','FFEFD6','5C1F00','330000','330000','FFFBF5','000000','FFF7EB','FFE7C2','FFE7C2','5C1F00','FFD799','000000','993300');
+-INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('forest','336633','000000','000000','000000','99CC99','000000','669966','663300','663300','E0E0E0','996633','FFFFFF','99CC99');
+-INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('black','000000','FFFFFF','FFFFFF','FFFFFF','000000','FFFFFF','000000','666666','666666','FFFFFF','999999','FFFFFF','FFFFFF');
+-INSERT INTO color_schemes (name, page_bg_color, text_color, link_color, vlink_color, table_bg_color, table_border_color, breadcrumb_bg_color, title_bg_color, tab_bg_color, tab_font_color, selected_tab_bg_color, selected_tab_font_color, title_font_color) VALUES ('beach','646D7E','000000','000000','000000','F9EEE2','000000','9AADC7','C6DEFF','617C58','D0D0D0','8BB381','000000','646D7E');
+-
+diff -Nru zoph-0.3.3/sql/zoph_update-0.3.3.sql zoph.new/sql/zoph_update-0.3.3.sql
+--- zoph-0.3.3/sql/zoph_update-0.3.3.sql	2002-11-11 17:49:21.000000000 +0000
++++ zoph.new/sql/zoph_update-0.3.3.sql	1970-01-01 01:00:00.000000000 +0100
+@@ -1,9 +0,0 @@
+-#
+-# Zoph 0.3.2 -> 0.3.3 update
+-# 18 Nov 2002
+-#
+-
+-#
+-# create a pref for displaying descriptions under thumbnails
+-#
+-alter table prefs add desc_thumbnails char(1) not null default '0';
+diff -Nru zoph-0.3.3/sql/zoph_update-0.3.sql zoph.new/sql/zoph_update-0.3.sql
+--- zoph-0.3.3/sql/zoph_update-0.3.sql	2002-09-25 01:03:58.000000000 +0100
++++ zoph.new/sql/zoph_update-0.3.sql	1970-01-01 01:00:00.000000000 +0100
+@@ -1,30 +0,0 @@
+-#
+-# Zoph 0.2.1 -> 0.3 update
+-# 20 Sep 2002
+-#
+-
+-#
+-# increase size of name and path photo fields
+-#
+-alter table photos modify name varchar(128);
+-alter table photos modify path varchar(255);
+-
+-#
+-# create timestamp field
+-#
+-alter table photos add timestamp timestamp(14);
+-
+-#
+-# create a language pref field
+-#
+-alter table prefs add language char(2);
+-
+-#
+-# create a field for the number of days used by the view recent links
+-#
+-alter table prefs add recent_photo_days smallint not null default 7;
+-
+-#
+-# create a import permission field
+-#
+-alter table users add import char(1) not null default '0';
--- zoph-0.8.0.1.orig/etc/zoph/apache.conf
+++ zoph-0.8.0.1/etc/zoph/apache.conf
@@ -0,0 +1,8 @@
+
+Alias /zoph /usr/share/zoph
+
+
+  Options FollowSymLinks
+  AllowOverride Limit Options FileInfo
+
+
--- zoph-0.8.0.1.orig/docs/configuration.html
+++ zoph-0.8.0.1/docs/configuration.html
@@ -460,7 +460,7 @@
 
Zoph automatically creates thumbnails and medium sized ('mid') images during import. To influence this proces, you can edit the following parameters:

 

 
Important!

-

+
The options in this section have a matching setting in ZophImport. These have to be set the same.

 
The options in this section have a matching setting in ZophImport.pl. These have to be set the same.

 

 

@@ -556,7 +556,7 @@
 Versions: 0.3 and later
 
 
-Description: Convert thumbnails to JPEGs. This setting should match what is in zophImporter.pl. If you are installing Zoph for the first time, it is recommend to set this to 0 and change zophImport.pl accordingly. If you are upgrading, see the Zoph/Upgrading#Zoph_0.2.1_-.3E_0.3_Upgrade for more information about this.
+Description: Convert thumbnails to JPEGs. This setting should match what is in zophImport. If you are installing Zoph for the first time, it is recommend to set this to 0 and change zophImport accordingly. If you are upgrading, see the Zoph/Upgrading#Zoph_0.2.1_-.3E_0.3_Upgrade for more information about this.
 
 
 Default: 1
@@ -594,7 +594,7 @@
 
 Database configuration

 

 
Important!

-

+
The options in this section have a matching setting in ZophImport. These have to be set the same.

 
The options in this section have a matching setting in ZophImport.pl. These have to be set the same.

 

 

@@ -929,7 +929,7 @@
 Versions: 0.5 and later
 
 
-Description: Put the files uploaded via the web import in dated directories, just like the --datedDirs option for zophImport.pl. For example, a photo taken on Dec 21, 2005, will be placed in a directory 2005.12.21, under your default path.
+Description: Put the files uploaded via the web import in dated directories, just like the --datedDirs option for zophImport. For example, a photo taken on Dec 21, 2005, will be placed in a directory 2005.12.21, under your default path.
 
 
 Default: 0
@@ -950,7 +950,7 @@
 Versions: 0.5 and later
 
 
-Description: Put the files uploaded via the web import in hierarchical dated directories, just like the --hierarchical option for zophImport.pl. For example, a photo taken on Dec 21, 2005, will be placed in a directory tree 2005/12/21, under your default path.
+Description: Put the files uploaded via the web import in hierarchical dated directories, just like the --hierarchical option for zophImport. For example, a photo taken on Dec 21, 2005, will be placed in a directory tree 2005/12/21, under your default path.
 
 
 Default: 0
--- zoph-0.8.0.1.orig/docs/using_the_commandline_tools.html
+++ zoph-0.8.0.1/docs/using_the_commandline_tools.html
@@ -17,7 +17,7 @@
 
Contents

 
 
    
-
  • 1 ZophImport.pl
+
  • 1 ZophImport
 
 
    • 
-
  • 2 ZophExport.pl
+
  • 2 ZophExport
 
      
 
    • 2.1 A Quick Example
      • 
 
    • 2.2 Selecting Photos
      • 
@@ -44,8 +44,8 @@
 
 
 
-
      
-
       ZophImport.pl
      
+
      
+
       ZophImport
      
 
      
 
       Loading Images
      
 
      This section describes the command line Perl importer. The next one talks about the web based importer.
      
@@ -68,7 +68,7 @@
 
       > ls ~/incoming
 DCP_0155.JPG
-> zophImport.pl --path dc280 --datedDirs ~/incoming/*.JPG
+> zophImport --path dc280 --datedDirs ~/incoming/*.JPG
 
      
 
      The --path flag tells the importer I want the photos to be put in the dc280 directory. The --datedDirs flag means that the photo should be put in a subdirectory based on the date field found in the photos Exif header. After running the script:
      
 
      @@ -77,13 +77,13 @@
 > ls dc280/2002.03.14
 DCP_0155.JPG mid thumb
 
      
-
      The mid/ and thumb/ directories hold images scaled down to 120 and 480 pixels respectively. If you wonder why zophImport.pl takes so long to import photos it is because it is creating these two smaller images (using ImageMagick's convert utility).
      
+
      The mid/ and thumb/ directories hold images scaled down to 120 and 480 pixels respectively. If you wonder why zophImport takes so long to import photos it is because it is creating these two smaller images (using ImageMagick's convert utility).
      
 
      What if you don't want to use dated directories to store your images? Here is an alternative way:
      
 
       > pwd
 /home/jgeiger/photos
 > mkdir christmas_2001
-> zophImport.pl --path christmas_2001 ~/incoming/*.JPG
+> zophImport --path christmas_2001 ~/incoming/*.JPG
 > ls christmas_2001
 DCP_0155.JPG mid thumb
 
      
@@ -91,7 +91,7 @@
 
       > mkdir christmas_2001
 > mv ~/incoming/*.JPG christmas_2001/
-> zophImport.pl christmas_2001/*.JPG
+> zophImport christmas_2001/*.JPG
 
      
 
      By not specifying a path, the importer uses the path that the photos are currently in.
      
 
      Whatever way you import photos, make sure you run the script from within your photos directory (as specified by IMAGE_DIR). The importer needs to be able to correctly extract the relative path to the photos from here to be stored in the database.
      
@@ -102,12 +102,12 @@
 
       > pwd
 /home/jgeiger/photos
-> zophImport.pl --path dc280 --datedDirs --photographer "Jason Geiger" --location "Jason's Apartment" --album "Zoph Tutorial" ~/incoming/*.JPG
+> zophImport --path dc280 --datedDirs --photographer "Jason Geiger" --location "Jason's Apartment" --album "Zoph Tutorial" ~/incoming/*.JPG
 
      
 
      To use the --photographer, --location and --album parameters, corresponding records must have been previously created in Zoph. So first create a person/place/album/category using the web interface, then import using them.
      
 
      What if you made a mistake, or remembered a piece of information you want to add? Pass the --update parameter so that the photos will not be inserted again:
      
 
      -> zophImport.pl --update --field rating=5 --field description="This is part of the zoph tutorial" dc280/2002.03.14/*.JPG
+> zophImport --update --field rating=5 --field description="This is part of the zoph tutorial" dc280/2002.03.14/*.JPG
 
      
 
      This will set the rating and description for all the photos I just imported. To set any of the fields found in the photos table (such as rating, title, description, etc), use the --field NAME=VALUE flag.
      
 
      For more info and examples about the importer, see the section at the end of this document.
      
@@ -116,7 +116,7 @@
 
      It is not uncommon to make a mistake while loading images so that when you view the ui you see a bunch of broken images. This most likely due to an invalid path. To check, edit one of the images in Zoph and click on "show additional attributes" at the bottom. Then you should be able to see the path info. It should always be the case that WEB_IMAGE_PATH (or IMAGE_PATH) + the photo's path field + the photo's name reflects the photo's location.
      
 
      You can use the importer to correct the paths for broken images:
      
 
      -> zophImport.pl --update --path 'dc280/2002.03.14' dc280/2002.03.14/*.JPG
+> zophImport --update --path 'dc280/2002.03.14' dc280/2002.03.14/*.JPG
 
      
 
      If you still see broken images, check the permissions on the files and directories.
      
 
      
@@ -166,44 +166,44 @@
 
      Below are a couple more examples.
      
 
      Adding a list of people to a photo (if there are many people it is often faster to do this using the importer rather than through the web ui):
      
 
      -> zophImport.pl --update --people "Jason Geiger, Virginia Wolfe" dc280/2002.03.14/DCP_0155.JPG
+> zophImport --update --people "Jason Geiger, Virginia Wolfe" dc280/2002.03.14/DCP_0155.JPG
 
      
 
      People should be listed left to right, front to back. These people must already be the database. If one of the names could not be found the importer will complain.
      
 
      Updating all the photos in a directory:
      
 
      -> find dc280/ -iname "*.jpg" -maxdepth 2 | xargs zophImport.pl --updateSize
+> find dc280/ -iname "*.jpg" -maxdepth 2 | xargs zophImport --updateSize
 
      
 
      You may want to use the --updateSize option like above if you had rotated or resized a bunch of images and wanted to get the correct dimensions into zoph. Specifying a maxdepth prevents the thumbnails from being included.
      
 
      Starting in version 0.3 of the importer you can also update photos based on their photo_ids rather than names. Say you notice couple sequences of of your photos have an incorrect location. You can see the photo_id for a photos in the url and it may be simpler to update based on that rather than by passing the file names:
      
 
      -> zophImport.pl --update --useIds --location "Yuka's House" 1562-1571 1580-1585
+> zophImport --update --useIds --location "Yuka's House" 1562-1571 1580-1585
 
      
-
      As of version 0.7, you can influence the way zophImport.pl handles symbolic links.
      
+
      As of version 0.7, you can influence the way zophImport handles symbolic links.
      
 
      For example, you have the following files IMG_0001.JPG, IMG_0002.JPG, both taken 01-01-2007 and LNK_0002.JPG, which is a symlink to IMG_0002.JPG.
      
 
      If you would import these files with
      
 
      -zophImport.pl --datedDirs IMG_0001.JPG LNK_0002.JPG
+zophImport --datedDirs IMG_0001.JPG LNK_0002.JPG
 
      
 
      You would have two files in 2007.01.01: IMG_0001.JPG and LNK_0002.JPG - both will be "normal" files. You will also have IMG_0002.JPG, still in it's old location.
      
 
      If you would import these files with
      
 
      -zophImport.pl --datedDirs --resolveSymlinks IMG_0001.JPG LNK_0002.JPG
+zophImport --datedDirs --resolveSymlinks IMG_0001.JPG LNK_0002.JPG
 
      
 
      You would have two files in 2007.01.01: IMG_0001.JPG and IMG_0002.JPG - both will be "normal" files. You will also have IMG_0002.JPG, still in it's old location.
      
 
      
 
       Reducing Thumbnail Size
      
-
      Based on a suggestion from Alan Shutko, in version 0.3.1 of zophImport.pl I added +profile "*" to the calls to convert. (And in 0.3.3 I commented out this since for some users multiple thumbnails were being generated for an image. I did not see this problem, maybe it was a shell expansion issue. For most people it probably works so you may want to re-enable this feature.)
      
+
      Based on a suggestion from Alan Shutko, in version 0.3.1 of zophImport I added +profile "*" to the calls to convert. (And in 0.3.3 I commented out this since for some users multiple thumbnails were being generated for an image. I did not see this problem, maybe it was a shell expansion issue. For most people it probably works so you may want to re-enable this feature.)
      
 
      From http://www.imagemagick.org/www/convert.html:
      
 
      "The '+profile "*"' removes any ICM, EXIF, IPTC, or other profiles that might be present in the input and aren't needed in the thumbnail."
      
 
      This can result in a significant reduction in file sizes. If you do wish to preserve the profiles, remove this argument to convert.
      
 
      Also, if you wish to regenerate your thumbnails after this change to save space, you can run a command like this from your image directory:
      
 
      -> find . -iname "*.jpg" -a -not -name "mid_*" -a -not -name "thumb_*" | xargs zophImport.pl --update --thumbnails
+> find . -iname "*.jpg" -a -not -name "mid_*" -a -not -name "thumb_*" | xargs zophImport --update --thumbnails
 
      
-
      
-
       ZophExport.pl
      
-
      Zoph is a dynamic sort of application tied closely to the database. But sometimes you want static html files of your photos to burn to a cd or whatnot. Zoph includes a perl script, zophExport.pl, that lets you easily create static galleries.
      
-
      There are numerous programs whose focus is to generate these sorts of static photo albums. Though I included a very simple built-in static album generator, zophExport.pl is primarily intended to be used with other scripts. Currently two such programs are supported:
      
+
      
+
       ZophExport
      
+
      Zoph is a dynamic sort of application tied closely to the database. But sometimes you want static html files of your photos to burn to a cd or whatnot. Zoph includes a perl script, zophExport, that lets you easily create static galleries.
      
+
      There are numerous programs whose focus is to generate these sorts of static photo albums. Though I included a very simple built-in static album generator, zophExport is primarily intended to be used with other scripts. Currently two such programs are supported:
      
 
        
 
      • album (http://marginalhacks.com/Hacks/album/)
        • 
 
      • BINS (http://bins.sautret.org/)
        • 
@@ -214,44 +214,44 @@
 
         A Quick Example
        
 
        Here is a command that creates an export for use with the album program:
        
 
        -> zophExport.pl --dir "~/Winter Pics" --format album --category Snow
+> zophExport --dir "~/Winter Pics" --format album --category Snow
 
        
-
        After the exporter finishes it's up to you to run album. zophExport.pl prints out an example command to run album which you can copy and run as is or update with your own options.
        
-
        In this simple example all photos placed in the Snow category are exported. Within the "Winter Pics" directory zophExport.pl will have created a directory structure mirroring the album structure in Zoph for the selected photos.
        
+
        After the exporter finishes it's up to you to run album. zophExport prints out an example command to run album which you can copy and run as is or update with your own options.
        
+
        In this simple example all photos placed in the Snow category are exported. Within the "Winter Pics" directory zophExport will have created a directory structure mirroring the album structure in Zoph for the selected photos.
        
 
        There are only two required arguments: the directory to export to (--dir) which will be created if it does not exist, and the format of the export (--format) which currently must be either "zoph", "album" or "bins".
        
 
        
 
         Selecting Photos
        
-
        Fields to search by are specified in the same was as in zophImport.pl. For example, you can say
        
+
        Fields to search by are specified in the same was as in zophImport. For example, you can say
        
 
        -> zophExport.pl --dir "~/My Album" --format album --album "Boston Trip" --photographer "Jason Geiger" --field rating=5
+> zophExport --dir "~/My Album" --format album --album "Boston Trip" --photographer "Jason Geiger" --field rating=5
 
        
 
        Only photos I took on my trip to Boston that I rated 5 or more would be exported. By default subalbums of an album are automatically included (so my "Duck Tour" subalbum is also exported). You can disable this by passing --nosubalbums. The same goes for categories (use --nosubcategories to disable). Most fields match using the equals operator. Two exceptions are rating (which defaults to >=) and description (which defaults to like).
        
-
        You can probably do most things you want by using this system, especially since you can run zophExport.pl multiple times with different parameters, and even edit the results by hand if you wish, before you run album or bins to generate the galleries.
        
+
        You can probably do most things you want by using this system, especially since you can run zophExport multiple times with different parameters, and even edit the results by hand if you wish, before you run album or bins to generate the galleries.
        
 
        But if you have a particularly complicated query you want to run you can just pass it in directly using the --sql argument. Your query must select * from the photos table, other than that it can be anything. If you pass a sql statement any other constraint arguments are ignored. Make sure to only pass select statements, the script does no checking to make sure you aren't deleting all your data
        
-
        Here's a tip if you run a complicated search within Zoph and then want to export only those photos. After you get to the results page open up config.inc.php and set DEBUG to 2. Then reload the results page and you should see two sql queries at the top of the page. Copy the first (the count query) and replace "count(distinct ph.photo_id)" with "ph.*", append "order by ph.date asc, ph.time asc" and pass this to zophExport.pl using the --sql argument.
        
+
        Here's a tip if you run a complicated search within Zoph and then want to export only those photos. After you get to the results page open up config.inc.php and set DEBUG to 2. Then reload the results page and you should see two sql queries at the top of the page. Copy the first (the count query) and replace "count(distinct ph.photo_id)" with "ph.*", append "order by ph.date asc, ph.time asc" and pass this to zophExport using the --sql argument.
        
 
        
 
         Choosing What to Display
        
-
        By default zophExport.pl will export everything about your photos except the last modified time, the rating and the albums or categories in which the photo appears.
        
+
        By default zophExport will export everything about your photos except the last modified time, the rating and the albums or categories in which the photo appears.
        
 
        To prevent the display of a particular field, use the --noshowFIELD argument. For example: --noshowlocation or --noshowdescription. Passing --noshowexif prevents any exif info from being shown. (Note, however, that the BINS program extracts exif info on its own).
        
 
        The exporter can translate field labels using the same language files that Zoph uses. Pass --lang /path/to/php/lang/file to enable this option.
        
 
        By default the exporter creates directories to mirror the structure of the albums in which the exported photos appear. To disable this and have all the photos appear directly under the export dir use the --noalbumdirs flag.
        
 
        
 
         A Simple Export
        
-
        The exporter contains the ability to generate a very simple static gallery. To use the simple exporter, pass --format zoph to zophExport.pl.
        
+
        The exporter contains the ability to generate a very simple static gallery. To use the simple exporter, pass --format zoph to zophExport.
        
 
        There are two advantages to this format. The first is that it requires no additional software. The second is speed. The simple format is much much faster simply because it uses the thumbnails already generated by Zoph whereas album and BINS generate their own. Someone could probably alter album or BINS so that they could reuse the thumbnails.
        
-
        There's not really any elegant way to change the appearance of the gallery generated by this exporter. To do so you probably would want to edit zophExport.pl. It wouldn't be too difficult to add css support but I didn't. I only wanted to spend so much time reinventing the wheel.
        
+
        There's not really any elegant way to change the appearance of the gallery generated by this exporter. To do so you probably would want to edit zophExport. It wouldn't be too difficult to add css support but I didn't. I only wanted to spend so much time reinventing the wheel.
        
 
        
 
         Exporting to Album
        
 
        album is written by David Ljung Madison. http://marginalhacks.com/Hacks/album/
        
 
        album is a single perl script which requires nothing more than you already have from using Zoph (ImageMagick and Image::Size). A debian package is available.
        
-
        To use album, specify --format album to zophExport.pl. The exporter will create a captions.txt file in each directory that contains images.
        
+
        To use album, specify --format album to zophExport. The exporter will create a captions.txt file in each directory that contains images.
        
 
        Album is themeable and a number of themes are available from the website. I'd recommend you download a different theme, or create your own, simply because the default theme displays all of the info about a photo on the thumbnails page which can be quite a bit if you include descriptions and exif data. You specify a theme by passing -theme /path/to/theme/dir to album.
        
 
        
 
         Exporting to BINS
        
 
        BINS is written by Jerome Sautret, based on SWIGS, written by Brendan McMahan, which was in turn based on IDS by John Moose. http://bins.sautret.org/
        
 
        BINS consists of three perl scripts: an exporter and two image/album description editors. A debian package is available. BINS requires a number of perl modules which you can get from CPAN if you need to.
        
-
        To use BINS, specify --format bins to zophExport.pl. The exporter will create an image.jpg.xml file for each photo and an album.xml file in each directory.
        
-
        BINS takes a source directory and a target directory. zophExport.pl will create the target directory based on the --dir you specify. It will also append ".tmp" to the target directory name and create another directory to which it will copy the images from Zoph and which will act as the source dir for BINS. You can remove this temp dir after BINS finishes. You can set the source and target directory to the same dir in BINS but you can only run BINS against that directory once, after that it will start creating thumbnails of the thumbnails, etc.
        
+
        To use BINS, specify --format bins to zophExport. The exporter will create an image.jpg.xml file for each photo and an album.xml file in each directory.
        
+
        BINS takes a source directory and a target directory. zophExport will create the target directory based on the --dir you specify. It will also append ".tmp" to the target directory name and create another directory to which it will copy the images from Zoph and which will act as the source dir for BINS. You can remove this temp dir after BINS finishes. You can set the source and target directory to the same dir in BINS but you can only run BINS against that directory once, after that it will start creating thumbnails of the thumbnails, etc.
        
 
        You can create a config xml file for BINS to use. I found it useful to set the defaultSize parameter to 0 (default to small images).
        
 
 
--- zoph-0.8.0.1.orig/docs/installation.html
+++ zoph-0.8.0.1/docs/installation.html
@@ -36,7 +36,7 @@
 
 
@@ -143,12 +143,10 @@
 1;

Because Perl does not like it when the last assignment of the file is negative.

-

-

Copy bin/zophImport.pl and bin/zophExport.pl to /usr/local/bin

Or some other directory in your PATH.

Install the man page

-

A man page for zophImport.pl is in the man/ directory. Copy this to somewhere in your manpath, /usr/local/man/man1 for example.

+

A man page for zophImport is in the man/ directory. Copy this to somewhere in your manpath, /usr/local/man/man1 for example.

Test it

Try hitting http://localhost/zoph/logon.php. You should be presented with the logon screen. Log in using "admin" for user and "admin" for password.

--- zoph-0.8.0.1.orig/docs/using_the_webinterface.html +++ zoph-0.8.0.1/docs/using_the_webinterface.html @@ -135,7 +135,7 @@

The Web Based Importer

-

The web based importer is a new template in Zoph 0.3 that provides an alternative to the command line importer, zophImport.pl. This template does not yet contain all the functionality of zophImport.pl.

+

The web based importer is a new template in Zoph 0.3 that provides an alternative to the command line importer, zophImport. This template does not yet contain all the functionality of zophImport.

To use the importer, at least one of CLIENT_WEB_IMPORT and SERVER_WEB_IMPORT must be set to 1 in config.inc.php and you must be logged in as either an admin or a user that has been granted permission to import.

Enable CLIENT_WEB_IMPORT to upload files through the web-interface using a 'browse' button, and enable SERVER_WEB_IMPORT to import files through the web-interface for files that are already on the server. CLIENT_WEB_IMPORT and SERVER_WEB_IMPORT may be both activated.

If you are going to be importing directories of photos you will probably need to increase the size of max_execution_time in php.ini. The default is 30 seconds but you will probably need this to be a couple minutes or more, depending on how many images you import and how fast your computer is.

--- zoph-0.8.0.1.orig/docs/upgrading.html +++ zoph-0.8.0.1/docs/upgrading.html @@ -8,17 +8,16 @@

All text is available under the terms of the GNU Free Documentation License. For the latest version of this document, see Wikibooks.

-

Zoph/Upgrading

+

Zoph/Upgrading

-

Upgrading Zoph is a relatively simple process; it consists of moving the php, javascript, language and image files into your web root (beware that you may want to keep your config.inc.php) and running an SQL script that makes the database changes. More details about this process and special instructions per version are described below.

- +

Contents
- -

-

Zoph 0.7 to 0.8

- -

Copy php/* to the location of your installation. Make sure that you also copy the js and img subdirectories. If you use the translations in Zoph, make sure to also copy the lang directory.

-

Copy bin/zophImport.pl into the directory where you installed it, if you followed the installation instructions it is probably /usr/local/bin, otherwise, find out with which zophImport.pl.

+ +

+

Zoph 0.7 to 0.7.5

+

You can also use these instructions to go from 0.7.0.x to 0.7.5, for an update from 0.7.1, 0.7.2, 0.7.2.1, 0.7.3 or 0.7.4 see 0.7.x to 0.7.x

+

Copy php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

Updating the Database

If you are upgrading from an older version than 0.7, please run the older database updates first.

Execute zoph-update-0.8.sql:

-mysql -u zoph_admin -p zoph < sql/zoph_update-0.8.sql
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.8.sql

The database upgrade script makes the following changes:

    @@ -94,7 +166,7 @@

Group access rights

-

As of Zoph 0.7.4, you have to make your users members of a group and then assign viewing rights for albums to the group, instead of to the users directly. After the update to 0.7.4, you will have no groups and therefore your users will not be allowed to see any photos, you should create one or more groups, make your user member of one or more of them and assign viewing rights to the groups. If you'd rather stay with your current per-user viewing rights, you can use the user_to_group.php script in the contrib directory: this will create a new group for each user and assign the currently defined access rights for each user the newly created groups. To use this script:

+

As of Zoph 0.7.4, you have to make your users members of a group and then assign viewing rights for albums to the group, instead of to the users directly. After the update to 0.7.4, you will have no groups and therefore your users will not be allowed to see any groups, you should create one or more groups, make your user member of one or more of them and assign viewing rights to the groups. If you'd rather stay with your current per-user viewing rights, you can use the user_to_group.php script in the contrib directory: this will create a new group for each user and assign the currently defined access rights for each user the newly created groups. To use this script:

  1. Make a backup of your current Zoph database;
  2. Copy the users_to_group.php script into your Zoph php directory;
    3. @@ -103,27 +175,368 @@
  3. Change the part after the last / in your browser into user_to_group.php;

After this, you can remove the zoph_album_permissions table in Zoph, as it is no longer used.

-

-

Zoph 0.7.x to 0.8 update

- -

If you have previously upgraded to a feature release (0.7.1, 0.7.2, 0.7.3 or 0.7.4), you need to edit zoph-update-0.8.sql. You should comment out the changes that have already been applied to your system. For example, if you are upgrading from 0.7.1 to 0.8, you will need to prepend the changes for 0.7.1 with a #, since you have already applied those changes when you updated to 0.7.1. After that, you can follow the instructions for 0.7 to 0.8

-

-

Zoph 0.7.5 or 0.8 pre-release to 0.8

-

If you are upgrading from 0.7.5 or or a 0.8 pre-release to 0.8, you don't need to run any database scripts, there are no database changes in this upgrade.

-

Follow the instructions for 0.7 to 0.8, but skip the database upgrades.

+

+

Zoph 0.7.x to 0.7.x update

+

If you are upgrading from a feature release to another feature release, you need to edit zoph-update-0.8.sql. You should comment out the changes that have already been applied to your system. For example, if you are upgrading from 0.7.1 to 0.7.4, you will need to prepend the changes for 0.7.1 with a #, since you have already applied those changes when you updated to 0.7.1. After that, you can follow the instructions for 0.7 to 0.7.x.

Zoph 0.7 to Zoph 0.7.0.x

Copy php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

You can upgrade directly from 0.6 to 0.7.0.x, simply use the zoph-0.7.0.x.tar.gz and execute the instructions for the 0.6 to 0.7 upgrade.

-

-

Older versions

-

For upgrades from an older version of Zoph: Zoph/Upgrading/Archive

- +

+

Zoph 0.6 -> 0.7 update

+

Copy php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

+

+

Updating the Database

+

If you are upgrading from an older version than 0.6, please run the older database updates first.

+

Execute zoph-update-0.7.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.7.sql
+
+

The database upgrade script makes the following changes:

+
    +
  • Adds preference fields for "show all exif", autocomplete, view and autothumb features
    • +
  • Adds coverphoto field to albums, categories, places and people.
    • +
+

+

Configuration updates

+

(see Zoph/Configuration for details):

+

+

New options

+ +

+

Perl script changes

+

As of v0.7, you can set some defaults for zophImport from .zophrc. The example file zophrc.sample has been updated with these settings:

+
+$datedDirs = 0;
+$copy = 0;
+$hierarchical = 0;
+$verbose = 0;
+$resolveSymlinks = 0;
+
+

zophImport now has an option to resolve symlinks during import. For more details, see Using the commandline tools

+

+

Zoph 0.5.x -> 0.6 update

+

Copy php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

+

+

Updating the Database

+

If you are upgrading from an older version than 0.5, please run the older database updates first. It is not necessary to update to 0.5.1 if you are still running 0.5.

+

Execute zoph-update-0.6.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.6.sql
+
+

The database upgrade script makes the following changes:

+
    +
  • Add sortorder fields to albums and categories
    • +
  • Add url + description fields to places
    • +
  • Make changes needed for user comments: +
      +
    • Add table for comments
      • +
    • Add table to link comments to a photo
      • +
    • Add a field to a user to indicate whether or not this user can make comments
      • +
    +
    • +
  • Add a table to create relations between photos
    • +
  • Change the rating field length, because it couldn't hold a 10 and was truncated to 0 decimals in a previous version.
    • +
+

+

Configuration updates

+

(see Zoph/Configuration for details):

+

+

New options

+ +

+

Changed options

+
    +
  • USE_IMAGE_SERVICE is now on by default
    • +
  • DEFAULT_TABLE_WIDTH again has support for % (this was accidently removed in 0.5), please note that it is now required to specify the entity ("px" or "%").
    • +
+

+

Perl script changes

+

As of v0.6, no settings need to be made in zophImport and <zophExport, it is replaced by a settings file .zophrc in the home directory of the user that runs these scripts. An example file called zophrc.sample is included with Zoph:

+
+#-----------------------------------------
+# Configuration file for Zoph
+#-----------------------------------------
+#
+# Rename this file to .zophrc and place it in your home directory.
+#
+# All settings must match the settings with the same name in config.inc.php
+#
+# edit these to reflect your database
+$db_host = 'localhost';  # hostname or hostname:port
+$db_name = 'zoph';
+$db_user = 'zoph_rw';
+$db_pass = 'pass';
+$db_prefix = 'zoph_';
 
+#
+# set this to your image directory
+#
+$image_dir = '/data/images/';
+
+

Note: the Debian version of Zoph was already using this configuration.

+

+

Zoph 0.5 -> 0.5.1 Upgrade

+

Copy over php/* to the location of your installation. Make sure to also copy the php/lang subdirectory. No datebase changes are needed for this release.

+

+

Zoph 0.4 -> 0.5 Upgrade

+

Copy over php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

+

+

Updating the Database

+

If you are upgrading from an older version than 0.4, please run the older database updates first.

+

Execute zoph-update-0.5.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.5.sql
+
+

The database upgrade script makes the following changes:

+
    +
  • Change the password length to 64 bytes. Needed for Mysql 4.1 compatibility.
    • +
  • Changes to the places table for hierarchical locations: +
      +
    • add the parent_place_id column.
      • +
    • copy the location that currently has place_id 1 to a new place_id.
      • +
    • Update all the photos taken at that location
      • +
    • Change place_id 1 to "World" (You may want to change that)
      • +
    • And finally makes all the other places a child of "World".
      • +
    +
    • +
  • Add a column to the prefs table for opening fullsize photos in a new Window
    • +
  • Add a column to the album_permissions table for the watermarking feature
    • +
+

+

Configuration updates

+

A few new configuration options have been added in Zoph 0.5.

+

+

Forcing SSL

+

You can now force the usage of SSL for the web interface, either just for logging on or for the entire Zoph session. You can control the behaviour by adepting the following settings:

+
+define('FORCE_SSL_LOGIN', 0);
+define('FORCE_SSL', 0);
+
+

You will also need to tell Zoph at what URL it can be found, because it will need to redirect users from SSL to plain and vice versa:

+
+define('ZOPH_URL', 'http://myserver.com/zoph');
+define('ZOPH_SECURE_URL', 'https://myserver.com/zoph');
+
+

For more details see FORCE_SSL_LOGIN, FORCE_SSL, ZOPH_URL and ZOPH_SECURE_URL.

+

+

Using watermarks

+

You can now have Zoph add a watermark to the high resolution images, to prevent unauthorized use of your photos. The watermark is a partly transparant GIF image that needs to be placed in your IMAGE_DIR. To use watermarking, make the following changes to your configuration:

+
+define('WATERMARKING', 1);
+define('WATERMARK', 'watermark.gif');
+
+

You will also need to enable the image service if you have not already done so:

+
+define('USE_IMAGE_SERVICE', 1);
+
+

For more details see WATERMARKING, WATERMARK and USE_IMAGE_SERVICE.

+

+

Web import changes

+

A few changes have been made to the web importer. To delete an uploaded ZIP file after a successful import, change this line in the configuration:

+
+define('REMOVE_ARCHIVE', 1);
+
+

To enable dated directories in the Web importer:

+
+define('USE_DATED_DIRS', 1);
+define('HIER_DATED_DIRS', 0);
+
+

To enable hierarchical dated directories in the Web importer:

+
+define('USE_DATED_DIRS', 1);
+define('HIER_DATED_DIRS', 1);
+
+

The default UMASK and DIR_MODE have been changed as of v0.5:

+
+define('IMPORT_UMASK', 022);
+define('DIR_MODE', 0755);
+
+

For more detais, see REMOVE_ARCHIVE, USE_DATED_DIRS, HIER_DATED_DIRS, IMPORT_UMASK and DIR_MODE.

+

+

Adding multiple people at once

+

You can now add multiple people at once using the edit photo page or the bulk edit mode. To enable this feature, set MAX_PEOPLE_SLOTS to a reasonable maximum (recommendation: 5-10).

+
+define('MAX_PEOPLE_SLOTS', 5);
+
+

After that, go to the preference page and set "number of people to add at once" to a number that is convenient for that user. Each user can indivually set this number, but never higher than the number defined in MAX_PEOPLE_SLOTS. Bear in mind that setting either to a (very) high number, could (severely) impact performance.

+

For more detais, see MAX_PEOPLE_SLOTS

+

+

Zoph 0.3.3 -> 0.4 Upgrade

+

Copy over php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

+

+

Updating the Database

+

If you are upgrading from an older version than 0.3.3, please run the older database updates first. If you have been using a 0.4-pre version, you do not need to update the database again.

+

Execute zoph-update-0.4.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.4.sql
+
+

The database upgrade script makes the following changes:

+
    +
  • Changes the name of all the tables to zoph_<old name>. If you do not want this, comment out the lines starting with "rename table". Make sure the variable DB_PREFIX in config.inc.php and $db_prefix in zophImport and zophExport match your choice.
    • +
  • Adds a few columns to zoph_album_permissions and zoph_users, to be able to monitor such as changes to permissions and last login.
    • +
  • Adds "email" to people.
    • +
  • Makes modifications for the new rating system, where multiple ratings can be done on a single photo and average is calculated automatically.
    • +
+

+

Updating configuration

+

A number of configuration items have been added since v0.3.3. You can use the list below to update your current configuration file, or simply use the one in the distribution and change it to your needs.

+

Set DB_PREFIX to a prefix for each tablename, see db update for details. Suggested is to use 'zoph_', as this will be the default in future releases. Make sure $db_prefix in zophImport and zophExport matches this setting.

+

Much of the style information has been removed from the HTML code and is now in a separate CSS file. Please set CSS_SHEET to 'css.php' to load the CSS file.

+

You can now choose the authentication method used by zoph; set $VALIDATOR accordingly. Possible choices:

+

'default_validate':

+
+   use the 'old' authentication method, probably the best choice for most.
+
+

'htpasswd_validate':

+
+   use htpasswd to validate users.
+
+

'php_validate':

+
+   let PHP take care of validation. See http://www.php.net/features.http-auth
+
+

You could also write your own authentication module; make it a function in validator.inc.php and set $VALIDATOR to it's name.

+

You can automatically send a copy of each e-mail sent from Zoph to a predefined address by setting BCC_ADDRESS to that address. Zoph includes a link to the site when notifying a user of (new) access rights. If Zoph is unable to determine the correct URL itself, please set ZOPH_URL to the correct value.

+

If you want to be able to annotate photo's, set ANNOTATE_PHOTOS to 1 and set ANNOTATE_TEMP_DIR and ANNOTATE_TEMP_PREFIX to a sensible value (suggested: '/tmp' and 'zoph').

+

To set the destination path in the web import to some default value, define the variable DEFAULT_DESTINATION_PATH; suggested value: 'uploads/date(Y.m.d)'. To hide this path from non-admin users, also define SHOW_DESTINATION_PATH and set it to 0, if you do not want to hide it, set it to 1.

+

To allow users to rate photos, set ALLOW_RATINGS to 1; otherwise to 0.

+

Zoph can now rotate images for you. Add the following settings and adapt where needed:

+
+// allow images to be rotated
+define('ALLOW_ROTATIONS', 1);
+define(ROTATE_CMD, 'convert');
+//define('ROTATE_CMD', 'jpegtran');
+// set to 1 to backup the original before it is rotated
+define('BACKUP_ORIGINAL', 1);
+// copy the original to a file with this prefix
+define('BACKUP_PREFIX', 'orig_');
+
+

+

Zoph 0.3.2 -> 0.3.3 Upgrade

+

If you are upgrading from a version previous to 0.3.2, please run the older database updates first.

+

+

Updating the Database

+

This update adds a new column to the prefs table.

+

Execute zoph-update-0.3.3.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.3.3.sql
+
+

+

Updating the Templates

+

Copy over php/* to the location of your installation (back up your old config.inc.php first if you need to). Make sure to also copy the php/lang subdirectory as there are additions to the language files.

+

There are a few new settings in config.inc.php. The old WEB_IMPORT setting was replaced with CLIENT_WEB_IMPORT and SERVER_WEB_IMPORT so that you can enable/disable one or the other if you like.

+

This release also supports the uploading of zip and tar files. Set the UNZIP_CMD and/or UNTAR_CMD to enable this. This feature extracts the images to a temp folder before loading them. The path to this folder is set by EXTRACT_DIR.

+

Another new feature is the addition of a pref to let photo descriptions appear under the thumbnails. The MAX_THUMB_DESC config sets the maximum number of characters to display.

+

+

A New Export Script

+

You'll find a new perl script in this release, bin/zophExport, which can be used to create static html galleries of your photos. See the manual for more info.

+

+

Zoph 0.3.1 -> 0.3.2 Upgrade

+

If you are upgrading from a version previous to 0.3.1, please run the older database updates first.

+

+

Updating the Database

+

The only thing added in this update are four new color schemes. You an skip this if you don't think you will use them.

+

Execute the statements in zoph-update-0.3.2.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.3.2.sql
+
+

+

Updating the Templates

+

Copy over php/* to the location of your installation. Make sure to also copy the php/lang subdirectory as there are additions to the language files. Also included in this release are the htmlized docs, in the php/docs/ directory, if you want them.

+

There are two new additions to config.inc.php: a VERSION variable and the DEFAULT_SHOW_ALL setting. The DEFAULT_SHOW_ALL setting makes all people or places shown by default when you visit the people or places pages. If you don't have hundreds of records this is probably more convenient than defaulting to 'a'. It is enabled by default.

+

That's it for this release, but I'll mention one bug fix for a problem a few users may have noticed: if you used zophImport to load images that were on a different filesystem than your images directory, everything would apparently work but the original images would not be copied. You might not have even noticed the images were missing unless you tried to view the full sized images in your browser. This release fixes this problem and makes sure other sorts of silent failure won't occur.

+

+

Zoph 0.3 -> 0.3.1 Upgrade

+

If you are upgrading from a version less than 0.3, please run the previous database updates first.

+

+

Updating the Database

+

Execute the statements in zoph-update-0.3.1.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.3.1.sql
+
+

None of the database changes should create incompatibility with version 0.3. You should update the database before updating the templates.

+

This database update attempts to delete some table accidentally included in zoph.sql in version 0.3. If you originally installed a prior version you probably do not have these tables and the update will fail when the "drop table" statements are reached. That isn't a problem, the other statements should have successfully executed first.

+

+

Updating the Templates

+

Copy over php/* to the location of your installation. Make sure to also copy the php/lang subdirectory.

+

There are no changes to config.inc.php this release so you can backup your version and then copy it over again.

+

+

Zoph 0.2.1 -> 0.3 Upgrade

+

If you are upgrading from Zoph 0.2, first update the database as described in the "Zoph 0.2 -> 0.2.1 Upgrade" section below. Updating the Database

+

Execute the statements in zoph-update-0.3.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.3.sql
+
+

None of the database changes should create incompatibility with version 0.2.1. You should update the database before updating the templates.

+

+

Updating the Templates

+

Copy over php/* to the location of your installation. Make sure to also copy the new php/lang and php/images subdirectories.

+

You may want to first backup your config.inc.php so you can copy your database settings over to the new config file.

+

Section 3 of the INSTALL file, "Configuring the PHP templates", has been updated to include information on the new config file settings.

+

The REQUIREMENTS document has info on what is need to use the new web importer.

+

The TUTORIAL has been updated to include information on using the web importer and viewing Zoph in other languages.

+

The db.inc.php template isn't needed anymore (and wasn't in the last release either, but it was accidentally included in the download). You can delete it if you like if it's still in your template directory.

+

If you are running PHP 4.2 and had to enable register_globals to get Zoph to work, with Zoph 0.3 this is no longer required. It is recommended that you disable register_globals in php.ini now. Also, to use the web importer you may need to increase the max_execution_time in php.ini to something more than the default of 30 seconds.

+

+

Configuration Changes

+

In versions of Zoph prior to 0.3, thumbnails were generated as the same file type as the original image (a jpeg image would have jpeg thumbnails, a gif image gif thumbnails, etc). As it may be desirable to instead have all thumbnails be the same type (there probably is no need, for example, to create uncompressed tiff thumbnails of tiff images), Zoph 0.3 allows you to specify that all thumbnails should be of the same type.

+

If all your images are the same type or if you don't mind having different sorts of thumbnails, you can skip this.

+

The default settings maintain compatibility with previous versions. If you would like to switch to a single thumbnail format, do the following:

+

In zophImport

+
    +
  • set $mixed_thumbnails to 1
    • +
  • set $thumb_extension to whatever you like (jpg, for example)
    • +
+

In config.inc.php set MIXED_THUMBNAILS and THUMB_EXTENSION to the same values as zophImport.

+

If you make this change and have previously generated thumbnails with an extension different from THUMB_EXTENSION, you will need to regenerate the old thumbnails. A command like the following can take care of that (this one finds gifs and makes jpgs):

+
+> find images/ -name "thumb_*.gif" -o -name "mid_*.gif" | perl -nle '$old = $_; s/\.(\w+)$/.jpg/; $cmd = "convert $old $_"; print $cmd; system($cmd);'
+
+

You can then get rid of the old thumbnails.

+

+

Preferences Changes

+

There are two new settings on the prefs page:

+

"Days past for recent photos links" sets the number of days used for the recently taken/modified links on the home page.

+

"Language" set the language to display. See the TUTORIAL for more info.

+

+

The PHP Importer

+

This version comes with a web based importer. If you are planning to use this feature you may need to install the following:

+
    +
  • GD 2.0
    • +
  • PHP 4.2
    • +
+

See the first section of the REQUIREMENTS doc for more info.

+

+

Zoph 0.2 -> 0.2.1 Upgrade

+

If you already have Zoph 0.2 installed, upgrading is fairly simple.

+

+

Updating the Database

+

Execute the statements in zoph-update-0.2.1.sql:

+
+> mysql -u zoph_admin -p zoph < sql/zoph_update-0.2.1.sql
+
+

None of the database changes should create incompatibility with version 0.2. You should update the db before updating the templates.

+

+

Updating the Templates

+

Simply copy over php/* to the location of your installation. You may want to first backup your config.inc.php then copy it over.

+

If you do keep you previous config.inc.php, be aware of one addition to that file. Copy the lines defining the DEFAULT_USER from the new config.inc.php to your file.

+

If you plan on using the new default (guest) user feature, read "Defining a Default User" in the "Creating Users" section of the tutorial.

+
--- zoph-0.8.0.1.orig/docs/index.html +++ zoph-0.8.0.1/docs/index.html @@ -16,6 +16,7 @@

Table of contents

    +
  1. README.Debian --- Debian specific instructions
  2. Requirements
  3. Installation
  4. Configuration
    5. --- zoph-0.8.0.1.orig/bin/zophImport.pl +++ zoph-0.8.0.1/bin/zophImport.pl @@ -228,8 +228,8 @@ # sub printUsage { print - "zophImport.pl $version\n" . - "Usage: zophImport.pl [OPTIONS] [IMAGE ...]\n" . + "zophImport $version\n" . + "Usage: zophImport [OPTIONS] [IMAGE ...]\n" . "OPTIONS:\n" . " --album ALBUM\n" . " --category CATEGORY\n" . --- zoph-0.8.0.1.orig/bin/zophrc.sample +++ zoph-0.8.0.1/bin/zophrc.sample @@ -10,13 +10,13 @@ $db_host = 'localhost'; # hostname or hostname:port $db_name = 'zoph'; $db_user = 'zoph_rw'; -$db_pass = 'pass'; +$db_pass = 'zoph_rw'; $db_prefix = 'zoph_'; # # set this to your image directory # -$image_dir = '/data/images/'; +$image_dir = '/var/lib/zoph/'; # # Change these to override default settings --- zoph-0.8.0.1.orig/bin/zophExport.pl +++ zoph-0.8.0.1/bin/zophExport.pl @@ -153,7 +153,7 @@ exit(1); } -print "zophExport.pl $version\n"; +print "zophExport $version\n"; # do it export(); @@ -168,8 +168,8 @@ # sub printUsage { print - "zophExport.pl $version\n" . - "Usage: zophExport.pl --dir --format zoph|album|bins [OPTIONS]\n" . + "zophExport $version\n" . + "Usage: zophExport --dir --format zoph|album|bins [OPTIONS]\n" . "OPTIONS:\n" . " --album ALBUM\n" . " --category CATEGORY\n" .