[phpwiki-checkins] SF.net SVN: phpwiki:[6842] trunk/lib/plugin/WikiAdminSetAcl.php

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

Revision: 6842
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6842&view=rev
Author:   vargenau
Date:     2009-06-02 15:21:49 +0000 (Tue, 02 Jun 2009)

Log Message:
-----------
Give more information: ACL changed from X to Y

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminSetAcl.php

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2009-06-01 13:44:55 UTC (rev 6841)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2009-06-02 15:21:49 UTC (rev 6842)
@@ -65,7 +65,7 @@
     }
 
     function setaclPages(&$request, $pages, $acl) {
-        $ul = HTML::ul();
+        $result = HTML::div();
         $count = 0;
         $dbi =& $request->_dbi; 
         // check new_group and new_perm
@@ -94,18 +94,28 @@
             	$oldperm = getPagePermissions($page);
                 if ($oldperm)
                     $oldperm->sanify();
-            	if ($oldperm and $perm->equal($oldperm->perm)) // (serialize($oldperm->perm) == serialize($perm->perm))
-                    $ul->pushContent(HTML::li(fmt("ACL not changed for page '%s'.",$pagename)));
-                elseif (mayAccessPage('change', $pagename)) {
+            	if ($oldperm and $perm->equal($oldperm->perm)) {
+                    $result->setAttr('class', 'error');
+                    $result->pushContent(HTML::p(fmt("ACL not changed for page '%s'.",$pagename)));
+                } elseif (mayAccessPage('change', $pagename)) {
                     setPagePermissions ($page, $perm);
-                    $ul->pushContent(HTML::li(fmt("ACL changed for page '%s'.",$pagename)));
+                    $result->setAttr('class', 'feedback');
+                    $result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
+                                                     $pagename)));
+                    $result->pushContent(HTML::p(fmt("from '%s'",
+                                                     $oldperm ? $oldperm->asAclGroupLines() : "None")));
+                    $result->pushContent(HTML::p(fmt("to '%s'.",
+                                                     $perm->asAclGroupLines())));
 
                     // Create new revision so that ACL change appears in history.
                     $current = $page->getCurrentRevision();
                     $version = $current->getVersion();
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
-                    $meta['summary'] = sprintf(_("ACL changed for page '%s'."), $pagename);
+                    $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."), 
+                                               $pagename,
+                                               $oldperm ? $oldperm->asAclGroupLines() : "None",
+                                               $perm->asAclGroupLines());
                     $meta['is_minor_edit'] = 0;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
@@ -113,20 +123,24 @@
 
                     $count++;
                 } else {
-                    $ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename)));
+                    $result->setAttr('class', 'error');
+                    $result->pushContent(HTML::p(fmt("Access denied to change page '%s'.",$pagename)));
                 }
             }
         } else {
-            $ul->pushContent(HTML::li(fmt("Invalid ACL")));
+            $result->pushContent(HTML::p(fmt("Invalid ACL")));
         }
         if ($count) {
             $dbi->touch();
-            return HTML($ul,
-                        HTML::p(fmt("%s pages have been changed.",$count)));
+            $result->setAttr('class', 'feedback');
+            if ($count > 1) {
+                $result->pushContent(HTML::p(fmt("%s pages have been changed.",$count)));
+            }
         } else {
-            return HTML($ul,
-                        HTML::p(fmt("No pages changed.")));
+            $result->setAttr('class', 'error');
+            $result->pushContent(HTML::p(fmt("No pages changed.")));
         }
+        return $result;
     }
     
     function run($dbi, $argstr, &$request, $basepage) {


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