[Fusionforge-commits] r10845 - in trunk/src/plugins/wiki/www: lib lib/plugin themes/fusionforge/templates

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Mon Oct 4 19:23:50 CEST 2010


Author: aljeux
Date: 2010-10-04 19:23:50 +0200 (Mon, 04 Oct 2010)
New Revision: 10845

Modified:
   trunk/src/plugins/wiki/www/lib/PageList.php
   trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl
Log:
Wiki sync with a syntax fix.

Modified: trunk/src/plugins/wiki/www/lib/PageList.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/PageList.php	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/lib/PageList.php	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php
-//rcs_id('$Id: PageList.php 7659 2010-08-31 14:55:29Z vargenau $');
+//rcs_id('$Id: PageList.php 7710 2010-10-01 11:45:58Z vargenau $');
 /* Copyright (C) 2004-2010 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
@@ -1582,7 +1582,7 @@
                                           $this->_options['limit']);
             if ($tokens) {
                 $paging = Template("pagelink", $tokens);
-                $out->pushContent(HTML::table(array('width'=>'50%'), $paging));
+                $out->pushContent(HTML::table(array('width'=>'100%'), $paging));
             }
         }
 
@@ -1693,7 +1693,7 @@
         }
         $out->pushContent($list);
         if ( $do_paging and $tokens ) {
-            $out->pushContent(HTML::table($paging));
+            $out->pushContent(HTML::table(array('width'=>'100%'), $paging));
         }
         return $out;
     }

Modified: trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CreateToc.php 7701 2010-09-20 16:09:07Z vargenau $');
+// rcs_id('$Id: CreateToc.php 7689 2010-09-17 08:41:10Z vargenau $');
 /*
  * Copyright 2004,2005 $ThePhpWikiProgrammingTeam
  * Copyright 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -34,8 +34,6 @@
  * - Certain corner-edges will not work with TOC_FULL_SYNTAX.
  *   I believe I fixed all of them now, but who knows?
  * - bug #969495 "existing labels not honored" seems to be fixed.
- * - some constructs might incorrectly be recognized as a header
- *   (e.g. lines starting with "!!!" or "==" inside <verbatim>)
  */
 
 if (!defined('TOC_FULL_SYNTAX'))
@@ -241,8 +239,6 @@
     // - Wikicreole syntax (lines starting with "==", "===", etc.)
     // We must omit lines starting with "!" if inside a Mediawiki table
     // (they represent a table header)
-    // Some constructs might incorrectly be recognized as a header
-    // (e.g. lines starting with "!!!" or "==" inside <verbatim>)
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
     function extractHeaders (&$content, &$markup, $backlink=0,
                              $counter=0, $levels=false, $firstlevelstyle='number', $basepage='')
@@ -254,16 +250,26 @@
         $headers = array();
         $j = 0;
         $insidetable = false;
+        $insideverbatim = false;
         for ($i=0; $i<count($content); $i++) {
             if (preg_match('/^\s*{\|/', $content[$i])) {
                $insidetable = true;
                continue;
-            }
-            if (preg_match('/^\s*\|}/', $content[$i])) {
+            } else if (preg_match('/^\s*{{{/', $content[$i]) 
+                    || preg_match('/^\s*<pre>/', $content[$i]) 
+                    || preg_match('/^\s*<verbatim>/', $content[$i])) {
+               $insideverbatim = true;
+               continue;
+            } else if (preg_match('/^\s*\|}/', $content[$i])) {
                $insidetable = false;
                continue;
+            } else if (preg_match('/^\s*}}}/', $content[$i]) 
+                    || preg_match('/^\s*<\/pre>/', $content[$i]) 
+                    || preg_match('/^\s*<\/verbatim>/', $content[$i])) {
+               $insideverbatim = false;
+               continue;
             }
-            if ($insidetable) {
+            if (($insidetable) || ($insideverbatim)) {
                continue;
             }
             foreach ($levels as $level) {

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: body.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <table width="100%" cellpadding="0" cellspacing="0">
 <tr>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: bottom.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: bottom.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <?php if (defined('DEBUG') and DEBUG) { ?>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,4 +1,4 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse-footer.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: browse-footer.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <p class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></p>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: debug.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: login.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: login.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php if ($fail_message) { ?>
   <div class="error"><p><?php echo $fail_message?></p></div>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7625 2010-07-20 09:09:04Z vargenau $');
+// rcs_id('$Id: navbar.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php 
 $curuserprefs = $user->getPreferences();

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: pagelink.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: pagelink.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php
 /**

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ratings.tmpl 7417 2010-05-19 12:57:42Z vargenau $');
+// rcs_id('$Id: ratings.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl	2010-10-04 17:23:40 UTC (rev 10844)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl	2010-10-04 17:23:50 UTC (rev 10845)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: userprefs.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: userprefs.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
 ?>
 <?php
 // Todo: Move the logic and code to the plugin




More information about the Fusionforge-commits mailing list