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

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

Revision: 7651
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7651&view=rev
Author:   vargenau
Date:     2010-08-24 14:24:17 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
Remove method asAclGroupLines that was introduced in r6688

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/PageList.php	2010-08-24 14:24:17 UTC (rev 7651)
@@ -536,7 +536,7 @@
         $result = HTML::span();
         $result->pushContent($type);
         $result->pushContent(HTML::br());
-        $result->pushContent($perm->asAclGroupLines());
+        $result->pushContent($perm->asAclLines());
         return $result;
     }
 };

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/PagePerm.php	2010-08-24 14:24:17 UTC (rev 7651)
@@ -705,32 +705,6 @@
         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 .= (($perm[$action][$group] ? " " : " -") . $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	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2010-08-24 14:24:17 UTC (rev 7651)
@@ -95,9 +95,9 @@
                     $result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
                                                      $pagename)));
                     $result->pushContent(HTML::p(fmt("from '%s'",
-                                                     $oldperm ? $oldperm->asAclGroupLines() : "None")));
+                                                     $oldperm ? $oldperm->asAclLines() : "None")));
                     $result->pushContent(HTML::p(fmt("to '%s'.",
-                                                     $perm->asAclGroupLines())));
+                                                     $perm->asAclLines())));
 
                     // Create new revision so that ACL change appears in history.
                     $current = $page->getCurrentRevision();
@@ -106,8 +106,8 @@
                     $text = $current->getPackedContent();
                     $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
                                                $pagename,
-                                               $oldperm ? $oldperm->asAclGroupLines() : "None",
-                                               $perm->asAclGroupLines());
+                                               $oldperm ? $oldperm->asAclLines() : "None",
+                                               $perm->asAclLines());
                     $meta['is_minor_edit'] = 1;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
@@ -242,7 +242,7 @@
         elseif ($type == 'default')
             $type = _("default page permission");
         $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
-        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclGroupLines()),HTML::br());
+        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
 
         $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
                                      _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/themes/MonoBook/templates/info.tmpl	2010-08-24 14:24:17 UTC (rev 7651)
@@ -148,7 +148,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?php echo $perm->asAclGroupLines() ?></td>
+    <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>
 

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/themes/default/templates/info.tmpl	2010-08-24 14:24:17 UTC (rev 7651)
@@ -140,7 +140,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?php echo $perm->asAclGroupLines() ?></td>
+    <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>
 


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