From cb5f3037bb18403433c2cfd0271f6bea76906aca Mon Sep 17 00:00:00 2001
From: Horus_Arch
Date: Wed, 18 Feb 2015 17:03:41 +0100
Subject: Reimplementation with gorilla toolkit.

---
 app/controllers/app.go       | 11 -----
 app/controllers/db.go        | 38 ------------------
 app/controllers/utilities.go | 96 --------------------------------------------
 3 files changed, 145 deletions(-)
 delete mode 100644 app/controllers/app.go
 delete mode 100644 app/controllers/db.go
 delete mode 100644 app/controllers/utilities.go

(limited to 'app/controllers')

diff --git a/app/controllers/app.go b/app/controllers/app.go
deleted file mode 100644
index e76d76b..0000000
--- a/app/controllers/app.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package controllers
-
-import "github.com/revel/revel"
-
-type App struct {
-	*revel.Controller
-}
-
-func (c App) Index() revel.Result {
-	return c.Render()
-}
diff --git a/app/controllers/db.go b/app/controllers/db.go
deleted file mode 100644
index e96cb63..0000000
--- a/app/controllers/db.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package controllers
-
-import (
-	"github.com/jinzhu/gorm"
-	_ "github.com/mattn/go-sqlite3"
-	"github.com/revel/revel"
-	"time"
-)
-
-/* Maybe worth saving uptime history? */
-
-type Hosts struct {
-	Id        int64
-	UserId    int64
-	Url       string
-	Protocoll string // e.g. http
-	Private   bool
-	Response  int64
-	Date      time.Time
-	Success   bool
-	Include   string // Website must include this string
-	Except    string // Website must not include this string
-	Reason    string // Include, Exclude, Connection failure
-	Alert     bool   // True to send alert on failure
-	CreatedAt time.Time
-	DeletedAt time.Time
-	UpdatedAt time.Time
-}
-
-type User struct {
-	Id        int64
-	Name      string
-	Email     string
-	Password  string
-	CreatedAt time.Time
-	DeletedAt time.Time
-	UpdatedAt time.Time
-}
diff --git a/app/controllers/utilities.go b/app/controllers/utilities.go
deleted file mode 100644
index 99720b8..0000000
--- a/app/controllers/utilities.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package controllers
-
-import (
-	"crypto/md5"
-	"fmt"
-	//	"github.com/garyburd/redigo/redis"
-	"github.com/revel/revel"
-	"golang.org/x/crypto/bcrypt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"time"
-)
-
-// Returns the content of a webpage as string
-func HttpGet(url string) (http.Header, string, error) {
-	response, err := http.Get(url)
-	if err != nil {
-		return nil, "Get request failed.", err
-	}
-
-	defer response.Body.Close()
-	contents, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		return nil, "Reading body failed.", err
-	}
-
-	return response.Header, string(contents), nil
-}
-
-// Hashs and returns a string (md5)
-func Hash(content string) string {
-	h := md5.New()
-	io.WriteString(h, content)
-	hash := fmt.Sprintf("%x", h.Sum(nil))
-
-	return hash
-}
-
-// Creates a random string
-func RandomKey() string {
-	letters := []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
-	key := make([]rune, 40)
-	for i := range key {
-		key[i] = letters[rand.Intn(len(letters))]
-	}
-
-	return string(key)
-}
-
-var pool = newPool()
-
-/*
-// Creates a pool with connections to Redis
-func newPool() *redis.Pool {
-	return &redis.Pool{
-		MaxIdle:     3,
-		IdleTimeout: 240 * time.Second,
-		Dial: func() (redis.Conn, error) {
-			//c, err := redis.Dial("tcp", ":6379")
-			c, err := redis.Dial("tcp", revel.Config.StringDefault("redis.server", "127.0.0.1")+":"+revel.Config.StringDefault("redis.port", "6379"))
-			if err != nil {
-				return nil, err
-			}
-			return c, err
-		},
-		TestOnBorrow: func(c redis.Conn, t time.Time) error {
-			_, err := c.Do("PING")
-			return err
-		},
-	}
-}
-*/
-
-// Hashs password with bcrypt and returns the string
-func HashPassword(password string) (string, error) {
-	if password == "" {
-		return "", nil
-	}
-	p := []byte(password)
-	hash, err := bcrypt.GenerateFromPassword(p, 10)
-	if err != nil {
-		return "", err
-	}
-	return string(hash), nil
-}
-
-// Verify password and hash
-func VerifyPassword(password, hash string) (bool, error) {
-	err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password))
-	if err != nil {
-		return false, err
-	}
-	return true, nil
-}
-- 
cgit v1.2.3