This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via e499db2971a901618f298737ac872a6aded8d251 (commit)
via 909e35834dd9467944a4a9c8b9ef46335ba29a13 (commit)
via b58644902e7c281cc4cb7981e35d54894adaf452 (commit)
via 11c3a93678fdacc971748cffc96f36f545feaf5a (commit)
from 09488e3d5039729fa11c48af06a5a2117f0d5f21 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e499db2971a901618f298737ac872a6aded8d251
commit e499db2971a901618f298737ac872a6aded8d251
Author: Franck Villaume <[email protected]>
Date: Sat Nov 4 14:32:00 2017 +0100
user tracker dashboard only available is use_tracker set
diff --git a/src/www/my/dashboard.php b/src/www/my/dashboard.php
index 20a8087..7b4948f 100644
--- a/src/www/my/dashboard.php
+++ b/src/www/my/dashboard.php
@@ -39,6 +39,9 @@ global $HTML; // Layout object
if (!session_loggedin()) {
exit_not_logged_in();
} else {
+ if (!forge_get_config('use_tracker')) {
+ exit_disabled('my');
+ }
$u = session_get_user();
site_user_header(array('title'=>sprintf(_('Personal Page for %s'),
$u->getRealName())));
echo $HTML->listTableTop();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=909e35834dd9467944a4a9c8b9ef46335ba29a13
commit 909e35834dd9467944a4a9c8b9ef46335ba29a13
Author: Franck Villaume <[email protected]>
Date: Sat Nov 4 14:30:17 2017 +0100
diary: fix table display
diff --git a/src/www/my/diary.php b/src/www/my/diary.php
index 4769f4e..d08ab88 100644
--- a/src/www/my/diary.php
+++ b/src/www/my/diary.php
@@ -182,7 +182,7 @@ if (!session_loggedin()) {
echo html_e('input', array('type' => 'hidden', 'name' => 'form_key',
'value' => form_generate_key()));
echo html_e('input', array('type' => 'hidden', 'name' => $proc_str,
'value' => '1'));
echo html_e('input', array('type' => 'hidden', 'name' => 'diary_id',
'value' => $_diary_id));
- echo $HTML->listTableTop();
+ echo $HTML->listTableTop(array(), array(), 'full');
echo html_ao('tr').html_ao('td').html_ao('label', array('for' =>
'summary'));
echo html_e('strong', array(), _('Summary')._(':')).'<br />';
echo html_ac(html_ap()-1);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b58644902e7c281cc4cb7981e35d54894adaf452
commit b58644902e7c281cc4cb7981e35d54894adaf452
Author: Franck Villaume <[email protected]>
Date: Sat Nov 4 14:29:53 2017 +0100
less string
diff --git a/src/www/account/change_pw.php b/src/www/account/change_pw.php
index 983da3d..67dc448 100644
--- a/src/www/account/change_pw.php
+++ b/src/www/account/change_pw.php
@@ -58,7 +58,7 @@ if (getStringFromRequest('submit')) {
if (!$u->setPasswd($passwd)) {
form_release_key(getStringFromRequest('form_key'));
- exit_error(_('Could not change password:
').$u->getErrorMessage(),'my');
+ exit_error(_('Could not change password')._(':
').$u->getErrorMessage(),'my');
}
site_user_header(array('title'=>_('Successfully Changed Password')));
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=11c3a93678fdacc971748cffc96f36f545feaf5a
commit 11c3a93678fdacc971748cffc96f36f545feaf5a
Author: Franck Villaume <[email protected]>
Date: Sat Nov 4 14:29:08 2017 +0100
change email: less string, fix return link to point to account
diff --git a/src/www/account/change_email.php b/src/www/account/change_email.php
index c580238..f073056 100644
--- a/src/www/account/change_email.php
+++ b/src/www/account/change_email.php
@@ -3,7 +3,7 @@
* Change user's email page
*
* Copyright 1999-2001 (c) VA Linux Systems
- * Copyright 2010, 2014, Franck Villaume - TrivialDev
+ * Copyright 2010,2014,2017, Franck Villaume - TrivialDev
*
* This file is part of FusionForge. FusionForge is free software;
* you can redistribute it and/or modify it under the terms of the
@@ -40,7 +40,7 @@ if (getStringFromRequest('submit')) {
exit_error(_('Invalid Email Address'),'my');
}
- $confirm_hash = substr(md5($GLOBALS['session_ser'] . time()),0,16);
+ $confirm_hash = substr(md5($GLOBALS['session_ser'].time()), 0, 16);
$u = user_get_object(user_getid());
if (!$u || !is_object($u)) {
@@ -58,18 +58,18 @@ if (getStringFromRequest('submit')) {
$message = sprintf(_('You have requested a change of email address on
%s.'), forge_get_config('forge_name'))
. "\n\n"
- . _('Please visit the following URL to complete the
email change:')
+ . _('Please visit the following URL to complete the
email change')._(':')
. "\n\n"
.
util_make_url('/account/change_email-complete.php?ch='.$confirm_hash)
. "\n\n"
. sprintf(_('-- the %s staff'),
forge_get_config('forge_name'));
- util_send_message($newemail,sprintf(_('%s Verification'),
forge_get_config ('forge_name')),$message);
+ util_send_message($newemail, sprintf(_('%s Verification'),
forge_get_config ('forge_name')), $message);
- site_user_header(array('title'=>_('Email Change Confirmation')));
+ site_user_header(array('title' => _('Email Change Confirmation')));
echo html_e('p', array(), _('An email has been sent to the new address.
Follow the instructions in the email to complete the email change.'));
- echo util_make_link('/', '[ '._('Home').' ]');
+ echo util_make_link('/account/', '[ '._('Home').' ]');
} else {
//show form
site_user_header(array('title'=>_('Email change')));
@@ -83,7 +83,7 @@ if (getStringFromRequest('submit')) {
html_e('input', array('type' => 'submit',
'name' => 'submit', 'value' => _('Send Confirmation to New Address'))));
echo $HTML->closeForm();
echo $HTML->addRequiredFieldsInfoBox();
- echo html_e('p', array(), util_make_link('/', _('Return')));
+ echo html_e('p', array(), util_make_link('/account/', _('Return')));
}
site_user_footer();
-----------------------------------------------------------------------
Summary of changes:
src/www/account/change_email.php | 14 +++++++-------
src/www/account/change_pw.php | 2 +-
src/www/my/dashboard.php | 3 +++
src/www/my/diary.php | 2 +-
4 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
