From: Roland Mas
Date: Mon, 31 Jan 2011 14:27:02 +0000 (+0000)
Subject: Merged from 5.1: misc. fixes all over
X-Git-Tag: v5_2_rc1~2289
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=ec000e3630310a364d013746d03850c296d8de68
Merged from 5.1: misc. fixes all over
---
diff --git a/src/README b/src/README
index db0923e37a..f02e54e23f 100644
--- a/src/README
+++ b/src/README
@@ -18,7 +18,7 @@ Thanks for taking the time to download this code. You will find
documentation on how to install, administrate and use FusionForge on
the project's wiki at
- https://fusionforge.org/plugins/mediawiki/wiki/fusionforge/index.php/Main_Page
+ http://wiki.fusionforge.org/
If you have any questions or suggestions, post a message either in the
forums at
diff --git a/src/common/include/config-vars.php b/src/common/include/config-vars.php
index b313ea4108..22865455e3 100644
--- a/src/common/include/config-vars.php
+++ b/src/common/include/config-vars.php
@@ -145,7 +145,6 @@ forge_define_config_item ('user_registration_accept_conditions', 'core', $GLOBAL
forge_set_config_item_bool ('user_registration_accept_conditions', 'core') ;
forge_define_config_item ('use_private_project', 'core', $GLOBALS['sys_use_private_project']);
forge_set_config_item_bool ('use_private_project', 'core') ;
-
forge_define_config_item ('compression_method', 'core', 'gzip') ;
// Arch plugin
diff --git a/src/cronjobs/backup_site.php b/src/cronjobs/backup_site.php
index 7462204574..4ca49f7cb7 100755
--- a/src/cronjobs/backup_site.php
+++ b/src/cronjobs/backup_site.php
@@ -28,6 +28,8 @@ require $gfcommon.'include/cron_utils.php';
$database=forge_get_config('database_name');
$username=forge_get_config('database_user');
$password=forge_get_config('database_password');
+$host=forge_get_config('database_host');
+$port=forge_get_config('database_port');
$datetime=date('Y-m-d'); //we will use this to concatenate it with the tar filename
@@ -66,7 +68,28 @@ if (!preg_match('/\\/$/',$sys_path_to_backup)) {
$output = "";
$err = "";
-@exec('echo -n -e "'.$password.'\n" | pg_dump -U '.$username.' -v -Ft -b 2>&1 '.$database.' > '.$sys_path_to_backup.'db-'.$database.'-tmp-'.$datetime.'.tar ',$output,$retval); //proceed with db dump
+$dump_cmd = 'pg_dump -U ' . $username;
+if ($host != '') {
+ $dump_cmd .= ' -h ' . $host;
+}
+if ($file != '') {
+ $dump_cmd .= ' -p ' . $port;
+}
+
+$tmpfname = tempnam(sys_get_temp_dir(), "tmp");
+
+$handle = fopen($tmpfname, "w");
+$line = '';
+$line .= $host ? "$host:" : "localhost:";
+$line .= $port ? "$port:" : "5432:";
+$line .= "$database:$username:$password";
+fwrite($handle, "$line");
+fclose($handle);
+
+$dump_cmd .= ' -v -Ft -b '.$database;
+@exec('PGPASSFILE='.$tmpfname.' '.$dump_cmd.' 2>&1 > '.$sys_path_to_backup.'db-'.$database.'-tmp-'.$datetime.'.tar ',$output,$retval); //proceed with db dump
+unlink($tmpfname);
+
if($retval!=0){
$err.= implode("\n", $output);
}
diff --git a/src/www/account/index.php b/src/www/account/index.php
index 9d5ae7c866..81aeaf507f 100644
--- a/src/www/account/index.php
+++ b/src/www/account/index.php
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright 2010-2011, Franck Villaume - Capgemini
- * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
+ * Copyright 2011, Alain Peyrat - Alcatel-Lucent
*
* This file is part of FusionForge.
*
diff --git a/src/www/admin/configman.php b/src/www/admin/configman.php
index 7da230d637..17791c6b46 100644
--- a/src/www/admin/configman.php
+++ b/src/www/admin/configman.php
@@ -33,7 +33,7 @@ require_once $gfwww.'admin/admin_utils.php';
site_admin_header(array('title'=>_('Configuration Manager')));
-echo "
".sprintf (_('Configuration from the config API (*.ini files) (experimental)'))."
" ;
+echo "
".sprintf (_('Configuration from the config API (*.ini files)'))."
" ;
$title_arr = array(_('Variable'),_('Configured value'),_('Result (possibly after interpolation)'));
echo $HTML->listTableTop($title_arr);
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 407442c815..b6f8b5d261 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -345,7 +345,7 @@ function html_get_tooltip_description($element_name) {
case 'canned_response':
return( _('The canned response drop-down represents a list of project admin-defined canned responses to common support or bug submission.
If you are a project admin you can click the \'(admin)\' link to define your own canned responses'));
case 'comment':
- return( _('Comment'));
+ return( _('Anyone can add here comments to give additional information, answers and solutions. Please, be as precise as possible to avoid misunderstanding. If relevant, screenshots or documents can be added as attached files.'));
case 'description':
return( htmlentities(_('Enter the complete description.').'
'.
_("
Editing tips: http,https or ftp: Hyperlinks. [#NNN]: Tracker id NNN. [TNNN]: Task id NNN. [wiki:<pagename>]: Wiki page. [forum:<msg_id>]: Forum post.
"),
diff --git a/src/www/project/admin/index.php b/src/www/project/admin/index.php
index 15dac260fb..fc1449846a 100644
--- a/src/www/project/admin/index.php
+++ b/src/www/project/admin/index.php
@@ -152,43 +152,42 @@ if (forge_get_config('use_shell')) {
-
-
+
';
-echo '
'._('Tags').'
';
-echo '
'._('Projects').'
';
-echo '
';
-
-$infos = getAllProjectTags();
-
-$unix_name = $group->getUnixName();
-foreach ($infos as $tag => $plist) {
- $disabled = '';
- $links = array();
- foreach($plist as $project) {
- $links[] = util_make_link('/projects/'.$project['unix_group_name'].'/',$project['unix_group_name']);
- if ($project['group_id'] == $group_id) {
- $disabled = ' disabled="disabled"';
+ $infos = getAllProjectTags();
+ if ($infos) {
+ echo ' ';
+ echo _('Or pick a tag from those used by other projects: ');
+ echo ' ';
+ echo '