Fossil SCM
Improvements to Append Wiki privilege suggested by jakesfr.
Commit
3790dbbd36ce6c4c1e83536b570af5cc76e6fc0a28beed1781ad407d1b5facd6
Parent
81e61d78fdfdd2e…
1 file changed
+6
-7
+6
-7
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -490,19 +490,20 @@ | ||
| 490 | 490 | if( !g.isHome ){ |
| 491 | 491 | if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) |
| 492 | 492 | && wiki_special_permission(zPageName) |
| 493 | 493 | ){ |
| 494 | 494 | if( db_get_boolean("wysiwyg-wiki", 0) ){ |
| 495 | - style_submenu_element("Edit", "%s/wikiedit?name=%T&wysiwyg=1", | |
| 496 | - g.zTop, zPageName); | |
| 495 | + style_submenu_element("Edit", "%R/wikiedit?name=%T&wysiwyg=1", | |
| 496 | + zPageName); | |
| 497 | 497 | }else{ |
| 498 | - style_submenu_element("Edit", "%s/wikiedit?name=%T", g.zTop, zPageName); | |
| 498 | + style_submenu_element("Edit", "%R/wikiedit?name=%T", zPageName); | |
| 499 | 499 | } |
| 500 | + }else if( rid && g.perm.ApndWiki ){ | |
| 501 | + style_submenu_element("Edit", "%R/wikiappend?name=%T", zPageName); | |
| 500 | 502 | } |
| 501 | 503 | if( g.perm.Hyperlink ){ |
| 502 | - style_submenu_element("History", "%s/whistory?name=%T", | |
| 503 | - g.zTop, zPageName); | |
| 504 | + style_submenu_element("History", "%R/whistory?name=%T", zPageName); | |
| 504 | 505 | } |
| 505 | 506 | } |
| 506 | 507 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 507 | 508 | wiki_page_header(WIKITYPE_UNKNOWN, zPageName, ""); |
| 508 | 509 | wiki_standard_submenu(submenuFlags); |
| @@ -684,12 +685,10 @@ | ||
| 684 | 685 | if( g.perm.Attach ){ |
| 685 | 686 | style_submenu_element("Attach", |
| 686 | 687 | "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T", |
| 687 | 688 | g.zTop, zPageName, g.zTop, zPageName); |
| 688 | 689 | } |
| 689 | - style_submenu_element("Append", "%s/wikiappend?name=%T&mimetype=%s", | |
| 690 | - g.zTop, zPageName, zMimetype); | |
| 691 | 690 | } |
| 692 | 691 | if( !goodCaptcha ){ |
| 693 | 692 | @ <p class="generalError">Error: Incorrect security code.</p> |
| 694 | 693 | } |
| 695 | 694 | blob_zero(&wiki); |
| 696 | 695 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -490,19 +490,20 @@ | |
| 490 | if( !g.isHome ){ |
| 491 | if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) |
| 492 | && wiki_special_permission(zPageName) |
| 493 | ){ |
| 494 | if( db_get_boolean("wysiwyg-wiki", 0) ){ |
| 495 | style_submenu_element("Edit", "%s/wikiedit?name=%T&wysiwyg=1", |
| 496 | g.zTop, zPageName); |
| 497 | }else{ |
| 498 | style_submenu_element("Edit", "%s/wikiedit?name=%T", g.zTop, zPageName); |
| 499 | } |
| 500 | } |
| 501 | if( g.perm.Hyperlink ){ |
| 502 | style_submenu_element("History", "%s/whistory?name=%T", |
| 503 | g.zTop, zPageName); |
| 504 | } |
| 505 | } |
| 506 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 507 | wiki_page_header(WIKITYPE_UNKNOWN, zPageName, ""); |
| 508 | wiki_standard_submenu(submenuFlags); |
| @@ -684,12 +685,10 @@ | |
| 684 | if( g.perm.Attach ){ |
| 685 | style_submenu_element("Attach", |
| 686 | "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T", |
| 687 | g.zTop, zPageName, g.zTop, zPageName); |
| 688 | } |
| 689 | style_submenu_element("Append", "%s/wikiappend?name=%T&mimetype=%s", |
| 690 | g.zTop, zPageName, zMimetype); |
| 691 | } |
| 692 | if( !goodCaptcha ){ |
| 693 | @ <p class="generalError">Error: Incorrect security code.</p> |
| 694 | } |
| 695 | blob_zero(&wiki); |
| 696 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -490,19 +490,20 @@ | |
| 490 | if( !g.isHome ){ |
| 491 | if( ((rid && g.perm.WrWiki) || (!rid && g.perm.NewWiki)) |
| 492 | && wiki_special_permission(zPageName) |
| 493 | ){ |
| 494 | if( db_get_boolean("wysiwyg-wiki", 0) ){ |
| 495 | style_submenu_element("Edit", "%R/wikiedit?name=%T&wysiwyg=1", |
| 496 | zPageName); |
| 497 | }else{ |
| 498 | style_submenu_element("Edit", "%R/wikiedit?name=%T", zPageName); |
| 499 | } |
| 500 | }else if( rid && g.perm.ApndWiki ){ |
| 501 | style_submenu_element("Edit", "%R/wikiappend?name=%T", zPageName); |
| 502 | } |
| 503 | if( g.perm.Hyperlink ){ |
| 504 | style_submenu_element("History", "%R/whistory?name=%T", zPageName); |
| 505 | } |
| 506 | } |
| 507 | style_set_current_page("%T?name=%T", g.zPath, zPageName); |
| 508 | wiki_page_header(WIKITYPE_UNKNOWN, zPageName, ""); |
| 509 | wiki_standard_submenu(submenuFlags); |
| @@ -684,12 +685,10 @@ | |
| 685 | if( g.perm.Attach ){ |
| 686 | style_submenu_element("Attach", |
| 687 | "%s/attachadd?page=%T&from=%s/wiki%%3fname=%T", |
| 688 | g.zTop, zPageName, g.zTop, zPageName); |
| 689 | } |
| 690 | } |
| 691 | if( !goodCaptcha ){ |
| 692 | @ <p class="generalError">Error: Incorrect security code.</p> |
| 693 | } |
| 694 | blob_zero(&wiki); |
| 695 |