Make the limitation that only advanced string fields starting with "K…

…PH: " optional
pfn · Sep 16, 2015 · 73306a1 · 73306a1 · HolySephi · Mar 22, 2016
1 parent 3a29380
commit 73306a1
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 43 deletions.
diff --git a/KeePassHttp.plgx b/KeePassHttp.plgx
diff --git a/KeePassHttp/ConfigOpt.cs b/KeePassHttp/ConfigOpt.cs
@@ -13,6 +13,7 @@ public class ConfigOpt
         const string SearchInAllOpenedDatabasesKey = "KeePassHttp_SearchInAllOpenedDatabases";
         const string MatchSchemesKey = "KeePassHttp_MatchSchemes";
         const string ReturnStringFieldsKey = "KeePassHttp_ReturnStringFields";
+        const string ReturnStringFieldsWithKphOnlyKey = "KeePassHttp_ReturnStringFieldsWithKphOnly";
         const string SortResultByUsernameKey = "KeePassHttp_SortResultByUsername";
         const string ListenerPortKey = "KeePassHttp_ListenerPort";
         const string ListenerHostKey = "KeePassHttp_ListenerHost";
@@ -70,6 +71,12 @@ public bool ReturnStringFields
             set { _config.SetBool(ReturnStringFieldsKey, value); }
         }
 
+        public bool ReturnStringFieldsWithKphOnly
+        {
+            get { return _config.GetBool(ReturnStringFieldsWithKphOnlyKey, true); }
+            set { _config.SetBool(ReturnStringFieldsWithKphOnlyKey, value); }
+        }
+
         public bool SortResultByUsername
         {
             get { return _config.GetBool(SortResultByUsernameKey, true); }

diff --git a/KeePassHttp/Handlers.cs b/KeePassHttp/Handlers.cs
@@ -470,10 +470,17 @@ private ResponseEntry PrepareElementForResponseEntries(ConfigOpt configOpt, PwEn
                 fields = new List<ResponseStringField>();
                 foreach (var sf in entryDatabase.entry.Strings)
                 {
-                    if (sf.Key.StartsWith("KPH: "))
+                    var sfValue = entryDatabase.entry.Strings.ReadSafe(sf.Key);
+                    if (configOpt.ReturnStringFieldsWithKphOnly)
                     {
-                        var sfValue = entryDatabase.entry.Strings.ReadSafe(sf.Key);
-                        fields.Add(new ResponseStringField(sf.Key.Substring(5), sfValue));
+                        if (sf.Key.StartsWith("KPH: "))
+                        {
+                            fields.Add(new ResponseStringField(sf.Key.Substring(5), sfValue));
+                        }
+                    }
+                    else
+                    {
+                        fields.Add(new ResponseStringField(sf.Key, sfValue));
                     }
                 }
 

diff --git a/KeePassHttp/OptionsForm.Designer.cs b/KeePassHttp/OptionsForm.Designer.cs
diff --git a/KeePassHttp/OptionsForm.cs b/KeePassHttp/OptionsForm.cs
@@ -43,10 +43,13 @@ private void OptionsForm_Load(object sender, EventArgs e)
             credSearchInAllOpenedDatabases.Checked = _config.SearchInAllOpenedDatabases;
             matchSchemesCheckbox.Checked = _config.MatchSchemes;
             returnStringFieldsCheckbox.Checked = _config.ReturnStringFields;
+            returnStringFieldsWithKphOnlyCheckBox.Checked = _config.ReturnStringFieldsWithKphOnly;
             SortByUsernameRadioButton.Checked = _config.SortResultByUsername;
             SortByTitleRadioButton.Checked = !_config.SortResultByUsername;
             portNumber.Value = _config.ListenerPort;
             hostName.Text = _config.ListenerHost;
+
+            this.returnStringFieldsCheckbox_CheckedChanged(null, EventArgs.Empty);
         }
 
         private void okButton_Click(object sender, EventArgs e)
@@ -59,6 +62,7 @@ private void okButton_Click(object sender, EventArgs e)
             _config.SearchInAllOpenedDatabases = credSearchInAllOpenedDatabases.Checked;
             _config.MatchSchemes = matchSchemesCheckbox.Checked;
             _config.ReturnStringFields = returnStringFieldsCheckbox.Checked;
+            _config.ReturnStringFieldsWithKphOnly = returnStringFieldsWithKphOnlyCheckBox.Checked;
             _config.SortResultByUsername = SortByUsernameRadioButton.Checked;
             _config.ListenerPort = (int)portNumber.Value;
             _config.ListenerHost = hostName.Text;
@@ -212,5 +216,10 @@ private void SetRestartRequired()
         {
             _restartRequired = (_config.ListenerPort != portNumber.Value) || (_config.ListenerHost != hostName.Text);
         }
+
+        private void returnStringFieldsCheckbox_CheckedChanged(object sender, EventArgs e)
+        {
+            this.returnStringFieldsWithKphOnlyCheckBox.Enabled = this.returnStringFieldsCheckbox.Checked;
+        }
     }
 }
diff --git a/KeePassHttp/OptionsForm.resx b/KeePassHttp/OptionsForm.resx
@@ -117,11 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="label3.Text" xml:space="preserve">
-    <value>If there are more fields needed than username + password,
-normal "String Fields" are used, which can be defined in the
-"Advanced" tab of an entry.
-String fields are returned in alphabetical order and have to start
-with "KPH: " (mind the space after KPH:).</value>
-  </data>
 </root>