Provide MD5 value of downloads to HTTP client

Content-MD5 is a HTTP header to provide end-to-end integrity checks
(see RFC2616, 14.15). This doesn't protect against malicious
modifications, but against transmissions errors and storage errors
on the server.

The change also removes one redirect when downloading files.

.gitattributes

@@ -0,0 +1 @@
+src/IDF/version.php     export-subst

.gitignore

@@ -9,3 +9,6 @@ indefero-*.zip
 src/IDF/conf/path.php
 .tx/config
 src/IDF/locale/idf.pot.bak
+test/test.db
+test/tmp
+test/config.php

AUTHORS

@@ -1,30 +1,43 @@
-InDefero was originally created during summer 2008 
+InDefero was originally created during summer 2008
 by Loïc d'Anterroches with the support of Céondo Ltd.
 
-Much appreciated contributors:
+Much appreciated contributors (in alphabetical order):
 
-    Nicolas Lassalle <http://www.beroot.org/> - Subversion support
-    bohwaz <http://bohwaz.net/>
-    Benjamin Jorand <benjamin.jorand@gmail.com> - Mercurial support
-    Baptiste Michaud <bactisme@gmail.com> - Subversion synchronization
-    Julien Issler 
+    Adrien Bustany <madcat@mymadcat.com>
+    Andrew Nguyen <andrew-git-indefero@na-consulting.net>
+    Baptiste Durand-Bret <bathizte@ozazar.org>
+    Baptiste Michaud <bactisme@gmail.com>           - Subversion sync
+    Benjamin Jorand <benjamin.jorand@gmail.com>     - Mercurial support
+    Brenda Wallace <shiny@cpan.org>
+    Brian Armstrong <brianar>
+    Charles Melbye <charlie@yourwiki.net>
+    Ciaran Gultnieks <ciaran@ciarang.com>
+    Daniel Steudler <steudlerdaniel@gmail.com>
+    David Feeney <davidf>
+    Denis Kot <denis.kot@gmail.com>                 - Russian translation
+    Dmitry Dulepov <dmitryd>
+    Fernando Sayago Gil <mikados.mikados@gmail.com> - Spanish translation
+    Jakub Viták <mainiak@gmail.com>                 - Czech translation
+    Janez Troha <http://www.dz0ny.info>             - Slovenian translation
+    Jean-Philippe Fleury <jpfleury>
+    Jerry <lxb429@gmail.com>                        - Chinese translation
+    Julien Issler <julien@issler.net>
+    Ludovic Bellière <xrogaan>
     Manuel Eidenberger <eidenberger@gmail.com>
-    Ciaran Gultnieks
+    Matthew Dawson <mjd>
+    Matías Halles <matias@halles.cl>
     Mehdi Kabab <http://pioupioum.fr/>
-    Sindre R. Myren
+    Nicolas Lassalle <nicolas@beroot.org>           - Subversion support
     Patrick Georgi <patrick.georgi@coresystems.de>
-    Adrien Bustany
-    Charles Melbye
-    Baptiste Durand-Bret
-    Andrew Nguyen
-    David Feeney
-    Denis Kot <denis.kot@gmail.com>
-    Samuel Suther
-    Ludovic Bellière
-    Brian Armstrong
-    Raphaël Emourgeon
-    Jakub Viták
-    Vladimir Solomatin
+    Raphaël Emourgeon <raphael>
+    Samuel Suther <info@suther.de>                  - German translation
+    Sindre R. Myren <sindrero@stud.ntnu.no>
+    Stewart Platt <stew@futurete.ch>
+    Thomas Keller <me@thomaskeller.biz>             - Monotone support
+    Vladimir Solomatin <slash>
+    William Martin <william.martin@lcpc.fr>
+    Xavier Brochard <xavier@alternatif.org>
+    bohwaz <http://bohwaz.net/>
 
 And all the nice users who spent time reporting issues and promoting
 the project. The project could not live without them.

CONTRIBUTE.mdtext

@@ -104,12 +104,13 @@ without first talking to us.
 
 ## I am a translator
 
-We currently use (transifex)[http://trac.transifex.org] to help our
-users to translate indefero. You don't have to use it, but it's an
-easy way to do the job. You can visit the indefero page at transifex
-here : http://www.transifex.net/projects/p/indefero/c/indefero/
+We currently use [transifex](http://trac.transifex.org) to help our
+users translate indefero. You don't have to use it, but it's an easy
+way to do the job. You can visit the indefero page at transifex here:
+
+    http://www.transifex.net/projects/p/indefero/
 
 Please understand that your changes will not be commited instantly,
 but are sent to the maintainers e-mails before. Then, your changes
-will not be in the main repository until da-loic push the changes. In
-that way, try to do big changes with less submissions.
+will not be in the main repository until the maintainer pushs the
+changes. In that way, try to do big changes with less submissions.

INSTALL.mdtext

@@ -4,6 +4,12 @@ The installation of InDefero is composed of 2 parts, first the
 installation of the [Pluf framework](http://www.pluf.org) and second,
 the installation of InDefero by itself.
 
+## PHP modules for indefero
+
+Indefero need the GD module for PHP. It's named "php5-gd" in debian.
+
+    $ apt-get install php5-gd
+
 ## Recommended Layout of the Files
 
 If your server document root is in `/var/www` a good thing is to keep
@@ -37,6 +43,7 @@ docroot.
     $ sudo pear upgrade-all
     $ sudo pear install --alldeps Mail
     $ sudo pear install --alldeps Mail_mime
+    $ sudo pear install --alldeps Console_Getopt
 
 If you already have some of the PEAR packages installed with your
 distribution, the `Mail` package is often not up-to-date, 
@@ -125,6 +132,7 @@ The documentation is available in the `doc` folder.
 * Subversion: `doc/syncsvn.mdtext`.
 * Mercurial: `doc/syncmercurial.mdtext`.
 * Git: `doc/syncgit.mdtext`.
+* Monotone: `doc/syncmonotone.mdtext`
 
 ## For the Apache Webserver Users
 
@@ -222,4 +230,4 @@ functions. You need to prevent the overload as it does not make sense
 anyway (magic in the background is bad!). 
 See the [corresponding ticket][reglink].
 
-[reglink]: http://projects.ceondo.com/p/indefero/issues/481/
+[reglink]: http://projects.ceondo.com/p/indefero/issues/481/

Makefile

@@ -22,25 +22,40 @@
 #   sudo apt-get install python-setuptools
 #   sudo easy_install -U transifex-client
 
-PLUF_PATH=$(shell php -r "require_once('src/IDF/conf/path.php'); echo PLUF_PATH;")
 
-all help:
-	@echo "Rules for generate tarball :"
+
+.PHONY: help
+help:
+	@printf "Rules for generating distributable files :\n"
 	@for b in `git branch | sed "s/^. //g"`; do \
-		echo -e "\t"$$b"_tarball - Generate a zip archive of the "$$b" branch."; \
+		printf "\t"$$b"-zipfile - Generate a zip archive of the "$$b" branch.\n"; \
 	done
-	@echo -e "\nRules for internationnalization :";
-	@echo -e "\tpot-update - Update the POT file from HTML template and PHP source, then merge it with PO file"
-	@echo -e "\tpot-push - Send the POT file on transifex server"
-	@echo -e "\tpo-update - Merge POT file into PO file. POT is not regenerated."
-	@echo -e "\tpo-push - Send the all PO file on transifex server"
-	@echo -e "\tpo-pull - Get all PO file from transifex server"
+	@printf "\nRules for internationalization :\n";
+	@printf "\tpot-update - Update the POT file from HTML templates and PHP sources, then merge it with PO file.\n"
+	@printf "\tpot-push   - Send the POT file to the transifex server.\n"
+	@printf "\tpo-update  - Merge the POT file into the PO file. The POT is not regenerated.\n"
+	@printf "\tpo-push    - Send the all PO files to the transifex server.\n"
+	@printf "\tpo-pull    - Get all PO files from the transifex server.\n"
+	@printf "\tpo-stats   - Show translation statistics of all PO files.\n"
+	@printf "\nMisc Rules :\n";
+	@printf "\tdb-install - Install the database schema.\n"
+	@printf "\tdb-update  - Update the database schema.\n"
+
 
 #
-#   Internationnalization rule, POT & PO file manipulation
-#   
+#   Internationalization rule, POT & PO file manipulation
+#
+.PHONY: pluf_path
+pluf_path:
+ifeq (src/IDF/conf/path.php, $(wildcard src/IDF/conf/path.php))
+PLUF_PATH=$(shell php -r "require_once('src/IDF/conf/path.php'); echo PLUF_PATH;")
+else
+	@printf "File 'src/IDF/conf/path.php' don't exist. Please configure it !\n"
+	@exit 1
+endif
+ 
 .PHONY: pot-update po-update
-pot-update:
+pot-update: pluf_path
 	# Backup pot file
 	@if [ -e src/IDF/locale/idf.pot ]; then                     \
 	mv -f src/IDF/locale/idf.pot src/IDF/locale/idf.pot.bak;    \
@@ -49,19 +64,20 @@ pot-update:
 	# Extract string
 	@cd src; php $(PLUF_PATH)/extracttemplates.php IDF/conf/idf.php IDF/gettexttemplates
 	@cd src; for phpfile in `find . -iname "*.php"`; do \
-		echo "Parsing file : "$$phpfile; \
-		xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j --keyword --keyword=__ --keyword=_n:1,2 -L PHP $$phpfile ; \
+		printf "Parsing file : "$$phpfile"\n"; \
+		xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j \
+			--keyword --keyword=__ --keyword=_n:1,2 -L PHP $$phpfile ; \
 		done
 	#	Remove tmp folder
 	rm -Rf src/IDF/gettexttemplates
 	# Update PO
 	@make po-update
 
-po-update:
+po-update: pluf_path
 	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
-		echo "Updating file : "$$pofile; \
+		printf "Updating file : "$$pofile"\n"; \
 		msgmerge -v -U $$pofile src/IDF/locale/idf.pot; \
-		echo ; \
+		printf "\n"; \
 	done
 
 #
@@ -72,22 +88,22 @@ check-tx-config:
 	@if [ ! -e .tx/config ]; then                                       \
 	mkdir -p .tx;                                                       \
 	touch .tx/config;                                                   \
-	echo "[main]" >> .tx/config;                                        \
-	echo "host = http://www.transifex.net" >> .tx/config;               \
-	echo "" >> .tx/config;                                              \
-	echo "[indefero.idfpot]" >> .tx/config;                             \
-	echo "file_filter = src/IDF/locale/<lang>/idf.po" >> .tx/config;    \
-	echo "source_file = src/IDF/locale/idf.pot" >> .tx/config;          \
-	echo "source_lang = en" >> .tx/config;                              \
+	printf "[main]\n" >> .tx/config;                                        \
+	printf "host = http://www.transifex.net\n" >> .tx/config;               \
+	printf "\n" >> .tx/config;                                              \
+	printf "[indefero.idfpot]\n" >> .tx/config;                             \
+	printf "file_filter = src/IDF/locale/<lang>/idf.po\n" >> .tx/config;    \
+	printf "source_file = src/IDF/locale/idf.pot\n" >> .tx/config;          \
+	printf "source_lang = en\n" >> .tx/config;                              \
 	fi
-	@if [ ! -e $(HOME)/.transifexrc ]; then								\
+	@if [ ! -e $(HOME)/.transifexrc ]; then					\
 	touch $(HOME)/.transifexrc;												\
-	echo "[http://www.transifex.net]" >> $(HOME)/.transifexrc;				\
-	echo "username = " >> $(HOME)/.transifexrc;								\
-	echo "token = " >> $(HOME)/.transifexrc;									\
-	echo "password = " >> $(HOME)/.transifexrc;								\
-	echo "hostname = http://www.transifex.net" >> $(HOME)/.transifexrc;		\
-	echo "You must edit the file ~/.transifexrc to setup your transifex account (login & password) !";		\
+	printf "[http://www.transifex.net]\n" >> $(HOME)/.transifexrc;						\
+	printf "username = \n" >> $(HOME)/.transifexrc;								\
+	printf "token = \n" >> $(HOME)/.transifexrc;								\
+	printf "password = \n" >> $(HOME)/.transifexrc;								\
+	printf "hostname = http://www.transifex.net\n" >> $(HOME)/.transifexrc;					\
+	printf "You must edit the file ~/.transifexrc to setup your transifex account (login & password) !\n";	\
 	exit 1;																\
 	fi
 
@@ -98,13 +114,37 @@ po-push: check-tx-config
 	@tx push -t
 
 po-pull: check-tx-config
+	# Save PO
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+	    cp $$pofile $$pofile".save"; \
+	done
+	# Get new one
 	@tx pull -a
+	# Merge Transifex PO into local PO (so fuzzy entry is correctly saved)
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+	    msgmerge -U $$pofile".save" $$pofile; \
+	    rm -f $$pofile; \
+	    mv $$pofile".save" $$pofile; \
+	done
+
+po-stats:
+	@msgfmt --statistics -v src/IDF/locale/idf.pot
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+	    msgfmt --statistics -v $$pofile; \
+	done
 
 #
-#   Generic rule to build a tarball of indefero for a specified branch
-#   ex: make master_tarball
-#       make dev_tarball
+#   Generic rule to build a zipfile of indefero for a specified branch
+#   ex: make master_zipfile
+#       make develop_zipfile
 #
-%_tarball:
-	@git archive --format=zip --prefix="indefero/" $(@:_tarball=) > indefero-$(@:_tarball=)-`git log $(@:_tarball=) -n 1 --pretty=format:%H`.zip
+%-zipfile:
+	@git archive --format=zip --prefix="indefero/" $(@:-zipfile=) \
+		> indefero-$(@:-zipfile=)-`git log $(@:-zipfile=) -n 1 \
+		--pretty=format:%h`.zip
 
+db-install:
+	@cd src && php $(PLUF_PATH)/migrate.php --conf=IDF/conf/idf.php -a -d -i
+
+db-update:
+	@cd src && php $(PLUF_PATH)/migrate.php --conf=IDF/conf/idf.php -a -d

NEWS.mdtext

@@ -0,0 +1,149 @@
+# InDefero 1.2 - xxx xxx xx xx:xx 2011 UTC
+
+ATTENTION: You need Pluf [324ae60b](http://projects.ceondo.com/p/pluf/source/commit/324ae60b)
+or newer to properly run this version of Indefero!
+
+## New Features
+
+- Indefero's issue tracker can now bi-directionally link issues with variable, configurable
+  terms, such as "is related to", "is blocked by" or "is duplicated by" (issue 638)
+- Mercurial source views now show parent revisions (if any) and detailed change information
+- Subversion source views now show detailed change information (issue 622)
+- File download URLs now contain the file name rather than the upload id; old links still work though (issues 559 and 686)
+- Display monotone file and directory attributes in the tree and file view
+  (needs a monotone with an interface version of 13.1 or newer)
+- The context area is now kept in view when a page scrolls down several pages
+
+## Bugfixes
+
+- The SVN interface acts more robust if an underlying repository has been restructured (issue 364)
+- monotone zip archive entries now all carry the revision date as mtime (issue 645)
+- Timeline only displays filter options for items a user has actually access to (issue 655)
+- The log, tags and branches parsers for Mercurial are more robust now (issue 663)
+- Fix SSH public key parsing issues and improve the check for existing, uploaded keys (issue 679)
+- Diff views now show empty context lines for git and hg again (issue 688)
+- Let the SVN command line client not store the login credentials we give him as arguments
+- The usher section in the forge administration no longer displays a bogus
+  server enty in case no monotone server is configured in the connected
+  usher instance
+- Prevent a timeout from popping up when Usher is restarted (issue 695)
+- The SyncMonotone plugin now cleans up partial artifacts it created during the addition of
+  a new project or monotone key, in case an error popped up in the middle (issue 697)
+- Better error detection and reporting in the SyncMonotone plugin
+  ATTENTION: This needs Pluf 46b7f251 or newer!
+- Fix the branch links users of the Subversion frontend get when they enter a wrong revision
+  and only display this list if there are any branches available for all SCMs
+- If git's author name is not encoded in an UTF-8 compatible encoding, skip the author lookup,
+  as we have no information what the author string is actually encoded in
+
+## Documentation
+
+- The documentation on the setup of the monotone plugin has been improved.
+
+## Translations
+
+# InDefero 1.1.2 - Thu May 26 07:42:25 2011 UTC
+
+## Bugfixes
+
+- Fix tags extraction from git repository (issue 675)
+- Fix SSH validation method (issue 671)
+- Fix malformed URL in the RSS (issue 666)
+- Fix validateRevision call for Mercurial Scm (issue 657)
+
+## Translations
+
+- Missing word in French translation (issue 672)
+- Update Spanish translation
+
+# InDefero 1.1.1 - Mon Mar 28 15:52 2011 UTC
+
+## Bugfixes
+
+- Fix an incompatibility with Python 3.1 in gitserve.py (issue 554)
+- Fix PHP error when the commit view shows a commit with changed binary files (issue 643)
+- A migration problem prevented the preferences page being displayed properly (issues 644 and 653)
+- Fix PHP error when trying to create Mercurial source archives (issue 648)
+- Improve the French translation (issue 651)
+- Registration page missed a link to password recovery that was mentioned in a form error (issue 652)
+
+# InDefero 1.1 - Sun Mar 20 11:44 2011 UTC
+
+## New Features
+
+* _Version control_:
+ - Support for the monotone Version Control system (see [[InstallationScmMonotone]])
+ - Display detailed changeset information in the commit details (git, mtn) (issue 544)
+ - Show branch in the commit details (git, mtn, hg) (issue 450)
+ - Render branch and tag names in a popup and make them filterable (git, hg, mtn) (issue 601)
+
+* _Issue tracking_:
+ - Forge-wide and per-project watch lists of starred issues (issue 589)
+ - Configure a default issue template for each project (issues 212 and 540)
+ - Pick default issue labels from the configured project settings (issue 556)
+ - Navigate to a preceding / following issue in the issue detail view
+ - Many new text syntaxes to auto-link revisions (see [[AutomaticLinks]], issue 569)
+
+* _Documentation wiki_:
+ - Automatically create a table of contents on wiki pages (issue 350)
+ - Allow the usage of text labels for Wiki text links (issue 456)
+
+* _Other_:
+ - Enhanced user profile page (issue 510)
+ - Manage multiple (commit) emails in the account settings (issues 136 and 500)
+ - Filter the timeline and its feed by item type (issue 543)
+ - Add multiple email addresses for project notifications (issue 372)
+ - Direct links to other projects via the new `Project List` dropdown
+ - InDefero gained a favicon (issue 594)
+
+## Bugfixes
+
+- Fix `Need SSH_ORIGINAL_COMMAND in environment` error for git sync (issue 198)
+- Added an option to disable lengthy project size calculation in the forge (issue 403)
+- Fix a problem when deleting an orphaned git repository (issue 467)
+- Ignore XML parsing problems when trying to retrieve commit messages for svn (issues 469 and 518)
+- Sort the project list by the display name of the project (issue 477)
+- Project creation form now has a short description field as well (issue 479)
+- Add more file extensions supported by our in-tree prettify version (issues 490 and 567)
+- Improve the parsing of hg's log output (issues 507 and 508)
+- Do not clean `<ins>` and `<del>` HTML markup from user input (issue 509)
+- Improve HTML validation by switching from `strict` to `transitional` DOCTYPE (issue 511)
+- Properly handle git commits without a changelog title (issue 520)
+- Improve BSD compatibility in shell scripts (issue 526)
+- Properly render inner whitespaces in viewed issue attachments (issue 528)
+- Support for uploading SSH keys without optional comment (issue 531)
+- Recognize irc: and git: protocols in Markdown renderer (issue 546)
+- New config option `git_core_quotepath` to handle non-ASCII git file names (issue 553)
+- Ensured that active views are rendered in the menu as such (issue 555)
+- Add CSS for nested and mixed ordered and unordered lists (issue 557)
+- Directories are now sorted before files in source tree views (issue 573)
+- File attachments now have explicit view and download links in issue views (issue 575)
+- Display anonymous access URL when user has no SSH key registered (issue 588)
+- Improve the rendering of tag lists in issue views (issue 591)
+- Improved error page when a commit or branch was not found (issue 609)
+- Disable browser autocomplete of password fields in the account settings (issue 616)
+- Improvements in the automatic linker parser (issue 618)
+- The `createIssue` API method did not check the API authentication (issue 619)
+- Reduce the memory footprint and compatibility of the internal diff parser (issues 627 and 633)
+- Print the git branches and tags in bold which contain the currently displayed revision
+
+## Documentation
+
+- Document how to contribute to Indefero in `CONTRIBUTE.mdtext` (issue 486)
+- Note possible problems with mbstring.func_overload in `INSTALL.mdtext` (issue 481)
+- Improve links to Markdown documentation (issue 489)
+- Explain purpose of `idf_strong_key_check` in `idf.php-dist` (issue 516)
+
+## Translations
+
+- Spanish translation added
+- Started with a Simplified Chinese translation (issue 521)
+- Started with a Russian translation
+- Updates and fixes to the French translation (issue 574)
+- Updates and fixes to the German translation
+- English source language has been improved (issues 441, 478, and 631)
+
+# InDefero 1.0 - Tue Apr 20 07:00 2010 UTC
+
+First stable release.
+

doc/syncmonotone.mdtext

@@ -25,7 +25,7 @@ If you install monotone from source (<http://monotone.ca/downloads.php>),
 please follow the `INSTALL` document which comes with the software.
 It contains detailed instructions, including all needed dependencies.
 
-## Choose your indefero setup
+## Choose your indefero (IDF) setup
 
 The monotone plugin can be used in several different ways:
 
@@ -112,14 +112,40 @@ The monotone plugin can be used in several different ways:
             ^D
             $ chmod 600 usher.conf
 
+    **ATTENTION:** Do _not_ configure a default monotone server key in `usher.conf`,
+    otherwise the individual server key that IDF creates for each project is
+    not used and this could cause problems.
+
     Your indefero www user needs later write access to `usher.conf` and
     `projects/`. There are two ways of setting this up:
 
-    * Make the usher user the web user, for example via Apache's `suexec`
-    * Use acls, like this:
+    * Make the usher user the web user, for example via Apache's `suexec`.
+      This is however a bit clumsy.
+    * Preferred: Use Access Control Lists (ACLs), like this:
 
+            #
+            # Linux
+            #
             $ setfacl -m u:www:rw usher.conf
             $ setfacl -m d:u:www:rwx projects/
+            $ setfacl -m d:u:usher:rwx projects/
+            #
+            # FreeBSD
+            #
+            $ setfacl -m user:www:rw::allow usher.conf
+            $ setfacl -m user:www:rwxp:fd:allow projects/
+            $ setfacl -m user:usher:rwxp:fd:allow projects/
+            #
+            # Mac OS X
+            #
+            chmod +a '_www allow read,write' usher.conf
+            chmod +a '_www allow read,write,delete,add_file,add_subdirectory,file_inherit,directory_inherit' projects/
+            chmod +a 'usher allow read,write,delete,add_file,add_subdirectory,file_inherit,directory_inherit' projects/
+
+      In each example's last line, `usher` is the user which is executing
+      the usher instance. **It is very important to add this line, otherwise
+      usher won't be able to read and write into the initial file system
+      setup IDF creates!**
 
 5. Wrap a daemonizer around usher, for example supervise from daemontools
    (<http://cr.yp.to/damontools.html>):

logo/no_logo.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="no_logo.svg"
+   inkscape:version="0.47 r22583"
+   id="svg2985"
+   height="32"
+   width="32"
+   version="1.1"
+   inkscape:export-filename="/Users/tommyd/Entwicklung/indefero/www/media/idf/img/no_logo.png"
+   inkscape:export-xdpi="89.989998"
+   inkscape:export-ydpi="89.989998">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="852"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="16.0625"
+     inkscape:cx="8.5507561"
+     inkscape:cy="16.122403"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g2847"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,25.836575"
+       id="guide3752" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="-18.677042,16"
+       id="guide3754" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2987">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective13" />
+    <inkscape:perspective
+       id="perspective2863"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3676"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3717"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3816"
+       x="-0.14434362"
+       width="1.2886872"
+       y="-0.11562817"
+       height="1.2312563">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1799243"
+         id="feGaussianBlur3818" />
+    </filter>
+  </defs>
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="shadow"
+     style="display:inline"
+     sodipodi:insensitive="true">
+    <g
+       transform="translate(0.44042901,0.78704792)"
+       id="g2847-8"
+       style="opacity:0.79710143;fill:#000000;stroke:#000000;stroke-opacity:1;filter:url(#filter3816)">
+      <g
+         id="g3838-0"
+         style="fill:#000000;stroke:#000000;stroke-opacity:1" />
+      <g
+         id="g2401-2"
+         transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:2.4000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
+         inkscape:export-xdpi="12.330909"
+         inkscape:export-ydpi="12.330909">
+        <path
+           id="path2383-4"
+           d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path2391-8"
+           d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
+           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="logo"
+     style="display:inline">
+    <g
+       id="layer1"
+       transform="translate(-0.06540759,0.09444087)">
+      <g
+         id="g2847">
+        <g
+           id="g3838" />
+        <g
+           id="g2401"
+           transform="matrix(0.21219597,0,0,0.21219597,-70.751966,-27.73328)"
+           style="fill:#e6e6e6;fill-opacity:1;stroke:#a0a0a0;stroke-width:2.4000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:export-filename="/home/loa/Projects/indefero/logo/powered-by-indefero.png"
+           inkscape:export-xdpi="12.330909"
+           inkscape:export-ydpi="12.330909">
+          <path
+             id="path2383"
+             d="m 396.19089,173.14471 c -7.67621,0.80661 -14.40195,5.39406 -19.58101,10.89131 -7.23597,7.88004 -11.69742,18.07908 -13.32198,28.60362 -1.7236,11.28173 -0.25925,23.20635 5.07686,33.37271 3.78607,7.24384 9.53161,13.92339 17.29701,16.96772 3.86478,1.53937 8.98362,1.03284 11.67912,-2.41036 2.64357,-3.5671 2.69463,-8.234 2.85756,-12.48867 0.045,-7.61054 -0.54749,-15.25544 0.45618,-22.83193 0.87131,-9.50623 4.03944,-18.56751 6.71612,-27.66851 1.16242,-4.44333 2.25094,-9.02808 1.97499,-13.64988 -0.48817,-4.62476 -3.58059,-9.31042 -8.2964,-10.4067 -1.57489,-0.44882 -3.23412,-0.48948 -4.85845,-0.37931 z"
+             style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             inkscape:connector-curvature="0" />
+          <path
+             id="path2391"
+             d="m 433.14691,149.28687 c 7.2059,2.76589 12.51512,8.93778 16.09494,15.58815 4.94991,9.48434 6.61962,20.49058 5.46486,31.07695 -1.25505,11.34342 -5.75582,22.48271 -13.54134,30.92159 -5.53192,6.01709 -12.81048,10.98198 -21.09918,11.91276 -4.13154,0.4866 -8.94486,-1.32748 -10.65734,-5.35104 -1.63027,-4.12976 -0.4717,-8.65084 0.47212,-12.80269 1.92628,-7.36287 4.47721,-14.59393 5.4687,-22.17201 1.61875,-9.40784 0.90381,-18.98034 0.67386,-28.46402 0.0272,-4.59278 0.1624,-9.30303 1.62515,-13.69592 1.66851,-4.34082 5.86829,-8.06645 10.70716,-7.90484 1.63738,-0.0259 3.25061,0.36424 4.79107,0.89107 z"
+             style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#a0a0a0;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

phpunit.xml

@@ -0,0 +1,27 @@
+<phpunit backupGlobals="true"
+         backupStaticAttributes="false"
+         bootstrap="test/bootstrap.php"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         strict="false"
+         verbose="true">
+
+    <testsuites>
+        <testsuite name="Everything">
+            <directory>test/IDF/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src/IDF</directory>
+            <exclude>
+                <directory suffix=".php">src/IDF/Tests</directory>
+                <directory suffix=".php">src/IDF/conf</directory>
+                <file>src/IDF/version.php</file>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
+

run-tests

@@ -0,0 +1,14 @@
+#!/usr/bin/env php
+<?php
+
+$xmlfile = dirname(__FILE__) .'/test/report.xml';
+passthru('phpunit --coverage-clover='.$xmlfile);
+$xml = simplexml_load_string(file_get_contents($xmlfile));
+unlink($xmlfile);
+printf(
+   '>>> code coverage %s/%s (%s%%)'."\n",
+   $xml->project->metrics['coveredstatements'],
+   $xml->project->metrics['statements'],
+   round(($xml->project->metrics['coveredstatements']/(float)$xml->project->metrics['statements']) * 100.0, 2)
+);
+

scripts/gitcron.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/gitpostupdate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/gitserve.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/gitserve.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,14 +23,17 @@
 
 import os
 import sys
-import commands
-import traceback
+import subprocess
+
+SCRIPTDIR = os.path.abspath(__file__).rsplit(os.path.sep, 1)[0]
+GITSERVEPHP = '%s/gitserve.php' % SCRIPTDIR
+process = subprocess.Popen(['php', GITSERVEPHP, sys.argv[1]],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+output = str.encode("\n").join(process.communicate()).strip()
+status = process.wait()
 
-n = len("/gitserve.py")
-GITSERVEPHP = '%s/gitserve.php' % traceback.extract_stack(limit=1)[0][0][0:-n]
-status, output = commands.getstatusoutput('php %s %s' % (GITSERVEPHP, sys.argv[1]))
 if status == 0:
     os.execvp('git', ['git', 'shell', '-c', output.strip()])
 else:
-    sys.stderr.write("%s\n" % output)
+    sys.stderr.write("%s\n" % output.strip())
 sys.exit(1)

scripts/hgchangegroup.php

@@ -4,7 +4,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/mtnpostpush.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/queuecron.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/svnpostcommit.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

scripts/svnpostrevpropchange.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008-2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Commit.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Conf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Config/DataProxy.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Diff.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,17 +27,17 @@
  */
 class IDF_Diff
 {
-    public $repo = '';
-    public $diff = '';
+    public $path_strip_level = 0;
     protected $lines = array();
 
     public $files = array();
 
-    public function __construct($diff, $repo='')
+    public function __construct($diff, $path_strip_level = 0)
     {
-        $this->repo = $repo;
-        $this->diff = $diff;
-        $this->lines = preg_split("/\015\012|\015|\012/", $diff);
+        $this->path_strip_level = $path_strip_level;
+        // this works because in unified diff format even empty lines are
+        // either prefixed with a '+', '-' or ' '
+        $this->lines = preg_split("/\015\012|\015|\012/", $diff, -1, PREG_SPLIT_NO_EMPTY);
     }
 
     public function parse()
@@ -49,118 +49,95 @@ class IDF_Diff
         $files = array();
         $indiff = false; // Used to skip the headers in the git patches
         $i = 0; // Used to skip the end of a git patch with --\nversion number
-        foreach ($this->lines as $line) {
-            $i++;
-            if (0 === strpos($line, '--') and isset($this->lines[$i])
-                and preg_match('/^\d+\.\d+\.\d+\.\d+$/', $this->lines[$i])) {
-                break;
+        $diffsize = count($this->lines);
+        while ($i < $diffsize) {
+            // look for the potential beginning of a diff
+            if (substr($this->lines[$i], 0, 4) !== '--- ') {
+                $i++;
+                continue;
             }
-            if (0 === strpos($line, 'diff --git a')) {
-                $current_file = self::getFile($line);
-                $files[$current_file] = array();
-                $files[$current_file]['chunks'] = array();
-                $files[$current_file]['chunks_def'] = array();
-                $current_chunk = 0;
-                $indiff = true;
+
+            // we're inside a diff candiate
+            $oldfileline = $this->lines[$i++];
+            $newfileline = $this->lines[$i++];
+            if (substr($newfileline, 0, 4) !== '+++ ') {
+                // not a valid diff here, move on
                 continue;
-            } else if (preg_match('#^diff -r [^\s]+ -r [^\s]+ (.+)$#', $line, $matches)) {
-                $current_file = $matches[1];
-                $files[$current_file] = array();
-                $files[$current_file]['chunks'] = array();
-                $files[$current_file]['chunks_def'] = array();
-                $current_chunk = 0;
-                $indiff = true;
-                continue;
-            } else if (!$indiff && 0 === strpos($line, '=========')) {
-                // ignore pseudo stanzas with a hint of a binary file
-                if (preg_match("/^# (.+) is binary/", $this->lines[$i]))
-                    continue;
-                // by default always use the new name of a possibly renamed file
-                $current_file = self::getMtnFile($this->lines[$i+1]);
-                // mtn 0.48 and newer set /dev/null as file path for dropped files
-                // so we display the old name here
-                if ($current_file == "/dev/null") {
-                    $current_file = self::getMtnFile($this->lines[$i]);
+            }
+
+            // use new file name by default
+            preg_match("/^\+\+\+ ([^\t]+)/", $newfileline, $m);
+            $current_file = $m[1];
+            if ($current_file === '/dev/null') {
+                // except if it's /dev/null, use the old one instead
+                // eg. mtn 0.48 and newer
+                preg_match("/^--- ([^\t]+)/", $oldfileline, $m);
+                $current_file = $m[1];
+            }
+            if ($this->path_strip_level > 0) {
+                $fileparts = explode('/', $current_file, $this->path_strip_level+1);
+                $current_file = array_pop($fileparts);
+            }
+            $current_chunk = 0;
+            $files[$current_file] = array();
+            $files[$current_file]['chunks'] = array();
+            $files[$current_file]['chunks_def'] = array();
+
+            while ($i < $diffsize && substr($this->lines[$i], 0, 3) === '@@ ') {
+                $elems = preg_match('/@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@.*/',
+                                    $this->lines[$i++], $results);
+                if ($elems != 1) {
+                    // hunk is badly formatted
+                    break;
                 }
-                if ($current_file == "/dev/null") {
-                    throw new Exception(
-                        "could not determine path from diff"
-                    );
-                }
-                $files[$current_file] = array();
-                $files[$current_file]['chunks'] = array();
-                $files[$current_file]['chunks_def'] = array();
-                $current_chunk = 0;
-                $indiff = true;
-                continue;
-            } else if (0 === strpos($line, 'Index: ')) {
-                $current_file = self::getSvnFile($line);
-                $files[$current_file] = array();
-                $files[$current_file]['chunks'] = array();
-                $files[$current_file]['chunks_def'] = array();
-                $current_chunk = 0;
-                $indiff = true;
-                continue;
-            }
-            if (!$indiff) {
-                continue;
-            }
-            if (0 === strpos($line, '@@ ')) {
-                $files[$current_file]['chunks_def'][] = self::getChunk($line);
+                $delstart = $results[1];
+                $dellines = $results[2] === '' ? 1 : $results[2];
+                $addstart = $results[3];
+                $addlines = $results[4] === '' ? 1 : $results[4];
+
+                $files[$current_file]['chunks_def'][] = array(
+                    array($delstart, $dellines), array($addstart, $addlines)
+                );
                 $files[$current_file]['chunks'][] = array();
+
+                while ($i < $diffsize && ($addlines >= 0 || $dellines >= 0)) {
+                    $linetype = $this->lines[$i] != '' ? $this->lines[$i][0] : false;
+                    switch ($linetype) {
+                        case ' ':
+                            $files[$current_file]['chunks'][$current_chunk][] =
+                                array($delstart, $addstart, substr($this->lines[$i++], 1));
+                            $dellines--;
+                            $addlines--;
+                            $delstart++;
+                            $addstart++;
+                            break;
+                        case '+':
+                            $files[$current_file]['chunks'][$current_chunk][] =
+                                array('', $addstart, substr($this->lines[$i++], 1));
+                            $addlines--;
+                            $addstart++;
+                            break;
+                        case '-':
+                            $files[$current_file]['chunks'][$current_chunk][] =
+                                array($delstart, '', substr($this->lines[$i++], 1));
+                            $dellines--;
+                            $delstart++;
+                            break;
+                        case '\\':
+                            // ignore newline handling for now, see issue 636
+                            $i++;
+                            continue;
+                        default:
+                            break 2;
+                    }
+                }
                 $current_chunk++;
-                $lline = $files[$current_file]['chunks_def'][$current_chunk-1][0][0];
-                $rline = $files[$current_file]['chunks_def'][$current_chunk-1][1][0];
-                continue;
-            }
-            if (0 === strpos($line, '---') or 0 === strpos($line, '+++')) {
-                continue;
-            }
-            if (0 === strpos($line, '-')) {
-                $files[$current_file]['chunks'][$current_chunk-1][] = array($lline, '', substr($line, 1));
-                $lline++;
-                continue;
-            }
-            if (0 === strpos($line, '+')) {
-                $files[$current_file]['chunks'][$current_chunk-1][] = array('', $rline, substr($line, 1));
-                $rline++;
-                continue;
-            }
-            if (0 === strpos($line, ' ')) {
-                $files[$current_file]['chunks'][$current_chunk-1][] = array($lline, $rline, substr($line, 1));
-                $rline++;
-                $lline++;
-                continue;
-            }
-            if ($line == '') {
-                $files[$current_file]['chunks'][$current_chunk-1][] = array($lline, $rline, $line);
-                $rline++;
-                $lline++;
-                continue;
             }
         }
         $this->files = $files;
         return $files;
     }
 
-    public static function getFile($line)
-    {
-        $line = substr(trim($line), 10);
-        $n = (int) strlen($line)/2;
-        return trim(substr($line, 3, $n-3));
-    }
-
-    public static function getSvnFile($line)
-    {
-        return substr(trim($line), 7);
-    }
-
-    public static function getMtnFile($line)
-    {
-        preg_match("/^[+-]{3} ([^\t]+)/", $line, $m);
-        return $m[1];
-    }
-
     /**
      * Return the html version of a parsed diff.
      */
@@ -197,7 +174,6 @@ class IDF_Diff
         return Pluf_Template::markSafe($out);
     }
 
-
     public static function padLine($line)
     {
         $line = str_replace("\t", '    ', $line);
@@ -210,19 +186,6 @@ class IDF_Diff
         return str_repeat('&nbsp;', $i).substr($line, $i);
     }
 
-    /**
-     * @return array array(array(start, n), array(start, n))
-     */
-    public static function getChunk($line)
-    {
-        $elts = explode(' ', $line);
-        $res = array();
-        for ($i=1;$i<3;$i++) {
-            $res[] = explode(',', trim(substr($elts[$i], 1)));
-        }
-        return $res;
-    }
-
     /**
      * Review patch.
      *
@@ -347,7 +310,6 @@ class IDF_Diff
         return $nnew_chunks;
     }
 
-
     public function renderCompared($chunks, $filename)
     {
         $fileinfo = IDF_FileUtil::getMimeType($filename);
@@ -381,6 +343,5 @@ class IDF_Diff
             $i++;
         }
         return Pluf_Template::markSafe($out);
-
     }
 }

src/IDF/EmailAddress.php

@@ -0,0 +1,96 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+#
+# InDefero 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.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Storage of Email addresses
+ *
+ */
+class IDF_EmailAddress extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    function init()
+    {
+        $this->_a['table'] = 'idf_emailaddresses';
+        $this->_a['model'] = __CLASS__;
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  //It is automatically added.
+                                  'blank' => true,
+                                  ),
+                            'user' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'Pluf_User',
+                                  'blank' => false,
+                                  'verbose' => __('user'),
+                                  ),
+                            'address' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Email',
+                                  'blank' => false,
+                                  'verbose' => __('email'),
+                                  'unique' => true,
+                                  ),
+                            );
+        // WARNING: Not using getSqlTable on the Pluf_User object to
+        // avoid recursion.
+        $t_users = $this->_con->pfx.'users';
+        $this->_a['views'] = array(
+                              'join_user' =>
+                              array(
+                                    'join' => 'LEFT JOIN '.$t_users
+                                    .' ON '.$t_users.'.id='.$this->_con->qn('user'),
+                                    'select' => $this->getSelect().', '
+                                    .$t_users.'.login AS login',
+                                    'props' => array('login' => 'login'),
+                                    )
+                                   );
+    }
+
+    function get_email_addresses_for_user($user)
+    {
+        $addr = $user->get_idf_emailaddress_list();
+        $addr[] = (object)array("address" => $user->email, "id" => -1, "user" => $user);
+        return $addr;
+    }
+
+    function get_user_for_email_address($email)
+    {
+        $sql = new Pluf_SQL('email=%s', array($email));
+        $users = Pluf::factory('Pluf_User')->getList(array('filter'=>$sql->gen()));
+        if ($users->count() > 0) {
+            return $users[0];
+        }
+        $sql = new Pluf_SQL('address=%s', array($email));
+        $matches = Pluf::factory('IDF_EmailAddress')->getList(array('filter'=>$sql->gen()));
+        if ($matches->count() > 0) {
+            return new Pluf_User($matches[0]->user);
+        }
+        return null;
+    }
+}
+

src/IDF/FileUtil.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/Admin/ProjectCreate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -182,7 +182,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
         // we accept only starting with http(s):// to avoid people
         // trying to access the local filesystem.
         if (!preg_match('#^(http|https)://#', $url)) {
-            throw new Pluf_Form_Invalid(__('Only a remote repository available throught http or https are allowed. For example "http://somewhere.com/svn/trunk".'));
+            throw new Pluf_Form_Invalid(__('Only a remote repository available through HTTP or HTTPS is allowed. For example "http://somewhere.com/svn/trunk".'));
         }
         return $url;
     }
@@ -319,6 +319,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                            'labels_issue_closed' => IDF_Form_IssueTrackingConf::init_closed,
                            'labels_issue_predefined' =>  IDF_Form_IssueTrackingConf::init_predefined,
                            'labels_issue_one_max' => IDF_Form_IssueTrackingConf::init_one_max,
+                           'issue_relations' => IDF_Form_IssueTrackingConf::init_relations,
                            'webhook_url' => '',
                            'downloads_access_rights' => 'all',
                            'review_access_rights' => 'all',

src/IDF/Form/Admin/ProjectDelete.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/Admin/ProjectUpdate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
                         $mtn_master_branch)) {
             throw new Pluf_Form_Invalid(__(
                 'The master branch is empty or contains illegal characters, '.
-                'please use only letters, digits, dashs and dots as separators.'
+                'please use only letters, digits, dashes and dots as separators.'
             ));
         }
 

src/IDF/Form/Admin/UserCreate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
                                       array('required' => true,
                                             'label' => __('Email'),
                                             'initial' => '',
-                                            'help_text' => __('Double check the email address as the password is directly sent to the user.'),
+                                            'help_text' => __('Double check the email address as the password is sent directly to the user.'),
                                             ));
 
         $this->fields['language'] = new Pluf_Form_Field_Varchar(

src/IDF/Form/Admin/UserUpdate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
                                             'label' => __('Password'),
                                             'initial' => '',
                                             'widget' => 'Pluf_Form_Widget_PasswordInput',
-                                            'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'<br />'.__('The password must be hard for other people to find it, but easy for the user to remember.')),
+                                            'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'<br />'.__('The password must be hard for other people to guess, but easy for the user to remember.')),
                                             'widget_attrs' => array(
                                                        'maxlength' => 50,
                                                        'size' => 15,
@@ -161,7 +161,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
                           'label' => __('Staff'),
                           'initial' => $this->user->staff,
                           'widget' => 'Pluf_Form_Widget_CheckboxInput',
-                          'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
+                          'help_text' => __('If you give staff rights to a user, you really need to trust them.'),
                           ));
         }
 
@@ -173,7 +173,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
                           'initial' => $this->user->active,
                           'widget' => 'Pluf_Form_Widget_CheckboxInput',
                           'widget_attrs' => $attrs,
-                          'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable his account here.'),
+                          'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable their account here.'),
                           ));
     }
 

src/IDF/Form/Field/EmailList.php

@@ -3,19 +3,19 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
-# Plume Framework is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
+# InDefero 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.
 #
-# Plume Framework is distributed in the hope that it will be useful,
+# InDefero 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 Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
+# You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #

src/IDF/Form/IssueCreate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
     public $user = null;
     public $project = null;
     public $show_full = false;
+    public $relation_types = null;
 
     public function initFields($extra=array())
     {
@@ -45,9 +46,12 @@ class IDF_Form_IssueCreate extends Pluf_Form
             or $this->user->hasPerm('IDF.project-member', $this->project)) {
             $this->show_full = true;
         }
+        $this->relation_types = $this->project->getRelationsFromConfig();
+
         $contentTemplate = $this->project->getConf()->getVal(
             'labels_issue_template', IDF_Form_IssueTrackingConf::init_template
         );
+
         $this->fields['summary'] = new Pluf_Form_Field_Varchar(
                                       array('required' => true,
                                             'label' => __('Summary'),
@@ -76,11 +80,11 @@ class IDF_Form_IssueCreate extends Pluf_Form
         // case of someone allowing the upload path to be accessible
         // to everybody.
         for ($i=1;$i<4;$i++) {
-            $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s.dummy'; 
+            $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s.dummy';
             $this->fields['attachment'.$i] = new Pluf_Form_Field_File(
                 array('required' => false,
                       'label' => __('Attach a file'),
-                      'move_function_params' => 
+                      'move_function_params' =>
                       array('upload_path' => $upload_path,
                             'upload_path_create' => true,
                             'file_name' => $filename,
@@ -109,6 +113,20 @@ class IDF_Form_IssueCreate extends Pluf_Form
                                                                     ),
                                             ));
 
+            $this->fields['relation_type0'] = new Pluf_Form_Field_Varchar(
+                          array('required' => false,
+                                'label' => __('This issue'),
+                                'initial' => current($this->relation_types),
+                                'widget_attrs' => array('size' => 15),
+                                ));
+
+            $this->fields['relation_issue0'] = new Pluf_Form_Field_Varchar(
+                          array('required' => false,
+                                'label' => null,
+                                'initial' => '',
+                                'widget_attrs' => array('size' => 10),
+                                ));
+
             /*
              * get predefined tags for issues from current project
              *
@@ -181,7 +199,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
             $this->cleaned_data['label'.$i] = trim($this->cleaned_data['label'.$i]);
             if (strpos($this->cleaned_data['label'.$i], ':') !== false) {
                 list($class, $name) = explode(':', $this->cleaned_data['label'.$i], 2);
-                list($class, $name) = array(mb_strtolower(trim($class)), 
+                list($class, $name) = array(mb_strtolower(trim($class)),
                                             trim($name));
             } else {
                 $class = 'other';
@@ -215,10 +233,10 @@ class IDF_Form_IssueCreate extends Pluf_Form
     function clean_status()
     {
         // Check that the status is in the list of official status
-        $tags = $this->project->getTagsFromConfig('labels_issue_open', 
+        $tags = $this->project->getTagsFromConfig('labels_issue_open',
                                           IDF_Form_IssueTrackingConf::init_open,
                                           'Status');
-        $tags = array_merge($this->project->getTagsFromConfig('labels_issue_closed', 
+        $tags = array_merge($this->project->getTagsFromConfig('labels_issue_closed',
                                           IDF_Form_IssueTrackingConf::init_closed,
                                           'Status')
                             , $tags);
@@ -235,6 +253,63 @@ class IDF_Form_IssueCreate extends Pluf_Form
         return $this->cleaned_data['status'];
     }
 
+    // this method is not called from Pluf_Form directly, but shared for
+    // among all similar fields
+    function clean_relation_type($value)
+    {
+        $relation_type = trim($value);
+        if (empty($relation_type))
+            return '';
+
+        $found = false;
+        foreach ($this->relation_types as $type) {
+            if ($type == $relation_type) {
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) {
+            throw new Pluf_Form_Invalid(__('You provided an invalid relation type.'));
+        }
+        return $relation_type;
+    }
+
+    function clean_relation_type0()
+    {
+        return $this->clean_relation_type($this->cleaned_data['relation_type0']);
+    }
+
+    // this method is not called from Pluf_Form directly, but shared for
+    // among all similar fields
+    function clean_relation_issue($value)
+    {
+        $issues = trim($value);
+        if (empty($issues))
+            return '';
+
+        $issue_ids = preg_split('/\s*,\s*/', $issues, -1, PREG_SPLIT_NO_EMPTY);
+        foreach ($issue_ids as $issue_id) {
+            if (!ctype_digit($issue_id) || (int)$issue_id < 1) {
+                throw new Pluf_Form_Invalid(sprintf(
+                    __('The value "%s" is not a valid issue id.'), $issue_id
+                ));
+            }
+            $issue = new IDF_Issue($issue_id);
+            if ($issue->id != $issue_id || $issue->project != $this->project->id) {
+                throw new Pluf_Form_Invalid(sprintf(
+                    __('The issue "%s" does not exist.'), $issue_id
+                ));
+            }
+        }
+
+        return implode(', ', $issue_ids);
+    }
+
+    function clean_relation_issue0()
+    {
+        return $this->clean_relation_issue($this->cleaned_data['relation_issue0']);
+    }
+
     /**
      * Clean the attachments post failure.
      */
@@ -298,6 +373,30 @@ class IDF_Form_IssueCreate extends Pluf_Form
         foreach ($tags as $tag) {
             $issue->setAssoc($tag);
         }
+        // add relations (if any)
+        if (!empty($this->cleaned_data['relation_type0'])) {
+            $verb = $this->cleaned_data['relation_type0'];
+            $other_verb = $this->relation_types[$verb];
+            $related_issues = preg_split('/\s*,\s*/', $this->cleaned_data['relation_issue0'], -1, PREG_SPLIT_NO_EMPTY);
+
+            foreach ($related_issues as $related_issue_id) {
+                $related_issue = new IDF_Issue($related_issue_id);
+                $rel = new IDF_IssueRelation();
+                $rel->issue = $issue;
+                $rel->verb = $verb;
+                $rel->other_issue = $related_issue;
+                $rel->submitter = $this->user;
+                $rel->create();
+
+                $other_rel = new IDF_IssueRelation();
+                $other_rel->issue = $related_issue;
+                $other_rel->verb = $other_verb;
+                $other_rel->other_issue = $issue;
+                $other_rel->submitter = $this->user;
+                $other_rel->create();
+            }
+        }
+
         // add the first comment
         $comment = new IDF_IssueComment();
         $comment->issue = $issue;

src/IDF/Form/IssueTrackingConf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,6 +72,23 @@ Performance          = Performance issue
 Usability            = Affects program usability
 Maintainability      = Hinders future changes';
     const init_one_max = 'Type, Priority, Milestone';
+    // ATTENTION: if you change something here, change the values below as well!
+    const init_relations = 'is related to
+blocks, is blocked by
+duplicates, is duplicated by';
+
+    // These are actually all noop's, but we have no other chance to
+    // tell IDF's translation mechanism to mark the strings as translatable
+    // FIXME: IDF should get a internal translation system for strings like
+    // that, that can also be easily expanded by users
+    private function noop()
+    {
+        __('is related to');
+        __('blocks');
+        __('is blocked by');
+        __('duplicates');
+        __('is duplicated by');
+    }
 
     public function initFields($extra=array())
     {
@@ -114,10 +131,19 @@ Maintainability      = Hinders future changes';
         $this->fields['labels_issue_one_max'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
                                             'label' => __('Each issue may have at most one label with each of these classes'),
-                                            'initial' => self::init_one_max, 
+                                            'initial' => self::init_one_max,
                                             'widget_attrs' => array('size' => 60),
                                             ));
 
+        $this->fields['issue_relations'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => true,
+                                            'label' => __('Issue relations'),
+                                            'initial' => self::init_relations,
+                                            'help_text' => __('You can define bidirectional relations like "is related to" or "blocks, is blocked by".'),
+                                            'widget_attrs' => array('rows' => 7,
+                                                                    'cols' => 75),
+                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
+                                            ));
     }
 }
 

src/IDF/Form/IssueUpdate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
             or $this->user->hasPerm('IDF.project-member', $this->project)) {
             $this->show_full = true;
         }
+        $this->relation_types = $this->project->getRelationsFromConfig();
         if ($this->show_full) {
             $this->fields['summary'] = new Pluf_Form_Field_Varchar(
                                       array('required' => true,
@@ -69,11 +70,11 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
         // case of someone allowing the upload path to be accessible
         // to everybody.
         for ($i=1;$i<4;$i++) {
-            $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s.dummy'; 
+            $filename = substr($md5, 0, 2).'/'.substr($md5, 2, 2).'/'.substr($md5, 4).'/%s.dummy';
             $this->fields['attachment'.$i] = new Pluf_Form_Field_File(
                 array('required' => false,
                       'label' => __('Attach a file'),
-                      'move_function_params' => 
+                      'move_function_params' =>
                       array('upload_path' => $upload_path,
                             'upload_path_create' => true,
                             'file_name' => $filename,
@@ -102,6 +103,52 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
                                                        'size' => 15,
                                                                     ),
                                             ));
+
+            $idx = 0;
+            // note: clean_relation_type0 and clean_relation_issue0 already
+            //       exist in the base class
+            $this->fields['relation_type'.$idx] = new Pluf_Form_Field_Varchar(
+                          array('required' => false,
+                                'label' => __('This issue'),
+                                'initial' => current($this->relation_types),
+                                'widget_attrs' => array('size' => 15),
+                                ));
+
+            $this->fields['relation_issue'.$idx] = new Pluf_Form_Field_Varchar(
+                          array('required' => false,
+                                'label' => null,
+                                'initial' => '',
+                                'widget_attrs' => array('size' => 10),
+                                ));
+
+            ++$idx;
+            $relatedIssues = $this->issue->getGroupedRelatedIssues(array(), true);
+            foreach ($relatedIssues as $verb => $ids) {
+                $this->fields['relation_type'.$idx] = new Pluf_Form_Field_Varchar(
+                          array('required' => false,
+                                'label' => __('This issue'),
+                                'initial' => $verb,
+                                'widget_attrs' => array('size' => 15),
+                                ));
+                $m = 'clean_relation_type'.$idx;
+                $this->$m = create_function('$form', '
+                    return $form->clean_relation_type($form->cleaned_data["relation_type'.$idx.'"]);
+                ');
+
+                $this->fields['relation_issue'.$idx] = new Pluf_Form_Field_Varchar(
+                              array('required' => false,
+                                    'label' => null,
+                                    'initial' => implode(', ', $ids),
+                                    'widget_attrs' => array('size' => 10),
+                                    ));
+                $m = 'clean_relation_issue'.$idx;
+                $this->$m = create_function('$form', '
+                    return $form->clean_relation_issue($form->cleaned_data["relation_issue'.$idx.'"]);
+                ');
+
+                ++$idx;
+            }
+
             $tags = $this->issue->get_tags_list();
             for ($i=1;$i<7;$i++) {
                 $initial = '';
@@ -155,6 +202,51 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
     public function clean()
     {
         $this->cleaned_data = parent::clean();
+
+        // normalize the user's input by removing dublettes and by combining
+        // ids from identical verbs in different input fields into one array
+        $normRelatedIssues = array();
+        for ($idx = 0; isset($this->cleaned_data['relation_type'.$idx]); ++$idx) {
+            $verb = $this->cleaned_data['relation_type'.$idx];
+            if (empty($verb))
+                continue;
+
+            $ids = preg_split('/\s*,\s*/', $this->cleaned_data['relation_issue'.$idx],
+                              -1, PREG_SPLIT_NO_EMPTY);
+            if (count($ids) == 0)
+                continue;
+
+            if (!array_key_exists($verb, $normRelatedIssues))
+                $normRelatedIssues[$verb] = array();
+            foreach ($ids as $id) {
+                if (!in_array($id, $normRelatedIssues[$verb]))
+                    $normRelatedIssues[$verb][] = $id;
+            }
+        }
+
+        // now look at any added / removed ids
+        $added = $removed = array();
+        $relatedIssues = $this->issue->getGroupedRelatedIssues(array(), true);
+        $added = array_diff_key($normRelatedIssues, $relatedIssues);
+        $removed = array_diff_key($relatedIssues, $normRelatedIssues);
+
+        $keysToLookAt = array_keys(
+            array_intersect_key($relatedIssues, $normRelatedIssues)
+        );
+        foreach ($keysToLookAt as $key) {
+            $a = array_diff($normRelatedIssues[$key], $relatedIssues[$key]);
+            if (count($a) > 0)
+                $added[$key] = $a;
+            $r = array_diff($relatedIssues[$key], $normRelatedIssues[$key]);
+            if (count($r) > 0)
+                $removed[$key] = $r;
+        }
+
+        // cache the added / removed data, so we do not have to
+        // calculate that again
+        $this->cleaned_data['_added_issue_relations'] = $added;
+        $this->cleaned_data['_removed_issue_relations'] = $removed;
+
         // As soon as we know that at least one change was done, we
         // return the cleaned data and do not go further.
         if (strlen(trim($this->cleaned_data['content']))) {
@@ -214,6 +306,11 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
                     return $this->cleaned_data;
                 }
             }
+
+            if (count($this->cleaned_data['_added_issue_relations']) != 0 ||
+                count($this->cleaned_data['_removed_issue_relations']) != 0) {
+                return $this->cleaned_data;
+            }
         }
         // no changes!
         throw new Pluf_Form_Invalid(__('No changes were entered.'));
@@ -255,20 +352,22 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
             foreach ($tags as $tag) {
                 if (!Pluf_Model_InArray($tag, $oldtags)) {
                     if (!isset($changes['lb'])) $changes['lb'] = array();
+                    if (!isset($changes['lb']['add'])) $changes['lb']['add'] = array();
                     if ($tag->class != 'Other') {
-                        $changes['lb'][] = (string) $tag; //new tag
+                        $changes['lb']['add'][] = (string) $tag; //new tag
                     } else {
-                        $changes['lb'][] = (string) $tag->name;
+                        $changes['lb']['add'][] = (string) $tag->name;
                     }
                 }
             }
             foreach ($oldtags as $tag) {
                 if (!Pluf_Model_InArray($tag, $tags)) {
                     if (!isset($changes['lb'])) $changes['lb'] = array();
+                    if (!isset($changes['lb']['rem'])) $changes['lb']['rem'] = array();
                     if ($tag->class != 'Other') {
-                        $changes['lb'][] = '-'.(string) $tag; //new tag
+                        $changes['lb']['rem'][] = (string) $tag; //new tag
                     } else {
-                        $changes['lb'][] = '-'.(string) $tag->name;
+                        $changes['lb']['rem'][] = (string) $tag->name;
                     }
                 }
             }
@@ -286,6 +385,47 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
                 or ((!is_null($owner) and !is_null($this->issue->get_owner())) and $owner->id != $this->issue->get_owner()->id)) {
                 $changes['ow'] = (is_null($owner)) ? '---' : $owner->login;
             }
+            // Issue relations - additions
+            foreach ($this->cleaned_data['_added_issue_relations'] as $verb => $ids) {
+                $other_verb = $this->relation_types[$verb];
+                foreach ($ids as $id) {
+                    $related_issue = new IDF_Issue($id);
+                    $rel = new IDF_IssueRelation();
+                    $rel->issue = $this->issue;
+                    $rel->verb = $verb;
+                    $rel->other_issue = $related_issue;
+                    $rel->submitter = $this->user;
+                    $rel->create();
+
+                    $other_rel = new IDF_IssueRelation();
+                    $other_rel->issue = $related_issue;
+                    $other_rel->verb = $other_verb;
+                    $other_rel->other_issue = $this->issue;
+                    $other_rel->submitter = $this->user;
+                    $other_rel->create();
+                }
+                if (!isset($changes['rel'])) $changes['rel'] = array();
+                if (!isset($changes['rel']['add'])) $changes['rel']['add'] = array();
+                $changes['rel']['add'][] = $verb.' '.implode(', ', $ids);
+            }
+            // Issue relations - removals
+            foreach ($this->cleaned_data['_removed_issue_relations'] as $verb => $ids) {
+                foreach ($ids as $id) {
+                    $db = &Pluf::db();
+                    $table = Pluf::factory('IDF_IssueRelation')->getSqlTable();
+                    $sql = new Pluf_SQL('verb=%s AND (
+                                        (issue=%s AND other_issue=%s) OR
+                                        (other_issue=%s AND issue=%s))',
+                                        array($verb,
+                                              $this->issue->id, $id,
+                                              $this->issue->id, $id));
+                    $db->execute('DELETE FROM '.$table.' WHERE '.$sql->gen());
+                }
+
+                if (!isset($changes['rel'])) $changes['rel'] = array();
+                if (!isset($changes['rel']['rem'])) $changes['rel']['rem'] = array();
+                $changes['rel']['rem'][] = $verb.' '.implode(', ', $ids);
+            }
             // Update the issue
             $this->issue->batchAssoc('IDF_Tag', $tagids);
             $this->issue->summary = trim($this->cleaned_data['summary']);

src/IDF/Form/MembersConf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/Password.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -86,7 +86,7 @@ class IDF_Form_Password extends Pluf_Form
                 $return_url = Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryInputCode');
                 $tmpl = new Pluf_Template('idf/user/passrecovery-email.txt');
                 $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));
-                $code = trim($cr->encrypt($user->email.':'.$user->id.':'.time()), 
+                $code = trim($cr->encrypt($user->email.':'.$user->id.':'.time().':primary'), 
                              '~');
                 $code = substr(md5(Pluf::f('secret_key').$code), 0, 2).$code;
                 $url = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecovery', array($code), array(), false);

src/IDF/Form/PasswordInputKey.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/PasswordReset.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/ProjectConf.php

@@ -0,0 +1,140 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright(C) 2008-2011 Céondo Ltd and contributors.
+#
+# InDefero 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.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+
+/**
+ * Configuration of the project.
+ */
+class IDF_Form_ProjectConf extends Pluf_Form
+{
+    public $project = null;
+
+    public function initFields($extra=array())
+    {
+        $this->project = $extra['project'];
+
+        // Basic part
+        $this->fields['name'] = new Pluf_Form_Field_Varchar(array('required' => true,
+                                                                  'label' => __('Name'),
+                                                                  'initial' => $this->project->name,
+                                                                 ));
+        $this->fields['shortdesc'] = new Pluf_Form_Field_Varchar(array('required' => true,
+                                                                       'label' => __('Short Description'),
+                                                                       'initial' => $this->project->shortdesc,
+                                                                       'widget_attrs' => array('size' => '68'),
+                                                                      ));
+        $this->fields['description'] = new Pluf_Form_Field_Varchar(array('required' => true,
+                                                                         'label' => __('Description'),
+                                                                         'initial' => $this->project->description,
+                                                                         'widget_attrs' => array('cols' => 68,
+                                                                                                 'rows' => 26,
+                                                                                                ),
+                                                                         'widget' => 'Pluf_Form_Widget_TextareaInput',
+                                                                        ));
+
+        // Logo part
+        $upload_path = Pluf::f('upload_path', false);
+        if (false === $upload_path) {
+            throw new Pluf_Exception_SettingError(__('The "upload_path" configuration variable was not set.'));
+        }
+        $upload_path .= '/' . $this->project->shortname;
+        $filename = '/%s';
+        $this->fields['logo'] = new Pluf_Form_Field_File(array('required' => false,
+                                                         'label' => __('Update the logo'),
+                                                         'initial' => '',
+                                                         'help_text' => __('The logo must be a picture with a size of 32 by 32.'),
+                                                         'max_size' => Pluf::f('max_upload_size', 5 * 1024),
+                                                         'move_function_params' =>
+                                                         array('upload_path' => $upload_path,
+                                                               'upload_path_create' => true,
+                                                               'file_name' => $filename,
+                                                               )
+                                                         ));
+
+        $this->fields['logo_remove'] = new Pluf_Form_Field_Boolean(array('required' => false,
+                                                                         'label' => __('Remove the current logo'),
+                                                                         'initial' => false,
+                                                                         'widget' => 'Pluf_Form_Widget_CheckboxInput',
+                                                                         ));
+    }
+
+    /**
+     * If we have uploaded a file, but the form failed remove it.
+     *
+     */
+    function failed()
+    {
+        if (!empty($this->cleaned_data['logo'])
+            && file_exists(Pluf::f('upload_path').'/'.$this->cleaned_data['logo'])) {
+            unlink(Pluf::f('upload_path').'/'.$this->cleaned_data['logo']);
+        }
+    }
+
+    public function clean()
+    {
+        if (!isset($this->cleaned_data['logo_remove'])) {
+            $this->cleaned_data['logo_remove'] = false;
+        }
+
+        return $this->cleaned_data;
+    }
+
+    public function clean_logo()
+    {
+        if (empty($this->cleaned_data['logo'])) {
+            return '';
+        }
+
+        $meta = getimagesize(Pluf::f('upload_path') . '/' . $this->project->shortname . $this->cleaned_data['logo']);
+
+        if ($meta === false) {
+            throw new Pluf_Form_Invalid(__('Could not determine the size of the uploaded picture.'));
+        }
+
+        if ($meta[0] !== 32 || $meta[1] !== 32) {
+            throw new Pluf_Form_Invalid(__('The picture must have a size of 32 by 32.'));
+        }
+
+        return $this->cleaned_data['logo'];
+    }
+
+    public function save($commit=true)
+    {
+        $conf = $this->project->getConf();
+
+        // Basic part
+        $this->project->name = $this->cleaned_data['name'];
+        $this->project->shortdesc = $this->cleaned_data['shortdesc'];
+        $this->project->description = $this->cleaned_data['description'];
+        $this->project->update();
+
+        // Logo part
+        if ($this->cleaned_data['logo'] !== "") {
+            $conf->setVal('logo', $this->cleaned_data['logo']);
+        }
+        if ($this->cleaned_data['logo_remove'] === true) {
+            @unlink(Pluf::f('upload_path') . '/' . $this->project->shortname . $conf->getVal('logo'));
+            $conf->delVal('logo');
+        }
+    }
+}

src/IDF/Form/Register.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ class IDF_Form_Register extends Pluf_Form
                                             'max_length' => 15,
                                             'min_length' => 3,
                                             'initial' => $login,
-                                            'help_text' => __('The login must be between 3 and 15 characters long and contains only letters and digits.'),
+                                            'help_text' => __('The login must be between 3 and 15 characters long and contain only letters and digits.'),
                                             'widget_attrs' => array(
                                                        'maxlength' => 15,
                                                        'size' => 10,
@@ -52,7 +52,7 @@ class IDF_Form_Register extends Pluf_Form
                                       array('required' => true,
                                             'label' => __('Your email'),
                                             'initial' => '',
-                                            'help_text' => __('We will never send you any unsolicited emails. We hate spams too!'),
+                                            'help_text' => __('We will never send you any unsolicited emails. We hate spam too!'),
                                             ));
 
         $this->fields['terms'] = new Pluf_Form_Field_Boolean(
@@ -93,10 +93,8 @@ class IDF_Form_Register extends Pluf_Form
     function clean_email()
     {
         $this->cleaned_data['email'] = mb_strtolower(trim($this->cleaned_data['email']));
-        $guser = new Pluf_User();
-        $sql = new Pluf_SQL('email=%s', $this->cleaned_data['email']);
-        if ($guser->getCount(array('filter' => $sql->gen())) > 0) {
-            throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need, click on the help link to recover your password.'), $this->cleaned_data['email']));
+        if (Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['email']) != null) {
+            throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need to, click on the help link to recover your password.'), $this->cleaned_data['email']));
         }
         return $this->cleaned_data['email'];
     }

src/IDF/Form/RegisterConfirmation.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -69,7 +69,7 @@ class IDF_Form_RegisterConfirmation extends Pluf_Form
                                             'label' => __('Your password'),
                                             'initial' => '',
                                             'widget' => 'Pluf_Form_Widget_PasswordInput',
-                                            'help_text' => __('Your password must be hard for other people to find it, but easy for you to remember.'),
+                                            'help_text' => __('Your password must be hard for other people to guess, but easy for you to remember.'),
                                             'widget_attrs' => array(
                                                        'maxlength' => 50,
                                                        'size' => 15,

src/IDF/Form/RegisterInputKey.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/ReviewCreate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/ReviewFileComment.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -64,6 +64,8 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
         if ($this->user->hasPerm('IDF.project-owner', $this->project)
             or $this->user->hasPerm('IDF.project-member', $this->project)) {
             $this->show_full = true;
+        } else {
+            $this->show_full = false;
         }
         if ($this->show_full) {
             $this->fields['summary'] = new Pluf_Form_Field_Varchar(

src/IDF/Form/SourceConf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/TabsConf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/UpdateUpload.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/Upload.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ class IDF_Form_Upload extends Pluf_Form
         if (strlen($extra)) $extra .= '|';
         if (!preg_match('/\.('.$extra.'png|jpg|jpeg|gif|bmp|psd|tif|aiff|asf|avi|bz2|css|doc|eps|gz|jar|mdtext|mid|mov|mp3|mpg|ogg|pdf|ppt|ps|qt|ra|ram|rm|rtf|sdd|sdw|sit|sxi|sxw|swf|tgz|txt|wav|xls|xml|war|wmv|zip)$/i', $this->cleaned_data['file'])) {
             @unlink(Pluf::f('upload_path').'/'.$this->project->shortname.'/files/'.$this->cleaned_data['file']);
-            throw new Pluf_Form_Invalid(__('For security reason, you cannot upload a file with this extension.'));
+            throw new Pluf_Form_Invalid(__('For security reasons, you cannot upload a file with this extension.'));
         }
         return $this->cleaned_data['file'];
     }

src/IDF/Form/UploadConf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/UserAccount.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,6 +79,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
                                             'widget' => 'Pluf_Form_Widget_PasswordInput',
                                             'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change your password.').'<br />'.__('Your password must be hard for other people to find it, but easy for you to remember.')),
                                             'widget_attrs' => array(
+                                                       'autocomplete' => 'off',
                                                        'maxlength' => 50,
                                                        'size' => 15,
                                                                     ),
@@ -89,6 +90,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
                                             'initial' => '',
                                             'widget' => 'Pluf_Form_Widget_PasswordInput',
                                             'widget_attrs' => array(
+                                                       'autocomplete' => 'off',
                                                        'maxlength' => 50,
                                                        'size' => 15,
                                                                     ),
@@ -161,8 +163,44 @@ class IDF_Form_UserAccount  extends Pluf_Form
                                             'widget_attrs' => array('rows' => 3,
                                                                     'cols' => 40),
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
-                                            'help_text' => __('Paste a SSH or monotone public key. Be careful to not provide your private key here!')
+                                            'help_text' => __('Paste an SSH or monotone public key. Be careful to not provide your private key here!')
                                             ));
+
+        $this->fields['secondary_mail'] = new Pluf_Form_Field_Email(
+                                      array('required' => false,
+                                            'label' => __('Add a secondary mail address'),
+                                            'initial' => '',
+                                            'help_text' => __('You will get a mail to confirm that you own the address you specify.'),
+                                            ));
+    }
+
+    private function send_validation_mail($new_email, $secondary_mail=false)
+    {
+        if ($secondary_mail) {
+            $type = "secondary";
+        } else {
+            $type = "primary";
+        }
+        $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));
+        $encrypted = trim($cr->encrypt($new_email.':'.$this->user->id.':'.time().':'.$type), '~');
+        $key = substr(md5(Pluf::f('secret_key').$encrypted), 0, 2).$encrypted;
+        $url = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views_User::changeEmailDo', array($key), array(), false);
+        $urlik = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views_User::changeEmailInputKey', array(), array(), false);
+        $context = new Pluf_Template_Context(
+             array('key' => Pluf_Template::markSafe($key),
+                   'url' => Pluf_Template::markSafe($url),
+                   'urlik' => Pluf_Template::markSafe($urlik),
+                   'email' => $new_email,
+                   'user'=> $this->user,
+                   )
+        );
+        $tmpl = new Pluf_Template('idf/user/changeemail-email.txt');
+        $text_email = $tmpl->render($context);
+        $email = new Pluf_Mail(Pluf::f('from_email'), $new_email,
+                               __('Confirm your new email address.'));
+        $email->addTextMessage($text_email);
+        $email->sendMail();
+        $this->user->setMessage(sprintf(__('A validation email has been sent to "%s" to validate the email address change.'), Pluf_esc($new_email)));
     }
 
     /**
@@ -188,26 +226,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
         $new_email = $this->cleaned_data['email'];
         unset($this->cleaned_data['email']);
         if ($old_email != $new_email) {
-            $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));
-            $encrypted = trim($cr->encrypt($new_email.':'.$this->user->id.':'.time()), '~');
-            $key = substr(md5(Pluf::f('secret_key').$encrypted), 0, 2).$encrypted;
-            $url = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views_User::changeEmailDo', array($key), array(), false);
-            $urlik = Pluf::f('url_base').Pluf_HTTP_URL_urlForView('IDF_Views_User::changeEmailInputKey', array(), array(), false);
-            $context = new Pluf_Template_Context(
-                 array('key' => Pluf_Template::markSafe($key),
-                       'url' => Pluf_Template::markSafe($url),
-                       'urlik' => Pluf_Template::markSafe($urlik),
-                       'email' => $new_email,
-                       'user'=> $this->user,
-                       )
-            );
-            $tmpl = new Pluf_Template('idf/user/changeemail-email.txt');
-            $text_email = $tmpl->render($context);
-            $email = new Pluf_Mail(Pluf::f('from_email'), $new_email,
-                                   __('Confirm your new email address.'));
-            $email->addTextMessage($text_email);
-            $email->sendMail();
-            $this->user->setMessage(sprintf(__('A validation email has been sent to "%s" to validate the email address change.'), Pluf_esc($new_email)));
+            $this->send_validation_mail($new_email);
         }
         $this->user->setFromFormData($this->cleaned_data);
         // Add key as needed.
@@ -219,6 +238,9 @@ class IDF_Form_UserAccount  extends Pluf_Form
                 $key->create();
             }
         }
+        if ('' !== $this->cleaned_data['secondary_mail']) {
+            $this->send_validation_mail($this->cleaned_data['secondary_mail'], true);
+        }
 
         if ($commit) {
             $this->user->update();
@@ -295,8 +317,15 @@ class IDF_Form_UserAccount  extends Pluf_Form
             return '';
         }
 
-        if (preg_match('#^ssh\-[a-z]{3}\s\S+(\s\S+)?$#', $key)) {
-            $key = str_replace(array("\n", "\r"), '', $key);
+        $keysearch = '';
+        if (preg_match('#^(ssh\-(?:dss|rsa)\s+\S+)(.*)#', $key, $m)) {
+            $basekey = preg_replace('/\s+/', ' ', $m[1]);
+            $comment = trim(preg_replace('/[\r\n]/', ' ', $m[2]));
+           
+            $keysearch = $basekey.'%';
+            $key = $basekey;
+            if (!empty($comment))
+                $key .= ' '.$comment;
 
             if (Pluf::f('idf_strong_key_check', false)) {
 
@@ -315,7 +344,9 @@ class IDF_Form_UserAccount  extends Pluf_Form
                 }
             }
         }
-        else if (preg_match('#^\[pubkey [^\]]+\]\s*\S+\s*\[end\]$#', $key)) {
+        else if (preg_match('#^\[pubkey [^\]]+\]\s*(\S+)\s*\[end\]$#', $key, $m)) {
+            $keysearch = '%'.$m[1].'%';
+            
             if (Pluf::f('idf_strong_key_check', false)) {
 
                 // if monotone can read it, it should be valid
@@ -337,7 +368,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
         }
         else {
             throw new Pluf_Form_Invalid(
-                __('Public key looks neither like a SSH '.
+                __('Public key looks like neither an SSH '.
                    'nor monotone public key.'));
         }
 
@@ -345,7 +376,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
         if ($user) {
             $ruser = Pluf::factory('Pluf_User', $user);
             if ($ruser->id > 0) {
-                $sql = new Pluf_SQL('content=%s', array($key));
+                $sql = new Pluf_SQL('content LIKE %s AND user=%s', array($keysearch, $ruser->id));
                 $keys = Pluf::factory('IDF_Key')->getList(array('filter' => $sql->gen()));
                 if (count($keys) > 0) {
                     throw new Pluf_Form_Invalid(
@@ -393,15 +424,22 @@ class IDF_Form_UserAccount  extends Pluf_Form
     function clean_email()
     {
         $this->cleaned_data['email'] = mb_strtolower(trim($this->cleaned_data['email']));
-        $guser = new Pluf_User();
-        $sql = new Pluf_SQL('email=%s AND id!=%s',
-                            array($this->cleaned_data['email'], $this->user->id));
-        if ($guser->getCount(array('filter' => $sql->gen())) > 0) {
+        $user = Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['email']);
+        if ($user != null and $user->id != $this->user->id) {
             throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used.'), $this->cleaned_data['email']));
         }
         return $this->cleaned_data['email'];
     }
 
+    function clean_secondary_mail()
+    {
+        $this->cleaned_data['secondary_mail'] = mb_strtolower(trim($this->cleaned_data['secondary_mail']));
+        if (Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['secondary_mail']) != null) {
+            throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used.'), $this->cleaned_data['secondary_mail']));
+        }
+        return $this->cleaned_data['secondary_mail'];
+    }
+
     function clean_public_key()
     {
         $this->cleaned_data['public_key'] =

src/IDF/Form/UserChangeEmail.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ class IDF_Form_UserChangeEmail extends Pluf_Form
      * Throw a Pluf_Form_Invalid exception if the key is not valid.
      *
      * @param string Key
-     * @return array array($new_email, $user_id, time())
+     * @return array array($new_email, $user_id, time(), [primary|secondary])
      */
     public static function validateKey($key)
     {
@@ -63,7 +63,7 @@ class IDF_Form_UserChangeEmail extends Pluf_Form
             throw new Pluf_Form_Invalid(__('The validation key is not valid. Please copy/paste it from your confirmation email.'));
         }
         $cr = new Pluf_Crypt(md5(Pluf::f('secret_key')));
-        return explode(':', $cr->decrypt($encrypted), 3);
+        return explode(':', $cr->decrypt($encrypted), 4);
         
     }
 

src/IDF/Form/WikiConf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/WikiCreate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/WikiDelete.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Form/WikiUpdate.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Gconf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Issue.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -169,6 +169,24 @@ class IDF_Issue extends Pluf_Model
         }
     }
 
+    function getGroupedRelatedIssues($opts = array(), $idsOnly = false)
+    {
+        $rels = $this->get_related_issues_list(array_merge($opts, array(
+               'view' => 'with_other_issue',
+        )));
+
+        $res = array();
+        foreach ($rels as $rel) {
+            $verb = $rel->verb;
+            if (!array_key_exists($verb, $res)) {
+                $res[$verb] = array();
+            }
+            $res[$verb][] = $idsOnly ? $rel->other_issue : $rel;
+        }
+
+        return $res;
+    }
+
     /**
      * Returns an HTML fragment used to display this issue in the
      * timeline.

src/IDF/IssueComment.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -155,10 +155,19 @@ class IDF_IssueComment extends Pluf_Model
                     $out .= __('Owner:'); break;
                 case 'lb':
                     $out .= __('Labels:'); break;
+                case 'rel':
+                    $out .= __('Relations:'); break;
                 }
                 $out .= '</strong>&nbsp;';
-                if ($w == 'lb') {
-                    $out .= Pluf_esc(implode(', ', $v));
+                if ($w == 'lb' || $w == 'rel') {
+                    foreach ($v as $t => $ls) {
+                        foreach ($ls as $l) {
+                            if ($t == 'rem') $out .= '<s>';
+                            $out .= Pluf_esc($l);
+                            if ($t == 'rem') $out .= '</s>';
+                            $out .= ' ';
+                        }
+                    }
                 } else {
                     $out .= Pluf_esc($v);
                 }

src/IDF/IssueFile.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/IssueRelation.php

@@ -0,0 +1,100 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+#
+# InDefero 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.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * A relation of one issue to another
+ */
+class IDF_IssueRelation extends Pluf_Model
+{
+    public $_model = __CLASS__;
+
+    function init()
+    {
+        $this->_a['table'] = 'idf_issuerelations';
+        $this->_a['model'] = __CLASS__;
+        $this->_a['cols'] = array(
+                             // It is mandatory to have an "id" column.
+                            'id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Sequence',
+                                  'blank' => true,
+                                  ),
+                            'issue' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'IDF_Issue',
+                                  'blank' => false,
+                                  'verbose' => __('issue'),
+                                  'relate_name' => 'related_issues',
+                                  ),
+                            'verb' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Text',
+                                  'blank' => false,
+                                  'verbose' => __('verb'),
+                                  ),
+                            'other_issue' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'IDF_Issue',
+                                  'blank' => false,
+                                  'verbose' => __('other issue'),
+                                  'relate_name' => 'related_other_issues',
+                                  ),
+                            'submitter' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
+                                  'model' => 'Pluf_User',
+                                  'blank' => false,
+                                  'verbose' => __('submitter'),
+                                   ),
+                            'creation_dtime' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Datetime',
+                                  'blank' => true,
+                                  'verbose' => __('creation date'),
+                                  ),
+                            );
+        $this->_a['idx'] = array(
+                            'creation_dtime_idx' =>
+                            array(
+                                  'col' => 'creation_dtime',
+                                  'type' => 'normal',
+                                  ),
+                            );
+        $issuetbl = $this->_con->pfx.'idf_issues';
+        $this->_a['views'] = array(
+            'with_other_issue' => array(
+                'join' => 'INNER JOIN '.$issuetbl.' ON other_issue='.$issuetbl.'.id',
+                'select' => $this->getSelect().', summary',
+                'props' => array('summary' => 'other_summary'),
+        ));
+    }
+
+    function preSave($create=false)
+    {
+        if ($this->id == '') {
+            $this->creation_dtime = gmdate('Y-m-d H:i:s');
+        }
+    }
+}

src/IDF/Key.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -80,7 +80,10 @@ class IDF_Key extends Pluf_Model
         if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {
             return array('mtn', $m[1], $m[2]);
         }
-        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {
+        else if (preg_match('#^ssh\-(?:dss|rsa)\s(\S+)(?:\s(.*))?$#', $this->content, $m)) {
+            if (!isset($m[2])) {
+                $m[2] = "";
+            }
             return array('ssh', $m[2], $m[1]);
         }
 

src/IDF/Middleware.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -87,6 +87,7 @@ class IDF_Middleware
                               'markdown' => 'IDF_Template_Markdown',
                               'showuser' => 'IDF_Template_ShowUser',
                               'ashowuser' => 'IDF_Template_AssignShowUser',
+                              'appversion' => 'IDF_Template_AppVersion',
                                             ));
         $params['modifiers'] = array_merge($params['modifiers'],
                                            array(

src/IDF/Migrations/10SshKey.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/11GitCache.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/12DownloadDesc.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/13NewReview.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/14Queue.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/15AddGconf.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/16AddUserMail.php

@@ -0,0 +1,43 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+#
+# InDefero 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.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add the new IDF_Gconf model.
+ *
+ */
+
+function IDF_Migrations_16AddUserMail_up($params=null)
+{
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    $schema->model = new IDF_EmailAddress();
+    $schema->createTables();
+}
+
+function IDF_Migrations_16AddUserMail_down($params=null)
+{
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    $schema->model = new IDF_EmailAddress();
+    $schema->dropTables();
+}

src/IDF/Migrations/17AddIssueRelations.php

@@ -0,0 +1,90 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+#
+# InDefero 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.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add the new IDF_IssueRelation model.
+ *
+ */
+
+function IDF_Migrations_17AddIssueRelations_up($params=null)
+{
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    $schema->model = new IDF_IssueRelation();
+    $schema->createTables();
+
+    // change the serialization format for added / removed labels in IDF_IssueComment
+    $comments = Pluf::factory('IDF_IssueComment')->getList();
+    foreach ($comments as $comment) {
+        if (!isset($comment->changes['lb'])) continue;
+        $changes = $comment->changes;
+        $adds = $removals = array();
+        foreach ($comment->changes['lb'] as $lb) {
+            if (substr($lb, 0, 1) == '-')
+                $removals[] = substr($lb, 1);
+            else
+                $adds[] = $lb;
+        }
+        $changes['lb'] = array();
+        if (count($adds) > 0)
+            $changes['lb']['add'] = $adds;
+        if (count($removals) > 0)
+            $changes['lb']['rem'] = $removals;
+        $comment->changes = $changes;
+        $comment->update();
+    }
+}
+
+function IDF_Migrations_17AddIssueRelations_down($params=null)
+{
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    $schema->model = new IDF_IssueRelation();
+    $schema->dropTables();
+
+    // change the serialization format for added / removed labels in IDF_IssueComment
+    $comments = Pluf::factory('IDF_IssueComment')->getList();
+    foreach ($comments as $comment) {
+        $changes = $comment->changes;
+        if (empty($changes))
+            continue;
+        if (isset($changes['lb'])) {
+            $labels = array();
+            foreach ($changes['lb'] as $type => $lbs) {
+                if (!is_array($lbs)) {
+                    $labels[] = $lbs;
+                    continue;
+                }
+                foreach ($lbs as $lb) {
+                    $labels[] = ($type == 'rem' ? '-' : '') . $lb;
+                }
+            }
+            $changes['lb'] = $labels;
+        }
+        // while we're at it, remove any 'rel' changes
+        unset($changes['rel']);
+        $comment->changes = $changes;
+        $comment->update();
+    }
+}
+

src/IDF/Migrations/18DownloadMD5.php

@@ -0,0 +1,63 @@
+<?php
+/* -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
+#
+# InDefero 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.
+#
+# InDefero is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# ***** END LICENSE BLOCK ***** */
+
+/**
+ * Add the md5 column for the download model.
+ */
+
+function IDF_Migrations_18DownloadMD5_up($params=null)
+{
+    // Add the row
+    $table = Pluf::factory('IDF_Upload')->getSqlTable();
+    $sql = array();
+    $sql['PostgreSQL'] = 'ALTER TABLE '.$table.' ADD COLUMN "md5" VARCHAR(32) DEFAULT \'\'';
+    $sql['MySQL'] = 'ALTER TABLE '.$table.' ADD COLUMN `md5` VARCHAR(32) DEFAULT \'\'';
+    $db = Pluf::db();
+    $engine = Pluf::f('db_engine');
+    if (!isset($sql[$engine])) {
+        throw new Exception('SQLite complex migration not supported.');
+    }
+    $db->execute($sql[$engine]);
+    
+    // Process md5 of already uploaded file
+    $files = Pluf::factory('IDF_Upload')->getList();
+    foreach ($files as $f) {
+        $f->md5 = md5_file (Pluf::f('upload_path') . '/' . $f->get_project()->shortname . '/files/' . $f->file);
+        $f->update();
+    }
+}
+
+function IDF_Migrations_18DownloadMD5_down($params=null)
+{
+    // Remove the row
+    $table = Pluf::factory('IDF_Upload')->getSqlTable();
+    $sql = array();
+    $sql['PostgreSQL'] = 'ALTER TABLE '.$table.' DROP COLUMN "md5"';
+    $sql['MySQL'] = 'ALTER TABLE '.$table.' DROP COLUMN `md5`';
+    $db = Pluf::db();
+    $engine = Pluf::f('db_engine');
+    if (!isset($sql[$engine])) {
+        throw new Exception('SQLite complex migration not supported.');
+    }
+    $db->execute($sql[$engine]);
+}

src/IDF/Migrations/1Download.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/2Search.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/3Attachments.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/4Timeline.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/5DescToText.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/6PrivateProject.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/7Wiki.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/8CodeReview.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/9ShortDescription.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Migrations/Backup.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,6 +53,8 @@ function IDF_Migrations_Backup_run($folder, $name=null)
                     'IDF_Scm_Cache_Git',
                     'IDF_Queue',
                     'IDF_Gconf',
+                    'IDF_EmailAddress',
+                    'IDF_IssueRelation',
                     );
     $db = Pluf::db();
     // Now, for each table, we dump the content in json, this is a
@@ -98,6 +100,8 @@ function IDF_Migrations_Backup_restore($folder, $name)
                     'IDF_Scm_Cache_Git',
                     'IDF_Queue',
                     'IDF_Gconf',
+                    'IDF_EmailAddress',
+                    'IDF_IssueRelation',
                     );
     $db = Pluf::db();
     $schema = new Pluf_DB_Schema($db);
@@ -110,4 +114,4 @@ function IDF_Migrations_Backup_restore($folder, $name)
         Pluf_Test_Fixture::load($data, false);
     }
     return true;
-}
+}

src/IDF/Migrations/Install.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -50,6 +50,8 @@ function IDF_Migrations_Install_setup($params=null)
                     'IDF_Scm_Cache_Git',
                     'IDF_Queue',
                     'IDF_Gconf',
+                    'IDF_EmailAddress',
+                    'IDF_IssueRelation',
                     );
     $db = Pluf::db();
     $schema = new Pluf_DB_Schema($db);
@@ -107,6 +109,8 @@ function IDF_Migrations_Install_teardown($params=null)
                     'IDF_Tag',
                     'IDF_Commit',
                     'IDF_Project',
+                    'IDF_EmailAddress',
+                    'IDF_IssueRelation',
                     );
     $db = Pluf::db();
     $schema = new Pluf_DB_Schema($db);
@@ -114,4 +118,4 @@ function IDF_Migrations_Install_teardown($params=null)
         $schema->model = new $model();
         $schema->dropTables();
     }
-}
+}

src/IDF/Plugin/SyncGit.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Plugin/SyncGit/Cron.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -59,6 +59,16 @@ class IDF_Plugin_SyncGit_Cron
                 $out .= sprintf($template, $cmd, $key->login, $content)."\n";
             }
         }
+        $out = "# indefero start" . PHP_EOL . $out . "# indefero end" . PHP_EOL;
+        
+        // We update only the part of the file between IDF_START / IDF_END comment
+        $original_keys = file_get_contents($authorized_keys);
+        if (strstr($original_keys, "# indefero start") && strstr($original_keys, "# indefero end")) {
+            $out = preg_replace('/(#\sindefero\sstart).+(#\sindefero\send\s\s?)/isU', 
+                                $out, $original_keys);
+        } else {
+             $out .= $original_keys;   
+        }
         file_put_contents($authorized_keys, $out, LOCK_EX);
     }
 

src/IDF/Plugin/SyncGit/Serve.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Plugin/SyncMercurial.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Plugin/SyncMonotone.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2010 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,6 +27,18 @@
  */
 class IDF_Plugin_SyncMonotone
 {
+    private $old_err_rep = 0;
+
+    public function __construct()
+    {
+        $this->old_err_rep = error_reporting(0);
+    }
+
+    public function __destruct()
+    {
+        error_reporting($this->old_err_rep);
+    }
+
     /**
      * Entry point of the plugin.
      */
@@ -80,24 +92,33 @@ class IDF_Plugin_SyncMonotone
             return;
         }
 
+        // This guard cleans up on any kind of error, and here is how it works:
+        // As long as the guard is not committed, it keeps a reference to
+        // the given project. When the guard is destroyed and the reference
+        // is still present, it deletes the object. The deletion indirectly
+        // also calls into this plugin again, as the project delete hook
+        // will be called, that removes any changes we've made during the
+        // process.
+        $projectGuard = new IDF_Plugin_SyncMonotone_ModelGuard($project);
+
         $projecttempl = Pluf::f('mtn_repositories', false);
         if ($projecttempl === false) {
-            throw new IDF_Scm_Exception(
-                 __('"mtn_repositories" must be defined in your configuration file.')
+            $this->_diagnoseProblem(
+                 __('"mtn_repositories" must be defined in your configuration file')
             );
         }
 
         $usher_config = Pluf::f('mtn_usher_conf', false);
         if (!$usher_config || !is_writable($usher_config)) {
-            throw new IDF_Scm_Exception(
-                 __('"mtn_usher_conf" does not exist or is not writable.')
+            $this->_diagnoseProblem(
+                 __('"mtn_usher_conf" does not exist or is not writable')
             );
         }
 
         $mtnpostpush = realpath(dirname(__FILE__) . '/../../../scripts/mtn-post-push');
         if (!file_exists($mtnpostpush)) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('Could not find mtn-post-push script "%s".'), $mtnpostpush
+            $this->_diagnoseProblem(sprintf(
+                __('Could not find mtn-post-push script "%s"'), $mtnpostpush
             ));
         }
 
@@ -110,13 +131,12 @@ class IDF_Plugin_SyncMonotone
              'monotonerc.in',
              'remote-automate-permissions.in',
              'hooks.d/',
-             // this is linked and not copied to be able to update
-             // the list of read-only commands on upgrades
-             'hooks.d/indefero_authorize_remote_automate.conf',
              'hooks.d/indefero_authorize_remote_automate.lua',
              'hooks.d/indefero_post_push.conf.in',
              'hooks.d/indefero_post_push.lua',
         );
+        // enable remote command execution of read-only commands
+        // only for public projects
         if (!$project->private) {
             // this is linked and not copied to be able to update
             // the list of read-only commands on upgrades
@@ -131,8 +151,8 @@ class IDF_Plugin_SyncMonotone
         }
         foreach ($confdir_contents as $content) {
             if (!file_exists($confdir.$content)) {
-                throw new IDF_Scm_Exception(sprintf(
-                    __('The configuration file %s is missing.'), $content
+                $this->_diagnoseProblem(sprintf(
+                    __('The configuration file "%s" is missing'), $content
                 ));
             }
         }
@@ -140,14 +160,15 @@ class IDF_Plugin_SyncMonotone
         $shortname = $project->shortname;
         $projectpath = sprintf($projecttempl, $shortname);
         if (file_exists($projectpath)) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('The project path %s already exists.'), $projectpath
+            $this->_diagnoseProblem(sprintf(
+                __('The project path "%s" already exists'), $projectpath
             ));
         }
 
-        if (!mkdir($projectpath)) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('The project path %s could not be created.'), $projectpath
+        if (!@mkdir($projectpath)) {
+            $this->_diagnoseProblem(sprintf(
+                __('The project path "%s" could not be created'),
+                $projectpath
             ));
         }
 
@@ -156,7 +177,7 @@ class IDF_Plugin_SyncMonotone
         //
         $dbfile = $projectpath.'/database.mtn';
         $cmd = sprintf('db init -d %s', escapeshellarg($dbfile));
-        self::_mtn_exec($cmd);
+        $this->_mtn_exec($cmd);
 
         //
         // step 2) create a server key
@@ -175,16 +196,17 @@ class IDF_Plugin_SyncMonotone
             escapeshellarg($projectpath),
             escapeshellarg($serverkey)
         );
-        self::_mtn_exec($cmd);
+        $this->_mtn_exec($cmd);
 
         //
         // step 3) create a client key, and save it in IDF
         //
         $keydir = Pluf::f('tmp_folder').'/mtn-client-keys';
         if (!file_exists($keydir)) {
-            if (!mkdir($keydir)) {
-                throw new IDF_Scm_Exception(sprintf(
-                    __('The key directory %s could not be created.'), $keydir
+            if (!@mkdir($keydir)) {
+                $this->_diagnoseProblem(sprintf(
+                    __('The key directory "%s" could not be created'),
+                    $keydir
                 ));
             }
         }
@@ -194,14 +216,14 @@ class IDF_Plugin_SyncMonotone
             escapeshellarg($keydir),
             escapeshellarg($clientkey_name)
         );
-        $keyinfo = self::_mtn_exec($cmd);
+        $keyinfo = $this->_mtn_exec($cmd);
 
         $parsed_keyinfo = array();
         try {
             $parsed_keyinfo = IDF_Scm_Monotone_BasicIO::parse($keyinfo);
         }
         catch (Exception $e) {
-            throw new IDF_Scm_Exception(sprintf(
+            $this->_diagnoseProblem(sprintf(
                 __('Could not parse key information: %s'), $e->getMessage()
             ));
         }
@@ -219,13 +241,13 @@ class IDF_Plugin_SyncMonotone
             escapeshellarg($keydir),
             escapeshellarg($clientkey_hash)
         );
-        $clientkey_pubdata = self::_mtn_exec($cmd);
+        $clientkey_pubdata = $this->_mtn_exec($cmd);
 
         $cmd = sprintf('au put_public_key --db=%s %s',
             escapeshellarg($dbfile),
             escapeshellarg($clientkey_pubdata)
         );
-        self::_mtn_exec($cmd);
+        $this->_mtn_exec($cmd);
 
         //
         // step 4) setup the configuration
@@ -238,18 +260,20 @@ class IDF_Plugin_SyncMonotone
         foreach ($confdir_contents as $content) {
             $filepath = $projectpath.'/'.$content;
             if (substr($content, -1) == '/') {
-                if (!mkdir($filepath)) {
-                    throw new IDF_Scm_Exception(sprintf(
-                        __('Could not create configuration directory "%s"'), $filepath
+                if (!@mkdir($filepath)) {
+                    $this->_diagnoseProblem(sprintf(
+                        __('Could not create configuration directory "%s"'),
+                        $filepath
                     ));
                 }
                 continue;
             }
 
             if (substr($content, -3) != '.in') {
-                if (!symlink($confdir.$content, $filepath)) {
-                    IDF_Scm_Exception(sprintf(
-                        __('Could not create symlink "%s"'), $filepath
+                if (!@symlink($confdir.$content, $filepath)) {
+                    $this->_diagnoseProblem(sprintf(
+                        __('Could not create symlink for configuration file "%s"'),
+                        $filepath
                     ));
                 }
                 continue;
@@ -264,9 +288,10 @@ class IDF_Plugin_SyncMonotone
 
             // remove the .in
             $filepath = substr($filepath, 0, -3);
-            if (file_put_contents($filepath, $filecontents, LOCK_EX) === false) {
-                throw new IDF_Scm_Exception(sprintf(
-                    __('Could not write configuration file "%s"'), $filepath
+            if (@file_put_contents($filepath, $filecontents, LOCK_EX) === false) {
+                $this->_diagnoseProblem(sprintf(
+                    __('Could not write configuration file "%s"'),
+                    $filepath
                 ));
             }
         }
@@ -280,7 +305,7 @@ class IDF_Plugin_SyncMonotone
             $parsed_config = IDF_Scm_Monotone_BasicIO::parse($usher_rc);
         }
         catch (Exception $e) {
-            throw new IDF_Scm_Exception(sprintf(
+            $this->_diagnoseProblem(sprintf(
                 __('Could not parse usher configuration in "%s": %s'),
                 $usher_config, $e->getMessage()
             ));
@@ -291,7 +316,7 @@ class IDF_Plugin_SyncMonotone
             foreach ($stanzas as $stanza_line) {
                 if ($stanza_line['key'] == 'server' &&
                     $stanza_line['values'][0] == $shortname) {
-                    throw new IDF_Scm_Exception(sprintf(
+                    $this->_diagnoseProblem(sprintf(
                         __('usher configuration already contains a server '.
                            'entry named "%s"'),
                         $shortname
@@ -315,9 +340,10 @@ class IDF_Plugin_SyncMonotone
 
         // FIXME: more sanity - what happens on failing writes? we do not
         // have a backup copy of usher.conf around...
-        if (file_put_contents($usher_config, $usher_rc, LOCK_EX) === false) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('Could not write usher configuration file "%s"'), $usher_config
+        if (@file_put_contents($usher_config, $usher_rc, LOCK_EX) === false) {
+            $this->_diagnoseProblem(sprintf(
+                __('Could not write usher configuration file "%s"'),
+                $usher_config
             ));
         }
 
@@ -325,6 +351,9 @@ class IDF_Plugin_SyncMonotone
         // step 6) reload usher to pick up the new configuration
         //
         IDF_Scm_Monotone_Usher::reload();
+
+        // commit the guard, so the newly created project is not deleted
+        $projectGuard->commit();
     }
 
     /**
@@ -345,8 +374,8 @@ class IDF_Plugin_SyncMonotone
         $mtn = IDF_Scm_Monotone::factory($project);
         $stdio = $mtn->getStdio();
 
-        $projectpath = self::_get_project_path($project);
-        $auth_ids    = self::_get_authorized_user_ids($project);
+        $projectpath = $this->_get_project_path($project);
+        $auth_ids    = $this->_get_authorized_user_ids($project);
         $key_ids     = array();
         foreach ($auth_ids as $auth_id) {
             $sql = new Pluf_SQL('user=%s', array($auth_id));
@@ -361,9 +390,10 @@ class IDF_Plugin_SyncMonotone
 
         $write_permissions = implode("\n", $key_ids);
         $rcfile = $projectpath.'/write-permissions';
-        if (file_put_contents($rcfile, $write_permissions, LOCK_EX) === false) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('Could not write write-permissions file "%s"'), $rcfile
+        if (@file_put_contents($rcfile, $write_permissions, LOCK_EX) === false) {
+            $this->_diagnoseProblem(sprintf(
+                __('Could not write write-permissions file "%s"'),
+                $rcfile
             ));
         }
 
@@ -382,11 +412,13 @@ class IDF_Plugin_SyncMonotone
                 array('key' => 'allow', 'values' => array('*')),
             );
         }
+
         $read_permissions = IDF_Scm_Monotone_BasicIO::compile(array($stanza));
         $rcfile = $projectpath.'/read-permissions';
-        if (file_put_contents($rcfile, $read_permissions, LOCK_EX) === false) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('Could not write read-permissions file "%s"'), $rcfile
+        if (@file_put_contents($rcfile, $read_permissions, LOCK_EX) === false) {
+            $this->_diagnoseProblem(sprintf(
+                __('Could not write read-permissions file "%s"'),
+                $rcfile
             ));
         }
 
@@ -401,16 +433,16 @@ class IDF_Plugin_SyncMonotone
 
         $serverRestartRequired = false;
         if ($project->private && file_exists($projectfile) && is_link($projectfile)) {
-            if (!unlink($projectfile)) {
-                IDF_Scm_Exception(sprintf(
+            if (!@unlink($projectfile)) {
+                $this->_diagnoseProblem(sprintf(
                     __('Could not remove symlink "%s"'), $projectfile
                 ));
             }
             $serverRestartRequired = true;
         } else
         if (!$project->private && !file_exists($projectfile)) {
-            if (!symlink($templatefile, $projectfile)) {
-                throw new IDF_Scm_Exception(sprintf(
+            if (!@symlink($templatefile, $projectfile)) {
+                $this->_diagnoseProblem(sprintf(
                     __('Could not create symlink "%s"'), $projectfile
                 ));
             }
@@ -422,6 +454,9 @@ class IDF_Plugin_SyncMonotone
             // seems to be ignored when the server should be started
             // again immediately afterwards
             IDF_Scm_Monotone_Usher::killServer($project->shortname);
+            // give usher some time to cool down, otherwise it might hang
+            // (see https://code.monotone.ca/p/contrib/issues/175/)
+            sleep(2);
             IDF_Scm_Monotone_Usher::startServer($project->shortname);
         }
     }
@@ -443,8 +478,8 @@ class IDF_Plugin_SyncMonotone
 
         $usher_config = Pluf::f('mtn_usher_conf', false);
         if (!$usher_config || !is_writable($usher_config)) {
-            throw new IDF_Scm_Exception(
-                 __('"mtn_usher_conf" does not exist or is not writable.')
+            $this->_diagnoseProblem(
+                 __('"mtn_usher_conf" does not exist or is not writable')
             );
         }
 
@@ -453,16 +488,16 @@ class IDF_Plugin_SyncMonotone
 
         $projecttempl = Pluf::f('mtn_repositories', false);
         if ($projecttempl === false) {
-            throw new IDF_Scm_Exception(
-                 __('"mtn_repositories" must be defined in your configuration file.')
+            $this->_diagnoseProblem(
+                 __('"mtn_repositories" must be defined in your configuration file')
             );
         }
 
         $projectpath = sprintf($projecttempl, $shortname);
         if (file_exists($projectpath)) {
-            if (!self::_delete_recursive($projectpath)) {
-                throw new IDF_Scm_Exception(sprintf(
-                    __('One or more paths underknees %s could not be deleted.'), $projectpath
+            if (!$this->_delete_recursive($projectpath)) {
+                $this->_diagnoseProblem(sprintf(
+                    __('One or more paths underneath %s could not be deleted'), $projectpath
                 ));
             }
         }
@@ -473,8 +508,9 @@ class IDF_Plugin_SyncMonotone
         if ($keyname && $keyhash &&
             file_exists($keydir .'/'. $keyname . '.' . $keyhash)) {
             if (!@unlink($keydir .'/'. $keyname . '.' . $keyhash)) {
-                throw new IDF_Scm_Exception(sprintf(
-                    __('Could not delete client private key %s'), $keyname
+                $this->_diagnoseProblem(sprintf(
+                    __('Could not delete client private key "%s"'),
+                    $keyname
                 ));
             }
         }
@@ -485,7 +521,7 @@ class IDF_Plugin_SyncMonotone
             $parsed_config = IDF_Scm_Monotone_BasicIO::parse($usher_rc);
         }
         catch (Exception $e) {
-            throw new IDF_Scm_Exception(sprintf(
+            $this->_diagnoseProblem(sprintf(
                 __('Could not parse usher configuration in "%s": %s'),
                 $usher_config, $e->getMessage()
             ));
@@ -505,9 +541,10 @@ class IDF_Plugin_SyncMonotone
 
         // FIXME: more sanity - what happens on failing writes? we do not
         // have a backup copy of usher.conf around...
-        if (file_put_contents($usher_config, $usher_rc, LOCK_EX) === false) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('Could not write usher configuration file "%s"'), $usher_config
+        if (@file_put_contents($usher_config, $usher_rc, LOCK_EX) === false) {
+            $this->_diagnoseProblem(sprintf(
+                __('Could not write usher configuration file "%s"'),
+                $usher_config
             ));
         }
 
@@ -528,6 +565,8 @@ class IDF_Plugin_SyncMonotone
             return;
         }
 
+        $keyGuard = new IDF_Plugin_SyncMonotone_ModelGuard($key);
+
         foreach (Pluf::factory('IDF_Project')->getList() as $project) {
             $conf = new IDF_Conf();
             $conf->setProject($project);
@@ -535,8 +574,8 @@ class IDF_Plugin_SyncMonotone
             if ($scm != 'mtn')
                 continue;
 
-            $projectpath = self::_get_project_path($project);
-            $auth_ids    = self::_get_authorized_user_ids($project);
+            $projectpath = $this->_get_project_path($project);
+            $auth_ids    = $this->_get_authorized_user_ids($project);
             if (!in_array($key->user, $auth_ids))
                 continue;
 
@@ -556,7 +595,7 @@ class IDF_Plugin_SyncMonotone
                     $parsed_read_perms = IDF_Scm_Monotone_BasicIO::parse($read_perms);
                 }
                 catch (Exception $e) {
-                    throw new IDF_Scm_Exception(sprintf(
+                    $this->_diagnoseProblem(sprintf(
                         __('Could not parse read-permissions for project "%s": %s'),
                         $shortname, $e->getMessage()
                     ));
@@ -598,10 +637,11 @@ class IDF_Plugin_SyncMonotone
 
                 $read_perms = IDF_Scm_Monotone_BasicIO::compile($parsed_read_perms);
 
-                if (file_put_contents($projectpath.'/read-permissions',
+                if (@file_put_contents($projectpath.'/read-permissions',
                                       $read_perms, LOCK_EX) === false) {
-                    throw new IDF_Scm_Exception(sprintf(
-                        __('Could not write read-permissions for project "%s"'), $shortname
+                    $this->_diagnoseProblem(sprintf(
+                        __('Could not write read-permissions for project "%s"'),
+                        $shortname
                     ));
                 }
             }
@@ -611,9 +651,9 @@ class IDF_Plugin_SyncMonotone
             if (!in_array('*', $lines) && !in_array($mtn_key_id, $lines)) {
                 $lines[] = $mtn_key_id;
             }
-            if (file_put_contents($projectpath.'/write-permissions',
+            if (@file_put_contents($projectpath.'/write-permissions',
                                   implode("\n", $lines) . "\n", LOCK_EX) === false) {
-                throw new IDF_Scm_Exception(sprintf(
+                $this->_diagnoseProblem(sprintf(
                     __('Could not write write-permissions file for project "%s"'),
                     $shortname
                 ));
@@ -623,6 +663,8 @@ class IDF_Plugin_SyncMonotone
             $stdio = $mtn->getStdio();
             $stdio->exec(array('put_public_key', $key->content));
         }
+
+        $keyGuard->commit();
     }
 
     /**
@@ -651,8 +693,8 @@ class IDF_Plugin_SyncMonotone
             if ($scm != 'mtn')
                 continue;
 
-            $projectpath = self::_get_project_path($project);
-            $auth_ids    = self::_get_authorized_user_ids($project);
+            $projectpath = $this->_get_project_path($project);
+            $auth_ids    = $this->_get_authorized_user_ids($project);
             if (!in_array($key->user, $auth_ids))
                 continue;
 
@@ -672,7 +714,7 @@ class IDF_Plugin_SyncMonotone
                     $parsed_read_perms = IDF_Scm_Monotone_BasicIO::parse($read_perms);
                 }
                 catch (Exception $e) {
-                    throw new IDF_Scm_Exception(sprintf(
+                    $this->_diagnoseProblem(sprintf(
                         __('Could not parse read-permissions for project "%s": %s'),
                         $shortname, $e->getMessage()
                     ));
@@ -693,10 +735,11 @@ class IDF_Plugin_SyncMonotone
 
                 $read_perms = IDF_Scm_Monotone_BasicIO::compile($parsed_read_perms);
 
-                if (file_put_contents($projectpath.'/read-permissions',
+                if (@file_put_contents($projectpath.'/read-permissions',
                                       $read_perms, LOCK_EX) === false) {
-                    throw new IDF_Scm_Exception(sprintf(
-                        __('Could not write read-permissions for project "%s"'), $shortname
+                    $this->_diagnoseProblem(sprintf(
+                        __('Could not write read-permissions for project "%s"'),
+                        $shortname
                     ));
                 }
             }
@@ -711,9 +754,9 @@ class IDF_Plugin_SyncMonotone
                     continue;
                 }
             }
-            if (file_put_contents($projectpath.'/write-permissions',
-                                  implode("\n", $lines) . "\n", LOCK_EX) === false) {
-                throw new IDF_Scm_Exception(sprintf(
+            if (@file_put_contents($projectpath.'/write-permissions',
+                                   implode("\n", $lines) . "\n", LOCK_EX) === false) {
+                $this->_diagnoseProblem(sprintf(
                     __('Could not write write-permissions file for project "%s"'),
                     $shortname
                 ));
@@ -762,7 +805,43 @@ class IDF_Plugin_SyncMonotone
         ));
     }
 
-    private static function _get_authorized_user_ids($project)
+    private function _get_project_path($project)
+    {
+        $projecttempl = Pluf::f('mtn_repositories', false);
+        if ($projecttempl === false) {
+            $this->_diagnoseProblem(
+                 __('"mtn_repositories" must be defined in your configuration file.')
+            );
+        }
+
+        $projectpath = sprintf($projecttempl, $project->shortname);
+        if (!file_exists($projectpath)) {
+            $this->_diagnoseProblem(sprintf(
+                __('The project path %s does not exists.'), $projectpath
+            ));
+        }
+        return $projectpath;
+    }
+
+    private function _mtn_exec($cmd)
+    {
+        $fullcmd = sprintf('%s %s %s',
+            Pluf::f('idf_exec_cmd_prefix', ''),
+            Pluf::f('mtn_path', 'mtn'),
+            $cmd
+        );
+
+        $output = $return = null;
+        exec($fullcmd, $output, $return);
+        if ($return != 0) {
+            $this->_diagnoseProblem(sprintf(
+                __('The command "%s" could not be executed.'), $cmd
+            ));
+        }
+        return implode("\n", $output);
+    }
+
+    private function _get_authorized_user_ids($project)
     {
         $mem = $project->getMembershipData();
         $members = array_merge((array)$mem['members'],
@@ -775,43 +854,7 @@ class IDF_Plugin_SyncMonotone
         return $userids;
     }
 
-    private static function _get_project_path($project)
-    {
-        $projecttempl = Pluf::f('mtn_repositories', false);
-        if ($projecttempl === false) {
-            throw new IDF_Scm_Exception(
-                 __('"mtn_repositories" must be defined in your configuration file.')
-            );
-        }
-
-        $projectpath = sprintf($projecttempl, $project->shortname);
-        if (!file_exists($projectpath)) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('The project path %s does not exists.'), $projectpath
-            ));
-        }
-        return $projectpath;
-    }
-
-    private static function _mtn_exec($cmd)
-    {
-        $fullcmd = sprintf('%s %s %s',
-            Pluf::f('idf_exec_cmd_prefix', ''),
-            Pluf::f('mtn_path', 'mtn'),
-            $cmd
-        );
-
-        $output = $return = null;
-        exec($fullcmd, $output, $return);
-        if ($return != 0) {
-            throw new IDF_Scm_Exception(sprintf(
-                __('The command "%s" could not be executed.'), $cmd
-            ));
-        }
-        return implode("\n", $output);
-    }
-
-    private static function _delete_recursive($path)
+    private function _delete_recursive($path)
     {
         if (is_file($path) || is_link($path)) {
             return @unlink($path);
@@ -821,10 +864,48 @@ class IDF_Plugin_SyncMonotone
             $scan = glob(rtrim($path, '/') . '/*');
             $status = 0;
             foreach ($scan as $subpath) {
-                $status |= self::_delete_recursive($subpath);
+                $status |= $this->_delete_recursive($subpath);
             }
-            $status |= rmdir($path);
+            $status |= @rmdir($path);
             return $status;
         }
     }
+
+    private function _diagnoseProblem($msg)
+    {
+        $system_err = error_get_last();
+        if (!empty($system_err)) {
+            $msg .= ': '.$system_err['message'];
+        }
+
+        error_reporting($this->old_err_rep);
+        throw new IDF_Scm_Exception($msg);
+    }
 }
+
+/**
+ * A simple helper class that deletes the model instance if
+ * it is not committed
+ */
+class IDF_Plugin_SyncMonotone_ModelGuard
+{
+    private $model;
+
+    public function __construct(Pluf_Model $m)
+    {
+        $this->model = $m;
+    }
+
+    public function __destruct()
+    {
+        if ($this->model == null)
+            return;
+        $this->model->delete();
+    }
+
+    public function commit()
+    {
+        $this->model = null;
+    }
+}
+

src/IDF/Plugin/SyncMonotone/hooks.d/indefero_authorize_remote_automate.lua

@@ -1,6 +1,6 @@
 -- ***** BEGIN LICENSE BLOCK *****
 -- This file is part of InDefero, an open source project management application.
--- Copyright (C) 2011 Céondo Ltd and contributors.
+-- Copyright (C) 2008-2011 Céondo Ltd and contributors.
 -- Copyright (C) 2010 Thomas Keller <me@thomaskeller.biz>
 --                    Richard Levitte <richard@levitte.org>
 --

src/IDF/Plugin/SyncMonotone/hooks.d/indefero_post_push.lua

@@ -1,6 +1,6 @@
 -- ***** BEGIN LICENSE BLOCK *****
 -- This file is part of InDefero, an open source project management application.
--- Copyright (C) 2011 Céondo Ltd and contributors.
+-- Copyright (C) 2008-2011 Céondo Ltd and contributors.
 --
 -- InDefero is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by

src/IDF/Plugin/SyncMonotone/monotonerc.in

@@ -1,6 +1,6 @@
 -- ***** BEGIN LICENSE BLOCK *****
 -- This file is part of InDefero, an open source project management application.
--- Copyright (C) 2011 Céondo Ltd and contributors.
+-- Copyright (C) 2008-2011 Céondo Ltd and contributors.
 --
 -- InDefero is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by

src/IDF/Plugin/SyncSvn.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Precondition.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -190,7 +190,12 @@ class IDF_Precondition
             return true; // Again need authentication error
         }
         $request->user = $users[0];
-        IDF_Middleware::setRights($request);
+        
+        // Don't try to load projects rights access if we are not in one
+        if ($request->query !== "/api/") {
+            IDF_Middleware::setRights($request);
+        }
+            
         return true;
     }
 
@@ -256,4 +261,4 @@ class IDF_Precondition
         $encrypted = trim($cr->encrypt($user->id.':'.$project->id), '~');
         return substr(md5(Pluf::f('secret_key').$encrypted), 0, 2).$encrypted;
     }
-}
+}

src/IDF/Project.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -132,6 +132,46 @@ class IDF_Project extends Pluf_Model
         }
         return $projects[0];
     }
+    
+    /**
+     * Returns the number of open/closed issues.
+     *
+     * @param string Status ('open'), 'closed'
+     * @param IDF_Tag Subfilter with a label (null)
+     * @return int Count
+     */
+    public function getIssueCountByOwner($status='open')
+    {
+        switch ($status) {
+        case 'open':
+            $tags = implode(',', $this->getTagIdsByStatus('open'));
+            break;
+        case 'closed':
+        default:
+            $tags = implode(',', $this->getTagIdsByStatus('closed'));
+            break;
+        }
+        $sqlIssueTable = Pluf::factory('IDF_Issue')->getSqlTable();
+        $query = "SELECT uid AS id,COUNT(uid) AS nb
+FROM (
+    SELECT COALESCE(owner, -1) AS uid
+    FROM $sqlIssueTable
+    WHERE status IN ($tags)
+    ) AS ff
+GROUP BY uid";
+
+        $db = Pluf::db();
+        $dbData = $db->select($query);
+        $ownerStatistics = array();
+        foreach ($dbData as $k => $v) {
+            $key = ($v['id'] === '-1') ? null : $v['id'];
+            $ownerStatistics[$key] = (int)$v['nb'];
+        }
+        
+        arsort($ownerStatistics);
+
+        return $ownerStatistics;
+    }
 
     /**
      * Returns the number of open/closed issues.
@@ -233,6 +273,29 @@ class IDF_Project extends Pluf_Model
         return $tags;
     }
 
+    /**
+     * Returns a list of relations which are available in this project as
+     * associative array. Each key-value pair marks a set of orthogonal
+     * relations. To ease processing, each of these pairs is included twice
+     * in the array, once as key1 => key2 and once as key2 => key1.
+     *
+     * @return array List of relation names
+     */
+    public function getRelationsFromConfig()
+    {
+        $conf = $this->getConf();
+        $rel = $conf->getVal('issue_relations', IDF_Form_IssueTrackingConf::init_relations);
+        $relations = array();
+        foreach (preg_split("/\015\012|\015|\012/", $rel, -1, PREG_SPLIT_NO_EMPTY) as $s) {
+            $verbs = preg_split("/\s*,\s*/", $s, 2);
+            if (count($verbs) == 1)
+                $relations += array($verbs[0] => $verbs[0]);
+            else
+                $relations += array($verbs[0] => $verbs[1], $verbs[1] => $verbs[0]);
+        }
+        return $relations;
+    }
+
     /**
      * Return membership data.
      *

src/IDF/Queue.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Review.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Review/Comment.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Review/FileComment.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Review/Patch.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/IDF/Scm.php

@@ -3,7 +3,7 @@
 /*
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
-# Copyright (C) 2008 Céondo Ltd and contributors.
+# Copyright (C) 2008-2011 Céondo Ltd and contributors.
 #
 # InDefero is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -88,22 +88,36 @@ class IDF_Scm
     }
 
     /**
-     * Run exec and log some information.
+     * Runs the given command and log some information.
+     *
+     * A previous version used plain exec(), but this should not be used
+     * for various reasons, one being that this command does not preserve
+     * trailing whitespace, which is essential for proper diff parsing.
      *
      * @param $caller Calling method
      * @param $cmd Command to run
      * @param &$out Array of output
      * @param &$return Return value
-     * @return string Last line of the command
      */
     public static function exec($caller, $cmd, &$out=null, &$return=null)
     {
+        $return = -1;
         Pluf_Log::stime('timer');
-        $ret = exec($cmd, $out, $return);
+        $fp = popen($cmd, 'r');
+        $buf = '';
+        if ($fp !== false) {
+            while (!feof($fp)) {
+                $buf .= fread($fp, 1024);
+            }
+            $return = pclose($fp);
+        }
+        $out = preg_split('/\r\n|\r|\n/', $buf);
+        $elem = count($out);
+        if ($elem > 0 && $out[$elem-1] === '')
+            unset($out[$elem-1]);
         Pluf_Log::perf(array($caller, $cmd, Pluf_Log::etime('timer', 'total_exec')));
         Pluf_Log::debug(array($caller, $cmd, $out));
         Pluf_Log::inc('exec_calls');
-        return $ret;
     }
 
     /**
@@ -325,7 +339,8 @@ class IDF_Scm
      * stdClass object {
      *  'additions' => array('path/to/file', 'path/to/directory', ...),
      *  'deletions' => array('path/to/file', 'path/to/directory', ...),
-     *  'renames' => array('old/path/to/file' => 'new/path/to/file', ...)
+     *  'renames' => array('old/path/to/file' => 'new/path/to/file', ...),
+     *  'copies' => array('path/to/source' => 'path/to/target', ...),
      *  'patches' => array('path/to/file', ...),
      *  'properties' => array('path/to/file' => array(
      *              'propname' => 'propvalue', 'deletedprop' => null, ...)
@@ -473,5 +488,14 @@ class IDF_Scm
     {
         return str_replace('%2F', '/', rawurlencode($path));
     }
+
+    /**
+     * Returns the number of slashes and preceeding path components
+     * that should be stripped from paths in the SCM's diff output
+     */
+    public function getDiffPathStripLevel()
+    {
+        return 0;
+    }
 }