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, master has been updated
via 5d2d75696878d5174aab329f70612f1ea2e812dd (commit)
via a0e5ecfe85327ba773033d9d10ea44907c51b0ff (commit)
from d8966dc4425694cbe6a63be930426d3f3ed4f3ec (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=5d2d75696878d5174aab329f70612f1ea2e812dd
commit 5d2d75696878d5174aab329f70612f1ea2e812dd
Author: Franck Villaume <[email protected]>
Date: Sun Sep 4 13:27:16 2016 +0200
use HTML helpers
diff --git a/src/common/widget/WidgetLayout_Row.class.php
b/src/common/widget/WidgetLayout_Row.class.php
index 39ad9db..d591d74 100644
--- a/src/common/widget/WidgetLayout_Row.class.php
+++ b/src/common/widget/WidgetLayout_Row.class.php
@@ -1,7 +1,7 @@
<?php
/**
* Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights
reserved
- * Copyright 2013-2014, Franck Villaume - TrivialDev
+ * Copyright 2013-2014,2016, Franck Villaume - TrivialDev
*
* This file is a part of Fusionforge.
*
@@ -41,7 +41,8 @@ class WidgetLayout_Row {
}
function display($readonly, $owner_id, $owner_type) {
- echo html_ao('table', array('id' =>
'mainwidget_table'.$this->id, 'class' => 'fullwidth'));
+ global $HTML;
+ echo $HTML->listTableTop(array(), array(), '',
'mainwidget_table'.$this->id);
echo html_ao('tbody');
echo html_ao('tr', array('style' => 'vertical-align:top;'));
$last = count($this->columns) - 1;
@@ -49,7 +50,8 @@ class WidgetLayout_Row {
foreach($this->columns as $key => $nop) {
$this->columns[$key]->display($readonly, $owner_id,
$owner_type, $is_last = ($i++ == $last));
}
- echo html_ac(html_ap() -3);
+ echo html_ac(html_ap() -2);
+ echo $HTML->listTableBottom();
}
function getColumnIds() {
diff --git a/src/www/my/dashboard.php b/src/www/my/dashboard.php
index 18c15b7..5bf0e1b 100644
--- a/src/www/my/dashboard.php
+++ b/src/www/my/dashboard.php
@@ -8,7 +8,7 @@
* Copyright 2009-2010, Roland Mas
* Copyright (C) 2012 Alain Peyrat - Alcatel-Lucent
* Copyright (C) 2012-2013 Marc-Etienne Vargenau - Alcatel-Lucent
- * Copyright 2013, Franck Villaume - TrivialDev
+ * Copyright 2013,2016, Franck Villaume - TrivialDev
* Copyright 2014, Stéphane-Eymeric Bredthauer
*
* This file is part of FusionForge. FusionForge is free software;
@@ -41,7 +41,7 @@ if (!session_loggedin()) {
} else {
$u = session_get_user();
site_user_header(array('title'=>sprintf(_('Personal Page for %s'),
$u->getRealName())));
- echo html_ao('table', array('class' => 'fullwidth'));
+ echo $HTML->listTableTop();
echo html_ao('tr');
echo html_ao('td', array('class' => 'top'));
echo $HTML->boxTop(_('All trackers for my projects'), false, false);
@@ -215,6 +215,6 @@ if (!session_loggedin()) {
show_priority_colors_key();
echo html_ac(html_ap()-2);
*/
- echo html_ac(html_ap()-1);
+ echo $HTML->listTableBottom();
site_user_footer();
}
diff --git a/src/www/my/diary.php b/src/www/my/diary.php
index d2b9589..5077921 100644
--- a/src/www/my/diary.php
+++ b/src/www/my/diary.php
@@ -4,7 +4,7 @@
*
* Copyright 1999-2001 (c) VA Linux Systems
* Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
- * Copyright 2011, Franck Villaume - TrivialDev
+ * Copyright 2011,2016, Franck Villaume - TrivialDev
* Copyright 2014, Stéphane-Eymeric Bredthauer
*
* This file is part of FusionForge. FusionForge is free software;
@@ -177,11 +177,11 @@ if (!session_loggedin()) {
echo html_e('h2', array(), $info_str);
- echo html_ao('form', array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post'));
+ echo $HTML->openForm(array('action' => getStringFromServer('PHP_SELF'),
'method' => 'post'));
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_ao('table', array('class' => 'fullwidth'));
+ echo $HTML->listTableTop();
echo html_ao('tr').html_ao('td');
echo html_e('strong', array(),_('Summary')._(':')).'<br />';
echo html_e('input', array( 'required' => 'required', 'type' => 'text',
'name' => 'summary', 'size' => '60', 'maxlength' => '60', 'value' =>
$_summary));
@@ -203,7 +203,9 @@ if (!session_loggedin()) {
echo html_ac(html_ap()-1);
echo html_e('p', array(), _('If marked as public, your entry will be
mailed to any monitoring users when it is first submitted.'));
- echo html_ac(html_ap()-4);
+ echo html_ac(html_ap()-2);
+ echo $HTML->listTableBottom();
+ echo $HTML->closeForm();
echo html_e('h2', array(), _('Existing Diary and Notes Entries'));
$result=db_query_params('SELECT * FROM user_diary WHERE user_id=$1
ORDER BY id DESC',
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a0e5ecfe85327ba773033d9d10ea44907c51b0ff
commit a0e5ecfe85327ba773033d9d10ea44907c51b0ff
Author: Franck Villaume <[email protected]>
Date: Sun Sep 4 13:19:41 2016 +0200
url_prefix on login: more generic patch
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index 4c7659d..6391406 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -195,13 +195,7 @@ class Navigation extends FFError {
$url = '/account/login.php';
if(getStringFromServer('REQUEST_METHOD') != 'POST') {
$url .= '?return_to=';
- // remove the url_prefix
- $url_prefix = forge_get_config('url_prefix');
$request_uri =
getStringFromServer('REQUEST_URI');
- if (substr($request_uri, 0,
strlen($url_prefix)) == $url_prefix) {
- $request_uri = '/'.substr($request_uri,
strlen($url_prefix));
- }
-
$url .= urlencode($request_uri);
}
$res['titles'][] = _('Log In');
diff --git a/src/www/account/login.php b/src/www/account/login.php
index 615d328..67c52fc 100644
--- a/src/www/account/login.php
+++ b/src/www/account/login.php
@@ -32,7 +32,14 @@ require_once '../env.inc.php';
require_once $gfcommon.'include/pre.php';
require_once $gfwww.'include/login-form.php';
+
+// remove the url_prefix
+$url_prefix = forge_get_config('url_prefix');
$return_to = getStringFromRequest('return_to');
+if (substr($return_to, 0, strlen($url_prefix)) == $url_prefix) {
+ $return_to = '/'.substr($return_to, strlen($url_prefix));
+}
+
$triggered = getIntFromRequest('triggered');
if (isset($session_hash)) {
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 6 ------
src/common/widget/WidgetLayout_Row.class.php | 8 +++++---
src/www/account/login.php | 7 +++++++
src/www/my/dashboard.php | 6 +++---
src/www/my/diary.php | 10 ++++++----
5 files changed, 21 insertions(+), 16 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
