";
menu_alerts.find(".alertList").html(alist);
if(data.msgs.length != 0) {
menu_alerts.find(".alert_counter").text(data.msgs.length);
@@ -65,7 +63,7 @@ function load_alerts(menu_alerts)
console.log(data.errmsg);
errtxt = data.errmsg;
}
- else errtxt = "Unable to get the alerts"
+ else errtxt = "Unable to get the alerts";
} catch(e) { errtxt = "Unable to get the alerts"; }
menu_alerts.find(".alertList").html("
"+errtxt+"
");
}
@@ -74,81 +72,77 @@ function load_alerts(menu_alerts)
$(document).ready(function(){
function SplitN(data,ch,n) {
- var out = []
- if(data.length == 0) {
- return out
- }
-
- var lastIndex = 0
- var j = 0
- var lastN = 1
+ var out = [];
+ if(data.length == 0) return out;
+
+ var lastIndex = 0;
+ var j = 0;
+ var lastN = 1;
for(var i = 0; i < data.length; i++) {
if(data[i] == ch) {
- out[j++] = data.substring(lastIndex,i)
- lastIndex = i
- if(lastN == n) {
- break
- }
- lastN++
+ out[j++] = data.substring(lastIndex,i);
+ lastIndex = i;
+ if(lastN == n) break;
+ lastN++;
}
}
if(data.length > lastIndex) {
- out[out.length - 1] += data.substring(lastIndex)
+ out[out.length - 1] += data.substring(lastIndex);
}
- return out
+ return out;
}
-
+
if(window["WebSocket"]) {
- conn = new WebSocket("ws://" + document.location.host + "/ws/")
+ conn = new WebSocket("ws://" + document.location.host + "/ws/");
conn.onopen = function() {
- conn.send("page " + document.location.pathname + '\r')
+ conn.send("page " + document.location.pathname + '\r');
}
conn.onclose = function() {
- conn = false
+ conn = false;
}
conn.onmessage = function(event) {
- //console.log("WS_Message:")
- //console.log(event.data)
- var messages = event.data.split('\r')
+ //console.log("WS_Message:");
+ //console.log(event.data);
+ var messages = event.data.split('\r');
for(var i = 0; i < messages.length; i++) {
- //console.log("Message:")
- //console.log(messages[i])
+ //console.log("Message:");
+ //console.log(messages[i]);
if(messages[i].startsWith("set ")) {
- //msgblocks = messages[i].split(' ',3)
- msgblocks = SplitN(messages[i]," ",3)
+ //msgblocks = messages[i].split(' ',3);
+ msgblocks = SplitN(messages[i]," ",3);
if(msgblocks.length < 3) {
- continue
+ continue;
}
- document.querySelector(msgblocks[1]).innerHTML = msgblocks[2]
+ document.querySelector(msgblocks[1]).innerHTML = msgblocks[2];
} else if(messages[i].startsWith("set-class ")) {
- msgblocks = SplitN(messages[i]," ",3)
+ msgblocks = SplitN(messages[i]," ",3);
if(msgblocks.length < 3) {
- continue
+ continue;
}
- document.querySelector(msgblocks[1]).className = msgblocks[2]
+ document.querySelector(msgblocks[1]).className = msgblocks[2];
}
}
}
} else {
conn = false
}
-
+
$(".open_edit").click(function(event){
//console.log("Clicked on edit");
event.preventDefault();
$(".hide_on_edit").hide();
$(".show_on_edit").show();
});
-
+
$(".topic_item .submit_edit").click(function(event){
event.preventDefault();
$(".topic_name").html($(".topic_name_input").val());
$(".topic_content").html($(".topic_content_input").val());
$(".topic_status_e:not(.open_edit)").html($(".topic_status_input").val());
-
+
$(".hide_on_edit").show();
$(".show_on_edit").hide();
-
+
var topic_name_input = $('.topic_name_input').val();
var topic_status_input = $('.topic_status_input').val();
var topic_content_input = $('.topic_content_input').val();
@@ -158,31 +152,31 @@ $(document).ready(function(){
//console.log("Form Action: " + form_action);
$.ajax({
url: form_action,
+ type: "POST",
+ dataType: "json",
data: {
topic_name: topic_name_input,
topic_status: topic_status_input,
topic_content: topic_content_input,
topic_js: 1
- },
- type: "POST",
- dataType: "json"
+ }
});
});
-
+
$(".delete_item").click(function(event)
{
post_link(event);
var block = $(this).closest('.deletable_block');
block.remove();
});
-
+
$(".edit_item").click(function(event)
{
event.preventDefault();
var block_parent = $(this).closest('.editable_parent');
var block = block_parent.find('.editable_block').eq(0);
block.html(" ");
-
+
$(".submit_edit").click(function(event)
{
event.preventDefault();
@@ -190,21 +184,21 @@ $(document).ready(function(){
var block = block_parent.find('.editable_block').eq(0);
var newContent = block.find('textarea').eq(0).val();
block.html(newContent);
-
+
var form_action = $(this).closest('a').attr("href");
//console.log("Form Action: " + form_action);
$.ajax({ url: form_action, type: "POST", dataType: "json", data: { is_js: "1", edit_item: newContent }
});
});
});
-
+
$(".edit_field").click(function(event)
{
event.preventDefault();
var block_parent = $(this).closest('.editable_parent');
var block = block_parent.find('.editable_block').eq(0);
block.html("");
-
+
$(".submit_edit").click(function(event)
{
event.preventDefault();
@@ -212,7 +206,7 @@ $(document).ready(function(){
var block = block_parent.find('.editable_block').eq(0);
var newContent = block.find('input').eq(0).val();
block.html(newContent);
-
+
var form_action = $(this).closest('a').attr("href");
//console.log("Form Action: " + form_action);
$.ajax({
@@ -223,25 +217,38 @@ $(document).ready(function(){
});
});
});
-
+
$(".edit_fields").click(function(event)
{
event.preventDefault();
+ //console.log("clicked .edit_fields");
var block_parent = $(this).closest('.editable_parent');
+ //console.log(block_parent);
block_parent.find('.hide_on_edit').hide();
block_parent.find('.editable_block').show();
block_parent.find('.editable_block').each(function(){
var field_name = this.getAttribute("data-field");
var field_type = this.getAttribute("data-type");
- if(field_type=="list") {
+ if(field_type=="list")
+ {
var field_value = this.getAttribute("data-value");
if(field_name in form_vars) var it = form_vars[field_name];
else var it = ['No','Yes'];
var itLen = it.length;
var out = "";
+ //console.log("Field Name '" + field_name + "'")
+ //console.log("Field Type",field_type)
+ //console.log("Field Value '" + field_value + "'")
for (var i = 0; i < itLen; i++){
- if(field_value==i) sel = "selected ";
- else sel = "";
+ //console.log("Field Possibility '" + it[i] + "'");
+ if(field_value == i || field_value == it[i]) {
+ sel = "selected ";
+ //console.log("Class List: ",this.classList)
+ this.classList.remove(field_name + '_' + it[i]);
+ //console.log("Removing " + field_name + '_' + it[i]);
+ //console.log(this.classList)
+ this.innerHTML = "";
+ } else sel = "";
out += "";
}
this.innerHTML = "";
@@ -249,22 +256,35 @@ $(document).ready(function(){
else this.innerHTML = "";
});
block_parent.find('.show_on_edit').eq(0).show();
-
+
+ // Remove any handlers already attached to the submitter
+ $(".submit_edit").unbind("click");
+
$(".submit_edit").click(function(event)
{
event.preventDefault();
+ //console.log("running .submit_edit event");
var out_data = {is_js: "1"}
var block_parent = $(this).closest('.editable_parent');
var block = block_parent.find('.editable_block').each(function(){
var field_name = this.getAttribute("data-field");
var field_type = this.getAttribute("data-type");
- if(field_type == "list") var newContent = $(this).find('select :selected').text();
- else var newContent = $(this).find('input').eq(0).val();
-
- this.innerHTML = newContent;
- out_data[field_name] = newContent
+ if(field_type == "list") {
+ var newContent = $(this).find('select :selected').text();
+ this.classList.add(field_name + '_' + newContent);
+ this.innerHTML = "";
+ } else {
+ var newContent = $(this).find('input').eq(0).val();
+ this.innerHTML = newContent;
+ }
+ //console.log(".submit_edit");
+ //console.log("field_name",field_name);
+ //console.log("field_type",field_type);
+ //console.log("newContent",newContent);
+ this.setAttribute("data-value",newContent);
+ out_data[field_name] = newContent;
});
-
+
var form_action = $(this).closest('a').attr("href");
//console.log("Form Action: " + form_action);
//console.log(out_data);
@@ -273,7 +293,7 @@ $(document).ready(function(){
block_parent.find('.show_on_edit').hide();
});
});
-
+
$(".ip_item").each(function(){
var ip = this.textContent;
//console.log("IP: " + ip);
@@ -285,24 +305,24 @@ $(document).ready(function(){
};
}
});
-
+
$(this).click(function() {
$(".selectedAlert").removeClass("selectedAlert");
});
-
+
$(".menu_alerts").ready(function(){
load_alerts($(this));
});
-
+
$(".menu_alerts").click(function(event) {
event.stopPropagation();
if($(this).hasClass("selectedAlert")) return;
this.className += " selectedAlert";
load_alerts($(this));
});
-
+
this.onkeyup = function(event){
if(event.which == 37) this.querySelectorAll("#prevFloat a")[0].click();
if(event.which == 39) this.querySelectorAll("#nextFloat a")[0].click();
};
-});
\ No newline at end of file
+});
diff --git a/router_gen/main.go b/router_gen/main.go
index 22228610..2633e283 100644
--- a/router_gen/main.go
+++ b/router_gen/main.go
@@ -1,4 +1,5 @@
/* WIP Under Construction */
+// The router generator might be discontinued in favour of syncmaps in Go 1.9, it will be temporarily used for a couple of months as a lockless alternative to maps
package main
import "log"
@@ -16,7 +17,7 @@ func main() {
routes()
var out string
- var fdata string = "// Code generated by. DO NOT EDIT.\n/* This file was automatically generated by the software. Please don't edit it as your changes may be overwritten at any moment. */\n"
+ var fdata string = "// Code generated by. DO NOT EDIT.\n/* This file was automatically generated by the software. Please don't edit it as your changes may be overwritten at any moment. */\n// The router generator might be discontinued in favour of syncmaps in Go 1.9, it will be temporarily used for a couple of months as a lockless alternative to maps\n"
for _, route := range route_list {
var end int
diff --git a/routes.go b/routes.go
index 8ab4b1de..46638483 100644
--- a/routes.go
+++ b/routes.go
@@ -34,7 +34,7 @@ func route_static(w http.ResponseWriter, r *http.Request){
w.WriteHeader(http.StatusNotFound)
return
}
-
+
// Surely, there's a more efficient way of doing this?
if t, err := time.Parse(http.TimeFormat, r.Header.Get("If-Modified-Since")); err == nil && file.Info.ModTime().Before(t.Add(1 * time.Second)) {
w.WriteHeader(http.StatusNotModified)
@@ -72,9 +72,9 @@ func route_overview(w http.ResponseWriter, r *http.Request){
}
pi := Page{"Overview",user,noticeList,tList,nil}
err := templates.ExecuteTemplate(w,"overview.html",pi)
- if err != nil {
- InternalError(err,w,r)
- }
+ if err != nil {
+ InternalError(err,w,r)
+ }
}
func route_custom_page(w http.ResponseWriter, r *http.Request){
@@ -87,19 +87,19 @@ func route_custom_page(w http.ResponseWriter, r *http.Request){
NotFound(w,r)
return
}
-
+
err := templates.ExecuteTemplate(w,"page_" + name,Page{"Page",user,noticeList,tList,nil})
if err != nil {
InternalError(err,w,r)
}
}
-
+
func route_topics(w http.ResponseWriter, r *http.Request){
user, noticeList, ok := SessionCheck(w,r)
if !ok {
return
}
-
+
var fidList []string
group := groups[user.Group]
for _, fid := range group.CanSee {
@@ -107,7 +107,7 @@ func route_topics(w http.ResponseWriter, r *http.Request){
fidList = append(fidList,strconv.Itoa(fid))
}
}
-
+
var topicList []TopicsRow
rows, err := db.Query("select topics.tid, topics.title, topics.content, topics.createdBy, topics.is_closed, topics.sticky, topics.createdAt, topics.lastReplyAt, topics.parentID, topics.likeCount, users.name, users.avatar from topics left join users ON topics.createdBy = users.uid where parentID in("+strings.Join(fidList,",")+") order by topics.sticky DESC, topics.lastReplyAt DESC, topics.createdBy DESC")
//rows, err := get_topic_list_stmt.Query()
@@ -115,7 +115,7 @@ func route_topics(w http.ResponseWriter, r *http.Request){
InternalError(err,w,r)
return
}
-
+
topicItem := TopicsRow{ID: 0}
for rows.Next() {
err := rows.Scan(&topicItem.ID, &topicItem.Title, &topicItem.Content, &topicItem.CreatedBy, &topicItem.Is_Closed, &topicItem.Sticky, &topicItem.CreatedAt, &topicItem.LastReplyAt, &topicItem.ParentID, &topicItem.LikeCount, &topicItem.CreatedByName, &topicItem.Avatar)
@@ -123,7 +123,7 @@ func route_topics(w http.ResponseWriter, r *http.Request){
InternalError(err,w,r)
return
}
-
+
if topicItem.Avatar != "" {
if topicItem.Avatar[0] == '.' {
topicItem.Avatar = "/uploads/avatar_" + strconv.Itoa(topicItem.CreatedBy) + topicItem.Avatar
@@ -131,13 +131,13 @@ func route_topics(w http.ResponseWriter, r *http.Request){
} else {
topicItem.Avatar = strings.Replace(noavatar,"{id}",strconv.Itoa(topicItem.CreatedBy),1)
}
-
+
if topicItem.ParentID >= 0 {
topicItem.ForumName = forums[topicItem.ParentID].Name
} else {
topicItem.ForumName = ""
}
-
+
/*topicItem.CreatedAt, err = relative_time(topicItem.CreatedAt)
if err != nil {
InternalError(err,w,r)
@@ -146,7 +146,7 @@ func route_topics(w http.ResponseWriter, r *http.Request){
if err != nil {
InternalError(err,w,r)
}
-
+
if hooks["trow_assign"] != nil {
topicItem = run_hook("trow_assign", topicItem).(TopicsRow)
}
@@ -158,7 +158,7 @@ func route_topics(w http.ResponseWriter, r *http.Request){
return
}
rows.Close()
-
+
pi := TopicsPage{"Topic List",user,noticeList,topicList,nil}
if template_topics_handle != nil {
template_topics_handle(pi,w)
@@ -177,7 +177,7 @@ func route_forum(w http.ResponseWriter, r *http.Request, sfid string){
PreError("The provided ForumID is not a valid number.",w,r)
return
}
-
+
user, noticeList, ok := ForumSessionCheck(w,r,fid)
if !ok {
return
@@ -187,7 +187,7 @@ func route_forum(w http.ResponseWriter, r *http.Request, sfid string){
NoPermissions(w,r,user)
return
}
-
+
// Calculate the offset
var offset int
last_page := int(forums[fid].TopicCount / items_per_page) + 1
@@ -204,7 +204,7 @@ func route_forum(w http.ResponseWriter, r *http.Request, sfid string){
InternalError(err,w,r)
return
}
-
+
var topicList []TopicUser
topicItem := TopicUser{ID: 0}
for rows.Next() {
@@ -213,7 +213,7 @@ func route_forum(w http.ResponseWriter, r *http.Request, sfid string){
InternalError(err,w,r)
return
}
-
+
if topicItem.Avatar != "" {
if topicItem.Avatar[0] == '.' {
topicItem.Avatar = "/uploads/avatar_" + strconv.Itoa(topicItem.CreatedBy) + topicItem.Avatar
@@ -221,12 +221,12 @@ func route_forum(w http.ResponseWriter, r *http.Request, sfid string){
} else {
topicItem.Avatar = strings.Replace(noavatar,"{id}",strconv.Itoa(topicItem.CreatedBy),1)
}
-
+
topicItem.LastReplyAt, err = relative_time(topicItem.LastReplyAt)
if err != nil {
InternalError(err,w,r)
}
-
+
if hooks["trow_assign"] != nil {
topicItem = run_hook("trow_assign", topicItem).(TopicUser)
}
@@ -238,7 +238,7 @@ func route_forum(w http.ResponseWriter, r *http.Request, sfid string){
return
}
rows.Close()
-
+
pi := ForumPage{forums[fid].Name,user,noticeList,topicList,forums[fid],page,last_page,nil}
if template_forum_handle != nil {
template_forum_handle(pi,w)
@@ -255,7 +255,7 @@ func route_forums(w http.ResponseWriter, r *http.Request){
if !ok {
return
}
-
+
var forumList []Forum
var err error
group := groups[user.Group]
@@ -276,7 +276,7 @@ func route_forums(w http.ResponseWriter, r *http.Request){
forumList = append(forumList, forum)
}
}
-
+
pi := ForumsPage{"Forum List",user,noticeList,forumList,nil}
if template_forums_handle != nil {
template_forums_handle(pi,w)
@@ -287,19 +287,19 @@ func route_forums(w http.ResponseWriter, r *http.Request){
}
}
}
-
+
func route_topic_id(w http.ResponseWriter, r *http.Request){
var err error
var page, offset int
var replyList []Reply
-
+
page, _ = strconv.Atoi(r.FormValue("page"))
tid, err := strconv.Atoi(r.URL.Path[len("/topic/"):])
if err != nil {
PreError("The provided TopicID is not a valid number.",w,r)
return
}
-
+
// Get the topic...
topic, err := get_topicuser(tid)
if err == sql.ErrNoRows {
@@ -310,7 +310,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
return
}
topic.Css = no_css_tmpl
-
+
user, noticeList, ok := ForumSessionCheck(w,r,topic.ParentID)
if !ok {
return
@@ -320,20 +320,20 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
NoPermissions(w,r,user)
return
}
-
+
topic.Content = parse_message(topic.Content)
topic.ContentLines = strings.Count(topic.Content,"\n")
-
+
// We don't want users posting in locked topics...
if topic.Is_Closed && !user.Is_Mod {
user.Perms.CreateReply = false
}
-
+
topic.Tag = groups[topic.Group].Tag
if groups[topic.Group].Is_Mod || groups[topic.Group].Is_Admin {
topic.Css = staff_css_tmpl
}
-
+
/*if settings["url_tags"] == false {
topic.URLName = ""
} else {
@@ -344,7 +344,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
topic.URL = topic.URL + topic.URLName
}
}*/
-
+
// Calculate the offset
last_page := int(topic.PostCount / items_per_page) + 1
if page > 1 {
@@ -355,7 +355,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
} else {
page = 1
}
-
+
// Get the replies..
rows, err := get_topic_replies_offset_stmt.Query(topic.ID, offset)
if err == sql.ErrNoRows {
@@ -365,7 +365,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
InternalError(err,w,r)
return
}
-
+
replyItem := Reply{Css: no_css_tmpl}
for rows.Next() {
err := rows.Scan(&replyItem.ID, &replyItem.Content, &replyItem.CreatedBy, &replyItem.CreatedAt, &replyItem.LastEdit, &replyItem.LastEditBy, &replyItem.Avatar, &replyItem.CreatedByName, &replyItem.Group, &replyItem.URLPrefix, &replyItem.URLName, &replyItem.Level, &replyItem.IpAddress, &replyItem.LikeCount, &replyItem.ActionType)
@@ -373,17 +373,17 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
InternalError(err,w,r)
return
}
-
+
replyItem.ParentID = topic.ID
replyItem.ContentHtml = parse_message(replyItem.Content)
replyItem.ContentLines = strings.Count(replyItem.Content,"\n")
-
+
if groups[replyItem.Group].Is_Mod || groups[replyItem.Group].Is_Admin {
replyItem.Css = staff_css_tmpl
} else {
replyItem.Css = no_css_tmpl
}
-
+
if replyItem.Avatar != "" {
if replyItem.Avatar[0] == '.' {
replyItem.Avatar = "/uploads/avatar_" + strconv.Itoa(replyItem.CreatedBy) + replyItem.Avatar
@@ -391,9 +391,9 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
} else {
replyItem.Avatar = strings.Replace(noavatar,"{id}",strconv.Itoa(replyItem.CreatedBy),1)
}
-
+
replyItem.Tag = groups[replyItem.Group].Tag
-
+
/*if settings["url_tags"] == false {
replyItem.URLName = ""
} else {
@@ -404,7 +404,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
replyItem.URL = replyItem.URL + replyItem.URLName
}
}*/
-
+
// We really shouldn't have inline HTML, we should do something about this...
if replyItem.ActionType != "" {
switch(replyItem.ActionType) {
@@ -426,7 +426,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
}
}
replyItem.Liked = false
-
+
if hooks["rrow_assign"] != nil {
replyItem = run_hook("rrow_assign", replyItem).(Reply)
}
@@ -438,7 +438,7 @@ func route_topic_id(w http.ResponseWriter, r *http.Request){
return
}
rows.Close()
-
+
tpage := TopicPage{topic.Title,user,noticeList,replyList,topic,page,last_page,nil}
if template_topic_handle != nil {
template_topic_handle(tpage,w)
@@ -455,19 +455,19 @@ func route_profile(w http.ResponseWriter, r *http.Request){
if !ok {
return
}
-
+
var err error
var replyContent, replyCreatedByName, replyCreatedAt, replyAvatar, replyTag string
var rid, replyCreatedBy, replyLastEdit, replyLastEditBy, replyLines, replyGroup int
var replyCss template.CSS
var replyList []Reply
-
+
pid, err := strconv.Atoi(r.URL.Path[len("/user/"):])
if err != nil {
LocalError("The provided User ID is not a valid number.",w,r,user)
return
}
-
+
var puser *User
if pid == user.ID {
user.Is_Mod = true
@@ -483,7 +483,7 @@ func route_profile(w http.ResponseWriter, r *http.Request){
return
}
}
-
+
// Get the replies..
rows, err := db.Query("select users_replies.rid, users_replies.content, users_replies.createdBy, users_replies.createdAt, users_replies.lastEdit, users_replies.lastEditBy, users.avatar, users.name, users.group from users_replies left join users ON users_replies.createdBy = users.uid where users_replies.uid = ?", puser.ID)
if err != nil {
@@ -491,14 +491,14 @@ func route_profile(w http.ResponseWriter, r *http.Request){
return
}
defer rows.Close()
-
+
for rows.Next() {
err := rows.Scan(&rid, &replyContent, &replyCreatedBy, &replyCreatedAt, &replyLastEdit, &replyLastEditBy, &replyAvatar, &replyCreatedByName, &replyGroup)
if err != nil {
InternalError(err,w,r)
return
}
-
+
replyLines = strings.Count(replyContent,"\n")
if groups[replyGroup].Is_Mod || groups[replyGroup].Is_Admin {
replyCss = staff_css_tmpl
@@ -512,7 +512,7 @@ func route_profile(w http.ResponseWriter, r *http.Request){
} else {
replyAvatar = strings.Replace(noavatar,"{id}",strconv.Itoa(replyCreatedBy),1)
}
-
+
if groups[replyGroup].Tag != "" {
replyTag = groups[replyGroup].Tag
} else if puser.ID == replyCreatedBy {
@@ -520,10 +520,10 @@ func route_profile(w http.ResponseWriter, r *http.Request){
} else {
replyTag = ""
}
-
+
replyLiked := false
replyLikeCount := 0
-
+
replyList = append(replyList, Reply{rid,puser.ID,replyContent,parse_message(replyContent),replyCreatedBy,replyCreatedByName,replyGroup,replyCreatedAt,replyLastEdit,replyLastEditBy,replyAvatar,replyCss,replyLines,replyTag,"","","",0,"",replyLiked,replyLikeCount,"",""})
}
err = rows.Err()
@@ -531,7 +531,7 @@ func route_profile(w http.ResponseWriter, r *http.Request){
InternalError(err,w,r)
return
}
-
+
ppage := ProfilePage{puser.Name + "'s Profile",user,noticeList,replyList,*puser,false}
if template_profile_handle != nil {
template_profile_handle(ppage,w)
@@ -553,7 +553,7 @@ func route_topic_create(w http.ResponseWriter, r *http.Request, sfid string){
return
}
}
-
+
user, noticeList, ok := ForumSessionCheck(w,r,fid)
if !ok {
return
@@ -562,7 +562,7 @@ func route_topic_create(w http.ResponseWriter, r *http.Request, sfid string){
NoPermissions(w,r,user)
return
}
-
+
var forumList []Forum
group := groups[user.Group]
for _, fid := range group.CanSee {
@@ -570,7 +570,7 @@ func route_topic_create(w http.ResponseWriter, r *http.Request, sfid string){
forumList = append(forumList, forums[fid])
}
}
-
+
ctpage := CreateTopicPage{"Create Topic",user,noticeList,forumList,fid,nil}
if template_create_topic_handle != nil {
template_create_topic_handle(ctpage,w)
@@ -581,21 +581,21 @@ func route_topic_create(w http.ResponseWriter, r *http.Request, sfid string){
}
}
}
-
+
// POST functions. Authorised users only.
func route_create_topic(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
PreError("Bad Form",w,r)
- return
+ return
}
-
+
fid, err := strconv.Atoi(r.PostFormValue("topic-board"))
if err != nil {
PreError("The provided ForumID is not a valid number.",w,r)
return
}
-
+
user, ok := SimpleForumSessionCheck(w,r,fid)
if !ok {
return
@@ -604,7 +604,7 @@ func route_create_topic(w http.ResponseWriter, r *http.Request) {
NoPermissions(w,r,user)
return
}
-
+
topic_name := html.EscapeString(r.PostFormValue("topic-name"))
content := html.EscapeString(preparse_message(r.PostFormValue("topic-content")))
ipaddress, _, err := net.SplitHostPort(r.RemoteAddr)
@@ -612,7 +612,7 @@ func route_create_topic(w http.ResponseWriter, r *http.Request) {
LocalError("Bad IP",w,r,user)
return
}
-
+
wcount := word_count(content)
res, err := create_topic_stmt.Exec(fid,topic_name,content,parse_message(content),ipaddress,wcount,user.ID)
if err != nil {
@@ -624,14 +624,14 @@ func route_create_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
_, err = add_topics_to_forum_stmt.Exec(1,fid)
if err != nil {
InternalError(err,w,r)
return
}
forums[fid].TopicCount -= 1
-
+
_, err = update_forum_cache_stmt.Exec(topic_name,lastId,user.Name,user.ID,fid)
if err != nil {
InternalError(err,w,r)
@@ -642,13 +642,13 @@ func route_create_topic(w http.ResponseWriter, r *http.Request) {
forums[fid].LastReplyer = user.Name
forums[fid].LastReplyerID = user.ID
forums[fid].LastTopicTime = ""
-
+
_, err = add_subscription_stmt.Exec(user.ID,lastId,"topic")
if err != nil {
InternalError(err,w,r)
return
}
-
+
http.Redirect(w,r,"/topic/" + strconv.FormatInt(lastId,10), http.StatusSeeOther)
err = increase_post_user_stats(wcount,user.ID,true,user)
if err != nil {
@@ -661,14 +661,14 @@ func route_create_reply(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
PreError("Bad Form",w,r)
- return
+ return
}
tid, err := strconv.Atoi(r.PostFormValue("tid"))
if err != nil {
PreError("Failed to convert the Topic ID",w,r)
return
}
-
+
var topic_name string
var fid int
var createdBy int
@@ -680,7 +680,7 @@ func route_create_reply(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
user, ok := SimpleForumSessionCheck(w,r,fid)
if !ok {
return
@@ -689,21 +689,21 @@ func route_create_reply(w http.ResponseWriter, r *http.Request) {
NoPermissions(w,r,user)
return
}
-
+
content := preparse_message(html.EscapeString(r.PostFormValue("reply-content")))
ipaddress, _, err := net.SplitHostPort(r.RemoteAddr)
if err != nil {
LocalError("Bad IP",w,r,user)
return
}
-
+
wcount := word_count(content)
_, err = create_reply_stmt.Exec(tid,content,parse_message(content),ipaddress,wcount, user.ID)
if err != nil {
InternalError(err,w,r)
return
}
-
+
_, err = add_replies_to_topic_stmt.Exec(1, tid)
if err != nil {
InternalError(err,w,r)
@@ -714,7 +714,7 @@ func route_create_reply(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
res, err := add_activity_stmt.Exec(user.ID,createdBy,"reply","topic",tid)
if err != nil {
InternalError(err,w,r)
@@ -725,13 +725,13 @@ func route_create_reply(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
_, err = notify_watchers_stmt.Exec(lastId)
if err != nil {
InternalError(err,w,r)
return
}
-
+
// Reload the topic...
err = topics.Load(tid)
if err != nil && err != sql.ErrNoRows {
@@ -741,7 +741,7 @@ func route_create_reply(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
http.Redirect(w,r,"/topic/" + strconv.Itoa(tid), http.StatusSeeOther)
err = increase_post_user_stats(wcount, user.ID, false, user)
if err != nil {
@@ -754,15 +754,15 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
PreError("Bad Form",w,r)
- return
+ return
}
-
+
tid, err := strconv.Atoi(r.URL.Path[len("/topic/like/submit/"):])
if err != nil {
PreError("Topic IDs can only ever be numbers.",w,r)
return
}
-
+
var words int
var fid int
var createdBy int
@@ -774,7 +774,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
user, ok := SimpleForumSessionCheck(w,r,fid)
if !ok {
return
@@ -783,7 +783,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
NoPermissions(w,r,user)
return
}
-
+
err = db.QueryRow("select targetItem from likes where sentBy = ? and targetItem = ? and targetType = 'topics'", user.ID, tid).Scan(&tid)
if err != nil && err != sql.ErrNoRows {
InternalError(err,w,r)
@@ -792,7 +792,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
LocalError("You already liked this!",w,r,user)
return
}
-
+
_, err = users.CascadeGet(createdBy)
if err != nil && err == sql.ErrNoRows {
LocalError("The target user doesn't exist",w,r,user)
@@ -801,7 +801,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
//score := words_to_score(words,true)
score := 1
_, err = create_like_stmt.Exec(score,tid,"topics",user.ID)
@@ -809,13 +809,13 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
_, err = add_likes_to_topic_stmt.Exec(1,tid)
if err != nil {
InternalError(err,w,r)
return
}
-
+
res, err := add_activity_stmt.Exec(user.ID,createdBy,"like","topic",tid)
if err != nil {
InternalError(err,w,r)
@@ -826,7 +826,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
/*_, err = notify_watchers_stmt.Exec(lastId)
if err != nil {
InternalError(err,w,r)
@@ -837,7 +837,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
// Reload the topic...
err = topics.Load(tid)
if err != nil && err != sql.ErrNoRows {
@@ -847,7 +847,7 @@ func route_like_topic(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
http.Redirect(w,r,"/topic/" + strconv.Itoa(tid),http.StatusSeeOther)
}
@@ -855,15 +855,15 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
PreError("Bad Form",w,r)
- return
+ return
}
-
+
rid, err := strconv.Atoi(r.URL.Path[len("/reply/like/submit/"):])
if err != nil {
PreError("The provided Reply ID is not a valid number.",w,r)
return
}
-
+
var tid int
var words int
var createdBy int
@@ -875,7 +875,7 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
var fid int
err = db.QueryRow("select parentID from topics where tid = ?", tid).Scan(&fid)
if err == sql.ErrNoRows {
@@ -885,7 +885,7 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
user, ok := SimpleForumSessionCheck(w,r,fid)
if !ok {
return
@@ -894,7 +894,7 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
NoPermissions(w,r,user)
return
}
-
+
err = db.QueryRow("select targetItem from likes where sentBy = ? and targetItem = ? and targetType = 'replies'", user.ID, rid).Scan(&rid)
if err != nil && err != sql.ErrNoRows {
InternalError(err,w,r)
@@ -903,7 +903,7 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
LocalError("You already liked this!",w,r,user)
return
}
-
+
_, err = users.CascadeGet(createdBy)
if err != nil && err != sql.ErrNoRows {
LocalError("The target user doesn't exist",w,r,user)
@@ -912,7 +912,7 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
//score := words_to_score(words,false)
score := 1
_, err = create_like_stmt.Exec(score,rid,"replies",user.ID)
@@ -920,13 +920,13 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
_, err = add_likes_to_reply_stmt.Exec(1,rid)
if err != nil {
InternalError(err,w,r)
return
}
-
+
res, err := add_activity_stmt.Exec(user.ID,createdBy,"like","post",rid)
if err != nil {
InternalError(err,w,r)
@@ -937,13 +937,13 @@ func route_reply_like_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
_, err = notify_one_stmt.Exec(createdBy,lastId)
if err != nil {
InternalError(err,w,r)
return
}
-
+
http.Redirect(w,r,"/topic/" + strconv.Itoa(tid),http.StatusSeeOther)
}
@@ -956,24 +956,24 @@ func route_profile_reply_create(w http.ResponseWriter, r *http.Request) {
NoPermissions(w,r,user)
return
}
-
+
err := r.ParseForm()
if err != nil {
LocalError("Bad Form",w,r,user)
- return
+ return
}
uid, err := strconv.Atoi(r.PostFormValue("uid"))
if err != nil {
LocalError("Invalid UID",w,r,user)
return
}
-
+
_, err = create_profile_reply_stmt.Exec(uid,html.EscapeString(preparse_message(r.PostFormValue("reply-content"))),parse_message(html.EscapeString(preparse_message(r.PostFormValue("reply-content")))),user.ID)
if err != nil {
InternalError(err,w,r)
return
}
-
+
var user_name string
err = db.QueryRow("select name from users where uid = ?", uid).Scan(&user_name)
if err == sql.ErrNoRows {
@@ -983,7 +983,7 @@ func route_profile_reply_create(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
http.Redirect(w, r, "/user/" + strconv.Itoa(uid), http.StatusSeeOther)
}
@@ -1000,7 +1000,7 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
Banned(w,r,user)
return
}
-
+
err := r.ParseForm()
if err != nil {
LocalError("Bad Form",w,r,user)
@@ -1010,15 +1010,15 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
SecurityError(w,r,user)
return
}
-
+
item_id, err := strconv.Atoi(sitem_id)
if err != nil {
LocalError("Bad ID",w,r,user)
return
}
-
+
item_type := r.FormValue("type")
-
+
var fid int = 1
var tid int
var title, content, data string
@@ -1031,7 +1031,7 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
InternalError(err,w,r)
return
}
-
+
err = db.QueryRow("select title, data from topics where tid = ?",tid).Scan(&title,&data)
if err == sql.ErrNoRows {
LocalError("We were unable to find the topic which the reported post is supposed to be in",w,r,user)
@@ -1050,7 +1050,7 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
InternalError(err,w,r)
return
}
-
+
err = db.QueryRow("select name from users where uid = ?", tid).Scan(&title)
if err == sql.ErrNoRows {
LocalError("We were unable to find the profile which the reported post is supposed to be on",w,r,user)
@@ -1077,16 +1077,16 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
}
// Don't try to guess the type
LocalError("Unknown type",w,r,user)
- return
+ return
}
-
+
var count int
rows, err := db.Query("select count(*) as count from topics where data = ? and data != '' and parentID = 1", item_type + "_" + strconv.Itoa(item_id))
if err != nil && err != sql.ErrNoRows {
InternalError(err,w,r)
return
}
-
+
for rows.Next() {
err = rows.Scan(&count)
if err != nil {
@@ -1098,20 +1098,20 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
LocalError("Someone has already reported this!",w,r,user)
return
}
-
+
title = "Report: " + title
res, err := create_report_stmt.Exec(title,content,parse_message(content),user.ID,item_type + "_" + strconv.Itoa(item_id))
if err != nil {
InternalError(err,w,r)
return
}
-
+
lastId, err := res.LastInsertId()
if err != nil {
InternalError(err,w,r)
return
}
-
+
_, err = add_topics_to_forum_stmt.Exec(1, fid)
if err != nil {
InternalError(err,w,r)
@@ -1122,7 +1122,7 @@ func route_report_submit(w http.ResponseWriter, r *http.Request, sitem_id string
InternalError(err,w,r)
return
}
-
+
http.Redirect(w,r,"/topic/" + strconv.FormatInt(lastId, 10), http.StatusSeeOther)
}
@@ -1148,19 +1148,19 @@ func route_account_own_edit_critical_submit(w http.ResponseWriter, r *http.Reque
LocalError("You need to login to edit your account.",w,r,user)
return
}
-
+
err := r.ParseForm()
if err != nil {
LocalError("Bad Form",w,r,user)
- return
+ return
}
-
+
var real_password string
var salt string
current_password := r.PostFormValue("account-current-password")
new_password := r.PostFormValue("account-new-password")
confirm_password := r.PostFormValue("account-confirm-password")
-
+
err = get_password_stmt.QueryRow(user.ID).Scan(&real_password, &salt)
if err == sql.ErrNoRows {
LocalError("Your account no longer exists.",w,r,user)
@@ -1169,7 +1169,7 @@ func route_account_own_edit_critical_submit(w http.ResponseWriter, r *http.Reque
InternalError(err,w,r)
return
}
-
+
current_password = current_password + salt
err = bcrypt.CompareHashAndPassword([]byte(real_password), []byte(current_password))
if err == bcrypt.ErrMismatchedHashAndPassword {
@@ -1184,14 +1184,14 @@ func route_account_own_edit_critical_submit(w http.ResponseWriter, r *http.Reque
return
}
SetPassword(user.ID, new_password)
-
+
// Log the user out as a safety precaution
_, err = logout_stmt.Exec(user.ID)
if err != nil {
InternalError(err,w,r)
return
}
-
+
noticeList = append(noticeList,"Your password was successfully updated")
pi := Page{"Edit Password",user,noticeList,tList,nil}
templates.ExecuteTemplate(w,"account-own-edit.html", pi)
@@ -1216,7 +1216,7 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
return
}
r.Body = http.MaxBytesReader(w, r.Body, int64(max_request_size))
-
+
user, noticeList, ok := SessionCheck(w,r)
if !ok {
return
@@ -1225,13 +1225,13 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
LocalError("You need to login to edit your account.",w,r,user)
return
}
-
+
err := r.ParseMultipartForm(int64(max_request_size))
if err != nil {
LocalError("Upload failed",w,r,user)
return
}
-
+
var filename string
var ext string
for _, fheaders := range r.MultipartForm.File {
@@ -1242,7 +1242,7 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
return
}
defer infile.Close()
-
+
// We don't want multiple files
if filename != "" {
if filename != hdr.Filename {
@@ -1253,7 +1253,7 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
} else {
filename = hdr.Filename
}
-
+
if ext == "" {
extarr := strings.Split(hdr.Filename,".")
if len(extarr) < 2 {
@@ -1261,7 +1261,7 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
return
}
ext = extarr[len(extarr) - 1]
-
+
reg, err := regexp.Compile("[^A-Za-z0-9]+")
if err != nil {
LocalError("Bad file extension", w, r, user)
@@ -1270,14 +1270,14 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
ext = reg.ReplaceAllString(ext,"")
ext = strings.ToLower(ext)
}
-
+
outfile, err := os.Create("./uploads/avatar_" + strconv.Itoa(user.ID) + "." + ext);
if err != nil {
LocalError("Upload failed [File Creation Failed]",w,r,user)
return
}
defer outfile.Close()
-
+
_, err = io.Copy(outfile, infile);
if err != nil {
LocalError("Upload failed [Copy Failed]",w,r,user)
@@ -1285,7 +1285,7 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
}
}
}
-
+
_, err = set_avatar_stmt.Exec("." + ext, strconv.Itoa(user.ID))
if err != nil {
InternalError(err,w,r)
@@ -1298,7 +1298,7 @@ func route_account_own_edit_avatar_submit(w http.ResponseWriter, r *http.Request
return
}
noticeList = append(noticeList, "Your avatar was successfully updated")
-
+
pi := Page{"Edit Avatar",user,noticeList,tList,nil}
templates.ExecuteTemplate(w,"account-own-edit-avatar.html", pi)
}
@@ -1328,23 +1328,23 @@ func route_account_own_edit_username_submit(w http.ResponseWriter, r *http.Reque
err := r.ParseForm()
if err != nil {
LocalError("Bad Form",w,r,user)
- return
+ return
}
-
+
new_username := html.EscapeString(r.PostFormValue("account-new-username"))
_, err = set_username_stmt.Exec(new_username, strconv.Itoa(user.ID))
if err != nil {
LocalError("Unable to change the username. Does someone else already have this name?",w,r,user)
return
}
-
+
user.Name = new_username
err = users.Load(user.ID)
if err != nil {
LocalError("Your account doesn't exist!",w,r,user)
return
}
-
+
noticeList = append(noticeList,"Your username was successfully updated")
pi := Page{"Edit Username",user,noticeList,tList,nil}
templates.ExecuteTemplate(w,"account-own-edit-username.html", pi)
@@ -1359,7 +1359,7 @@ func route_account_own_edit_email(w http.ResponseWriter, r *http.Request) {
LocalError("You need to login to edit your account.",w,r,user)
return
}
-
+
email := Email{UserID: user.ID}
var emailList []interface{}
rows, err := db.Query("select email, validated from emails where uid = ?", user.ID)
@@ -1367,13 +1367,13 @@ func route_account_own_edit_email(w http.ResponseWriter, r *http.Request) {
log.Fatal(err)
}
defer rows.Close()
-
+
for rows.Next() {
err := rows.Scan(&email.Email, &email.Validated)
if err != nil {
log.Fatal(err)
}
-
+
if email.Email == user.Email {
email.Primary = true
}
@@ -1383,7 +1383,7 @@ func route_account_own_edit_email(w http.ResponseWriter, r *http.Request) {
if err != nil {
log.Fatal(err)
}
-
+
// Was this site migrated from another forum software? Most of them don't have multiple emails for a single user. This also applies when the admin switches enable_emails on after having it off for a while
if len(emailList) == 0 {
email.Email = user.Email
@@ -1391,7 +1391,7 @@ func route_account_own_edit_email(w http.ResponseWriter, r *http.Request) {
email.Primary = true
emailList = append(emailList, email)
}
-
+
if !enable_emails {
noticeList = append(noticeList, "The email system has been turned off. All features involving sending emails have been disabled.")
}
@@ -1409,7 +1409,7 @@ func route_account_own_edit_email_token_submit(w http.ResponseWriter, r *http.Re
return
}
token := r.URL.Path[len("/user/edit/token/"):]
-
+
email := Email{UserID: user.ID}
targetEmail := Email{UserID: user.ID}
var emailList []interface{}
@@ -1419,14 +1419,14 @@ func route_account_own_edit_email_token_submit(w http.ResponseWriter, r *http.Re
return
}
defer rows.Close()
-
+
for rows.Next() {
err := rows.Scan(&email.Email, &email.Validated, &email.Token)
if err != nil {
InternalError(err,w,r)
return
}
-
+
if email.Email == user.Email {
email.Primary = true
}
@@ -1440,7 +1440,7 @@ func route_account_own_edit_email_token_submit(w http.ResponseWriter, r *http.Re
InternalError(err,w,r)
return
}
-
+
if len(emailList) == 0 {
LocalError("A verification email was never sent for you!",w,r,user)
return
@@ -1449,13 +1449,13 @@ func route_account_own_edit_email_token_submit(w http.ResponseWriter, r *http.Re
LocalError("That's not a valid token!",w,r,user)
return
}
-
+
_, err = verify_email_stmt.Exec(user.Email)
if err != nil {
InternalError(err,w,r)
return
}
-
+
// If Email Activation is on, then activate the account while we're here
if settings["activation_type"] == 2 {
_, err = activate_user_stmt.Exec(user.ID)
@@ -1464,7 +1464,7 @@ func route_account_own_edit_email_token_submit(w http.ResponseWriter, r *http.Re
return
}
}
-
+
if !enable_emails {
noticeList = append(noticeList,"The email system has been turned off. All features involving sending emails have been disabled.")
}
@@ -1482,13 +1482,13 @@ func route_logout(w http.ResponseWriter, r *http.Request) {
LocalError("You can't logout without logging in first.",w,r,user)
return
}
-
+
_, err := logout_stmt.Exec(user.ID)
if err != nil {
InternalError(err,w,r)
return
}
-
+
err = users.Load(user.ID)
if err != nil {
LocalError("Your account doesn't exist!",w,r,user)
@@ -1496,7 +1496,7 @@ func route_logout(w http.ResponseWriter, r *http.Request) {
}
http.Redirect(w,r, "/", http.StatusSeeOther)
}
-
+
func route_login(w http.ResponseWriter, r *http.Request) {
user, noticeList, ok := SessionCheck(w,r)
if !ok {
@@ -1522,16 +1522,16 @@ func route_login_submit(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
LocalError("Bad Form",w,r,user)
- return
+ return
}
-
+
var uid int
var real_password string
var salt string
var session string
username := html.EscapeString(r.PostFormValue("username"))
password := r.PostFormValue("password")
-
+
err = login_stmt.QueryRow(username).Scan(&uid, &username, &real_password, &salt)
if err == sql.ErrNoRows {
LocalError("That username doesn't exist.",w,r,user)
@@ -1540,14 +1540,14 @@ func route_login_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
// Emergency password reset mechanism..
if salt == "" {
if password != real_password {
LocalError("That's not the correct password.",w,r,user)
return
}
-
+
// Re-encrypt the password
SetPassword(uid, password)
} else { // Normal login..
@@ -1556,7 +1556,7 @@ func route_login_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
err := bcrypt.CompareHashAndPassword([]byte(real_password), []byte(password))
if err == bcrypt.ErrMismatchedHashAndPassword {
LocalError("That's not the correct password.",w,r,user)
@@ -1566,19 +1566,19 @@ func route_login_submit(w http.ResponseWriter, r *http.Request) {
return
}
}
-
+
session, err = GenerateSafeString(sessionLength)
if err != nil {
InternalError(err,w,r)
return
}
-
+
_, err = update_session_stmt.Exec(session, uid)
if err != nil {
InternalError(err,w,r)
return
}
-
+
cookie := http.Cookie{Name: "uid",Value: strconv.Itoa(uid),Path: "/",MaxAge: year}
http.SetCookie(w,&cookie)
cookie = http.Cookie{Name: "session",Value: session,Path: "/",MaxAge: year}
@@ -1606,39 +1606,39 @@ func route_register_submit(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
LocalError("Bad Form",w,r,user)
- return
+ return
}
-
+
username := html.EscapeString(r.PostFormValue("username"))
if username == "" {
LocalError("You didn't put in a username.",w,r,user)
- return
+ return
}
email := html.EscapeString(r.PostFormValue("email"))
if email == "" {
LocalError("You didn't put in an email.",w,r,user)
- return
+ return
}
-
+
password := r.PostFormValue("password")
if password == "" {
LocalError("You didn't put in a password.",w,r,user)
- return
+ return
}
if password == "test" || password == "123456" || password == "123" || password == "password" {
LocalError("Your password is too weak.",w,r,user)
- return
+ return
}
-
+
confirm_password := r.PostFormValue("confirm_password")
log.Print("Registration Attempt! Username: " + username)
-
+
// Do the two inputted passwords match..?
if password != confirm_password {
LocalError("The two passwords don't match.",w,r,user)
return
}
-
+
// Is this username already taken..?
err = username_exists_stmt.QueryRow(username).Scan(&username)
if err != nil && err != sql.ErrNoRows {
@@ -1648,7 +1648,7 @@ func route_register_submit(w http.ResponseWriter, r *http.Request) {
LocalError("This username isn't available. Try another.",w,r,user)
return
}
-
+
salt, err := GenerateSafeString(saltLength)
if err != nil {
InternalError(err,w,r)
@@ -1659,14 +1659,14 @@ func route_register_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
password = password + salt
hashed_password, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
InternalError(err,w,r)
return
}
-
+
var active int
var group int
switch settings["activation_type"] {
@@ -1676,7 +1676,7 @@ func route_register_submit(w http.ResponseWriter, r *http.Request) {
default: // Anything else. E.g. Admin Activation or Email Activation.
group = activation_group
}
-
+
res, err := register_stmt.Exec(username,email,string(hashed_password),salt,group,session,active)
if err != nil {
InternalError(err,w,r)
@@ -1687,7 +1687,7 @@ func route_register_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
// Check if this user actually owns this email, if email activation is on, automatically flip their account to active when the email is validated. Validation is also useful for determining whether this user should receive any alerts, etc. via email
if enable_emails {
token, err := GenerateSafeString(80)
@@ -1700,13 +1700,13 @@ func route_register_submit(w http.ResponseWriter, r *http.Request) {
InternalError(err,w,r)
return
}
-
+
if !SendValidationEmail(username, email, token) {
LocalError("We were unable to send the email for you to confirm that this email address belongs to you. You may not have access to some functionality until you do so. Please ask an administrator for assistance.",w,r,user)
return
}
}
-
+
cookie := http.Cookie{Name: "uid",Value: strconv.FormatInt(lastId, 10),Path: "/",MaxAge: year}
http.SetCookie(w,&cookie)
cookie = http.Cookie{Name: "session",Value: session,Path: "/",MaxAge: year}
@@ -1728,18 +1728,18 @@ func route_api(w http.ResponseWriter, r *http.Request) {
PreErrorJSQ("Bad Form",w,r,is_js)
return
}
-
+
user, ok := SimpleSessionCheck(w,r)
if !ok {
return
}
-
+
action := r.FormValue("action")
if action != "get" && action != "set" {
PreErrorJSQ("Invalid Action",w,r,is_js)
return
}
-
+
module := r.FormValue("module")
switch(module) {
case "alerts": // A feed of events tailored for a specific user
@@ -1747,13 +1747,13 @@ func route_api(w http.ResponseWriter, r *http.Request) {
PreError("You can only fetch alerts in the JSON format!",w,r)
return
}
-
+
w.Header().Set("Content-Type","application/json")
if !user.Loggedin {
w.Write(phrase_login_alerts)
return
}
-
+
var msglist string
var asid int
var actor_id int
@@ -1763,26 +1763,26 @@ func route_api(w http.ResponseWriter, r *http.Request) {
var elementID int
//---
var targetUser *User
-
+
rows, err := get_activity_feed_by_watcher_stmt.Query(user.ID)
if err != nil {
InternalErrorJS(err,w,r)
return
}
-
+
for rows.Next() {
err = rows.Scan(&asid,&actor_id,&targetUser_id,&event,&elementType,&elementID)
if err != nil {
InternalErrorJS(err,w,r)
return
}
-
+
actor, err := users.CascadeGet(actor_id)
if err != nil {
LocalErrorJS("Unable to find the actor",w,r)
return
}
-
+
/*if elementType != "forum" {
targetUser, err = users.CascadeGet(targetUser_id)
if err != nil {
@@ -1790,12 +1790,12 @@ func route_api(w http.ResponseWriter, r *http.Request) {
return
}
}*/
-
+
if event == "friend_invite" {
msglist += `{"msg":"You received a friend invite from {0}","sub":["` + actor.Name + `"],"path":"\/user\/`+strconv.Itoa(actor.ID)+`","avatar":"`+strings.Replace(actor.Avatar,"/","\\/",-1)+`"},`
continue
}
-
+
/*
"You received a friend invite from {user}"
"{x}{mentioned you on}{user}{'s profile}"
@@ -1809,7 +1809,7 @@ func route_api(w http.ResponseWriter, r *http.Request) {
"{x}{replied to}{your topic}{topic}"
"{x}{created a new topic}{topic}"
*/
-
+
var act string
var post_act string
var url string
@@ -1840,7 +1840,7 @@ func route_api(w http.ResponseWriter, r *http.Request) {
}
url = build_topic_url(elementID)
area = topic.Title
-
+
if targetUser_id == user.ID {
post_act = " your topic"
}
@@ -1867,7 +1867,7 @@ func route_api(w http.ResponseWriter, r *http.Request) {
default:
LocalErrorJS("Invalid elementType",w,r)
}
-
+
switch(event) {
case "like":
if elementType == "user" {
@@ -1888,17 +1888,17 @@ func route_api(w http.ResponseWriter, r *http.Request) {
}
case "reply": act = "replied to"
}
-
+
msglist += `{"msg":"{0} ` + start_frag + act + post_act + ` {1}` + end_frag + `","sub":["` + actor.Name + `","` + area + `"],"path":"` + url + `","avatar":"` + actor.Avatar + `"},`
}
-
+
err = rows.Err()
if err != nil {
InternalErrorJS(err,w,r)
return
}
rows.Close()
-
+
if len(msglist) != 0 {
msglist = msglist[0:len(msglist)-1]
}
diff --git a/template_list.go b/template_list.go
index 5311b224..38e7be0e 100644
--- a/template_list.go
+++ b/template_list.go
@@ -60,10 +60,13 @@ var topic_2 []byte = []byte(`"><`)
var topic_3 []byte = []byte(`
-