Merge pull request #7 from core-coin/feautre/index

Minor refactoring

Author: Rastislav

main.go

@@ -55,7 +55,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func rawDataHandler(w http.ResponseWriter, r *http.Request) {
-	_, _, _, err := getFormValues(w, r) // set network ID
+	_, _, _, err := getFormValues(r) // set network ID
 	if err != nil {
 		returnPageToClient(
 			w,
@@ -94,7 +94,7 @@ func exitHandler(w http.ResponseWriter, req *http.Request) {
 }
 
 func encryptedDataHandler(w http.ResponseWriter, r *http.Request) {
-	keyPath, password, _, err := getFormValues(w, r)
+	keyPath, password, _, err := getFormValues(r)
 	if err != nil {
 		returnPageToClient(
 			w,
@@ -108,7 +108,7 @@ func encryptedDataHandler(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		returnPageToClient(
 			w,
-			DecryptedWalletData{IsError: true, ErrorMsg: "cannot create a wallet file: " + err.Error()},
+			DecryptedWalletData{IsError: true, ErrorMsg: "Cannot create a wallet file: " + err.Error()},
 			baseHTML, indexHTML, cssHTML,
 		)
 		return
@@ -139,23 +139,23 @@ func returnPageToClient(w http.ResponseWriter, data interface{}, templates ...st
 	}
 }
 
-func getFormValues(w http.ResponseWriter, r *http.Request) (keyPath, password, passwordRepeat string, err error) {
+func getFormValues(r *http.Request) (keyPath, password, passwordRepeat string, err error) {
 	if err := r.ParseForm(); err != nil {
-		return "", "", "", errors.New(fmt.Sprintf("cannot parse data from form: %v", err))
+		return "", "", "", errors.New(fmt.Sprintf("Cannot parse data from form: %v", err))
 	}
 
 	// Setup NetworkID
 	network := r.FormValue("network_id")
 	if network == "" {
-		return "", "", "", errors.New("you need to define network ID, 1=Mainnet, 3=Devin, everything bigger then 4=private networks")
+		return "", "", "", errors.New("You need to define network ID: 1=Mainnet, 3=Devin, 4+=Enterprise")
 	}
 	networkId, err := strconv.Atoi(network)
 	if err != nil {
 		return "", "", "", errors.New(fmt.Sprintf("Wrong network id: %v ", err))
 	}
 
 	if networkId == 2 {
-		return "", "", "", errors.New("there is not network with id = 2")
+		return "", "", "", errors.New("Network ID 2 is not existent!")
 	}
 	common.DefaultNetworkID = common.NetworkID(networkId)
 
@@ -173,7 +173,7 @@ func getFormValues(w http.ResponseWriter, r *http.Request) (keyPath, password, p
 		}
 	}
 	if !path.IsAbs(keyPath) {
-		return "", "", "", errors.New("path for keyfile is not absolute")
+		return "", "", "", errors.New("Path for keyfile is not absolute")
 	}
 
 	return