[evolvis-commits] r17726: bm:taramir51/upstream pending merges:↵ Roland Mas 2011-11-16 Merged from Evolvis: translations↵ Roland Mas 2011-11-16 Merged from Evolvis: fix XHTML errors↵ Roland Mas 2011-11-16 Inspired from Evolvis: better handling of timezone settings↵ aljeux 2011-11-21 Add support for mediawiki in RPM, drop old mediawiki patches.↵ aljeux 2011-11-21 Set executable mode for cron jobs↵ olberger 2011-11-21 Update on apache configuration documentation↵ olberger 2011-11-21 Add a README.Debian for gforge-web-apache2↵ olberger 2011-11-21 Support generation of README.Debian for packages different from the default one↵ olberger 2011-11-21 Fix path (only regenerated from template)↵ olberger 2011-11-21 Do not ship httpd.conf.d README files and likes : only .conf and .inc files↵ olberger 2011-11-21 Add more docs and README files about generated apache conf files↵ aljeux 2011-11-20 Use alternative vztemplate↵ Roland Mas 2011-11-16 Fixed syntax error↵ Roland Mas 2011-11-16 Merged from Evolvis: make {set,delete}Preference method’s return value act...↵ Roland Mas 2011-11-16 Merged from Evolvis: more XHTML↵ Roland Mas 2011-11-15 Merged from Evolvis: prevent PHP error↵ Roland Mas 2011-11-15 Merged from Evolvis: fix XHTML: prevent <select></select> without <option/...↵ Roland Mas 2011-11-15 Merged from Evolvis: insert a BIG RED WARNING about what “Upload CSV” does↵ Roland Mas 2011-11-15 Merged from Evolvis: fix more PHP errors↵ Roland Mas 2011-11-15 Merged from Evolvis: more php error fixes↵ Roland Mas 2011-11-15 Merged from Evolvis: better error msg↵ Roland Mas 2011-11-15 Merged from Evolvis: php errors/warnings↵ Roland Mas 2011-11-09 Merged from Evolvis: more XHTML fixes: Collapse one or more <br/> into one...↵ Roland Mas 2011-11-09 Merged from Evolvis: revert bad part of r17109 (this isn’t XHTML anyway)↵ Roland Mas 2011-11-09 Merged from Evolvis: Some DTD XHTML 1.0 Transitional validity fixes↵ mirabilos 2011-11-04 drop unused file

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Nov 25 17:20:34 CET 2011


Author: mirabilos
Date: 2011-11-25 17:20:34 +0100 (Fri, 25 Nov 2011)
New Revision: 17726

Added:
   trunk/gforge_base/evolvisforge-5.1/src/packaging/readme/
   trunk/gforge_base/evolvisforge-5.1/src/packaging/readme/web-apache2
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/cron.d/
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/cron.d/fusionforge-plugin-mediawiki
   trunk/gforge_base/evolvisforge-5.1/tests/config/build
Removed:
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/opener_tasks.js
Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Jabber.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/session.php
   trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTasksForUser.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/import_utils.php
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/debian/rules
   trunk/gforge_base/evolvisforge-5.1/src/etc/README.httpd-conf-d-flavours
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf-fhs
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/01-namevhost.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/02-config-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/10-vhosts-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/README.generated
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/projects-in-mainvhost.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-main.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-projects.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/01-namevhost.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/02-config-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/10-vhosts-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/README.generated
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/projects-in-mainvhost.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-main.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-projects.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/01-namevhost.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/02-config-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/10-vhosts-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/README.generated
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/projects-in-mainvhost.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-main.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-projects.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/01-namevhost.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/02-config-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/10-vhosts-main.conf
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-main.inc
   trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-projects.inc
   trunk/gforge_base/evolvisforge-5.1/src/fusionforge.spec
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-imagedirs.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/diff.ezt
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/include/diff_form.ezt
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/query.ezt
   trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/revision.ezt
   trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
   trunk/gforge_base/evolvisforge-5.1/src/utils/fixscripts/tools_data_cleanup.php
   trunk/gforge_base/evolvisforge-5.1/src/utils/manage-apache-config.sh
   trunk/gforge_base/evolvisforge-5.1/src/www/account/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/account/lostpw.php
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/responses_admin.php
   trunk/gforge_base/evolvisforge-5.1/src/www/export/rssAboTask.php
   trunk/gforge_base/evolvisforge-5.1/src/www/forum/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
   trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/new/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/people/createjob.php
   trunk/gforge_base/evolvisforge-5.1/src/www/people/editprofile.php
   trunk/gforge_base/evolvisforge-5.1/src/www/people/viewprofile.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/postuploadcsv.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/uploadcsv.php
   trunk/gforge_base/evolvisforge-5.1/src/www/project/admin/editimages.php
   trunk/gforge_base/evolvisforge-5.1/src/www/reporting/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/docroot/help_rootview.html
   trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/query_results.ezt
   trunk/gforge_base/evolvisforge-5.1/src/www/soap/nusoap.php
   trunk/gforge_base/evolvisforge-5.1/src/www/softwaremap/tag_cloud.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/viewvc/help_rootview.html
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-updatetracker.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php
   trunk/gforge_base/evolvisforge-5.1/tests/config/default
   trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh
Log:
bm:taramir51/upstream pending merges:
  Roland Mas 2011-11-16 Merged from Evolvis: translations
    Roland Mas 2011-11-16 Merged from Evolvis: fix XHTML errors
    Roland Mas 2011-11-16 Inspired from Evolvis: better handling of timezone settings
    aljeux 2011-11-21 Add support for mediawiki in RPM, drop old mediawiki patches.
    aljeux 2011-11-21 Set executable mode for cron jobs
    olberger 2011-11-21 Update on apache configuration documentation
    olberger 2011-11-21 Add a README.Debian for gforge-web-apache2
    olberger 2011-11-21 Support generation of README.Debian for packages different from the default one
    olberger 2011-11-21 Fix path (only regenerated from template)
    olberger 2011-11-21 Do not ship httpd.conf.d README files and likes : only .conf and .inc files
    olberger 2011-11-21 Add more docs and README files about generated apache conf files
    aljeux 2011-11-20 Use alternative vztemplate
    Roland Mas 2011-11-16 Fixed syntax error
    Roland Mas 2011-11-16 Merged from Evolvis: make {set,delete}Preference method’s return value act...
    Roland Mas 2011-11-16 Merged from Evolvis: more XHTML
    Roland Mas 2011-11-15 Merged from Evolvis: prevent PHP error
    Roland Mas 2011-11-15 Merged from Evolvis: fix XHTML: prevent <select></select> without <option/...
    Roland Mas 2011-11-15 Merged from Evolvis: insert a BIG RED WARNING about what “Upload CSV” does
    Roland Mas 2011-11-15 Merged from Evolvis: fix more PHP errors
    Roland Mas 2011-11-15 Merged from Evolvis: more php error fixes
    Roland Mas 2011-11-15 Merged from Evolvis: better error msg
    Roland Mas 2011-11-15 Merged from Evolvis: php errors/warnings
    Roland Mas 2011-11-09 Merged from Evolvis: more XHTML fixes: Collapse one or more <br/> into one...
    Roland Mas 2011-11-09 Merged from Evolvis: revert bad part of r17109 (this isn’t XHTML anyway)
    Roland Mas 2011-11-09 Merged from Evolvis: Some DTD XHTML 1.0 Transitional validity fixes
    mirabilos 2011-11-04 drop unused file


Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/ForumHTML.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -511,7 +511,7 @@
 			<br />
 		<strong><?php echo _('Subject:'); ?></strong><?php echo utils_requiredField(); ?><br />
 				<input type="text" name="subject" value="<?php echo $subject; ?>" size="80" maxlength="80" />
-		<br /><br />
+		<br />
 		<strong><?php echo _('Message:'); ?></strong><?php echo notepad_button('document.forms.ForumEditForm.body') ?><?php echo utils_requiredField(); ?><br />
 		<?php
 		$GLOBALS['editor_was_set_up']=false;
@@ -527,7 +527,7 @@
 		}
 		unset($GLOBALS['editor_was_set_up']);
 				?>
-			<br /><br />		
+			<br />
 
 				<p>
 				<?php //$this->LinkAttachForm();?>
@@ -575,7 +575,7 @@
 			<br />
 		<strong><?php echo _('Subject:'); ?></strong><?php echo utils_requiredField(); ?><br />
 				<input type="text" name="subject" value="<?php echo $subject; ?>" size="80" maxlength="80" />
-			<br /><br />
+			<br />
 		<strong><?php echo _('Message:'); ?></strong><?php echo notepad_button('document.forms.ForumPostForm.body') ?><?php echo utils_requiredField(); ?><br />
 
 		<?php

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1626,7 +1626,8 @@
 			$sql='INSERT INTO project_tags (group_id,name) VALUES ($1, $2)';
 			$res=db_query_params($sql, array($this->getID(), $tag));
 			if (!$res) {
-				$this->setError(_('Setting tags: ').db_error());
+				$this->setError(_('Setting tags:') . ' ' .
+				    db_error());
 				db_rollback();
 				return false;
 			}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Jabber.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Jabber.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Jabber.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -234,7 +234,7 @@
 		
 		if ($this->enable_logging) {
 			echo "<h2>logging enabled, logged events below:</h2>\n";
-			echo (count($this->logfile) > 0) ? implode("<br /><br />\n", $this->logfile) : "No logged events.";
+			echo (count($this->logfile) > 0) ? implode("<br />\n", $this->logfile) : "No logged events.";
 		}
 	}
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1222,7 +1222,7 @@
 		$res = db_query_params ('DELETE FROM user_preferences WHERE user_id=$1 AND preference_name=$2',
 					array ($this->getID(),
 					       $preference_name)) ;
-		return $res;
+		return ((!$res || db_affected_rows($res) < 1) ? false : true);
 	}
 
 	/**
@@ -1253,9 +1253,9 @@
 								  $preference_name,
 								  $value,
 								  time())) ;
-				return $result;
 			}
 		}
+		return ((!$result || db_affected_rows($result) < 1) ? false : true);
 	}
 
 	/**

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/pre.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -310,12 +310,12 @@
 	// and setup theme
 	if (session_loggedin()) {
 		$LUSER =& session_get_user();
-		putenv ('TZ='. $LUSER->getTimeZone());
 		header ('Cache-Control: private');
 		require_once forge_get_config('themes_root').'/'.$LUSER->setUpTheme().'/Theme.class.php';
 	} else {
 		require_once forge_get_config('themes_root').'/'.forge_get_config('default_theme').'/Theme.class.php';
 	}
+	setup_tz_from_context();
 	$HTML = new Theme () ;
 } else {		     // Script run from cron or a command line
 	require_once $gfcommon.'include/squal_exit.php';

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/session.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/session.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/session.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -618,15 +618,26 @@
 	$session_ser = $sessionKey;
 	session_set();
 	setup_gettext_from_context();
+	setup_tz_from_context();
 	$LUSER =& session_get_user();
 	if (!is_object($LUSER) || $LUSER->isError()) {
 		return false;
 	} else {
-		putenv('TZ='. $LUSER->getTimeZone());
 		return true;
 	}
 }
 
+function setup_tz_from_context() {
+	$LUSER =& session_get_user();
+	if (!is_object($LUSER) || $LUSER->isError()) {
+		$tz = forge_get_config('default_timezone');
+	} else {
+		$tz = $LUSER->getTimeZone();
+	}
+	putenv ('TZ='. $tz);
+	date_default_timezone_set($tz);
+}	
+
 /**
  *	session_get_user() - Wrapper function to return the User object for the logged in user.
  *	

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/utils.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -568,7 +568,7 @@
 				echo ' checked="checked"';
 			}
 		}
-		echo '/> '.$options[$i];
+		echo ' /> '.$options[$i];
 	}
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTask.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -27,7 +27,7 @@
 require_once $gfcommon.'include/Error.class.php';
 require_once $gfcommon.'include/Validator.class.php';
 
-function &projecttask_get_object($project_task_id,$data=false) {
+function projecttask_get_object($project_task_id,$data=false) {
 		global $PROJECTTASK_OBJ;
 		if (!isset($PROJECTTASK_OBJ["_".$project_task_id."_"])) {
 			if ($data) {
@@ -1063,7 +1063,10 @@
 				}
 				$has_changes = true;
 		}
-		$old_array = array_keys($this->getDependentOn());			
+		$old_array = array_keys($this->getDependentOn());
+		if (!is_array($depend_arr)) {
+			$depend_arr = array();
+		}
 		$diff_array=array_diff($old_array,array_keys($depend_arr));
 		if (count($diff_array)>0) { 
 			for ($tmp=0;$tmp<count($old_array);$tmp++) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTasksForUser.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTasksForUser.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectTasksForUser.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -60,7 +60,7 @@
 		for ($i=0; $i < $rows; $i++) {
 			$project_task_id = db_result($result,$i,'project_task_id');
 			$arr = db_fetch_array($result);
-			$task =& projecttask_get_object($project_task_id,$arr);
+			$task = projecttask_get_object($project_task_id,$arr);
 			$tasks[] =& $task;
 		}
 		return $tasks;

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/import_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/import_utils.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/import_utils.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -47,6 +47,9 @@
 }
 
 function &pm_import_tasks($group_project_id,&$tasks) {
+	$was_error = false;
+	$foo = "";
+
 	printr($tasks,'MSPCheckin::in-array');
 	printr(getenv('TZ'),'MSPCheckin::entry TZ');
 
@@ -79,7 +82,7 @@
 			$resrc = $tasks[$i]['resources'];
 			for ($j=0; $j<count($resrc); $j++) {
 				//validate user - see if they really exist as techs in this subproject
-				if (!$tarr[strtolower($resrc[$j]['user_name'])]) {
+				if (!util_ifsetor($tarr[strtolower($resrc[$j]['user_name'])])) {
 					//create list of bogus names to send back
 					if (array_search(strtolower($resrc[$j]['user_name']),$invalid_names) === false) {
 						$invalid_names[]=$resrc[$j]['user_name'];
@@ -93,7 +96,10 @@
 		//
 		if (count($invalid_names)) {
 			$array['success']=false;
-			$array['errormessage']='Invalid Resource Name';
+			$array['errormessage']='Invalid Resource Name:';
+			foreach ($invalid_names as $i) {
+				$array['errormessage'] .= ' ' . $i;
+			}
 			$array['resourcename']=$invalid_names;
 			for ($i=0; $i<$tcount; $i++) {
 				$array['usernames'][$techs[$i]->getID()]=$techs[$i]->getUnixName();
@@ -197,7 +203,7 @@
 				} else {
 					//update existing task
 					//create the task
-					$pt = &projecttask_get_object($tasks[$i]['id']);
+					$pt = projecttask_get_object($tasks[$i]['id']);
 					if (!$pt || !is_object($pt)) {
 						printr($tasks[$i]['id'],'Could not get task');
 					//	$array['success']=false;
@@ -316,7 +322,7 @@
 						$deps[$id]=$darr[$dcount]['link_type'];
 					}
 					printr($deps,'Deps for task id: '.$tasks[$i]['id']);
-					if (is_object($tasks[$i]['obj'])) {
+					if (isset($tasks[$i]['obj']) && is_object($tasks[$i]['obj'])) {
 						printr($deps,'11 Done Setting deps for task id: '.$tasks[$i]['id']);
 						if (!$tasks[$i]['obj']->setDependentOn($deps)) {
 							$was_error=true;
@@ -340,11 +346,11 @@
 			//
 			printr($was_error,'Right before deleting unreferenced tasks');
 			if (!$was_error) {
-				$ptf =& new ProjectTaskFactory($pg);
+				$ptf = new ProjectTaskFactory($pg);
 				$pt_arr=& $ptf->getTasks();
 				for ($i=0; $i<count($pt_arr); $i++) {
 					if (is_object($pt_arr[$i])) {
-						if (!$completed[$pt_arr[$i]->getID()]) {
+						if (!util_ifsetor($completed[$pt_arr[$i]->getID()])) {
 							printr($pt_arr[$i]->getID(),'Deleting task');
 							if (!$pt_arr[$i]->delete(true)) {
 								echo $pt_arr[$i]->getErrorMessage();

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-11-25 16:20:34 UTC (rev 17726)
@@ -38,6 +38,12 @@
 
  -- Thorsten Glaser <t.glaser at tarent.de>  Wed, 09 Nov 2011 10:57:22 +0100
 
+fusionforge (5.1.1-3) UNRELEASED; urgency=low
+
+  * Add new README.Debian for gforge-web-apache2 specifically.
+
+ -- Olivier Berger <obergix at debian.org>  Mon, 21 Nov 2011 17:33:28 +0100
+
 fusionforge (5.1.1-2) unstable; urgency=low
 
   * New upstream SVN snapshot.

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/rules	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/rules	2011-11-25 16:20:34 UTC (rev 17726)
@@ -49,6 +49,9 @@
 		$(patsubst packaging/docs/%,debian/$(PACKAGE)-%.docs,$(wildcard packaging/docs/[a-z]*))
 PDOCSFILES=$(foreach i,$(ENABLED_PLUGINS),$(if $(wildcard plugins/$i/packaging/docs/[a-z]*),debian/$(PACKAGE)-plugin-$i.docs))
 
+READMEFILES=$(patsubst packaging/readme/%,debian/$(OLDPACKAGE)-%.README.Debian,$(wildcard packaging/readme/[a-z]*)) \
+		$(patsubst packaging/readme/%,debian/$(PACKAGE)-%.README.Debian,$(wildcard packaging/readme/[a-z]*))
+
 POFILES=$(patsubst debian/dsf-po/%,debian/po/%,$(wildcard debian/dsf-po/*) debian/po/POTFILES.in)
 
 testpat:
@@ -62,6 +65,7 @@
 	@echo "LINKSFILES=$(LINKSFILES)"
 	@echo "INSTALLFILES=$(INSTALLFILES)"
 	@echo "DOCSFILES=$(DOCSFILES)"
+	@echo "READMEFILES=$(READMEFILES)"
 	@echo ""
 	@echo "PCRONDFILES=$(PCRONDFILES)"
 	@echo "PDIRSFILES=$(PDIRSFILES)"
@@ -73,7 +77,7 @@
 	sh $(CURDIR)/deb-specific/manage-uufiles.sh clean
 
 .PHONY: conffiles
-conffiles: $(PPOSTINST) $(PPRERM) $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) $(PCRONDFILES) $(PDIRSFILES) $(PLINKSFILES) $(PINSTALLFILES) $(PDOCSFILES) debian/control
+conffiles: $(PPOSTINST) $(PPRERM) $(CRONDFILES) $(DIRSFILES) $(LINKSFILES) $(INSTALLFILES) $(DOCSFILES) $(READMEFILES) $(PCRONDFILES) $(PDIRSFILES) $(PLINKSFILES) $(PINSTALLFILES) $(PDOCSFILES) debian/control
 
 debian/$(PACKAGE)-plugin-%.postinst:
 	export PLUGLONGNAME="`cat $(CURDIR)/plugins/$*/NAME`"; $(SED_REPLACE) -e 's/@PLUGSHORTNAME@/$*/g' -e "s/@PLUGLONGNAME@/$$PLUGLONGNAME/g" $(CURDIR)/debian/dsf-in/plugin.postinst > $@
@@ -113,6 +117,11 @@
 debian/$(PACKAGE)-%.docs:
 	$(SED_REPLACE) $(CURDIR)/packaging/docs/$* > $@
 
+debian/$(OLDPACKAGE)-%.README.Debian:
+	$(SED_REPLACE) $(CURDIR)/packaging/readme/$* > $@
+debian/$(PACKAGE)-%.README.Debian:
+	$(SED_REPLACE) $(CURDIR)/packaging/readme/$* > $@
+
 debian/control: $(wildcard packaging/control/*) $(wildcard plugins/*/packaging/control/[1-9][0-9][0-9]*)
 	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | $(SED_REPLACE) > $@
 	@echo Enabled plugins: $(ENABLED_PLUGINS)
@@ -157,6 +166,7 @@
 	rm -f $(CURDIR)/debian/*.links
 	rm -f $(CURDIR)/debian/*.install
 	rm -f $(CURDIR)/debian/*.docs
+	rm -f $(CURDIR)/debian/*.README.Debian
 	rm -f $(CURDIR)/debian/$(PACKAGE)-config.sgml
 	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-common.manpages
 	rm -f cvssh.1 $(PACKAGE)-config.1
@@ -194,7 +204,9 @@
 
 # Rename config files
 	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(PACKAGE)/config.ini-fhs $(CURDIR)/debian/$(OLDPACKAGE)-common/etc/$(PACKAGE)/config.ini
-	cp -r $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d
+	mkdir -p $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d
+	cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs/*.conf $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d/
+	cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf.d-fhs/*.inc $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf.d/
 	cp $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/$(OLDPACKAGE)/etc/httpd.conf-fhs $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/etc/$(OLDPACKAGE)/httpd.conf
 	mv $(CURDIR)/debian/$(OLDPACKAGE)-common/usr/share/$(OLDPACKAGE)/etc/templates/httpd.vhosts $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2-vhosts/etc/$(OLDPACKAGE)/templates/
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/README.httpd-conf-d-flavours
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/README.httpd-conf-d-flavours	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/README.httpd-conf-d-flavours	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,8 +1,16 @@
+The following information may be helpful to developers.
+
 The different httpd.conf.d-*/ directories are *generated* out of
-contents of httpd.conf.d/.
+contents of 'httpd.conf.d/'. At the moment, there are 3 flavours of
+these files ("fhs", "opt" and "usrlocal").
 
-See src/utils/manage-apache-config.sh
+The script src/utils/manage-apache-config.sh must be used to
+regenerate the files for these flavours.
 
-Please make modifications in the source files inside httpd.conf.d/.
+Please make modifications in the source files inside 'httpd.conf.d/'
+and regenerate.
 
+More details available in :
+http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001074.html
+
 -- Olivier Berger

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf-fhs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf-fhs	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf-fhs	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,2 +1,5 @@
 # Include all FusionForge-related configuration files
+#
+# TODO: add a pointer to documentation about the Apache configuration of FusionForge
+#
 Include /etc/gforge/httpd.conf.d/*.conf

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/01-namevhost.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/01-namevhost.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/01-namevhost.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,2 +1,4 @@
+# Name-based Virtual Host Support : supports multiple websites over a single IP address
+
 NameVirtualHost {core/web_ip}:80
 NameVirtualHost {core/web_ip}:443

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/02-config-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/02-config-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/02-config-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,10 +1,11 @@
 #
-# Main directory options
+# Main directory options ({core/source_path}/www contains the PHP scripts of FusionForge)
 #
 <Directory {core/source_path}/www>
   Options Indexes FollowSymlinks
   AllowOverride All
   
+  # define access restrictions for the main site
   Include {core/config_path}/httpd.conf.d/auth-main.inc
   
   #

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/10-vhosts-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/10-vhosts-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/10-vhosts-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,6 +1,9 @@
 #
 # Main host
 #
+
+# Differences between HTTP and HTTPS are in ssl-on.inc/ssl-off.inc
+
 <VirtualHost {core/web_ip}:80>
   Include {core/config_path}/httpd.conf.d/vhost-main.inc
   Include {core/config_path}/httpd.conf.d/block-trace.inc

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-main.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-main.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-main.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,3 +1,6 @@
+
+# We are inside <VirtualHost ...>
+
 ServerName {core/web_host}
 ServerAlias www.{core/web_host}
 ServerAdmin webmaster@{core/web_host}
@@ -8,6 +11,7 @@
   UserDir disabled
 </IfModule>
 
+# Define configuration/env variables for passing passwords and other secrets to PHP
 <Directory {core/source_path}/www>
   Include {core/config_path}/httpd.conf.d/secrets.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-projects.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-projects.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d/vhost-projects.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,4 @@
-# per-project vhost content
+# per-project vhost content : myproject1.myforge.com, myproject2.myforge.com, etc.
 
 ServerName siteadmin.{core/web_host}
 ServerAlias *.{core/web_host}

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/01-namevhost.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/01-namevhost.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/01-namevhost.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,2 +1,4 @@
+# Name-based Virtual Host Support : supports multiple websites over a single IP address
+
 NameVirtualHost *:80
 NameVirtualHost *:443

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/02-config-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/02-config-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/02-config-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,10 +1,11 @@
 #
-# Main directory options
+# Main directory options (/usr/share/gforge/www contains the PHP scripts of FusionForge)
 #
 <Directory /usr/share/gforge/www>
   Options Indexes FollowSymlinks
   AllowOverride All
   
+  # define access restrictions for the main site
   Include /etc/gforge/httpd.conf.d/auth-main.inc
   
   #

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/10-vhosts-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/10-vhosts-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/10-vhosts-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,6 +1,9 @@
 #
 # Main host
 #
+
+# Differences between HTTP and HTTPS are in ssl-on.inc/ssl-off.inc
+
 <VirtualHost *:80>
   Include /etc/gforge/httpd.conf.d/vhost-main.inc
   Include /etc/gforge/httpd.conf.d/block-trace.inc

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/README.generated
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/README.generated	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/README.generated	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,6 @@
-Attention : contents of this directory are *generated files*.
+Attention developers : contents of this directory are *generated
+files* for FHS like paths.
 
 See ../README.httpd-conf-d-flavours for more details
 
+-- OlivierBerger

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/projects-in-mainvhost.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/projects-in-mainvhost.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/projects-in-mainvhost.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -7,5 +7,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include /etc/gforge/httpd.conf.d/auth.projects.inc
+  Include /etc/gforge/httpd.conf.d/auth-projects.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-main.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-main.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-main.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,3 +1,6 @@
+
+# We are inside <VirtualHost ...>
+
 ServerName {core/web_host}
 ServerAlias www.{core/web_host}
 ServerAdmin webmaster@{core/web_host}
@@ -8,6 +11,7 @@
   UserDir disabled
 </IfModule>
 
+# Define configuration/env variables for passing passwords and other secrets to PHP
 <Directory /usr/share/gforge/www>
   Include /etc/gforge/httpd.conf.d/secrets.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-projects.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-projects.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-fhs/vhost-projects.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,4 @@
-# per-project vhost content
+# per-project vhost content : myproject1.myforge.com, myproject2.myforge.com, etc.
 
 ServerName siteadmin.{core/web_host}
 ServerAlias *.{core/web_host}

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/01-namevhost.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/01-namevhost.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/01-namevhost.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,2 +1,4 @@
+# Name-based Virtual Host Support : supports multiple websites over a single IP address
+
 NameVirtualHost *:80
 NameVirtualHost *:443

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/02-config-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/02-config-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/02-config-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,10 +1,11 @@
 #
-# Main directory options
+# Main directory options (/opt/gforge/www contains the PHP scripts of FusionForge)
 #
 <Directory /opt/gforge/www>
   Options Indexes FollowSymlinks
   AllowOverride All
   
+  # define access restrictions for the main site
   Include /etc/gforge/httpd.conf.d/auth-main.inc
   
   #

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/10-vhosts-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/10-vhosts-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/10-vhosts-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,6 +1,9 @@
 #
 # Main host
 #
+
+# Differences between HTTP and HTTPS are in ssl-on.inc/ssl-off.inc
+
 <VirtualHost *:80>
   Include /etc/gforge/httpd.conf.d/vhost-main.inc
   Include /etc/gforge/httpd.conf.d/block-trace.inc

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/README.generated
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/README.generated	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/README.generated	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,6 @@
-Attention : contents of this directory are *generated files*.
+Attention developers : contents of this directory are *generated
+files* for /opt like paths.
 
 See ../README.httpd-conf-d-flavours for more details
 
+-- OlivierBerger

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/projects-in-mainvhost.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/projects-in-mainvhost.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/projects-in-mainvhost.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -7,5 +7,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include /etc/gforge/httpd.conf.d/auth.projects.inc
+  Include /etc/gforge/httpd.conf.d/auth-projects.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-main.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-main.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-main.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,3 +1,6 @@
+
+# We are inside <VirtualHost ...>
+
 ServerName {core/web_host}
 ServerAlias www.{core/web_host}
 ServerAdmin webmaster@{core/web_host}
@@ -8,6 +11,7 @@
   UserDir disabled
 </IfModule>
 
+# Define configuration/env variables for passing passwords and other secrets to PHP
 <Directory /opt/gforge/www>
   Include /etc/gforge/httpd.conf.d/secrets.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-projects.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-projects.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-opt/vhost-projects.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,4 @@
-# per-project vhost content
+# per-project vhost content : myproject1.myforge.com, myproject2.myforge.com, etc.
 
 ServerName siteadmin.{core/web_host}
 ServerAlias *.{core/web_host}

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/01-namevhost.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/01-namevhost.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/01-namevhost.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,2 +1,4 @@
+# Name-based Virtual Host Support : supports multiple websites over a single IP address
+
 NameVirtualHost *:80
 NameVirtualHost *:443

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/02-config-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/02-config-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/02-config-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,10 +1,11 @@
 #
-# Main directory options
+# Main directory options (/usr/local/share/gforge/www contains the PHP scripts of FusionForge)
 #
 <Directory /usr/local/share/gforge/www>
   Options Indexes FollowSymlinks
   AllowOverride All
   
+  # define access restrictions for the main site
   Include /etc/gforge/httpd.conf.d/auth-main.inc
   
   #

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/10-vhosts-main.conf
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/10-vhosts-main.conf	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/10-vhosts-main.conf	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,6 +1,9 @@
 #
 # Main host
 #
+
+# Differences between HTTP and HTTPS are in ssl-on.inc/ssl-off.inc
+
 <VirtualHost *:80>
   Include /etc/gforge/httpd.conf.d/vhost-main.inc
   Include /etc/gforge/httpd.conf.d/block-trace.inc

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/README.generated
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/README.generated	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/README.generated	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,6 @@
-Attention : contents of this directory are *generated files*.
+Attention developers : contents of this directory are *generated
+files* for /usr/local like paths.
 
 See ../README.httpd-conf-d-flavours for more details
 
+-- OlivierBerger

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/projects-in-mainvhost.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/projects-in-mainvhost.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/projects-in-mainvhost.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -7,5 +7,5 @@
   Options Indexes FollowSymlinks
   AllowOverride All
   
-  Include /etc/gforge/httpd.conf.d/auth.projects.inc
+  Include /etc/gforge/httpd.conf.d/auth-projects.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-main.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-main.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-main.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,3 +1,6 @@
+
+# We are inside <VirtualHost ...>
+
 ServerName {core/web_host}
 ServerAlias www.{core/web_host}
 ServerAdmin webmaster@{core/web_host}
@@ -8,6 +11,7 @@
   UserDir disabled
 </IfModule>
 
+# Define configuration/env variables for passing passwords and other secrets to PHP
 <Directory /usr/local/share/gforge/www>
   Include /etc/gforge/httpd.conf.d/secrets.inc
 </Directory>

Modified: trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-projects.inc
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-projects.inc	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/etc/httpd.conf.d-usrlocal/vhost-projects.inc	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,4 +1,4 @@
-# per-project vhost content
+# per-project vhost content : myproject1.myforge.com, myproject2.myforge.com, etc.
 
 ServerName siteadmin.{core/web_host}
 ServerAlias *.{core/web_host}

Modified: trunk/gforge_base/evolvisforge-5.1/src/fusionforge.spec
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/fusionforge.spec	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/fusionforge.spec	2011-11-25 16:20:34 UTC (rev 17726)
@@ -35,10 +35,6 @@
 License: GPL
 Group: Development/Tools
 Source0: %{name}-%{version}.tar.bz2
-Source1: README.mediawiki.jlbond
-Source2: LocalSettings.php
-Patch1: fusionforge-4.8.3-mediawiki.patch
-Patch2: fusionforge-4.8.3-register_globals.patch
 URL: http://www.fusionforge.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Packager: Alain Peyrat <aljeux at free.fr>
@@ -330,9 +326,6 @@
 
 %prep
 %setup -q
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
 
 %build
 # empty build section
@@ -362,6 +355,7 @@
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_VAR_LIB}/dumps
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_VAR_LIB}/chroot/scmrepos/svn
 %{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_VAR_LIB}/chroot/scmrepos/cvs
+%{__install} -m 755 -d $RPM_BUILD_ROOT%{FORGE_VAR_LIB}/plugins/mediawiki
 %{__install} -m 755 -d $RPM_BUILD_ROOT/home/groups
 # mock mediawiki directory because we symlink GForge skin to Monobook
 %{__install} -m 755 -d $RPM_BUILD_ROOT/usr/share/mediawiki/skins
@@ -473,24 +467,23 @@
 
 # plugin: mediawiki
 %{__ln_s} ../../plugins/mediawiki/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/mediawiki
-# create symlink for apache configuration for mediawiki plugin
-## first, delete the php_admin_value include_path
-%{__sed} -i -e "/^.*php_admin_value[[:space:]]*include_path.*/d" $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki
-%{__ln_s} %{FORGE_DIR}/plugins/mediawiki/etc/httpd.d/61plugin-mediawiki $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/httpd.d/03mediawiki.conf
-# this is pre-activated, so create the config symlink
-#%{__ln_s} %{FORGE_DIR}/plugins/mediawiki/etc/plugins/mediawiki $RPM_BUILD_ROOT%{FORGE_CONF_DIR}/plugins/mediawiki
-# create symlinks to use MonoBook as the GForge skin
-%{__ln_s} monobook $RPM_BUILD_ROOT/usr/share/mediawiki/skins/gforge
-%{__ln_s} MonoBook.deps.php $RPM_BUILD_ROOT/usr/share/mediawiki/skins/GForge.deps.php
-%{__ln_s} MonoBook.php $RPM_BUILD_ROOT/usr/share/mediawiki/skins/GForge.php
-# sort out the GForge skin files and remove obsolete code
-%{__rm} -rf $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/mediawiki-skin
-%{__rm} -rf $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/usr/share/gforge
-%{__rm} -rf $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/usr/share/mediawiki/skins
-# insert our own LocalSettings.php
-#%{__cp} -f %{SOURCE2} $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/usr/share/mediawiki/LocalSettings.php
-# insert our own README file
-%{__cp} -f %{SOURCE1} $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/README.jlbond
+%{__ln_s} /usr/share/mediawiki/api.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/extensions $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/img_auth.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/includes $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/index.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/languages $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/maintenance/ $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/opensearch_desc.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/profileinfo.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/redirect.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/StartProfiler.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/thumb.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/trackback.php $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki/skins $RPM_BUILD_ROOT%{FORGE_DIR}/plugins/mediawiki/www/
+%{__ln_s} /usr/share/mediawiki $RPM_BUILD_ROOT/var/lib/gforge/plugins/mediawiki/master
+%{__ln_s} /usr/share/gforge/src/plugins/mediawiki/mediawiki-skin/FusionForge.php $RPM_BUILD_ROOT/usr/share/mediawiki/skins/
+%{__ln_s} /usr/share/gforge/src/plugins/mediawiki/mediawiki-skin/fusionforge $RPM_BUILD_ROOT/usr/share/mediawiki/skins/
 
 # plugin: online_help
 %{__ln_s} ../../plugins/online_help/www $RPM_BUILD_ROOT%{FORGE_DIR}/www/plugins/online_help
@@ -815,13 +808,13 @@
 
 %files plugin-mediawiki
 %config(noreplace) %{FORGE_CONF_DIR}/config.ini.d/mediawiki.ini
-%config(noreplace) %{FORGE_CONF_DIR}/httpd.d/03mediawiki.conf
+%{_sysconfdir}/cron.d/fusionforge-plugin-mediawiki
 %{FORGE_CONF_DIR}/httpd.d/61plugin-mediawiki
 %{FORGE_DIR}/plugins/mediawiki/
 %{FORGE_DIR}/www/plugins/mediawiki
-/usr/share/mediawiki/skins/gforge
-/usr/share/mediawiki/skins/GForge.deps.php
-/usr/share/mediawiki/skins/GForge.php
+%{FORGE_VAR_LIB}/plugins/mediawiki
+/usr/share/mediawiki/skins/FusionForge.php
+/usr/share/mediawiki/skins/fusionforge
 
 %files plugin-online_help
 %{FORGE_DIR}/plugins/online_help

Added: trunk/gforge_base/evolvisforge-5.1/src/packaging/readme/web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/readme/web-apache2	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/readme/web-apache2	2011-11-25 16:20:34 UTC (rev 17726)
@@ -0,0 +1,17 @@
+This file documents the Apache 2 Web server configuration for
+ at PACKAGE@ in Debian.
+
+See /usr/share/doc/@OLDPACKAGE at -common/README.Debian(.gz) for more
+generic documentation about @PACKAGE@ packaging in Debian.
+
+See
+http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001074.html
+which gives some hints on the design principle behind the Web server
+configuration files adopted for this packaging.
+
+ -- Olivier Berger <obergix at debian.org>, Mon, 21 Nov 2011 16:58:44 +0100
+
+# Local Variables:
+# mode: readme-debian
+# End:
+


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-imagedirs.php
___________________________________________________________________
Added: svn:executable
   + *


Property changes on: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/cronjobs/create-wikis.php
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/cron.d/fusionforge-plugin-mediawiki
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/cron.d/fusionforge-plugin-mediawiki	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/etc/cron.d/fusionforge-plugin-mediawiki	2011-11-25 16:20:34 UTC (rev 17726)
@@ -0,0 +1,20 @@
+FFDIR=/usr/share/gforge
+MWCRON=/usr/share/gforge/src/plugins/mediawiki/cronjobs
+FFUSER=gforge
+
+# You may need to change the pathname to php CLI (command line interface)
+PHP="/usr/bin/php -q -d include_path=.:/etc/gforge:/usr/share/gforge:/usr/share/gforge/www/include:/usr/share/gforge/plugins"
+
+# Don't mail command output to anyone.
+MAILTO=""
+
+#
+# Regular cron jobs for the plugin-mediawiki package
+#
+
+# Create new mediawikis four times an hour
+0,15,30,45 * * * * root [ -x $MWCRON/create-wikis.php ] && $PHP $MWCRON/create-wikis.php
+1,16,31,46 * * * * root [ -x $MWCRON/create-imagedirs.php ] && $PHP $MWCRON/create-imagedirs.php
+
+# Create wiki XML dumps every night
+55 1 * * * root [ -x $MWCRON/dump-wikis.php ] && $PHP $MWCRON/cronjobs/dump-wikis.php

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/common/SVNPlugin.class.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -108,8 +108,8 @@
 			$b .= '<tt>svn checkout svn://'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$project->getUnixName().$module.'</tt><br />';
 		}
 		if (forge_get_config('use_dav', 'scmsvn')) {
-			$b .= '<tt>svn checkout --username '.forge_get_config('anonsvn_login', 'scmsvn').' http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://' . $this->getBoxForProject($project). $this->svn_root_dav .'/'. $project->getUnixName() .$module.'</tt><br/><br/>';
-			$b .= _('The password is ').forge_get_config('anonsvn_password', 'scmsvn').'<br/>';
+			$b .= '<tt>svn checkout --username '.forge_get_config('anonsvn_login', 'scmsvn').' http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://' . $this->getBoxForProject($project). $this->svn_root_dav .'/'. $project->getUnixName() .$module.'</tt><br />';
+			$b .= _('The password is ').forge_get_config('anonsvn_password', 'scmsvn').'<br />';
 		}
 		$b .= '</p>';
 		return $b ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/diff.ezt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/diff.ezt	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/diff.ezt	2011-11-25 16:20:34 UTC (rev 17726)
@@ -123,8 +123,8 @@
     <td>
       <form method=get action="[diff_format_action]">
         [diff_format_hidden_values]
-        <input type=checkbox name="makepatch" value="1"> 
-        Generate output suitable for use with a patch program<br>
+        <input type=checkbox name="makepatch" value="1" /> 
+        Generate output suitable for use with a patch program<br />
         <select name="diff_format" onchange="submit()">
           <option value="h" [is diff_format "h"]selected[end]>Colored Diff</option>
           <option value="l" [is diff_format "l"]selected[end]>Long Colored Diff</option>

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/include/diff_form.ezt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/include/diff_form.ezt	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/include/diff_form.ezt	2011-11-25 16:20:34 UTC (rev 17726)
@@ -41,7 +41,7 @@
   </td>
   </tr>
   <tr>
-  <td><input type="checkbox" name="makepatch" id="makepatch" value="1"></td>
+  <td><input type="checkbox" name="makepatch" id="makepatch" value="1" /></td>
   <td><label for="makepatch">Generate output suitable for use with a patch
   program</label></td>
   </tr>

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/query.ezt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/query.ezt	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/query.ezt	2011-11-25 16:20:34 UTC (rev 17726)
@@ -217,7 +217,7 @@
       [if-index commits.files last]
 	<tr class="vc_row_[if-index commits even]even[else]odd[end]">
 	  <td> </td>
-	  <td colspan=5><b>Log:</b><br>
+	  <td colspan=5><b>Log:</b><br />
 	    <pre class="vc_log">[commits.desc]</pre></td>
 	</tr>
       [end]

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/revision.ezt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/revision.ezt	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/scmsvn/etc/plugins/scmsvn/viewcvs/templates/revision.ezt	2011-11-25 16:20:34 UTC (rev 17726)
@@ -32,8 +32,7 @@
   </tr>
 </table>
 
-<p><b>Log Message:</b><br/>
-   <pre class="vc_log">[log]</pre>
+<p><b>Log Message:</b><pre class="vc_log">[log]</pre>
 </p>
 
 <hr noshade>

Modified: trunk/gforge_base/evolvisforge-5.1/src/translations/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/translations/de.po	2011-11-25 16:20:34 UTC (rev 17726)
@@ -8482,7 +8482,7 @@
 
 #: www/account/change_email.php:78
 msgid "Email change"
-msgstr "EMail-Änderung "
+msgstr "EMail-Änderung"
 
 #: www/account/change_email.php:80
 msgid ""
@@ -9492,7 +9492,7 @@
 
 #: www/admin/approve-pending.php:193
 msgid "Pending reason:"
-msgstr "Wartegrund: "
+msgstr "Wartegrund:"
 
 #: www/admin/approve-pending.php:202
 #, fuzzy, php-format
@@ -9794,7 +9794,7 @@
 
 #: www/admin/groupedit.php:230
 msgid "Resend New Project Instruction Email"
-msgstr "Sende erneut neue Email mit Projekt-Anweisungen "
+msgstr "Sende erneut neue Email mit Projekt-Anweisungen"
 
 #: www/admin/grouplist.php:27 www/include/Layout.class.php:1323
 #: www/themes/evolvis/Theme.class.php:466

Modified: trunk/gforge_base/evolvisforge-5.1/src/utils/fixscripts/tools_data_cleanup.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/utils/fixscripts/tools_data_cleanup.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/utils/fixscripts/tools_data_cleanup.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -24,7 +24,7 @@
 
 if (!$res) print "error<br />";
 
-echo "Affected rows: ",db_affected_rows($res),"<br /><br />";
+echo "Affected rows: ",db_affected_rows($res),"<br />";
 
 
 
@@ -40,6 +40,6 @@
 
 if (!$res) print "error<br />";
 
-echo "Affected rows: ",db_affected_rows($res),"<br /><br />";
+echo "Affected rows: ",db_affected_rows($res),"<br />";
 
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/src/utils/manage-apache-config.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/utils/manage-apache-config.sh	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/utils/manage-apache-config.sh	2011-11-25 16:20:34 UTC (rev 17726)
@@ -1,6 +1,7 @@
 #! /bin/bash -e
 
-# Generates contents of the apache configuration files based on the sources in src/etc/httpd.conf.d/ :
+# Generates contents of the apache configuration files based on the
+# sources in src/etc/httpd.conf.d/ for 3 different flavours :
 #  - src/etc/httpd.conf.d-fhs/ : for FHS like paths (/usr, ...)
 #  - src/etc/httpd.conf.d-opt/ : for /opt like paths
 #  - src/etc/httpd.conf.d-usrlocal/ : for /usr/local like paths
@@ -8,6 +9,9 @@
 # See the thread at : http://lists.fusionforge.org/pipermail/fusionforge-general/2010-June/001067.html for some more details
 #
 
+# invoke with utils/manage-apache-config.sh build to regenerate the config files
+# or with utils/manage-apache-config.sh install to ...(TODO: document this)...
+
 case $1 in
     build)
 	if [ -e src/etc/httpd.conf.d ] ; then # We're in the parent dir
@@ -36,7 +40,16 @@
 		-e 's,{scmsvn/repos_path},/var/lib/gforge/chroot/scmrepos/svn,g' \
 		$i > httpd.conf.d-fhs/$(basename $i)
 	done
+	message="FHS like paths"
+	cat > httpd.conf.d-fhs/README.generated <<EOF
+Attention developers : contents of this directory are *generated
+files* for $message.
 
+See ../README.httpd-conf-d-flavours for more details
+
+-- OlivierBerger
+EOF
+
 	# /opt like paths
 	mkdir -p httpd.conf.d-opt
 	for i in httpd.conf.d/*.inc httpd.conf.d/*.conf ; do
@@ -52,6 +65,15 @@
 		-e 's,{scmsvn/repos_path},/var/lib/gforge/svnroot,g' \
 		$i > httpd.conf.d-opt/$(basename $i)
 	done
+	message="/opt like paths"
+	cat > httpd.conf.d-opt/README.generated <<EOF
+Attention developers : contents of this directory are *generated
+files* for $message.
+
+See ../README.httpd-conf-d-flavours for more details
+
+-- OlivierBerger
+EOF
 	
 	# /usr/local like paths
 	mkdir -p httpd.conf.d-usrlocal
@@ -68,6 +90,15 @@
 		-e 's,{scmsvn/repos_path},/var/lib/gforge/chroot/scmrepos/svn,g' \
 		$i > httpd.conf.d-usrlocal/$(basename $i)
 	done
+	message="/usr/local like paths"
+	cat > httpd.conf.d-usrlocal/README.generated <<EOF
+Attention developers : contents of this directory are *generated
+files* for $message.
+
+See ../README.httpd-conf-d-flavours for more details
+
+-- OlivierBerger
+EOF
 	;;
 	
     install)
@@ -104,6 +135,7 @@
     
     *)
 	echo "Unknown operation"
+	echo "invoke with $0 [build|install]"
 	exit 1
 	;;
 esac

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/account/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/account/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/account/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -217,8 +217,8 @@
     echo '<tr valign="top">
 <td>'. _('Jabber Address:') .'</td>
 <td>
-    <input size=30 type="text" name="jabber_address" value="'. $u->getJabberAddress() .'" /><p />
-	<input type="checkbox" name="jabber_only" value="1" '.(($u->getJabberOnly()) ? 'checked="CHECKED"' : '' ).' />
+    <input size="30" type="text" name="jabber_address" value="'. $u->getJabberAddress() .'" /><p />
+	<input type="checkbox" name="jabber_only" value="1" '.(($u->getJabberOnly()) ? 'checked="checked"' : '' ).' />
 	'._('Send auto-generated notices only to my Jabber address').'.
 </td></tr>';
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/account/lostpw.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/account/lostpw.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/account/lostpw.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -89,7 +89,6 @@
 <br />
 <input type="text" name="loginname" />
 <br />
-<br />
 <input type="submit" name="submit" value="<?php echo _('Send Lost PW Hash'); ?>" />
 </p>
 </form>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/approve-pending.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -152,7 +152,7 @@
 	<input type="hidden" name="group_id" value="<?php print $row_grp['group_id']; ?>" />
 	<?php echo _('Canned responses'); ?><br />
 	<?php print get_canned_responses(); ?> <a href="responses_admin.php"><?php echo _('(manage responses)'); ?></a>
-	<br /><br />
+	<br />
 	<?php echo _('Custom response title and text'); ?><br />
 	<input type="text" name="response_title" size="30" maxlength="25" /><br />
 	<textarea name="response_text" rows="10" cols="50"></textarea>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/responses_admin.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/responses_admin.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/responses_admin.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -51,7 +51,7 @@
 <?php  echo _('Yes, I\'m sure'); ?>
 </form>
 
-<br /><br />
+<br />
 
 <?php
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/export/rssAboTask.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/export/rssAboTask.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/export/rssAboTask.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -70,7 +70,7 @@
 	exit_error('Error',_('No project group was found for this task.'));
 }
 
-$objProjectTask = &projecttask_get_object($project_task_id);
+$objProjectTask = projecttask_get_object($project_task_id);
 if(!$objProjectTask || !is_object($objProjectTask)) {
 	exit_error('Error',_('No project task was found.'));
 }

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/forum/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/forum/admin/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/forum/admin/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -423,7 +423,7 @@
 							<input type="hidden" name="msg_id" value="'.$msg_id.'" />
 							<input type="hidden" name="return_to_message" value="'.$return_to_message.'" />' .
 			html_build_select_box_from_assoc($forums,'new_forum_id',$forum_id) .
-			'<br /><br />
+			'<br />
 							<input type="submit" name="ok" value="' . _("Submit") . '" />
 							<input type="submit" name="cancel" value="' . _("Cancel") . '" />    
 							</p>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/forum/message.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -116,7 +116,7 @@
 
 	$url = util_make_url('/forum/message.php?msg_id='. $msg_id .'&group_id='.$group_id);
 	
-	echo '<br /><br /><table border="0" width="100%" cellspacing="0">';
+	echo '<br /><table border="0" width="100%" cellspacing="0">';
 	echo '<tr class="tablecontent"><td valign="top">'."\n";
 	echo '<strong>'.$fm->getSubject() .'</strong>';
 	if (!$reply) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -404,6 +404,8 @@
  * @param		array	Array of all allowed values from the full list.
  */
 function html_build_select_box_from_arrays ($vals,$texts,$select_name,$checked_val='xzxz',$show_100=true,$text_100='none',$show_any=false,$text_any='any', $allowed=false) {
+	$have_a_subelement = false;
+
 	if ($text_100=='none'){
 		$text_100=_('None');
 	}
@@ -431,11 +433,13 @@
 	if ($show_any) {
 		$return .= '
 		<option value=""'.(($checked_val=='') ? ' selected="selected"' : '').'>'. util_html_secure($text_any) .'</option>';
+		$have_a_subelement = true;
 	}
 	//we don't always want the default 100 row shown
 	if ($show_100) {
 		$return .= '
 		<option value="100"'.(($checked_val==100) ? ' selected="selected"' : '').'>'. util_html_secure($text_100) .'</option>';
+		$have_a_subelement = true;
 	}
 
 	$checked_found=false;
@@ -454,6 +458,7 @@
 				$return .= ' disabled="disabled" class="option_disabled"';
 			}
 			$return .= '>'.util_html_secure($texts[$i]).'</option>';
+			$have_a_subelement = true;
 		}
 	}
 	//
@@ -463,8 +468,14 @@
 	if (!$checked_found && $checked_val != 'xzxz' && $checked_val && $checked_val != 100) {
 		$return .= '
 		<option value="'.util_html_secure($checked_val).'" selected="selected">'._('No Change').'</option>';
+		$have_a_subelement = true;
 	}
 
+	if (!$have_a_subelement) {
+		/* <select></select> without <option/> in between is invalid */
+		return '<!-- select without options -->';
+	}
+
 	$return .= '
 		</select>';
 	return $return;

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/mail/admin/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -186,13 +186,13 @@
 			<input type="hidden" name="add_list" value="y" />
 			<input type="hidden" name="form_key" value="<?php echo form_generate_key();?>" />
 			<p><strong><?php echo _('Mailing List Name:'); ?></strong><br />
-			<strong><?php echo $group->getUnixName(); ?>-<input type="text" name="list_name" value="" size="10" maxlength="12" />@<?php echo forge_get_config('lists_host'); ?></strong><br /></p>
+			<strong><?php echo $group->getUnixName(); ?>-<input type="text" name="list_name" value="" size="10" maxlength="12" />@<?php echo forge_get_config('lists_host'); ?></strong></p>
 			<p>
 			<strong><?php echo _('Is Public?'); ?></strong><br />
 			<input type="radio" name="is_public" value="<?php echo MAIL__MAILING_LIST_IS_PUBLIC; ?>" checked="checked" /> <?php echo _('Yes'); ?><br />
 			<input type="radio" name="is_public" value="<?php echo MAIL__MAILING_LIST_IS_PRIVATE; ?>" /> <?php echo _('No'); ?></p><p>
 			<strong><?php echo _('Description:'); ?></strong><br />
-			<input type="text" name="description" value="" size="40" maxlength="80" /><br /></p>
+			<input type="text" name="description" value="" size="40" maxlength="80" /></p>
 			<p>
 			<input type="submit" name="submit" value="<?php echo _('Add This List'); ?>" /></p>
 		</form>
@@ -224,7 +224,7 @@
 			<input type="radio" name="is_public" value="<?php echo MAIL__MAILING_LIST_IS_PRIVATE; ?>"<?php echo ($mailingList->isPublic() == MAIL__MAILING_LIST_IS_PRIVATE ? ' checked="checked"' : ''); ?> /> <?php echo _('No'); ?>
 			</p>
 			<p><strong><?php echo _('Description:'); ?></strong><br />
-			<input type="text" name="description" value="<?php echo inputSpecialChars($mailingList->getDescription()); ?>" size="40" maxlength="80" /><br /></p>
+			<input type="text" name="description" value="<?php echo inputSpecialChars($mailingList->getDescription()); ?>" size="40" maxlength="80" /></p>
 			<p>
 			<input type="submit" name="submit" value="<?php echo _('Update'); ?>" /></p>
 		</form>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/new/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/new/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/new/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -90,7 +90,7 @@
 				util_make_link_g ($row_new['unix_group_name'],$row_new['group_id'],'<strong>'.$row_new['group_name'].'</strong>').'
 				</td>
 				<td nowrap="nowrap"><em>'._('Released by:').
-				util_make_link_u ($row_new['user_name'],$row_new['user_id'],'<em>'.$row_new['user_name'].'</em>').'
+				util_make_link_u ($row_new['user_name'],$row_new['user_id'],$row_new['user_name']).'</em>
 				</td>
 			</tr>
 			<tr>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/news/admin/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -159,7 +159,7 @@
 		unset($GLOBALS['editor_was_set_up']);
 		
 		echo '<p>
-		<strong>'.sprintf(_('If this item is on the %1$s home page and you edit it, it will be removed from the home page.'), forge_get_config ('forge_name')).'</strong><br /></p>
+		<strong>'.sprintf(_('If this item is on the %1$s home page and you edit it, it will be removed from the home page.'), forge_get_config ('forge_name')).'</strong></p>
 		<input type="submit" name="submit" value="'._('Submit').'" />
 		</form>';
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/people/createjob.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/people/createjob.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/people/createjob.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -46,7 +46,7 @@
 		<form action="'.util_make_url ('/people/editjob.php').'" method="post">
 		<input type="hidden" name="group_id" value="'.$group_id.'" />
 		<input type="hidden" name="form_key" value="' . form_generate_key() . '">
-		<strong>'._('Category').'</strong>'.utils_requiredField().'<br /></p>
+		<strong>'._('Category').'</strong>'.utils_requiredField().'</p>
 		'. people_job_category_box('category_id') .'
 		<p>
 		<strong>'._('Short Description').':</strong>'.utils_requiredField().'<br />

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/people/editprofile.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/people/editprofile.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/people/editprofile.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -204,7 +204,7 @@
 					for($i = 0; $i < $rows; $i++) {
 						echo "<strong>   " .db_result($result, $i, 'title') . "</strong><br />";
 					}
-					echo "<br />"._('This action cannot be undone.')."<br /><br />";
+					echo "<br />"._('This action cannot be undone.')."<br />";
 					echo _('Are you <strong>sure</strong> you wish to continue?');
 					
 					echo '<form action="'.getStringFromServer('PHP_SELF').'" method="post">';
@@ -244,7 +244,7 @@
 		<strong>'._('Publicly Viewable').':</strong><br />
 		<input type="hidden" name="form_key" value="'.form_generate_key().'"> 
 		<input type="radio" name="people_view_skills" value="0" '. ((db_result($result,0,'people_view_skills')==0)?'checked="checked"':'') .' /> <strong>'._('No').'</strong><br />
-		<input type="radio" name="people_view_skills" value="1" '. ((db_result($result,0,'people_view_skills')==1)?'checked="checked"':'') .' /> <strong>'._('Yes').'</strong><br /></p>
+		<input type="radio" name="people_view_skills" value="1" '. ((db_result($result,0,'people_view_skills')==1)?'checked="checked"':'') .' /> <strong>'._('Yes').'</strong></p>
 		<p>
 		<input type="submit" name="update_profile" value="'._('Update Permissions').'"></p>
 		</form>';

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/people/viewprofile.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/people/viewprofile.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/people/viewprofile.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -62,7 +62,7 @@
         <p>
 		<strong>'._('Skills profile for').' : </strong>'. db_result($result,0,'realname') .
         ' ('.db_result($result, 0, 'user_name') .
-        ')<br /><br /></p> <table border="0" width="100%">';
+        ')</p><table border="0" width="100%">';
         
         displayUserSkills($user_id, 0);
         		

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -213,8 +213,7 @@
 	<input type="hidden" name="add_cat" value="y" />
 	<input type="hidden" name="group_project_id" value="<?php echo $pg->getID(); ?>" />
 	<strong><?php echo _('Category Name') ?>:</strong><br />
-	<input type="text" name="name" value="" size="15" maxlength="30" /><br />
-	<p />
+	<input type="text" name="name" value="" size="15" maxlength="30" /><p />
 	<span class="important"><?php echo _('Once you add a category, it cannot be deleted') ?></span>
 	<p />
 	<input type="submit" name="post_changes" value="<?php echo _('Submit') ?>" />
@@ -297,8 +296,7 @@
 	<input type="text" name="description" value="" size="40" maxlength="80" />
 	<p />
 	<strong><?php echo _('Send All Updates To')?>:</strong><br />
-	<input type="text" name="send_all_posts_to" value="" size="40" maxlength="80" /><br />
-	<p />
+	<input type="text" name="send_all_posts_to" value="" size="40" maxlength="80" /><p />
 	<input type="submit" name="submit" value="<?php echo _('Submit') ?>" />
 	</form>
 	<?php

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -225,7 +225,7 @@
 					}
 				}
 				if ($cell_contents == '') {
-					$cell_contents = '<br /><br /><br />';
+					$cell_contents = '<br />';
 				}
 				print "$cell_contents</td>\n";
 			} else {

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/postuploadcsv.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/postuploadcsv.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/postuploadcsv.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -43,7 +43,8 @@
 require_once $gfcommon.'pm/import_utils.php';
 
 $input_file = getUploadedFile('userfile');
-if (is_uploaded_file($input_file['tmp_name'])) {
+if (isset($input_file) && isset($input_file['tmp_name']) &&
+    is_uploaded_file($input_file['tmp_name'])) {
 	$handle = fopen($input_file['tmp_name'], 'r');
 	$tasks = array();
 	
@@ -106,13 +107,16 @@
 					'dependenton'=>$dependentOn,
 					'notes'=>$cols[11]);
 		}
+		$res=&pm_import_tasks($group_project_id, $tasks);
+
 	}
-	$res=&pm_import_tasks($group_project_id, $tasks);
-	
-	if ($res['success']) {
-		$feedback .= 'Import Was Successful';
-	} else {
-		$error_msg .= $res['errormessage'];
-	}
+} else {
+	$res['errormessage'] = 'Parameter error';
 }
+
+if ($res['success']) {
+	$feedback .= 'Import Was Successful';
+} else {
+	$error_msg .= $res['errormessage'];
+}
 ?>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/uploadcsv.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/uploadcsv.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/uploadcsv.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -31,6 +31,13 @@
 pm_header(array('title'=>_('Upload data into the tasks.'),'group_project_id'=>$group_project_id));
 
 ?>
+
+<div style="border:5px red groove;">
+<h2><?php echo _('Warning!'); ?></h2>
+<p><?php echo _('This function will <em>replace</em> all tasks in the currently selected subproject with these uploaded from the CSV file.'); ?></p>
+<p><?php echo _('FAQ: Attaching files to Tasks is not possible, only Tracker Items (Bugs, Feature Requests, …) support that functionality.'); ?></p>
+</div>
+
 <p>
 <?php echo _('This page lets you choose a file, in .csv format, and upload it so it can be inserted in the current subproject.'); ?>
 </p>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/project/admin/editimages.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/project/admin/editimages.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/project/admin/editimages.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -255,7 +255,7 @@
 	<strong>'._('Description').':</strong>'.utils_requiredField().'<br />
 	<input type="text" name="description" size="40" maxlength="255" /></p><p>
 	<input type="hidden" name="add" value="1" />
-	<input type="submit" value="'._('Add File').'" name="submit" /><br /></p>
+	<input type="submit" value="'._('Add File').'" name="submit" /></p>
 	</form></p>
 	';
 }

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/reporting/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/reporting/index.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/reporting/index.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -42,36 +42,31 @@
 <p>
 <a href="useradded.php?SPAN=1"><?php echo _('Users Added Weekly (graph)'); ?></a><br />
 <a href="usercum.php?SPAN=1"><?php echo _('Cumulative Users Weekly (graph)'); ?></a><br />
-<a href="useract.php"><?php echo _('Activity (graph)'); ?></a><br />
-</p>
+<a href="useract.php"><?php echo _('Activity (graph)'); ?></a></p>
 <h2><?php echo _('Projects'); ?></h2>
 <p>
 <a href="groupadded.php?SPAN=1"><?php echo _('Projects Added Weekly (graph)'); ?></a><br />
 <a href="groupcum.php?SPAN=1"><?php echo _('Cumulative Projects Weekly (graph)'); ?></a><br />
 <?php echo _('Project-specific reports: Tracker, Task Mgr, Forums, Doc Mgr, Downloads'); ?><br />
-<a href="projectact.php"><?php echo _('Activity (graph)'); ?></a><br />
-</p>
+<a href="projectact.php"><?php echo _('Activity (graph)'); ?></a></p>
 <h2><?php echo _('Site-Wide'); ?></h2>
 <p>
 <?php echo _('Site-wide reports: Tracker, Task Mgr, Forums, Doc Mgr, Downloads'); ?><br />
 <a href="toolspie.php"><?php echo _('Pie (graph)'); ?></a><br />
-<a href="siteact.php"><?php echo _('Line (graph)'); ?></a><br />
-</p>
+<a href="siteact.php"><?php echo _('Line (graph)'); ?></a></p>
 <h2><?php echo _('Time-Tracking'); ?></h2>
 <p>
 <a href="usertime.php"><?php echo _('Individual User Time Report (graph)'); ?></a> <a href="usertime.php?typ=r">(<?php echo _('report'); ?>)</a><br />
 <a href="projecttime.php"><?php echo _('Individual Project Time Report (graph)'); ?></a> <a href="projecttime.php?typ=r">(<?php echo _('report'); ?>)</a><br />
 <a href="sitetime.php"><?php echo _('Site-Wide Time Report (graph)'); ?></a> <a href="sitetime.php?typ=r">(<?php echo _('report'); ?>)</a><br />
 <a href="sitetimebar.php"><?php echo _('Site-Wide Total Hours Graph (graph)'); ?></a> <a href="sitetimebar.php?typ=r">(<?php echo _('report'); ?>)</a><br />
-<a href="usersummary.php"><?php echo _('Site-Wide Task & Hours (report)'); ?></a><br />
-</p>
+<a href="usersummary.php"><?php echo _('Site-Wide Task & Hours (report)'); ?></a></p>
 
 <?php if (forge_check_global_perm ('forge_stats', 'admin')) { ?>
 <h2><?php echo _('Administrative'); ?></h2>
 <p>
 <a href="rebuild.php"><?php echo _('Initialize / Rebuild Reporting Tables'); ?></a><br />
-<a href="timecategory.php"><?php echo _('Manage Time Tracker Categories'); ?></a><br />
-</p>
+<a href="timecategory.php"><?php echo _('Manage Time Tracker Categories'); ?></a></p>
 <?php
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/docroot/help_rootview.html
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/docroot/help_rootview.html	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/docroot/help_rootview.html	2011-11-25 16:20:34 UTC (rev 17726)
@@ -158,7 +158,7 @@
   <blockquote>
     <p>
       <a href="http://svnbook.red-bean.com/"><em>Version Control with
-      Subversion</em></a><br />
+      Subversion</em></a>
     </p>
   </blockquote>
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/query_results.ezt
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/query_results.ezt	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/scm/viewvc/templates/query_results.ezt	2011-11-25 16:20:34 UTC (rev 17726)
@@ -74,8 +74,7 @@
   [end]
   <tr class="vc_row_[if-index commits even]even[else]odd[end]">
     <td> </td>
-    <td colspan="5"><strong>Log:</strong><br />
-      <pre class="vc_log">[commits.log]</pre></td>
+    <td colspan="5"><strong>Log:</strong><pre class="vc_log">[commits.log]</pre></td>
   </tr>
   </tbody>
 [end]

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/softwaremap/tag_cloud.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/softwaremap/tag_cloud.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/softwaremap/tag_cloud.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -59,7 +59,7 @@
 $selected_tag = getStringFromRequest('tag');
 $page = getIntFromRequest('page', 1);
 
-echo '<br />' . tag_cloud(array('selected' => $selected_tag, 'nb_max' => 100)) . '<br /><br />';
+echo '<br />' . tag_cloud(array('selected' => $selected_tag, 'nb_max' => 100)) . '<br />';
 
 if ($selected_tag) {
 	$res_grp = db_query_params('

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/viewvc/help_rootview.html
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/viewvc/help_rootview.html	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/gforge/viewvc/help_rootview.html	2011-11-25 16:20:34 UTC (rev 17726)
@@ -158,8 +158,7 @@
   <blockquote>
     <p>
       <a href="http://svnbook.red-bean.com/"><em>Version Control with
-      Subversion</em></a><br />
-    </p>
+      Subversion</em></a></p>
   </blockquote>
 
   </td></tr></table>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-updatetracker.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-updatetracker.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/form-updatetracker.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -63,7 +63,7 @@
 		<strong><?php echo _('Send email on new submission to address') ?>:</strong><br />
 		<input type="text" name="email_address" value="<?php echo $email_address; ?>" /></p>
 		<p>
-		<input type="checkbox" name="email_all" value="1" <?php echo (($email_all)?'checked="checked"':''); ?> /> <strong><?php echo _('Send email on all changes') ?></strong><br /></p>
+		<input type="checkbox" name="email_all" value="1" <?php echo (($email_all)?'checked="checked"':''); ?> /> <strong><?php echo _('Send email on all changes') ?></strong></p>
 		<p>
 		<strong><?php echo _('Days till considered overdue') ?>:</strong><br />
 		<input type="text" name="due_period" value="<?php echo $due_period; ?>" /></p>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php	2011-11-25 16:20:34 UTC (rev 17726)
@@ -148,7 +148,7 @@
 	<strong><?php echo _('Send email on new submission to address') ?>:</strong><br />
 	<input type="text" name="email_address" value="" /></p>
 	<p>
-	<input type="checkbox" name="email_all" value="1" /> <strong><?php echo _('Send email on all changes') ?></strong><br /></p>
+	<input type="checkbox" name="email_all" value="1" /> <strong><?php echo _('Send email on all changes') ?></strong></p>
 	<p>
 	<strong><?php echo _('Days till considered overdue') ?>:</strong><br />
 	<input type="text" name="due_period" value="30" /></p>

Added: trunk/gforge_base/evolvisforge-5.1/tests/config/build
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/config/build	                        (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/tests/config/build	2011-11-25 16:20:34 UTC (rev 17726)
@@ -0,0 +1,8 @@
+#
+# In this file you can find vars that are useable 
+# both as an include in a Makefile or
+# be sourced in a shell
+# So it should only be stuffs like VAR=value
+#
+REMOTESELENIUM=true
+VZTEMPLATE=centos-5-x86-test

Modified: trunk/gforge_base/evolvisforge-5.1/tests/config/default
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/config/default	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/tests/config/default	2011-11-25 16:20:34 UTC (rev 17726)
@@ -28,6 +28,7 @@
 VZPRIVATEDIR=/var/lib/vz/private
 # You shouldn't change the next line, don't really work
 VZTEMPLATEDIR=/var/lib/vz/template
+VZTEMPLATE=centos-5-x86
 
 SSHPUBKEY=~/.ssh/id_rsa.pub
 HOSTKEYDIR=~/ssh

Modified: trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-25 16:20:26 UTC (rev 17725)
+++ trunk/gforge_base/evolvisforge-5.1/tests/scripts/fusionforge-build-and-test-rpm.sh	2011-11-25 16:20:34 UTC (rev 17726)
@@ -26,8 +26,7 @@
 export IPMASK=$IPCOSMASK
 export IPGW=$IPCOSGW
 
-ARCH=`dpkg-architecture -qDEB_BUILD_ARCH`
-export VZTEMPLATE=centos-$COSVERS-$ARCH-minimal
+export VZTEMPLATE
 export VZPRIVATEDIR
 export DEBMIRROR
 
@@ -44,7 +43,6 @@
 	export SELENIUM_RC_URL=http://`hostname -f`$BASEDIR/reports
 else
 	export SELENIUM_RC_URL=${HUDSON_URL}job/$JOB_NAME/ws/reports
-	export VZTEMPLATE=centos-5-x86
 fi
 export DB_NAME=gforge
 export CONFIGURED=true



More information about the evolvis-commits mailing list