* Rename fsldap to efsldap

* Use gopkg.in/ini.v1 over github.com/joho/godotenv
* Fix typos

Signed-off-by: Shin'ya Minazuki <shinyoukai@laidback.moe>

utils/dotenv.go

@@ -1,39 +0,0 @@
-package utils
-
-import (
-	"log"
-	"os"
-
-	"github.com/joho/godotenv"
-)
-
-var SmtpHostname, SmtpPort, Domain, Base, Uid string
-var BaseLenght, UidLenght int
-
-func init(){
-	loadEnv()
-}
-
-func loadEnv(){
-	log.Print("Loading .env file...")
-	err := godotenv.Load()
-	if err != nil {
-		log.Print("error loading .env file")
-	}
-
-	Domain = Env("SMTP_DOMAIN")
-	Base = Env("LDAP_BASE")
-	Uid = Env("LDAP_UID")
-	BaseLenght = len(Base) + 1
-	UidLenght = len(Uid) + 1
-	log.Print("Base ",Base," BaseLenght ",BaseLenght)
-}
-
-
-func Env(name string) string{
-	envVar := os.Getenv(name)
-	if envVar == "" {
-		log.Fatalf("error getting %s env variable", name)
-	}
-	return envVar
-}

utils/ldap.go

@@ -3,6 +3,18 @@ package utils
 import (
 	"fmt"
 	"strings"
+	"git.laidback.moe/YakumoLabs/efsldap/config"
+)
+
+var (
+	Base = config.Config.LDAPBase
+	Domain = config.Config.SMTPDomain
+	Uid = config.Config.LDAPUID
+)
+
+var (
+	BaseLength = len(Base) + 1
+	UidLength = len(Uid) + 1
 )
 
 func GetMail(user string) string {
@@ -14,11 +26,11 @@ func GetLdapName(user string) string {
 }
 
 func GetUser(name string) string {
-	endIndex := len(name) - BaseLenght
+	endIndex := len(name) - BaseLength
 	if endIndex < 0 {
 		return ""
 	}
-	user := name[UidLenght:endIndex]
+	user := name[UidLength:endIndex]
 
         user = strings.TrimSuffix(user, "@"+Domain)
 
@@ -26,7 +38,7 @@ func GetUser(name string) string {
 }
 
 func GetSearchUser(name string) string {
-	startIndex := UidLenght + 1
+	startIndex := UidLength + 1
 	endIndex := len(name) - 1
 	if endIndex < 0 {
 		return ""