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 0ff89bd82f74b5cc8b47e183aaf59f18b7b37c47 (commit)
via cc3b4061a165c15231f3a9dda1fd925b7ee9f784 (commit)
via ef951eb10a29aa5c439cc78eb0e60b12ece349ce (commit)
via 2bd09d79590c61d91f467a6d854fd9d4804e6faa (commit)
via 1b1687b9da38e9d683afe7178c784dd41df2c72d (commit)
from 93ce27a7956d782782ed4f16a40517834775200f (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=0ff89bd82f74b5cc8b47e183aaf59f18b7b37c47
commit 0ff89bd82f74b5cc8b47e183aaf59f18b7b37c47
Author: Franck Villaume <[email protected]>
Date: Thu May 25 12:24:10 2017 +0200
remove useless p tag
diff --git a/src/www/admin/index.php b/src/www/admin/index.php
index 62a84f6..90ec127 100644
--- a/src/www/admin/index.php
+++ b/src/www/admin/index.php
@@ -84,17 +84,17 @@ echo html_ac(html_ap() - 1);
<ul>
<li><?php
- echo $HTML->openForm(array('action' =>
'/admin/globalroleedit.php', 'method' => 'post')).'<p>';
+ echo $HTML->openForm(array('action' =>
'/admin/globalroleedit.php', 'method' => 'post'));
echo global_role_box('role_id');
- echo '<input type="submit" name="edit" value="'._("Edit
Role").'" /></p>'.$HTML->closeForm();
+ echo '<input type="submit" name="edit" value="'._("Edit
Role").'" />'.$HTML->closeForm();
?>
</li>
<li>
<?php
- echo $HTML->openForm(array('action' =>
'/admin/globalroleedit.php', 'method' => 'post')).'<p>';
+ echo $HTML->openForm(array('action' =>
'/admin/globalroleedit.php', 'method' => 'post'));
echo '<input type="text" name="role_name" size="10" value=""
required="required" />';
- echo '<input type="submit" name="add" value="'._("Create
Role").'" /></p>'.$HTML->closeForm();
+ echo '<input type="submit" name="add" value="'._("Create
Role").'" />'.$HTML->closeForm();
?></li>
</ul>
</div>
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cc3b4061a165c15231f3a9dda1fd925b7ee9f784
commit cc3b4061a165c15231f3a9dda1fd925b7ee9f784
Author: Franck Villaume <[email protected]>
Date: Thu May 25 12:19:51 2017 +0200
fix HTML syntax
diff --git a/src/common/frs/views/usemanualuploads.php
b/src/common/frs/views/usemanualuploads.php
index 4597a54..3ea6536 100644
--- a/src/common/frs/views/usemanualuploads.php
+++ b/src/common/frs/views/usemanualuploads.php
@@ -31,11 +31,11 @@ $incoming =
forge_get_config('groupdir_prefix').'/'.$g->getUnixName().'/incoming
$localcontent = sprintf(_('Alternatively, you can use a file you already
uploaded (by SFTP or SCP) to the <a href="%2$s">project\'s incoming
directory</a> (%1$s).'),
$incoming,
'sftp://'.forge_get_config('web_host').$incoming.'/');
$localcontent .= ' ' . _('This direct <samp>sftp://</samp> link only works
with some browsers, such as Konqueror.') .html_e('br');
-$localcontent .= _('Choose an already uploaded file:').html_e('br');
+$localcontent .= _('Choose an already uploaded file')._(':');
+$content = html_e('p', array(), $localcontent);
$manual_files_arr = frs_filterfiles(ls($incoming, true));
if (count($manual_files_arr)) {
- $localcontent .= html_build_select_box_from_arrays($manual_files_arr,
$manual_files_arr, 'manual_filename', '');
+ $content .= html_build_select_box_from_arrays($manual_files_arr,
$manual_files_arr, 'manual_filename', '');
} else {
- $localcontent .= $HTML->information(_('No uploaded file available.'));
+ $content .= $HTML->information(_('No uploaded file available.'));
}
-$content .= html_e('p', array(), $localcontent);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ef951eb10a29aa5c439cc78eb0e60b12ece349ce
commit ef951eb10a29aa5c439cc78eb0e60b12ece349ce
Author: Franck Villaume <[email protected]>
Date: Thu May 25 12:13:21 2017 +0200
use CSS
diff --git a/src/common/frs/views/admin.php b/src/common/frs/views/admin.php
index 216c94a..deabd42 100644
--- a/src/common/frs/views/admin.php
+++ b/src/common/frs/views/admin.php
@@ -130,7 +130,7 @@ if (count($FRSPackages) == 0) {
if (forge_check_perm('frs', $FRSPackage->getID(), 'file') &&
count($FRSPackage->getReleases())) {
$content .=
util_make_link('/frs/?view=showreleases&package_id='.$FRSPackage->getID().'&group_id='.$group_id,
$HTML->getConfigurePic(_('Edit Releases'), _('Edit Releases')));
}
- $cells[] = array($content, 'style' => 'white-space: nowrap;',
'align' => 'center');
+ $cells[] = array($content, 'style' => 'white-space: nowrap;',
'class' => 'align-center');
echo $HTML->multiTableRow(array('id' =>
'pkgid'.$FRSPackage->getID()), $cells);
}
echo $HTML->listTableBottom();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2bd09d79590c61d91f467a6d854fd9d4804e6faa
commit 2bd09d79590c61d91f467a6d854fd9d4804e6faa
Author: Franck Villaume <[email protected]>
Date: Thu May 25 12:04:56 2017 +0200
better handling for url_prefix: REQUEST_URI is already reformated
diff --git a/src/www/frs/download.php b/src/www/frs/download.php
index a1d194b..320dc81 100644
--- a/src/www/frs/download.php
+++ b/src/www/frs/download.php
@@ -90,10 +90,7 @@ function send_file($filename, $filepath, $file_id = NULL,
$mode = NULL) {
}
}
-$normalized_urlprefix = normalized_urlprefix();
-$pathinfo = substr_replace(getStringFromServer('REQUEST_URI'), '', 0,
strlen($normalized_urlprefix)-1);
-$expl_pathinfo = explode('/', $pathinfo);
-
+$expl_pathinfo = explode('/', getStringFromServer('REQUEST_URI'));
$mode = $expl_pathinfo[3];
// .../download.php/123/foo.tar.gz (5.1 backward compatibility)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1b1687b9da38e9d683afe7178c784dd41df2c72d
commit 1b1687b9da38e9d683afe7178c784dd41df2c72d
Author: Franck Villaume <[email protected]>
Date: Thu May 25 12:04:15 2017 +0200
fix HTML syntax
diff --git a/src/common/frs/views/listpackages.php
b/src/common/frs/views/listpackages.php
index 158fd87..1d888e4 100644
--- a/src/common/frs/views/listpackages.php
+++ b/src/common/frs/views/listpackages.php
@@ -104,7 +104,7 @@ EOS;
$image = $HTML->getStartMonitoringPic($title);
}
$errorMessage = _('Unable to set monitoring');
- $package_monitor = util_make_link('#', $image,
array('id' => 'pkgid'.$package_id, 'onclick' =>
'javascript:controllerFRS.doAction({action:\''.util_make_uri($url).'\',
id:\'pkgid'.$package_id.'\'})'), true);
+ $package_monitor = html_e('span', array('class' =>
'frs-monitor-package'), util_make_link('#', $image, array('id' =>
'pkgid'.$package_id, 'onclick' =>
'javascript:controllerFRS.doAction({action:\''.util_make_uri($url).'\',
id:\'pkgid'.$package_id.'\'})'), true));
} else {
$package_monitor = '';
}
@@ -117,15 +117,11 @@ EOS;
$package_ziplink = '';
if ($FRSPackageReleases && $num_releases >= 1 &&
class_exists('ZipArchive') &&
file_exists($FRSPackage->getReleaseZipPath($FRSPackage->getNewestReleaseID())))
{
// display link to latest-release-as-zip
- $package_ziplink = html_e('span',
- array('class' => 'frs-zip-package'),
- util_make_link(
-
util_make_uri('/frs/download.php/latestzip/'.$FRSPackage->getID()
- .'/'.$FRSPackage->getNewestReleaseZipName()),
- $HTML->getZipPic(_('Download the newest release as
ZIP.')
- .' '._('This link always points to the newest
release as a ZIP file.'))));
+ $package_ziplink = html_e('span', array('class' =>
'frs-zip-package'),
util_make_link('/frs/download.php/latestzip/'.$FRSPackage->getID().'/'.$FRSPackage->getNewestReleaseZipName(),
+
$HTML->getZipPic(_('Download
the newest release as ZIP.')
+
.' '._('This link always points
to the newest release as a ZIP file.'))));
}
- echo html_e('h2', array('id' => 'title_'.
$package_name_protected), html_entity_decode($package_name).html_e('span',
array('class' => 'frs-monitor-package'), $package_monitor).$package_ziplink);
+ echo html_e('h2', array('id' => 'title_'.
$package_name_protected),
html_entity_decode($package_name).$package_monitor.$package_ziplink);
if ( !$FRSPackageReleases || $num_releases < 1 ) {
echo $HTML->warning_msg(_('No releases'));
@@ -136,9 +132,7 @@ EOS;
$ziplink = '';
if (class_exists('ZipArchive')) {
if
(file_exists($FRSPackage->getReleaseZipPath($package_release_id))) {
- $ziplink .= util_make_link(
-
util_make_uri('/frs/download.php/zip/'.$FRSPackageRelease->getID()
-
.'/'.$FRSPackage->getReleaseZipName($FRSPackageRelease->getID())),
+ $ziplink .=
util_make_link('/frs/download.php/zip/'.$FRSPackageRelease->getID().'/'.$FRSPackage->getReleaseZipName($FRSPackageRelease->getID()),
$HTML->getZipPic(_('Download
this release as ZIP.')
.' '._('This link always
points to this release as a ZIP file.')));
}
@@ -165,8 +159,9 @@ EOS;
$roadmapObject = new
Roadmap($g, $linkedRoadmapID);
$rnum = 0;
foreach ($linkedRoadmap
as $linkedRoadmapRelease) {
- if ($rnum)
+ if ($rnum) {
$urls
.= ' || ';
+ }
$urls .=
util_make_link('/tracker/roadmap.php?group_id='.$group_id.'&release='.urlencode($linkedRoadmapRelease),
$roadmapObject->getName().' - '.$linkedRoadmapRelease);
$rnum++;
}
@@ -197,13 +192,13 @@ EOS;
// now iterate and show the
files in this release....
foreach ($res_files as
$res_file) {
$cells = array();
- $cells[][] =
util_make_link('/frs/download.php/file/'.$res_file->getID().'/'.$res_file->getName(),
$res_file->getName());
+ $cells[][] =
util_make_link('/frs/download.php/file/'.$res_file->getID().'/'.urlencode($res_file->getName()),
$res_file->getName());
$cells[][] =
date(_('Y-m-d H:i'), $res_file->getReleaseTime());
$cells[][] =
human_readable_bytes($res_file->getSize());
$cells[][] =
($res_file->getDownloads() ? number_format($res_file->getDownloads(), 0) : '0');
$cells[][] =
$res_file->getProcessor();
$cells[][] =
$res_file->getFileType();
- $cells[][] =
util_make_link('/frs/download.php/latestfile/'.$FRSPackage->getID().'/'.$res_file->getName(),
_('Latest version'));
+ $cells[][] =
util_make_link('/frs/download.php/latestfile/'.$FRSPackage->getID().'/'.urlencode($res_file->getName()),
_('Latest version'));
echo
$HTML->multiTableRow(array(), $cells);
}
echo $HTML->listTableBottom();
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/views/admin.php | 2 +-
src/common/frs/views/listpackages.php | 25 ++++++++++---------------
src/common/frs/views/usemanualuploads.php | 8 ++++----
src/www/admin/index.php | 8 ++++----
src/www/frs/download.php | 5 +----
5 files changed, 20 insertions(+), 28 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
