Fix #43 + Rewrite convert1To2digits

Author: funilrys

funceble

@@ -72,7 +72,7 @@ noFiles=false
 
 # Generate debug file under log
 # DO NOT USE THIS IF YOU DON'T KNOW HOW TO DEBUG FROM OUTPUTTED FILE
-debugUnknown=true
+debugUnknown=false
 
 # Defaut name for hosts file
 hostsDefault='hosts'
@@ -749,7 +749,7 @@ getExpirationDate(){
 
         # Here's a list of words the ${content} have to match to get the
         # expiration date from the whois record of domain
-        local toMatch=('expire:' 'Expiration Date:' 'expire on:' 'Expiry Date:' 'free-date' 'expires:' 'Expiration date:' 'Expiry date:' 'Expire Date:' 'renewal date:' 'Expires:' 'validity:' 'Expiration Date             :' 'Expiry :' 'expires at:' 'domain_datebilleduntil:' 'Data de expiração \/ Expiration Date \(dd\/mm\/yyyy\):' 'Fecha de expiración \(Expiration date\):' '\[Expires on\]' 'Record expires on' 'status:      OK-UNTIL' 'renewal:' 'expires............:' 'expire-date:')
+        local toMatch=('expire:' 'Expiration Date:' 'expire on:' 'Expiry Date:' 'free-date' 'expires:' 'Expiration date:' 'Expiry date:' 'Expire Date:' 'renewal date:' 'Expires:' 'validity:' 'Expiration Date             :' 'Expiry :' 'expires at:' 'domain_datebilleduntil:' 'Data de expiração \/ Expiration Date \(dd\/mm\/yyyy\):' 'Fecha de expiración \(Expiration date\):' '\[Expires on\]' 'Record expires on' 'status:      OK-UNTIL' 'renewal:' 'expires............:' 'expire-date:' 'Exp date:')
 
         for i in ${!toMatch[*]}
         do
@@ -875,46 +875,30 @@ getMonthInEnglish(){
 # @CalledBy formatDate
 ################################################################################
 convert1To2digits(){
-    oneDigit="${1}"
+    local number="${1}"
+    local monthOrDay="${2}"
 
-    local regex='(?<!\S)\d(?!\S)'
-    if [[ ${oneDigit} =~ regex ]]
-    then
-        case ${oneDigit} in
-            1)
-                month='01'
-            ;;
-            2)
-                month='02'
-            ;;
-            3)
-                month='03'
-            ;;
-            4)
-                month='04'
-            ;;
-            5)
-                month='05'
-            ;;
-            6)
-                month='06'
-            ;;
-            7)
-                month='07'
-            ;;
-            8)
-                month='08'
-            ;;
-            9)
-                month='09'
-            ;;
-            *)
-                month='00'
-            ;;
-        esac
-    else
-        month=${oneDigit}
-    fi
+    local regex="^\d"
+    
+    local validNumber=('1' '2' '3' '4' '5' '6' '7' '8' '9')
+    local null='0'
+    
+    for i in ${!validNumber[*]}
+    do
+        if [[ ${number} == ${validNumber[${i}]} ]]
+        then
+            case "${monthOrDay}" in
+                month)
+                    month=${null}${number}
+                    break
+                ;;
+                day)
+                    day=${null}${number}
+                    break
+                ;;
+            esac
+        fi
+    done
 }
 
 ################################ Format Date ###################################
@@ -979,6 +963,8 @@ formatDate()
     local regex26='[0-9]{2}-[A-Z]{1}[a-z]{2}-[0-9]{4}'
     # Date in format: 02.1.2017 // Month: jan
     local regex27='[0-9]{2}\.[0-9]{1}\.[0-9]{4}'
+    # Date in format: 02 Jan 2017
+    local regex28='[0-9]\s[A-Z]{1}[a-z]{2}\s[0-9]{4}'
 
     if [[ "${expirationDate}" =~ ${regex1} || "${expirationDate}" =~ ${regex11} || "${expirationDate}" =~ ${regex26} ]]
     then
@@ -1036,14 +1022,46 @@ formatDate()
         local year=$(echo "${expirationDate}" | tr -cd '[[:digit:]]' | tail -c4)
 
         # We convert the month
-        convert1To2digits "${month}"
+        convert1To2digits "${month}" "month"
 
         # We convert the month to alpha format
         getMonthInEnglish "${month}"
 
         # We assign the expiration date
         expirationDate=${day}'-'${month}'-'${year}
 
+        # We convert it to lower case
+        dateToLower
+    elif [[ "${expirationDate}" =~ ${regex28} ]]
+    then
+        # We split the date
+        local month=$(echo "${expirationDate}" | tr -cd '[[:alpha:]]' | head -c3)
+        local year=$(echo "${expirationDate}" | tr -cd '[[:digit:]]' | tail -c4)
+        local day=$(echo "${expirationDate}" | tr -cd '[[:digit:]]' | head -c4)
+        
+        # We get the last 2 digits of the day
+        local dayEnd=$(echo "${day}" | tr -cd '[[:digit:]]' | tail -c2)
+        
+        # We use 20 to check if it's a 1 or 2 digts day
+        # Case:
+        #    2 Jan 2017
+        #        Result: 2201
+        #    02 Jan 2017-01
+        #        Result: 0220
+        # So if the last 2 digts are not 20, it's a 1 digit day
+        if [[ ${dayEnd} == '20' ]]
+        then
+            local day=$(echo "${day}" | tr -cd '[[:digit:]]' | head -c2)
+        else
+            local day=$(echo "${day}" | tr -cd '[[:digit:]]' | head -c1)
+            
+            # We convert the day
+            convert1To2digits "${day}" "day"
+        fi
+        
+        # We assign the expiration date
+        expirationDate=${day}'-'${month}'-'${year}
+        
         # We convert it to lower case
         dateToLower
     else