Add support for 'comment' and 'url' fields (closes: #6)

sukria · Aug 30, 2014 · aa28481 · aa28481
1 parent c97af86
commit aa28481
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 11 deletions.
diff --git a/lib/WebKeePass/DB.pm b/lib/WebKeePass/DB.pm
@@ -13,6 +13,7 @@ use File::KeePass;
 use DateTime;
 use Data::Dumper;
 use Digest::SHA1 'sha1_hex';
+use Encode 'encode';
 
 =attr db_file 
 
@@ -69,18 +70,25 @@ sub _parse_entries {
     my @entries;
 
     foreach my $entry ( @{$entries} ) {
-        my ( $title, $username, $password ) =
-          ( $entry->{title}, $entry->{username}, $entry->{password} );
 
-        push @entries,
-          {
-            id       => sha1_hex($title . $username . $password ),
-            title    => $title,
-            username => $username,
-            password => $password,
-          }
-          if defined $title && defined $username && defined $password;
+        my $e = {
+            id => sha1_hex(
+                    encode( 'UTF-8', $entry->{title} || '')
+                  . encode( 'UTF-8', $entry->{username} || '')
+                  . encode( 'UTF-8', $entry->{password} || '')
+            )
+        };
+        my @fields = qw(title username password comment url);
+        map { $e->{$_} = $entry->{$_}} @fields;
+
+        push @entries, $e
+          if defined $e->{title} && 
+             defined $e->{username} && 
+             defined $e->{password};
     }
+
+    #use Data::Dumper;
+    #warn Dumper(\@entries);
     return \@entries;
 }
 

diff --git a/views/keepass.tt b/views/keepass.tt
@@ -30,12 +30,25 @@
 [% FOREACH e IN group.entries %]
 <div class="row">
     <div class="span1"></div>
-    <div class="span3">[% e.title %]</div>
+    <div class="span3">
+      [% IF e.url %]
+        <a href="[% e.url %]" target="_webkeepass_link">[% e.title %]</a>
+      [% ELSE %]
+        [% e.title %]
+      [% END %]
+    </div>
     <div class="span2"> [% e.username %] </div>
     <div class="span3">
       <button id="button_[% e.id %]" title="Get the password">Password</button>
     </div>
 </div>
+<div class="row">
+  <div class="span1">
+  </div>
+  <div class="span8">
+    <em>[% e.comment %]</em>
+  </div>
+</div>
 
   <script>
   $('#button_[% e.id %]').click(function() {