diff --git a/database/audit.go b/database/audit.go index ca8dd79..4f4d291 100644 --- a/database/audit.go +++ b/database/audit.go @@ -88,7 +88,7 @@ func (ar *AuditRecord) Store() error { if ar.Record > 0 { return fmt.Errorf("audit record %d already stored", ar.Record) } - moment := time.Now() + moment := time.Now().UTC() rs, err := amdb.Exec(`INSERT INTO audit (on_date, event, uid, commid, ip, data1, data2, data3, data4) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);`, moment, ar.Event, ar.Uid, ar.CommId, ar.IP, ar.Data1, ar.Data2, ar.Data3, ar.Data4) diff --git a/database/contactinfo.go b/database/contactinfo.go index 38a7c99..6e30a0d 100644 --- a/database/contactinfo.go +++ b/database/contactinfo.go @@ -120,7 +120,7 @@ func (ci *ContactInfo) Save() (bool, error) { _, err := amdb.NamedExec(`UPDATE contacts SET given_name = :given_name, family_name = :family_name, middle_init = :middle_init, prefix = :prefix, suffix = :suffix, company = :company, addr1 = :addr1, addr2 = :addr2, locality = :locality, region = :region, pcode = :pcode, country = :country, phone = :phone, fax = :fax, mobile = :mobile, email = :email, pvt_addr = :pvt_addr, - pvt_phone = :pvt_phone, pvt_fax = :pvt_fax, pvt_email = :pvt_email, photo_url = :photo_url, url = :url, lastupdate = NOW() + pvt_phone = :pvt_phone, pvt_fax = :pvt_fax, pvt_email = :pvt_email, photo_url = :photo_url, url = :url, lastupdate = UTC_TIMESTAMP() WHERE contactid = :contactid`, ci) if err != nil { return false, err @@ -132,7 +132,7 @@ func (ci *ContactInfo) Save() (bool, error) { pvt_email, owner_uid, owner_commid, photo_url, url, lastupdate) VALUES (:given_name, :family_name, :middle_init, :prefix, :suffix, :company, :addr1, :addr2, :locality, :region, :pcode, :country, :phone, :fax, :mobile, :email, :pvt_addr, :pvt_phone, :pvt_fax, :pvt_email, - :owner_uid, :owner_commid, :photo_url, :url, NOW())`, ci) + :owner_uid, :owner_commid, :photo_url, :url, UTC_TIMESTAMP())`, ci) if err != nil { return false, err } diff --git a/database/ipban.go b/database/ipban.go index 8d6284d..334176c 100644 --- a/database/ipban.go +++ b/database/ipban.go @@ -66,7 +66,7 @@ func AmTestIPBan(ip_address string) (string, error) { rows, err := amdb.Query(` SELECT message FROM ipban WHERE (address_lo & mask_lo) = (? & mask_lo) AND (address_hi & mask_hi) = (? & mask_hi) AND (expire IS NULL OR expire >= ?) - AND enable <> 0 ORDER BY mask_hi DESC, mask_lo DESC`, iv_lo, iv_hi, time.Now()) + AND enable <> 0 ORDER BY mask_hi DESC, mask_lo DESC`, iv_lo, iv_hi, time.Now().UTC()) if err != nil { return "", err } diff --git a/database/user.go b/database/user.go index 48b0497..510d43a 100644 --- a/database/user.go +++ b/database/user.go @@ -457,7 +457,7 @@ func hashPassword(password string) string { func touchUser(user *User) { user.Mutex.Lock() defer user.Mutex.Unlock() - moment := time.Now() + moment := time.Now().UTC() _, _ = amdb.Exec("UPDATE user SET lastaccess = ? WHERE uid = ?", moment, user.Uid) user.LastAccess = &moment } @@ -613,7 +613,7 @@ func AmCreateNewUser(username string, password string, reminder string, dob *tim // Insert the user record. _, err2 := amdb.Exec(`INSERT INTO users (username, passhash, verify_email, lockout, email_confnum, - base_lvl, created, lastaccess, passreminder, description, dob) VALUES (?, ?, 0, 0, ?, ?, NOW(), NOW(), ?, '', ?)`, + base_lvl, created, lastaccess, passreminder, description, dob) VALUES (?, ?, 0, 0, ?, ?, UTC_TIMESTAMP(), UTC_TIMESTAMP(), ?, '', ?)`, username, hashPassword(password), util.GenerateRandomConfirmationNumber(), AmDefaultRole("Global.NewUser").Level(), reminder, dob) if err2 != nil { diff --git a/ui/dialog.go b/ui/dialog.go index 0ae7f58..546127c 100644 --- a/ui/dialog.go +++ b/ui/dialog.go @@ -141,7 +141,7 @@ func (fld *DialogItem) AsDate() *time.Time { if fld.Type == "date" && fld.AuxData != nil { v := fld.AuxData.([]int) if v[0] >= 1 && v[1] >= 1 && v[2] >= 1 { - rc := time.Date(v[2], time.Month(v[0]), v[1], 0, 0, 0, 0, time.Now().Location()) + rc := time.Date(v[2], time.Month(v[0]), v[1], 0, 0, 0, 0, time.Local) return &rc } }