[Tutos-commits] tutos/php user.pinc,1.184,1.185

[Gero K. <gok...@us...>]

Update of /cvsroot/tutos/tutos/php
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv13048

Modified Files:
	user.pinc 
Log Message:
fixed a PERM_ALL Problem

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- user.pinc	2 Jun 2010 19:33:15 -0000	1.184
+++ user.pinc	23 Jul 2010 04:15:22 -0000	1.185
@@ -309,9 +309,9 @@
         }
         // hardcoded (CHANGE THIS !!!)
         if ($this->isadmin()) {
-            $this->p[usedbs] = PERM_ALL;
-            $this->p[useuser] = PERM_ALL;
-            $this->p[useteams] = PERM_ALL;
+            $this->p[usedbs] = PERM_SEE | PERM_USE | PERM_MOD | PERM_DEL;
+            $this->p[useuser] = PERM_SEE | PERM_USE | PERM_MOD | PERM_DEL;
+            $this->p[useteams] = PERM_SEE | PERM_USE | PERM_MOD | PERM_DEL;
         } else {
             $this->p[usedbs] = PERM_SEE;
             $this->p[useuser] = PERM_SEE | PERM_USE | PERM_MOD;
@@ -639,18 +639,12 @@
         if ( ($this->p[$feature] & $level) ) {
             return true;
         }
-        if ( ($this->p[$feature] & PERM_ALL) ) {
-            return true;
-        }
 
         // Check team permissions
         foreach($this->teams as $f) {
             if ( ($f->p[$feature] & $level) ) {
                 return true;
             }
-            if ( ($f->p[$feature] & PERM_ALL) ) {
-                return true;
-            }
         }
         return false;
     }