From ebf891e7854da2208e1d13ed481e9cd00f8f17ca Mon Sep 17 00:00:00 2001
From: Joshua Merrell <joshuamerrell@gmail.com>
Date: Tue, 4 Jun 2013 18:04:56 -0700
Subject: [PATCH] fixing merge (push)

---
 src/TODO      |  3 ---
 src/gochan.go |  3 +--
 src/server.go |  6 +-----
 src/sql.go    | 44 --------------------------------------------
 4 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/src/TODO b/src/TODO
index 19ce315a..c1258410 100644
--- a/src/TODO
+++ b/src/TODO
@@ -3,11 +3,8 @@
 - Set up load balancing
 - Clean up config file template
 - Set up HTTPS for management
-- gzip-encoding for html, css, and javascript
-- Set up backend mode, compatibility with nginx and Apache
 - Set up templating
 - Set up timezone adjusting
-- Set up new mod menu style, integrated with board pages
 - Give administrator server control options (restart/shutdown daemon, etc)
 - Set up basic posting/board interaction
 - find out what changes were made in Kusaba 0.9.3 to fix XSS vulnerability
\ No newline at end of file
diff --git a/src/gochan.go b/src/gochan.go
index 43ccb69a..6951d285 100644
--- a/src/gochan.go
+++ b/src/gochan.go
@@ -7,7 +7,7 @@ import (
 )
 
 var (
-	version float32 = 0.2
+	version float32 = 0.3
 )
 
 
@@ -25,7 +25,6 @@ func main() {
 		needs_initial_setup = true
 		runInitialSetup()
 	}
-
 	fmt.Println("Loading and parsing templates...")
 	initTemplates()
 	fmt.Println("Initializing server...")
diff --git a/src/server.go b/src/server.go
index a5f5b5e8..7cd77b61 100644
--- a/src/server.go
+++ b/src/server.go
@@ -92,11 +92,7 @@ func makeHandler(fn func(http.ResponseWriter, *http.Request)) http.HandlerFunc {
 	}
 }
 
-<<<<<<< HEAD
 func exitWithErrorPage(w http.ResponseWriter, err string) {
-=======
-func exitWithErrorPage(writer http.ResponseWriter, err string) {
->>>>>>> 0b6e2bc132fad7f323348b27857431ea8674c382
 	error_page_bytes,_ := ioutil.ReadFile("templates/error.html")
 	error_page := string(error_page_bytes)
 	error_page = strings.Replace(error_page,"{ERRORTEXT}", err,-1)
@@ -125,4 +121,4 @@ func serverError() {
 func serveFile(w http.ResponseWriter, filepath string) {
 	http.ServeFile(w, &request, filepath)
 	access_log.Write("Success: 200 from " + request.RemoteAddr + " @ " + request.RequestURI)
-}
+}
\ No newline at end of file
diff --git a/src/sql.go b/src/sql.go
index 8bb51f65..2c204027 100644
--- a/src/sql.go
+++ b/src/sql.go
@@ -3,16 +3,12 @@ package main
 import (
 	"os"
 	"fmt"
-	//"database/sql"
-	//_ "github.com/go-sql-driver/mysql"
-
 	"github.com/ziutek/mymysql/mysql"
 	_ "github.com/ziutek/mymysql/native" // Native engine
 	//_ "github.com/ziutek/mymysql/thrsafe" // Thread safe engine
 )
 
 var (
-	//db *sql.DB
 	db mysql.Conn
 	db_connected = false
 )
@@ -34,44 +30,4 @@ func connectToSQLServer(usedb bool) {
 		}
 	}
 	db_connected = true
-}
-
-
-func dbTests() {
-  	results,err := db.Start("SELECT * FROM `"+config.DBprefix+"staff")
-  	if err != nil {
-  		fmt.Println(err.Error())
-  		os.Exit(2)
-  	}
-  	/*var entry StaffTable
-	if err != nil {
-		error_log.Write(err.Error())
-	}
-	for results.Next() {
-		err = results.Scan(&entry.username,&entry.password_checksum,&entry.rank)
-		//if err !=  nil { panic(err) }
-	}*/
-
-	for {
-	    row, err := results.GetRow()
-	        if err != nil {
-	        	error_log.Write(err.Error())
-	        }
-
-	        if row == nil {
-	            // No more rows
-	            break
-	        }
-
-	    // Print all cols
-	    for _, col := range row {
-	        if col == nil {
-	            fmt.Print("<NULL>")
-	        } else {
-	            os.Stdout.Write(col.([]byte))
-	        }
-	        fmt.Print(" ")
-	    }
-	    fmt.Println()
-	}
 }
\ No newline at end of file