[evolvis-commits] r6672: merge bm:taramir/patches/wui-tweaks
mirabilos at evolvis.org
mirabilos at evolvis.org
Wed Jun 2 16:42:24 CEST 2010
Author: mirabilos
Date: 2010-06-02 16:42:23 +0200 (Wed, 02 Jun 2010)
New Revision: 6672
Added:
trunk/gforge_base/evolvisforge/gforge/deb-specific/pkginfo.inc.php
Modified:
trunk/gforge_base/evolvisforge/gforge/common/include/utils.php
trunk/gforge_base/evolvisforge/gforge/debian/changelog
trunk/gforge_base/evolvisforge/gforge/debian/rules
trunk/gforge_base/evolvisforge/gforge/www/frs/admin/qrs.php
trunk/gforge_base/evolvisforge/gforge/www/include/features_boxes.php
Log:
merge bm:taramir/patches/wui-tweaks
Modified: trunk/gforge_base/evolvisforge/gforge/common/include/utils.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/common/include/utils.php 2010-06-01 16:27:46 UTC (rev 6671)
+++ trunk/gforge_base/evolvisforge/gforge/common/include/utils.php 2010-06-02 14:42:23 UTC (rev 6672)
@@ -4,6 +4,8 @@
*
* Copyright 1999-2001, VA Linux Systems, Inc.
* Copyright 2009, Roland Mas
+ * Copyright © 2010
+ * Thorsten Glaser <t.glaser at tarent.de>
*
* This file is part of FusionForge.
*
@@ -1051,6 +1053,32 @@
}
}
+function util_ini_get_bytes($id) {
+ $val = trim(ini_get($id));
+ $last = strtolower($val[strlen($val)-1]);
+ switch ($last) {
+ case 'g':
+ $val *= 1024;
+ case 'm':
+ $val *= 1024;
+ case 'k':
+ $val *= 1024;
+ }
+ return $val;
+}
+
+function util_get_maxuploadfilesize() {
+ $postmax = util_ini_get_bytes('post_max_size');
+ $maxfile = util_ini_get_bytes('upload_max_filesize');
+
+ $postfile = (int)(($postmax * 3) / 4);
+
+ if ($postfile < $maxfile)
+ $postfile = $maxfile;
+
+ return $postfile;
+}
+
// Local Variables:
// mode: php
// c-file-style: "bsd"
Added: trunk/gforge_base/evolvisforge/gforge/deb-specific/pkginfo.inc.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/deb-specific/pkginfo.inc.php (rev 0)
+++ trunk/gforge_base/evolvisforge/gforge/deb-specific/pkginfo.inc.php 2010-06-02 14:42:23 UTC (rev 6672)
@@ -0,0 +1,6 @@
+<?php
+
+$forge_pkg_name = '@PKGNAME@';
+$forge_pkg_version = '@PKGVERSION@';
+
+?>
\ No newline at end of file
Modified: trunk/gforge_base/evolvisforge/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-06-01 16:27:46 UTC (rev 6671)
+++ trunk/gforge_base/evolvisforge/gforge/debian/changelog 2010-06-02 14:42:23 UTC (rev 6672)
@@ -8,8 +8,10 @@
* Split httpd configuration files and re-join them differently,
to avoid duplication (unify differences where found) and
permit easier overrides (especially to add HTTP Basic Auth)
+ * Display the forge flavour and version on the website
+ * Display estimated maximum file size for HTTP uploads in QRS
- -- Thorsten Glaser <t.glaser at tarent.de> Tue, 01 Jun 2010 17:41:21 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de> Wed, 02 Jun 2010 12:30:01 +0200
gforge (4.8.3+evolvis16) unstable; urgency=low
Modified: trunk/gforge_base/evolvisforge/gforge/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/debian/rules 2010-06-01 16:27:46 UTC (rev 6671)
+++ trunk/gforge_base/evolvisforge/gforge/debian/rules 2010-06-02 14:42:23 UTC (rev 6672)
@@ -9,7 +9,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+WHICH_FORGE=EvolvisForge
PACKAGE=gforge
+VERSION := $(shell dpkg-parsechangelog | sed -n '/^Version: /s///p')
include /usr/share/dpatch/dpatch.make
CRONFILESLIST=$(patsubst cron.d/%,debian/$(PACKAGE)-%.cron.d,$(wildcard cron.d/[a-z]*))
@@ -99,6 +101,12 @@
#dh_install --fail-missing -X.svn -X.arch-ids -X.bzr -X.cvsignore --sourcedir=$(CURDIR)
dh_install -X.svn -X.arch-ids -X.bzr -X.cvsignore --sourcedir=$(CURDIR)
+ sed \
+ -e 's!@PKGNAME@!${WHICH_FORGE}!g' \
+ -e 's!@PKGVERSION@!${VERSION}!g' \
+ <$(CURDIR)/deb-specific/pkginfo.inc.php \
+ >$(CURDIR)/debian/$(PACKAGE)-common/usr/share/$(PACKAGE)/pkginfo.inc.php
+
# Install few links
ln -s database-pgsql.php $(CURDIR)/debian/$(PACKAGE)-common/usr/share/$(PACKAGE)/common/include/database.php
ln -s /usr/share/mediawiki/skins/$(PACKAGE)/loader.php $(CURDIR)/debian/$(PACKAGE)-plugin-mediawiki/etc/mediawiki-extensions/extensions-available/GforgeAuth.php
Modified: trunk/gforge_base/evolvisforge/gforge/www/frs/admin/qrs.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/frs/admin/qrs.php 2010-06-01 16:27:46 UTC (rev 6671)
+++ trunk/gforge_base/evolvisforge/gforge/www/frs/admin/qrs.php 2010-06-02 14:42:23 UTC (rev 6672)
@@ -192,6 +192,7 @@
<td>
<span class="important">
<?php echo _('NOTE: In some browsers you must select the file in the file-upload dialog and click "OK". Double-clicking doesn\'t register the file.')?>)</span><br />
+ <?php printf(_('You can probably not upload files larger than about %.2f MiB in size.'), util_get_maxuploadfilesize() / 1048576); ?><br />
<?php echo _('Upload a new file') ?>: <input type="file" name="userfile" size="30" />
<?php if ($sys_use_ftpuploads) {
Modified: trunk/gforge_base/evolvisforge/gforge/www/include/features_boxes.php
===================================================================
--- trunk/gforge_base/evolvisforge/gforge/www/include/features_boxes.php 2010-06-01 16:27:46 UTC (rev 6671)
+++ trunk/gforge_base/evolvisforge/gforge/www/include/features_boxes.php 2010-06-02 14:42:23 UTC (rev 6672)
@@ -9,6 +9,7 @@
//require_once('../env.inc.php');
//require_once('pre.php');
+require_once $gfcommon.'pkginfo.inc.php';
require_once $gfcommon.'include/FusionForge.class.php';
require_once $gfcommon.'include/tag_cloud.php';
@@ -38,6 +39,9 @@
$return .= show_highest_ranked_projects();
$return .= $HTML->boxMiddle(_('Recently Registered Projects'));
$return .= show_newest_projects();
+ $return .= $HTML->boxMiddle(_('System Information'));
+ $return .= sprintf(_('%s is running %s %s'), $GLOBALS['sys_name'],
+ $forge_pkg_name, $forge_pkg_version);
$return .= $HTML->boxBottom(0);
return $return;
}
More information about the evolvis-commits
mailing list