From 47f9106c42c0759e931e50acda11c6d4b5ebea48 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 19 Nov 2021 08:21:42 +0000
Subject: [PATCH] MDL-73121 atto_managefiles: match used files enclosed by
 quotes.

---
 ...moodle-atto_managefiles-usedfiles-debug.js | Bin 5886 -> 6014 bytes
 .../moodle-atto_managefiles-usedfiles-min.js  | Bin 1461 -> 1465 bytes
 .../moodle-atto_managefiles-usedfiles.js      | Bin 5790 -> 5918 bytes
 .../yui/src/usedfiles/js/usedfiles.js         |   3 ++-
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-debug.js
index eef8a6480a617eea0785d9522d758c608cfed057..1b36bece62b94c57d66558ee99732d21f52def9d 100644
GIT binary patch
delta 186
zcmeyT`%iB}zo4d4bc~XEtdfGZLQ-OJYG_f8UQud6PGWMZhJLiJeoRc9ik7y$o`z=4
z<V}Jt_4@h>AsML(1&JjksYQ7Txrrso8L7nziFuU@DMg8CC25&CsS2S%J_^bCc_oRN
zd8sK1<(VZJnRyC@rTHbP#X1V9dg*!!>cvILwn{c2)p?1zsdh^03i(9}>KR3;X{f?_
RTnbQ7o&i+6*;?o@3jp;WJqiE-

delta 52
zcmeyT_fL02zo2qbVsUC{QI1|wYC%q7a;k=Ybc}9{eoRbEoQjsVy`F|<P0ZvSf-Rf3
I37ud801*Zg5dZ)H

diff --git a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles-min.js
index 90153d95dbf38a6b6e386a3562fbb44544854d05..c829ff39f089c8beb33d4b70d53aa80e1158c0c0 100644
GIT binary patch
delta 46
zcmdnWy_0)GFpHv6bc~XEtde$~UQud6PGWMZhJLiJeoRc9ik7y$o`z=4<^mR1MgT>A
B4K)A&

delta 42
xcmdnVy_I`IFpF%SUQud6PGWMZhJJL6Zj63ROiY}LmbSf~hGtF7<`NcHMgS-K4A}qx

diff --git a/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js b/lib/editor/atto/plugins/managefiles/yui/build/moodle-atto_managefiles-usedfiles/moodle-atto_managefiles-usedfiles.js
index ae2668e7dc1e45d286668e11d13ac6e7c4a34f3b..d15f24e5a403cb12a5b92e12f2707cfa3c22d0a0 100644
GIT binary patch
delta 186
zcmbQIJ5O(ezM!U3bc~XEtdfGZLQ-OJYG_f8UQud6PGWMZhJLiJeoRc9ik7y$o`z=4
z<RHP8dVPI`kc?D?g2a-N)S^6v+{BXPjMQR<#Joy{l%mA6lC;d6RE5wWABE)nypqJs
zywnth^30Nq%shp{()^OtVjYE4y>vYV_2QyrTO}Ki>b%6<R68Ygh5RA~^^Bs_G*n?d
RE(Itk&j2dkd|U7^3jp=)JShMG

delta 52
zcmbQIH&1tizMyhaVsUC{QI1|wYC%q7a;k=Ybc}9{eoRbEoQjsVy`F|<P0Zv7!IsTo
HLMK=N)Rz%4

diff --git a/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js b/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
index 534a2b79b69..863ddfef6d7 100644
--- a/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
+++ b/lib/editor/atto/plugins/managefiles/yui/src/usedfiles/js/usedfiles.js
@@ -149,11 +149,12 @@ M.atto_managefiles.usedfiles = M.atto_managefiles.usedfiles || {
     _getUsedFiles: function() {
         var content = Y.one(window.parent.document.getElementById(this._elementid + 'editable')),
             baseUrl = M.cfg.wwwroot + '/draftfile.php/' + this._usercontext + '/user/draft/' + this._itemid + '/',
-            pattern = new RegExp(baseUrl.replace(/[\-\/\\\^$*+?.()|\[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
+            pattern = new RegExp("[\"']" + baseUrl.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&') + "(.+?)[\\?\"']", 'gm'),
             filename = '',
             match = '',
             usedFiles = {};
 
+        // The pattern matches any draftfile URL contained within quotes, e.g. 'src="<filename>"' or 'href="<filename>"'.
         while ((match = pattern.exec(content.get('innerHTML'))) !== null) {
             filename = decodeURIComponent(match[1]);
             usedFiles[filename] = true;
-- 
2.43.0