Skip to content

Commit

Permalink
Allow user to choose https
Browse files Browse the repository at this point in the history 
#9
  • Loading branch information
@johnholbrook
johnholbrook committed Jul 22, 2023
1 parent a420497 commit a3f998f
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 35 deletions.
7 changes: 4 additions & 3 deletions us.johnholbrook.pihole.sdPlugin/code.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,17 @@ function log(message){

// make a call to enable or disable pi-hole
function callPiHole(settings, cmd){
let req_addr = `http://${settings.ph_addr}/admin/api.php?${cmd}&auth=${settings.ph_key}`;
let req_addr = `${settings.protocol}://${settings.ph_addr}/admin/api.php?${cmd}&auth=${settings.ph_key}`;
// log(`call request to ${req_addr}`);
let xhr = new XMLHttpRequest();
xhr.open("GET", req_addr);
xhr.send();
}

// get the status of the pi-hole (enabled/disabled, stats, etc.) and pass to a handler function
function get_ph_status(settings, handler){
let req_addr = `http://${settings.ph_addr}/admin/api.php?summaryRaw&auth=${settings.ph_key}`;
// log(`request to ${req_addr}`);
let req_addr = `${settings.protocol}://${settings.ph_addr}/admin/api.php?summaryRaw&auth=${settings.ph_key}`;
// log(`get_status request to ${req_addr}`);
let xhr = new XMLHttpRequest();
xhr.open("GET", req_addr);
xhr.onload = function(){
Expand Down
18 changes: 18 additions & 0 deletions us.johnholbrook.pihole.sdPlugin/pi/index_pi.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,24 @@
</select>
</div>

<div class="sdpi-item">
<div class="sdpi-item-label">Conn. Type</div>
<!-- <div class="sdpi-item-value">
<div class="sdpi-item-child">
<input type="radio" id="radio-http" name="protocol-radio" checked>
<label for="protocol-radio" class="sdpi-item-label"><span></span>HTTP</label>
</div>
<div class="sdpi-item-child">
<input type="radio" id="radio-https" name="protocol-radio">
<label for="protocol-radio" class="sdpi-item-label"><span></span>HTTPS</label>
</div>
</div> -->
<select name="protocol-input" id="protocol-input" class="sdpi-item-value select">
<option value="http" selected>HTTP</option>
<option value="https">HTTPS</option>
</select>
</div>

</div>
</body>
</html>
40 changes: 8 additions & 32 deletions us.johnholbrook.pihole.sdPlugin/pi/pi.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function connectElgatoStreamDeckSocket(inPort, inPropertyInspectorUUID, inRegist
document.querySelector("#ph-key-input").value = settings.ph_key ? settings.ph_key : "";
document.querySelector("#ph-addr-input").value = settings.ph_addr ? settings.ph_addr : "";
document.querySelector("#stat-input").value = settings.stat ? settings.stat : "none";
document.querySelector("#protocol-input").value = settings.protocol ? settings.protocol : "http";
if (action == "us.johnholbrook.pihole.temporarily-disable"){
document.querySelector("#disable-time-input").value = settings.disable_time ? settings.disable_time : "";
}
Expand All @@ -73,61 +74,35 @@ function updateSettings(){
let key = document.querySelector("#ph-key-input").value;
let addr = document.querySelector("#ph-addr-input").value;
let stat = document.querySelector("#stat-input").value;
let protocol = document.querySelector("#protocol-input").value;
send({
"event" : "setSettings",
"context" : context,
"payload": {
"ph_addr" : addr,
"ph_key" : key,
"disable_time" : disable_time,
"stat" : stat
"stat" : stat,
"protocol": protocol
}
});
}
else{
let key = document.querySelector("#ph-key-input").value;
let addr = document.querySelector("#ph-addr-input").value;
let stat = document.querySelector("#stat-input").value;
let protocol = document.querySelector("#protocol-input").value;
send({
"event" : "setSettings",
"context" : context,
"payload": {
"ph_addr" : addr,
"ph_key" : key,
"stat" : stat
"stat" : stat,
"protocol": protocol
}
});
}
// if (action == "us.johnholbrook.pihole.toggle"){
// let key = document.querySelector("#ph-key-input").value;
// let addr = document.querySelector("#ph-addr-input").value;
// let stat = document.querySelector("#stat-input").value;
// send({
// "event" : "setSettings",
// "context" : context,
// "payload": {
// "ph_addr" : addr,
// "ph_key" : key,
// "stat" : stat
// }
// });
// }
// else if (action == "us.johnholbrook.pihole.temporarily-disable"){
// let disable_time = document.querySelector("#disable-time-input").value;
// let key = document.querySelector("#ph-key-input").value;
// let addr = document.querySelector("#ph-addr-input").value;
// let stat = document.querySelector("#stat-input").value;
// send({
// "event" : "setSettings",
// "context" : context,
// "payload": {
// "ph_addr" : addr,
// "ph_key" : key,
// "disable_time" : disable_time,
// "stat" : stat
// }
// });
// }
}

document.addEventListener("DOMContentLoaded", () => {
Expand All @@ -136,4 +111,5 @@ document.addEventListener("DOMContentLoaded", () => {
document.querySelector("#ph-key-input").onchange = updateSettings;
document.querySelector("#ph-addr-input").onchange = updateSettings;
document.querySelector("#stat-input").onchange = updateSettings;
document.querySelector("#protocol-input").onchange = updateSettings;
});

0 comments on commit a3f998f

Please sign in to comment.