mantisbt · Feb 25, 2012 · Feb 25, 2012 · Feb 25, 2012 · Feb 25, 2012
diff --git a/application/MantisBT/Database/DriverAbstract.php b/application/MantisBT/Database/DriverAbstract.php
@@ -19,6 +19,7 @@
 namespace MantisBT\Database;
 
 use MantisBT\Database\PDO\MySQL\MySQLDriver;
+use MantisBT\Exception\Database\DatabaseTypeNotSupported;
 use MantisBT\Exception\Database\ParameterCountMismatch;
 use MantisBT\Exception\Database\QueryFailed;
 use MantisBT\Exception\UnspecifiedException;

diff --git a/application/MantisBT/Error.php b/application/MantisBT/Error.php
@@ -1,8 +1,7 @@
 <?php
 namespace MantisBT;
 use \stdClass;
-
-require_api('lang_api.php');
+use \ErrorException;
 
 class Error {
 	/**
@@ -12,7 +11,6 @@ class Error {
 
 	/**
 	 * Indicates if an error/exception has been handled
-	 * Note: this also indicates additional shutdown functions have been setup.
 	 */
 	private static $handled = false;
 
@@ -51,7 +49,7 @@ public static function exception_handler($exception) {
 		$errorInfo->type = 'EXCEPTION';
 		$errorInfo->name = 'InvalidException';
 		$errorInfo->code = 0;
-		$errorInfo->message = 'An invalid exception type was caught by the exception handler. Unfortuantly no further information can be obtained.';
+		$errorInfo->message = _('An invalid exception type was caught by the exception handler. Unfortuantly no further information can be obtained.');
 
 		if (is_object($exception)) {
 			$reflectionClass = new \ReflectionClass($exception);
@@ -62,78 +60,15 @@ public static function exception_handler($exception) {
 				$errorInfo->file = $exception->getFile();
 				$errorInfo->line = $exception->getLine();
 				$errorInfo->trace = $exception->getTrace();
-				$errorInfo->context = $exception->getContext();
 			}
 		}
 
 		self::init();
 		self::$allErrors[] = $errorInfo;
 	}
 
-	public static function error_handler( $type, $error, $file, $line, $context ) {
-        $errorInfo = new stdClass();
-        $errorInfo->time = time();
-        $errorInfo->type = 'ERROR';
-        $errorInfo->name = isset( self::$errorConstants[$type] ) ? self::$errorConstants[$type] : 'UNKNOWN';
-        $errorInfo->code = $type;
-        $errorInfo->message = is_numeric( $error ) ? self::error_string( $error ) : $error;
-        $errorInfo->file = $file;
-        $errorInfo->line = $line;
-        $errorInfo->context = $context;
-	$errorInfo->trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
-
-        self::$allErrors[] = $errorInfo;
-
-		if( 0 == error_reporting() ) {
-			return false;
-		}
-
-		// historically we inline warnings
-		if( $type != E_WARNING && $type != E_USER_WARNING ) {
-			self::init();
-		}
-
-		if( $type == E_WARNING || $type == E_USER_WARNING ) {
-
-			switch( $type ) {
-				case E_WARNING:
-					$errorType = 'SYSTEM WARNING';
-					$errorDescription = $error;
-					break;
-				case E_USER_WARNING:
-					$errorType = "APPLICATION WARNING #$error";
-					$errorDescription = self::error_string( $error );
-					break;
-			}
-			$errorDescription = nl2br( $errorDescription );
-			echo '<p style="color:red">', $errorType, ': ', $errorDescription, '</p>';
-
-			return true; // @todo true|false??
-		}
-
-		exit();
-	}
-
-	public static function shutdown_error_handler() {
-		$error = error_get_last();
-		if( $error === null ) {
-			return;
-		}
-
-		self::init();
-
-		$errorInfo = new stdClass();
-        $errorInfo->time = time();
-        $errorInfo->type = 'ERROR_LAST';
-        $errorInfo->name = isset( self::$errorConstants[$error['type']] ) ? self::$errorConstants[$error['type']] : 'UNKNOWN';
-        $errorInfo->code = $error['type'];
-        $errorInfo->message = $error['message'];
-        $errorInfo->file = $error['file'];
-        $errorInfo->line = $error['line'];
-        $errorInfo->trace = debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT);
-	$errorInfo->context = null;
-
-        self::$allErrors[] = $errorInfo;
+	public static function exception_error_handler( $errno, $errstr, $errfile, $errline ) {
+		throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
 	}
 
 	public static function display_errors( $noHeader = false ) {
@@ -164,7 +99,7 @@ public static function display_errors( $noHeader = false ) {
 		echo '<hr />';
 
 		echo '<div align="center">';
-		echo lang_get( 'error_no_proceed' );
+		echo _('Please use the "Back" button in your web browser to return to the previous page. There you can correct whatever problems were identified in this error or select another action. You can also click an option from the menu bar to go directly to a new section.');
 		echo '<br />';
 
 		foreach ( self::$allErrors as $key => $errorInfo ) {
@@ -194,7 +129,7 @@ public static function display_error( $error) {
 		echo '<tr><td class="form-title">' . $error->name . '</td></tr>';
 		echo '<tr><td><p class="center" style="color:red">' . nl2br( $error->message ) . '</p></td></tr>';
 		echo '<tr><td>';
-		self::error_print_details( basename( $error->file ), $error->line, $error->context );
+		self::error_print_details( basename( $error->file ), $error->line );
 		echo '</td></tr>';
 		if ( !config_get( 'show_friendly_errors' ) ) {
 			echo '<tr><td>';
@@ -205,13 +140,12 @@ public static function display_error( $error) {
 	}
 
 	/**
-	 * Print out the error details including context
+	 * Print out the error details
 	 * @param string $file
 	 * @param int $line
-	 * @param string $context
 	 * @return null
 	 */
-	public static function error_print_details( $file, $line, $context ) {
+	public static function error_print_details( $file, $line ) {
 		if ( !config_get( 'show_friendly_errors' ) ) {
 		?>
 			<table class="width75">
@@ -221,11 +155,6 @@ public static function error_print_details( $file, $line, $context ) {
 				<tr>
 					<td>Line: <?php echo $line?></td>
 				</tr>
-				<tr>
-					<td>
-						<?php self::error_print_context( $context )?>
-					</td>
-				</tr>
 			</table>
 		<?php
 		} else {
@@ -243,47 +172,7 @@ public static function error_print_details( $file, $line, $context ) {
 		}
 	}
 
-	/**
-	 * Print out the variable context given
-	 * @param string $context
-	 * @return null
-	 */
-	public static function error_print_context( $context ) {
-		if( !is_array( $context ) && !is_object( $context )) {
-			return;
-		}
-
-		echo '<table class="width100"><tr><th>Variable</th><th>Value</th><th>Type</th></tr>';
-
-		# print normal variables
-		foreach( $context as $var => $val ) {
-			if( !is_array( $val ) && !is_object( $val ) ) {
-				$type = gettype( $val );
-				$val = htmlentities( (string) $val, ENT_COMPAT, 'UTF-8' );
-
-				# Mask Passwords
-				if( strpos( $var, 'pass' ) !== false ) {
-					$val = '**********';
-				}
-
-				echo '<tr><td>', $var, '</td><td>', $val, '</td><td>', $type, '</td></tr>', "\n";
-			}
-		}
-
-		# print arrays
-		foreach( $context as $var => $val ) {
-			if( is_array( $val ) && ( $var != 'GLOBALS' ) ) {
-				echo '<tr><td colspan="3"><br /><strong>', $var, '</strong></td></tr>';
-				echo '<tr><td colspan="3">';
-				self::error_print_context( $val );
-				echo '</td></tr>';
-			}
-		}
-
-		echo '</table>';
-		}
-
-		public static function error_print_stack_trace( $stack ) {
+	public static function error_print_stack_trace( $stack ) {
 		echo '<table class="width75">';
 		echo '<tr><th>Filename</th><th>Line</th><th></th><th></th><th>Function</th><th>Args</th></tr>';
 
@@ -345,28 +234,6 @@ public static function error_build_parameter_string( $param, $showType = true, $
 		}
 	}
 
-	/**
-	 * Return an error string (in the current language) for the given error.
-	 * @param int $error
-	 * @return string
-	 * @access public
-	 */
-	public static function error_string( $error ) {
-		# We pad the parameter array to make sure that we don't get errors if
-		#  the caller didn't give enough parameters for the error string
-		$padding = array_pad( array(), 10, '' );
-
-		$error = lang_get( $error, null, false );
-
-		if( $error == '' ) {
-			return lang_get( 'missing_error_string' ) . $error;
-		}
-
-		# ripped from string_api
-		$string = call_user_func_array( 'sprintf', array_merge( array( $error ), self::$parameters, $padding ) );
-		return preg_replace( "/&amp;(#[0-9]+|[a-z]+);/i", "&$1;", @htmlspecialchars( $string, ENT_COMPAT, 'UTF-8' ) );
-	}
-
 	public static function error_handled() {
 		return self::$handled;
 	}

diff --git a/application/MantisBT/Exception/Access/AccessDenied.php b/application/MantisBT/Exception/Access/AccessDenied.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Access;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class AccessDenied extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_ACCESS_DENIED, null, false);
-		parent::__construct( ERROR_ACCESS_DENIED, $errorMessage, null );
+		$errorMessage = _('Access Denied.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 403;
 	}
 }
diff --git a/application/MantisBT/Exception/Access/IssueHandlerAccessDenied.php b/application/MantisBT/Exception/Access/IssueHandlerAccessDenied.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Access;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class IssueHandlerAccessDenied extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_HANDLER_ACCESS_TOO_LOW, null, false);
-		parent::__construct(ERROR_HANDLER_ACCESS_TOO_LOW, $errorMessage, null);
+		$errorMessage = _('Issue handler does not have sufficient access rights to handle issue at this status.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 400;
 	}
 }
diff --git a/application/MantisBT/Exception/Access/RelationshipDestinationIssueAccessDenied.php b/application/MantisBT/Exception/Access/RelationshipDestinationIssueAccessDenied.php
@@ -2,13 +2,10 @@
 namespace MantisBT\Exception\Access;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class RelationshipDestinationIssueAccessDenied extends ExceptionAbstract {
 	public function __construct($destinationIssueID) {
-		$errorMessage = lang_get(ERROR_RELATIONSHIP_ACCESS_LEVEL_TO_DEST_BUG_TOO_LOW, null, false);
-		$errorMessage = sprintf($errorMessage, $destinationIssueID);
-		parent::__construct(ERROR_RELATIONSHIP_ACCESS_LEVEL_TO_DEST_BUG_TOO_LOW, $errorMessage, null);
+		$errorMessage = sprintf(_('Access denied: You do not have permission to modify relationships for destination issue %1$d.'), $destinationIssueID);
+		parent::__construct($errorMessage);
 		$this->responseCode = 403;
 	}
 }
diff --git a/application/MantisBT/Exception/Access/SponsorshipAssignerAccessDenied.php b/application/MantisBT/Exception/Access/SponsorshipAssignerAccessDenied.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Access;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class SponsorshipAssignerAccessDenied extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_SPONSORSHIP_ASSIGNER_ACCESS_LEVEL_TOO_LOW, null, false);
-		parent::__construct(ERROR_SPONSORSHIP_ASSIGNER_ACCESS_LEVEL_TOO_LOW, $errorMessage, null);
+		$errorMessage = _('Access Denied: Assigning sponsored issues requires a higher access level.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 403;
 	}
 }
diff --git a/application/MantisBT/Exception/Access/SponsorshipHandlerAccessDenied.php b/application/MantisBT/Exception/Access/SponsorshipHandlerAccessDenied.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Access;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class SponsorshipHandlerAccessDenied extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_SPONSORSHIP_HANDLER_ACCESS_LEVEL_TOO_LOW, null, false);
-		parent::__construct(ERROR_SPONSORSHIP_HANDLER_ACCESS_LEVEL_TOO_LOW, $errorMessage, null);
+		$errorMessage = _('Handler does not have the required access level to handle sponsored issues.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 400;
 	}
 }
diff --git a/application/MantisBT/Exception/Attachment/AttachmentDuplicate.php b/application/MantisBT/Exception/Attachment/AttachmentDuplicate.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Attachment;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class AttachmentDuplicate extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_FILE_DUPLICATE, null, false);
-		parent::__construct(ERROR_FILE_DUPLICATE, $errorMessage, null);
+		$errorMessage = _('This is a duplicate file. Please delete the existing file first.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 400;
 	}
 }
diff --git a/application/MantisBT/Exception/Attachment/AttachmentFileTypeDisallowed.php b/application/MantisBT/Exception/Attachment/AttachmentFileTypeDisallowed.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Attachment;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class AttachmentFileTypeDisallowed extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_FILE_NOT_ALLOWED, null, false);
-		parent::__construct(ERROR_FILE_NOT_ALLOWED, $errorMessage, null);
+		$errorMessage = _('File type not allowed for uploads.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 400;
 	}
 }
diff --git a/application/MantisBT/Exception/Attachment/AttachmentMoveFailed.php b/application/MantisBT/Exception/Attachment/AttachmentMoveFailed.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Attachment;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class AttachmentMoveFailed extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_FILE_MOVE_FAILED, null, false);
-		parent::__construct(ERROR_FILE_MOVE_FAILED, $errorMessage, null);
+		$errorMessage = _('Uploaded file could not be moved to the file storage directory. Directory either does not exist or not writable to webserver.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 500;
 	}
 }
diff --git a/application/MantisBT/Exception/Attachment/AttachmentNotReadable.php b/application/MantisBT/Exception/Attachment/AttachmentNotReadable.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Attachment;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class AttachmentNotReadable extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_UPLOAD_FAILURE, null, false);
-		parent::__construct(ERROR_UPLOAD_FAILURE, $errorMessage, null);
+		$errorMessage = _('File upload failed. File is not readable by MantisBT. Please check the project settings.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 500;
 	}
 }
diff --git a/application/MantisBT/Exception/Attachment/AttachmentOversized.php b/application/MantisBT/Exception/Attachment/AttachmentOversized.php
@@ -2,12 +2,10 @@
 namespace MantisBT\Exception\Attachment;
 use MantisBT\Exception\ExceptionAbstract;
 
-require_api('lang_api.php');
-
 class AttachmentOversized extends ExceptionAbstract {
 	public function __construct() {
-		$errorMessage = lang_get(ERROR_FILE_TOO_BIG, null, false);
-		parent::__construct( ERROR_FILE_TOO_BIG, $errorMessage, null );
+		$errorMessage = _('File upload failed. This is likely because the filesize was larger than is currently allowed by this PHP installation.');
+		parent::__construct($errorMessage);
 		$this->responseCode = 400;
 	}
 }