Merge branch 'v132' of github.com:jaredhendrickson13/pfsense-api into v132

Author: jaredhendrickson13

pfSense-pkg-API/files/etc/inc/api/models/APIUserCreate.inc

@@ -201,8 +201,8 @@ class APIUserCreate extends APIModel {
     public function is_user_certificate($cert_ref_id) {
         # Loop through all certificates and check for matches
         foreach ($this->config["cert"] as $cert) {
-            # Check if this is a user certificate and that ref ID matches
-            if ($cert["type"] === "user" and $cert["refid"] === $cert_ref_id) {
+            # Check if this certificate matches the specified ref id
+            if ($cert["refid"] === $cert_ref_id) {
                 return true;
             }
         }

pfSense-pkg-API/files/etc/inc/api/models/APIUserUpdate.inc

@@ -179,12 +179,13 @@ class APIUserUpdate extends APIModel {
     public function is_user_certificate($cert_ref_id) {
         # Loop through all certificates and check for matches
         foreach ($this->config["cert"] as $cert) {
-            # Check if this is a user certificate and that ref ID matches
-            if ($cert["type"] === "user" and $cert["refid"] === $cert_ref_id) {
+            # Check if this certificate matches the specified ref id
+            if ($cert["refid"] === $cert_ref_id) {
                 return true;
             }
         }
 
         return false;
+
     }
 }

pfSense-pkg-API/files/usr/local/www/api/documentation/index.php

@@ -2315,12 +2315,12 @@
 function IsJsonString(str){try{JSON.parse(str);}catch(e){return false;}
 return true;}
 String.prototype.replaceAll=function(replaceThis,withThis){var re=new RegExp(RegExp.quote(replaceThis),"g");return this.replace(re,withThis);};RegExp.quote=function(str){return str.replace(/([.?*+^$[\]\\(){}-])/g,"\\$1");};function syntaxHighlight(json){json=json.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g,function(match){var cls='number';if(/^"/.test(match)){if(/:$/.test(match)){cls='key';}else{cls='string';}}else if(/true|false/.test(match)){cls='boolean';}else if(/null/.test(match)){cls='null';}
-return '<span class="'+cls+'">'+match+'</span>';});}</script><br><br><footer class="navbar-default navbar-fixed-bottom"><div class=container-fluid><div class="span12 text-center"><span data-toggle=tooltip title="If the application help you, please feel free to give a star to the project in github. Your star inspire me to work more on open-source projects like this!">Made with <em class=love-color>&#9829;</em> by <a href=https://github.com/thedevsaddam target=_blank class=text-muted>thedevsaddam</a> | Generated at: 2021-10-04 13:17:07 by <a href=https://github.com/thedevsaddam/docgen target=_blank class=text-muted>docgen</a></span></div></div></footer>
+return '<span class="'+cls+'">'+match+'</span>';});}</script><br><br><footer class="navbar-default navbar-fixed-bottom"><div class=container-fluid><div class="span12 text-center"><span data-toggle=tooltip title="If the application help you, please feel free to give a star to the project in github. Your star inspire me to work more on open-source projects like this!">Made with <em class=love-color>&#9829;</em> by <a href=https://github.com/thedevsaddam target=_blank class=text-muted>thedevsaddam</a> | Generated at: 2021-10-18 16:28:46 by <a href=https://github.com/thedevsaddam/docgen target=_blank class=text-muted>docgen</a></span></div></div></footer>
 <script type="text/javascript">
     $(document).ready(function() {
         document.title = 'pfSense REST API Documentation';
         var curr_year = new Date().getFullYear();
-        document.querySelector('footer').innerHTML = "<a href='/api/'>Back to pfSense</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api'>View on Github</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api/issues/new'>Report an Issue</a><p>Copyright &copy; " + curr_year + " - Jared Hendrickson</p>";
+        document.querySelector('footer').innerHTML = "<a href='/api/'>Back to pfSense</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api'>View on Github</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api/issues/new/choose'>Report an Issue</a><p>Copyright &copy; " + curr_year + " - Jared Hendrickson</p>";
     });
 
 </script>

pfSense-pkg-API/files/usr/local/www/api/index.php

@@ -366,7 +366,7 @@
 $rotate_btn->setOnclick("return confirm(\"Rotating the server key will void any existng API tokens and JWTs. Proceed?\");");
 $form->addGlobal(new Form_Button('save', 'Save', null, 'fa-save'))->addClass('btn btn-sm btn-primary api-save-btn');
 (in_array($pkg_config["authmode"], ["token", "jwt"])) ? $form->addGlobal($rotate_btn) : null;
-$form->addGlobal(new Form_Button('report', 'Report an Issue', 'https://github.com/jaredhendrickson13/pfsense-api/issues/new', ''))->addClass('fa fa-question-circle api-report');
+$form->addGlobal(new Form_Button('report', 'Report an Issue', 'https://github.com/jaredhendrickson13/pfsense-api/issues/new/choose', ''))->addClass('fa fa-question-circle api-report');
 
 # Display the populated configuration form
 print $form;

tools/make_documentation.py

@@ -127,7 +127,7 @@
     $(document).ready(function() {
         document.title = 'pfSense REST API Documentation';
         var curr_year = new Date().getFullYear();
-        document.querySelector('footer').innerHTML = "<a href='/api/'>Back to pfSense</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api'>View on Github</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api/issues/new'>Report an Issue</a><p>Copyright &copy; " + curr_year + " - Jared Hendrickson</p>";
+        document.querySelector('footer').innerHTML = "<a href='/api/'>Back to pfSense</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api'>View on Github</a> | <a href='https://github.com/jaredhendrickson13/pfsense-api/issues/new/choose'>Report an Issue</a><p>Copyright &copy; " + curr_year + " - Jared Hendrickson</p>";
     });
 
 </script>