From: Franck Villaume <franck.villaume@trivialdev.com>
Date: Mon, 17 Mar 2014 10:28:35 +0000 (+0100)
Subject: merge Branch_5_3
X-Git-Tag: v6.0rc1~1333
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=75560c612463d04a36d18bd9a57e2581ce526d48

merge Branch_5_3
---

75560c612463d04a36d18bd9a57e2581ce526d48
diff --cc .gitignore
index 3110fb4c14,815ec0063b..a905e549a3
--- a/.gitignore
+++ b/.gitignore
@@@ -65,4 -65,12 +65,13 @@@ htdocs/deb-repo/mkdebidx.lo
  htdocs/deb-repo/timestamp
  src/www/scm/viewvc/viewvc.org/*.tar.gz
  src/www/scm/viewvc/viewvc.org/*.zip
 +*~
+ # Debian packaging:
+ /*.dsc
+ /*.tar.gz
+ /*.diff.gz
+ /*.build
+ /*.changes
+ /*.deb
+ /*.upload
+ /.pc
diff --cc src/common/docman/views/reporting.php
index 684c3c14b4,275b7a53e7..933978b5b8
--- a/src/common/docman/views/reporting.php
+++ b/src/common/docman/views/reporting.php
@@@ -164,15 -169,20 +164,19 @@@ if (count($data) == 0) 
  	$tabletop = array(_('Folder'), _('Document'), _('User'), _('Date'));
  	$classth = array('', '', '', '');
  	echo $HTML->listTableTop($tabletop, false, 'sortable_docman_listfile', 'sortable', $classth);
 -	for ($i=0; $i<count($data); $i++) {
 -		$date = preg_replace('/^(....)(..)(..)$/', '\1-\2-\3', $data[$i][2]);
 +	for ($i = 0; $i < count($data); $i++) {
  		$ndg = new DocumentGroup($g, $data[$i][3]);
 -		$path = $ndg->getPath(true);
 -		echo '<tr '. $HTML->boxGetAltRowStyle($i) .'>'.
 -			'<td>'.$path.'</td>'.
 -			'<td>'. $data[$i][0] .'</td>';
 +		$cells = array();
 +		$cells[][] = $ndg->getPath(true);
 +		$cells[][] = $data[$i][0];
- 		$userObject = user_get_object($data[$i][1]);
- 		$cells[][] = util_display_user($userObject->getUnixName(), $data[$i][1], $userObject->getRealName());
+ 		if ( $data[$i][1] != 100) {
+ 			$userObject = user_get_object($data[$i][1]);
 -			echo '<td>'.util_display_user($userObject->getUnixname(), $data[$i][1], $userObject->getRealname()).'</td>';
++			$cells[][] = util_display_user($userObject->getUnixName(), $data[$i][1], $userObject->getRealName());
+ 		} else {
 -			echo '<td>'._('Anonymous user').'</td>';
++			$cells[][] = _('Anonymous user');
+ 		}
 -		echo '<td class="align-center">'. $date .'</td></tr>';
 +		$cells[] = array(preg_replace('/^(....)(..)(..)$/', '\1-\2-\3', $data[$i][2]), 'class' => 'align-center');
 +		echo $HTML->multiTableRow(array(), $cells);
  	}
  	echo $HTML->listTableBottom();
  }
diff --cc src/common/include/database-pgsql.php
index 714a682841,bcffdad8b5..178b500614
--- a/src/common/include/database-pgsql.php
+++ b/src/common/include/database-pgsql.php
@@@ -72,8 -72,8 +72,8 @@@ function db_connect() 
  	if (function_exists("pg_pconnect")) {
  		$gfconn = pg_pconnect(pg_connectstring(forge_get_config('database_name'), forge_get_config('database_user'), forge_get_config('database_password'), forge_get_config('database_host'), forge_get_config('database_port')));
  		if (!$gfconn) {
 -			print forge_get_config ('forge_name')." Could Not Connect to Database: ".db_error();
 +			print forge_get_config('forge_name')." Could Not Connect to Database: ".db_error();
- 			exit;
+ 			exit(1);
  		}
  	} else {
  		print("function pg_pconnect doesn't exist: no postgresql interface");