[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 283a7b5af74bcbbd7102db7af131f0a9ea3295c6

Franck VILLAUME nerville at fusionforge.org
Sun Feb 9 16:46:17 CET 2014


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, Branch_5_2 has been updated
       via  283a7b5af74bcbbd7102db7af131f0a9ea3295c6 (commit)
      from  ce356ca4ae467d9ba554a7a86279f07f27931efe (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 -----------------------------------------------------------------
commit 283a7b5af74bcbbd7102db7af131f0a9ea3295c6
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Feb 9 16:37:08 2014 +0100

    fix [#317]: add check on processor and file type

diff --git a/src/www/frs/admin/editrelease.php b/src/www/frs/admin/editrelease.php
index a169aed..d713d20 100644
--- a/src/www/frs/admin/editrelease.php
+++ b/src/www/frs/admin/editrelease.php
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2002-2004 (c) GForge Team
+ * Copyright 2014, Franck Villaume - TrivialDev
  * http://fusionforge.org/
  *
  * This file is part of FusionForge. FusionForge is free software;
@@ -151,12 +152,18 @@ if (getStringFromRequest('step2')) {
 	$ftp_filename = getStringFromRequest('ftp_filename');
 	$manual_filename = getStringFromRequest('manual_filename');
 
-	$ret = frs_add_file_from_form ($frsr, $type_id, $processor_id, $release_date,
-				       $userfile, $ftp_filename, $manual_filename) ;
-	if ($ret == true) {
-		$feedback = _('File Released') ;
+	if (!$type_id || $type_id == "100") {
+		$warning_msg .= _('Must select a file type.');
+	} else if (!$processor_id || $processor_id == "100") {
+		$warning_msg .= _('Must select a processor type.');
 	} else {
-		$error_msg .= $ret ;
+		$ret = frs_add_file_from_form ($frsr, $type_id, $processor_id, $release_date,
+					$userfile, $ftp_filename, $manual_filename) ;
+		if ($ret == true) {
+			$feedback = _('File Released') ;
+		} else {
+			$error_msg .= $ret ;
+		}
 	}
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/www/frs/admin/editrelease.php |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list