mirror
/
writefreely
mirror of https://github.com/writeas/writefreely
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #222 from writeas/fix-template-typo

Browse Source 
Fix password-protected page template
pull/224/head
Matt Baer 5 years ago committed by GitHub
parent 6a5d49eeb7 6afafa4d67
commit ed40e9dea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      collections.go
  2. 8
      posts.go
  3. 2
      templates/edit-meta.tmpl
  4. 3
      templates/password-collection.tmpl

10
collections.go
Unescape View File

@ -648,6 +648,16 @@ func processCollectionPermissions(app *App, cr *collectionReq, u *User, w http.R
uname = u.Username uname = u.Username
} }
// TODO: move this to all permission checks?
suspended, err := app.db.IsUserSuspended(c.OwnerID)
if err != nil {
log.Error("process protected collection permissions: %v", err)
return nil, err
}
if suspended {
return nil, ErrCollectionNotFound
}
// See if we've authorized this collection // See if we've authorized this collection
authd := isAuthorizedForCollection(app, c.Alias, r) authd := isAuthorizedForCollection(app, c.Alias, r)

8
posts.go
Unescape View File

@ -1342,8 +1342,12 @@ func viewCollectionPost(app *App, w http.ResponseWriter, r *http.Request) error
if c.IsPrivate() && (u == nil || u.ID != c.OwnerID) { if c.IsPrivate() && (u == nil || u.ID != c.OwnerID) {
return ErrPostNotFound return ErrPostNotFound
} }
if c.IsProtected() && ((u == nil || u.ID != c.OwnerID) && !isAuthorizedForCollection(app, c.Alias, r)) { if c.IsProtected() && (u == nil || u.ID != c.OwnerID) {
return impart.HTTPError{http.StatusFound, c.CanonicalURL() + "/?g=" + slug} if suspended {
return ErrPostNotFound
} else if !isAuthorizedForCollection(app, c.Alias, r) {
return impart.HTTPError{http.StatusFound, c.CanonicalURL() + "/?g=" + slug}
}
} }
cr.isCollOwner = u != nil && c.OwnerID == u.ID cr.isCollOwner = u != nil && c.OwnerID == u.ID

2
templates/edit-meta.tmpl
Unescape View File

@ -270,7 +270,7 @@
<script> <script>
function updateMeta() { function updateMeta() {
if ({{.Suspended}}) { if ({{.Suspended}}) {
alert('Your account is currently supsended, editing posts is disabled.'); alert("Your account is silenced, so you can't edit posts.");
return return
} }
document.getElementById('create-error').style.display = 'none'; document.getElementById('create-error').style.display = 'none';

3
templates/password-collection.tmpl
Unescape View File

@ -25,9 +25,6 @@
</head> </head>
<body id="collection" itemscope itemtype="http://schema.org/WebPage"> <body id="collection" itemscope itemtype="http://schema.org/WebPage">
{{if .Suspended}}
{{template "user-supsended"}}
{{end}}
<header> <header>
<h1 dir="{{.Direction}}" id="blog-title"><a href="/{{.Alias}}/" class="h-card p-author u-url" rel="me author">{{.DisplayTitle}}</a></h1> <h1 dir="{{.Direction}}" id="blog-title"><a href="/{{.Alias}}/" class="h-card p-author u-url" rel="me author">{{.DisplayTitle}}</a></h1>
</header> </header>

Write Preview
Loading…
Cancel
Save