[phpwiki-checkins] SF.net SVN: phpwiki:[6688] trunk

[<var...@us...>]

Revision: 6688
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6688&view=rev
Author:   vargenau
Date:     2009-03-22 17:39:00 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
new function: asAclGroupLines

Modified Paths:
--------------
    trunk/lib/PagePerm.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/themes/default/templates/info.tmpl

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2009-03-22 14:45:42 UTC (rev 6687)
+++ trunk/lib/PagePerm.php	2009-03-22 17:39:00 UTC (rev 6688)
@@ -709,7 +709,32 @@
         return $s;
     }
 
+    // Print ACL as group followed by actions allowed for the group
+    function asAclGroupLines() {
 
+        $s = '';
+        $perm =& $this->perm;
+        $actions = array("view", "edit", "create", "list", "remove", "purge", "dump", "change");
+        $groups = array(ACL_EVERY, ACL_ANONYMOUS, ACL_BOGOUSER, ACL_HASHOMEPAGE, ACL_SIGNED, ACL_AUTHENTICATED, ACL_ADMIN, ACL_OWNER, ACL_CREATOR);
+
+        foreach ($groups as $group) {
+            $none = true;
+            foreach ($actions as $action) {
+                if (isset($perm[$action][$group])) {
+                    if ($none) {
+                        $none = false;
+                        $s .= "$group:";
+                    }
+                    $s .= " $action";
+                }
+            }
+            if (!($none)) {
+                $s .= "; ";
+            }
+        }
+        return $s;
+    }
+
     // This is just a bad hack for testing.
     // Simplify the ACL to a unix-like "rwx------+" string
     // See getfacl(8)

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2009-03-22 14:45:42 UTC (rev 6687)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2009-03-22 17:39:00 UTC (rev 6688)
@@ -229,7 +229,7 @@
             $type = _("default page permission");
         $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
         $header->pushContent(HTML::strong(_("getfacl").': '), pagePermissionsSimpleFormat($perm_tree, $owner),HTML::br());
-        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
+        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclGroupLines()),HTML::br());
         
         $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
                                      _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
@@ -280,7 +280,7 @@
         $result = HTML::span();
         $result->pushContent($type);
         $result->pushContent(HTML::br());
-        $result->pushContent($perm->asAclLines());
+        $result->pushContent($perm->asAclGroupLines());
         return $result;
     }
 };

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2009-03-22 14:45:42 UTC (rev 6687)
+++ trunk/themes/default/templates/info.tmpl	2009-03-22 17:39:00 UTC (rev 6688)
@@ -140,7 +140,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?= $perm->asAclLines() ?></td>
+    <td><?= $perm->asAclGroupLines() ?></td>
   </tr>
 <?php } ?>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.