Write-protect git repository over HTTP!

I totally misunderstood the access control mechanism (but it's logical
that it behaves the way it does), and so on git projects with "open"
source access, repos were write-for-all.

This should fix it by enforcing member-or-owner auth for writes.

Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>

.gitattributes

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

.gitignore

@@ -1,3 +1,4 @@
+*~
 tmp
 src/IDF/conf/idf.php
 src/IDF/conf/idf.test.php
@@ -6,3 +7,8 @@ www/media/upload
 src/IDF/gettexttemplates
 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,28 +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
+    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

@@ -0,0 +1,116 @@
+[Indefero][idf] is not only a software you can use either hosted for
+you or hosted by you, but also a free software you can contribute to. 
+
+Here you will get how to contribute and what to contribute.
+
+[idf]: http://www.indefero.net 
+
+# Quick Way on How to Contribute
+
+Simple contribution:
+
+1. Open a ticket with your idea. You can directly propose a patch if
+   you have it.
+
+2. Wait for it to be checked by the devs or meet us on the #indefero
+   channel on [FreeNode][freenode].
+
+Bigger contribution:
+
+1. Fork Indefero where you want (fork from the develop branch).
+
+2. Code your change and document it.
+
+3. Open a ticket with a pull request and talk about it on IRC.
+
+# The General Contribution Workflow for Regular Contributors
+
+1. Fork Indefero from the **develop** branch.
+2. Request a pull request if you do not have write access on the repository.
+3. Merge your changes without fast forward in develop. This keeps track of 
+   the history of the changes and makes understanding what is going on easy.
+4. Merge your changes with fast forward **only if a single commit**.
+
+Indefero is composed of two main branches:
+
+1. **master**: this is the shipped branch, only a select number of people
+   can push into it.
+2. **develop**: this is the development branch, all the people having write
+   access to the repository are welcomed to push in.
+
+**Note:** The branching model we use is [explained in details here][bmi]. You
+**must** understand it to really contribute to the code base in an
+efficient way. 
+
+[bmi]: http://nvie.com/git-model "A successful Git branching model"
+
+# What to Contribute
+
+Contribution is easy, you can contribute in a lot of different fields,
+contributions small or big are always appreciated. Here is an example
+list of what you can do:
+
+- Install InDefero on your system and report the problem you had.
+- Find the bad English and typos and propose corrections.
+- Help with the translation effort.
+- Find little bugs or usability problems and provide ideas on how to fix them.
+- Register to the [discussion group][group] and help new users.
+- Come and chat on IRC #indefero on the [FreeNode][freenode] servers.
+- Find ways to improve the design while keeping it **beautifully simple**.
+- Write a blog post about the project, what you think is good or bad.
+- Translate InDefero for the sake of the community.
+- Or maybe really hack into the code.
+
+As you can see, the real hacking into the code is just a small part of the work, so even if you are not a coder you can do a lot.
+
+[group]: http://groups.google.com/group/indefero-users
+[freenode]: http://freenode.net/ 
+
+## I am a simple user
+
+Thanks a lot! Really! As a project leader, I consider **you** as 
+**the most important person in the success of the project**. So do not
+worry, I will really listen to your needs and make you love this
+project.
+
+What you can do to help:
+
+- Use the software and each time you find something a bit annoying in your daily use, report a bug. Usability issues are high priority issues.
+- Find typos, grammar mistakes, etc. and report a bug.
+- Write about InDefero on your blog/website.
+- Read the issues submitted by the users and provide answers if you have them.
+- ...
+
+## I am a designer
+
+A lot of things to do for you:
+
+- Check the design and find the flaws in it. Is the space well used, does it look really nice and is it also functional for the first users?
+- Do we have good support of all the major browsers?
+- ...
+
+## I am a coder
+
+Checkout the code and have fun, but keep in mind that your results
+must be simple to use. Do not worry about the beautiful part, the
+designers can work on that.
+
+## I am a security guy
+
+Please, do try to break it, if you find a problem, come on IRC or
+contact the developers to get the issue fixed as soon as
+possible. Please, be nice, do not release the issue in the wild
+without first talking to us.
+
+## I am a translator
+
+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 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
 
@@ -212,4 +220,14 @@ If you access a Subversion server with a self-signed certificate, you
 may have problems as your certificate is not trusted, check the
 [procedure provided here][svnfix] to solve the problem.
 
-[svnfix]: http://projects.ceondo.com/p/indefero/issues/319/#ic1358
+[svnfix]: http://projects.ceondo.com/p/indefero/issues/319/#ic1358
+
+## If the registration links are not working
+
+If You have standard instalaction of PHP ie in Debian, php.ini sets
+mbstring.func_overload to value "2" for overloading str*
+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/

Makefile

@@ -0,0 +1,150 @@
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of InDefero, an open source project management application.
+# Copyright (C) 2010 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 ***** */
+
+#   Installation of external tools : transifex-client
+#   sudo apt-get install python-setuptools
+#   sudo easy_install -U transifex-client
+
+
+
+.PHONY: help
+help:
+	@printf "Rules for generating distributable files :\n"
+	@for b in `git branch | sed "s/^. //g"`; do \
+		printf "\t"$$b"-zipfile - Generate a zip archive of the "$$b" branch.\n"; \
+	done
+	@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"
+
+
+#
+#   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: 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;    \
+	fi
+	touch src/IDF/locale/idf.pot;
+	# Extract string
+	@cd src; php $(PLUF_PATH)/extracttemplates.php IDF/conf/idf.php IDF/gettexttemplates
+	@cd src; for phpfile in `find . -iname "*.php"`; do \
+		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: pluf_path
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+		printf "Updating file : "$$pofile"\n"; \
+		msgmerge -v -U $$pofile src/IDF/locale/idf.pot; \
+		printf "\n"; \
+	done
+
+#
+#   Transifex
+#
+.PHONY: check-tx-config
+check-tx-config:
+	@if [ ! -e .tx/config ]; then                                       \
+	mkdir -p .tx;                                                       \
+	touch .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					\
+	touch $(HOME)/.transifexrc;												\
+	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
+
+pot-push: check-tx-config
+	@tx push -s
+
+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 zipfile of indefero for a specified branch
+#   ex: make master_zipfile
+#       make develop_zipfile
+#
+%-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,154 @@
+# 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
+- git repositories are now available under /r/projectname/
+
+## Bugfixes
+
+- The SVN interface acts more robust if an underlying repository has been restructured (issues 364 and 721)
+- 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)
+- Indefero now sends the MD5 checksum as HTTP header when downloading a file from the
+  download area. Additionally, a unneeded redirect has been removed. (issue 716)
+- 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
+- Indefero no longer displays an empty parents paragraph in the commit view for root revisions of
+  a git repository
+
+## 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.
+

contrib/zipstream-php-0.2.2/COPYING

@@ -0,0 +1,20 @@
+Copyright (C) 2007-2009 Paul Duncan <pabs@pablotron.org>
+ 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+  
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the of the Software.
+   
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.  

contrib/zipstream-php-0.2.2/README

@@ -0,0 +1,42 @@
+ZipStream 0.2.2 README
+======================
+
+Please see the file COPYING for licensing and warranty information.  The
+latest version of this software is available at the following URL:
+
+    http://pablotron.org/software/zipstream-php/
+
+Overview
+========
+A fast and simple streaming zip file downloader for PHP.  Here's a
+simple example:
+
+    # create a new zipstream object
+    $zip = new ZipStream('example.zip');
+
+    # create a file named 'hello.txt' 
+    $zip->add_file('some_image.jpg', 'This is the contents of hello.txt');
+
+    # add a file named 'image.jpg' from a local file 'path/to/image.jpg'
+    $zip->add_file_from_path('some_image.jpg', 'path/to/image.jpg');
+
+    # finish the zip stream
+    $zip->finish();
+
+You can also add comments, modify file timestamps, and customize (or
+disable) the HTTP headers.  See the class file for details.  There are a
+couple of additional examples in the initial release announcement at the
+following URL:
+
+    http://pablotron.org/?cid=1535
+
+Requirements
+============
+
+  * PHP version 5.1.2 or newer (specifically, the hash_init and
+    hash_file functions).
+
+About the Author
+================
+Paul Duncan <pabs@pablotron.org>
+http://pablotron.org/

contrib/zipstream-php-0.2.2/extras/README

@@ -0,0 +1,2 @@
+Based on PKZIP appnotes, which are included here.
+

contrib/zipstream-php-0.2.2/test/index.php

@@ -0,0 +1,52 @@
+<?php
+
+# load zipstream class
+require '../zipstream.php';
+
+# get path to current file
+$pwd = dirname(__FILE__);
+
+# add some random files
+$files = array(
+  '../extras/zip-appnote-6.3.1-20070411.txt',
+  '../zipstream.php',
+);
+
+# create new zip stream object
+$zip = new ZipStream('test.zip', array(
+  'comment' => 'this is a zip file comment.  hello?'
+));
+
+# common file options
+$file_opt = array(
+  # file creation time (2 hours ago)
+  'time'    => time() - 2 * 3600,
+
+  # file comment
+  'comment' => 'this is a file comment. hi!',
+);
+
+# add files under folder 'asdf'
+foreach ($files as $file) {
+  # build absolute path and get file data
+  $path = ($file[0] == '/') ? $file : "$pwd/$file";
+  $data = file_get_contents($path);
+
+  # add file to archive
+  $zip->add_file('asdf/' . basename($file), $data, $file_opt);
+}
+
+# add same files again wihtout a folder
+foreach ($files as $file) {
+  # build absolute path and get file data
+  $path = ($file[0] == '/') ? $file : "$pwd/$file";
+  $data = file_get_contents($path);
+
+  # add file to archive
+  $zip->add_file(basename($file), $data, $file_opt);
+}
+
+# finish archive
+$zip->finish();
+
+?>

contrib/zipstream-php-0.2.2/zipstream.php

@@ -0,0 +1,580 @@
+<?php
+
+##########################################################################
+# ZipStream - Streamed, dynamically generated zip archives.              #
+# by Paul Duncan <pabs@pablotron.org>                                    #
+#                                                                        #
+# Copyright (C) 2007-2009 Paul Duncan <pabs@pablotron.org>               #
+#                                                                        #
+# Permission is hereby granted, free of charge, to any person obtaining  #
+# a copy of this software and associated documentation files (the        #
+# "Software"), to deal in the Software without restriction, including    #
+# without limitation the rights to use, copy, modify, merge, publish,    #
+# distribute, sublicense, and/or sell copies of the Software, and to     #
+# permit persons to whom the Software is furnished to do so, subject to  #
+# the following conditions:                                              #
+#                                                                        #
+# The above copyright notice and this permission notice shall be         #
+# included in all copies or substantial portions of the of the Software. #
+#                                                                        #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        #
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     #
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. #
+# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR      #
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,  #
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR  #
+# OTHER DEALINGS IN THE SOFTWARE.                                        #
+##########################################################################
+
+#
+# ZipStream - Streamed, dynamically generated zip archives.
+# by Paul Duncan <pabs@pablotron.org>
+#
+# Requirements:
+#
+# * PHP version 5.1.2 or newer.
+#
+# Usage:
+#
+# Streaming zip archives is a simple, three-step process:
+#
+# 1.  Create the zip stream:
+#
+#     $zip = new ZipStream('example.zip');
+#
+# 2.  Add one or more files to the archive:
+#
+#     # add first file
+#     $data = file_get_contents('some_file.gif');
+#     $zip->add_file('some_file.gif', $data);
+#
+#     # add second file
+#     $data = file_get_contents('some_file.gif');
+#     $zip->add_file('another_file.png', $data);
+#
+# 3.  Finish the zip stream:
+#
+#     $zip->finish();
+#
+# You can also add an archive comment, add comments to individual files,
+# and adjust the timestamp of files.  See the API documentation for each
+# method below for additional information.
+#
+# Example:
+#
+#   # create a new zip stream object
+#   $zip = new ZipStream('some_files.zip');
+#
+#   # list of local files
+#   $files = array('foo.txt', 'bar.jpg');
+#
+#   # read and add each file to the archive
+#   foreach ($files as $path)
+#     $zip->add_file($path, file_get_contents($path));
+# 
+#   # write archive footer to stream
+#   $zip->finish();
+#
+class ZipStream {
+  const VERSION = '0.2.2';
+
+  var $opt = array(),
+      $files = array(),
+      $cdr_ofs = 0,
+      $need_headers = false,
+      $ofs = 0; 
+
+  #
+  # Create a new ZipStream object.
+  #
+  # Parameters:
+  #
+  #   $name - Name of output file (optional).
+  #   $opt  - Hash of archive options (optional, see "Archive Options"
+  #           below).
+  #
+  # Archive Options:
+  #
+  #   comment             - Comment for this archive.
+  #   content_type        - HTTP Content-Type.  Defaults to 'application/x-zip'.
+  #   content_disposition - HTTP Content-Disposition.  Defaults to 
+  #                         'attachment; filename=\"FILENAME\"', where
+  #                         FILENAME is the specified filename.
+  #   large_file_size     - Size, in bytes, of the largest file to try
+  #                         and load into memory (used by
+  #                         add_file_from_path()).  Large files may also
+  #                         be compressed differently; see the
+  #                         'large_file_method' option.
+  #   large_file_method   - How to handle large files.  Legal values are
+  #                         'store' (the default), or 'deflate'.  Store
+  #                         sends the file raw and is significantly
+  #                         faster, while 'deflate' compresses the file
+  #                         and is much, much slower.  Note that deflate
+  #                         must compress the file twice and extremely
+  #                         slow.
+  #   send_http_headers   - Boolean indicating whether or not to send
+  #                         the HTTP headers for this file.
+  #
+  # Note that content_type and content_disposition do nothing if you are
+  # not sending HTTP headers.
+  #
+  # Large File Support:
+  #
+  # By default, the method add_file_from_path() will send send files
+  # larger than 20 megabytes along raw rather than attempting to
+  # compress them.  You can change both the maximum size and the
+  # compression behavior using the large_file_* options above, with the
+  # following caveats:
+  #
+  # * For "small" files (e.g. files smaller than large_file_size), the
+  #   memory use can be up to twice that of the actual file.  In other
+  #   words, adding a 10 megabyte file to the archive could potentially
+  #   occupty 20 megabytes of memory.
+  #
+  # * Enabling compression on large files (e.g. files larger than
+  #   large_file_size) is extremely slow, because ZipStream has to pass
+  #   over the large file once to calculate header information, and then
+  #   again to compress and send the actual data.
+  #
+  # Examples:
+  #
+  #   # create a new zip file named 'foo.zip'
+  #   $zip = new ZipStream('foo.zip');
+  #
+  #   # create a new zip file named 'bar.zip' with a comment
+  #   $zip = new ZipStream('bar.zip', array(
+  #     'comment' => 'this is a comment for the zip file.',
+  #   ));
+  #
+  # Notes:
+  #
+  # If you do not set a filename, then this library _DOES NOT_ send HTTP
+  # headers by default.  This behavior is to allow software to send its
+  # own headers (including the filename), and still use this library.
+  #
+  function __construct($name = null, $opt = array()) {
+    # save options
+    $this->opt = $opt;
+
+    # set large file defaults: size = 20 megabytes, method = store
+    if (!isset($this->opt['large_file_size']))
+      $this->opt['large_file_size'] = 20 * 1024 * 1024;
+    if (!isset($this->opt['large_file_method']))
+      $this->opt['large_file_method'] = 'store';
+
+    $this->output_name = $name;
+    if ($name || (isset($opt['send_http_headers']) 
+        && $opt['send_http_headers']))
+      $this->need_headers = true; 
+  }
+
+  #
+  # add_file - add a file to the archive
+  #
+  # Parameters:
+  #   
+  #  $name - path of file in archive (including directory).
+  #  $data - contents of file
+  #  $opt  - Hash of options for file (optional, see "File Options"
+  #          below).  
+  #
+  # File Options: 
+  #  time     - Last-modified timestamp (seconds since the epoch) of
+  #             this file.  Defaults to the current time.
+  #  comment  - Comment related to this file.
+  #
+  # Examples:
+  #
+  #   # add a file named 'foo.txt'
+  #   $data = file_get_contents('foo.txt');
+  #   $zip->add_file('foo.txt', $data);
+  # 
+  #   # add a file named 'bar.jpg' with a comment and a last-modified
+  #   # time of two hours ago
+  #   $data = file_get_contents('bar.jpg');
+  #   $zip->add_file('bar.jpg', $data, array(
+  #     'time'    => time() - 2 * 3600,
+  #     'comment' => 'this is a comment about bar.jpg',
+  #   ));
+  # 
+  function add_file($name, $data, $opt = array()) {
+    # compress data
+    $zdata = gzdeflate($data);
+
+    # calculate header attributes
+    $crc  = crc32($data);
+    $zlen = strlen($zdata);
+    $len  = strlen($data);
+    $meth = 0x08;
+
+    # send file header
+    $this->add_file_header($name, $opt, $meth, $crc, $zlen, $len);
+
+    # print data
+    $this->send($zdata);
+  }
+
+  #
+  # add_file_from_path - add a file at path to the archive.
+  #
+  # Note that large files may be compresed differently than smaller
+  # files; see the "Large File Support" section above for more
+  # information.
+  #
+  # Parameters:
+  #   
+  #  $name - name of file in archive (including directory path).
+  #  $path - path to file on disk (note: paths should be encoded using
+  #          UNIX-style forward slashes -- e.g '/path/to/some/file').
+  #  $opt  - Hash of options for file (optional, see "File Options"
+  #          below).  
+  #
+  # File Options: 
+  #  time     - Last-modified timestamp (seconds since the epoch) of
+  #             this file.  Defaults to the current time.
+  #  comment  - Comment related to this file.
+  #
+  # Examples:
+  #
+  #   # add a file named 'foo.txt' from the local file '/tmp/foo.txt'
+  #   $zip->add_file_from_path('foo.txt', '/tmp/foo.txt');
+  # 
+  #   # add a file named 'bigfile.rar' from the local file
+  #   # '/usr/share/bigfile.rar' with a comment and a last-modified
+  #   # time of two hours ago
+  #   $path = '/usr/share/bigfile.rar';
+  #   $zip->add_file_from_path('bigfile.rar', $path, array(
+  #     'time'    => time() - 2 * 3600,
+  #     'comment' => 'this is a comment about bar.jpg',
+  #   ));
+  # 
+  function add_file_from_path($name, $path, $opt = array()) {
+    if ($this->is_large_file($path)) {
+      # file is too large to be read into memory; add progressively
+      $this->add_large_file($name, $path, $opt);
+    } else {
+      # file is small enough to read into memory; read file contents and
+      # handle with add_file()
+      $data = file_get_contents($path);
+      $this->add_file($name, $data, $opt);
+    }
+  }
+
+  #
+  # finish - Write zip footer to stream.
+  #
+  # Example:
+  #
+  #   # add a list of files to the archive
+  #   $files = array('foo.txt', 'bar.jpg');
+  #   foreach ($files as $path)
+  #     $zip->add_file($path, file_get_contents($path));
+  # 
+  #   # write footer to stream
+  #   $zip->finish();
+  # 
+  function finish() {
+    # add trailing cdr record
+    $this->add_cdr($this->opt);
+    $this->clear();
+  }
+
+  ###################
+  # PRIVATE METHODS #
+  ###################
+
+  #
+  # Create and send zip header for this file.
+  #
+  private function add_file_header($name, $opt, $meth, $crc, $zlen, $len) {
+    # strip leading slashes from file name
+    # (fixes bug in windows archive viewer)
+    $name = preg_replace('/^\\/+/', '', $name);
+
+    # calculate name length
+    $nlen = strlen($name);
+
+    # create dos timestamp
+    $opt['time'] = isset($opt['time']) ? $opt['time'] : time();
+    $dts = $this->dostime($opt['time']);
+
+    # build file header
+    $fields = array(            # (from V.A of APPNOTE.TXT)
+      array('V', 0x04034b50),     # local file header signature
+      array('v', (6 << 8) + 3),   # version needed to extract
+      array('v', 0x00),           # general purpose bit flag
+      array('v', $meth),          # compresion method (deflate or store)
+      array('V', $dts),           # dos timestamp
+      array('V', $crc),           # crc32 of data
+      array('V', $zlen),          # compressed data length
+      array('V', $len),           # uncompressed data length
+      array('v', $nlen),          # filename length
+      array('v', 0),              # extra data len
+    );
+
+    # pack fields and calculate "total" length
+    $ret = $this->pack_fields($fields);
+    $cdr_len = strlen($ret) + $nlen + $zlen;
+
+    # print header and filename
+    $this->send($ret . $name);
+
+    # add to central directory record and increment offset
+    $this->add_to_cdr($name, $opt, $meth, $crc, $zlen, $len, $cdr_len);
+  }
+
+  #
+  # Add a large file from the given path.
+  #
+  private function add_large_file($name, $path, $opt = array()) {
+    $st = stat($path);
+    $block_size = 1048576; # process in 1 megabyte chunks
+    $algo = 'crc32b';
+
+    # calculate header attributes
+    $zlen = $len = $st['size'];
+
+    $meth_str = $this->opt['large_file_method'];
+    if ($meth_str == 'store') {
+      # store method
+      $meth = 0x00;
+      $crc  = unpack('V', hash_file($algo, $path, true));
+      $crc = $crc[1];
+    } elseif ($meth_str == 'deflate') {
+      # deflate method
+      $meth = 0x08;
+
+      # open file, calculate crc and compressed file length
+      $fh = fopen($path, 'rb');
+      $hash_ctx = hash_init($algo);
+      $zlen = 0;
+
+      # read each block, update crc and zlen
+      while ($data = fgets($fh, $block_size)) {
+        hash_update($hash_ctx, $data);
+        $data = gzdeflate($data);
+        $zlen += strlen($data);
+      }
+
+      # close file and finalize crc
+      fclose($fh);
+      $crc = unpack('V', hash_final($hash_ctx, true));
+      $crc = $crc[1];
+    } else {
+      die("unknown large_file_method: $meth_str");
+    }
+
+    # send file header
+    $this->add_file_header($name, $opt, $meth, $crc, $zlen, $len);
+
+    # open input file
+    $fh = fopen($path, 'rb');
+
+    # send file blocks
+    while ($data = fgets($fh, $block_size)) {
+      if ($meth_str == 'deflate') 
+        $data = gzdeflate($data);
+
+      # send data
+      $this->send($data);
+    }
+
+    # close input file
+    fclose($fh);
+  }
+
+  #
+  # Is this file larger than large_file_size?
+  #
+  function is_large_file($path) {
+    $st = stat($path);
+    return ($this->opt['large_file_size'] > 0) && 
+           ($st['size'] > $this->opt['large_file_size']);
+  }
+
+  #
+  # Save file attributes for trailing CDR record.
+  #
+  private function add_to_cdr($name, $opt, $meth, $crc, $zlen, $len, $rec_len) {
+    $this->files[] = array($name, $opt, $meth, $crc, $zlen, $len, $this->ofs);
+    $this->ofs += $rec_len;
+  }
+
+  #
+  # Send CDR record for specified file.
+  #
+  private function add_cdr_file($args) {
+    list ($name, $opt, $meth, $crc, $zlen, $len, $ofs) = $args;
+
+    # get attributes
+    $comment = isset($opt['comment']) ? $opt['comment'] : '';
+
+    # get dos timestamp
+    $dts = $this->dostime($opt['time']);
+
+    $fields = array(                  # (from V,F of APPNOTE.TXT)
+      array('V', 0x02014b50),           # central file header signature
+      array('v', (6 << 8) + 3),         # version made by
+      array('v', (6 << 8) + 3),         # version needed to extract
+      array('v', 0x00),                 # general purpose bit flag
+      array('v', $meth),                # compresion method (deflate or store)
+      array('V', $dts),                 # dos timestamp
+      array('V', $crc),                 # crc32 of data
+      array('V', $zlen),                # compressed data length
+      array('V', $len),                 # uncompressed data length
+      array('v', strlen($name)),        # filename length
+      array('v', 0),                    # extra data len
+      array('v', strlen($comment)),     # file comment length
+      array('v', 0),                    # disk number start
+      array('v', 0),                    # internal file attributes
+      array('V', 32),                   # external file attributes
+      array('V', $ofs),                 # relative offset of local header
+    );
+
+    # pack fields, then append name and comment
+    $ret = $this->pack_fields($fields) . $name . $comment;
+
+    $this->send($ret);
+
+    # increment cdr offset
+    $this->cdr_ofs += strlen($ret);
+  }
+
+  #
+  # Send CDR EOF (Central Directory Record End-of-File) record.
+  #
+  private function add_cdr_eof($opt = null) {
+    $num = count($this->files);
+    $cdr_len = $this->cdr_ofs;
+    $cdr_ofs = $this->ofs;
+
+    # grab comment (if specified)
+    $comment = '';
+    if ($opt && isset($opt['comment']))
+      $comment = $opt['comment'];
+
+    $fields = array(                # (from V,F of APPNOTE.TXT)
+      array('V', 0x06054b50),         # end of central file header signature
+      array('v', 0x00),               # this disk number
+      array('v', 0x00),               # number of disk with cdr
+      array('v', $num),               # number of entries in the cdr on this disk
+      array('v', $num),               # number of entries in the cdr
+      array('V', $cdr_len),           # cdr size
+      array('V', $cdr_ofs),           # cdr ofs
+      array('v', strlen($comment)),   # zip file comment length
+    );
+
+    $ret = $this->pack_fields($fields) . $comment;
+    $this->send($ret);
+  }
+
+  #
+  # Add CDR (Central Directory Record) footer.
+  #
+  private function add_cdr($opt = null) {
+    foreach ($this->files as $file)
+      $this->add_cdr_file($file);
+    $this->add_cdr_eof($opt);
+  }
+
+  #
+  # Clear all internal variables.  Note that the stream object is not
+  # usable after this.
+  #
+  function clear() {
+    $this->files = array();
+    $this->ofs = 0;
+    $this->cdr_ofs = 0;
+    $this->opt = array();
+  }
+
+  ###########################
+  # PRIVATE UTILITY METHODS #
+  ###########################
+
+  #
+  # Send HTTP headers for this stream.
+  #
+  private function send_http_headers() {
+    # grab options
+    $opt = $this->opt;
+    
+    # grab content type from options
+    $content_type = 'application/x-zip';
+    if (isset($opt['content_type']))
+      $content_type = $this->opt['content_type'];
+
+    # grab content disposition 
+    $disposition = 'attachment';
+    if (isset($opt['content_disposition']))
+      $disposition = $opt['content_disposition'];
+
+    if ($this->output_name) 
+      $disposition .= "; filename=\"{$this->output_name}\"";
+
+    $headers = array(
+      'Content-Type'              => $content_type,
+      'Content-Disposition'       => $disposition,
+      'Pragma'                    => 'public',
+      'Cache-Control'             => 'public, must-revalidate',
+      'Content-Transfer-Encoding' => 'binary',
+    );
+
+    foreach ($headers as $key => $val)
+      header("$key: $val");
+  }
+
+  #
+  # Send string, sending HTTP headers if necessary.
+  #
+  private function send($str) {
+    if ($this->need_headers)
+      $this->send_http_headers();
+    $this->need_headers = false;
+
+    echo $str;
+  }
+
+  #
+  # Convert a UNIX timestamp to a DOS timestamp.
+  #
+  function dostime($when = 0) {
+    # get date array for timestamp
+    $d = getdate($when);
+
+    # set lower-bound on dates
+    if ($d['year'] < 1980) {
+      $d = array('year' => 1980, 'mon' => 1, 'mday' => 1, 
+                 'hours' => 0, 'minutes' => 0, 'seconds' => 0);
+    }
+
+    # remove extra years from 1980
+    $d['year'] -= 1980;
+
+    # return date string
+    return ($d['year'] << 25) | ($d['mon'] << 21) | ($d['mday'] << 16) |
+           ($d['hours'] << 11) | ($d['minutes'] << 5) | ($d['seconds'] >> 1);
+  }
+
+  #
+  # Create a format string and argument list for pack(), then call
+  # pack() and return the result.
+  #
+  function pack_fields($fields) {
+    list ($fmt, $args) = array('', array());
+
+    # populate format string and argument list
+    foreach ($fields as $field) {
+      $fmt .= $field[0];
+      $args[] = $field[1];
+    }
+
+    # prepend format string to argument list
+    array_unshift($args, $fmt);
+
+    # build output string from header and compressed data
+    return call_user_func_array('pack', $args);
+  }
+};
+
+?>

doc/httprepos-git.mdtext

@@ -0,0 +1,57 @@
+# Accessing git repositories over HTTP
+
+Starting with indefero 1.2, git repositories are provided via http,
+featuring read-only and read-write access with full integration with
+indefero's access control mechanisms.
+
+## Access git repositories
+
+The repositories are available under http://YOURHOST/BASEPATH/r/PROJECT.
+
+For authentication, use the "extra password" which you can find on your
+profile page.
+
+## Setup
+
+The main thing to setup is git_repositories and git_remote_url in
+src/IDF/conf/idf.php
+
+git_remote_url should match http://YOURHOST/BASEPATH/r/%s, while
+git_repositories points to the local directory supposed to contain the
+repositories like /PATH/TO/REPOSITORIES/%s.git.
+
+## Setup requirements when using PHP over FastCGI
+
+There are a couple of things to setup when using PHP over FastCGI, as compared
+to mod_php or similar integrated mechanisms:
+
+- You will need to setup a RewriteRule for mod_rewrite (in case of Apache,
+  analogous mechanisms might need to be setup for other http daemons), which
+  passes through the Authorization HTTP Header of a request.
+
+  In case of mod_rewrite, the necessary line is
+  one of (depending on server configuration):
+      RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
+      RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
+
+- The FastCGI adaptor must allow large requests to be handled by PHP,
+  otherwise push might fail.
+
+  For mod_fcgid, this is the FcgidMaxRequestLen option, or MaxRequestLen in
+  older versions. Set this option to some large enough value - there is no
+  issue with RAM use, as another option defines the limit after which the
+  request is backed on disk, which can remain small.
+
+## When migrating from syncgit
+
+HTTP access can be used in parallel to syncgit.
+
+If you want to disable syncgit, just undo the changes detailled
+in doc/syncgit.mdtext:
+- In src/IDF/conf/idf.php keep git_repositories
+- In src/IDF/conf/idf.php adapt git_remote_url to http://host/basepath/r/%s 
+- In src/IDF/conf/idf.php remove idf_plugin_syncgit*
+- Remove the cronjob that called gitcron.php
+- Disable the git daemon (eg. /etc/event.d/local-git-daemon)
+- You can remove the git user and group, if you also adapt the git repositories
+  to be owned by the www user.

doc/syncmonotone.mdtext

@@ -0,0 +1,298 @@
+# Plugin SyncMonotone by Thomas Keller (me@thomaskeller.biz)
+
+The SyncMonotone plugin allow the direct creation and synchronisation of
+monotone repositories with the InDefero database. It has been built to
+work together with monotone's "super server" usher, which is used to control
+several repositories at once, acts as proxy and single entrance.
+
+## Prerequisites
+
+* a unixoid operating system
+* monotone >= 0.99.1
+* for a proxy setup with usher:
+    * boost headers (for usher compilation)
+    * a current version of usher
+    * a daemonizer, like supervise
+
+## Installation of monotone
+
+If you install monotone from a distribution package, ensure you do not
+install and / or activate the server component. We just need a plain
+client installation which usually consists only of the `mtn` binary and
+a few docs.
+
+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 (IDF) setup
+
+The monotone plugin can be used in several different ways:
+
+1. One database for everything. This is the easiest setup and of possible
+   use in case you do not want indefero to manage the access to your project.
+   Your `idf.php` should look like this:
+
+            $ cat idf.php
+            ...
+            $cfg['mtn_path'] = 'mtn';
+            $cfg['mtn_opts'] = array('--no-workspace', '--no-standard-rcfiles');
+            $cfg['mtn_repositories'] = '/home/monotone/all_projects.mtn';
+            $cfg['mtn_remote_url'] = 'ssh://monotone@my.server.com:~all_projects.mtn';
+            $cfg['mtn_db_access'] = 'local';
+            ...
+
+   Pro:
+      * easy to setup and to manage
+
+   Con:
+      * you need to give committers SSH access to your machine
+      * database lock problem: the database from which
+        indefero reads its data might be locked in case a user
+        syncs at the very moment via SSH
+
+2. One database for every project. Similar to the above setup, but this
+   time you use the '%s' placeholder which is replaced with the short name
+   of the indefero project:
+
+            $ cat idf.php
+            ...
+            $cfg['mtn_path'] = 'mtn';
+            $cfg['mtn_opts'] = array('--no-workspace', '--no-standard-rcfiles');
+            $cfg['mtn_repositories'] = '/home/monotone/%s.mtn';
+            $cfg['mtn_remote_url'] = 'ssh://monotone@my.server.com:~%s.mtn';
+            $cfg['mtn_db_access'] = 'local';
+            ...
+
+   The same pro's and con's apply. Additionally you have to be careful about
+   not giving people physical read/write access of another project's database.
+
+   Furthermore, if you do not want to use `ssh`, but `netsync` transport,
+   each project's database must be served over a separate port.
+
+3. One database for every project, all managed with usher. This is the
+   recommended setup for a mid-size forge setup. The remaining part of this
+   document will describe the process to set this up in detail.
+
+   Pro:
+      * access rights can be granted per project and are automatically
+        managed by indefero, just like the user's public monotone keys
+      * no database locking issues
+      * one public server running on the one well-known port
+
+   Con:
+      * harder to setup
+
+## Installation and configuration of usher
+
+1. Clone usher's monotone repository:
+
+            $ mtn clone "mtn://monotone.ca?net.venge.monotone.contrib.usher"
+
+2. Compile usher:
+
+            $ autoreconf -i
+            $ ./configure && make
+            $ sudo make install
+
+   This installs the usher binary in $prefix/bin.
+
+3. Create a new usher user:
+
+            $ adduser --system --disabled-login --home /var/lib/usher usher
+
+4. Create the basic usher setup:
+
+            $ cd /var/lib/usher
+            $ mkdir projects logs
+            $ cat > usher.conf
+             userpass "admin" "<secret-password>"
+            adminaddr "127.0.0.1:12345"
+               logdir "log"
+            ^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`.
+      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>):
+
+            $ cat > run
+            #!/bin/sh
+            cd /var/lib/usher
+            exec 2>&1
+            exec \
+                setuidgid usher \
+                usher usher.conf
+            ^D
+
+   The service can now be started through supervise:
+
+            $ supervise /var/lib/usher
+
+## Configuration of indefero
+
+Based on the above setup, the configuration in `src/IDF/conf/idf.php` should
+look like this:
+
+        $ cat idf.php
+        ...
+        $cfg['mtn_path'] = 'mtn';
+        $cfg['mtn_opts'] = array('--no-workspace', '--no-standard-rcfiles');
+        $cfg['mtn_repositories'] = '/var/lib/usher/projects/%s/';
+        $cfg['mtn_remote_url'] = 'mtn://my.server.com/%s';
+        $cfg['mtn_db_access'] = 'remote';
+        $cfg['mtn_usher_conf'] = '/var/lib/usher/usher.conf';
+        ...
+
+The `%s` placeholders are automatically replaced by the name of the
+indefero project. The plugin assumes that every project is separated
+by a distinct server name in the monotone URL (hence the use of `/%s`),
+so if a user calls
+
+        $ mtn sync mtn://my.server.com/project1
+
+then the database / repository of the indefero `project1` is used.
+Note that 'mtn_remote_url' is also used as internal URI to query the data
+for indefero's source view, so it *must* be a valid host!
+
+Usher also allows the identification of a project repository by hostname,
+which would allow an URL template like `mtn://%s.my.server.com`, however
+the plugin does not write out the configuration which is needed for this
+yet.
+
+For even more advanced setups, usher can also be used to forward sync
+requests to other remote servers for load balancing, please consult the
+README file for more information.
+
+## Security and remote access
+
+Indefero distinguishs between public and private projects and so does
+the monotone plugin.
+
+Public projects can be pulled by everybody and pushed by team members
+or additional invited people. Remote command execution is enabled, but
+only for read-only commands.
+
+Remote commands can be helpful for a user or a 3rd party tool (like
+[mtn-browse](http://mtn-browse.sourceforge.net) or
+[guitone](http://guitone.thomaskeller.biz)) to browse the database
+contents remotely without having to pull everything in first instance.
+
+Private projects on the other hand can only be synced by team members
+or additional invited people. Remote command execution is disabled
+by default. If you want to enable that, simply put the keys of the users
+you want to give access to in your project's `remote-automate-permissions`
+file. In the future this plugin might handle this file just as it handles
+`read-permissions` and `write-permissions`.
+
+## Notifications
+
+If you have successfully set up your monotone instance, you probably want
+to notify 3rd party systems for incoming changes or simply mirror them
+somewhere else for backup purposes.  The monotone source tree already comes
+with [many example scripts and hooks](http://code.monotone.ca/p/monotone/source/tree/h:net.venge.monotone/contrib)
+which serve these purposes, after only little additional configuration.
+
+The usher/indefero-controlled setup automatically looks for *.lua files
+in a directory called `hooks.d` right under the project's base directory
+(configured via $cfg['mtn_repositories']) and this is the ideal place to
+put or link these additional lua sources.
+
+## Custom project configurations and templates
+
+If a new project is created in IDF, the SyncMonotone plugin creates a new
+configuration tree for the project into the project's configuration directory,
+determined by `$cfg['mtn_repositories']`. IDF ships with the minimum set of
+files for this configuration tree and sets up everything automatically for you.
+
+Even more, most of the configuration files from the newly created tree are only
+symlinked to the original configuration directory which is configurable via
+`$cfg['mtn_confdir']` and defaults to `src/IDF/Plugin/SyncMonotone/`. This has
+the advantage that your standard IDF setup automatically receives updates to
+existing (symlinked) configuration files as soon as you update to a newer
+version.
+
+You could, however, also choose to place the directory tree somewhere else
+and adapt the contents of the individual files yourself, so these changes get
+automatically applied to all new projects you create. You could even go so far
+and add new files to the tree and let them be processed automatically just
+as the basic files! All you need to do is to copy your files and / or directories
+underknees your `$cfg['mtn_confdir']` and add their relative paths to
+`$cfg['mtn_confdir_extra']`.
+
+By convention, all entries which end with a slash are considered directories,
+so mkdir(1) is issued for these entries, all files which do not end up with
+".in" are considered to be static script files which are just symlinked from
+the basic configuration dir and all entries ending on ".in" are considered
+configuration files or templates, which are copied over to the project's
+configuration tree and which get some basic project-specific values replaced.
+
+The following placeholders are currently recognized and replaced for these files:
+
+ * %%PROJECT%% - the name of the created project
+ * %%MTNPOSTPUSH%% - the absolute path to the `mtn-post-push` script
+ * %%MTNCLIENTKEY%% - the public key hash of the key which is used by IDF
+   to authenticate remote stdio access
+
+Thats it - I hope you find it useful :)
+
+## Q&A
+
+### After I created a new project, IDF throws an exception and tells me that it couldn't save the membership data with a cryptic error message. Whats wrong?
+
+Multiple issues could cause that. If you've set up usher, make sure the usher
+can fork your database at all and look out for specific errors in the log file
+of your project. If you stumble upon permission issues, ensure that the user
+who runs the usher can access all files in your project's configuration directory,
+including symlinked files.
+
+### I pushed a branch to my server, but it does not show up in IDF. Whats wrong?
+
+Check if the heads of your branch are not suspended, i.e. do not carry a
+`suspend` certificate.  This usually hides the branch and all of its history
+from monotone's eyes and therefor also from indefero.  You can either choose
+to "unsuspend" the branch simply by committing and pushing another head or
+by letting monotone ignore all suspend certs.  For the latter, its usually
+enough to add `--ignore-suspend-certs` to the list of options in `$cfg['mtn_opts']`.
+
+### I want to display another default branch when I click the "Source" tab. How can I do that?
+
+Let the forge admin know the new master branch for your project.  He is able
+to change that quickly.  Depending on the backend / server setup this might
+also require some changes in the usher configuration, but only if usher
+recognizes and proxies your database on a branch name level.
+

doc/syncsvn.mdtext

@@ -79,3 +79,12 @@ the following configuration variables:
 * **idf_plugin_syncsvn_access_public ('r')**: Anonymous access.
 * **idf_plugin_syncsvn_access_private ('')**: Anonymous access in the case of a private project.
 
+## svn: Can't open file '/root/.subversion/servers': Permission denied error
+
+If you get the error:
+
+    svn: Can't open file '/root/.subversion/servers': Permission denied
+
+Check the [fix available](http://projects.ceondo.com/p/indefero/issues/458/)
+
+

logo/indefero-logo-lite.svg

@@ -0,0 +1,86 @@
+<?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"
+   width="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.0 r9654"
+   version="1.0"
+   sodipodi:docname="indefero-logo-lite.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="31.568929"
+     inkscape:cy="-0.35578703"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="723"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-728.09451)">
+    <g
+       id="g2401"
+       transform="matrix(0.13580542,0,0,0.13580542,-47.580342,708.10521)"
+       style="fill:#8ae234;stroke:#4e9a06;stroke-width:2.4000001;stroke-miterlimit:4;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:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;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:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;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>
+</svg>

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>
+

release-script

@@ -1,10 +1,13 @@
 #!/bin/sh
 last="$1"
 new="$2"
+PLUF_PATH=`php -r "require_once('./IDF/conf/path.php'); echo PLUF_PATH;"`
+echo "php $PLUF_PATH/extracttemplates.php ./IDF/conf/idf.php ./IDF/gettexttemplates"
 echo "xgettext -o idf.pot -p ./IDF/locale --force-po --from-code=UTF-8 --keyword --keyword=__ --keyword=_n:1,2 -L PHP ./IDF/*.php"
 echo "find ./ -iname \"*.php\" -exec xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j --keyword --keyword=__ --keyword=_n:1,2 -L PHP {} \;"
+echo 'for pofile in `ls ./IDF/locale/*/idf.po`; do msgmerge -U $pofile ./IDF/locale/idf.pot; done'
 echo "# git tag v$new"
 echo "git archive --format=zip --prefix=indefero-$new/ v$new > indefero-$new.zip"
 echo "git log --no-merges v$new ^v$last > ChangeLog-$new"
 echo "git shortlog --no-merges v$new ^v$last > ShortLog"
-echo "git diff --stat --summary -M v$last v$new > diffstat-$new"
+echo "git diff --stat --summary -M v$last v$new > diffstat-$new"

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/git-post-update

@@ -17,8 +17,8 @@
 # git$ ln -s /home/www/indefero/scripts/git-post-update post-update
 #
 
-SCRIPTDIR=$(dirname $(readlink -f $0))
-FULL_GIT_DIR=$(readlink -f $GIT_DIR)
+SCRIPTDIR=$(dirname $(readlink $0))
+FULL_GIT_DIR=$(cd "$GIT_DIR" && /bin/pwd || "$GIT_DIR")
 PHP_POST_UPDATE=$SCRIPTDIR/gitpostupdate.php
 
 echo php $PHP_POST_UPDATE $FULL_GIT_DIR | at now > /dev/null 2>&1

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
@@ -53,6 +53,7 @@ Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
  */
 $params = array('git_dir' => $argv[1],
                 'env' => array_merge($_ENV, $_SERVER));
+Pluf_Log::event(array('gitpostupdate.php', 'Send run signal.', $params));
 Pluf_Signal::send('gitpostupdate.php::run', 'gitpostupdate.php', $params);
 
 

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/mtn-post-push

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# This hook informs IDF that new revisions arrived in the database
+# of the specified project.
+#
+# This hook is normally installed automatically at the creation of your
+# repository if you have everything configured correctly. If you want
+# to enable it later, you need to call it into your monotonerc file
+# from the hook "note_netsync_end". (See chapter "Event Notifications
+# and Triggers" on <http://monotone.ca/docs/Hooks.html#Hooks>.)
+#
+
+dir=$(dirname "$0")
+res=$(cd "$dir" && /bin/pwd || "$dir")
+SCRIPTDIR="$res/$(readlink $0)"
+PHP_POST_PUSH=$SCRIPTDIR/mtnpostpush.php
+
+TMPFILE=$(mktemp /tmp/mtn-post-push.XXXXXX) || exit 1
+while read rev; do echo $rev >> $TMPFILE; done
+
+echo php $PHP_POST_PUSH "$1" \< $TMPFILE \&\& rm -f $TMPFILE |\
+    at now > /dev/null 2>&1

scripts/mtnpostpush.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 ***** */
+
+/**
+ * This script will send the notifications after a push in your 
+ * repository.
+ */
+
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
+require 'Pluf.php';
+Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
+Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
+
+/**
+ * [signal]
+ *
+ * mtnpostpush.php::run
+ *
+ * [sender]
+ *
+ * mtnpostpush.php
+ *
+ * [description]
+ *
+ * This signal allows an application to perform a set of tasks
+ * after a push to a monotone repository.
+ *
+ * [parameters]
+ *
+ * array('project' => 'name-of-the-project',
+ *       'revisions' => array('123abc...', '456def...', ...));
+ *
+ */
+
+fwrite(STDERR, "waiting for revisions on STDIN...\n");
+$stdin = file_get_contents('php://stdin');
+
+$params = array('project' => $argv[1],
+                'revisions' => explode("\n", chop($stdin)));
+Pluf_Signal::send('mtnpostpush.php::run', 'mtnpostpush.php', $params);
+
+
+

scripts/queuecron.php

@@ -0,0 +1,69 @@
+<?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 ***** */
+
+/**
+ * This script process the queue of items.
+ *
+ * At the moment the queue is only used for the webhooks, but it would
+ * be good in the future to use it for indexing and email
+ * notifications.
+ *
+ */
+
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
+require 'Pluf.php';
+Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
+Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
+
+#;*/ ::
+$lock_file = Pluf::f('idf_queuecron_lock', 
+                     Pluf::f('tmp_folder', '/tmp').'/queuecron.lock');
+if (file_exists($lock_file)) {
+    Pluf_Log::event(array('queuecron.php', 'skip'));
+    return;
+}
+file_put_contents($lock_file, time(), LOCK_EX);
+
+/**
+ * [signal]
+ *
+ * queuecron.php::run
+ *
+ * [sender]
+ *
+ * queuecron.php
+ *
+ * [description]
+ *
+ * This signal allows an application to perform a set of tasks when
+ * the queue cron job is run. This is done usually every 5 minutes.
+ *
+ * [parameters]
+ *
+ * array()
+ *
+ */
+$params = array();
+Pluf_Signal::send('queuecron.php::run', 'queuecron.php', $params);
+
+unlink($lock_file);

scripts/svn-post-commit

@@ -18,7 +18,7 @@
 # www$ ln -s /home/www/indefero/scripts/svn-post-commit post-commit
 #
 
-SCRIPTDIR=$(dirname $(readlink -f $0))
+SCRIPTDIR=$(dirname $(readlink $0))
 PHP_POST_COMMIT=$SCRIPTDIR/svnpostcommit.php
 
 echo php $PHP_POST_COMMIT "$1" "$2" | at now > /dev/null 2>&1

scripts/svn-post-revprop-change

@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# This hook does only one thing:
+#
+# 1. It calls the svnpostrevpropchange.php script with the current repository
+#    and revision as argument. The svnpostrevpropchange.php script will then 
+#    trigger the 'svnpostrevpropchange.php::run' event with the repository 
+#    path, revision, username, property name and action as arguments together
+#    with merged $_ENV and $_SERVER array.
+#
+# This hook is normally installed automatically at the creation of your
+# repository if you have everything configured correctly. If you want
+# to enable it later, you need to symlink it as "post-revprop-change" in your 
+# $REPOSITORY/hooks folder. It needs to be executable.
+#
+# www$ chmod +x /home/www/indefero/scripts/svn-post-revprop-change
+# www$ cd /home/svn/repositories/project/hooks
+# www$ ln -s /home/www/indefero/scripts/svn-post-revprop-change post-revprop-change
+#
+
+SCRIPTDIR=$(dirname $(readlink $0))
+PHP_POST_REVPROP=$SCRIPTDIR/svnpostrevpropchange.php
+
+echo php $PHP_POST_REVPROP "$1" "$2" "$3" "$4" "$5" | at now > /dev/null 2>&1
+REPOS="$1"
+REV="$2"
+USER="$3"
+PROPNAME="$4"
+ACTION="$5"

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
@@ -55,6 +55,7 @@ Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
 $params = array('repo_dir' => $argv[1],
                 'revision' => $argv[2],
                 'env' => array_merge($_ENV, $_SERVER));
+Pluf_Log::event(array('svnpostcommit.php', 'Send run signal.', $params));
 Pluf_Signal::send('svnpostcommit.php::run', 'svnpostcommit.php', $params);
 
 

scripts/svnpostrevpropchange.php

@@ -0,0 +1,70 @@
+<?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 ***** */
+
+/**
+ * This script allows you to hook into the post-revprop-change action
+ * of your subversion repository. I am using it to perform near real
+ * time backup of the repositories on indefero.net.
+ */
+
+require dirname(__FILE__).'/../src/IDF/conf/path.php';
+require 'Pluf.php';
+Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
+Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
+
+/**
+ * [signal]
+ *
+ * svnpostrevpropchange.php::run
+ *
+ * [sender]
+ *
+ * svnpostrevpropchange.php
+ *
+ * [description]
+ *
+ * This signal allows an application to perform a set of tasks on a
+ * post property revision change of a subversion repository.
+ *
+ * [parameters]
+ *
+ * array('repo_dir' => '/path/to/subversion/repository',
+ *       'revision' => 1234,
+ *       'user' => 'username',
+ *       'propname' => 'changed-property',
+ *       'action' => 'the action M, A or D',
+ *       'env' => array_merge($_ENV, $_SERVER));
+ *
+ */
+
+$params = array('repo_dir' => $argv[1],
+                'revision' => $argv[2],
+                'user' => $argv[3],
+                'propname' => $argv[4],
+                'action' => $argv[5],
+                'env' => array_merge($_ENV, $_SERVER));
+Pluf_Signal::send('svnpostrevpropchange.php::run', 'svnpostrevpropchange.php', 
+                  $params);
+
+
+

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
@@ -34,6 +34,7 @@ Pluf::loadFunction('Pluf_Template_dateAgo');
 class IDF_Commit extends Pluf_Model
 {
     public $_model = __CLASS__;
+    public $extra = null; /**< Extra data as IDF_Gconf object */
 
     function init()
     {
@@ -44,9 +45,9 @@ class IDF_Commit extends Pluf_Model
                             'id' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Sequence',
-                                  'blank' => true, 
+                                  'blank' => true,
                                   ),
-                            'project' => 
+                            'project' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'IDF_Project',
@@ -54,7 +55,7 @@ class IDF_Commit extends Pluf_Model
                                   'verbose' => __('project'),
                                   'relate_name' => 'commits',
                                   ),
-                            'author' => 
+                            'author' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'Pluf_User',
@@ -118,7 +119,7 @@ class IDF_Commit extends Pluf_Model
     {
         IDF_Search::index($this);
         if ($create) {
-            IDF_Timeline::insert($this, $this->get_project(), 
+            IDF_Timeline::insert($this, $this->get_project(),
                                  $this->get_author(), $this->creation_dtime);
         }
     }
@@ -127,6 +128,7 @@ class IDF_Commit extends Pluf_Model
     {
         IDF_Timeline::remove($this);
         IDF_Search::remove($this);
+        IDF_Gconf::dropForModel($this);
     }
 
     /**
@@ -142,6 +144,10 @@ class IDF_Commit extends Pluf_Model
                             array($project->id, $change->commit));
         $r = Pluf::factory('IDF_Commit')->getList(array('filter'=>$sql->gen()));
         if ($r->count() > 0) {
+            $r[0]->extra = new IDF_Gconf();
+            $r[0]->extra->serialize = true;
+            $r[0]->extra->setModel($r[0]);
+            $r[0]->extra->initCache();
             return $r[0];
         }
         if (!isset($change->full_message)) {
@@ -154,9 +160,16 @@ class IDF_Commit extends Pluf_Model
         $commit->summary = self::toUTF8($change->title);
         $commit->fullmessage = self::toUTF8($change->full_message);
         $commit->author = $scm->findAuthor($change->author);
-        $commit->origauthor = $change->author;
+        $commit->origauthor = self::toUTF8($change->author);
         $commit->creation_dtime = $change->date;
         $commit->create();
+        $extra = $scm->getExtraProperties($change);
+        $commit->extra = new IDF_Gconf();
+        $commit->extra->serialize = true; // As we can store arrays
+        $commit->extra->setModel($commit);
+        foreach ($extra as $key => $val) {
+            $commit->extra->setVal($key, $val);
+        }
         $commit->notify($project->getConf());
         return $commit;
     }
@@ -200,13 +213,13 @@ class IDF_Commit extends Pluf_Model
      * Returns the timeline fragment for the commit.
      *
      *
-     * @param Pluf_HTTP_Request 
+     * @param Pluf_HTTP_Request
      * @return Pluf_Template_SafeString
      */
     public function timelineFragment($request)
     {
-        $url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::commit', 
-                                        array($request->project->shortname, 
+        $url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::commit',
+                                        array($request->project->shortname,
                                               $this->scm_id));
         $out = '<tr class="log"><td><a href="'.$url.'">'.
             Pluf_esc(Pluf_Template_dateAgo($this->creation_dtime, 'without')).
@@ -222,24 +235,24 @@ class IDF_Commit extends Pluf_Model
 </tr>
 <tr class="extra">
 <td colspan="2">
-<div class="helptext right">'.sprintf(__('Commit&nbsp;%s, by %s'), '<a href="'.$url.'" class="mono">'.$this->scm_id.'</a>', $user).'</div></td></tr>'; 
+<div class="helptext right">'.sprintf(__('Commit&nbsp;%s, by %s'), '<a href="'.$url.'" class="mono">'.$this->scm_id.'</a>', $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
     /**
      * Returns the feed fragment for the commit.
      *
-     * @param Pluf_HTTP_Request 
+     * @param Pluf_HTTP_Request
      * @return Pluf_Template_SafeString
      */
     public function feedFragment($request)
     {
         $url = Pluf::f('url_base')
-            .Pluf_HTTP_URL_urlForView('IDF_Views_Source::commit', 
-                                      array($request->project->shortname, 
+            .Pluf_HTTP_URL_urlForView('IDF_Views_Source::commit',
+                                      array($request->project->shortname,
                                             $this->scm_id));
         $date = Pluf_Date::gmDateToGmString($this->creation_dtime);
-        $author = ($this->get_author()) ? 
+        $author = ($this->get_author()) ?
             $this->get_author() : $this->origauthor;
         $cproject = $this->get_project();
         $context = new Pluf_Template_Context_Request(
@@ -264,12 +277,41 @@ class IDF_Commit extends Pluf_Model
      */
     public function notify($conf, $create=true)
     {
+        // Now we add to the queue, soon we will push everything in
+        // the queue, including email notifications and indexing.
+        // Even if the url is empty, we add to the queue as some
+        // plugins may want to do something with this information in
+        // an asynchronous way.
+        $project = $this->get_project();
+        $scm = $project->getConf()->getVal('scm', 'git');
+        $url = str_replace(array('%p', '%r'),
+                           array($project->shortname, $this->scm_id),
+                           $conf->getVal('webhook_url', ''));
+        $payload = array('to_send' => array(
+                                            'project' => $project->shortname,
+                                            'rev' => $this->scm_id,
+                                            'scm' => $scm,
+                                            'summary' => $this->summary,
+                                            'fullmessage' => $this->fullmessage,
+                                            'author' => $this->origauthor,
+                                            'creation_date' => $this->creation_dtime,
+                                            ),
+                         'project_id' => $project->id,
+                         'authkey' => $project->getPostCommitHookKey(),
+                         'url' => $url,
+                         );
+        $item = new IDF_Queue();
+        $item->type = 'new_commit';
+        $item->payload = $payload;
+        $item->create();
+
         if ('' == $conf->getVal('source_notification_email', '')) {
             return;
         }
+
         $current_locale = Pluf_Translation::getLocale();
         $langs = Pluf::f('languages', array('en'));
-        Pluf_Translation::loadSetLocale($langs[0]);        
+        Pluf_Translation::loadSetLocale($langs[0]);
 
         $context = new Pluf_Template_Context(
                        array(
@@ -280,13 +322,16 @@ class IDF_Commit extends Pluf_Model
                                              );
         $tmpl = new Pluf_Template('idf/source/commit-created-email.txt');
         $text_email = $tmpl->render($context);
-        $email = new Pluf_Mail(Pluf::f('from_email'), 
-                               $conf->getVal('source_notification_email'),
-                               sprintf(__('New Commit %s - %s (%s)'),
-                                       $this->scm_id, $this->summary, 
-                                       $this->get_project()->shortname));
-        $email->addTextMessage($text_email);
-        $email->sendMail();
+        $addresses = explode(',', $conf->getVal('source_notification_email'));
+        foreach ($addresses as $address) {
+            $email = new Pluf_Mail(Pluf::f('from_email'),
+                                   $address,
+                                   sprintf(__('New Commit %s - %s (%s)'),
+                                           $this->scm_id, $this->summary,
+                                           $this->get_project()->shortname));
+            $email->addTextMessage($text_email);
+            $email->sendMail();
+        }
         Pluf_Translation::loadSetLocale($current_locale);
     }
 }

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,90 +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;
-            }
-            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;
-                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 (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;
+        $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 (!$indiff) {
+
+            // 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;
             }
-            if (0 === strpos($line, '@@ ')) {
-                $files[$current_file]['chunks_def'][] = self::getChunk($line);
+
+            // 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;
+                }
+                $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);
-    }
-
     /**
      * Return the html version of a parsed diff.
      */
@@ -141,8 +146,8 @@ class IDF_Diff
         $out = '';
         foreach ($this->files as $filename=>$file) {
             $pretty = '';
-            $fileinfo = IDF_Views_Source::getMimeType($filename);
-            if (IDF_Views_Source::isSupportedExtension($fileinfo[2])) {
+            $fileinfo = IDF_FileUtil::getMimeType($filename);
+            if (IDF_FileUtil::isSupportedExtension($fileinfo[2])) {
                 $pretty = ' prettyprint';
             }
             $out .= "\n".'<table class="diff" summary="">'."\n";
@@ -169,7 +174,6 @@ class IDF_Diff
         return Pluf_Template::markSafe($out);
     }
 
-
     public static function padLine($line)
     {
         $line = str_replace("\t", '    ', $line);
@@ -182,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.
      *
@@ -215,14 +206,14 @@ class IDF_Diff
      * @param int Number of lines before/after the chunk to be displayed (10)
      * @return Pluf_Template_SafeString The table body
      */
-    public function fileCompare($orig, $chunks, $filename, $context=10) 
+    public function fileCompare($orig, $chunks, $filename, $context=10)
     {
         $orig_lines = preg_split("/\015\012|\015|\012/", $orig);
         $new_chunks = $this->mergeChunks($orig_lines, $chunks, $context);
         return $this->renderCompared($new_chunks, $filename);
     }
 
-    public function mergeChunks($orig_lines, $chunks, $context=10) 
+    public function mergeChunks($orig_lines, $chunks, $context=10)
     {
         $spans = array();
         $new_chunks = array();
@@ -250,7 +241,7 @@ class IDF_Diff
                 for ($lc=$spans[$i][0];$lc<$chunk[0][0];$lc++) {
                     $exists = false;
                     foreach ($chunk_lines as $line) {
-                        if ($lc == $line[0] 
+                        if ($lc == $line[0]
                             or ($chunk[0][1]-$chunk[0][0]+$lc) == $line[1]) {
                             $exists = true;
                             break;
@@ -259,7 +250,7 @@ class IDF_Diff
                     if (!$exists) {
                         $orig = isset($orig_lines[$lc-1]) ? $orig_lines[$lc-1] : '';
                         $n_chunk[] = array(
-                                           $lc, 
+                                           $lc,
                                            $chunk[0][1]-$chunk[0][0]+$lc,
                                            $orig
                                            );
@@ -283,7 +274,7 @@ class IDF_Diff
                     }
                     if (!$exists) {
                         $n_chunk[] = array(
-                                           $lc, 
+                                           $lc,
                                            $lline[1]-$lline[0]+$lc,
                                            $orig_lines[$lc-1]
                                            );
@@ -305,7 +296,7 @@ class IDF_Diff
                     foreach ($chunk as $line) {
                         if ($line[0] > $lline[0] or empty($line[0])) {
                             $nnew_chunks[$i-1][] = $line;
-                        } 
+                        }
                     }
                 } else {
                     $nnew_chunks[] = $chunk;
@@ -319,12 +310,11 @@ class IDF_Diff
         return $nnew_chunks;
     }
 
-
     public function renderCompared($chunks, $filename)
     {
-        $fileinfo = IDF_Views_Source::getMimeType($filename);
+        $fileinfo = IDF_FileUtil::getMimeType($filename);
         $pretty = '';
-        if (IDF_Views_Source::isSupportedExtension($fileinfo[2])) {
+        if (IDF_FileUtil::isSupportedExtension($fileinfo[2])) {
             $pretty = ' prettyprint';
         }
         $out = '';
@@ -353,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

@@ -0,0 +1,165 @@
+<?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 ***** */
+
+/**
+ * File utilities.
+ *
+ */
+class IDF_FileUtil
+{
+    /**
+     * Extension supported by the syntax highlighter.
+     */
+    public static $supportedExtenstions = array(
+              'ascx', 'ashx', 'asmx', 'aspx', 'browser', 'bsh', 'c', 'cl', 'cc',
+              'config', 'cpp', 'cs', 'csh', 'csproj', 'css', 'cv', 'cyc', 'el', 'fs',
+              'h', 'hh', 'hpp', 'hs', 'html', 'html', 'java', 'js', 'lisp', 'master',
+              'pas', 'perl', 'php', 'pl', 'pm', 'py', 'rb', 'scm', 'sh', 'sitemap',
+              'skin', 'sln', 'svc', 'vala', 'vb', 'vbproj', 'vbs', 'wsdl', 'xhtml',
+              'xml', 'xsd', 'xsl', 'xslt');
+
+    /**
+     * Test if an extension is supported by the syntax highlighter.
+     *
+     * @param string The extension to test
+     * @return bool
+     */
+    public static function isSupportedExtension($extension)
+    {
+        return in_array($extension, self::$supportedExtenstions);
+    }
+
+    /**
+     * Returns a HTML snippet with a line-by-line pre-rendered table
+     * for the given source content
+     *
+     * @param array file information as returned by getMimeType or getMimeTypeFromContent
+     * @param string the content of the file
+     * @return string
+     */
+    public static function highLight($fileinfo, $content)
+    {
+        $pretty = '';
+        if (self::isSupportedExtension($fileinfo[2])) {
+            $pretty = ' prettyprint';
+        }
+        $table = array();
+        $i = 1;
+        foreach (preg_split("/\015\012|\015|\012/", $content) as $line) {
+            $table[] = '<tr class="c-line"><td class="code-lc" id="L'.$i.'"><a href="#L'.$i.'">'.$i.'</a></td>'
+                .'<td class="code mono'.$pretty.'">'.IDF_Diff::padLine(Pluf_esc($line)).'</td></tr>';
+            $i++;
+        }
+        return Pluf_Template::markSafe(implode("\n", $table));
+    }
+
+    /**
+     * Find the mime type of a file.
+     *
+     * Use /etc/mime.types to find the type.
+     *
+     * @param string Filename/Filepath
+     * @param array  Mime type found or 'application/octet-stream', basename, extension
+     */
+    public static function getMimeType($file)
+    {
+        static $mimes = null;
+        if ($mimes == null) {
+            $mimes = array();
+            $src = Pluf::f('idf_mimetypes_db', '/etc/mime.types');
+            $filecontent = @file_get_contents($src);
+            if ($filecontent !== false) {
+                $mimes = preg_split("/\015\012|\015|\012/", $filecontent);
+            }
+        }
+
+        $info = pathinfo($file);
+        if (isset($info['extension'])) {
+            foreach ($mimes as $mime) {
+                if ('#' != substr($mime, 0, 1)) {
+                    $elts = preg_split('/ |\t/', $mime, -1, PREG_SPLIT_NO_EMPTY);
+                    if (in_array($info['extension'], $elts)) {
+                        return array($elts[0], $info['basename'], $info['extension']);
+                    }
+                }
+            }
+        } else {
+            // we consider that if no extension and base name is all
+            // uppercase, then we have a text file.
+            if ($info['basename'] == strtoupper($info['basename'])) {
+                return array('text/plain', $info['basename'], 'txt');
+            }
+            $info['extension'] = 'bin';
+        }
+        return array('application/octet-stream', $info['basename'], $info['extension']);
+    }
+
+    /**
+     * Find the mime type of a file using the fileinfo class.
+     *
+     * @param string Filename/Filepath
+     * @param string File content
+     * @return array Mime type found or 'application/octet-stream', basename, extension
+     */
+    public static function getMimeTypeFromContent($file, $filedata)
+    {
+        $info = pathinfo($file);
+        $res = array('application/octet-stream',
+                     $info['basename'],
+                     isset($info['extension']) ? $info['extension'] : 'bin');
+        if (function_exists('finfo_open')) {
+            $finfo = finfo_open(FILEINFO_MIME);
+            $mime = finfo_buffer($finfo, $filedata);
+            finfo_close($finfo);
+            if ($mime) {
+                $res[0] = $mime;
+            }
+            if (!isset($info['extension']) && $mime) {
+                $res[2] = (0 === strpos($mime, 'text/')) ? 'txt' : 'bin';
+            } elseif (!isset($info['extension'])) {
+                $res[2] = 'bin';
+            }
+        }
+        return $res;
+    }
+
+    /**
+     * Find if a given mime type is a text file.
+     * This uses the output of the self::getMimeType function.
+     *
+     * @param array (Mime type, file name, extension)
+     * @return bool Is text
+     */
+    public static function isText($fileinfo)
+    {
+        if (0 === strpos($fileinfo[0], 'text/')) {
+            return true;
+        }
+        $ext = 'mdtext php-dist h gitignore diff patch';
+        $extra_ext = trim(Pluf::f('idf_extra_text_ext', ''));
+        if (!empty($extra_ext))
+            $ext .= ' ' . $extra_ext;
+        $ext = array_merge(self::$supportedExtenstions, explode(' ' , $ext));
+        return (in_array($fileinfo[2], $ext));
+    }
+}

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
@@ -38,6 +38,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                          'git' => __('git'),
                          'svn' => __('Subversion'),
                          'mercurial' => __('mercurial'),
+                         'mtn' => __('monotone'),
                          );
         foreach (Pluf::f('allowed_scm', array()) as $key => $class) {
             $choices[$options[$key]] = $key;
@@ -63,6 +64,14 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                                             'help_text' => __('It must be unique for each project and composed only of letters, digits and dash (-) like "my-project".'),
                                             ));
 
+        $this->fields['shortdesc'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => true,
+                                            'label' => __('Short description'),
+                                            'help_text' => __('A one line description of the project.'),
+                                            'initial' => '',
+                                            'widget_attrs' => array('size' => '35'),
+                                            ));
+
         $this->fields['scm'] = new Pluf_Form_Field_Varchar(
                     array('required' => true,
                           'label' => __('Repository type'),
@@ -92,6 +101,14 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                           'widget' => 'Pluf_Form_Widget_PasswordInput',
                           ));
 
+        $this->fields['mtn_master_branch'] = new Pluf_Form_Field_Varchar(
+                    array('required' => false,
+                          'label' => __('Master branch'),
+                          'initial' => '',
+                          'widget_attrs' => array('size' => '35'),
+                          'help_text' => __('This should be a world-wide unique identifier for your project. A reverse DNS notation like "com.my-domain.my-project" is a good idea.'),
+                          ));
+
         $this->fields['owners'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
                                             'label' => __('Project owners'),
@@ -109,6 +126,20 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                                                                     'cols' => 40),
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
                                             ));
+
+        $projects = array('--' => '--');
+        foreach (Pluf::factory('IDF_Project')->getList(array('order' => 'name ASC')) as $proj) {
+            $projects[$proj->name] = $proj->shortname;
+        }
+        $this->fields['template'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Project template'),
+                                            'initial' => '--',
+                                            'help_text' => __('Use the given project to initialize the new project. Access rights and general configuration will be taken from the template project.'),
+                                            'widget' => 'Pluf_Form_Widget_SelectInput',
+                                            'widget_attrs' => array('choices' => $projects),
+                                            ));
+
         /**
          * [signal]
          *
@@ -151,11 +182,39 @@ 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;
     }
 
+    public function clean_mtn_master_branch()
+    {
+        // do not validate, but empty the field if a different
+        // SCM should be used
+        if ($this->cleaned_data['scm'] != 'mtn')
+            return '';
+
+        $mtn_master_branch = mb_strtolower($this->cleaned_data['mtn_master_branch']);
+        if (!preg_match('/^([\w\d]+([-][\w\d]+)*)(\.[\w\d]+([-][\w\d]+)*)*$/',
+                        $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.'
+            ));
+        }
+
+        $sql = new Pluf_SQL('vkey=%s AND vdesc=%s',
+                            array('mtn_master_branch', $mtn_master_branch));
+        $l = Pluf::factory('IDF_Conf')->getList(array('filter'=>$sql->gen()));
+        if ($l->count() > 0) {
+            throw new Pluf_Form_Invalid(__(
+                'This master branch is already used. Please select another one.'
+            ));
+        }
+
+        return $mtn_master_branch;
+    }
+
     public function clean_shortname()
     {
         $shortname = mb_strtolower($this->cleaned_data['shortname']);
@@ -184,6 +243,11 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
                 $this->cleaned_data[$key] = '';
             }
         }
+
+        if ($this->cleaned_data['scm'] != 'mtn') {
+            $this->cleaned_data['mtn_master_branch'] = '';
+        }
+
         /**
          * [signal]
          *
@@ -217,24 +281,89 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
         $project = new IDF_Project();
         $project->name = $this->cleaned_data['name'];
         $project->shortname = $this->cleaned_data['shortname'];
-        $project->private = $this->cleaned_data['private_project'];
-        $project->description = __('Click on the Project Management tab to set the description of your project.');
+        $project->shortdesc = $this->cleaned_data['shortdesc'];
+
+        if ($this->cleaned_data['template'] != '--') {
+            // Find the template project
+            $sql = new Pluf_SQL('shortname=%s',
+                                array($this->cleaned_data['template']));
+            $tmpl = Pluf::factory('IDF_Project')->getOne(array('filter' => $sql->gen()));
+            $project->private = $tmpl->private;
+            $project->description = $tmpl->description;
+        } else {
+            $project->private = $this->cleaned_data['private_project'];
+            $project->description = __('Click on the Project Management tab to set the description of your project.');
+        }
         $project->create();
         $conf = new IDF_Conf();
         $conf->setProject($project);
-        $keys = array('scm', 'svn_remote_url', 
-                      'svn_username', 'svn_password');
+        $keys = array('scm', 'svn_remote_url', 'svn_username',
+                      'svn_password', 'mtn_master_branch');
         foreach ($keys as $key) {
-            $this->cleaned_data[$key] = (!empty($this->cleaned_data[$key])) ? 
+            $this->cleaned_data[$key] = (!empty($this->cleaned_data[$key])) ?
                 $this->cleaned_data[$key] : '';
             $conf->setVal($key, $this->cleaned_data[$key]);
         }
+        if ($this->cleaned_data['template'] != '--') {
+            $tmplconf = new IDF_Conf();
+            $tmplconf->setProject($tmpl);
+            // We need to get all the configuration variables we want from
+            // the old project and put them into the new project.
+            $props = array(
+                           'labels_download_predefined' => IDF_Form_UploadConf::init_predefined,
+                           'labels_download_one_max' => IDF_Form_UploadConf::init_one_max,
+                           'labels_wiki_predefined' => IDF_Form_WikiConf::init_predefined,
+                           'labels_wiki_one_max' => IDF_Form_WikiConf::init_one_max,
+                           'labels_issue_template' => IDF_Form_IssueTrackingConf::init_template,
+                           'labels_issue_open' => IDF_Form_IssueTrackingConf::init_open,
+                           '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',
+                           'wiki_access_rights' => 'all',
+                           'source_access_rights' => 'all',
+                           'issues_access_rights' => 'all',
+                           'downloads_notification_email' => '',
+                           'review_notification_email' => '',
+                           'wiki_notification_email' => '',
+                           'source_notification_email' => '',
+                           'issues_notification_email' => '',
+                           );
+            foreach ($props as $prop => $def) {
+                $conf->setVal($prop, $tmplconf->getVal($prop, $def));
+            }
+        }
         $project->created();
-        IDF_Form_MembersConf::updateMemberships($project, 
-                                                $this->cleaned_data);
+
+        if ($this->cleaned_data['template'] == '--') {
+            IDF_Form_MembersConf::updateMemberships($project,
+                                                    $this->cleaned_data);
+        } else {
+            // Get the membership of the template $tmpl
+            IDF_Form_MembersConf::updateMemberships($project,
+                                                    $tmpl->getMembershipData('string'));
+        }
         $project->membershipsUpdated();
         return $project;
     }
+
+    /**
+     * Check that the template project exists.
+     */
+    public function clean_template()
+    {
+        if ($this->cleaned_data['template'] == '--') {
+            return $this->cleaned_data['template'];
+        }
+        $sql = new Pluf_SQL('shortname=%s', array($this->cleaned_data['template']));
+        if (Pluf::factory('IDF_Project')->getOne(array('filter' => $sql->gen())) == null) {
+            throw new Pluf_Form_Invalid(__('This project is not available.'));
+        }
+        return $this->cleaned_data['template'];
+    }
 }
 
 

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
@@ -37,12 +37,32 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
     {
         $this->project = $extra['project'];
         $members = $this->project->getMembershipData('string');
+        $conf = $this->project->getConf();
+
         $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'),
+                                            'help_text' => __('A one line description of the project.'),
+                                            'initial' => $this->project->shortdesc,
+                                            'widget_attrs' => array('size' => '35'),
+                                            ));
+
+        if ($this->project->getConf()->getVal('scm') == 'mtn') {
+            $this->fields['mtn_master_branch'] = new Pluf_Form_Field_Varchar(
+                                          array('required' => false,
+                                                'label' => __('Master branch'),
+                                                'initial' => $conf->getVal('mtn_master_branch'),
+                                                'widget_attrs' => array('size' => '35'),
+                                                'help_text' => __('This should be a world-wide unique identifier for your project. A reverse DNS notation like "com.my-domain.my-project" is a good idea.'),
+                                                ));
+        }
+
         $this->fields['owners'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
                                             'label' => __('Project owners'),
@@ -61,6 +81,30 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
                                             ));
     }
 
+    public function clean_mtn_master_branch()
+    {
+        $mtn_master_branch = mb_strtolower($this->cleaned_data['mtn_master_branch']);
+        if (!preg_match('/^([\w\d]+([-][\w\d]+)*)(\.[\w\d]+([-][\w\d]+)*)*$/',
+                        $mtn_master_branch)) {
+            throw new Pluf_Form_Invalid(__(
+                'The master branch is empty or contains illegal characters, '.
+                'please use only letters, digits, dashes and dots as separators.'
+            ));
+        }
+
+        $sql = new Pluf_SQL('vkey=%s AND vdesc=%s AND project!=%s',
+                            array('mtn_master_branch', $mtn_master_branch,
+                                  (string)$this->project->id));
+        $l = Pluf::factory('IDF_Conf')->getList(array('filter'=>$sql->gen()));
+        if ($l->count() > 0) {
+            throw new Pluf_Form_Invalid(__(
+                'This master branch is already used. Please select another one.'
+            ));
+        }
+
+        return $mtn_master_branch;
+    }
+
     public function clean_owners()
     {
         return IDF_Form_MembersConf::checkBadLogins($this->cleaned_data['owners']);
@@ -76,11 +120,19 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
         if (!$this->isValid()) {
             throw new Exception(__('Cannot save the model from an invalid form.'));
         }
-        IDF_Form_MembersConf::updateMemberships($this->project, 
+        IDF_Form_MembersConf::updateMemberships($this->project,
                                                 $this->cleaned_data);
         $this->project->membershipsUpdated();
         $this->project->name = $this->cleaned_data['name'];
+        $this->project->shortdesc = $this->cleaned_data['shortdesc'];
         $this->project->update();
+
+        $keys = array('mtn_master_branch');
+        foreach ($keys as $key) {
+            if (!empty($this->cleaned_data[$key])) {
+                $this->project->getConf()->setVal($key, $this->cleaned_data[$key]);
+            }
+        }
     }
 }
 

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(
@@ -77,22 +77,20 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
                                             'initial' => '',
                                             'widget' => 'Pluf_Form_Widget_SelectInput',
                                             'widget_attrs' => array(
-                                                       'choices' => 
+                                                       'choices' =>
                                                        Pluf_L10n::getInstalledLanguages()
                                                                     ),
                                             ));
 
-        $this->fields['ssh_key'] = new Pluf_Form_Field_Varchar(
+        $this->fields['public_key'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
-                                            'label' => __('Add a public SSH key'),
+                                            'label' => __('Add a public key'),
                                             'initial' => '',
                                             'widget_attrs' => array('rows' => 3,
                                                                     'cols' => 40),
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
-                                            'help_text' => __('Be careful to provide the public key and not the private key!')
+                                            'help_text' => __('Paste a SSH or monotone public key. Be careful to not provide your private key here!')
                                             ));
-        
-
     }
 
     /**
@@ -137,11 +135,11 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
         $params = array('user' => $user);
         Pluf_Signal::send('Pluf_User::passwordUpdated',
                           'IDF_Form_Admin_UserCreate', $params);
-        // Create the ssh key as needed
-        if ('' !== $this->cleaned_data['ssh_key']) {
+        // Create the public key as needed
+        if ('' !== $this->cleaned_data['public_key']) {
             $key = new IDF_Key();
             $key->user = $user;
-            $key->content = $this->cleaned_data['ssh_key'];
+            $key->content = $this->cleaned_data['public_key'];
             $key->create();
         }
         // Send an email to the user with the password
@@ -162,16 +160,11 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
         return $user;
     }
 
-    function clean_ssh_key()
-    {
-        return IDF_Form_UserAccount::checkSshKey($this->cleaned_data['ssh_key']);
-    }
-
     function clean_last_name()
     {
         $last_name = trim($this->cleaned_data['last_name']);
         if ($last_name == mb_strtoupper($last_name)) {
-            return mb_convert_case(mb_strtolower($last_name), 
+            return mb_convert_case(mb_strtolower($last_name),
                                    MB_CASE_TITLE, 'UTF-8');
         }
         return $last_name;
@@ -181,7 +174,7 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
     {
         $first_name = trim($this->cleaned_data['first_name']);
         if ($first_name == mb_strtoupper($first_name)) {
-            return mb_convert_case(mb_strtolower($first_name), 
+            return mb_convert_case(mb_strtolower($first_name),
                                    MB_CASE_TITLE, 'UTF-8');
         }
         return $first_name;
@@ -211,4 +204,12 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
         }
         return $this->cleaned_data['login'];
     }
+
+    public function clean_public_key()
+    {
+        $this->cleaned_data['public_key'] =
+            IDF_Form_UserAccount::checkPublicKey($this->cleaned_data['public_key']);
+
+        return $this->cleaned_data['public_key'];
+    }
 }

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
@@ -24,13 +24,15 @@
 /**
  * Update user's details.
  */
-class IDF_Form_Admin_UserUpdate  extends Pluf_Form
+class IDF_Form_Admin_UserUpdate extends Pluf_Form
 {
     public $user = null;
 
     public function initFields($extra=array())
     {
         $this->user = $extra['user'];
+        $user_data = IDF_UserData::factory($this->user);
+
         $this->fields['first_name'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
                                             'label' => __('First name'),
@@ -66,7 +68,7 @@ class IDF_Form_Admin_UserUpdate  extends Pluf_Form
                                             'initial' => $this->user->language,
                                             'widget' => 'Pluf_Form_Widget_SelectInput',
                                             'widget_attrs' => array(
-                                                       'choices' => 
+                                                       'choices' =>
                                                        Pluf_L10n::getInstalledLanguages()
                                                                     ),
                                             ));
@@ -76,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,
@@ -93,13 +95,73 @@ class IDF_Form_Admin_UserUpdate  extends Pluf_Form
                                                                     ),
                                             ));
 
+        $this->fields['description'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Description'),
+                                            'initial' => $user_data->description,
+                                            'widget_attrs' => array('rows' => 3,
+                                                                    'cols' => 40),
+                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
+                                            ));
+
+        $this->fields['twitter'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Twitter username'),
+                                            'initial' => $user_data->twitter,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+
+        $this->fields['public_email'] = new Pluf_Form_Field_Email(
+                                      array('required' => false,
+                                            'label' => __('Public email address'),
+                                            'initial' => $user_data->public_email,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+
+        $this->fields['website'] = new Pluf_Form_Field_Url(
+                                      array('required' => false,
+                                            'label' => __('Website URL'),
+                                            'initial' => $user_data->website,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+
+        $this->fields['custom_avatar'] = new Pluf_Form_Field_File(
+                                      array('required' => false,
+                                            'label' => __('Upload custom avatar'),
+                                            'initial' => '',
+                                            'max_size' => Pluf::f('max_upload_size', 2097152),
+                                            'move_function_params' => array('upload_path' => Pluf::f('upload_path').'/avatars',
+                                                                            'upload_path_create' => true,
+                                                                            'upload_overwrite' => true,
+                                                                            'file_name' => 'user_'.$this->user->id.'_%s'),
+                                            'help_text' => __('An image file with a width and height not larger than 60 pixels (bigger images are scaled down).'),
+                                            ));
+
+        $this->fields['remove_custom_avatar'] = new Pluf_Form_Field_Boolean(
+                                      array('required' => false,
+                                            'label' => __('Remove custom avatar'),
+                                            'initial' => false,
+                                            'widget' => 'Pluf_Form_Widget_CheckboxInput',
+                                            'widget_attrs' => array(),
+                                            'help_text' => __('Tick this to delete the custom avatar.'),
+                                            ));
+
         if ($extra['request']->user->administrator) {
             $this->fields['staff'] = new Pluf_Form_Field_Boolean(
                     array('required' => false,
                           '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.'),
                           ));
         }
 
@@ -111,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.'),
                           ));
     }
 
@@ -136,8 +198,37 @@ class IDF_Form_Admin_UserUpdate  extends Pluf_Form
             $update_pass = true;
         }
         $this->user->setFromFormData($this->cleaned_data);
+
         if ($commit) {
             $this->user->update();
+
+            // FIXME: go the extra mile and check the input lengths for
+            // all fields here!
+            // FIXME: this is all doubled in UserAccount!
+
+            $user_data = IDF_UserData::factory($this->user);
+
+            // Add or remove avatar - we need to do this here because every
+            // single setter directly leads to a save in the database
+            if ($user_data->avatar != '' &&
+                    ($this->cleaned_data['remove_custom_avatar'] == 1 ||
+                     $this->cleaned_data['custom_avatar'] != '')) {
+                $avatar_path = Pluf::f('upload_path').'/avatars/'.basename($user_data->avatar);
+                if (basename($avatar_path) != '' && is_file($avatar_path)) {
+                    unlink($avatar_path);
+                }
+                $user_data->avatar = '';
+            }
+
+            if ($this->cleaned_data['custom_avatar'] != '') {
+                $user_data->avatar = $this->cleaned_data['custom_avatar'];
+            }
+
+            $user_data->description  = $this->cleaned_data['description'];
+            $user_data->twitter      = $this->cleaned_data['twitter'];
+            $user_data->public_email = $this->cleaned_data['public_email'];
+            $user_data->website      = $this->cleaned_data['website'];
+
             if ($update_pass) {
                 /**
                  * [signal]
@@ -170,7 +261,7 @@ class IDF_Form_Admin_UserUpdate  extends Pluf_Form
     {
         $last_name = trim($this->cleaned_data['last_name']);
         if ($last_name == mb_strtoupper($last_name)) {
-            return mb_convert_case(mb_strtolower($last_name), 
+            return mb_convert_case(mb_strtolower($last_name),
                                    MB_CASE_TITLE, 'UTF-8');
         }
         return $last_name;
@@ -183,7 +274,7 @@ class IDF_Form_Admin_UserUpdate  extends Pluf_Form
             throw new Pluf_Form_Invalid(__('--- is not a valid first name.'));
         }
         if ($first_name == mb_strtoupper($first_name)) {
-            $first_name = mb_convert_case(mb_strtolower($first_name), 
+            $first_name = mb_convert_case(mb_strtolower($first_name),
                                           MB_CASE_TITLE, 'UTF-8');
         }
         return $first_name;
@@ -201,12 +292,23 @@ class IDF_Form_Admin_UserUpdate  extends Pluf_Form
         return $email;
     }
 
+    function clean_custom_avatar()
+    {
+        // Just png, jpeg/jpg or gif
+        if (!preg_match('/\.(png|jpg|jpeg|gif)$/i', $this->cleaned_data['custom_avatar']) &&
+            $this->cleaned_data['custom_avatar'] != '') {
+            @unlink(Pluf::f('upload_path').'/avatars/'.$this->cleaned_data['custom_avatar']);
+            throw new Pluf_Form_Invalid(__('For security reason, you cannot upload a file with this extension.'));
+        }
+        return $this->cleaned_data['custom_avatar'];
+    }
+
     /**
-     * Check to see if the 2 passwords are the same.
+     * Check to see if the two passwords are the same.
      */
     public function clean()
     {
-        if (!isset($this->errors['password']) 
+        if (!isset($this->errors['password'])
             && !isset($this->errors['password2'])) {
             $password1 = $this->cleaned_data['password'];
             $password2 = $this->cleaned_data['password2'];

src/IDF/Form/Field/EmailList.php

@@ -0,0 +1,51 @@
+<?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 ***** */
+
+/**
+ * Similar to Pluf_Form_Field_Email, this form field validates one or more
+ * email addresses separated by a comma
+ */
+class IDF_Form_Field_EmailList extends Pluf_Form_Field
+{
+    public $widget = 'Pluf_Form_Widget_TextInput';
+
+    public function clean($value)
+    {
+        parent::clean($value);
+        if (in_array($value, $this->empty_values)) {
+            $value = '';
+        }
+        if ($value == '') {
+            return $value;
+        }
+        $emails = preg_split('/\s*,\s*/', $value, -1, PREG_SPLIT_NO_EMPTY);
+        foreach ($emails as $email) {
+            if (!Pluf_Utils::isValidEmail($email)) {
+                throw new Pluf_Form_Invalid(__(
+                    'Please enter one or more valid email addresses.'
+                ));
+            }
+        }
+        return implode(',', $emails);
+    }
+}

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,6 +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'),
@@ -57,7 +64,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
         $this->fields['content'] = new Pluf_Form_Field_Varchar(
                                       array('required' => true,
                                             'label' => __('Description'),
-                                            'initial' => '',
+                                            'initial' => $contentTemplate,
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
                                             'widget_attrs' => array(
                                                        'cols' => 58,
@@ -73,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,
@@ -105,14 +112,55 @@ class IDF_Form_IssueCreate extends Pluf_Form
                                                        'size' => 15,
                                                                     ),
                                             ));
+
+            $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
+             *
+             * first Type:<...> and Priority:<...> will be used
+             *
+             */
+            $predefined = preg_split("/[\r\n]+/", $extra['project']->getConf()->getVal(
+              'labels_issue_predefined'
+            ));
+            $predefined_type = 'Type:Defect';
+            foreach ($predefined as $tag) {
+                if (strpos($tag, 'Type:') === 0) {
+                    $predefined_type = explode('=', $tag, 2);
+                    $predefined_type = trim($predefined_type[0]);
+                    break;
+                }
+            }
+            $predefined_priority = 'Priority:Medium';
+            foreach ($predefined as $tag) {
+                if (strpos($tag, 'Priority:') === 0) {
+                    $predefined_priority = explode('=', $tag, 2);
+                    $predefined_priority = trim($predefined_priority[0]);
+                    break;
+                }
+            }
+
             for ($i=1;$i<7;$i++) {
                 $initial = '';
                 switch ($i) {
                 case 1:
-                    $initial = 'Type:Defect';
+                    $initial = $predefined_type;
                     break;
                 case 2:
-                    $initial = 'Priority:Medium';
+                    $initial = $predefined_priority;
                     break;
                 }
                 $this->fields['label'.$i] = new Pluf_Form_Field_Varchar(
@@ -151,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';
@@ -185,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);
@@ -205,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.
      */
@@ -268,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;
@@ -276,6 +405,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
         $comment->create();
         // If we have a file, create the IDF_IssueFile and attach
         // it to the comment.
+        $created_files = array();
         for ($i=1;$i<4;$i++) {
             if ($this->cleaned_data['attachment'.$i]) {
                 $file = new IDF_IssueFile();
@@ -283,8 +413,36 @@ class IDF_Form_IssueCreate extends Pluf_Form
                 $file->submitter = $this->user;
                 $file->comment = $comment;
                 $file->create();
+                $created_files[] = $file;
             }
         }
+        /**
+         * [signal]
+         *
+         * IDF_Issue::create
+         *
+         * [sender]
+         *
+         * IDF_Form_IssueCreate
+         *
+         * [description]
+         *
+         * This signal allows an application to perform a set of tasks
+         * just after the creation of an issue. The comment contains
+         * the description of the issue.
+         *
+         * [parameters]
+         *
+         * array('issue' => $issue,
+         *       'comment' => $comment,
+         *       'files' => $attached_files);
+         *
+         */
+        $params = array('issue' => $issue,
+                        'comment' => $comment,
+                        'files' => $created_files);
+        Pluf_Signal::send('IDF_Issue::create', 'IDF_Form_IssueCreate',
+                          $params);
         return $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
@@ -31,6 +31,15 @@ class IDF_Form_IssueTrackingConf extends Pluf_Form
      * Defined as constants to easily access the value in the
      * IssueUpdate/Create form in the case nothing is in the db yet.
      */
+    const init_template = 'Steps to reproduce the problem:
+1.
+2.
+3.
+
+Expected result:
+
+Actual result:
+';
     const init_open = 'New                 = Issue has not had initial review yet
 Accepted            = Problem reproduced / Need acknowledged
 Started             = Work on this issue has begun';
@@ -63,9 +72,35 @@ 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())
     {
+        $this->fields['labels_issue_template'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Define an issue template to hint the reporter to provide certain information'),
+                                            'initial' => self::init_template,
+                                            'widget_attrs' => array('rows' => 7,
+                                                                    'cols' => 75),
+                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
+                                            ));
+
         $this->fields['labels_issue_open'] = new Pluf_Form_Field_Varchar(
                                       array('required' => true,
                                             'label' => __('Open issue status values'),
@@ -87,6 +122,7 @@ Maintainability      = Hinders future changes';
                                       array('required' => true,
                                             'label' => __('Predefined issue labels'),
                                             'initial' => self::init_predefined,
+                                            'help_text' => __('The first "Type:" and "Priority:" entries found in this list are automatically chosen as defaults for new issues.'),
                                             'widget_attrs' => array('rows' => 7,
                                                                     'cols' => 75),
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
@@ -95,12 +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']);
@@ -305,6 +445,7 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
             $this->issue->submitter != $this->user->id) {
             $this->issue->setAssoc($this->user); // interested user.
         }
+        $attached_files = array();
         for ($i=1;$i<4;$i++) {
             if ($this->cleaned_data['attachment'.$i]) {
                 $file = new IDF_IssueFile();
@@ -312,8 +453,36 @@ class IDF_Form_IssueUpdate  extends IDF_Form_IssueCreate
                 $file->submitter = $this->user;
                 $file->comment = $comment;
                 $file->create();
+                $attached_files[] = $file;
             }
         }
+        /**
+         * [signal]
+         *
+         * IDF_Issue::update
+         *
+         * [sender]
+         *
+         * IDF_Form_IssueUpdate
+         *
+         * [description]
+         *
+         * This signal allows an application to perform a set of tasks
+         * just after the update of an issue.
+         *
+         * [parameters]
+         *
+         * array('issue' => $issue,
+         *       'comment' => $comment,
+         *       'files' => $attached_files);
+         *
+         */
+        $params = array('issue' => $this->issue,
+                        'comment' => $comment,
+                        'files' => $attached_files);
+        Pluf_Signal::send('IDF_Issue::update', 'IDF_Form_IssueUpdate',
+                          $params);
+
         return $this->issue;
     }
 }

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
@@ -101,7 +101,7 @@ class IDF_Form_MembersConf extends Pluf_Form
         $n = count($bad);
         if ($n) {
             $badlogins = Pluf_esc(implode(', ', $bad));
-            throw new Pluf_Form_Invalid(sprintf(_n('The following login is invalid: %s.', 'The following login are invalids: %s.', $n), $badlogins));
+            throw new Pluf_Form_Invalid(sprintf(_n('The following login is invalid: %s.', 'The following logins are invalid: %s.', $n), $badlogins));
         }
         return $logins;
     }

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
@@ -205,6 +205,30 @@ class IDF_Form_ReviewCreate extends Pluf_Form
         $patch->patch = $this->cleaned_data['patch'];
         $patch->create();
         $patch->notify($this->project->getConf());
+        /**
+         * [signal]
+         *
+         * IDF_Review::create
+         *
+         * [sender]
+         *
+         * IDF_Form_ReviewCreate
+         *
+         * [description]
+         *
+         * This signal allows an application to perform a set of tasks
+         * just after the creation of a review and the notification.
+         *
+         * [parameters]
+         *
+         * array('review' => $review,
+         *       'patch' => $patch);
+         *
+         */
+        $params = array('review' => $review,
+                        'patch' => $patch);
+        Pluf_Signal::send('IDF_Review::create', 'IDF_Form_ReviewCreate',
+                          $params);
         return $review;
     }
 

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
@@ -52,7 +52,7 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
                                             ));
         }
         $this->fields['content'] = new Pluf_Form_Field_Varchar(
-                                      array('required' => true,
+                                      array('required' => false,
                                             'label' => __('General comment'),
                                             'initial' => '',
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
@@ -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(
@@ -94,24 +96,40 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
      */
     public function clean()
     {
-        foreach ($this->files as $filename => $def) {
-            if (!empty($this->cleaned_data[md5($filename)])) {
-                return $this->cleaned_data;
+        $isOk = false;
+        
+        foreach($this->files as $filename => $def) {
+            $this->cleaned_data[md5($filename)] = trim($this->cleaned_data[md5($filename)]);
+            if(!empty($this->cleaned_data[md5($filename)])) {
+                $isOk = true;
             }
         }
-        throw new Pluf_Form_Invalid(__('You need to provide comments on at least one file.'));
+        
+        if(!empty($this->cleaned_data['content'])) {
+            $isOk = true;
+        }
+        
+        if (!$isOk) {
+            throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal, or comments on at least one file.'));
+        }
+        
+        return $this->cleaned_data;
     }
 
     function clean_content()
     {
         $content = trim($this->cleaned_data['content']);
-        if (!$this->show_full and strlen($content) == 0) {
-            throw new Pluf_Form_Invalid(__('You need to provide your general comment about the proposal.'));
+        if(empty($content)) {
+            if ($this->fields['status']->initial != $this->fields['status']->value) {
+                return __('The status have been updated.');
+            }
+        } else {
+            return $content;
         }
-        return $content;
+        
+        throw new Pluf_Form_Invalid(__('This field is required.'));
     }
 
-
     /**
      * Save the model in the database.
      *

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
@@ -34,7 +34,7 @@ class IDF_Form_SourceConf extends Pluf_Form
     public function initFields($extra=array())
     {
         $this->conf = $extra['conf'];
-        if ($this->conf->getVal('scm', 'git') == 'svn') {
+        if ($extra['remote_svn']) {
             $this->fields['svn_username'] = new Pluf_Form_Field_Varchar(
                     array('required' => false,
                           'label' => __('Repository username'),
@@ -49,6 +49,16 @@ class IDF_Form_SourceConf extends Pluf_Form
                           'widget' => 'Pluf_Form_Widget_PasswordInput',
                           ));
         }
+        Pluf::loadFunction('Pluf_HTTP_URL_urlForView');
+        $url = Pluf_HTTP_URL_urlForView('idf_faq').'#webhooks';
+        $this->fields['webhook_url'] = new Pluf_Form_Field_Url(
+                    array('required' => false,
+                          'label' => __('Webhook URL'),
+                          'initial' => $this->conf->getVal('webhook_url', ''),
+                          'help_text' => sprintf(__('Learn more about the <a href="%s">post-commit web hooks</a>.'), $url),
+                          'widget_attrs' => array('size' => 35),
+                          ));
+
     }
 }
 

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
@@ -45,7 +45,7 @@ class IDF_Form_TabsConf extends Pluf_Form
                                       array('required' => true,
                                             'label' => $label,
                                             'initial' => $this->conf->getVal($key, 'all'),
-                                            'widget_attrs' => array('choices' => 
+                                            'widget_attrs' => array('choices' =>
                                           array(
                                                 __('Open to all') => 'all',
                                                 __('Signed in users') => 'login',
@@ -63,10 +63,11 @@ class IDF_Form_TabsConf extends Pluf_Form
                     'source_notification_email',
                     'issues_notification_email',);
         foreach ($ak as $key) {
-            $this->fields[$key] = new Pluf_Form_Field_Email(
+            $this->fields[$key] = new IDF_Form_Field_EmailList(
                                       array('required' => false,
                                             'label' => $key,
                                             'initial' => $this->conf->getVal($key, ''),
+                                            'widget_attrs' => array('size' => 40),
                                             ));
         }
 

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
@@ -146,6 +146,28 @@ class IDF_Form_UpdateUpload extends Pluf_Form
         $this->upload->modif_dtime = gmdate('Y-m-d H:i:s');
         $this->upload->update();
         $this->upload->batchAssoc('IDF_Tag', $tags);
+        /**
+         * [signal]
+         *
+         * IDF_Upload::update
+         *
+         * [sender]
+         *
+         * IDF_Form_UpdateUpload
+         *
+         * [description]
+         *
+         * This signal allows an application to perform a set of tasks
+         * just after the update of an uploaded file.
+         *
+         * [parameters]
+         *
+         * array('upload' => $upload);
+         *
+         */
+        $params = array('upload' => $this->upload);
+        Pluf_Signal::send('IDF_Upload::update', 
+                          'IDF_Form_UpdateUpload', $params);
         return $this->upload;
     }
 }

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'];
     }
@@ -176,6 +176,28 @@ class IDF_Form_Upload extends Pluf_Form
         }
         // Send the notification
         $upload->notify($this->project->getConf());
+        /**
+         * [signal]
+         *
+         * IDF_Upload::create
+         *
+         * [sender]
+         *
+         * IDF_Form_Upload
+         *
+         * [description]
+         *
+         * This signal allows an application to perform a set of tasks
+         * just after the upload of a file and after the notification run.
+         *
+         * [parameters]
+         *
+         * array('upload' => $upload);
+         *
+         */
+        $params = array('upload' => $upload);
+        Pluf_Signal::send('IDF_Upload::create', 'IDF_Form_Upload',
+                          $params);
         return $upload;
     }
 }

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
@@ -33,6 +33,8 @@ class IDF_Form_UserAccount  extends Pluf_Form
     public function initFields($extra=array())
     {
         $this->user = $extra['user'];
+        $user_data = IDF_UserData::factory($this->user);
+
         $this->fields['first_name'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
                                             'label' => __('First name'),
@@ -65,7 +67,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
                                             'initial' => $this->user->language,
                                             'widget' => 'Pluf_Form_Widget_SelectInput',
                                             'widget_attrs' => array(
-                                                       'choices' => 
+                                                       'choices' =>
                                                        Pluf_L10n::getInstalledLanguages()
                                                                     ),
                                             ));
@@ -77,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,
                                                                     ),
@@ -87,22 +90,117 @@ class IDF_Form_UserAccount  extends Pluf_Form
                                             'initial' => '',
                                             'widget' => 'Pluf_Form_Widget_PasswordInput',
                                             'widget_attrs' => array(
+                                                       'autocomplete' => 'off',
                                                        'maxlength' => 50,
                                                        'size' => 15,
                                                                     ),
                                             ));
 
-        $this->fields['ssh_key'] = new Pluf_Form_Field_Varchar(
+        $this->fields['description'] = new Pluf_Form_Field_Varchar(
                                       array('required' => false,
-                                            'label' => __('Add a public SSH key'),
+                                            'label' => __('Description'),
+                                            'initial' => $user_data->description,
+                                            'widget_attrs' => array('rows' => 3,
+                                                                    'cols' => 40),
+                                            'widget' => 'Pluf_Form_Widget_TextareaInput',
+                                            ));
+
+        $this->fields['twitter'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Twitter username'),
+                                            'initial' => $user_data->twitter,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+
+        $this->fields['public_email'] = new Pluf_Form_Field_Email(
+                                      array('required' => false,
+                                            'label' => __('Public email address'),
+                                            'initial' => $user_data->public_email,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+
+        $this->fields['website'] = new Pluf_Form_Field_Url(
+                                      array('required' => false,
+                                            'label' => __('Website URL'),
+                                            'initial' => $user_data->website,
+                                            'widget_attrs' => array(
+                                                       'maxlength' => 50,
+                                                       'size' => 15,
+                                                                    ),
+                                            ));
+
+        $this->fields['custom_avatar'] = new Pluf_Form_Field_File(
+                                      array('required' => false,
+                                            'label' => __('Upload custom avatar'),
+                                            'initial' => '',
+                                            'max_size' => Pluf::f('max_upload_size', 2097152),
+                                            'move_function_params' => array('upload_path' => Pluf::f('upload_path').'/avatars',
+                                                                            'upload_path_create' => true,
+                                                                            'upload_overwrite' => true,
+                                                                            'file_name' => 'user_'.$this->user->id.'_%s'),
+                                            'help_text' => __('An image file with a width and height not larger than 60 pixels (bigger images are scaled down).'),
+                                            ));
+
+        $this->fields['remove_custom_avatar'] = new Pluf_Form_Field_Boolean(
+                                      array('required' => false,
+                                            'label' => __('Remove custom avatar'),
+                                            'initial' => false,
+                                            'widget' => 'Pluf_Form_Widget_CheckboxInput',
+                                            'widget_attrs' => array(),
+                                            'help_text' => __('Tick this to delete the custom avatar.'),
+                                            ));
+
+        $this->fields['public_key'] = new Pluf_Form_Field_Varchar(
+                                      array('required' => false,
+                                            'label' => __('Add a public key'),
                                             'initial' => '',
                                             'widget_attrs' => array('rows' => 3,
                                                                     'cols' => 40),
                                             'widget' => 'Pluf_Form_Widget_TextareaInput',
-                                            'help_text' => __('Be careful to provide your public key and not your private key!')
+                                            '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)));
     }
 
     /**
@@ -128,39 +226,52 @@ 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.
-        if ('' !== $this->cleaned_data['ssh_key']) {
+        if ('' !== $this->cleaned_data['public_key']) {
             $key = new IDF_Key();
             $key->user = $this->user;
-            $key->content = $this->cleaned_data['ssh_key'];
+            $key->content = $this->cleaned_data['public_key'];
             if ($commit) {
                 $key->create();
             }
         }
+        if ('' !== $this->cleaned_data['secondary_mail']) {
+            $this->send_validation_mail($this->cleaned_data['secondary_mail'], true);
+        }
+
         if ($commit) {
             $this->user->update();
+
+            // FIXME: go the extra mile and check the input lengths for
+            // all fields here!
+            // FIXME: this is all doubled in admin/UserUpdate!
+
+            $user_data = IDF_UserData::factory($this->user);
+
+            // Add or remove avatar - we need to do this here because every
+            // single setter directly leads to a save in the database
+            if ($user_data->avatar != '' &&
+                    ($this->cleaned_data['remove_custom_avatar'] == 1 ||
+                     $this->cleaned_data['custom_avatar'] != '')) {
+                $avatar_path = Pluf::f('upload_path').'/avatars/'.basename($user_data->avatar);
+                if (basename($avatar_path) != '' && is_file($avatar_path)) {
+                    unlink($avatar_path);
+                }
+                $user_data->avatar = '';
+            }
+
+            if ($this->cleaned_data['custom_avatar'] != '') {
+                $user_data->avatar = $this->cleaned_data['custom_avatar'];
+            }
+
+            $user_data->description  = $this->cleaned_data['description'];
+            $user_data->twitter      = $this->cleaned_data['twitter'];
+            $user_data->public_email = $this->cleaned_data['public_email'];
+            $user_data->website      = $this->cleaned_data['website'];
+
             if ($update_pass) {
                 /**
                  * [signal]
@@ -190,7 +301,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
     }
 
     /**
-     * Check an ssh key.
+     * Check arbitrary public keys.
      *
      * It will throw a Pluf_Form_Invalid exception if it cannot
      * validate the key.
@@ -199,52 +310,102 @@ class IDF_Form_UserAccount  extends Pluf_Form
      * @param $user int The user id of the user of the key (0)
      * @return string The clean key
      */
-    public static function checkSshKey($key, $user=0)
+    public static function checkPublicKey($key, $user=0)
     {
         $key = trim($key);
         if (strlen($key) == 0) {
             return '';
         }
-        $key = str_replace(array("\n", "\r"), '', $key);
-        if (!preg_match('#^ssh\-[a-z]{3}\s(\S+)\s\S+$#', $key, $matches)) {
-            throw new Pluf_Form_Invalid(__('The format of the key is not valid. It must start with ssh-dss or ssh-rsa, a long string on a single line and at the end a comment.'));
-        }
-        if (Pluf::f('idf_strong_key_check', false)) {
-            $tmpfile = Pluf::f('tmp_folder', '/tmp').'/'.$user.'-key';
-            file_put_contents($tmpfile, $key, LOCK_EX);
-            $cmd = Pluf::f('idf_exec_cmd_prefix', '').
-                'ssh-keygen -l -f '.escapeshellarg($tmpfile).' > /dev/null 2>&1';
-            exec($cmd, $out, $return);
-            unlink($tmpfile);
-            if ($return != 0) {
-                throw new Pluf_Form_Invalid(__('Please check the key as it does not appears to be a valid 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)) {
+
+                $tmpfile = Pluf::f('tmp_folder', '/tmp').'/'.$user.'-key';
+                file_put_contents($tmpfile, $key, LOCK_EX);
+                $cmd = Pluf::f('idf_exec_cmd_prefix', '').
+                    'ssh-keygen -l -f '.escapeshellarg($tmpfile).' > /dev/null 2>&1';
+                exec($cmd, $out, $return);
+                unlink($tmpfile);
+
+                if ($return != 0) {
+                    throw new Pluf_Form_Invalid(
+                        __('Please check the key as it does not appear '.
+                           'to be a valid SSH public 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
+                $mtn_opts = implode(' ', Pluf::f('mtn_opts', array()));
+                $cmd = Pluf::f('idf_exec_cmd_prefix', '').
+                    sprintf('%s %s -d :memory: read >/tmp/php-out 2>&1',
+                            Pluf::f('mtn_path', 'mtn'), $mtn_opts);
+                $fp = popen($cmd, 'w');
+                fwrite($fp, $key);
+                $return = pclose($fp);
+
+                if ($return != 0) {
+                       throw new Pluf_Form_Invalid(
+                        __('Please check the key as it does not appear '.
+                           'to be a valid monotone public key.')
+                    );
+                }
+            }
+        }
+        else {
+            throw new Pluf_Form_Invalid(
+                __('Public key looks like neither an SSH '.
+                   'nor monotone public key.'));
+        }
+
         // If $user, then check if not the same key stored
         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(__('You already have uploaded this SSH key.'));
+                    throw new Pluf_Form_Invalid(
+                        __('You already have uploaded this key.')
+                    );
                 }
             }
         }
         return $key;
     }
 
-    function clean_ssh_key()
+
+    function clean_custom_avatar()
     {
-        return self::checkSshKey($this->cleaned_data['ssh_key'], 
-                                 $this->user->id);
+        // Just png, jpeg/jpg or gif
+        if (!preg_match('/\.(png|jpg|jpeg|gif)$/i', $this->cleaned_data['custom_avatar']) &&
+            $this->cleaned_data['custom_avatar'] != '') {
+            @unlink(Pluf::f('upload_path').'/avatars/'.$this->cleaned_data['custom_avatar']);
+            throw new Pluf_Form_Invalid(__('For security reason, you cannot upload a file with this extension.'));
+        }
+        return $this->cleaned_data['custom_avatar'];
     }
 
+
     function clean_last_name()
     {
         $last_name = trim($this->cleaned_data['last_name']);
         if ($last_name == mb_strtoupper($last_name)) {
-            return mb_convert_case(mb_strtolower($last_name), 
+            return mb_convert_case(mb_strtolower($last_name),
                                    MB_CASE_TITLE, 'UTF-8');
         }
         return $last_name;
@@ -254,7 +415,7 @@ class IDF_Form_UserAccount  extends Pluf_Form
     {
         $first_name = trim($this->cleaned_data['first_name']);
         if ($first_name == mb_strtoupper($first_name)) {
-            return mb_convert_case(mb_strtolower($first_name), 
+            return mb_convert_case(mb_strtolower($first_name),
                                    MB_CASE_TITLE, 'UTF-8');
         }
         return $first_name;
@@ -263,21 +424,36 @@ 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'] =
+                self::checkPublicKey($this->cleaned_data['public_key'],
+                                     $this->user->id);
+        return $this->cleaned_data['public_key'];
+    }
+
     /**
-     * Check to see if the 2 passwords are the same.
+     * Check to see if the 2 passwords are the same
      */
     public function clean()
     {
-        if (!isset($this->errors['password']) 
+        if (!isset($this->errors['password'])
             && !isset($this->errors['password2'])) {
             $password1 = $this->cleaned_data['password'];
             $password2 = $this->cleaned_data['password2'];
@@ -285,6 +461,9 @@ class IDF_Form_UserAccount  extends Pluf_Form
                 throw new Pluf_Form_Invalid(__('The passwords do not match. Please give them again.'));
             }
         }
+
         return $this->cleaned_data;
     }
+
+
 }

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

@@ -0,0 +1,210 @@
+<?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 objects.
+ *
+ * It is just storing a list of key/value pairs associated to
+ * different objects. If you use this table for your model, do not
+ * forget to drop the corresponding keys in your preDelete call.
+ */
+class IDF_Gconf extends Pluf_Model
+{
+    public $_model = __CLASS__;
+    public $datacache = null;
+    public $dirty = array();
+    public $f = null;
+    protected $_mod = null;
+    /**
+     * Do we (un)serialize the data when getting/setting them.
+     */
+    public $serialize = false;
+
+    function init()
+    {
+        $this->_a['table'] = 'idf_gconf';
+        $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,
+                                  ),
+                            'model_class' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 150,
+                                  'verbose' => __('model class'),
+                                  ),
+                            'model_id' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Integer',
+                                  'blank' => false,
+                                  'verbose' => __('model id'),
+                                  ),
+                            'vkey' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Varchar',
+                                  'blank' => false,
+                                  'size' => 50,
+                                  'verbose' => __('key'),
+                                  ),
+                            'vdesc' =>
+                            array(
+                                  'type' => 'Pluf_DB_Field_Text',
+                                  'blank' => false,
+                                  'verbose' => __('value'),
+                                  ),
+                            );
+        $this->_a['idx'] = array('model_vkey_idx' =>
+                                 array(
+                                       'col' => 'model_class, model_id, vkey',
+                                       'type' => 'unique',
+                                       ),
+                                 );
+        $this->f = new IDF_Config_DataProxy($this);
+    }
+
+    function setModel($model)
+    {
+        $this->datacache = null;
+        $this->_mod = $model;
+    }
+
+    function initCache()
+    {
+        $this->datacache = array();
+        $this->dirty = array();
+        $sql = new Pluf_SQL('model_class=%s AND model_id=%s',
+                            array($this->_mod->_model, $this->_mod->id));
+        foreach ($this->getList(array('filter' => $sql->gen())) as $val) {
+            $this->datacache[$val->vkey] = ($this->serialize) ? unserialize($val->vdesc) : $val->vdesc;
+            $this->dirty[$val->vkey] = $val->id;
+        }
+    }
+
+    /**
+     * FIXME: This is not efficient when setting a large number of
+     * values in a loop.
+     */
+    function setVal($key, $value)
+    {
+        if (!is_null($this->getVal($key, null))
+            and $value == $this->getVal($key)) {
+            return;
+        }
+        $svalue = ($this->serialize) ? serialize($value) : $value;
+        if (isset($this->dirty[$key])) {
+            // we get to check if deleted by other process + update
+            $conf = new IDF_Gconf($this->dirty[$key]);
+            if ($conf->id == $this->dirty[$key]) {
+                $conf->vdesc = $svalue;
+                $conf->update();
+                $this->datacache[$key] = $value;
+                return;
+            }
+        }
+        // we insert
+        $conf = new IDF_Gconf();
+        $conf->model_class = $this->_mod->_model;
+        $conf->model_id = $this->_mod->id;
+        $conf->vkey = $key;
+        $conf->vdesc = $svalue;
+        $conf->create();
+        $this->datacache[$key] = $value;
+        $this->dirty[$key] = $conf->id;
+    }
+
+    function getVal($key, $default='')
+    {
+        if ($this->datacache === null) {
+            $this->initCache();
+        }
+        return (isset($this->datacache[$key])) ? $this->datacache[$key] : $default;
+    }
+
+    function delVal($key, $initcache=true)
+    {
+        $gconf = new IDF_Gconf();
+        $sql = new Pluf_SQL('vkey=%s AND model_class=%s AND model_id=%s', array($key, $this->_mod->_model, $this->_mod->id));
+        foreach ($gconf->getList(array('filter' => $sql->gen())) as $c) {
+            $c->delete();
+        }
+        if ($initcache) {
+            $this->initCache();
+        }
+    }
+
+    /**
+     * Collection selection.
+     *
+     * Suppose you have 5 objects with associated meta data in the
+     * Gconf storage, if you load the data independently for each
+     * object, you end up with 5 SELECT queries. With 25 objects, 25
+     * SELECT. You can select with one query all the data and merge in
+     * the code. It is faster. The collection selection get a
+     * model_class and a list of ids and returns an id indexed array
+     * of associative array data. This is for read only access as you
+     * do not get a series of Gconf objects.
+     */
+    public static function collect($class, $ids)
+    {
+        $gconf = new IDF_Gconf();
+        $stmpl = sprintf('model_class=%%s AND model_id IN (%s)', 
+                         implode(',' , $ids));
+        $sql = new Pluf_SQL($stmpl, array($class));
+        $out = array_fill_keys($ids, array());
+        foreach ($gconf->getList(array('filter' => $sql->gen())) as $c) {
+            $out[$c->model_id][$c->vkey] = $c->vdesc;
+        }
+
+        return $out;
+    }
+
+    /**
+     * Drop the conf of a model.
+     *
+     * If your model is using this table, just add the following line
+     * in your preDelete() method:
+     *
+     * IDF_Gconf::dropForModel($this)
+     *
+     * It will take care of the cleaning.
+     */
+    static public function dropForModel($model)
+    {
+        $table = Pluf::factory(__CLASS__)->getSqlTable();
+        $sql = new Pluf_SQL('model_class=%s AND model_id=%s',
+                            array($model->_model, $model->id));
+        $db = &Pluf::db();
+        $db->execute('DELETE FROM '.$table.' WHERE '.$sql->gen());
+    }
+
+    static public function dropUser($signal, &$params)
+    {
+        self::dropForModel($params['user']);
+    }
+}

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
@@ -42,9 +42,9 @@ class IDF_Issue extends Pluf_Model
                             'id' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Sequence',
-                                  'blank' => true, 
+                                  'blank' => true,
                                   ),
-                            'project' => 
+                            'project' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'IDF_Project',
@@ -59,7 +59,7 @@ class IDF_Issue extends Pluf_Model
                                   'size' => 250,
                                   'verbose' => __('summary'),
                                   ),
-                            'submitter' => 
+                            'submitter' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'Pluf_User',
@@ -67,7 +67,7 @@ class IDF_Issue extends Pluf_Model
                                   'verbose' => __('submitter'),
                                   'relate_name' => 'submitted_issue',
                                   ),
-                            'owner' => 
+                            'owner' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'Pluf_User',
@@ -76,7 +76,7 @@ class IDF_Issue extends Pluf_Model
                                   'verbose' => __('owner'),
                                   'relate_name' => 'owned_issue',
                                   ),
-                            'interested' => 
+                            'interested' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Manytomany',
                                   'model' => 'Pluf_User',
@@ -86,14 +86,14 @@ class IDF_Issue extends Pluf_Model
                                   ),
                             'tags' =>
                             array(
-                                  'type' => 'Pluf_DB_Field_Manytomany', 
+                                  'type' => 'Pluf_DB_Field_Manytomany',
                                   'blank' => true,
                                   'model' => 'IDF_Tag',
                                   'verbose' => __('labels'),
                                   ),
-                            'status' => 
+                            'status' =>
                             array(
-                                  'type' => 'Pluf_DB_Field_Foreignkey', 
+                                  'type' => 'Pluf_DB_Field_Foreignkey',
                                   'blank' => false,
                                   'model' => 'IDF_Tag',
                                   'verbose' => __('status'),
@@ -111,7 +111,7 @@ class IDF_Issue extends Pluf_Model
                                   'verbose' => __('modification date'),
                                   ),
                             );
-        $this->_a['idx'] = array(                           
+        $this->_a['idx'] = array(
                             'modif_dtime_idx' =>
                             array(
                                   'col' => 'modif_dtime',
@@ -120,7 +120,7 @@ class IDF_Issue extends Pluf_Model
                             );
         $table = $this->_con->pfx.'idf_issue_idf_tag_assoc';
         $this->_a['views'] = array(
-                              'join_tags' => 
+                              'join_tags' =>
                               array(
                                     'join' => 'LEFT JOIN '.$table
                                     .' ON idf_issue_id=id',
@@ -164,11 +164,29 @@ class IDF_Issue extends Pluf_Model
         // that the issue as at least one comment in the database when
         // doing the indexing.
         if ($create) {
-            IDF_Timeline::insert($this, $this->get_project(), 
+            IDF_Timeline::insert($this, $this->get_project(),
                                  $this->get_submitter());
         }
     }
 
+    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.
@@ -177,12 +195,12 @@ class IDF_Issue extends Pluf_Model
      * as such create links to other items etc. You can consider that
      * if displayed, you can create a link to it.
      *
-     * @param Pluf_HTTP_Request 
+     * @param Pluf_HTTP_Request
      * @return Pluf_Template_SafeString
      */
     public function timelineFragment($request)
     {
-        $url = Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view', 
+        $url = Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view',
                                         array($request->project->shortname,
                                               $this->id));
         $out = '<tr class="log"><td><a href="'.$url.'">'.
@@ -193,14 +211,14 @@ class IDF_Issue extends Pluf_Model
         $ic = (in_array($this->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o';
         $out .= sprintf(__('<a href="%1$s" class="%2$s" title="View issue">Issue %3$d</a>, %4$s'), $url, $ic, $this->id, Pluf_esc($this->summary)).'</td>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Creation of <a href="%s" class="%s">issue&nbsp;%d</a>, by %s'), $url, $ic, $this->id, $user).'</div></td></tr>'; 
+<div class="helptext right">'.sprintf(__('Creation of <a href="%s" class="%s">issue&nbsp;%d</a>, by %s'), $url, $ic, $this->id, $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
     public function feedFragment($request)
     {
         $url = Pluf::f('url_base')
-            .Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view', 
+            .Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view',
                                       array($request->project->shortname,
                                             $this->id));
         $title = sprintf(__('%s: Issue %d created - %s'),
@@ -241,15 +259,17 @@ class IDF_Issue extends Pluf_Model
         $prj = $this->get_project();
         $to_email = array();
         if ('' != $conf->getVal('issues_notification_email', '')) {
-            $langs = Pluf::f('languages', array('en'));
-            $to_email[] = array($conf->getVal('issues_notification_email'),
-                                $langs[0]);
+            $langs     = Pluf::f('languages', array('en'));
+            $addresses = explode(',', $conf->getVal('issues_notification_email'));
+            foreach ($addresses as $address) {
+                $to_email[] = array($address, $langs[0]);
+            }
         }
         $current_locale = Pluf_Translation::getLocale();
         $id = '<'.md5($this->id.md5(Pluf::f('secret_key'))).'@'.Pluf::f('mail_host', 'localhost').'>';
         if ($create) {
-            if (null != $this->get_owner() and $this->owner != $this->submitter) {                
-                $email_lang = array($this->get_owner()->email, 
+            if (null != $this->get_owner() and $this->owner != $this->submitter) {
+                $email_lang = array($this->get_owner()->email,
                                     $this->get_owner()->language);
                 if (!in_array($email_lang, $to_email)) {
                     $to_email[] = $email_lang;

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
@@ -41,9 +41,9 @@ class IDF_IssueComment extends Pluf_Model
                             'id' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Sequence',
-                                  'blank' => true, 
+                                  'blank' => true,
                                   ),
-                            'issue' => 
+                            'issue' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'IDF_Issue',
@@ -57,7 +57,7 @@ class IDF_IssueComment extends Pluf_Model
                                   'blank' => false,
                                   'verbose' => __('comment'),
                                   ),
-                            'submitter' => 
+                            'submitter' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'Pluf_User',
@@ -79,7 +79,7 @@ class IDF_IssueComment extends Pluf_Model
                                   'verbose' => __('creation date'),
                                   ),
                             );
-        $this->_a['idx'] = array(                           
+        $this->_a['idx'] = array(
                             'creation_dtime_idx' =>
                             array(
                                   'col' => 'creation_dtime',
@@ -119,7 +119,7 @@ class IDF_IssueComment extends Pluf_Model
             $sql = new Pluf_SQL('issue=%s', array($this->issue));
             $co = Pluf::factory('IDF_IssueComment')->getList(array('filter'=>$sql->gen()));
             if ($co->count() > 1) {
-                IDF_Timeline::insert($this, $this->get_issue()->get_project(), 
+                IDF_Timeline::insert($this, $this->get_issue()->get_project(),
                                      $this->get_submitter());
             }
         }
@@ -129,7 +129,7 @@ class IDF_IssueComment extends Pluf_Model
     public function timelineFragment($request)
     {
         $issue = $this->get_issue();
-        $url = Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view', 
+        $url = Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view',
                                         array($request->project->shortname,
                                               $issue->id));
         $url .= '#ic'.$this->id;
@@ -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);
                 }
@@ -168,7 +177,7 @@ class IDF_IssueComment extends Pluf_Model
         }
         $out .= '</td></tr>';
         $out .= "\n".'<tr class="extra"><td colspan="2">
-<div class="helptext right">'.sprintf(__('Comment on <a href="%s" class="%s">issue&nbsp;%d</a>, by %s'), $url, $ic, $issue->id, $user).'</div></td></tr>'; 
+<div class="helptext right">'.sprintf(__('Comment on <a href="%s" class="%s">issue&nbsp;%d</a>, by %s'), $url, $ic, $issue->id, $user).'</div></td></tr>';
         return Pluf_Template::markSafe($out);
     }
 
@@ -176,7 +185,7 @@ class IDF_IssueComment extends Pluf_Model
     {
         $issue = $this->get_issue();
         $url = Pluf::f('url_base')
-            .Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view', 
+            .Pluf_HTTP_URL_urlForView('IDF_Views_Issue::view',
                                       array($request->project->shortname,
                                             $issue->id));
         $title = sprintf(__('%s: Comment on issue %d - %s'),
@@ -196,4 +205,9 @@ class IDF_IssueComment extends Pluf_Model
         $tmpl = new Pluf_Template('idf/issues/feedfragment.xml');
         return $tmpl->render($context);
     }
+
+    public function get_submitter_data()
+    {
+        return IDF_UserData::factory($this->get_submitter());
+    }
 }

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
@@ -39,9 +39,9 @@ class IDF_IssueFile extends Pluf_Model
                             array(
                                   'type' => 'Pluf_DB_Field_Sequence',
                                   //It is automatically added.
-                                  'blank' => true, 
+                                  'blank' => true,
                                   ),
-                            'comment' => 
+                            'comment' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'IDF_IssueComment',
@@ -49,7 +49,7 @@ class IDF_IssueFile extends Pluf_Model
                                   'verbose' => __('comment'),
                                   'relate_name' => 'attachment',
                                    ),
-                            'submitter' => 
+                            'submitter' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'Pluf_User',
@@ -63,7 +63,7 @@ class IDF_IssueFile extends Pluf_Model
                                   'size' => 100,
                                   'verbose' => __('file name'),
                                   ),
-                            'attachment' => 
+                            'attachment' =>
                             array(
                                   'type' => 'Pluf_DB_Field_File',
                                   'blank' => false,
@@ -76,7 +76,7 @@ class IDF_IssueFile extends Pluf_Model
                                   'verbose' => __('file size'),
                                   'help_text' => 'Size in bytes.',
                                   ),
-                            'type' => 
+                            'type' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Varchar',
                                   'blank' => false,
@@ -111,7 +111,7 @@ class IDF_IssueFile extends Pluf_Model
             $file = Pluf::f('upload_issue_path').'/'.$this->attachment;
             $this->filesize = filesize($file);
             // remove .dummy
-            $this->filename = substr(basename($file), 0, -6); 
+            $this->filename = substr(basename($file), 0, -6);
             $img_extensions = array('jpeg', 'jpg', 'png', 'gif');
             $info = pathinfo($this->filename);
             if (!isset($info['extension'])) $info['extension'] = '';
@@ -128,4 +128,10 @@ class IDF_IssueFile extends Pluf_Model
     {
         @unlink(Pluf::f('upload_issue_path').'/'.$this->attachment);
     }
+
+    function isText()
+    {
+        $info = IDF_FileUtil::getMimeType($this->filename);
+        return IDF_FileUtil::isText($info);
+    }
 }

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
@@ -22,7 +22,7 @@
 # ***** END LICENSE BLOCK ***** */
 
 /**
- * Storage of the SSH keys.
+ * Storage of the public keys (ssh or monotone).
  *
  */
 class IDF_Key extends Pluf_Model
@@ -39,9 +39,9 @@ class IDF_Key extends Pluf_Model
                             array(
                                   'type' => 'Pluf_DB_Field_Sequence',
                                   //It is automatically added.
-                                  'blank' => true, 
+                                  'blank' => true,
                                   ),
-                            'user' => 
+                            'user' =>
                             array(
                                   'type' => 'Pluf_DB_Field_Foreignkey',
                                   'model' => 'Pluf_User',
@@ -52,14 +52,14 @@ class IDF_Key extends Pluf_Model
                             array(
                                   'type' => 'Pluf_DB_Field_Text',
                                   'blank' => false,
-                                  'verbose' => __('ssh key'),
+                                  'verbose' => __('public key'),
                                   ),
                             );
         // WARNING: Not using getSqlTable on the Pluf_User object to
         // avoid recursion.
-        $t_users = $this->_con->pfx.'users'; 
+        $t_users = $this->_con->pfx.'users';
         $this->_a['views'] = array(
-                              'join_user' => 
+                              'join_user' =>
                               array(
                                     'join' => 'LEFT JOIN '.$t_users
                                     .' ON '.$t_users.'.id='.$this->_con->qn('user'),
@@ -75,6 +75,61 @@ class IDF_Key extends Pluf_Model
         return Pluf_Template::markSafe(Pluf_esc(substr($this->content, 0, 25)).' [...] '.Pluf_esc(substr($this->content, -55)));
     }
 
+    private function parseContent()
+    {
+        if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {
+            return array('mtn', $m[1], $m[2]);
+        }
+        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]);
+        }
+
+        throw new Exception(__('Invalid or unknown key data detected.'));
+    }
+
+    /**
+     * Returns the type of the public key
+     *
+     * @return string 'ssh' or 'mtn'
+     */
+    function getType()
+    {
+        list($type, , ) = $this->parseContent();
+        return $type;
+    }
+
+    /**
+     * Returns the key name of the key
+     *
+     * @return string
+     */
+    function getName()
+    {
+        list(, $keyName, ) = $this->parseContent();
+        return $keyName;
+    }
+
+    /**
+     * This function should be used to calculate the key id from the
+     * public key hash for authentication purposes. This avoids clashes
+     * in case the key name is not unique across the project
+     *
+     * And yes, this is actually how monotone itself calculates the key
+     * id...
+     *
+     * @return string
+     */
+    function getMtnId()
+    {
+        list($type, $keyName, $keyData) = $this->parseContent();
+        if ($type != 'mtn')
+            throw new Exception('key is not a monotone public key');
+        return sha1($keyName.":".$keyData);
+    }
+
     function postSave($create=false)
     {
         /**
@@ -89,7 +144,7 @@ class IDF_Key extends Pluf_Model
          * [description]
          *
          * This signal allows an application to perform special
-         * operations after the saving of a SSH Key.
+         * operations after the saving of a public Key.
          *
          * [parameters]
          *
@@ -127,5 +182,4 @@ class IDF_Key extends Pluf_Model
         Pluf_Signal::send('IDF_Key::preDelete',
                           'IDF_Key', $params);
     }
-
 }

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
@@ -44,7 +44,7 @@ class IDF_Middleware
     function process_request(&$request)
     {
         $match = array();
-        if (preg_match('#^/(?:api/p|p)/([\-\w]+)/?#', $request->query, $match)) {
+        if (preg_match('#^/(?:api/p|p|r)/([\-\w]+)/?#', $request->query, $match)) {
             try {
                 $request->project = IDF_Project::getOr404($match[1]);
             } catch (Pluf_HTTP_Error404 $e) {
@@ -87,11 +87,13 @@ 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(
                                    'size' => 'IDF_Views_Source_PrettySize',
                                    'ssize' => 'IDF_Views_Source_PrettySizeSimple',
+                                   'shorten' => 'IDF_Views_Source_ShortenString',
                                                  ));
     }
 }
@@ -104,12 +106,14 @@ function IDF_Middleware_ContextPreProcessor($request)
     $c['isAdmin'] = ($request->user->administrator or $request->user->staff);
     if (isset($request->project)) {
         $c['project'] = $request->project;
-        $c['isOwner'] = $request->user->hasPerm('IDF.project-owner', 
+        $c['isOwner'] = $request->user->hasPerm('IDF.project-owner',
                                                 $request->project);
-        $c['isMember'] = $request->user->hasPerm('IDF.project-member', 
+        $c['isMember'] = $request->user->hasPerm('IDF.project-member',
                                                  $request->project);
         $c = array_merge($c, $request->rights);
     }
+    $c['usherConfigured'] = Pluf::f("mtn_usher_conf", null) !== null;
+    $c['allProjects'] = IDF_Views::getProjects($request->user);
     return $c;
 }
 

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

@@ -0,0 +1,53 @@
+<?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_Queue model.
+ *
+ */
+
+function IDF_Migrations_14Queue_up($params=null)
+{
+    $models = array(
+                    'IDF_Queue',
+                    );
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    foreach ($models as $model) {
+        $schema->model = new $model();
+        $schema->createTables();
+    }
+}
+
+function IDF_Migrations_14Queue_down($params=null)
+{
+    $models = array(
+                    'IDF_Queue',
+                    );
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    foreach ($models as $model) {
+        $schema->model = new $model();
+        $schema->dropTables();
+    }
+}

src/IDF/Migrations/15AddGconf.php

@@ -0,0 +1,53 @@
+<?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_15AddGconf_up($params=null)
+{
+    $models = array(
+                    'IDF_Gconf',
+                    );
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    foreach ($models as $model) {
+        $schema->model = new $model();
+        $schema->createTables();
+    }
+}
+
+function IDF_Migrations_15AddGconf_down($params=null)
+{
+    $models = array(
+                    'IDF_Gconf',
+                    );
+    $db = Pluf::db();
+    $schema = new Pluf_DB_Schema($db);
+    foreach ($models as $model) {
+        $schema->model = new $model();
+        $schema->dropTables();
+    }
+}

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
@@ -51,6 +51,10 @@ function IDF_Migrations_Backup_run($folder, $name=null)
                     'IDF_Review_FileComment',
                     'IDF_Key',
                     '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
@@ -94,6 +98,10 @@ function IDF_Migrations_Backup_restore($folder, $name)
                     'IDF_Review_FileComment',
                     'IDF_Key',
                     'IDF_Scm_Cache_Git',
+                    'IDF_Queue',
+                    'IDF_Gconf',
+                    'IDF_EmailAddress',
+                    'IDF_IssueRelation',
                     );
     $db = Pluf::db();
     $schema = new Pluf_DB_Schema($db);
@@ -106,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
@@ -48,6 +48,10 @@ function IDF_Migrations_Install_setup($params=null)
                     'IDF_Review_FileComment',
                     'IDF_Key',
                     'IDF_Scm_Cache_Git',
+                    'IDF_Queue',
+                    'IDF_Gconf',
+                    'IDF_EmailAddress',
+                    'IDF_IssueRelation',
                     );
     $db = Pluf::db();
     $schema = new Pluf_DB_Schema($db);
@@ -85,6 +89,8 @@ function IDF_Migrations_Install_teardown($params=null)
     $perm = Pluf_Permission::getFromString('IDF.project-authorized-user');
     if ($perm) $perm->delete();
     $models = array(
+                    'IDF_Gconf',
+                    'IDF_Queue',
                     'IDF_Scm_Cache_Git',
                     'IDF_Key',
                     'IDF_Review_FileComment',
@@ -103,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);
@@ -110,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
@@ -48,13 +48,28 @@ class IDF_Plugin_SyncGit_Cron
         $out = '';
         $keys = Pluf::factory('IDF_Key')->getList(array('view'=>'join_user'));
         foreach ($keys as $key) {
-            if (strlen($key->content) > 40 // minimal check
-                and preg_match('/^[a-zA-Z][a-zA-Z0-9_.-]*(@[a-zA-Z][a-zA-Z0-9.-]*)?$/', $key->login)) {
+            try {
+                $key_type = $key->getType();
+            } catch (Exception $e) {
+                // The key is a bad key, skip it
+                continue;
+            }
+            if ($key_type == 'ssh' and preg_match('/^[a-zA-Z][a-zA-Z0-9_.-]*(@[a-zA-Z][a-zA-Z0-9.-]*)?$/', $key->login)) {
                 $content = trim(str_replace(array("\n", "\r"), '', $key->content));
                 $out .= sprintf($template, $cmd, $key->login, $content)."\n";
             }
         }
-        file_put_contents($authorized_keys, $out, LOCK_EX);        
+        $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);
     }
 
     /**
@@ -99,6 +114,7 @@ class IDF_Plugin_SyncGit_Cron
         if (count($orphans)) {
             $cmd = Pluf::f('idf_exec_cmd_prefix', '').'rm -rf '.implode(' ', $orphans);
             exec($cmd);
+            clearstatcache();
             while (list(, $project) = each($orphans)) {
                 if (is_dir($project)) {
                     throw new Exception(sprintf('Cannot remove %s directory.', $project));