From f5739fe5afbe3d39d7af89f4a713d056b9a2fd57 Mon Sep 17 00:00:00 2001
From: mxmehl <mail@mehl.mx>
Date: Fri, 10 Jul 2015 09:28:49 +0300
Subject: [PATCH] add function to update datasheet

---
 .htaccess.sample |  6 ++++++
 action.sh        | 18 ++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.htaccess.sample b/.htaccess.sample
index 55ad504..3f281e6 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -1,3 +1,9 @@
+## SSL
+# Enforce SSL
+RewriteCond %{SERVER_PORT}     !^443$
+RewriteRule (.*)  https://%{SERVER_NAME}%{REQUEST}
+
+## Basic Auth protection
 AuthType Basic
 AuthName "secured area"
 AuthUserFile /path/to/.htpasswd
diff --git a/action.sh b/action.sh
index a27f936..163f57c 100755
--- a/action.sh
+++ b/action.sh
@@ -33,6 +33,10 @@ ACTION="$1"   # adduser, changepw, listusers, userdetail, deluser, sizeall, size
 USER="$2"
 PASS="$3"
 
+SYSUSER=$(whoami)
+NOTES="~/$SYSUSER-Notes.txt"
+NOTESTMP=.Notes.txt.tmp
+
 ## FUNCTIONS
 function checkaction {
   REGEX="^adduser$|^changepw$|^listusers$|^userdetail$|^deluser$|^sizeall$|^sizeuser$"
@@ -101,6 +105,7 @@ if ! $(checkaction "$ACTION"); then
   exit 1
 fi
 
+
 # # # # #
 # ADDING USER
 # # # # #
@@ -125,10 +130,17 @@ if [ "$ACTION" == "adduser" ]; then
   
   python adduser.py "$USER" "$PASS"
   
-  mailsend "New Email account created" \
+  if [ $? == 0 ]; then
+    # Send infomail
+    mailsend "New Email account created" \
            "A new Email account has been created." \
            "User: $USER | Password: $PASS"
+    
+    # Update datasheet (add new entry in Email section)
+    TAIL='## < EMAIL'
+    sed -i "/$TAIL/i User:     $USER\nPass:     $PASS\n" $NOTES
   
+  fi
 fi # /adduser
 
 # # # # #
@@ -154,7 +166,7 @@ if [ "$ACTION" == "changepw" ]; then
            "An Email account password has been changed." \
            "User: $USER | New Password: $PASS"
   
-fi # /adduser
+fi # /changepw
 
 # # # # #
 # LIST USERS
@@ -173,7 +185,6 @@ fi # /listusers
 if [ "$ACTION" == "sizeall" ]; then
   echo "Calculate total size of all Email accounts..."
   echo
-  SYSUSER=$(whoami)
   
   du -sBM ~/users/* | sed -e "s:/home/$SYSUSER/users/::g"
   
@@ -185,7 +196,6 @@ fi # /sizeall
 if [ "$ACTION" == "sizeuser" ]; then
   echo "Calculate size of all folders of an Email account..."
   echo
-  SYSUSER=$(whoami)
   
   # Show size in MB, strip long paths, strip tmp and new folders, rename .INBOX cur-folder
   du -BM ~/users/"$USER" | sed -e "s:/home/$SYSUSER/users/$USER/::g" | grep -v "/cur$\|new$\|tmp$" | sed "s:cur$:.INBOX:" | grep -v "/home/$SYSUSER/users/$USER" | sort -nr