[Fusionforge-commits] r10541 - in trunk/src/plugins/wiki/www: . doc lib lib/plugin pgsrc themes themes/Crao themes/MonoBook themes/Sidebar/templates themes/blog

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Sat Sep 18 00:10:00 CEST 2010


Author: vargenau
Date: 2010-09-18 00:10:00 +0200 (Sat, 18 Sep 2010)
New Revision: 10541

Removed:
   trunk/src/plugins/wiki/www/themes/Sidebar/templates/browse.tmpl
Modified:
   trunk/src/plugins/wiki/www/doc/THEMES
   trunk/src/plugins/wiki/www/lib/FileFinder.php
   trunk/src/plugins/wiki/www/lib/IniConfig.php
   trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php
   trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes
   trunk/src/plugins/wiki/www/themes/Crao/themeinfo.php
   trunk/src/plugins/wiki/www/themes/MonoBook/themeinfo.php
   trunk/src/plugins/wiki/www/themes/README
   trunk/src/plugins/wiki/www/themes/blog/themeinfo.php
   trunk/src/plugins/wiki/www/wiki
Log:
Align with Phpwiki 1.4.0RC1

Modified: trunk/src/plugins/wiki/www/doc/THEMES
===================================================================
--- trunk/src/plugins/wiki/www/doc/THEMES	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/doc/THEMES	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,4 +1,4 @@
-! Brief Example of Creating Your Own WikiTheme
+== Brief Example of Creating Your Own WikiTheme ==
 
 To create or modify one of the existing themes:
 * Make a copy of one of the themes.
@@ -23,7 +23,7 @@
 of your theme to index.php.
   define('THEME','NewName');
 
-! Template Structure
+== Template Structure ==
 
 Templates currently must use the .tmpl extension (simple PHP parsed files).
 Other file extensions are reserved for future use (i.e. .tpl for Smarty or 
@@ -58,4 +58,4 @@
 to produce validating XHTML, by using custom templates not.
 
 ----
-PhpWikiDocumentation
+[[PhpWikiDocumentation]]

Modified: trunk/src/plugins/wiki/www/lib/FileFinder.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/FileFinder.php	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/lib/FileFinder.php	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: FileFinder.php 7543 2010-06-17 13:22:59Z vargenau $');
+<?php // rcs_id('$Id: FileFinder.php 7692 2010-09-17 11:32:55Z rurban $');
 
 require_once(dirname(__FILE__).'/stdlib.php');
 
@@ -154,7 +154,7 @@
         if (substr($path,0,1) == '/') {
             return true;
         } elseif (isWindows() and preg_match("/^[a-z]:/i", $path)
-                  and (substr($path,3,1) == "/" or substr($path,3,1) == "\\")) 
+                  and (substr($path,2,1) == "/" or substr($path,2,1) == "\\")) 
         {
             return true;
         } else {

Modified: trunk/src/plugins/wiki/www/lib/IniConfig.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/IniConfig.php	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/lib/IniConfig.php	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,5 +1,5 @@
 <?php
-// rcs_id('$Id: IniConfig.php 7666 2010-08-31 16:02:45Z vargenau $');
+// rcs_id('$Id: IniConfig.php 7693 2010-09-17 11:33:14Z rurban $');
 /**
  * A configurator intended to read its config from a PHP-style INI file,
  * instead of a PHP file.
@@ -125,6 +125,7 @@
     if (!file_exists($file)) {
         // We need to DATA_PATH for configurator, or pass the posted values
         // somewhow to the script
+        $GLOBALS['charset'] = 'utf-8';
         include_once(dirname(__FILE__)."/install.php");
         run_install("_part1");
         if (!defined("_PHPWIKI_INSTALL_RUNNING"))

Modified: trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/lib/plugin/CreateToc.php	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: CreateToc.php 7638 2010-08-11 11:58:40Z 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
@@ -246,7 +246,6 @@
     function extractHeaders (&$content, &$markup, $backlink=0,
                              $counter=0, $levels=false, $firstlevelstyle='number', $basepage='')
     {
-
         if (!$levels) $levels = array(1,2);
         $tocCounter = $this->_initTocCounter();
         reset($levels);
@@ -374,8 +373,7 @@
         if (!$pagename) {
             return $this->error(_("no page specified"));
         }
-        if ($jshide and isBrowserIE() and browserDetect("Mac")) {
-            //trigger_error(_("jshide set to 0 on Mac IE"), E_USER_NOTICE);
+        if (isBrowserIE() and browserDetect("Mac")) {
             $jshide = 0;
         }
         if (($notoc) or ($liststyle == 'ol')) {
@@ -384,8 +382,8 @@
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $pagename)) {
-                return $this->error(sprintf(_("Illegal access to page %s: no read access"),
-                $pagename));
+            return $this->error(sprintf(_("Illegal access to page %s: no read access"),
+            $pagename));
         }
 
         $page = $dbi->getPage($pagename);

Modified: trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes
===================================================================
--- trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/pgsrc/ReleaseNotes	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,6 +1,6 @@
-Date: Fri, 10 Sep 2010 14:12:16 +0000
+Date: Fri, 17 Sep 2010 14:12:16 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
-X-Rcs-Id: $Id: ReleaseNotes 7684 2010-09-10 12:13:48Z vargenau $
+X-Rcs-Id: $Id: ReleaseNotes 7695 2010-09-17 11:49:14Z rurban $
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
   flags=PAGE_LOCKED;
@@ -10,11 +10,13 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
-== 1.4.0RC1 2010-09-10 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+== 1.4.0RC1 2010-09-17 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
 
-An important modification in this release is the implementation of full Wikicreole 1.0
-syntax, including additions.
+This is a new major release, where everything changed from 1.2, and lots of changes since 13.4.
 
+An important modification in this release is the implementation 
+of full Wikicreole 1.0 syntax, including additions.
+
 The "classic" Phpwiki syntax is still supported.
 
 The documentation pages found in pgsrc have been mostly converted to UTF-8 and 

Modified: trunk/src/plugins/wiki/www/themes/Crao/themeinfo.php
===================================================================
--- trunk/src/plugins/wiki/www/themes/Crao/themeinfo.php	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/themes/Crao/themeinfo.php	2010-09-17 22:10:00 UTC (rev 10541)
@@ -6,10 +6,10 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: themeinfo.php 7690 2010-09-17 08:46:20Z vargenau $');
 
 /*
- * This file defines the default appearance ("theme") of PhpWiki.
+ * This file defines the Crao theme of PhpWiki.
  */
 
 require_once('lib/WikiTheme.php');

Modified: trunk/src/plugins/wiki/www/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/src/plugins/wiki/www/themes/MonoBook/themeinfo.php	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/themes/MonoBook/themeinfo.php	2010-09-17 22:10:00 UTC (rev 10541)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: themeinfo.php 7690 2010-09-17 08:46:20Z vargenau $');
 /**
  * The new mediawiki (Wikipedia.org) default style.
  * Mediawiki 'monobook' style sheet for CSS2-capable browsers.
@@ -49,9 +49,7 @@
                     $WikiTheme->makeActionButton($action, $label, $page_or_rev, $options));
 }
 
-class WikiTheme_MonoBook
-/* extends WikiTheme */
-extends WikiTheme_Wikilens
+class WikiTheme_MonoBook extends WikiTheme_Wikilens
 {
   
     /* this adds selected to the class */

Modified: trunk/src/plugins/wiki/www/themes/README
===================================================================
--- trunk/src/plugins/wiki/www/themes/README	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/themes/README	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,24 +1,30 @@
 Some files may be removed from this directory to save space, if
-needed:
-
-17k     Portland
-16k     smaller
-175k    Hawaiian
-235k    MacOSX
-151     Sidebar
-115k    SpaceWiki
-21k     wikilens
-27k     Wordpress
-
+needed.
 *The default theme must always be present,* even when using another
 theme! Wherever a theme has no specific variant (override) of a
 template or button or image, PhpWiki will look for one in the default 
 theme. Same with the language: 
 Language and theme specific specific buttons will be search in 
 sub-directories like <theme>/buttons/en, and if none will be found, 
-the default buttons, which might be language-indepedent, in default/buttons 
+the default buttons, which might be language-independent, in default/buttons 
 will be used.
 
+List of current themes:
+* default
+* blog
+* Crao
+* fusionforge (extends wikilens, can be used only with Fusionforge)
+* Hawaiian
+* MacOSX
+* MonoBook (extends wikilens)
+* Portland
+* shamino_com
+* Sidebar (extends MonoBook)
+* smaller
+* SpaceWiki
+* wikilens
+* Wordpress
+
 See doc/THEMES for more info on PhpWiki themes.
 
 TODO:
@@ -26,4 +32,4 @@
   http://www.oswd.org/viewdesign.phtml?id=1739&referer=%2Fmost_popular.phtml
 Use the plugin->box method for the right and left boxes.
 
-$Id: README 6205 2008-08-26 15:17:08Z vargenau $
+$Id: README 7690 2010-09-17 08:46:20Z vargenau $

Deleted: trunk/src/plugins/wiki/www/themes/Sidebar/templates/browse.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Sidebar/templates/browse.tmpl	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/themes/Sidebar/templates/browse.tmpl	2010-09-17 22:10:00 UTC (rev 10541)
@@ -1,16 +0,0 @@
-<?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
-?>
-
-<?php if ($revision and !$revision->isCurrent()) { ?>
-  <p><strong><?php echo _("Note:")?></strong>
-     <?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('browse', _("View the current version"), $page)?>.
-  </p>
-<?php } ?>
-<?php if (!empty($redirected)) { ?>
-  <p><?php echo $redirected ?></p>
-<?php } ?>
-
-<?php echo $CONTENT?>
-

Modified: trunk/src/plugins/wiki/www/themes/blog/themeinfo.php
===================================================================
--- trunk/src/plugins/wiki/www/themes/blog/themeinfo.php	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/themes/blog/themeinfo.php	2010-09-17 22:10:00 UTC (rev 10541)
@@ -6,7 +6,7 @@
     exit;
 }
 
-// rcs_id('$Id: themeinfo.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: themeinfo.php 7690 2010-09-17 08:46:20Z vargenau $');
 
 /**
  * This file defines a blog theme for PhpWiki,
@@ -44,7 +44,6 @@
  */
 
 require_once('lib/WikiTheme.php');
-//require_once('themes/Sidebar/themeinfo.php');
 
 class WikiTheme_blog extends WikiTheme {
 

Modified: trunk/src/plugins/wiki/www/wiki
===================================================================
--- trunk/src/plugins/wiki/www/wiki	2010-09-17 22:04:33 UTC (rev 10540)
+++ trunk/src/plugins/wiki/www/wiki	2010-09-17 22:10:00 UTC (rev 10541)
@@ -20,9 +20,9 @@
 define('VIRTUAL_PATH', $_SERVER['SCRIPT_NAME']);
 
 // Override the default configuration for CONSTANTS before index.php
-$LANG='de'; $LC_ALL='de_DE';
-define('THEME', 'default');
-define('WIKI_NAME', "WikiDemo:$LANG:" . THEME);
+//$LANG='de'; $LC_ALL='de_DE';
+//define('THEME', 'default');
+//define('WIKI_NAME', "WikiDemo:$LANG:" . THEME);
 
 // Load the default configuration.
 include "index.php";




More information about the Fusionforge-commits mailing list