Merge branch 'master' of github.com:/Intermesh/groupoffice

Author: derjoachim

CHANGELOG.md

@@ -1,7 +1,8 @@
 - Files: fix external link to folder in folder panel
 - Support: new icon for link to prevent confusion with old tickets module
+- Core / email: Improved converting url to anchors so text cursor won't jump to last line
 
-23-06-2025: 25.0.32
+- 23-06-2025: 25.0.32
 - LDAPServer: Fix primary key error
 
 20-06-2025: 25.0.31

www/modules/z-push/backend/go/MailStore.php

@@ -37,6 +37,9 @@ public function ChangeFolder($folderid, $oldid, $displayname, $type) {
 			//$this->imap_reopenFolder($folderid);
 
 			$imap = $this->_imapLogon();
+			if(!$imap) {
+				return false;
+			}
 
 			//remove m/ from the combined stuff
 			if (!empty($folderid)) {

www/modules/z-push/backend/go/Store.php

@@ -22,10 +22,10 @@ public function getImapAccount(){
 				try{
 					self::$_account = \GO\Email\Model\Account::model()->findByPk($settings->account_id);
 					if(!self::$_account){
-						ZLog::Write(LOGLEVEL_FATAL, 'E-mail account not found!');
+						ZLog::Write(LOGLEVEL_INFO, 'E-mail account not found!');
 					}
 				}catch(\GO\Base\Exception\AccessDenied $e){
-					ZLog::Write(LOGLEVEL_FATAL, 'GoBaseBackendDiff->getImapAccount() ~~ ACCESS DENIED to e-mail account configured in sync settings('.(string)$e->getMessage().')');
+					ZLog::Write(LOGLEVEL_WARN, 'GoBaseBackendDiff->getImapAccount() ~~ ACCESS DENIED to e-mail account configured in sync settings('.(string)$e->getMessage().')');
 				}
 			}else
 			{

www/views/Extjs3/javascript/form/HtmlEditor.js

@@ -237,76 +237,49 @@ Ext.extend(GO.form.HtmlEditor, Ext.form.HtmlEditor, {
 		this.debounceTimeout = setTimeout( () => {
 			clearTimeout(this.debounceTimeout);
 			this.debounceTimeout = undefined;
+			this.convertUrisToAnchors();
+		}, 500);
+	},
 
-			const index = this.getCaretCharacterOffsetWithin();
-			var h = this.getEditorBody().innerHTML;
-			var anchored = Autolinker.link(h, {
-				stripPrefix: false,
-				stripTrailingSlash: false,
-				className: "normal-link",
-				newWindow: true,
-				phone: false,
-				urls: {
-					schemeMatches : true,
-					wwwMatches    : false,
-					tldMatches    : false
-				}
-			});
 
-			if(h != anchored) {
+	convertUrisToAnchors: function() {
+		const walk = (node) => {
 
-				this.getEditorBody().innerHTML = anchored;
-				this.setCaretPosition(index);
+			if(node.nodeType == Node.ELEMENT_NODE && node.tagName == "A") {
+				// don't traverse into anchor tags
+				return;
 			}
 
-			console.warn("autolink");
-
-		}, 500);
-	},
-
-
-	getCaretCharacterOffsetWithin: function () {
-		const win = this.getWin(), doc = this.getDoc(), element = this.getEditorBody();
-		let caretOffset = 0;
-		const sel = win.getSelection();
-		if (sel.rangeCount > 0) {
-			const range = sel.getRangeAt(0);
-			const preCaretRange = range.cloneRange();
-			preCaretRange.selectNodeContents(element);
-			preCaretRange.setEnd(range.endContainer, range.endOffset);
-			caretOffset = preCaretRange.toString().length;
-		}
-		return caretOffset;
-	},
+			//walk nodes recursively
+			node.childNodes.forEach(walk);
 
-	setCaretPosition: function (offset) {
-		const win = this.getWin(), doc = this.getDoc(), element = this.getEditorBody();
-		let currentOffset = 0;
-		const nodeStack = [element];
-		let node, found = false;
-
-		while (nodeStack.length && !found) {
-			node = nodeStack.pop();
-			if (node.nodeType === Node.TEXT_NODE) {
-				const nextOffset = currentOffset + node.length;
-				if (offset <= nextOffset) {
-					const range = win.document.createRange();
-					range.setStart(node, offset - currentOffset);
-					range.collapse(true);
-					const sel = win.getSelection();
-					sel.removeAllRanges();
-					sel.addRange(range);
-					found = true;
-				} else {
-					currentOffset = nextOffset;
+			if(node.nodeType == Node.TEXT_NODE) {
+				if(node == this.getDoc().getSelection().anchorNode) {
+					return;
 				}
-			} else {
-				let i = node.childNodes.length;
-				while (i--) {
-					nodeStack.push(node.childNodes[i]);
+
+				if (node.textContent && node.textContent.indexOf("http") > -1) {
+					const anchored = this.replaceUriWithAnchor(node.textContent);
+					if (anchored != node.textContent) {
+						const tmp = document.createElement("span");
+						tmp.innerHTML = anchored;
+						node.replaceWith(tmp);
+					}
 				}
 			}
 		}
+
+		walk(this.getEditorBody());
+	},
+
+	replaceUriWithAnchor : function(html) {
+		// Regular expression to match URIs that are not inside anchor tags
+		const uriRegex = /(https?:\/\/[^\s]+|ftp:\/\/[^\s]+)/ig;
+
+		// Replace matched URIs with anchor tags
+		return html.replace(uriRegex, (url) => {
+			return `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`;
+		});
 	},
 
 	onDrop: function(e) {