Revert #684

Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
nextcloud · Apr 27, 2022 · 08ad8f3 · 08ad8f3
1 parent ae99533
commit 08ad8f3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/js/logreader-main.js b/js/logreader-main.js
diff --git a/js/logreader-main.js.map b/js/logreader-main.js.map
diff --git a/src/Components/TraceLine.js b/src/Components/TraceLine.js
@@ -47,7 +47,7 @@ export class Argument extends Component {
 		return (
 			<span className={style.argument}
 				  title={showInline ? null : fancyFormatted}>
-				{showInline ? baseFormatted : `${baseFormatted.slice(0, 12)} ... ${baseFormatted.slice(-2)}`}
+				{showInline ? baseFormatted : `${baseFormatted.substr(0, 12)} ... ${baseFormatted.substr(baseFormatted.length - 2, 2)}`}
 			</span>
 		)
 	}

diff --git a/src/ExceptionParser.js b/src/ExceptionParser.js
@@ -14,11 +14,11 @@ export class ExceptionParser {
 	}
 
 	isOldStyleException (logMessage) {
-		return logMessage.substr && logMessage.slice(0, 12) === 'Exception: {';
+		return logMessage.substr && logMessage.substr(0, 12) === 'Exception: {';
 	}
 
 	isBackgroundJobException (logMessage) {
-		return logMessage.substr && logMessage.slice(0, 34) === 'Error while running background job' && logMessage.indexOf('{"Exception":') !== -1;
+		return logMessage.substr && logMessage.substr(0, 34) === 'Error while running background job' && logMessage.indexOf('{"Exception":') !== -1;
 	}
 
 	parse (logMessage) {
@@ -28,20 +28,20 @@ export class ExceptionParser {
 		let data;
 		if (this.isOldStyleException(logMessage)) {
 			try {
-				data = this.tryParseJSON(logMessage.slice(10));
+				data = this.tryParseJSON(logMessage.substr(10));
 			} catch (e) {
 				console.log('Error while parsing exception:');
-				console.log(logMessage.slice(10));
+				console.log(logMessage.substr(10));
 				console.error(e);
 			}
 		} else {
-			data = this.tryParseJSON(logMessage.slice(logMessage.indexOf('{"Exception":')));
-			const messageHead = logMessage.substring(0, logMessage.indexOf('{"Exception":'));
+			data = this.tryParseJSON(logMessage.substr(logMessage.indexOf('{"Exception":')));
+			const messageHead = logMessage.substr(0, logMessage.indexOf('{"Exception":'));
 			const jobDataString = messageHead.split('(', 2)[1];
 			const jobDataParts = jobDataString.split(',', 2).map(part => part.trim());
 			data.jobClass = jobDataParts[0].split(':', 2)[1].trim();
-			data.jobArguments = jobDataParts[1].slice(10).trim();
-			window.s = jobDataParts[1].slice(10).trim();
+			data.jobArguments = jobDataParts[1].substr(10).trim();
+			window.s = jobDataParts[1].substr(10).trim();
 			if (data.jobClass === 'OC\\Command\\CommandJob') {
 				try {
 					[data.jobClass, data.jobArguments] = this.parseCommandJob(data.jobArguments);
@@ -94,7 +94,7 @@ export class ExceptionParser {
 			} else {
 				let filePaths = fileAndLine.split('(', 2);
 				file = filePaths[0];
-				lineNumber = filePaths[1].slice(0, -1);
+				lineNumber = filePaths[1].substr(0, filePaths[1].length - 1);
 			}
 			return {
 				'function': call,
@@ -134,7 +134,7 @@ export class ExceptionParser {
 					const args = (trace.args || []).map(arg => {
 						const baseFormatted = formatArgument(arg, 0).replace(/\n/g, '');;
 						const showInline = baseFormatted.length < 42;
-						return showInline ? baseFormatted : `${baseFormatted.slice(0, 16)} ... ${baseFormatted.slice(-2)}`;
+						return showInline ? baseFormatted : `${baseFormatted.substr(0, 16)} ... ${baseFormatted.substr(baseFormatted.length - 2, 2)}`;
 					});
 					return `${' '.repeat(widestIndex - ('' + i).length)}${i}. ${fileAndLine(trace)}\n` +
 						`${' '.repeat(widestIndex + 2)}${trace.class || ''}${trace.type || ''}${trace.function}(${args.join(', ')})`;

diff --git a/src/Providers/LogFile.js b/src/Providers/LogFile.js
@@ -32,9 +32,9 @@ export class LogFile extends LogProvider {
 			// fix unescaped message json
 			const startPos = json.indexOf('"message":"') + ('"message":"').length;
 			const endPos = json.lastIndexOf('","level":');
-			const start = json.slice(0, startPos);
-			const end = json.slice(endPos);
-			const message = json.slice(startPos, endPos);
+			const start = json.substr(0, startPos);
+			const end = json.substr(endPos);
+			const message = json.substr(startPos, endPos - startPos);
 
 			const escapedMessage = message.replace(/([^\\]|^)["]/g, '$1\\"');
 			json = start + escapedMessage + end;

diff --git a/src/unserialize.js b/src/unserialize.js
@@ -92,7 +92,7 @@ export default function (phpstr) {
 			case 's':
 				var key = readString();
 				if (key[key.length - 2] === '"') { // missing null bytes gives invalid length
-					key = key.slice(0, -2);
+					key = key.substr(0, key.length - 2);
 					idx -= 2;
 				}
 				return key;
@@ -153,7 +153,7 @@ export default function (phpstr) {
 			pos = parsedName.indexOf("\u0000", 1);
 			if (pos > 0) {
 				class_name = parsedName.substring(1, pos);
-				prop_name = parsedName.slice(pos + 1);
+				prop_name = parsedName.substr(pos + 1);
 
 				if ("*" === class_name) {
 					// protected
@@ -181,8 +181,8 @@ export default function (phpstr) {
 					// So, we can to lose something in any way.
 				}
 			}
-		} else if (parsedName.slice(0, baseClassName.length) === baseClassName) { // private property with missing null bytes
-			return baseClassName + '::' + parsedName.slice(baseClassName.length);
+		} else if (parsedName.substr(0, baseClassName.length) === baseClassName) { // private property with missing null bytes
+			return baseClassName + '::' + parsedName.substr(baseClassName.length);
 		} else {
 			// public "property"
 			return parsedName;