From b877d6853bebea430c511f4269b3c25ce08a0554 Mon Sep 17 00:00:00 2001
From: Massimo Melina <a@rejetto.com>
Date: Wed, 27 May 2020 12:12:00 +0200
Subject: [PATCH] offer "copy url with password" also for upload/delete
 restriction

---
 main.dfm    | 14 +++++++-------
 main.pas    | 32 ++++++++++++++++++++------------
 utillib.pas |  7 ++++---
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/main.dfm b/main.dfm
index 32c8d6c..063f7ba 100644
--- a/main.dfm
+++ b/main.dfm
@@ -749,6 +749,13 @@ object mainFrm: TmainFrm
       AutoHotkeys = maManual
       Caption = 'Copy URL with password'
     end
+    object CopyURLwithdifferentaddress1: TMenuItem
+      Caption = 'Copy URL with different host address'
+    end
+    object CopyURLwithfingerprint1: TMenuItem
+      Caption = 'Copy URL with fingerprint'
+      OnClick = CopyURLwithfingerprint1Click
+    end
     object Browseit1: TMenuItem
       Caption = 'Browse it'
       ImageIndex = 26
@@ -785,13 +792,6 @@ object mainFrm: TmainFrm
     object N11: TMenuItem
       Caption = '-'
     end
-    object CopyURLwithdifferentaddress1: TMenuItem
-      Caption = 'Copy URL with different host address'
-    end
-    object CopyURLwithfingerprint1: TMenuItem
-      Caption = 'Copy URL with fingerprint'
-      OnClick = CopyURLwithfingerprint1Click
-    end
     object Purge1: TMenuItem
       Caption = 'Purge...'
       OnClick = Purge1Click
diff --git a/main.pas b/main.pas
index 3a85e42..a94a997 100644
--- a/main.pas
+++ b/main.pas
@@ -3150,19 +3150,22 @@ f:=self;
 if assigned(outInherited) then outInherited^:=FALSE;
 while assigned(f) do
   begin
-  for i:=0 to length(f.accounts[action])-1 do
+  for s in f.accounts[action] do
   	begin
-    s:=f.accounts[action][i];
     if (s = '')
-    or (action = FA_UPLOAD) and not f.isRealFolder() then continue; // we must ignore this setting
+    or (action = FA_UPLOAD) and not f.isRealFolder() then  // we must ignore this setting
+      continue;
 
     if specialUsernames and (s[1] = '@')
     or accountExists(s, specialUsernames) then // we admit groups only if specialUsernames are admitted too
       addString(s, result);
     end;
-  if (action = FA_ACCESS) and (f.user > '') then addString(f.user, result);
-  if assigned(result) then exit;
-  if assigned(outInherited) then outInherited^:=TRUE;
+  if (action = FA_ACCESS) and (f.user > '') then
+    addString(f.user, result);
+  if assigned(result) then
+    exit;
+  if assigned(outInherited) then
+    outInherited^:=TRUE;
   f:=f.parent;
   end;
 end; // getAccountsFor
@@ -7364,6 +7367,8 @@ var
       inc(result);
   end; // itemsVisible
 
+var
+  s: string;
 begin
 // default values
 setDefaultValues(filemenu.items);
@@ -7407,19 +7412,22 @@ if filesBox.SelectionCount = 1 then
 
   a:=NIL;
   if anyFileSelected then
-    a:=expandAccountsByLink(selectedFile.getAccountsFor(FA_ACCESS, TRUE));
+    a:=expandAccountsByLink(selectedFile.getAccountsFor(FA_ACCESS, TRUE))
+      +expandAccountsByLink(selectedFile.getAccountsFor(FA_UPLOAD, TRUE))
+      +expandAccountsByLink(selectedFile.getAccountsFor(FA_DELETE, TRUE));
   visibleIf(CopyURLwithpassword1, assigned(a), ONLY_EXPERT);
   copyURLwithpassword1.Clear();
-  for i:=0 to length(a)-1 do
-    copyURLwithpassword1.add( newItem( a[i], 0, FALSE, TRUE, copyURLwithPasswordMenuClick, 0, '') );
+  uniqueStrings(a, FALSE);
+  for s in a do
+    copyURLwithpassword1.add( newItem( s, 0, FALSE, TRUE, copyURLwithPasswordMenuClick, 0, '') );
   end;
 
 a:=getPossibleAddresses();
 if length(a) = 1 then a:=NIL;
 visibleIf(CopyURLwithdifferentaddress1, anyFileSelected and assigned(a), ONLY_EXPERT);
 copyURLwithdifferentaddress1.clear();
-for i:=0 to length(a)-1 do
-  copyURLwithdifferentaddress1.add( newItem( a[i], 0, FALSE, TRUE, copyURLwithAddressMenuclick, 0, '') );
+for s in a do
+  copyURLwithdifferentaddress1.add( newItem( s, 0, FALSE, TRUE, copyURLwithAddressMenuclick, 0, '') );
 
 end;
 
@@ -10508,7 +10516,7 @@ f:=selectedFile;
 while assigned(f) and (f.accounts[FA_ACCESS] = NIL) and (f.user = '') do
   f:=f.parent;
 
-if f.user = user then 
+if assigned(f) and (f.user = user) then
   pwd:=f.pwd
 else
   begin
diff --git a/utillib.pas b/utillib.pas
index c7e0a88..d9c9a4a 100644
--- a/utillib.pas
+++ b/utillib.pas
@@ -172,7 +172,7 @@ function onlyString(s:string; ss:TStringDynArray):boolean;
 function addArray(var dst:TstringDynArray; src:array of string; where:integer=-1; srcOfs:integer=0; srcLn:integer=-1):integer;
 function removeArray(var src:TstringDynArray; toRemove:array of string):integer;
 function addUniqueArray(var a:TstringDynArray; b:array of string):integer;
-procedure uniqueStrings(var a:TstringDynArray);
+procedure uniqueStrings(var a:TstringDynArray; ci:Boolean=TRUE);
 function idxOf(s:string; a:array of string; isSorted:boolean=FALSE):integer;
 function stringExists(s:string; a:array of string; isSorted:boolean=FALSE):boolean;
 function listToArray(l:Tstrings):TstringDynArray;
@@ -639,13 +639,14 @@ if i < 0 then addString(s, ss)
 else removeString(ss, i);
 end; // toggleString
 
-procedure uniqueStrings(var a:TstringDynArray);
+procedure uniqueStrings(var a:TstringDynArray; ci:Boolean=TRUE);
 var
   i, j: integer;
 begin
 for i:=length(a)-1 downto 1 do
   for j:=i-1 downto 0 do
-    if ansiCompareText(a[i], a[j]) = 0 then
+    if ci and SameText(a[i], a[j])
+    or not ci and (a[i] = a[j]) then
       begin
       removeString(a, i);
       break;