diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/auths.go | 94 | ||||
| -rw-r--r-- | routers/admin/users.go | 58 | ||||
| -rw-r--r-- | routers/api/v1/api.go | 4 | ||||
| -rw-r--r-- | routers/api/v1/repo/repo.go | 20 | ||||
| -rw-r--r-- | routers/install.go | 184 | ||||
| -rw-r--r-- | routers/org/org.go | 14 | ||||
| -rw-r--r-- | routers/org/setting.go | 38 | ||||
| -rw-r--r-- | routers/org/teams.go | 24 | ||||
| -rw-r--r-- | routers/repo/editor.go | 154 | ||||
| -rw-r--r-- | routers/repo/issue.go | 86 | ||||
| -rw-r--r-- | routers/repo/pull.go | 28 | ||||
| -rw-r--r-- | routers/repo/release.go | 40 | ||||
| -rw-r--r-- | routers/repo/repo.go | 52 | ||||
| -rw-r--r-- | routers/repo/setting.go | 78 | ||||
| -rw-r--r-- | routers/repo/webhook.go | 100 | ||||
| -rw-r--r-- | routers/repo/wiki.go | 16 | ||||
| -rw-r--r-- | routers/user/auth.go | 32 | ||||
| -rw-r--r-- | routers/user/setting.go | 62 |
18 files changed, 542 insertions, 542 deletions
diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 952a5315..a6610e5d 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -12,10 +12,10 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth/ldap" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" ) @@ -76,64 +76,64 @@ func NewAuthSource(ctx *context.Context) { ctx.HTML(200, AUTH_NEW) } -func parseLDAPConfig(form auth.AuthenticationForm) *models.LDAPConfig { +func parseLDAPConfig(f form.Authentication) *models.LDAPConfig { return &models.LDAPConfig{ Source: &ldap.Source{ - Name: form.Name, - Host: form.Host, - Port: form.Port, - SecurityProtocol: ldap.SecurityProtocol(form.SecurityProtocol), - SkipVerify: form.SkipVerify, - BindDN: form.BindDN, - UserDN: form.UserDN, - BindPassword: form.BindPassword, - UserBase: form.UserBase, - AttributeUsername: form.AttributeUsername, - AttributeName: form.AttributeName, - AttributeSurname: form.AttributeSurname, - AttributeMail: form.AttributeMail, - AttributesInBind: form.AttributesInBind, - Filter: form.Filter, - AdminFilter: form.AdminFilter, + Name: f.Name, + Host: f.Host, + Port: f.Port, + SecurityProtocol: ldap.SecurityProtocol(f.SecurityProtocol), + SkipVerify: f.SkipVerify, + BindDN: f.BindDN, + UserDN: f.UserDN, + BindPassword: f.BindPassword, + UserBase: f.UserBase, + AttributeUsername: f.AttributeUsername, + AttributeName: f.AttributeName, + AttributeSurname: f.AttributeSurname, + AttributeMail: f.AttributeMail, + AttributesInBind: f.AttributesInBind, + Filter: f.Filter, + AdminFilter: f.AdminFilter, Enabled: true, }, } } -func parseSMTPConfig(form auth.AuthenticationForm) *models.SMTPConfig { +func parseSMTPConfig(f form.Authentication) *models.SMTPConfig { return &models.SMTPConfig{ - Auth: form.SMTPAuth, - Host: form.SMTPHost, - Port: form.SMTPPort, - AllowedDomains: form.AllowedDomains, - TLS: form.TLS, - SkipVerify: form.SkipVerify, + Auth: f.SMTPAuth, + Host: f.SMTPHost, + Port: f.SMTPPort, + AllowedDomains: f.AllowedDomains, + TLS: f.TLS, + SkipVerify: f.SkipVerify, } } -func NewAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { +func NewAuthSourcePost(ctx *context.Context, f form.Authentication) { ctx.Data["Title"] = ctx.Tr("admin.auths.new") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true - ctx.Data["CurrentTypeName"] = models.LoginNames[models.LoginType(form.Type)] - ctx.Data["CurrentSecurityProtocol"] = models.SecurityProtocolNames[ldap.SecurityProtocol(form.SecurityProtocol)] + ctx.Data["CurrentTypeName"] = models.LoginNames[models.LoginType(f.Type)] + ctx.Data["CurrentSecurityProtocol"] = models.SecurityProtocolNames[ldap.SecurityProtocol(f.SecurityProtocol)] ctx.Data["AuthSources"] = authSources ctx.Data["SecurityProtocols"] = securityProtocols ctx.Data["SMTPAuths"] = models.SMTPAuths hasTLS := false var config core.Conversion - switch models.LoginType(form.Type) { + switch models.LoginType(f.Type) { case models.LOGIN_LDAP, models.LOGIN_DLDAP: - config = parseLDAPConfig(form) - hasTLS = ldap.SecurityProtocol(form.SecurityProtocol) > ldap.SECURITY_PROTOCOL_UNENCRYPTED + config = parseLDAPConfig(f) + hasTLS = ldap.SecurityProtocol(f.SecurityProtocol) > ldap.SECURITY_PROTOCOL_UNENCRYPTED case models.LOGIN_SMTP: - config = parseSMTPConfig(form) + config = parseSMTPConfig(f) hasTLS = true case models.LOGIN_PAM: config = &models.PAMConfig{ - ServiceName: form.PAMServiceName, + ServiceName: f.PAMServiceName, } default: ctx.Error(400) @@ -147,23 +147,23 @@ func NewAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { } if err := models.CreateLoginSource(&models.LoginSource{ - Type: models.LoginType(form.Type), - Name: form.Name, - IsActived: form.IsActive, + Type: models.LoginType(f.Type), + Name: f.Name, + IsActived: f.IsActive, Cfg: config, }); err != nil { if models.IsErrLoginSourceAlreadyExist(err) { ctx.Data["Err_Name"] = true - ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(models.ErrLoginSourceAlreadyExist).Name), AUTH_NEW, form) + ctx.RenderWithErr(ctx.Tr("admin.auths.login_source_exist", err.(models.ErrLoginSourceAlreadyExist).Name), AUTH_NEW, f) } else { ctx.Handle(500, "CreateSource", err) } return } - log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, form.Name) + log.Trace("Authentication created by admin(%s): %s", ctx.User.Name, f.Name) - ctx.Flash.Success(ctx.Tr("admin.auths.new_success", form.Name)) + ctx.Flash.Success(ctx.Tr("admin.auths.new_success", f.Name)) ctx.Redirect(setting.AppSubUrl + "/admin/auths") } @@ -186,7 +186,7 @@ func EditAuthSource(ctx *context.Context) { ctx.HTML(200, AUTH_EDIT) } -func EditAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { +func EditAuthSourcePost(ctx *context.Context, f form.Authentication) { ctx.Data["Title"] = ctx.Tr("admin.auths.edit") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminAuthentications"] = true @@ -207,22 +207,22 @@ func EditAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { } var config core.Conversion - switch models.LoginType(form.Type) { + switch models.LoginType(f.Type) { case models.LOGIN_LDAP, models.LOGIN_DLDAP: - config = parseLDAPConfig(form) + config = parseLDAPConfig(f) case models.LOGIN_SMTP: - config = parseSMTPConfig(form) + config = parseSMTPConfig(f) case models.LOGIN_PAM: config = &models.PAMConfig{ - ServiceName: form.PAMServiceName, + ServiceName: f.PAMServiceName, } default: ctx.Error(400) return } - source.Name = form.Name - source.IsActived = form.IsActive + source.Name = f.Name + source.IsActived = f.IsActive source.Cfg = config if err := models.UpdateSource(source); err != nil { ctx.Handle(500, "UpdateSource", err) @@ -231,7 +231,7 @@ func EditAuthSourcePost(ctx *context.Context, form auth.AuthenticationForm) { log.Trace("Authentication changed by admin(%s): %d", ctx.User.Name, source.ID) ctx.Flash.Success(ctx.Tr("admin.auths.update_success")) - ctx.Redirect(setting.AppSubUrl + "/admin/auths/" + com.ToStr(form.ID)) + ctx.Redirect(setting.AppSubUrl + "/admin/auths/" + com.ToStr(f.ID)) } func DeleteAuthSource(ctx *context.Context) { diff --git a/routers/admin/users.go b/routers/admin/users.go index 6253683b..442b938e 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -11,9 +11,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/routers" @@ -58,7 +58,7 @@ func NewUser(ctx *context.Context) { ctx.HTML(200, USER_NEW) } -func NewUserPost(ctx *context.Context, form auth.AdminCrateUserForm) { +func NewUserPost(ctx *context.Context, f form.AdminCrateUser) { ctx.Data["Title"] = ctx.Tr("admin.users.new_account") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true @@ -78,19 +78,19 @@ func NewUserPost(ctx *context.Context, form auth.AdminCrateUserForm) { } u := &models.User{ - Name: form.UserName, - Email: form.Email, - Passwd: form.Password, + Name: f.UserName, + Email: f.Email, + Passwd: f.Password, IsActive: true, LoginType: models.LOGIN_PLAIN, } - if len(form.LoginType) > 0 { - fields := strings.Split(form.LoginType, "-") + if len(f.LoginType) > 0 { + fields := strings.Split(f.LoginType, "-") if len(fields) == 2 { u.LoginType = models.LoginType(com.StrTo(fields[0]).MustInt()) u.LoginSource = com.StrTo(fields[1]).MustInt64() - u.LoginName = form.LoginName + u.LoginName = f.LoginName } } @@ -98,16 +98,16 @@ func NewUserPost(ctx *context.Context, form auth.AdminCrateUserForm) { switch { case models.IsErrUserAlreadyExist(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), USER_NEW, &form) + ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), USER_NEW, &f) case models.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_been_used"), USER_NEW, &form) + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), USER_NEW, &f) case models.IsErrNameReserved(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), USER_NEW, &form) + ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), USER_NEW, &f) case models.IsErrNamePatternNotAllowed(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("user.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), USER_NEW, &form) + ctx.RenderWithErr(ctx.Tr("user.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), USER_NEW, &f) default: ctx.Handle(500, "CreateUser", err) } @@ -116,7 +116,7 @@ func NewUserPost(ctx *context.Context, form auth.AdminCrateUserForm) { log.Trace("Account created by admin (%s): %s", ctx.User.Name, u.Name) // Send email notification. - if form.SendNotify && setting.MailService != nil { + if f.SendNotify && setting.MailService != nil { mailer.SendRegisterNotifyMail(ctx.Context, models.NewMailerUser(u)) } @@ -166,7 +166,7 @@ func EditUser(ctx *context.Context) { ctx.HTML(200, USER_EDIT) } -func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) { +func EditUserPost(ctx *context.Context, f form.AdminEditUser) { ctx.Data["Title"] = ctx.Tr("admin.users.edit_account") ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true @@ -182,7 +182,7 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) { return } - fields := strings.Split(form.LoginType, "-") + fields := strings.Split(f.LoginType, "-") if len(fields) == 2 { loginType := models.LoginType(com.StrTo(fields[0]).MustInt()) loginSource := com.StrTo(fields[1]).MustInt64() @@ -193,8 +193,8 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) { } } - if len(form.Password) > 0 { - u.Passwd = form.Password + if len(f.Password) > 0 { + u.Passwd = f.Password var err error if u.Salt, err = models.GetUserSalt(); err != nil { ctx.Handle(500, "UpdateUser", err) @@ -203,22 +203,22 @@ func EditUserPost(ctx *context.Context, form auth.AdminEditUserForm) { u.EncodePasswd() } - u.LoginName = form.LoginName - u.FullName = form.FullName - u.Email = form.Email - u.Website = form.Website - u.Location = form.Location - u.MaxRepoCreation = form.MaxRepoCreation - u.IsActive = form.Active - u.IsAdmin = form.Admin - u.AllowGitHook = form.AllowGitHook - u.AllowImportLocal = form.AllowImportLocal - u.ProhibitLogin = form.ProhibitLogin + u.LoginName = f.LoginName + u.FullName = f.FullName + u.Email = f.Email + u.Website = f.Website + u.Location = f.Location + u.MaxRepoCreation = f.MaxRepoCreation + u.IsActive = f.Active + u.IsAdmin = f.Admin + u.AllowGitHook = f.AllowGitHook + u.AllowImportLocal = f.AllowImportLocal + u.ProhibitLogin = f.ProhibitLogin if err := models.UpdateUser(u); err != nil { if models.IsErrEmailAlreadyUsed(err) { ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_been_used"), USER_EDIT, &form) + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), USER_EDIT, &f) } else { ctx.Handle(500, "UpdateUser", err) } diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index d883d6c0..df5fb5c3 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -13,8 +13,8 @@ import ( api "github.com/gogits/go-gogs-client" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/routers/api/v1/admin" "github.com/gogits/gogs/routers/api/v1/misc" "github.com/gogits/gogs/routers/api/v1/org" @@ -237,7 +237,7 @@ func RegisterRoutes(m *macaron.Macaron) { }) m.Group("/repos", func() { - m.Post("/migrate", bind(auth.MigrateRepoForm{}), repo.Migrate) + m.Post("/migrate", bind(form.MigrateRepo{}), repo.Migrate) m.Combo("/:username/:reponame").Get(repo.Get). Delete(repo.Delete) diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index 1fd0af3d..147b980d 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -12,8 +12,8 @@ import ( api "github.com/gogits/go-gogs-client" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/routers/api/v1/convert" ) @@ -206,12 +206,12 @@ func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) { } // https://github.com/gogits/go-gogs-client/wiki/Repositories#migrate -func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { +func Migrate(ctx *context.APIContext, f form.MigrateRepo) { ctxUser := ctx.User // Not equal means context user is an organization, // or is another user/organization if current user is admin. - if form.Uid != ctxUser.ID { - org, err := models.GetUserByID(form.Uid) + if f.Uid != ctxUser.ID { + org, err := models.GetUserByID(f.Uid) if err != nil { if models.IsErrUserNotExist(err) { ctx.Error(422, "", err) @@ -236,7 +236,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { } } - remoteAddr, err := form.ParseRemoteAddr(ctx.User) + remoteAddr, err := f.ParseRemoteAddr(ctx.User) if err != nil { if models.IsErrInvalidCloneAddr(err) { addrErr := err.(models.ErrInvalidCloneAddr) @@ -257,10 +257,10 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { } repo, err := models.MigrateRepository(ctxUser, models.MigrateRepoOptions{ - Name: form.RepoName, - Description: form.Description, - IsPrivate: form.Private || setting.Repository.ForcePrivate, - IsMirror: form.Mirror, + Name: f.RepoName, + Description: f.Description, + IsPrivate: f.Private || setting.Repository.ForcePrivate, + IsMirror: f.Mirror, RemoteAddr: remoteAddr, }) if err != nil { @@ -273,7 +273,7 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) { return } - log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName) + log.Trace("Repository migrated: %s/%s", ctxUser.Name, f.RepoName) ctx.JSON(201, repo.APIFormat(&api.Permission{true, true, true})) } diff --git a/routers/install.go b/routers/install.go index 930c3e4e..45e22041 100644 --- a/routers/install.go +++ b/routers/install.go @@ -21,10 +21,10 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" "github.com/gogits/gogs/modules/cron" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/markdown" "github.com/gogits/gogs/modules/setting" @@ -109,13 +109,13 @@ func InstallInit(ctx *context.Context) { } func Install(ctx *context.Context) { - form := auth.InstallForm{} + f := form.Install{} // Database settings - form.DbHost = models.DbCfg.Host - form.DbUser = models.DbCfg.User - form.DbName = models.DbCfg.Name - form.DbPath = models.DbCfg.Path + f.DbHost = models.DbCfg.Host + f.DbUser = models.DbCfg.User + f.DbName = models.DbCfg.Name + f.DbPath = models.DbCfg.Path ctx.Data["CurDbOption"] = "MySQL" switch models.DbCfg.Type { @@ -130,47 +130,47 @@ func Install(ctx *context.Context) { } // Application general settings - form.AppName = setting.AppName - form.RepoRootPath = setting.RepoRootPath + f.AppName = setting.AppName + f.RepoRootPath = setting.RepoRootPath // Note(unknwon): it's hard for Windows users change a running user, // so just use current one if config says default. if setting.IsWindows && setting.RunUser == "git" { - form.RunUser = user.CurrentUsername() + f.RunUser = user.CurrentUsername() } else { - form.RunUser = setting.RunUser + f.RunUser = setting.RunUser } - form.Domain = setting.Domain - form.SSHPort = setting.SSH.Port - form.UseBuiltinSSHServer = setting.SSH.StartBuiltinServer - form.HTTPPort = setting.HTTPPort - form.AppUrl = setting.AppUrl - form.LogRootPath = setting.LogRootPath + f.Domain = setting.Domain + f.SSHPort = setting.SSH.Port + f.UseBuiltinSSHServer = setting.SSH.StartBuiltinServer + f.HTTPPort = setting.HTTPPort + f.AppUrl = setting.AppUrl + f.LogRootPath = setting.LogRootPath // E-mail service settings if setting.MailService != nil { - form.SMTPHost = setting.MailService.Host - form.SMTPFrom = setting.MailService.From - form.SMTPUser = setting.MailService.User + f.SMTPHost = setting.MailService.Host + f.SMTPFrom = setting.MailService.From + f.SMTPUser = setting.MailService.User } - form.RegisterConfirm = setting.Service.RegisterEmailConfirm - form.MailNotify = setting.Service.EnableNotifyMail + f.RegisterConfirm = setting.Service.RegisterEmailConfirm + f.MailNotify = setting.Service.EnableNotifyMail // Server and other services settings - form.OfflineMode = setting.OfflineMode - form.DisableGravatar = setting.DisableGravatar - form.EnableFederatedAvatar = setting.EnableFederatedAvatar - form.DisableRegistration = setting.Service.DisableRegistration - form.EnableCaptcha = setting.Service.EnableCaptcha - form.RequireSignInView = setting.Service.RequireSignInView - - auth.AssignForm(form, ctx.Data) + f.OfflineMode = setting.OfflineMode + f.DisableGravatar = setting.DisableGravatar + f.EnableFederatedAvatar = setting.EnableFederatedAvatar + f.DisableRegistration = setting.Service.DisableRegistration + f.EnableCaptcha = setting.Service.EnableCaptcha + f.RequireSignInView = setting.Service.RequireSignInView + + form.Assign(f, ctx.Data) ctx.HTML(200, INSTALL) } -func InstallPost(ctx *context.Context, form auth.InstallForm) { - ctx.Data["CurDbOption"] = form.DbType +func InstallPost(ctx *context.Context, f form.Install) { + ctx.Data["CurDbOption"] = f.DbType if ctx.HasError() { if ctx.HasValue("Err_SMTPEmail") { @@ -187,24 +187,24 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { } if _, err := exec.LookPath("git"); err != nil { - ctx.RenderWithErr(ctx.Tr("install.test_git_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.test_git_failed", err), INSTALL, &f) return } // Pass basic check, now test configuration. // Test database setting. dbTypes := map[string]string{"MySQL": "mysql", "PostgreSQL": "postgres", "MSSQL": "mssql", "SQLite3": "sqlite3", "TiDB": "tidb"} - models.DbCfg.Type = dbTypes[form.DbType] - models.DbCfg.Host = form.DbHost - models.DbCfg.User = form.DbUser - models.DbCfg.Passwd = form.DbPasswd - models.DbCfg.Name = form.DbName - models.DbCfg.SSLMode = form.SSLMode - models.DbCfg.Path = form.DbPath + models.DbCfg.Type = dbTypes[f.DbType] + models.DbCfg.Host = f.DbHost + models.DbCfg.User = f.DbUser + models.DbCfg.Passwd = f.DbPasswd + models.DbCfg.Name = f.DbName + models.DbCfg.SSLMode = f.SSLMode + models.DbCfg.Path = f.DbPath if models.DbCfg.Type == "sqlite3" && len(models.DbCfg.Path) == 0 { ctx.Data["Err_DbPath"] = true - ctx.RenderWithErr(ctx.Tr("install.err_empty_db_path"), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.err_empty_db_path"), INSTALL, &f) return } @@ -213,72 +213,72 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { if err := models.NewTestEngine(x); err != nil { if strings.Contains(err.Error(), `Unknown database type: sqlite3`) { ctx.Data["Err_DbType"] = true - ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &f) } else { ctx.Data["Err_DbSetting"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), INSTALL, &f) } return } // Test repository root path. - form.RepoRootPath = strings.Replace(form.RepoRootPath, "\\", "/", -1) - if err := os.MkdirAll(form.RepoRootPath, os.ModePerm); err != nil { + f.RepoRootPath = strings.Replace(f.RepoRootPath, "\\", "/", -1) + if err := os.MkdirAll(f.RepoRootPath, os.ModePerm); err != nil { ctx.Data["Err_RepoRootPath"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_repo_path", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_repo_path", err), INSTALL, &f) return } // Test log root path. - form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1) - if err := os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil { + f.LogRootPath = strings.Replace(f.LogRootPath, "\\", "/", -1) + if err := os.MkdirAll(f.LogRootPath, os.ModePerm); err != nil { ctx.Data["Err_LogRootPath"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_log_root_path", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_log_root_path", err), INSTALL, &f) return } - currentUser, match := setting.IsRunUserMatchCurrentUser(form.RunUser) + currentUser, match := setting.IsRunUserMatchCurrentUser(f.RunUser) if !match { ctx.Data["Err_RunUser"] = true - ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, currentUser), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", f.RunUser, currentUser), INSTALL, &f) return } // Make sure FROM field is valid - if len(form.SMTPFrom) > 0 { - _, err := mail.ParseAddress(form.SMTPFrom) + if len(f.SMTPFrom) > 0 { + _, err := mail.ParseAddress(f.SMTPFrom) if err != nil { ctx.Data["Err_SMTP"] = true ctx.Data["Err_SMTPFrom"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_smtp_from", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_smtp_from", err), INSTALL, &f) return } } // Check logic loophole between disable self-registration and no admin account. - if form.DisableRegistration && len(form.AdminName) == 0 { + if f.DisableRegistration && len(f.AdminName) == 0 { ctx.Data["Err_Services"] = true ctx.Data["Err_Admin"] = true - ctx.RenderWithErr(ctx.Tr("install.no_admin_and_disable_registration"), INSTALL, form) + ctx.RenderWithErr(ctx.Tr("install.no_admin_and_disable_registration"), INSTALL, f) return } // Check admin password. - if len(form.AdminName) > 0 && len(form.AdminPasswd) == 0 { + if len(f.AdminName) > 0 && len(f.AdminPasswd) == 0 { ctx.Data["Err_Admin"] = true ctx.Data["Err_AdminPasswd"] = true - ctx.RenderWithErr(ctx.Tr("install.err_empty_admin_password"), INSTALL, form) + ctx.RenderWithErr(ctx.Tr("install.err_empty_admin_password"), INSTALL, f) return } - if form.AdminPasswd != form.AdminConfirmPasswd { + if f.AdminPasswd != f.AdminConfirmPasswd { ctx.Data["Err_Admin"] = true ctx.Data["Err_AdminPasswd"] = true - ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form) + ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, f) return } - if form.AppUrl[len(form.AppUrl)-1] != '/' { - form.AppUrl += "/" + if f.AppUrl[len(f.AppUrl)-1] != '/' { + f.AppUrl += "/" } // Save settings. @@ -297,39 +297,39 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { cfg.Section("database").Key("SSL_MODE").SetValue(models.DbCfg.SSLMode) cfg.Section("database").Key("PATH").SetValue(models.DbCfg.Path) - cfg.Section("").Key("APP_NAME").SetValue(form.AppName) - cfg.Section("repository").Key("ROOT").SetValue(form.RepoRootPath) - cfg.Section("").Key("RUN_USER").SetValue(form.RunUser) - cfg.Section("server").Key("DOMAIN").SetValue(form.Domain) - cfg.Section("server").Key("HTTP_PORT").SetValue(form.HTTPPort) - cfg.Section("server").Key("ROOT_URL").SetValue(form.AppUrl) + cfg.Section("").Key("APP_NAME").SetValue(f.AppName) + cfg.Section("repository").Key("ROOT").SetValue(f.RepoRootPath) + cfg.Section("").Key("RUN_USER").SetValue(f.RunUser) + cfg.Section("server").Key("DOMAIN").SetValue(f.Domain) + cfg.Section("server").Key("HTTP_PORT").SetValue(f.HTTPPort) + cfg.Section("server").Key("ROOT_URL").SetValue(f.AppUrl) - if form.SSHPort == 0 { + if f.SSHPort == 0 { cfg.Section("server").Key("DISABLE_SSH").SetValue("true") } else { cfg.Section("server").Key("DISABLE_SSH").SetValue("false") - cfg.Section("server").Key("SSH_PORT").SetValue(com.ToStr(form.SSHPort)) - cfg.Section("server").Key("START_SSH_SERVER").SetValue(com.ToStr(form.UseBuiltinSSHServer)) + cfg.Section("server").Key("SSH_PORT").SetValue(com.ToStr(f.SSHPort)) + cfg.Section("server").Key("START_SSH_SERVER").SetValue(com.ToStr(f.UseBuiltinSSHServer)) } - if len(strings.TrimSpace(form.SMTPHost)) > 0 { + if len(strings.TrimSpace(f.SMTPHost)) > 0 { cfg.Section("mailer").Key("ENABLED").SetValue("true") - cfg.Section("mailer").Key("HOST").SetValue(form.SMTPHost) - cfg.Section("mailer").Key("FROM").SetValue(form.SMTPFrom) - cfg.Section("mailer").Key("USER").SetValue(form.SMTPUser) - cfg.Section("mailer").Key("PASSWD").SetValue(form.SMTPPasswd) + cfg.Section("mailer").Key("HOST").SetValue(f.SMTPHost) + cfg.Section("mailer").Key("FROM").SetValue(f.SMTPFrom) + cfg.Section("mailer").Key("USER").SetValue(f.SMTPUser) + cfg.Section("mailer").Key("PASSWD").SetValue(f.SMTPPasswd) } else { cfg.Section("mailer").Key("ENABLED").SetValue("false") } - cfg.Section("service").Key("REGISTER_EMAIL_CONFIRM").SetValue(com.ToStr(form.RegisterConfirm)) - cfg.Section("service").Key("ENABLE_NOTIFY_MAIL").SetValue(com.ToStr(form.MailNotify)) + cfg.Section("service").Key("REGISTER_EMAIL_CONFIRM").SetValue(com.ToStr(f.RegisterConfirm)) + cfg.Section("service").Key("ENABLE_NOTIFY_MAIL").SetValue(com.ToStr(f.MailNotify)) - cfg.Section("server").Key("OFFLINE_MODE").SetValue(com.ToStr(form.OfflineMode)) - cfg.Section("picture").Key("DISABLE_GRAVATAR").SetValue(com.ToStr(form.DisableGravatar)) - cfg.Section("picture").Key("ENABLE_FEDERATED_AVATAR").SetValue(com.ToStr(form.EnableFederatedAvatar)) - cfg.Section("service").Key("DISABLE_REGISTRATION").SetValue(com.ToStr(form.DisableRegistration)) - cfg.Section("service").Key("ENABLE_CAPTCHA").SetValue(com.ToStr(form.EnableCaptcha)) - cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").SetValue(com.ToStr(form.RequireSignInView)) + cfg.Section("server").Key("OFFLINE_MODE").SetValue(com.ToStr(f.OfflineMode)) + cfg.Section("picture").Key("DISABLE_GRAVATAR").SetValue(com.ToStr(f.DisableGravatar)) + cfg.Section("picture").Key("ENABLE_FEDERATED_AVATAR").SetValue(com.ToStr(f.EnableFederatedAvatar)) + cfg.Section("service").Key("DISABLE_REGISTRATION").SetValue(com.ToStr(f.DisableRegistration)) + cfg.Section("service").Key("ENABLE_CAPTCHA").SetValue(com.ToStr(f.EnableCaptcha)) + cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").SetValue(com.ToStr(f.RequireSignInView)) cfg.Section("").Key("RUN_MODE").SetValue("prod") @@ -337,30 +337,30 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { cfg.Section("log").Key("MODE").SetValue("file") cfg.Section("log").Key("LEVEL").SetValue("Info") - cfg.Section("log").Key("ROOT_PATH").SetValue(form.LogRootPath) + cfg.Section("log").Key("ROOT_PATH").SetValue(f.LogRootPath) cfg.Section("security").Key("INSTALL_LOCK").SetValue("true") secretKey, err := base.GetRandomString(15) if err != nil { - ctx.RenderWithErr(ctx.Tr("install.secret_key_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.secret_key_failed", err), INSTALL, &f) return } cfg.Section("security").Key("SECRET_KEY").SetValue(secretKey) os.MkdirAll(filepath.Dir(setting.CustomConf), os.ModePerm) if err := cfg.SaveTo(setting.CustomConf); err != nil { - ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), INSTALL, &f) return } GlobalInit() // Create admin account - if len(form.AdminName) > 0 { + if len(f.AdminName) > 0 { u := &models.User{ - Name: form.AdminName, - Email: form.AdminEmail, - Passwd: form.AdminPasswd, + Name: f.AdminName, + Email: f.AdminEmail, + Passwd: f.AdminPasswd, IsAdmin: true, IsActive: true, } @@ -369,7 +369,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { setting.InstallLock = false ctx.Data["Err_AdminName"] = true ctx.Data["Err_AdminEmail"] = true - ctx.RenderWithErr(ctx.Tr("install.invalid_admin_setting", err), INSTALL, &form) + ctx.RenderWithErr(ctx.Tr("install.invalid_admin_setting", err), INSTALL, &f) return } log.Info("Admin account already exist") @@ -383,5 +383,5 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) { log.Info("First-time run install finished!") ctx.Flash.Success(ctx.Tr("install.install_success")) - ctx.Redirect(form.AppUrl + "user/login") + ctx.Redirect(f.AppUrl + "user/login") } diff --git a/routers/org/org.go b/routers/org/org.go index 1a6a821e..cf49733b 100644 --- a/routers/org/org.go +++ b/routers/org/org.go @@ -8,7 +8,7 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" "github.com/gogits/gogs/modules/setting" @@ -23,7 +23,7 @@ func Create(ctx *context.Context) { ctx.HTML(200, CREATE) } -func CreatePost(ctx *context.Context, form auth.CreateOrgForm) { +func CreatePost(ctx *context.Context, f form.CreateOrg) { ctx.Data["Title"] = ctx.Tr("new_org") if ctx.HasError() { @@ -32,7 +32,7 @@ func CreatePost(ctx *context.Context, form auth.CreateOrgForm) { } org := &models.User{ - Name: form.OrgName, + Name: f.OrgName, IsActive: true, Type: models.USER_TYPE_ORGANIZATION, } @@ -41,11 +41,11 @@ func CreatePost(ctx *context.Context, form auth.CreateOrgForm) { ctx.Data["Err_OrgName"] = true switch { case models.IsErrUserAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), CREATE, &form) + ctx.RenderWithErr(ctx.Tr("form.org_name_been_taken"), CREATE, &f) case models.IsErrNameReserved(err): - ctx.RenderWithErr(ctx.Tr("org.form.name_reserved", err.(models.ErrNameReserved).Name), CREATE, &form) + ctx.RenderWithErr(ctx.Tr("org.form.name_reserved", err.(models.ErrNameReserved).Name), CREATE, &f) case models.IsErrNamePatternNotAllowed(err): - ctx.RenderWithErr(ctx.Tr("org.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), CREATE, &form) + ctx.RenderWithErr(ctx.Tr("org.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), CREATE, &f) default: ctx.Handle(500, "CreateOrganization", err) } @@ -53,5 +53,5 @@ func CreatePost(ctx *context.Context, form auth.CreateOrgForm) { } log.Trace("Organization created: %s", org.Name) - ctx.Redirect(setting.AppSubUrl + "/org/" + form.OrgName + "/dashboard") + ctx.Redirect(setting.AppSubUrl + "/org/" + f.OrgName + "/dashboard") } diff --git a/routers/org/setting.go b/routers/org/setting.go index 4949c3a0..136e1b66 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -10,9 +10,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/routers/user" ) @@ -29,7 +29,7 @@ func Settings(ctx *context.Context) { ctx.HTML(200, SETTINGS_OPTIONS) } -func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) { +func SettingsPost(ctx *context.Context, f form.UpdateOrgSetting) { ctx.Data["Title"] = ctx.Tr("org.settings") ctx.Data["PageIsSettingsOptions"] = true @@ -41,40 +41,40 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) { org := ctx.Org.Organization // Check if organization name has been changed. - if org.LowerName != strings.ToLower(form.Name) { - isExist, err := models.IsUserExist(org.ID, form.Name) + if org.LowerName != strings.ToLower(f.Name) { + isExist, err := models.IsUserExist(org.ID, f.Name) if err != nil { ctx.Handle(500, "IsUserExist", err) return } else if isExist { ctx.Data["OrgName"] = true - ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SETTINGS_OPTIONS, &form) + ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SETTINGS_OPTIONS, &f) return - } else if err = models.ChangeUserName(org, form.Name); err != nil { + } else if err = models.ChangeUserName(org, f.Name); err != nil { if err == models.ErrUserNameIllegal { ctx.Data["OrgName"] = true - ctx.RenderWithErr(ctx.Tr("form.illegal_username"), SETTINGS_OPTIONS, &form) + ctx.RenderWithErr(ctx.Tr("form.illegal_username"), SETTINGS_OPTIONS, &f) } else { ctx.Handle(500, "ChangeUserName", err) } return } // reset ctx.org.OrgLink with new name - ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + form.Name - log.Trace("Organization name changed: %s -> %s", org.Name, form.Name) + ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + f.Name + log.Trace("Organization name changed: %s -> %s", org.Name, f.Name) } // In case it's just a case change. - org.Name = form.Name - org.LowerName = strings.ToLower(form.Name) + org.Name = f.Name + org.LowerName = strings.ToLower(f.Name) if ctx.User.IsAdmin { - org.MaxRepoCreation = form.MaxRepoCreation + org.MaxRepoCreation = f.MaxRepoCreation } - org.FullName = form.FullName - org.Description = form.Description - org.Website = form.Website - org.Location = form.Location + org.FullName = f.FullName + org.Description = f.Description + org.Website = f.Website + org.Location = f.Location if err := models.UpdateUser(org); err != nil { ctx.Handle(500, "UpdateUser", err) return @@ -84,9 +84,9 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) { ctx.Redirect(ctx.Org.OrgLink + "/settings") } -func SettingsAvatar(ctx *context.Context, form auth.AvatarForm) { - form.Source = auth.AVATAR_LOCAL - if err := user.UpdateAvatarSetting(ctx, form, ctx.Org.Organization); err != nil { +func SettingsAvatar(ctx *context.Context, f form.Avatar) { + f.Source = form.AVATAR_LOCAL + if err := user.UpdateAvatarSetting(ctx, f, ctx.Org.Organization); err != nil { ctx.Flash.Error(err.Error()) } else { ctx.Flash.Success(ctx.Tr("org.settings.update_avatar_success")) diff --git a/routers/org/teams.go b/routers/org/teams.go index 653ea20a..221b636f 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -11,9 +11,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" ) const ( @@ -149,16 +149,16 @@ func NewTeam(ctx *context.Context) { ctx.HTML(200, TEAM_NEW) } -func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) { +func NewTeamPost(ctx *context.Context, f form.CreateTeam) { ctx.Data["Title"] = ctx.Org.Organization.FullName ctx.Data["PageIsOrgTeams"] = true ctx.Data["PageIsOrgTeamsNew"] = true t := &models.Team{ OrgID: ctx.Org.Organization.ID, - Name: form.TeamName, - Description: form.Description, - Authorize: models.ParseAccessMode(form.Permission), + Name: f.TeamName, + Description: f.Description, + Authorize: models.ParseAccessMode(f.Permission), } ctx.Data["Team"] = t @@ -171,9 +171,9 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) { ctx.Data["Err_TeamName"] = true switch { case models.IsErrTeamAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), TEAM_NEW, &form) + ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), TEAM_NEW, &f) case models.IsErrNameReserved(err): - ctx.RenderWithErr(ctx.Tr("org.form.team_name_reserved", err.(models.ErrNameReserved).Name), TEAM_NEW, &form) + ctx.RenderWithErr(ctx.Tr("org.form.team_name_reserved", err.(models.ErrNameReserved).Name), TEAM_NEW, &f) default: ctx.Handle(500, "NewTeam", err) } @@ -211,7 +211,7 @@ func EditTeam(ctx *context.Context) { ctx.HTML(200, TEAM_NEW) } -func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) { +func EditTeamPost(ctx *context.Context, f form.CreateTeam) { t := ctx.Org.Team ctx.Data["Title"] = ctx.Org.Organization.FullName ctx.Data["PageIsOrgTeams"] = true @@ -226,7 +226,7 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) { if !t.IsOwnerTeam() { // Validate permission level. var auth models.AccessMode - switch form.Permission { + switch f.Permission { case "read": auth = models.ACCESS_MODE_READ case "write": @@ -238,18 +238,18 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) { return } - t.Name = form.TeamName + t.Name = f.TeamName if t.Authorize != auth { isAuthChanged = true t.Authorize = auth } } - t.Description = form.Description + t.Description = f.Description if err := models.UpdateTeam(t, isAuthChanged); err != nil { ctx.Data["Err_TeamName"] = true switch { case models.IsErrTeamAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), TEAM_NEW, &form) + ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), TEAM_NEW, &f) default: ctx.Handle(500, "UpdateTeam", err) } diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 83302039..af3a300c 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -15,9 +15,9 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/template" ) @@ -123,7 +123,7 @@ func NewFile(ctx *context.Context) { editFile(ctx, true) } -func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bool) { +func editFilePost(ctx *context.Context, f form.EditRepoFile, isNewFile bool) { ctx.Data["PageIsEdit"] = true ctx.Data["IsNewFile"] = isNewFile ctx.Data["RequireHighlightJS"] = true @@ -132,26 +132,26 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo oldBranchName := ctx.Repo.BranchName branchName := oldBranchName oldTreePath := ctx.Repo.TreePath - lastCommit := form.LastCommit - form.LastCommit = ctx.Repo.Commit.ID.String() + lastCommit := f.LastCommit + f.LastCommit = ctx.Repo.Commit.ID.String() - if form.IsNewBrnach() { - branchName = form.NewBranchName + if f.IsNewBrnach() { + branchName = f.NewBranchName } - form.TreePath = strings.Trim(form.TreePath, " /") - treeNames, treePaths := getParentTreeFields(form.TreePath) + f.TreePath = strings.Trim(f.TreePath, " /") + treeNames, treePaths := getParentTreeFields(f.TreePath) - ctx.Data["TreePath"] = form.TreePath + ctx.Data["TreePath"] = f.TreePath ctx.Data["TreeNames"] = treeNames ctx.Data["TreePaths"] = treePaths ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + branchName - ctx.Data["FileContent"] = form.Content - ctx.Data["commit_summary"] = form.CommitSummary - ctx.Data["commit_message"] = form.CommitMessage - ctx.Data["commit_choice"] = form.CommitChoice + ctx.Data["FileContent"] = f.Content + ctx.Data["commit_summary"] = f.CommitSummary + ctx.Data["commit_message"] = f.CommitMessage + ctx.Data["commit_choice"] = f.CommitChoice ctx.Data["new_branch_name"] = branchName - ctx.Data["last_commit"] = form.LastCommit + ctx.Data["last_commit"] = f.LastCommit ctx.Data["MarkdownFileExts"] = strings.Join(setting.Markdown.FileExtensions, ",") ctx.Data["LineWrapExtensions"] = strings.Join(setting.Repository.Editor.LineWrapExtensions, ",") ctx.Data["PreviewableFileModes"] = strings.Join(setting.Repository.Editor.PreviewableFileModes, ",") @@ -161,16 +161,16 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo return } - if len(form.TreePath) == 0 { + if len(f.TreePath) == 0 { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.filename_cannot_be_empty"), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.filename_cannot_be_empty"), EDIT_FILE, &f) return } if oldBranchName != branchName { if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { ctx.Data["Err_NewBranchName"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), EDIT_FILE, &f) return } } @@ -191,17 +191,17 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo if index != len(treeNames)-1 { if !entry.IsDir() { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), EDIT_FILE, &f) return } } else { if entry.IsLink() { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.file_is_a_symlink", part), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.file_is_a_symlink", part), EDIT_FILE, &f) return } else if entry.IsDir() { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.filename_is_a_directory", part), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.filename_is_a_directory", part), EDIT_FILE, &f) return } } @@ -212,7 +212,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo if err != nil { if git.IsErrNotExist(err) { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.file_editing_no_longer_exists", oldTreePath), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.file_editing_no_longer_exists", oldTreePath), EDIT_FILE, &f) } else { ctx.Handle(500, "GetTreeEntryByPath", err) } @@ -226,17 +226,17 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo } for _, file := range files { - if file == form.TreePath { - ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+lastCommit+"..."+ctx.Repo.CommitID), EDIT_FILE, &form) + if file == f.TreePath { + ctx.RenderWithErr(ctx.Tr("repo.editor.file_changed_while_editing", ctx.Repo.RepoLink+"/compare/"+lastCommit+"..."+ctx.Repo.CommitID), EDIT_FILE, &f) return } } } } - if oldTreePath != form.TreePath { + if oldTreePath != f.TreePath { // We have a new filename (rename or completely new file) so we need to make sure it doesn't already exist, can't clobber. - entry, err := ctx.Repo.Commit.GetTreeEntryByPath(form.TreePath) + entry, err := ctx.Repo.Commit.GetTreeEntryByPath(f.TreePath) if err != nil { if !git.IsErrNotExist(err) { ctx.Handle(500, "GetTreeEntryByPath", err) @@ -245,23 +245,23 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo } if entry != nil { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.file_already_exists", form.TreePath), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.file_already_exists", f.TreePath), EDIT_FILE, &f) return } } - message := strings.TrimSpace(form.CommitSummary) + message := strings.TrimSpace(f.CommitSummary) if len(message) == 0 { if isNewFile { - message = ctx.Tr("repo.editor.add", form.TreePath) + message = ctx.Tr("repo.editor.add", f.TreePath) } else { - message = ctx.Tr("repo.editor.update", form.TreePath) + message = ctx.Tr("repo.editor.update", f.TreePath) } } - form.CommitMessage = strings.TrimSpace(form.CommitMessage) - if len(form.CommitMessage) > 0 { - message += "\n\n" + form.CommitMessage + f.CommitMessage = strings.TrimSpace(f.CommitMessage) + if len(f.CommitMessage) > 0 { + message += "\n\n" + f.CommitMessage } if err := ctx.Repo.Repository.UpdateRepoFile(ctx.User, models.UpdateRepoFileOptions{ @@ -269,32 +269,32 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo OldBranch: oldBranchName, NewBranch: branchName, OldTreeName: oldTreePath, - NewTreeName: form.TreePath, + NewTreeName: f.TreePath, Message: message, - Content: strings.Replace(form.Content, "\r", "", -1), + Content: strings.Replace(f.Content, "\r", "", -1), IsNewFile: isNewFile, }); err != nil { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.fail_to_update_file", form.TreePath, err), EDIT_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.fail_to_update_file", f.TreePath, err), EDIT_FILE, &f) return } if form.IsNewBrnach() && ctx.Repo.PullRequest.Allowed { ctx.Redirect(ctx.Repo.PullRequestURL(oldBranchName, form.NewBranchName)) } else { - ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + template.EscapePound(form.TreePath)) + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + template.EscapePound(f.TreePath)) } } -func EditFilePost(ctx *context.Context, form auth.EditRepoFileForm) { - editFilePost(ctx, form, false) +func EditFilePost(ctx *context.Context, f form.EditRepoFile) { + editFilePost(ctx, f, false) } -func NewFilePost(ctx *context.Context, form auth.EditRepoFileForm) { - editFilePost(ctx, form, true) +func NewFilePost(ctx *context.Context, f form.EditRepoFile) { + editFilePost(ctx, f, true) } -func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) { +func DiffPreviewPost(ctx *context.Context, f form.EditPreviewDiff) { treePath := ctx.Repo.TreePath entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treePath) @@ -306,7 +306,7 @@ func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) { return } - diff, err := ctx.Repo.Repository.GetDiffPreview(ctx.Repo.BranchName, treePath, form.Content) + diff, err := ctx.Repo.Repository.GetDiffPreview(ctx.Repo.BranchName, treePath, f.Content) if err != nil { ctx.Error(500, "GetDiffPreview: "+err.Error()) return @@ -332,7 +332,7 @@ func DeleteFile(ctx *context.Context) { ctx.HTML(200, DELETE_FILE) } -func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { +func DeleteFilePost(ctx *context.Context, f form.DeleteRepoFile) { ctx.Data["PageIsDelete"] = true ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchName ctx.Data["TreePath"] = ctx.Repo.TreePath @@ -340,12 +340,12 @@ func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { oldBranchName := ctx.Repo.BranchName branchName := oldBranchName - if form.IsNewBrnach() { - branchName = form.NewBranchName + if f.IsNewBrnach() { + branchName = f.NewBranchName } - ctx.Data["commit_summary"] = form.CommitSummary - ctx.Data["commit_message"] = form.CommitMessage - ctx.Data["commit_choice"] = form.CommitChoice + ctx.Data["commit_summary"] = f.CommitSummary + ctx.Data["commit_message"] = f.CommitMessage + ctx.Data["commit_choice"] = f.CommitChoice ctx.Data["new_branch_name"] = branchName if ctx.HasError() { @@ -356,19 +356,19 @@ func DeleteFilePost(ctx *context.Context, form auth.DeleteRepoFileForm) { if oldBranchName != branchName { if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { ctx.Data["Err_NewBranchName"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), DELETE_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), DELETE_FILE, &f) return } } - message := strings.TrimSpace(form.CommitSummary) + message := strings.TrimSpace(f.CommitSummary) if len(message) == 0 { message = ctx.Tr("repo.editor.delete", ctx.Repo.TreePath) } - form.CommitMessage = strings.TrimSpace(form.CommitMessage) - if len(form.CommitMessage) > 0 { - message += "\n\n" + form.CommitMessage + f.CommitMessage = strings.TrimSpace(f.CommitMessage) + if len(f.CommitMessage) > 0 { + message += "\n\n" + f.CommitMessage } if err := ctx.Repo.Repository.DeleteRepoFile(ctx.User, models.DeleteRepoFileOptions{ @@ -418,31 +418,31 @@ func UploadFile(ctx *context.Context) { ctx.HTML(200, UPLOAD_FILE) } -func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { +func UploadFilePost(ctx *context.Context, f form.UploadRepoFile) { ctx.Data["PageIsUpload"] = true renderUploadSettings(ctx) oldBranchName := ctx.Repo.BranchName branchName := oldBranchName - if form.IsNewBrnach() { - branchName = form.NewBranchName + if f.IsNewBrnach() { + branchName = f.NewBranchName } - form.TreePath = strings.Trim(form.TreePath, " /") - treeNames, treePaths := getParentTreeFields(form.TreePath) + f.TreePath = strings.Trim(f.TreePath, " /") + treeNames, treePaths := getParentTreeFields(f.TreePath) if len(treeNames) == 0 { // We must at least have one element for user to input. treeNames = []string{""} } - ctx.Data["TreePath"] = form.TreePath + ctx.Data["TreePath"] = f.TreePath ctx.Data["TreeNames"] = treeNames ctx.Data["TreePaths"] = treePaths ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + branchName - ctx.Data["commit_summary"] = form.CommitSummary - ctx.Data["commit_message"] = form.CommitMessage - ctx.Data["commit_choice"] = form.CommitChoice + ctx.Data["commit_summary"] = f.CommitSummary + ctx.Data["commit_message"] = f.CommitMessage + ctx.Data["commit_choice"] = f.CommitChoice ctx.Data["new_branch_name"] = branchName if ctx.HasError() { @@ -453,7 +453,7 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { if oldBranchName != branchName { if _, err := ctx.Repo.Repository.GetBranch(branchName); err == nil { ctx.Data["Err_NewBranchName"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), UPLOAD_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.branch_already_exists", branchName), UPLOAD_FILE, &f) return } } @@ -475,38 +475,38 @@ func UploadFilePost(ctx *context.Context, form auth.UploadRepoFileForm) { // User can only upload files to a directory. if !entry.IsDir() { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), UPLOAD_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.directory_is_a_file", part), UPLOAD_FILE, &f) return } } - message := strings.TrimSpace(form.CommitSummary) + message := strings.TrimSpace(f.CommitSummary) if len(message) == 0 { - message = ctx.Tr("repo.editor.upload_files_to_dir", form.TreePath) + message = ctx.Tr("repo.editor.upload_files_to_dir", f.TreePath) } - form.CommitMessage = strings.TrimSpace(form.CommitMessage) - if len(form.CommitMessage) > 0 { - message += "\n\n" + form.CommitMessage + f.CommitMessage = strings.TrimSpace(f.CommitMessage) + if len(f.CommitMessage) > 0 { + message += "\n\n" + f.CommitMessage } if err := ctx.Repo.Repository.UploadRepoFiles(ctx.User, models.UploadRepoFileOptions{ LastCommitID: ctx.Repo.CommitID, OldBranch: oldBranchName, NewBranch: branchName, - TreePath: form.TreePath, + TreePath: f.TreePath, Message: message, - Files: form.Files, + Files: f.Files, }); err != nil { ctx.Data["Err_TreePath"] = true - ctx.RenderWithErr(ctx.Tr("repo.editor.unable_to_upload_files", form.TreePath, err), UPLOAD_FILE, &form) + ctx.RenderWithErr(ctx.Tr("repo.editor.unable_to_upload_files", f.TreePath, err), UPLOAD_FILE, &f) return } if form.IsNewBrnach() && ctx.Repo.PullRequest.Allowed { ctx.Redirect(ctx.Repo.PullRequestURL(oldBranchName, form.NewBranchName)) } else { - ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + form.TreePath) + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + f.TreePath) } } @@ -553,17 +553,17 @@ func UploadFileToServer(ctx *context.Context) { }) } -func RemoveUploadFileFromServer(ctx *context.Context, form auth.RemoveUploadFileForm) { - if len(form.File) == 0 { +func RemoveUploadFileFromServer(ctx *context.Context, f form.RemoveUploadFile) { + if len(f.File) == 0 { ctx.Status(204) return } - if err := models.DeleteUploadByUUID(form.File); err != nil { + if err := models.DeleteUploadByUUID(f.File); err != nil { ctx.Error(500, fmt.Sprintf("DeleteUploadByUUID: %v", err)) return } - log.Trace("Upload file removed: %s", form.File) + log.Trace("Upload file removed: %s", f.File) ctx.Status(204) } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 3884b31c..09f369de 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -19,9 +19,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/markdown" "github.com/gogits/gogs/modules/setting" ) @@ -348,7 +348,7 @@ func NewIssue(ctx *context.Context) { ctx.HTML(200, ISSUE_NEW) } -func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64, int64, int64) { +func ValidateRepoMetas(ctx *context.Context, f form.CreateIssue) ([]int64, int64, int64) { var ( repo = ctx.Repo.Repository err error @@ -364,7 +364,7 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 } // Check labels. - labelIDs := base.StringsToInt64s(strings.Split(form.LabelIDs, ",")) + labelIDs := base.StringsToInt64s(strings.Split(f.LabelIDs, ",")) labelIDMark := base.Int64sToMap(labelIDs) hasSelected := false for i := range labels { @@ -374,11 +374,11 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 } } ctx.Data["HasSelectedLabel"] = hasSelected - ctx.Data["label_ids"] = form.LabelIDs + ctx.Data["label_ids"] = f.LabelIDs ctx.Data["Labels"] = labels // Check milestone. - milestoneID := form.MilestoneID + milestoneID := f.MilestoneID if milestoneID > 0 { ctx.Data["Milestone"], err = repo.GetMilestoneByID(milestoneID) if err != nil { @@ -389,7 +389,7 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 } // Check assignee. - assigneeID := form.AssigneeID + assigneeID := f.AssigneeID if assigneeID > 0 { ctx.Data["Assignee"], err = repo.GetAssigneeByID(assigneeID) if err != nil { @@ -402,7 +402,7 @@ func ValidateRepoMetas(ctx *context.Context, form auth.CreateIssueForm) ([]int64 return labelIDs, milestoneID, assigneeID } -func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { +func NewIssuePost(ctx *context.Context, f form.CreateIssue) { ctx.Data["Title"] = ctx.Tr("repo.issues.new") ctx.Data["PageIsIssueList"] = true ctx.Data["RequireHighlightJS"] = true @@ -414,13 +414,13 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { attachments []string ) - labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, form) + labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, f) if ctx.Written() { return } if setting.AttachmentEnabled { - attachments = form.Files + attachments = f.Files } if ctx.HasError() { @@ -430,12 +430,12 @@ func NewIssuePost(ctx *context.Context, form auth.CreateIssueForm) { issue := &models.Issue{ RepoID: repo.ID, - Title: form.Title, + Title: f.Title, PosterID: ctx.User.ID, Poster: ctx.User, MilestoneID: milestoneID, AssigneeID: assigneeID, - Content: form.Content, + Content: f.Content, } if err := models.NewIssue(repo, issue, labelIDs, attachments); err != nil { ctx.Handle(500, "NewIssue", err) @@ -805,7 +805,7 @@ func UpdateIssueAssignee(ctx *context.Context) { }) } -func NewComment(ctx *context.Context, form auth.CreateCommentForm) { +func NewComment(ctx *context.Context, f form.CreateComment) { issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index")) if err != nil { ctx.NotFoundOrServerError("GetIssueByIndex", models.IsErrIssueNotExist, err) @@ -814,7 +814,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { var attachments []string if setting.AttachmentEnabled { - attachments = form.Files + attachments = f.Files } if ctx.HasError() { @@ -827,13 +827,13 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { defer func() { // Check if issue admin/poster changes the status of issue. if (ctx.Repo.IsWriter() || (ctx.IsSigned && issue.IsPoster(ctx.User.ID))) && - (form.Status == "reopen" || form.Status == "close") && + (f.Status == "reopen" || f.Status == "close") && !(issue.IsPull && issue.PullRequest.HasMerged) { // Duplication and conflict check should apply to reopen pull request. var pr *models.PullRequest - if form.Status == "reopen" && issue.IsPull { + if f.Status == "reopen" && issue.IsPull { pull := issue.PullRequest pr, err = models.GetUnmergedPullRequest(pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch) if err != nil { @@ -857,7 +857,7 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { if pr != nil { ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index)) } else { - if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, form.Status == "close"); err != nil { + if err = issue.ChangeStatus(ctx.User, ctx.Repo.Repository, f.Status == "close"); err != nil { log.Error(4, "ChangeStatus: %v", err) } else { log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed) @@ -878,11 +878,11 @@ func NewComment(ctx *context.Context, form auth.CreateCommentForm) { }() // Fix #321: Allow empty comments, as long as we have attachments. - if len(form.Content) == 0 && len(attachments) == 0 { + if len(f.Content) == 0 && len(attachments) == 0 { return } - comment, err = models.CreateIssueComment(ctx.User, ctx.Repo.Repository, issue, form.Content, attachments) + comment, err = models.CreateIssueComment(ctx.User, ctx.Repo.Repository, issue, f.Content, attachments) if err != nil { ctx.Handle(500, "CreateIssueComment", err) return @@ -955,14 +955,14 @@ func Labels(ctx *context.Context) { ctx.HTML(200, LABELS) } -func InitializeLabels(ctx *context.Context, form auth.InitializeLabelsForm) { +func InitializeLabels(ctx *context.Context, f form.InitializeLabels) { if ctx.HasError() { ctx.Redirect(ctx.Repo.RepoLink + "/labels") return } - list, err := models.GetLabelTemplateFile(form.TemplateName) + list, err := models.GetLabelTemplateFile(f.TemplateName) if err != nil { - ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, err)) + ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", f.TemplateName, err)) ctx.Redirect(ctx.Repo.RepoLink + "/labels") return } @@ -982,7 +982,7 @@ func InitializeLabels(ctx *context.Context, form auth.InitializeLabelsForm) { ctx.Redirect(ctx.Repo.RepoLink + "/labels") } -func NewLabel(ctx *context.Context, form auth.CreateLabelForm) { +func NewLabel(ctx *context.Context, f form.CreateLabel) { ctx.Data["Title"] = ctx.Tr("repo.labels") ctx.Data["PageIsLabels"] = true @@ -994,8 +994,8 @@ func NewLabel(ctx *context.Context, form auth.CreateLabelForm) { l := &models.Label{ RepoID: ctx.Repo.Repository.ID, - Name: form.Title, - Color: form.Color, + Name: f.Title, + Color: f.Color, } if err := models.NewLabels(l); err != nil { ctx.Handle(500, "NewLabel", err) @@ -1004,8 +1004,8 @@ func NewLabel(ctx *context.Context, form auth.CreateLabelForm) { ctx.Redirect(ctx.Repo.RepoLink + "/labels") } -func UpdateLabel(ctx *context.Context, form auth.CreateLabelForm) { - l, err := models.GetLabelByID(form.ID) +func UpdateLabel(ctx *context.Context, f form.CreateLabel) { + l, err := models.GetLabelByID(f.ID) if err != nil { switch { case models.IsErrLabelNotExist(err): @@ -1016,8 +1016,8 @@ func UpdateLabel(ctx *context.Context, form auth.CreateLabelForm) { return } - l.Name = form.Title - l.Color = form.Color + l.Name = f.Title + l.Color = f.Color if err := models.UpdateLabel(l); err != nil { ctx.Handle(500, "UpdateLabel", err) return @@ -1090,7 +1090,7 @@ func NewMilestone(ctx *context.Context) { ctx.HTML(200, MILESTONE_NEW) } -func NewMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { +func NewMilestonePost(ctx *context.Context, f form.CreateMilestone) { ctx.Data["Title"] = ctx.Tr("repo.milestones.new") ctx.Data["PageIsIssueList"] = true ctx.Data["PageIsMilestones"] = true @@ -1102,27 +1102,27 @@ func NewMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { return } - if len(form.Deadline) == 0 { - form.Deadline = "9999-12-31" + if len(f.Deadline) == 0 { + f.Deadline = "9999-12-31" } - deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local) + deadline, err := time.ParseInLocation("2006-01-02", f.Deadline, time.Local) if err != nil { ctx.Data["Err_Deadline"] = true - ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form) + ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &f) return } if err = models.NewMilestone(&models.Milestone{ RepoID: ctx.Repo.Repository.ID, - Name: form.Title, - Content: form.Content, + Name: f.Title, + Content: f.Content, Deadline: deadline, }); err != nil { ctx.Handle(500, "NewMilestone", err) return } - ctx.Flash.Success(ctx.Tr("repo.milestones.create_success", form.Title)) + ctx.Flash.Success(ctx.Tr("repo.milestones.create_success", f.Title)) ctx.Redirect(ctx.Repo.RepoLink + "/milestones") } @@ -1150,7 +1150,7 @@ func EditMilestone(ctx *context.Context) { ctx.HTML(200, MILESTONE_NEW) } -func EditMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { +func EditMilestonePost(ctx *context.Context, f form.CreateMilestone) { ctx.Data["Title"] = ctx.Tr("repo.milestones.edit") ctx.Data["PageIsMilestones"] = true ctx.Data["PageIsEditMilestone"] = true @@ -1162,13 +1162,13 @@ func EditMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { return } - if len(form.Deadline) == 0 { - form.Deadline = "9999-12-31" + if len(f.Deadline) == 0 { + f.Deadline = "9999-12-31" } - deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local) + deadline, err := time.ParseInLocation("2006-01-02", f.Deadline, time.Local) if err != nil { ctx.Data["Err_Deadline"] = true - ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form) + ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &f) return } @@ -1181,8 +1181,8 @@ func EditMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) { } return } - m.Name = form.Title - m.Content = form.Content + m.Name = f.Title + m.Content = f.Content m.Deadline = deadline if err = models.UpdateMilestone(m); err != nil { ctx.Handle(500, "UpdateMilestone", err) diff --git a/routers/repo/pull.go b/routers/repo/pull.go index f9b8866e..64f77c2c 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -15,9 +15,9 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" ) @@ -85,7 +85,7 @@ func Fork(ctx *context.Context) { ctx.HTML(200, FORK) } -func ForkPost(ctx *context.Context, form auth.CreateRepoForm) { +func ForkPost(ctx *context.Context, f form.CreateRepo) { ctx.Data["Title"] = ctx.Tr("new_fork") forkRepo := getForkRepository(ctx) @@ -93,7 +93,7 @@ func ForkPost(ctx *context.Context, form auth.CreateRepoForm) { return } - ctxUser := checkContextUser(ctx, form.Uid) + ctxUser := checkContextUser(ctx, f.Uid) if ctx.Written() { return } @@ -120,20 +120,20 @@ func ForkPost(ctx *context.Context, form auth.CreateRepoForm) { // Cannot fork to same owner if ctxUser.ID == forkRepo.OwnerID { - ctx.RenderWithErr(ctx.Tr("repo.settings.cannot_fork_to_same_owner"), FORK, &form) + ctx.RenderWithErr(ctx.Tr("repo.settings.cannot_fork_to_same_owner"), FORK, &f) return } - repo, err := models.ForkRepository(ctxUser, forkRepo, form.RepoName, form.Description) + repo, err := models.ForkRepository(ctxUser, forkRepo, f.RepoName, f.Description) if err != nil { ctx.Data["Err_RepoName"] = true switch { case models.IsErrRepoAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), FORK, &form) + ctx.RenderWithErr(ctx.Tr("repo.settings.new_owner_has_same_repo"), FORK, &f) case models.IsErrNameReserved(err): - ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), FORK, &form) + ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), FORK, &f) case models.IsErrNamePatternNotAllowed(err): - ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), FORK, &form) + ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), FORK, &f) default: ctx.Handle(500, "ForkPost", err) } @@ -636,7 +636,7 @@ func CompareAndPullRequest(ctx *context.Context) { ctx.HTML(200, COMPARE_PULL) } -func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) { +func CompareAndPullRequestPost(ctx *context.Context, f form.CreateIssue) { ctx.Data["Title"] = ctx.Tr("repo.pulls.compare_changes") ctx.Data["PageIsComparePull"] = true ctx.Data["IsDiffCompare"] = true @@ -653,17 +653,17 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) return } - labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, form) + labelIDs, milestoneID, assigneeID := ValidateRepoMetas(ctx, f) if ctx.Written() { return } if setting.AttachmentEnabled { - attachments = form.Files + attachments = f.Files } if ctx.HasError() { - auth.AssignForm(form, ctx.Data) + form.Assign(f, ctx.Data) // This stage is already stop creating new pull request, so it does not matter if it has // something to compare or not. @@ -685,13 +685,13 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) pullIssue := &models.Issue{ RepoID: repo.ID, Index: repo.NextIssueIndex(), - Title: form.Title, + Title: f.Title, PosterID: ctx.User.ID, Poster: ctx.User, MilestoneID: milestoneID, AssigneeID: assigneeID, IsPull: true, - Content: form.Content, + Content: f.Content, } pullRequest := &models.PullRequest{ HeadRepoID: headRepo.ID, diff --git a/routers/repo/release.go b/routers/repo/release.go index bf58cdcc..7d35b318 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -10,9 +10,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/markdown" ) @@ -150,7 +150,7 @@ func NewRelease(ctx *context.Context) { ctx.HTML(200, RELEASE_NEW) } -func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) { +func NewReleasePost(ctx *context.Context, f form.NewRelease) { ctx.Data["Title"] = ctx.Tr("repo.release.new_release") ctx.Data["PageIsReleaseList"] = true @@ -159,13 +159,13 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) { return } - if !ctx.Repo.GitRepo.IsBranchExist(form.Target) { - ctx.RenderWithErr(ctx.Tr("form.target_branch_not_exist"), RELEASE_NEW, &form) + if !ctx.Repo.GitRepo.IsBranchExist(f.Target) { + ctx.RenderWithErr(ctx.Tr("form.target_branch_not_exist"), RELEASE_NEW, &f) return } var tagCreatedUnix int64 - tag, err := ctx.Repo.GitRepo.GetTag(form.TagName) + tag, err := ctx.Repo.GitRepo.GetTag(f.TagName) if err == nil { commit, err := tag.Commit() if err == nil { @@ -173,7 +173,7 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) { } } - commit, err := ctx.Repo.GitRepo.GetBranchCommit(form.Target) + commit, err := ctx.Repo.GitRepo.GetBranchCommit(f.Target) if err != nil { ctx.Handle(500, "GetBranchCommit", err) return @@ -188,14 +188,14 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) { rel := &models.Release{ RepoID: ctx.Repo.Repository.ID, PublisherID: ctx.User.ID, - Title: form.Title, - TagName: form.TagName, - Target: form.Target, + Title: f.Title, + TagName: f.TagName, + Target: f.Target, Sha1: commit.ID.String(), NumCommits: commitsCount, - Note: form.Content, - IsDraft: len(form.Draft) > 0, - IsPrerelease: form.Prerelease, + Note: f.Content, + IsDraft: len(f.Draft) > 0, + IsPrerelease: f.Prerelease, CreatedUnix: tagCreatedUnix, } @@ -203,15 +203,15 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) { ctx.Data["Err_TagName"] = true switch { case models.IsErrReleaseAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("repo.release.tag_name_already_exist"), RELEASE_NEW, &form) + ctx.RenderWithErr(ctx.Tr("repo.release.tag_name_already_exist"), RELEASE_NEW, &f) case models.IsErrInvalidTagName(err): - ctx.RenderWithErr(ctx.Tr("repo.release.tag_name_invalid"), RELEASE_NEW, &form) + ctx.RenderWithErr(ctx.Tr("repo.release.tag_name_invalid"), RELEASE_NEW, &f) default: ctx.Handle(500, "CreateRelease", err) } return } - log.Trace("Release created: %s/%s:%s", ctx.User.LowerName, ctx.Repo.Repository.Name, form.TagName) + log.Trace("Release created: %s/%s:%s", ctx.User.LowerName, ctx.Repo.Repository.Name, f.TagName) ctx.Redirect(ctx.Repo.RepoLink + "/releases") } @@ -242,7 +242,7 @@ func EditRelease(ctx *context.Context) { ctx.HTML(200, RELEASE_NEW) } -func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) { +func EditReleasePost(ctx *context.Context, f form.EditRelease) { ctx.Data["Title"] = ctx.Tr("repo.release.edit_release") ctx.Data["PageIsReleaseList"] = true ctx.Data["PageIsEditRelease"] = true @@ -269,10 +269,10 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) { return } - rel.Title = form.Title - rel.Note = form.Content - rel.IsDraft = len(form.Draft) > 0 - rel.IsPrerelease = form.Prerelease + rel.Title = f.Title + rel.Note = f.Content + rel.IsDraft = len(f.Draft) > 0 + rel.IsPrerelease = f.Prerelease if err = models.UpdateRelease(ctx.Repo.GitRepo, rel); err != nil { ctx.Handle(500, "UpdateRelease", err) return diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 8f119f40..ca862a13 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -16,9 +16,9 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" ) @@ -102,14 +102,14 @@ func handleCreateError(ctx *context.Context, owner *models.User, err error, name } } -func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { +func CreatePost(ctx *context.Context, f form.CreateRepo) { ctx.Data["Title"] = ctx.Tr("new_repo") ctx.Data["Gitignores"] = models.Gitignores ctx.Data["Licenses"] = models.Licenses ctx.Data["Readmes"] = models.Readmes - ctxUser := checkContextUser(ctx, form.Uid) + ctxUser := checkContextUser(ctx, f.Uid) if ctx.Written() { return } @@ -121,13 +121,13 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { } repo, err := models.CreateRepository(ctxUser, models.CreateRepoOptions{ - Name: form.RepoName, - Description: form.Description, - Gitignores: form.Gitignores, - License: form.License, - Readme: form.Readme, - IsPrivate: form.Private || setting.Repository.ForcePrivate, - AutoInit: form.AutoInit, + Name: f.RepoName, + Description: f.Description, + Gitignores: f.Gitignores, + License: f.License, + Readme: f.Readme, + IsPrivate: f.Private || setting.Repository.ForcePrivate, + AutoInit: f.AutoInit, }) if err == nil { log.Trace("Repository created [%d]: %s/%s", repo.ID, ctxUser.Name, repo.Name) @@ -141,7 +141,7 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) { } } - handleCreateError(ctx, ctxUser, err, "CreatePost", CREATE, &form) + handleCreateError(ctx, ctxUser, err, "CreatePost", CREATE, &f) } func Migrate(ctx *context.Context) { @@ -159,10 +159,10 @@ func Migrate(ctx *context.Context) { ctx.HTML(200, MIGRATE) } -func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { +func MigratePost(ctx *context.Context, f form.MigrateRepo) { ctx.Data["Title"] = ctx.Tr("new_migrate") - ctxUser := checkContextUser(ctx, form.Uid) + ctxUser := checkContextUser(ctx, f.Uid) if ctx.Written() { return } @@ -173,18 +173,18 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { return } - remoteAddr, err := form.ParseRemoteAddr(ctx.User) + remoteAddr, err := f.ParseRemoteAddr(ctx.User) if err != nil { if models.IsErrInvalidCloneAddr(err) { ctx.Data["Err_CloneAddr"] = true addrErr := err.(models.ErrInvalidCloneAddr) switch { case addrErr.IsURLError: - ctx.RenderWithErr(ctx.Tr("form.url_error"), MIGRATE, &form) + ctx.RenderWithErr(ctx.Tr("form.url_error"), MIGRATE, &f) case addrErr.IsPermissionDenied: - ctx.RenderWithErr(ctx.Tr("repo.migrate.permission_denied"), MIGRATE, &form) + ctx.RenderWithErr(ctx.Tr("repo.migrate.permission_denied"), MIGRATE, &f) case addrErr.IsInvalidPath: - ctx.RenderWithErr(ctx.Tr("repo.migrate.invalid_local_path"), MIGRATE, &form) + ctx.RenderWithErr(ctx.Tr("repo.migrate.invalid_local_path"), MIGRATE, &f) default: ctx.Handle(500, "Unknown error", err) } @@ -195,15 +195,15 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { } repo, err := models.MigrateRepository(ctxUser, models.MigrateRepoOptions{ - Name: form.RepoName, - Description: form.Description, - IsPrivate: form.Private || setting.Repository.ForcePrivate, - IsMirror: form.Mirror, + Name: f.RepoName, + Description: f.Description, + IsPrivate: f.Private || setting.Repository.ForcePrivate, + IsMirror: f.Mirror, RemoteAddr: remoteAddr, }) if err == nil { - log.Trace("Repository migrated [%d]: %s/%s", repo.ID, ctxUser.Name, form.RepoName) - ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + form.RepoName) + log.Trace("Repository migrated [%d]: %s/%s", repo.ID, ctxUser.Name, f.RepoName) + ctx.Redirect(setting.AppSubUrl + "/" + ctxUser.Name + "/" + f.RepoName) return } @@ -216,15 +216,15 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) { if strings.Contains(err.Error(), "Authentication failed") || strings.Contains(err.Error(), "could not read Username") { ctx.Data["Err_Auth"] = true - ctx.RenderWithErr(ctx.Tr("form.auth_failed", models.HandleCloneUserCredentials(err.Error(), true)), MIGRATE, &form) + ctx.RenderWithErr(ctx.Tr("form.auth_failed", models.HandleCloneUserCredentials(err.Error(), true)), MIGRATE, &f) return } else if strings.Contains(err.Error(), "fatal:") { ctx.Data["Err_CloneAddr"] = true - ctx.RenderWithErr(ctx.Tr("repo.migrate.failed", models.HandleCloneUserCredentials(err.Error(), true)), MIGRATE, &form) + ctx.RenderWithErr(ctx.Tr("repo.migrate.failed", models.HandleCloneUserCredentials(err.Error(), true)), MIGRATE, &f) return } - handleCreateError(ctx, ctxUser, err, "MigratePost", MIGRATE, &form) + handleCreateError(ctx, ctxUser, err, "MigratePost", MIGRATE, &f) } func Action(ctx *context.Context) { diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 0dca950a..a6a446ff 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -14,9 +14,9 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/setting" ) @@ -37,7 +37,7 @@ func Settings(ctx *context.Context) { ctx.HTML(200, SETTINGS_OPTIONS) } -func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { +func SettingsPost(ctx *context.Context, f form.RepoSetting) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsOptions"] = true @@ -52,7 +52,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { isNameChanged := false oldRepoName := repo.Name - newRepoName := form.RepoName + newRepoName := f.RepoName // Check if repository name has been changed. if repo.LowerName != strings.ToLower(newRepoName) { isNameChanged = true @@ -60,11 +60,11 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Data["Err_RepoName"] = true switch { case models.IsErrRepoAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), SETTINGS_OPTIONS, &form) + ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), SETTINGS_OPTIONS, &f) case models.IsErrNameReserved(err): - ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), SETTINGS_OPTIONS, &form) + ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), SETTINGS_OPTIONS, &f) case models.IsErrNamePatternNotAllowed(err): - ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), SETTINGS_OPTIONS, &form) + ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), SETTINGS_OPTIONS, &f) default: ctx.Handle(500, "ChangeRepositoryName", err) } @@ -77,16 +77,16 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { repo.Name = newRepoName repo.LowerName = strings.ToLower(newRepoName) - repo.Description = form.Description - repo.Website = form.Website + repo.Description = f.Description + repo.Website = f.Website // Visibility of forked repository is forced sync with base repository. if repo.IsFork { - form.Private = repo.BaseRepo.IsPrivate + f.Private = repo.BaseRepo.IsPrivate } - visibilityChanged := repo.IsPrivate != form.Private - repo.IsPrivate = form.Private + visibilityChanged := repo.IsPrivate != f.Private + repo.IsPrivate = f.Private if err := models.UpdateRepository(repo, visibilityChanged); err != nil { ctx.Handle(500, "UpdateRepository", err) return @@ -108,16 +108,16 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { return } - if form.Interval > 0 { - ctx.Repo.Mirror.EnablePrune = form.EnablePrune - ctx.Repo.Mirror.Interval = form.Interval - ctx.Repo.Mirror.NextUpdate = time.Now().Add(time.Duration(form.Interval) * time.Hour) + if f.Interval > 0 { + ctx.Repo.Mirror.EnablePrune = f.EnablePrune + ctx.Repo.Mirror.Interval = f.Interval + ctx.Repo.Mirror.NextUpdate = time.Now().Add(time.Duration(f.Interval) * time.Hour) if err := models.UpdateMirror(ctx.Repo.Mirror); err != nil { ctx.Handle(500, "UpdateMirror", err) return } } - if err := ctx.Repo.Mirror.SaveAddress(form.MirrorAddress); err != nil { + if err := ctx.Repo.Mirror.SaveAddress(f.MirrorAddress); err != nil { ctx.Handle(500, "SaveAddress", err) return } @@ -136,15 +136,15 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Redirect(repo.Link() + "/settings") case "advanced": - repo.EnableWiki = form.EnableWiki - repo.EnableExternalWiki = form.EnableExternalWiki - repo.ExternalWikiURL = form.ExternalWikiURL - repo.EnableIssues = form.EnableIssues - repo.EnableExternalTracker = form.EnableExternalTracker - repo.ExternalTrackerURL = form.ExternalTrackerURL - repo.ExternalTrackerFormat = form.TrackerURLFormat - repo.ExternalTrackerStyle = form.TrackerIssueStyle - repo.EnablePulls = form.EnablePulls + repo.EnableWiki = f.EnableWiki + repo.EnableExternalWiki = f.EnableExternalWiki + repo.ExternalWikiURL = f.ExternalWikiURL + repo.EnableIssues = f.EnableIssues + repo.EnableExternalTracker = f.EnableExternalTracker + repo.ExternalTrackerURL = f.ExternalTrackerURL + repo.ExternalTrackerFormat = f.TrackerURLFormat + repo.ExternalTrackerStyle = f.TrackerIssueStyle + repo.EnablePulls = f.EnablePulls if err := models.UpdateRepository(repo, false); err != nil { ctx.Handle(500, "UpdateRepository", err) @@ -160,7 +160,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Error(404) return } - if repo.Name != form.RepoName { + if repo.Name != f.RepoName { ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil) return } @@ -194,7 +194,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Error(404) return } - if repo.Name != form.RepoName { + if repo.Name != f.RepoName { ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil) return } @@ -233,7 +233,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Error(404) return } - if repo.Name != form.RepoName { + if repo.Name != f.RepoName { ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil) return } @@ -259,7 +259,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Error(404) return } - if repo.Name != form.RepoName { + if repo.Name != f.RepoName { ctx.RenderWithErr(ctx.Tr("form.enterred_invalid_repo_name"), SETTINGS_OPTIONS, nil) return } @@ -444,7 +444,7 @@ func SettingsProtectedBranch(ctx *context.Context) { ctx.HTML(200, SETTINGS_PROTECTED_BRANCH) } -func SettingsProtectedBranchPost(ctx *context.Context, form auth.ProtectBranchForm) { +func SettingsProtectedBranchPost(ctx *context.Context, f form.ProtectBranch) { branch := ctx.Params("*") if !ctx.Repo.GitRepo.IsBranchExist(branch) { ctx.NotFound() @@ -465,11 +465,11 @@ func SettingsProtectedBranchPost(ctx *context.Context, form auth.ProtectBranchFo } } - protectBranch.Protected = form.Protected - protectBranch.RequirePullRequest = form.RequirePullRequest - protectBranch.EnableWhitelist = form.EnableWhitelist + protectBranch.Protected = f.Protected + protectBranch.RequirePullRequest = f.RequirePullRequest + protectBranch.EnableWhitelist = f.EnableWhitelist if ctx.Repo.Owner.IsOrganization() { - err = models.UpdateOrgProtectBranch(ctx.Repo.Repository, protectBranch, form.WhitelistUsers, form.WhitelistTeams) + err = models.UpdateOrgProtectBranch(ctx.Repo.Repository, protectBranch, f.WhitelistUsers, f.WhitelistTeams) } else { err = models.UpdateProtectBranch(protectBranch) } @@ -547,7 +547,7 @@ func SettingsDeployKeys(ctx *context.Context) { ctx.HTML(200, SETTINGS_DEPLOY_KEYS) } -func SettingsDeployKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) { +func SettingsDeployKeysPost(ctx *context.Context, f form.AddSSHKey) { ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys") ctx.Data["PageIsSettingsKeys"] = true @@ -563,7 +563,7 @@ func SettingsDeployKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) { return } - content, err := models.CheckPublicKeyString(form.Content) + content, err := models.CheckPublicKeyString(f.Content) if err != nil { if models.IsErrKeyUnableVerify(err) { ctx.Flash.Info(ctx.Tr("form.unable_verify_ssh_key")) @@ -576,16 +576,16 @@ func SettingsDeployKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) { } } - key, err := models.AddDeployKey(ctx.Repo.Repository.ID, form.Title, content) + key, err := models.AddDeployKey(ctx.Repo.Repository.ID, f.Title, content) if err != nil { ctx.Data["HasError"] = true switch { case models.IsErrKeyAlreadyExist(err): ctx.Data["Err_Content"] = true - ctx.RenderWithErr(ctx.Tr("repo.settings.key_been_used"), SETTINGS_DEPLOY_KEYS, &form) + ctx.RenderWithErr(ctx.Tr("repo.settings.key_been_used"), SETTINGS_DEPLOY_KEYS, &f) case models.IsErrKeyNameAlreadyUsed(err): ctx.Data["Err_Title"] = true - ctx.RenderWithErr(ctx.Tr("repo.settings.key_name_used"), SETTINGS_DEPLOY_KEYS, &form) + ctx.RenderWithErr(ctx.Tr("repo.settings.key_name_used"), SETTINGS_DEPLOY_KEYS, &f) default: ctx.Handle(500, "AddDeployKey", err) } diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 07b9432b..63059a09 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -16,9 +16,9 @@ import ( api "github.com/gogits/go-gogs-client" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/setting" ) @@ -103,20 +103,20 @@ func WebhooksNew(ctx *context.Context) { ctx.HTML(200, orCtx.NewTemplate) } -func ParseHookEvent(form auth.WebhookForm) *models.HookEvent { +func ParseHookEvent(f form.Webhook) *models.HookEvent { return &models.HookEvent{ - PushOnly: form.PushOnly(), - SendEverything: form.SendEverything(), - ChooseEvents: form.ChooseEvents(), + PushOnly: f.PushOnly(), + SendEverything: f.SendEverything(), + ChooseEvents: f.ChooseEvents(), HookEvents: models.HookEvents{ - Create: form.Create, - Push: form.Push, - PullRequest: form.PullRequest, + Create: f.Create, + Push: f.Push, + PullRequest: f.PullRequest, }, } } -func WebHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) { +func WebHooksNewPost(ctx *context.Context, f form.NewWebhook) { ctx.Data["Title"] = ctx.Tr("repo.settings.add_webhook") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksNew"] = true @@ -136,17 +136,17 @@ func WebHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) { } contentType := models.JSON - if models.HookContentType(form.ContentType) == models.FORM { + if models.HookContentType(f.ContentType) == models.FORM { contentType = models.FORM } w := &models.Webhook{ RepoID: orCtx.RepoID, - URL: form.PayloadURL, + URL: f.PayloadURL, ContentType: contentType, - Secret: form.Secret, - HookEvent: ParseHookEvent(form.WebhookForm), - IsActive: form.Active, + Secret: f.Secret, + HookEvent: ParseHookEvent(f.Webhook), + IsActive: f.Active, HookTaskType: models.GOGS, OrgID: orCtx.OrgID, } @@ -162,7 +162,7 @@ func WebHooksNewPost(ctx *context.Context, form auth.NewWebhookForm) { ctx.Redirect(orCtx.Link + "/settings/hooks") } -func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { +func SlackHooksNewPost(ctx *context.Context, f form.NewSlackHook) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksNew"] = true @@ -180,10 +180,10 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { } meta, err := json.Marshal(&models.SlackMeta{ - Channel: form.Channel, - Username: form.Username, - IconURL: form.IconURL, - Color: form.Color, + Channel: f.Channel, + Username: f.Username, + IconURL: f.IconURL, + Color: f.Color, }) if err != nil { ctx.Handle(500, "Marshal", err) @@ -192,10 +192,10 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { w := &models.Webhook{ RepoID: orCtx.RepoID, - URL: form.PayloadURL, + URL: f.PayloadURL, ContentType: models.JSON, - HookEvent: ParseHookEvent(form.WebhookForm), - IsActive: form.Active, + HookEvent: ParseHookEvent(f.Webhook), + IsActive: f.Active, HookTaskType: models.SLACK, Meta: string(meta), OrgID: orCtx.OrgID, @@ -213,7 +213,7 @@ func SlackHooksNewPost(ctx *context.Context, form auth.NewSlackHookForm) { } // FIXME: merge logic to Slack -func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) { +func DiscordHooksNewPost(ctx *context.Context, f form.NewDiscordHook) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksNew"] = true @@ -231,9 +231,9 @@ func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) { } meta, err := json.Marshal(&models.SlackMeta{ - Username: form.Username, - IconURL: form.IconURL, - Color: form.Color, + Username: f.Username, + IconURL: f.IconURL, + Color: f.Color, }) if err != nil { ctx.Handle(500, "Marshal", err) @@ -242,10 +242,10 @@ func DiscordHooksNewPost(ctx *context.Context, form auth.NewDiscordHookForm) { w := &models.Webhook{ RepoID: orCtx.RepoID, - URL: form.PayloadURL, + URL: f.PayloadURL, ContentType: models.JSON, - HookEvent: ParseHookEvent(form.WebhookForm), - IsActive: form.Active, + HookEvent: ParseHookEvent(f.Webhook), + IsActive: f.Active, HookTaskType: models.DISCORD, Meta: string(meta), OrgID: orCtx.OrgID, @@ -319,7 +319,7 @@ func WebHooksEdit(ctx *context.Context) { ctx.HTML(200, orCtx.NewTemplate) } -func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) { +func WebHooksEditPost(ctx *context.Context, f form.NewWebhook) { ctx.Data["Title"] = ctx.Tr("repo.settings.update_webhook") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksEdit"] = true @@ -336,15 +336,15 @@ func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) { } contentType := models.JSON - if models.HookContentType(form.ContentType) == models.FORM { + if models.HookContentType(f.ContentType) == models.FORM { contentType = models.FORM } - w.URL = form.PayloadURL + w.URL = f.PayloadURL w.ContentType = contentType - w.Secret = form.Secret - w.HookEvent = ParseHookEvent(form.WebhookForm) - w.IsActive = form.Active + w.Secret = f.Secret + w.HookEvent = ParseHookEvent(f.Webhook) + w.IsActive = f.Active if err := w.UpdateEvent(); err != nil { ctx.Handle(500, "UpdateEvent", err) return @@ -357,7 +357,7 @@ func WebHooksEditPost(ctx *context.Context, form auth.NewWebhookForm) { ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", orCtx.Link, w.ID)) } -func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) { +func SlackHooksEditPost(ctx *context.Context, f form.NewSlackHook) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksEdit"] = true @@ -374,20 +374,20 @@ func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) { } meta, err := json.Marshal(&models.SlackMeta{ - Channel: form.Channel, - Username: form.Username, - IconURL: form.IconURL, - Color: form.Color, + Channel: f.Channel, + Username: f.Username, + IconURL: f.IconURL, + Color: f.Color, }) if err != nil { ctx.Handle(500, "Marshal", err) return } - w.URL = form.PayloadURL + w.URL = f.PayloadURL w.Meta = string(meta) - w.HookEvent = ParseHookEvent(form.WebhookForm) - w.IsActive = form.Active + w.HookEvent = ParseHookEvent(f.Webhook) + w.IsActive = f.Active if err := w.UpdateEvent(); err != nil { ctx.Handle(500, "UpdateEvent", err) return @@ -401,7 +401,7 @@ func SlackHooksEditPost(ctx *context.Context, form auth.NewSlackHookForm) { } // FIXME: merge logic to Slack -func DiscordHooksEditPost(ctx *context.Context, form auth.NewDiscordHookForm) { +func DiscordHooksEditPost(ctx *context.Context, f form.NewDiscordHook) { ctx.Data["Title"] = ctx.Tr("repo.settings") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["PageIsSettingsHooksEdit"] = true @@ -418,19 +418,19 @@ func DiscordHooksEditPost(ctx *context.Context, form auth.NewDiscordHookForm) { } meta, err := json.Marshal(&models.SlackMeta{ - Username: form.Username, - IconURL: form.IconURL, - Color: form.Color, + Username: f.Username, + IconURL: f.IconURL, + Color: f.Color, }) if err != nil { ctx.Handle(500, "Marshal", err) return } - w.URL = form.PayloadURL + w.URL = f.PayloadURL w.Meta = string(meta) - w.HookEvent = ParseHookEvent(form.WebhookForm) - w.IsActive = form.Active + w.HookEvent = ParseHookEvent(f.Webhook) + w.IsActive = f.Active if err := w.UpdateEvent(); err != nil { ctx.Handle(500, "UpdateEvent", err) return diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index d4bb4a12..df8d78a3 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -12,9 +12,9 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/markdown" ) @@ -198,7 +198,7 @@ func NewWiki(ctx *context.Context) { ctx.HTML(200, WIKI_NEW) } -func NewWikiPost(ctx *context.Context, form auth.NewWikiForm) { +func NewWikiPost(ctx *context.Context, f form.NewWiki) { ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") ctx.Data["PageIsWiki"] = true ctx.Data["RequireSimpleMDE"] = true @@ -208,17 +208,17 @@ func NewWikiPost(ctx *context.Context, form auth.NewWikiForm) { return } - if err := ctx.Repo.Repository.AddWikiPage(ctx.User, form.Title, form.Content, form.Message); err != nil { + if err := ctx.Repo.Repository.AddWikiPage(ctx.User, f.Title, f.Content, f.Message); err != nil { if models.IsErrWikiAlreadyExist(err) { ctx.Data["Err_Title"] = true - ctx.RenderWithErr(ctx.Tr("repo.wiki.page_already_exists"), WIKI_NEW, &form) + ctx.RenderWithErr(ctx.Tr("repo.wiki.page_already_exists"), WIKI_NEW, &f) } else { ctx.Handle(500, "AddWikiPage", err) } return } - ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + models.ToWikiPageURL(models.ToWikiPageName(form.Title))) + ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + models.ToWikiPageURL(models.ToWikiPageName(f.Title))) } func EditWiki(ctx *context.Context) { @@ -239,7 +239,7 @@ func EditWiki(ctx *context.Context) { ctx.HTML(200, WIKI_NEW) } -func EditWikiPost(ctx *context.Context, form auth.NewWikiForm) { +func EditWikiPost(ctx *context.Context, f form.NewWiki) { ctx.Data["Title"] = ctx.Tr("repo.wiki.new_page") ctx.Data["PageIsWiki"] = true ctx.Data["RequireSimpleMDE"] = true @@ -249,12 +249,12 @@ func EditWikiPost(ctx *context.Context, form auth.NewWikiForm) { return } - if err := ctx.Repo.Repository.EditWikiPage(ctx.User, form.OldTitle, form.Title, form.Content, form.Message); err != nil { + if err := ctx.Repo.Repository.EditWikiPage(ctx.User, f.OldTitle, f.Title, f.Content, f.Message); err != nil { ctx.Handle(500, "EditWikiPage", err) return } - ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + models.ToWikiPageURL(models.ToWikiPageName(form.Title))) + ctx.Redirect(ctx.Repo.RepoLink + "/wiki/" + models.ToWikiPageURL(models.ToWikiPageName(f.Title))) } func DeleteWikiPagePost(ctx *context.Context) { diff --git a/routers/user/auth.go b/routers/user/auth.go index 45ec1156..36aaa192 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -12,9 +12,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/setting" ) @@ -103,7 +103,7 @@ func SignIn(ctx *context.Context) { ctx.HTML(200, SIGNIN) } -func SignInPost(ctx *context.Context, form auth.SignInForm) { +func SignInPost(ctx *context.Context, f form.SignIn) { ctx.Data["Title"] = ctx.Tr("sign_in") if ctx.HasError() { @@ -111,17 +111,17 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) { return } - u, err := models.UserSignIn(form.UserName, form.Password) + u, err := models.UserSignIn(f.UserName, f.Password) if err != nil { if models.IsErrUserNotExist(err) { - ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), SIGNIN, &form) + ctx.RenderWithErr(ctx.Tr("form.username_password_incorrect"), SIGNIN, &f) } else { ctx.Handle(500, "UserSignIn", err) } return } - if form.Remember { + if f.Remember { days := 86400 * setting.LogInRememberDays ctx.SetCookie(setting.CookieUserName, u.Name, days, setting.AppSubUrl, "", setting.CookieSecure, true) ctx.SetSuperSecureCookie(u.Rands+u.Passwd, setting.CookieRememberName, u.Name, days, setting.AppSubUrl, "", setting.CookieSecure, true) @@ -169,7 +169,7 @@ func SignUp(ctx *context.Context) { ctx.HTML(200, SIGNUP) } -func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterForm) { +func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, f form.Register) { ctx.Data["Title"] = ctx.Tr("sign_up") ctx.Data["EnableCaptcha"] = setting.Service.EnableCaptcha @@ -186,36 +186,36 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo if setting.Service.EnableCaptcha && !cpt.VerifyReq(ctx.Req) { ctx.Data["Err_Captcha"] = true - ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), SIGNUP, &form) + ctx.RenderWithErr(ctx.Tr("form.captcha_incorrect"), SIGNUP, &f) return } - if form.Password != form.Retype { + if f.Password != f.Retype { ctx.Data["Err_Password"] = true - ctx.RenderWithErr(ctx.Tr("form.password_not_match"), SIGNUP, &form) + ctx.RenderWithErr(ctx.Tr("form.password_not_match"), SIGNUP, &f) return } u := &models.User{ - Name: form.UserName, - Email: form.Email, - Passwd: form.Password, + Name: f.UserName, + Email: f.Email, + Passwd: f.Password, IsActive: !setting.Service.RegisterEmailConfirm, } if err := models.CreateUser(u); err != nil { switch { case models.IsErrUserAlreadyExist(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SIGNUP, &form) + ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), SIGNUP, &f) case models.IsErrEmailAlreadyUsed(err): ctx.Data["Err_Email"] = true - ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SIGNUP, &form) + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SIGNUP, &f) case models.IsErrNameReserved(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), SIGNUP, &form) + ctx.RenderWithErr(ctx.Tr("user.form.name_reserved", err.(models.ErrNameReserved).Name), SIGNUP, &f) case models.IsErrNamePatternNotAllowed(err): ctx.Data["Err_UserName"] = true - ctx.RenderWithErr(ctx.Tr("user.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), SIGNUP, &form) + ctx.RenderWithErr(ctx.Tr("user.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), SIGNUP, &f) default: ctx.Handle(500, "CreateUser", err) } diff --git a/routers/user/setting.go b/routers/user/setting.go index 717baae8..0ea00770 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -14,9 +14,9 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/context" + "github.com/gogits/gogs/modules/form" "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/setting" ) @@ -76,7 +76,7 @@ func handleUsernameChange(ctx *context.Context, newName string) { ctx.User.LowerName = strings.ToLower(newName) } -func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) { +func SettingsPost(ctx *context.Context, f form.UpdateProfile) { ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsSettingsProfile"] = true @@ -85,15 +85,15 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) { return } - handleUsernameChange(ctx, form.Name) + handleUsernameChange(ctx, f.Name) if ctx.Written() { return } - ctx.User.FullName = form.FullName - ctx.User.Email = form.Email - ctx.User.Website = form.Website - ctx.User.Location = form.Location + ctx.User.FullName = f.FullName + ctx.User.Email = f.Email + ctx.User.Website = f.Website + ctx.User.Location = f.Location if err := models.UpdateUser(ctx.User); err != nil { ctx.Handle(500, "UpdateUser", err) return @@ -105,15 +105,15 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) { } // FIXME: limit size. -func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *models.User) error { - ctxUser.UseCustomAvatar = form.Source == auth.AVATAR_LOCAL - if len(form.Gravatar) > 0 { - ctxUser.Avatar = base.EncodeMD5(form.Gravatar) - ctxUser.AvatarEmail = form.Gravatar +func UpdateAvatarSetting(ctx *context.Context, f form.Avatar, ctxUser *models.User) error { + ctxUser.UseCustomAvatar = f.Source == form.AVATAR_LOCAL + if len(f.Gravatar) > 0 { + ctxUser.Avatar = base.EncodeMD5(f.Gravatar) + ctxUser.AvatarEmail = f.Gravatar } - if form.Avatar != nil { - fr, err := form.Avatar.Open() + if f.Avatar != nil { + fr, err := f.Avatar.Open() if err != nil { return fmt.Errorf("Avatar.Open: %v", err) } @@ -152,8 +152,8 @@ func SettingsAvatar(ctx *context.Context) { ctx.HTML(200, SETTINGS_AVATAR) } -func SettingsAvatarPost(ctx *context.Context, form auth.AvatarForm) { - if err := UpdateAvatarSetting(ctx, form, ctx.User); err != nil { +func SettingsAvatarPost(ctx *context.Context, f form.Avatar) { + if err := UpdateAvatarSetting(ctx, f, ctx.User); err != nil { ctx.Flash.Error(err.Error()) } else { ctx.Flash.Success(ctx.Tr("settings.update_avatar_success")) @@ -176,7 +176,7 @@ func SettingsPassword(ctx *context.Context) { ctx.HTML(200, SETTINGS_PASSWORD) } -func SettingsPasswordPost(ctx *context.Context, form auth.ChangePasswordForm) { +func SettingsPasswordPost(ctx *context.Context, f form.ChangePassword) { ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsSettingsPassword"] = true @@ -185,12 +185,12 @@ func SettingsPasswordPost(ctx *context.Context, form auth.ChangePasswordForm) { return } - if !ctx.User.ValidatePassword(form.OldPassword) { + if !ctx.User.ValidatePassword(f.OldPassword) { ctx.Flash.Error(ctx.Tr("settings.password_incorrect")) - } else if form.Password != form.Retype { + } else if f.Password != f.Retype { ctx.Flash.Error(ctx.Tr("form.password_not_match")) } else { - ctx.User.Passwd = form.Password + ctx.User.Passwd = f.Password var err error if ctx.User.Salt, err = models.GetUserSalt(); err != nil { ctx.Handle(500, "UpdateUser", err) @@ -222,7 +222,7 @@ func SettingsEmails(ctx *context.Context) { ctx.HTML(200, SETTINGS_EMAILS) } -func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) { +func SettingsEmailPost(ctx *context.Context, f form.AddEmail) { ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsSettingsEmails"] = true @@ -253,12 +253,12 @@ func SettingsEmailPost(ctx *context.Context, form auth.AddEmailForm) { email := &models.EmailAddress{ UID: ctx.User.ID, - Email: form.Email, + Email: f.Email, IsActivated: !setting.Service.RegisterEmailConfirm, } if err := models.AddEmailAddress(email); err != nil { if models.IsErrEmailAlreadyUsed(err) { - ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SETTINGS_EMAILS, &form) + ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SETTINGS_EMAILS, &f) return } ctx.Handle(500, "AddEmailAddress", err) @@ -311,7 +311,7 @@ func SettingsSSHKeys(ctx *context.Context) { ctx.HTML(200, SETTINGS_SSH_KEYS) } -func SettingsSSHKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) { +func SettingsSSHKeysPost(ctx *context.Context, f form.AddSSHKey) { ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsSettingsSSHKeys"] = true @@ -327,7 +327,7 @@ func SettingsSSHKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) { return } - content, err := models.CheckPublicKeyString(form.Content) + content, err := models.CheckPublicKeyString(f.Content) if err != nil { if models.IsErrKeyUnableVerify(err) { ctx.Flash.Info(ctx.Tr("form.unable_verify_ssh_key")) @@ -338,22 +338,22 @@ func SettingsSSHKeysPost(ctx *context.Context, form auth.AddSSHKeyForm) { } } - if _, err = models.AddPublicKey(ctx.User.ID, form.Title, content); err != nil { + if _, err = models.AddPublicKey(ctx.User.ID, f.Title, content); err != nil { ctx.Data["HasError"] = true switch { case models.IsErrKeyAlreadyExist(err): ctx.Data["Err_Content"] = true - ctx.RenderWithErr(ctx.Tr("settings.ssh_key_been_used"), SETTINGS_SSH_KEYS, &form) + ctx.RenderWithErr(ctx.Tr("settings.ssh_key_been_used"), SETTINGS_SSH_KEYS, &f) case models.IsErrKeyNameAlreadyUsed(err): ctx.Data["Err_Title"] = true - ctx.RenderWithErr(ctx.Tr("settings.ssh_key_name_used"), SETTINGS_SSH_KEYS, &form) + ctx.RenderWithErr(ctx.Tr("settings.ssh_key_name_used"), SETTINGS_SSH_KEYS, &f) default: ctx.Handle(500, "AddPublicKey", err) } return } - ctx.Flash.Success(ctx.Tr("settings.add_key_success", form.Title)) + ctx.Flash.Success(ctx.Tr("settings.add_key_success", f.Title)) ctx.Redirect(setting.AppSubUrl + "/user/settings/ssh") } @@ -383,7 +383,7 @@ func SettingsApplications(ctx *context.Context) { ctx.HTML(200, SETTINGS_APPLICATIONS) } -func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm) { +func SettingsApplicationsPost(ctx *context.Context, f form.NewAccessToken) { ctx.Data["Title"] = ctx.Tr("settings") ctx.Data["PageIsSettingsApplications"] = true @@ -400,7 +400,7 @@ func SettingsApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm t := &models.AccessToken{ UID: ctx.User.ID, - Name: form.Name, + Name: f.Name, } if err := models.NewAccessToken(t); err != nil { ctx.Handle(500, "NewAccessToken", err) |