From 20bd14fe7bf04f1acba968f017b7a433c5f179e1 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Sun, 17 Jan 2021 15:16:50 -0700
Subject: wizard: fix letsencrypt empty email

Signed-off-by: nachoparker <nacho@ownyourbits.com>
---
 bin/ncp-diag                      | 12 +++++++-----
 bin/ncp/NETWORKING/letsencrypt.sh |  2 +-
 bin/ncp/NETWORKING/no-ip.sh       |  2 +-
 changelog.md                      |  8 ++------
 etc/ncp-config.d/no-ip.cfg        |  1 +
 ncp-web/wizard/index.php          |  6 +++---
 ncp.sh                            |  2 +-
 7 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/bin/ncp-diag b/bin/ncp-diag
index 4d2d0fc9..ef0d879c 100644
--- a/bin/ncp-diag
+++ b/bin/ncp-diag
@@ -64,11 +64,13 @@ echo "internet check|$( ping -W 2 -w 1 -q github.com &>/dev/null && echo ok || e
 
 function is_port_open()
 {
-  PORT=$1
-  tmp_file=$(mktemp)
-  v=$(wget -T2 -t1 -q --keep-session-cookies --save-cookies $tmp_file https://portchecker.co -O - | grep -oP "_csrf\" value=\"\K.*\"")
-  wget -T2 -t1 -q   --load-cookies $tmp_file https://portchecker.co --post-data "port=$PORT&_csrf=${v::-1}" -O - \
-  | grep -q '<span class="green">open</span>' && { echo "open"; return 1; }
+  local PORT=$1
+  local tmp_file=$(mktemp)
+  local v=$(wget -T2 -t1 -q --keep-session-cookies --save-cookies $tmp_file https://portchecker.co -O - | grep -oP "_csrf\" value=\"\K.*\"")
+  if [[ "$v" != "" ]]; then
+    wget -T2 -t1 -q   --load-cookies $tmp_file https://portchecker.co --post-data "port=$PORT&_csrf=${v::-1}" -O - \
+    | grep -q '<span class="green">open</span>' && { echo "open"; return 1; }
+  fi
   echo "closed"
   rm $tmp_file
 }
diff --git a/bin/ncp/NETWORKING/letsencrypt.sh b/bin/ncp/NETWORKING/letsencrypt.sh
index 449a5dc2..415567b0 100644
--- a/bin/ncp/NETWORKING/letsencrypt.sh
+++ b/bin/ncp/NETWORKING/letsencrypt.sh
@@ -62,7 +62,7 @@ configure()
         domain_string+=",${domain}"
     }
   done
-  $letsencrypt certonly -n --force-renew --no-self-upgrade --webroot -w $ncdir --hsts --agree-tos -m $EMAIL -d $domain_string && {
+  "${letsencrypt}" certonly -n --force-renew --no-self-upgrade --webroot -w "${ncdir}" --hsts --agree-tos -m "${EMAIL}" -d "${domain_string}" && {
 
     # Set up auto-renewal
     cat > /etc/cron.weekly/letsencrypt-ncp <<EOF
diff --git a/bin/ncp/NETWORKING/no-ip.sh b/bin/ncp/NETWORKING/no-ip.sh
index 6e1c910d..1072c3c4 100644
--- a/bin/ncp/NETWORKING/no-ip.sh
+++ b/bin/ncp/NETWORKING/no-ip.sh
@@ -37,7 +37,7 @@ install()
 ### END INIT INFO
 EOF
 
-  cat debian.noip2.sh >> /etc/init.d/noip2 
+  cat debian.noip2.sh >> /etc/init.d/noip2
 
   chmod +x /etc/init.d/noip2
   cd -
diff --git a/changelog.md b/changelog.md
index 1041b3ed..e42dae59 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,11 +1,7 @@
 
-[v1.34.1](https://github.com/nextcloud/nextcloudpi/commit/37c2e4f) (2021-01-01) unattended-upgrades: fix raspbian origin
+[v1.33.2](https://github.com/nextcloud/nextcloudpi/commit/a975b0c) (2021-01-17) wizard: fix letsencrypt empty email
 
-[v1.34.0](https://github.com/nextcloud/nextcloudpi/commit/ec428a2) (2021-01-01) upgrade to NC20.0.4
-
-[v1.33.2 ](https://github.com/nextcloud/nextcloudpi/commit/82d00c8) (2021-01-01) ncp-config: fix empty values
-
-[v1.33.1 ](https://github.com/nextcloud/nextcloudpi/commit/42fd597) (2020-12-12) nc-update-nc: improve error messages
+[v1.33.1](https://github.com/nextcloud/nextcloudpi/commit/42fd597) (2020-12-12) nc-update-nc: improve error messages
 
 [v1.33.0](https://github.com/nextcloud/nextcloudpi/commit/ffd0b44) (2020-12-10) upgrade to NC20.0.3
 
diff --git a/etc/ncp-config.d/no-ip.cfg b/etc/ncp-config.d/no-ip.cfg
index 60416862..59646ee2 100644
--- a/etc/ncp-config.d/no-ip.cfg
+++ b/etc/ncp-config.d/no-ip.cfg
@@ -34,6 +34,7 @@
       "id": "TIME",
       "name": "Time",
       "value": "30",
+      "default": "30",
       "suggest": "30"
     }
   ]
diff --git a/ncp-web/wizard/index.php b/ncp-web/wizard/index.php
index 4cc6ba6e..87d6fcc0 100644
--- a/ncp-web/wizard/index.php
+++ b/ncp-web/wizard/index.php
@@ -172,7 +172,7 @@ HTML
                         </div>
                     </div>
 
-                    <!-- Configure No-IP -->	
+                    <!-- Configure No-IP -->
                     <div class="ncp-hidden" id="noip">
                         <div class="buttons-area">
                             <div class="ddns-form">
@@ -184,14 +184,14 @@ HTML
                                         </tr>
                                         <tr>
                                             <td><label for="noip-password">Password</label></td>
-                                            <td><input type="text" id="noip-password" placeholder="secret"></td>
+                                            <td><input type="password" id="noip-password" placeholder="secret"></td>
                                         </tr>
                                     </table>
                                     <div class="buttons-area">
                                         <button class="btn" id="ddns-enable-noip">Finish</button>
                                     </div>
                                 </form>
-                            </div>	
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/ncp.sh b/ncp.sh
index 2c57fb8f..83f4bc78 100644
--- a/ncp.sh
+++ b/ncp.sh
@@ -204,7 +204,7 @@ done
 ncc config:system:set trusted_domains 1 --value=$ip
 EOF
 
-  [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nextcloud-domain 
+  [[ "$DOCKERBUILD" != 1 ]] && systemctl enable nextcloud-domain
 
   # NEXTCLOUDPI UPDATES
   cat > /etc/cron.daily/ncp-check-version <<EOF
-- 
cgit v1.2.3