[phpwiki-checkins] SF.net SVN: phpwiki:[10459] trunk/lib/plugin/WikiAdminUtils.php

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

Revision: 10459
          http://sourceforge.net/p/phpwiki/code/10459
Author:   vargenau
Date:     2021-08-09 10:45:03 +0000 (Mon, 09 Aug 2021)
Log Message:
-----------
lib/plugin/WikiAdminUtils.php: actions return a string

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

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2021-08-09 08:25:48 UTC (rev 10458)
+++ trunk/lib/plugin/WikiAdminUtils.php	2021-08-09 10:45:03 UTC (rev 10459)
@@ -141,10 +141,9 @@
 
     private function _do_purge_bad_pagenames($request, $args)
     {
-        // FIXME: this should be moved into WikiDB::normalize() or something...
         $dbi = $request->getDbh();
         $count = 0;
-        $list = HTML::ol(array('class' => 'align-left'));
+        $list = '';
         $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
         while (($page = $pages->next())) {
             $pagename = $page->getName();
@@ -151,7 +150,7 @@
             $wpn = new WikiPageName($pagename);
             if (!$wpn->isValid()) {
                 $dbi->purgePage($pagename);
-                $list->pushContent(HTML::li($pagename));
+                $list .= "\n" . $pagename;
                 $count++;
             }
         }
@@ -159,8 +158,7 @@
         if (!$count) {
             return _("No pages with bad names had to be deleted.");
         } else {
-            return HTML(fmt("Deleted %d pages with invalid names:", $count),
-                HTML::div(array('class' => 'align-left'), $list));
+            return fmt("Deleted %d pages with invalid names:", $count) . $list;
         }
     }
 
@@ -176,7 +174,7 @@
         $dbi = $request->getDbh();
         $count = 0;
         $notpurgable = 0;
-        $list = HTML::ol(array('class' => 'align-left'));
+        $list = '';
         $pages = $dbi->getAllPages('include_empty');
         while (($page = $pages->next())) {
             if (!$page->exists()
@@ -185,10 +183,10 @@
             ) {
                 $pagename = $page->getName();
                 if ($pagename == 'global_data' or $pagename == '.') continue;
-                if ($dbi->purgePage($pagename))
-                    $list->pushContent(HTML::li($pagename . ' ' . _("[purged]")));
-                else {
-                    $list->pushContent(HTML::li($pagename . ' ' . _("[not purgable]")));
+                if ($dbi->purgePage($pagename)) {
+                    $list .= "\n" . $pagename . ' ' . _("[purged]");
+                } else {
+                    $list .= "\n" . $pagename . ' ' . _("[not purgable]");
                     $notpurgable++;
                 }
                 $count++;
@@ -195,15 +193,15 @@
             }
         }
         $pages->free();
-        if (!$count)
+        if (!$count) {
             return _("No empty, unreferenced pages were found.");
-        else
-            return HTML(fmt("Deleted %d unreferenced pages:", $count),
-                HTML::div(array('class' => 'align-left'), $list),
-                ($notpurgable ?
+        } else {
+            return fmt("Deleted %d unreferenced pages:", $count) . $list
+                   . ($notpurgable ?
                     fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
                         $notpurgable)
-                    : ''));
+                    : '');
+        }
     }
 
     private function _do_db_check($request, $args)
@@ -296,7 +294,7 @@
                         Button('cancel', _("Cancel")))
             );
         }
-    return HTML::raw('');
+        return HTML::raw('');
     }
 }
 

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