From ffdefc6ac34ff49a7b2d3fdf5922d4f6db307d4c Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Sat, 22 Jul 2006 15:11:55 +0000 Subject: [PATCH] drop a lot of things we won't use. diff now just works (oh yeah), reinstate them make the AuthFunction be ReadPage (huhuhu). now, we will handle page rights ourself, it's not that complicated. git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@562 839d8a87-29fc-0310-9880-83ba4fa771e5 --- plugins/pmwiki.config.php | 65 +++-------------------------------------------- 1 file changed, 3 insertions(+), 62 deletions(-) diff --git a/plugins/pmwiki.config.php b/plugins/pmwiki.config.php index da06d73..d3ca420 100644 --- a/plugins/pmwiki.config.php +++ b/plugins/pmwiki.config.php @@ -16,27 +16,8 @@ $InterMapFiles[] = $globals->spoolroot.'plugins/pmwiki.intermap.txt'; $Skin = 'empty'; -XLSDV('en', array('EnterAttributes' => - "Entre ici les différents droit pour la page. Les champs laissés en blanc ne seront pas modifiés. - Pour enlever une restriction ou une autorisation entre clear. - Les différentes restrictions possibles sont : - - Le : à la fin de chaque mot clef est important. Tu peux également combiner plusieurs mots clefs avec and: - ou des espaces (qui remplace le ou logique)
")); - @include_once("$FarmD/cookbook/e-protect.php"); -$DefaultPasswords['read'] = 'logged:'; -$DefaultPasswords['edit'] = 'has_perms:'; -$DefaultPasswords['attr'] = 'has_perms: and: identified:'; -$DefaultPasswords['admin'] = 'has_perms: and: identified:'; -$DefaultPasswords['upload'] = 'has_perms: and: identified:'; - // Theme-ing {{{ ## The following lines make additional editing buttons appear in the @@ -97,50 +78,10 @@ function doBicol($column=false) } // }}} -// {{{ Auth - -$AuthFunction = 'AuthPlatal'; -$HandleAuth['diff'] = 'edit'; -$HandleAuth['source'] = 'edit'; +$AuthFunction = 'ReadPage'; -// impossible to see the diff without the source because of the smarty tags -$DiffShow['source'] = 'y'; -$DiffSourceFmt = ''; - -// for read pages: will come only once so we have to be careful -// and translate any auth from the wiki to smarty auth -function AuthPlatal($pagename, $level, $authprompt) -{ - global $page; +$HandleAuth['diff'] = 'edit'; +$HandleAuth['source'] = 'edit'; - $page_read = ReadPage($pagename); - - $levels = array('read', 'attr', 'edit', 'upload'); - - if (S::identified() && S::has_perms()) - { - $page_read['=passwd'] = $passwds; - $page_read['=pwsource'] = $pwsources; - - return $page_read; - } - - // if we arrive here, the user doesn't have enough permission to access page - - // maybe it is because he is not identified - if ($authprompt && !S::identified()) { - require_once dirname(__FILE__).'/../classes/Platal.php'; - require_once dirname(__FILE__).'/../classes/PLModule.php'; - $platal = new Platal(); - $platal->force_login($page); - } - - if (S::has_perms()) { - $page->trig('Erreur : page Wiki inutilisable sur plat/al'); - } - $page->run(); -} - -// }}} ?> -- 2.1.4