web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sfPassword' into ro

Browse Source
This commit is contained in:
yflory
2019-10-21 17:43:46 +02:00
parent 50829d3db1 efded1063f
commit b2f89e289d
27 changed files with 672 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
www/common/userObject.js
View File

@@ -14,6 +14,7 @@ define([
var TRASH = module.TRASH = "trash";
var TEMPLATE = module.TEMPLATE = "template";
var SHARED_FOLDERS = module.SHARED_FOLDERS = "sharedFolders";
var SHARED_FOLDERS_TEMP = module.SHARED_FOLDERS_TEMP = "sharedFoldersTemp"; // Maybe deleted or new password
// Create untitled documents when no name is given
var getLocaleDate = function () {
@@ -93,6 +94,7 @@ define([
exp.TRASH = TRASH;
exp.TEMPLATE = TEMPLATE;
exp.SHARED_FOLDERS = SHARED_FOLDERS;
exp.SHARED_FOLDERS_TEMP = SHARED_FOLDERS_TEMP;
var sharedFolder = exp.sharedFolder = config.sharedFolder;
exp.id = config.id;
@@ -447,11 +449,17 @@ define([
return Util.deduplicateString(ret);
};
var getIdFromHref = exp.getIdFromHref = function (href) {
var getIdFromHref = exp.getIdFromHref = function (_href) {
var result;
var noPassword = function (str) {
if (!str) { return; }
var value = str.replace(/\/p\/?/, '/');
return Hash.getRelativeHref(value);
};
var href = noPassword(_href);
getFiles([FILES_DATA]).some(function (id) {
if (getHref(files[FILES_DATA][id]) === href ||
files[FILES_DATA][id].roHref === href) {
if (noPassword(getHref(files[FILES_DATA][id])) === href ||
noPassword(files[FILES_DATA][id].roHref) === href) {
result = id;
return true;
}
@@ -459,11 +467,17 @@ define([
return result;
};
exp.getSFIdFromHref = function (href) {
exp.getSFIdFromHref = function (_href) {
var result;
var noPassword = function (str) {
if (!str) { return; }
var value = str.replace(/\/p\/?/, '/');
return Hash.getRelativeHref(value);
};
var href = noPassword(_href);
getFiles([SHARED_FOLDERS]).some(function (id) {
if (getHref(files[SHARED_FOLDERS][id]) === href ||
files[SHARED_FOLDERS][id].roHref === href) {
if (noPassword(getHref(files[SHARED_FOLDERS][id])) === href ||
noPassword(files[SHARED_FOLDERS][id].roHref) === href) {
result = id;
return true;
}