Added missing links in templates (hestiacp#842)

* Added missing links in templates

Improved v-list-user-ssh-key and Filemanager SSH is not visible any more

* Removed non required and sync output with json

sshkey=$([[ -n $l && ${l###} = $l ]] && ssh-keygen -l -f <(echo $l)); 
Will filter the sftp keys out of the list

* Changes to title in link

Author: jaapmarcus

bin/v-list-user-ssh-key

@@ -24,16 +24,14 @@ json_list() {
     objects=$(echo "$keys" |wc -l)
     echo "{"
         for str in $keys; do
-        KEY=$(echo $str | awk '{print $(NF-1)}')
-        ID=$(echo $str | awk '{print $NF}')
+        KEY=$(echo $str | awk '{print $(NF-2)}')
+        ID=$(echo $str | awk '{print $(NF-1)}')
         echo -n '    "'$ID'": {
         "ID": "'$ID'",
         "KEY": "'$KEY'"
         }'
         if [ "$i" -lt "$objects" ]; then
             echo ','
-        else
-            echo
         fi
         ((i++))
         done		
@@ -45,8 +43,8 @@ shell_list() {
     echo "ID~KEY"
     echo "----~----~---"
     for str in $keys; do
-        KEY=$(echo $str | awk '{print $(NF-1)}')
-        ID=$(echo $str | awk '{print $NF}')
+        KEY=$(echo $str | awk '{print $(NF-2)}')
+        ID=$(echo $str | awk '{print $(NF-1)}')
         echo "$ID~$KEY"
         done
 }
@@ -55,8 +53,8 @@ shell_list() {
 plain_list() {
     IFS=$'\n'
     for str in $keys; do
-        KEY=$(echo $str | awk '{print $(NF-1)}')
-        ID=$(echo $str | awk '{print $NF}')
+        KEY=$(echo $str | awk '{print $(NF-2)}')
+        ID=$(echo $str | awk '{print $(NF-1)}')
         echo -e "$ID\t$KEY"
     done
 }
@@ -66,8 +64,8 @@ csv_list() {
     IFS=$'\n'
     echo "ID,KEY"
     for str in $keys; do
-        KEY=$(echo $str | awk '{print $(NF-1)}')
-        ID=$(echo $str | awk '{print $NF}')
+        KEY=$(echo $str | awk '{print $(NF-2)}')
+        ID=$(echo $str | awk '{print $(NF-1)}')
         echo "\"$ID\",\"$KEY\""
     done
 }
@@ -89,9 +87,17 @@ is_object_unsuspended 'user' 'USER' "$user"
 if [ ! -f "$HOMEDIR/$user/.ssh/authorized_keys" ]; then
     exit
 fi
-# Parsing backup config
-#cat "$HOMEDIR/$user/.ssh/authorized_keys"
-keys=$(cat "$HOMEDIR/$user/.ssh/authorized_keys")
+
+first_loop=1
+while read l; do
+    sshkey=$([[ -n $l && ${l###} = $l ]] && ssh-keygen -l -f <(echo $l));
+    if [ ! -z "$sshkey" ]
+    then
+        (( $first_loop )) && keys="$sshkey"  || keys="$keys"$'\n'"$sshkey"
+        unset first_loop
+    fi
+done < "$HOMEDIR/$user/.ssh/authorized_keys"
+
 
 # Listing data
 case $format in

web/templates/admin/edit_user.html

@@ -2,6 +2,7 @@
         <div class="l-sort clearfix">
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+            <a href="/list/key" id="btn-create" class="ui-button cancel" title="<?=__('SSH_KEY');?>"><i class="fas fa-key status-icon green"></i><?=__('SSH KEY')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>

web/templates/admin/list_key.html

@@ -44,7 +44,7 @@
                     </div>
                 </div>
             </div>
-        <div class="clearfix l-unit__stat-col--left wide-7"><b><?=htmlspecialchars(substr($data[$key]['KEY'],0,50).'.....'.substr($data[$key]['ID'], -10,10), ENT_QUOTES);?></b></div>
+        <div class="clearfix l-unit__stat-col--left wide-7"><b><?=htmlspecialchars($data[$key]['KEY'], ENT_QUOTES);?></b></div>
       </div>
     </div>
   <?}?>

web/templates/user/edit_user.html

@@ -2,6 +2,7 @@
         <div class="l-sort clearfix">
           <div class="l-unit-toolbar__buttonstrip">
             <a class="ui-button cancel" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i> <?=__('Back')?></a>
+            <a href="/list/key" id="btn-create" class="ui-button cancel" title="<?=__('SSH_KEY');?>"><i class="fas fa-key status-icon green"></i><?=__('SSH KEY')?></a>
           </div>
           <div class="l-unit-toolbar__buttonstrip float-right">
             <a href="#" class="ui-button" title="<?=__('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=__('Save')?></a>