7 files changed, 123 insertions, 6 deletions
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index 72908e4b9d..54ed4dcc9e 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -18,7 +18,7 @@
 			{DEBUG_OUTPUT}
 		<!-- ENDIF -->
 
-		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}">
+		<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 			<div id="darken">&nbsp;</div>
 			<div class="jalert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 		</div>
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index e3f1f9f55b..e0f1dc1eef 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -252,9 +252,24 @@ phpbb.ajaxify = function(options) {
 			return;
 		}
 
-		function errorHandler() {
+		/**
+		 * Handler for AJAX errors
+		 */
+		function errorHandler(jqXHR, textStatus, errorThrown) {
+			if (console && console.log) {
+				console.log('AJAX error. status: ' + textStatus + ', message: ' + errorThrown);
+			}
 			phpbb.clearLoadingTimeout();
-			phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
+			var errorText = false;
+			if (typeof errorThrown === 'string' && errorThrown.length > 0) {
+				errorText = errorThrown;
+			}
+			else {
+				errorText = dark.attr('data-ajax-error-text-' + textStatus);
+				if (typeof errorText !== 'string' || !errorText.length) 
+					errorText = dark.attr('data-ajax-error-text');
+			}
+			phpbb.alert(dark.attr('data-ajax-error-title'), errorText);
 		}
 
 		/**
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php
index f7f003781d..6b5407067d 100644
--- a/phpBB/includes/acp/acp_update.php
+++ b/phpBB/includes/acp/acp_update.php
@@ -38,7 +38,7 @@ class acp_update
 
 		$info = obtain_latest_version_info(request_var('versioncheck_force', false));
 
-		if ($info === false)
+		if (empty($info))
 		{
 			trigger_error('VERSIONCHECK_FAIL', E_USER_WARNING);
 		}
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index d9e445cff9..72855af5f8 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -3088,7 +3088,7 @@ function obtain_latest_version_info($force_update = false, $warn_fail = false, $
 		$info = get_remote_file('version.phpbb.com', '/phpbb',
 				((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
 
-		if ($info === false)
+		if (empty($info))
 		{
 			$cache->destroy('versioncheck');
 			if ($warn_fail)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 47a77d1dee..6e1782d551 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -70,6 +70,9 @@ $lang = array_merge($lang, array(
 	'AIM'							=> 'AIM',
 	'AJAX_ERROR_TITLE'				=> 'AJAX error',
 	'AJAX_ERROR_TEXT'				=> 'Something went wrong when processing your request.',
+	'AJAX_ERROR_TEXT_ABORT'			=> 'User aborted request.',
+	'AJAX_ERROR_TEXT_TIMEOUT'		=> 'Your request timed out; please try again.',
+	'AJAX_ERROR_TEXT_PARSERERROR'	=> 'Something went wrong with the request and the server returned an invalid reply.',
 	'ALLOWED'						=> 'Allowed',
 	'ALL_FILES'						=> 'All files',
 	'ALL_FORUMS'					=> 'All forums',
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js
index 0a749347ad..fd4c68adfe 100644
--- a/phpBB/styles/prosilver/template/editor.js
+++ b/phpBB/styles/prosilver/template/editor.js
@@ -394,3 +394,102 @@ function getCaretPosition(txtarea) {
 
 	return caretPos;
 }
+
+/**
+* Allow to use tab character when typing code
+* Keep indentation of last line of code when typing code
+*/
+(function($) {
+	$(document).ready(function() {
+		var doc, textarea, startTags, endTags;
+
+		// find textarea, make sure browser supports necessary functions
+		if (document.forms[form_name]) {
+			doc = document;
+		} else {
+			doc = opener.document;
+		}
+
+		if (!doc.forms[form_name]) {
+			return;
+		}
+
+		textarea = doc.forms[form_name].elements[text_name];
+		if (!textarea || typeof textarea.selectionStart !== 'number') {
+			return;
+		}
+
+		// list of allowed start and end bbcode code tags, in lower case
+		startTags = ['[code]', '[code='];
+		endTags = ['[/code]'];
+
+		function inTag() {
+			var start = textarea.selectionStart,
+				lastEnd = -1,
+				lastStart = -1,
+				i, index, value;
+
+			value = textarea.value.toLowerCase();
+
+			for (i = 0; i < startTags.length; i++) {
+				var tagLength = startTags[i].length;
+				if (start >= tagLength) {
+					index = value.lastIndexOf(startTags[i], start - tagLength);
+					lastStart = Math.max(lastStart, index);
+				}
+			}
+			if (lastStart == -1) return false;
+
+			if (start > 0) {
+				for (i = 0; i < endTags.length; i++) {
+					index = value.lastIndexOf(endTags[i], start - 1);
+					lastEnd = Math.max(lastEnd, index);
+				}
+			}
+
+			return (lastEnd < lastStart);
+		}
+
+		function getLastLine() {
+			var start = textarea.selectionStart,
+				value = textarea.value,
+				index = value.lastIndexOf("\n", start - 1);
+			return value.substring(index + 1, start);
+		}
+
+		function appendCode(code) {
+			var start = textarea.selectionStart,
+				end = textarea.selectionEnd,
+				value = textarea.value;
+			textarea.value = value.substr(0, start) + code + value.substr(end);
+			textarea.selectionStart = textarea.selectionEnd = start + code.length;
+		}
+
+		$(textarea).on('keydown', function(event) {
+			var key = event.keyCode || event.which;
+
+			// intercept tabs
+			if (key == 9) {
+				if (inTag()) {
+					appendCode("\t");
+					event.preventDefault();
+					return;
+				}
+			}
+
+			// intercept new line characters
+			if (key == 13) {
+				if (inTag()) {
+					var lastLine = getLastLine(),
+						code = '' + /^\s*/g.exec(lastLine);
+					if (code.length > 0) {
+						appendCode("\n" + code);
+						event.preventDefault();
+						return;
+					}
+				}
+			}
+		});
+	});
+})(jQuery);
+
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index f2113b73ef..ba0412ddd3 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -29,7 +29,7 @@
 		<!-- IF U_ACP --><br /><strong><a href="{U_ACP}">{L_ACP}</a></strong><!-- ENDIF -->
 	</div>
 
-	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}">
+	<div id="darkenwrapper" data-ajax-error-title="{L_AJAX_ERROR_TITLE}" data-ajax-error-text="{L_AJAX_ERROR_TEXT}" data-ajax-error-text-abort="{L_AJAX_ERROR_TEXT_ABORT}" data-ajax-error-text-timeout="{L_AJAX_ERROR_TEXT_TIMEOUT}" data-ajax-error-text-parsererror="{L_AJAX_ERROR_TEXT_PARSERERROR}">
 		<div id="darken">&nbsp;</div>
 		<div class="phpbb_alert" id="loadingalert"><h3>{L_LOADING}</h3><p>{L_PLEASE_WAIT}</p></div>
 	</div>