[phpwiki-checkins] SF.net SVN: phpwiki:[9726] trunk/lib

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

Revision: 9726
          http://sourceforge.net/p/phpwiki/code/9726
Author:   vargenau
Date:     2015-09-16 16:32:27 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
New function: close_tags

Modified Paths:
--------------
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/stdlib.php

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2015-09-16 10:17:38 UTC (rev 9725)
+++ trunk/lib/loadsave.php	2015-09-16 16:32:27 UTC (rev 9726)
@@ -63,8 +63,6 @@
  */
 function EndLoadDump(&$request)
 {
-    global $WikiTheme;
-
     $action = $request->getArg('action');
     if ($action == 'browse') // loading virgin
         $pagelink = WikiLink(HOME_PAGE);
@@ -98,36 +96,7 @@
 
     PrintXML(HTML::p(HTML::strong(_("Complete."))),
         HTML::p(fmt("Return to %s", $pagelink)));
-    // Ugly hack to get valid XHTML code
-    if (is_a($WikiTheme, 'WikiTheme_fusionforge')) {
-        echo "</div>\n";
-        echo "</div>\n";
-        echo "</main>\n";
-        echo "</div>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_Sidebar')
-        or is_a($WikiTheme, 'WikiTheme_MonoBook')
-    ) {
-        echo "</div>\n";
-        echo "</div>\n";
-        echo "</div>\n";
-        echo "</div>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_wikilens')) {
-        echo "</div>\n";
-        echo "</td>\n";
-        echo "</tr>\n";
-        echo "</table>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_blog')) {
-        echo "</div>\n";
-        echo "</div>\n";
-    } elseif (is_a($WikiTheme, 'WikiTheme_Crao')
-        or is_a($WikiTheme, 'WikiTheme_Hawaiian')
-        or is_a($WikiTheme, 'WikiTheme_MacOSX')
-        or is_a($WikiTheme, 'WikiTheme_shamino_com')
-        or is_a($WikiTheme, 'WikiTheme_smaller')
-    ) {
-        echo "</div>\n";
-    }
-    echo "</body></html>\n";
+    close_tags(); // HACK
 }
 
 ////////////////////////////////////////////////////////////////

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2015-09-16 10:17:38 UTC (rev 9725)
+++ trunk/lib/main.php	2015-09-16 16:32:27 UTC (rev 9726)
@@ -849,8 +849,7 @@
         if (!empty($errormsg)) {
             PrintXML(HTML::p(array('class' => 'error'), 
                              _("Fatal PhpWiki Error")._(': ').$errormsg));
-            // HACK:
-            echo "\n</div>\n</div>\n</div>\n</div>\n</body>\n</html>";
+            close_tags(); // HACK
         }
         if (is_object($this->_user)) {
             $this->_user->page = $this->getArg('pagename');

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2015-09-16 10:17:38 UTC (rev 9725)
+++ trunk/lib/stdlib.php	2015-09-16 16:32:27 UTC (rev 9726)
@@ -2119,3 +2119,42 @@
 {
     return mb_ereg_replace('[^\w\. \-]', '-', $filename);
 }
+
+/**
+ * Close all open tags depending on WikiTheme
+ */
+function close_tags()
+{
+    global $WikiTheme;
+
+    // Ugly hack to get valid XHTML code
+    if (is_a($WikiTheme, 'WikiTheme_fusionforge')) {
+        echo "</div>\n";
+        echo "</div>\n";
+        echo "</main>\n";
+        echo "</div>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_Sidebar')
+        or is_a($WikiTheme, 'WikiTheme_MonoBook')
+    ) {
+        echo "</div>\n";
+        echo "</div>\n";
+        echo "</div>\n";
+        echo "</div>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_wikilens')) {
+        echo "</div>\n";
+        echo "</td>\n";
+        echo "</tr>\n";
+        echo "</table>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_blog')) {
+        echo "</div>\n";
+        echo "</div>\n";
+    } elseif (is_a($WikiTheme, 'WikiTheme_Crao')
+        or is_a($WikiTheme, 'WikiTheme_Hawaiian')
+        or is_a($WikiTheme, 'WikiTheme_MacOSX')
+        or is_a($WikiTheme, 'WikiTheme_shamino_com')
+        or is_a($WikiTheme, 'WikiTheme_smaller')
+    ) {
+        echo "</div>\n";
+    }
+    echo "</body></html>\n";
+}

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