[Fusionforge-commits] r9115 - branches/Branch_5_0/gforge/www/tracker
Roland Mas
lolando at libremir.placard.fr.eu.org
Tue Mar 16 21:46:35 CET 2010
Author: lolando
Date: 2010-03-16 21:46:35 +0100 (Tue, 16 Mar 2010)
New Revision: 9115
Modified:
branches/Branch_5_0/gforge/www/tracker/mod-limited.php
branches/Branch_5_0/gforge/www/tracker/mod.php
branches/Branch_5_0/gforge/www/tracker/tracker.php
Log:
Fixed file uploads for artefacts [#72]
Modified: branches/Branch_5_0/gforge/www/tracker/mod-limited.php
===================================================================
--- branches/Branch_5_0/gforge/www/tracker/mod-limited.php 2010-03-16 20:45:26 UTC (rev 9114)
+++ branches/Branch_5_0/gforge/www/tracker/mod-limited.php 2010-03-16 20:46:35 UTC (rev 9115)
@@ -141,11 +141,11 @@
<table border="0" width="80%">
<tr><td colspan="2">
<?php echo _('Attach Files') ?><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
+ <input type="file" name="input_file0" size="30" /><br />
+ <input type="file" name="input_file1" size="30" /><br />
+ <input type="file" name="input_file2" size="30" /><br />
+ <input type="file" name="input_file3" size="30" /><br />
+ <input type="file" name="input_file4" size="30" /><br />
<p>
<h3><?php echo _('Attached Files') ?>:</h3>
<?php
Modified: branches/Branch_5_0/gforge/www/tracker/mod.php
===================================================================
--- branches/Branch_5_0/gforge/www/tracker/mod.php 2010-03-16 20:45:26 UTC (rev 9114)
+++ branches/Branch_5_0/gforge/www/tracker/mod.php 2010-03-16 20:46:35 UTC (rev 9115)
@@ -248,11 +248,11 @@
<table border="0" width="80%">
<tr><td colspan="2">
<strong><?php echo _('Attach Files') ?>:</strong><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
- <input type="file" name="input_file[]" size="30" /><br />
+ <input type="file" name="input_file0" size="30" /><br />
+ <input type="file" name="input_file1" size="30" /><br />
+ <input type="file" name="input_file2" size="30" /><br />
+ <input type="file" name="input_file3" size="30" /><br />
+ <input type="file" name="input_file4" size="30" /><br />
<?php
//
// print a list of files attached to this Artifact
Modified: branches/Branch_5_0/gforge/www/tracker/tracker.php
===================================================================
--- branches/Branch_5_0/gforge/www/tracker/tracker.php 2010-03-16 20:45:26 UTC (rev 9114)
+++ branches/Branch_5_0/gforge/www/tracker/tracker.php 2010-03-16 20:46:35 UTC (rev 9115)
@@ -87,7 +87,8 @@
//
$ext_feedback = '';
for ($i=0; $i<5; $i++) {
- $error=$_FILES['input_file']['error'][$i];
+ $f = getUploadedFile("input_file$i");
+ $error = $f['error'];
if (isset($error) && $error > 0) {
$n = $i+1;
if ($error === 1 || $error === 2) {
@@ -99,19 +100,19 @@
}
continue;
}
- $file_name=$_FILES['input_file']['name'][$i];
- $tmp_name=$_FILES['input_file']['tmp_name'][$i];
+ $file_name = $f['name'];
+ $tmp_name = $f['tmp_name'];
+ $size = $f['size'];
+ $type = $f['type'];
if (!is_uploaded_file($tmp_name)) {
continue;
}
- $size=$_FILES['input_file']['size'][$i];
- $type=$_FILES['input_file']['type'][$i];
$afh=new ArtifactFileHtml($ah);
if (!$afh || !is_object($afh)) {
$feedback .= 'Could Not Create File Object';
- // } elseif ($afh->isError()) {
- // $feedback .= $afh->getErrorMessage();
+ } elseif ($afh->isError()) {
+ $feedback .= $afh->getErrorMessage();
} else {
if (!util_check_fileupload($tmp_name)) {
form_release_key(getStringFromRequest('form_key'));
@@ -317,7 +318,8 @@
//
$ext_feedback = '';
for ($i=0; $i<5; $i++) {
- $error=$_FILES['input_file']['error'][$i];
+ $f = getUploadedFile("input_file$i");
+ $error = $f['error'];
if (isset($error) && $error > 0) {
$n = $i+1;
if ($error === 1 || $error === 2) {
@@ -329,37 +331,31 @@
}
continue;
}
- $file_name=$_FILES['input_file']['name'][$i];
- $tmp_name=$_FILES['input_file']['tmp_name'][$i];
+ $file_name = $f['name'];
+ $tmp_name = $f['tmp_name'];
+ $size = $f['size'];
+ $type = $f['type'];
+
if (!is_uploaded_file($tmp_name)) {
continue;
+ }
+ $afh=new ArtifactFileHtml($ah);
+ if (!$afh || !is_object($afh)) {
+ $feedback .= 'Could Not Create File Object';
+ } elseif ($afh->isError()) {
+ $feedback .= $afh->getErrorMessage();
+ } else {
+ if (!util_check_fileupload($tmp_name)) {
+ form_release_key(getStringFromRequest('form_key'));
+ exit_error("Error","Invalid filename");
+ }
if (!$afh->upload($tmp_name,$file_name,$type,' ')) {
$feedback .= ' <br />'._('File Upload: Error').':'.$afh->getErrorMessage();
$was_error=true;
} else {
$feedback .= ' <br />'._('File Upload: Successful');
}
- $size=$_FILES['input_file']['size'][$i];
- $type=$_FILES['input_file']['type'][$i];
-
- $afh=new ArtifactFileHtml($ah);
- if (!$afh || !is_object($afh)) {
- $feedback .= 'Could Not Create File Object';
- // } elseif ($afh->isError()) {
- // $feedback .= $afh->getErrorMessage();
- } else {
- if (!util_check_fileupload($tmp_name)) {
- form_release_key(getStringFromRequest('form_key'));
- exit_error("Error","Invalid filename");
- }
- if (!$afh->upload($tmp_name,$file_name,$type,' ')) {
- $feedback .= ' <br />'._('File Upload: Error').':'.$afh->getErrorMessage();
- $was_error=true;
- } else {
- $feedback .= ' <br />'._('File Upload: Successful');
- }
- }
}
}
More information about the Fusionforge-commits
mailing list