Commit:    6db526161bb46d359092df2828e7f4e68263360c
Author:    Hannes Magnusson <[email protected]>         Mon, 16 Dec 2013 
10:33:44 -0800
Parents:   0eca1908884c2ad0634d2eaf70866d42782bce9a
Branches:  master

Link:       
http://git.php.net/?p=web/wiki.git;a=commitdiff;h=6db526161bb46d359092df2828e7f4e68263360c

Log:
Fix admin karma & remove MAGIC_COOKIE

Changed paths:
  M  dokuwiki/lib/plugins/phpcvs/auth.php


Diff:
diff --git a/dokuwiki/lib/plugins/phpcvs/auth.php 
b/dokuwiki/lib/plugins/phpcvs/auth.php
index 03f83c4..3ca7a1b 100755
--- a/dokuwiki/lib/plugins/phpcvs/auth.php
+++ b/dokuwiki/lib/plugins/phpcvs/auth.php
@@ -21,19 +21,24 @@ class auth_plugin_phpcvs extends auth_plugin_authplain {
 
         global $conf;
         $this->cnf = $conf['auth']['phpcvs'];
-        $this->cando['external'] = true;
         $this->success = true;
+
+        /* We fallback on the authplain module, so pretend we can do these 
things */
+        $this->cando['addUser']   = true;
+        $this->cando['delUser']   = true;
+        $this->cando['modLogin']  = true;
+        $this->cando['modPass']   = true;
+        $this->cando['modName']   = true;
+        $this->cando['modMail']   = true;
+        $this->cando['modGroups'] = true;
+        $this->cando['getUsers']     = true;
+        $this->cando['getUserCount'] = true;
     }
 
 
+    /* There is no magic cookie, so don't trust it ! */
   function trustExternal($user,$pass,$sticky=false){
-      $silent = false;
-      if ($user === '' && isset($_COOKIE['MAGIC_COOKIE'])) {
-        list ($user, $pass) = explode(':', 
base64_decode($_COOKIE['MAGIC_COOKIE']), 2);
-        $sticky = false;
-        $silent = true;
-      }
-      return auth_login($user,$pass,$sticky,$silent);
+      return false;
     }
 
     /**


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to