@richscripts/richtexteditor 2.4.0 → 2.4.1

package/richtexteditor/plugins/html2pdf.js

@@ -6,9 +6,53 @@ if (!RTE_DefaultConfig.svgCode_html2pdf) {
 
 RTE_DefaultConfig.plugin_html2pdf = RTE_Plugin_Html2PDF;
 
+// Where to load the html2pdf renderer from. Leave null to use the pinned copy
+// shipped in <url_base>/plugins/vendor/. Set it to serve the bundle from your own
+// CDN, a versioned asset path, or a different build.
+if (typeof RTE_DefaultConfig.html2pdfScriptUrl === "undefined") RTE_DefaultConfig.html2pdfScriptUrl = null;
+
 function RTE_Plugin_Html2PDF() {
 
-	var scripturl = "https://raw.githack.com/eKoopmans/html2pdf/master/dist/html2pdf.bundle.js";
+	// The html2pdf renderer (jsPDF + html2canvas) is ~900 KB, so it is loaded on
+	// demand rather than bundled — but it is served from YOUR OWN assets by
+	// default, alongside the rest of the editor.
+	//
+	// It used to be pulled from a GitHub raw-CDN URL that tracked a branch rather
+	// than a release. That meant PDF export required a public network round-trip
+	// (so it failed offline / air-gapped), demanded a third-party `script-src`
+	// entry in any Content-Security-Policy, and could change underneath the
+	// product with no version pin. The bundled copy is pinned at html2pdf.js
+	// 0.14.0.
+	//
+	// Resolution order:
+	//   1. config.html2pdfScriptUrl        — explicit override (absolute or relative)
+	//   2. <url_base>/plugins/vendor/...   — the copy shipped with the editor
+	//   3. a pinned CDN URL                — last resort if url_base is unknown
+	var VENDOR_PATH = "/plugins/vendor/html2pdf.bundle.min.js";
+	// 2026-07-31 There is deliberately NO built-in CDN fallback any more.
+	//
+	// A fallback that silently reaches a third-party CDN when url_base happens to
+	// be unset is the worst of both worlds: it hides a misconfiguration, and it
+	// puts a public URL in a file that security-scanned deployments must ship.
+	// Failing loudly is better -- the host either serves the vendored copy or
+	// points html2pdfScriptUrl wherever it wants, including its own CDN.
+
+	// The script tag is written into a generated iframe whose base URL is not the
+	// host page, so the URL has to be absolute by the time it is injected.
+	function absoluteUrl(url) {
+		try { return new URL(url, document.baseURI || location.href).href; }
+		catch (e) { return url; }
+	}
+
+	function resolveScriptUrl() {
+		if (config && config.html2pdfScriptUrl) return absoluteUrl(config.html2pdfScriptUrl);
+		var base = config && config.url_base ? String(config.url_base).replace(/\/+$/, "") : "";
+		if (base) return absoluteUrl(base + VENDOR_PATH);
+		// No url_base and no explicit override: resolve against the page instead
+		// of reaching outside. If that 404s the failure is visible and local,
+		// which is what a misconfigured deployment should look like.
+		return absoluteUrl("." + VENDOR_PATH);
+	}
 
 	var obj = this;
 
@@ -36,6 +80,59 @@ function RTE_Plugin_Html2PDF() {
 
 	}
 
+	// Paper size / orientation / margins for the exported PDF, taken from the
+	// document's page setup when it has one. Returns the historical
+	// letter/portrait/0.5in defaults otherwise, so documents without a page
+	// setup export exactly as they always have.
+	obj.GetPdfPageOptions = function () {
+		var fallback = { format: 'letter', orientation: 'portrait', margin: 0.5 };
+
+		var setup = null;
+		try {
+			if (editor && typeof editor.getDocumentPageSetup === "function") setup = editor.getDocumentPageSetup();
+		} catch (e) { setup = null; }
+		if (!setup || typeof setup !== "object") return fallback;
+
+		// jsPDF understands these page-format names.
+		var SUPPORTED = { a3: 1, a4: 1, a5: 1, letter: 1, legal: 1, tabloid: 1 };
+		var fmt = String(setup.format || "").toLowerCase();
+		var orientation = String(setup.orientation || "").toLowerCase() === "landscape" ? "landscape" : fallback.orientation;
+
+		var result = {
+			format: SUPPORTED[fmt] ? fmt : fallback.format,
+			orientation: orientation,
+			margin: fallback.margin
+		};
+
+		// Margins are emitted in inches, matching jsPDF's unit: 'in'.
+		var m = setup.margins;
+		if (m && typeof m === "object") {
+			var top = __ToInches(m.top), right = __ToInches(m.right);
+			var bottom = __ToInches(m.bottom), left = __ToInches(m.left);
+			if (top !== null && right !== null && bottom !== null && left !== null) {
+				result.margin = [top, right, bottom, left];
+			}
+		}
+		return result;
+	};
+
+	// Accepts a bare number (already inches) or a CSS length string.
+	function __ToInches(v) {
+		if (typeof v === "number" && isFinite(v)) return v;
+		if (typeof v !== "string") return null;
+		var m = /^\s*(-?[\d.]+)\s*(mm|cm|in|px|pt)?\s*$/.exec(v);
+		if (!m) return null;
+		var n = parseFloat(m[1]);
+		if (!isFinite(n)) return null;
+		switch (m[2]) {
+			case "mm": return n / 25.4;
+			case "cm": return n / 2.54;
+			case "pt": return n / 72;
+			case "px": return n / 96;
+			default: return n; // bare number or explicit "in"
+		}
+	}
+
 	function __Append(parent, tagname, csstext, cssclass) {
 		var tag = parent.ownerDocument.createElement(tagname);
 		if (csstext) tag.style.cssText = csstext;
@@ -76,12 +173,19 @@ function RTE_Plugin_Html2PDF() {
 
 			div2.innerHTML = "Exporting...";
 
+			// Honor the document's own page setup (paper size, orientation and
+			// margins) so the exported PDF matches the paginated page view and the
+			// Word export instead of always emitting US Letter. Falls back to the
+			// previous fixed letter/portrait/0.5in defaults when the document
+			// carries no page setup, so existing integrations are unaffected.
+			var page = obj.GetPdfPageOptions();
+
 			var opt = {
-				margin: 0.5,
+				margin: page.margin,
 				filename: 'myfile.pdf',
 				image: { type: 'jpeg', quality: 0.98 },
 				html2canvas: { scale: 2 },
-				jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' }
+				jsPDF: { unit: 'in', format: page.format, orientation: page.orientation }
 			};
 
 			var promimg = win.html2pdf().set(opt).from(win.document.body).outputImg();
@@ -145,7 +249,7 @@ function RTE_Plugin_Html2PDF() {
 		iframe = __Append(div1, "iframe", "align-self:center;flex:99;width:100%;height:0px;border:0px;", "rte-editable");
 		iframe.contentDocument.open("text/html");
 		iframe.contentDocument.write("<html><head><link id='url-css-preview' rel='stylesheet' href='" + editor.htmlEncode(config.previewCssUrl) + "'/>"
-			+ "<script src='" + editor.htmlEncode(scripturl) + "'></script></head><body style='padding:10px;margin:0px'>"
+			+ "<script src='" + editor.htmlEncode(resolveScriptUrl()) + "'></script></head><body style='padding:10px;margin:0px'>"
 			+ editor.getHTMLCode() + "</body>"
 			+ "<script>window.onload=function(){setTimeout(function(){parent.html2pdf_callback(window)},100)}</script></html>")
 		iframe.contentDocument.close();

package/richtexteditor/plugins/imageeditor.js

@@ -70,14 +70,40 @@ function RTE_Plugin_ImageEditor() {
 		var scriptbase = config.url_base + "/plugins/tui.image-editor/";
 
 		window.rte_image_editor_callback = function (win) {
+			// 2026-07-31 No outbound calls from the image editor, at any layer.
+			//
+			// Upstream Toast UI ships a "usage statistics" beacon (in
+			// tui-code-snippet and tui-color-picker) that reports the host's own
+			// hostname to a third-party analytics endpoint, and its default theme
+			// loads a branding logo from the vendor's CDN. Both endpoint strings
+			// have been removed from the vendored copies in
+			// plugins/tui.image-editor/ -- deliberately from the FILES, not just
+			// disabled at runtime, because static scanners (Fortify CWE-297) flag
+			// the literal URL and a runtime flag does not satisfy them.
+			//
+			// Do NOT write those hostnames into this file either: it is
+			// concatenated into all_plugins.js, which is what customers scan.
+			//
+			// The settings below are the belt to that braces -- they switch the
+			// beacon off through the library's own supported option, so a future
+			// vendor upgrade that reintroduces the endpoint still does not phone
+			// home until someone re-applies the patch.
+			try { win.tui = win.tui || {}; win.tui.usageStatistics = false; } catch (e) {}
+
 			var options = {
+				usageStatistics: false,
 				includeUI: {
 					loadImage: {
 						path: img.src,
 						name: 'RteImage'
 					},
+					usageStatistics: false,
 					//locale: locale_ru_RU,
 					theme: {
+						// Blank rather than Toast's CDN-hosted logo.
+						'common.bi.image': '',
+						'common.bisize.width': '0',
+						'common.bisize.height': '0',
 						// main icons
 						'menu.normalIcon.path': scriptbase + 'svg/icon-d.svg',
 						'menu.activeIcon.path': scriptbase + 'svg/icon-b.svg',
@@ -106,7 +132,13 @@ function RTE_Plugin_ImageEditor() {
 			btns.innerHTML = '';
 			var savebtn = __Append(btns, "button", "");
 			savebtn.innerText = "Save";
+			var status = __Append(btns, "div", "margin-left:10px;font-size:12px;color:#b42318;", "rte-imageeditor-upload-status");
+			status.setAttribute("role", "status");
+			status.setAttribute("aria-live", "polite");
 			savebtn.onclick = function () {
+				status.innerText = "";
+				savebtn.disabled = true;
+				savebtn.innerText = "Saving...";
 
 				var dataurl = imgeditor.toDataURL();
 				if (!config.file_upload_handler) {
@@ -125,13 +157,11 @@ function RTE_Plugin_ImageEditor() {
 						dialoginner.close();
 						return;
 					}
-					if (error) {
-						//TODO:retry dialog or cancel
-						alert("upload failed , TODO:show retry dialog or cancel");
-					}
-					else {
-						alert("Developer warning : ");
-					}
+					savebtn.disabled = false;
+					savebtn.innerText = "Save";
+					status.innerText = error
+						? "Upload failed. Check your connection and try again."
+						: "The upload did not return a file URL. Please try again.";
 				});