[svn-commits] jpeeler: mantis/trunk r57 - in /mantis/trunk: ./ lang/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Jan 21 13:47:10 2009
New Revision: 57

URL: http://svn.digium.com/svn-view/thirdparty?view=rev&rev=57
Log:
Removed define ERROR_LICENSE_NOT_ON_FILE since it is only used in one place and can not use the internal error handling functions to render required HTML.


Modified:
    mantis/trunk/bug_file_add.php
    mantis/trunk/lang/strings_english.txt

Modified: mantis/trunk/bug_file_add.php
URL: http://svn.digium.com/svn-view/thirdparty/mantis/trunk/bug_file_add.php?view=diff&rev=57&r1=56&r2=57
==============================================================================
--- mantis/trunk/bug_file_add.php (original)
+++ mantis/trunk/bug_file_add.php Wed Jan 21 13:47:10 2009
@@ -55,9 +55,18 @@
 
 	if ( isset( $_POST["code_submission"] ) ) {
 		if  (! license_on_file( $t_user_id ) ) {
-			error_parameters( $_SERVER["HTTP_REFERER"] );
-			error_proceed_url( "#\" onclick=\"javascript: history.back(-1);" );
-			trigger_error( ERROR_LICENSE_NOT_ON_FILE, ERROR );
+			html_page_top1();
+			html_page_top2();
+
+			$t_error_description = sprintf("Sorry, you don't have a license agreement on file.<br />You must sign an agreement before being allowed to make code or documentation submissions.<br /><br /><a href=\"license_agreement.php?redirect=%s\">Click here to sign a license agreement</a>&nbsp;&nbsp;<a href=\"#\" onclick=\"javascript: history.back(-1);\">Click here to go back</a><br />", $_SERVER["HTTP_REFERER"]);
+
+			PRINT '<br /><div align="center"><table class="width50" cellspacing="1">';
+            PRINT "<tr><td class=\"form-title\">LICENSE ERROR</td></tr>";
+            PRINT "<tr><td><p class=\"center\" style=\"color:red\">$t_error_description</p></td></tr></table></div>"; 
+
+			html_page_bottom1();
+			exit; # stop processing since a link must be clicked
+
 		} else {
 			/* it is a code submission, and by the author of the bug id, probably a patch */
 			$summary = &$t_bug_data->summary;

Modified: mantis/trunk/lang/strings_english.txt
URL: http://svn.digium.com/svn-view/thirdparty/mantis/trunk/lang/strings_english.txt?view=diff&rev=57&r1=56&r2=57
==============================================================================
--- mantis/trunk/lang/strings_english.txt (original)
+++ mantis/trunk/lang/strings_english.txt Wed Jan 21 13:47:10 2009
@@ -304,9 +304,6 @@
 $MANTIS_ERROR[ERROR_INVALID_REQUEST_METHOD] = 'This page cannot be accessed using this method.';
 $MANTIS_ERROR[ERROR_INVALID_SORT_FIELD] = 'Invalid sort field.';
 
-define( "ERROR_LICENSE_NOT_ON_FILE", 1337 );
-$MANTIS_ERROR[ERROR_LICENSE_NOT_ON_FILE] = "Sorry, you don't have a license agreement on file.<br />You must sign an agreement before being allowed to make code or documentation submissions.<br /><br><a href=\"license_agreement.php?redirect=%s\">Click here to sign a license agreement</a><br />";
-
 $s_login_error = 'Your account may be disabled or blocked or the username/password you entered is incorrect.';
 $s_login_cookies_disabled = 'Your browser either does not know how to handle cookies, or refuses to handle them.';