From 2085dc90fc7231ddc38cd1d2ecf2dd1926ebe649 Mon Sep 17 00:00:00 2001
From: mxmehl <mail@mehl.mx>
Date: Fri, 10 Jul 2015 09:56:31 +0300
Subject: [PATCH] replace datasheet deletion; add viewdatasheet

---
 action.sh | 50 ++++++++++++++++++++++++++++++++------------------
 index.php | 11 +++++++++++
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/action.sh b/action.sh
index 9f8da61..752e0db 100755
--- a/action.sh
+++ b/action.sh
@@ -29,7 +29,7 @@
 if [ ! -e config.cfg ]; then echo "Missing config.cfg file. Edit and rename config.cfg.sample"; exit 1; fi
 source config.cfg
 
-ACTION="$1"   # adduser, changepw, listusers, userdetail, deluser, sizeall, sizeuser
+ACTION="$1"   # adduser, changepw, listusers, userdetail, deluser, sizeall, sizeuser, viewdata
 USER="$2"
 PASS="$3"
 
@@ -39,7 +39,7 @@ NOTESTMP=.Notes.txt.tmp
 
 ## FUNCTIONS
 function checkaction {
-  REGEX="^adduser$|^changepw$|^listusers$|^userdetail$|^deluser$|^sizeall$|^sizeuser$"
+  REGEX="^adduser$|^changepw$|^listusers$|^userdetail$|^deluser$|^sizeall$|^sizeuser$|^viewdata$"
   if [[ $1 =~ $REGEX ]]; then 
     echo "true" 
   else
@@ -167,19 +167,6 @@ if [ "$ACTION" == "changepw" ]; then
     mailsend "Email password changed" \
              "An Email account password has been changed." \
              "User: $USER | New Password: $PASS"
-             
-    # Update datasheet (delete entry in Email section)
-    LEAD='## > EMAIL'
-    TAIL='## < EMAIL'
-    
-    # Extract Mail part | exclude LEAD and TAIL | delete user
-    sed -n "/$LEAD/,/$TAIL/ p" $NOTES | grep -v "$LEAD\|$TAIL" | sed "/User:[ \t]*$USER$/,+2d" > $NOTESTMP
-    
-    # Put edited part in between $LEAD and $TAIL again
-    sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP
-            }; /$TAIL/p; d }" $NOTES
-    
-    #rm $NOTESTMP
     
   fi
 fi # /changepw
@@ -206,6 +193,17 @@ if [ "$ACTION" == "sizeall" ]; then
   
 fi # /sizeall
 
+# # # # #
+# VIEW DATASHEET
+# # # # #
+if [ "$ACTION" == "viewdata" ]; then
+  echo "Extracting data sheet..."
+  echo
+  
+  cat $NOTES
+  
+fi # /viewdata
+
 # # # # #
 # SIZE USER
 # # # # #
@@ -248,8 +246,24 @@ if [ "$ACTION" == "deluser" ]; then
   
   vdeluser "$USER"
   
-  mailsend "Email account deleted" \
-           "An Email account has been deleted." \
-           "User: $USER"
+  if [ $? == 0 ]; then
+    # Send infomail
+    mailsend "Email account deleted" \
+             "An Email account has been deleted." \
+             "User: $USER"
+    
+    # Update datasheet (delete entry in Email section)
+    LEAD='## > EMAIL'
+    TAIL='## < EMAIL'
+    
+    # Extract Mail part | exclude LEAD and TAIL | delete user
+    sed -n "/$LEAD/,/$TAIL/ p" $NOTES | grep -v "$LEAD\|$TAIL" | sed "/User:[ \t]*$USER$/,+2d" > $NOTESTMP
+    
+    # Put edited part in between $LEAD and $TAIL again
+    sed -i "/$LEAD/,/$TAIL/{ /$LEAD/{p; r $NOTESTMP
+            }; /$TAIL/p; d }" $NOTES
+    
+    rm $NOTESTMP
   
+  fi
 fi # /deluser
diff --git a/index.php b/index.php
index c4bb881..13fc41f 100644
--- a/index.php
+++ b/index.php
@@ -100,6 +100,17 @@
     </form>
   </div> <!-- /hide -->
 
+  <!-- VIEWDATA - View datasheet of whole account -->
+  <b class="switch"><span class="turn_on">&#187;</span><span class="turn_off">&#171;</span> View the data sheet</b>
+  <div class="hide">
+    <p>View the data sheet with all usernames and passwords. Please keep this document secure!</p>
+    <form action="submit.php" method="post">
+      <button type="submit" name="action" value="viewdata">View data sheet</button>
+      <!-- Hidden confirmation box -->
+      <input type="hidden" name="sure" value="yes" />
+    </form>
+  </div> <!-- /hide -->
+
   <!-- DELUSER - Delete an email account -->
   <b class="switch"><span class="turn_on">&#187;</span><span class="turn_off">&#171;</span> Delete an email account</b>
   <div class="hide">