phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[9873] trunk/lib/WikiTheme.php

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

Revision: 9873
          http://sourceforge.net/p/phpwiki/code/9873
Author:   vargenau
Date:     2016-07-11 14:50:15 +0000 (Mon, 11 Jul 2016)
Log Message:
-----------
Consistent PHP Doc syntax

Modified Paths:
--------------
    trunk/lib/WikiTheme.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-07-11 12:55:52 UTC (rev 9872)
+++ trunk/lib/WikiTheme.php	2016-07-11 14:50:15 UTC (rev 9873)
@@ -1724,7 +1724,7 @@
      * @param string $text The text for the button.
      * @param string $url The url (href) for the button.
      * @param string $class The CSS class for the button.
-     * @param array $options  Additional attributes for the <input> tag.
+     * @param array $options  Additional attributes for the <input> tag.
      *
      * Do NOT replace with __construct: will break RSS icons links in RecentChanges
      */
@@ -1758,11 +1758,11 @@
 class ImageButton extends Button
 {
     /**
-     * @param $text string The text for the button.
-     * @param $url string The url (href) for the button.
-     * @param $class string The CSS class for the button.
-     * @param $img_url string URL for button's image.
-     * @param $img_attr array Additional attributes for the &lt;img&gt; tag.
+     * @param string $text The text for the button.
+     * @param string $url The url (href) for the button.
+     * @param string $class The CSS class for the button.
+     * @param string $img_url URL for button's image.
+     * @param array $img_attr array Additional attributes for the <img> tag.
      *
      * Do NOT replace with __construct: will break RSS icons links in RecentChanges
      */
@@ -1797,10 +1797,10 @@
 class SubmitButton extends HtmlElement
 {
     /**
-     * @param $text string The text for the button.
-     * @param $name string The name of the form field.
-     * @param $class string The CSS class for the button.
-     * @param $options array Additional attributes for the &lt;input&gt; tag.
+     * @param string $text The text for the button.
+     * @param string $name The name of the form field.
+     * @param string $class  The CSS class for the button.
+     * @param array $options Additional attributes for the <input> tag.
      */
     function __construct($text, $name = '', $class = '', $options = array())
     {
@@ -1823,11 +1823,11 @@
 class SubmitImageButton extends SubmitButton
 {
     /**
-     * @param $text string The text for the button.
-     * @param $name string The name of the form field.
-     * @param $class string The CSS class for the button.
-     * @param $img_url string URL for button's image.
-     * @param $img_attr array Additional attributes for the &lt;img&gt; tag.
+     * @param string $text The text for the button.
+     * @param string $name The name of the form field.
+     * @param string $class The CSS class for the button.
+     * @param string $img_url URL for button's image.
+     * @param array $img_attr Additional attributes for the <img> tag.
      */
     function __construct($text, $name = '', $class = '', $img_url, $img_attr = array())
     {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9872] trunk/lib/Template.php

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

Revision: 9872
          http://sourceforge.net/p/phpwiki/code/9872
Author:   vargenau
Date:     2016-07-11 12:55:52 +0000 (Mon, 11 Jul 2016)
Log Message:
-----------
Template: use __construct

Modified Paths:
--------------
    trunk/lib/Template.php

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-07-10 16:57:34 UTC (rev 9871)
+++ trunk/lib/Template.php	2016-07-11 12:55:52 UTC (rev 9872)
@@ -13,7 +13,7 @@
      * @param WikiRequest $request
      * @param array $args
      */
-    function Template($name, &$request, $args = array())
+    function __construct($name, &$request, $args = array())
     {
         global $WikiTheme;
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9871] trunk/lib/plugin/PhotoAlbum.php

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

Revision: 9871
          http://sourceforge.net/p/phpwiki/code/9871
Author:   vargenau
Date:     2016-07-10 16:57:34 +0000 (Sun, 10 Jul 2016)
Log Message:
-----------
Use CSS

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

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016-07-09 17:26:31 UTC (rev 9870)
+++ trunk/lib/plugin/PhotoAlbum.php	2016-07-10 16:57:34 UTC (rev 9871)
@@ -321,7 +321,7 @@
                 } else {
                     $newcellwidth = $cellwidth;
                 }
-                $cell = array_merge($cell, array("width" => $newcellwidth));
+                $cell = array_merge($cell, array("style" => 'width: '.$newcellwidth));
             }
             if (in_array("nowrap", $attributes)) {
                 $cell = array_merge($cell, array("nowrap" => "nowrap"));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9870] trunk/pgsrc/ReleaseNotes

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

Revision: 9870
          http://sourceforge.net/p/phpwiki/code/9870
Author:   vargenau
Date:     2016-07-09 17:26:31 +0000 (Sat, 09 Jul 2016)
Log Message:
-----------
Update ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-07-08 16:14:56 UTC (rev 9869)
+++ trunk/pgsrc/ReleaseNotes	2016-07-09 17:26:31 UTC (rev 9870)
@@ -20,14 +20,14 @@
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Remove Fusionforge-specific files (g wikiadmin.php wikilist.php)
 * Bugs:
-** Remove wrong calls to setTightness in lib/InlineParser.php (bug reported by Harold Hallikainen)
+** Remove wrong calls to setTightness in ##lib/~InlineParser.php## (bug reported by Harold Hallikainen)
 * Plugins:
 ** ~UpLoad plugin: put date and author in history
 ** ~UpLoad plugin: don't inline images
-** phpweather-2.2.2 included in PhpWiki; ~PhpWeather plugin allowed in Fusionforge
+** phpweather-2.2.2 included in ~PhpWiki; ~PhpWeather plugin allowed in Fusionforge
 ** ~HtmlConverter plugin: check file is encoded in UTF-8; ~HtmlConverter plugin allowed in Fusionforge
 ** Use jquery.autoheight.js plugin for Transclude plugin
-** Repair PhotoAlbumPlugin
+** Repair [[Help:PhotoAlbumPlugin|PhotoAlbumPlugin]]
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9869] trunk/config/phpwiki.spec

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

Revision: 9869
          http://sourceforge.net/p/phpwiki/code/9869
Author:   vargenau
Date:     2016-07-08 16:14:56 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
config/phpwiki.spec: add units, graphviz

Modified Paths:
--------------
    trunk/config/phpwiki.spec

Modified: trunk/config/phpwiki.spec
===================================================================
--- trunk/config/phpwiki.spec	2016-07-08 16:05:44 UTC (rev 9868)
+++ trunk/config/phpwiki.spec	2016-07-08 16:14:56 UTC (rev 9869)
@@ -53,7 +53,7 @@
 #Relocation!
 Prefix: /var/www
 
-Requires: httpd, php, php-pear, php-mysql
+Requires: httpd, php, php-pear, units, graphviz, php-mysql
 
 Autoreq: 0
 
@@ -99,8 +99,6 @@
 	-e 's,^[;\s]*(AUTH_GROUP_FILE)\s*=.*,$1 = %{AUTH_GROUP_FILE},;'	\
 	config-dist.ini > config.ini
 
-
-
 %clean
 %{__rm} -rf %{buildroot}
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9868] trunk/pgsrc/ReleaseNotes

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

Revision: 9868
          http://sourceforge.net/p/phpwiki/code/9868
Author:   vargenau
Date:     2016-07-08 16:05:44 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
Update ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-07-08 15:22:04 UTC (rev 9867)
+++ trunk/pgsrc/ReleaseNotes	2016-07-08 16:05:44 UTC (rev 9868)
@@ -1,4 +1,4 @@
-Date: Fri,  8 Jul 2016 13:33:33 +0000
+Date: Fri,  8 Jul 2016 18:05:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -11,18 +11,23 @@
 == 1.5.6 2016-XX-XX Marc-Etienne Vargenau ==
 
 * Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
-* Remove wrong calls to setTightness in lib/InlineParser.php (bug reported by Harold Hallikainen)
 * Pear: use ##mysqli## instead of ##mysql##
+* Update Pear DB library to 1.9.2
 * Replace ##ereg## functions
-* ~UpLoad plugin: put date and author in history
-* ~UpLoad plugin: don't inline images
-* phpweather-2.2.2 included in PhpWiki; ~PhpWeather plugin allowed in Fusionforge
-* ~HtmlConverter plugin: check file is encoded in UTF-8; ~HtmlConverter plugin allowed in Fusionforge
+* Allow Wikicreole syntax for plugins in theme templates
+* Add HTML 5 <main> <header> <footer> <nav> in all themes. Add ARIA roles.
 * Valid HTML5 and CSS3 logos (in debug mode)
-* Add HTML 5 <main> <header> <footer> <nav> in all themes
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
-* Repair PhotoAlbumPlugin
 * Remove Fusionforge-specific files (g wikiadmin.php wikilist.php)
+* Bugs:
+** Remove wrong calls to setTightness in lib/InlineParser.php (bug reported by Harold Hallikainen)
+* Plugins:
+** ~UpLoad plugin: put date and author in history
+** ~UpLoad plugin: don't inline images
+** phpweather-2.2.2 included in PhpWiki; ~PhpWeather plugin allowed in Fusionforge
+** ~HtmlConverter plugin: check file is encoded in UTF-8; ~HtmlConverter plugin allowed in Fusionforge
+** Use jquery.autoheight.js plugin for Transclude plugin
+** Repair PhotoAlbumPlugin
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9867] trunk/lib/WikiDB/backend/PearDB_mysqli.php

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

Revision: 9867
          http://sourceforge.net/p/phpwiki/code/9867
Author:   vargenau
Date:     2016-07-08 15:22:04 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
Remove call to mysqli_set_charset

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PearDB_mysqli.php

Modified: trunk/lib/WikiDB/backend/PearDB_mysqli.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB_mysqli.php	2016-07-08 11:34:55 UTC (rev 9866)
+++ trunk/lib/WikiDB/backend/PearDB_mysqli.php	2016-07-08 15:22:04 UTC (rev 9867)
@@ -20,10 +20,6 @@
                 $this->_expressions['maxmajor'] = "MAX(IF(minor_edit=0,version,0))";
                 $this->_expressions['maxminor'] = "MAX(IF(minor_edit<>0,version,0))";
             }
-            // esp. needed for utf databases
-            if ($this->_serverinfo['version'] > 401.0) {
-                mysqli_set_charset($this->_dbh->connection, 'UTF-8');
-            }
         }
     }
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9866] trunk

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

Revision: 9866
          http://sourceforge.net/p/phpwiki/code/9866
Author:   vargenau
Date:     2016-07-08 11:34:55 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
Remove Fusionforge-specific files (g wikiadmin.php wikilist.php)

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Removed Paths:
-------------
    trunk/g
    trunk/wikiadmin.php
    trunk/wikilist.php

Deleted: trunk/g
===================================================================
--- trunk/g	2016-07-08 11:32:02 UTC (rev 9865)
+++ trunk/g	2016-07-08 11:34:55 UTC (rev 9866)
@@ -1,309 +0,0 @@
-<?php
-/*
- * Copyright (C) 2008-2012 Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Configuration File ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
-if (defined('WIKI_SOAP')) {
-    ini_set('memory_limit', -1);
-} else {
-    ini_set('memory_limit', "256M");
-}
-ini_set('pcre.backtrack_limit', 100000000);
-
-// Disable compression, seems needed to get all the messages.
-$no_gz_buffer=true;
-
-if (defined('WIKI_SOAP')) {
-    require_once 'include/env.inc.php';
-} else {
-    require_once '../../../common/include/env.inc.php';
-}
-require_once $gfcommon.'include/pre.php';
-require_once $gfplugins.'wiki/common/wikiconfig.class.php';
-
-html_use_jquery();
-if (forge_get_config('use_jquery_form_navigate')) {
-    use_javascript('/scripts/jquery-formnavigate/jquery.FormNavigate-min.js');
-    define('ENABLE_EDIT_TOOLBAR', true);
-} else {
-    // Disable Toolbar for tests
-    define('ENABLE_EDIT_TOOLBAR', false);
-}
-define('JS_SEARCHREPLACE', false);
-
-if (defined('WIKI_SOAP')) {
-    $help = group_get_object_by_name('help');
-    if ($help) {
-        $group_id = $help->getID();
-    } else {
-        // Test system don't have help project, use projecta instead.
-        $group_id = 6;
-    }
-}
-
-if (isset($group_id) && $group_id) {
-    if (! isset($project) || ! $project) {
-        $project = group_get_object($group_id);
-    }
-} elseif(isset($project) && is_object($project)) {
-    $group_id = $project->getID();
-}
-
-if (! isset($group_id) || ! isset($project)) {
-    exit_no_group();
-} else if (!($project->usesPlugin("wiki"))) {
-    // We should test whether the wiki plugin is disabled globally
-    // in the Forge or by the current project.
-    // exit_disabled('home');
-    exit_project_disabled('home');
-} else {
-
-    global $robots;
-
-    $robots = "noindex,nofollow";
-
-    $group_name = $project->getUnixName();
-    $group_public_name = $project->getPublicName();
-
-    $is_external = method_exists($project, 'getIsExternal') && $project->getIsExternal();
-
-    $wc = new WikiConfig($group_id);
-
-    define('VIRTUAL_PATH', '/wiki/g/'.$group_name);
-    global $page_prefix;
-    $page_prefix = '_g'.$group_id.'_';
-
-    // We have to use a smaller value than Phpwiki due to page prefix
-    define('MAX_PAGENAME_LENGTH', 92);
-
-    define('THEME', 'fusionforge');
-
-    // For FusionForge, we create some specific pages, located in the theme
-    // except for given project
-    if ($group_name == forge_get_config('wiki_help_project', 'wiki')) {
-        define('WIKI_PGSRC', 'pgsrc');
-    } else {
-        define('WIKI_PGSRC', 'themes/fusionforge/pgsrc');
-    }
-
-    define('FUSIONFORGE', true);
-
-    define('PATH_INFO_PREFIX', '/'.$group_name . '/');
-    define('USE_PATH_INFO', true);
-
-    define('WIKI_NAME', $group_name);
-
-    define('ALLOWED_PROTOCOLS', "http|https|mailto|ftp|ftps|news|nntp|ssh|gopher");
-
-    define('DISABLE_MARKUP_WIKIWORD', $wc->getWikiConfig('DISABLE_MARKUP_WIKIWORD'));
-
-    define('NUM_SPAM_LINKS', 20 * ($wc->getWikiConfig('NUM_SPAM_LINKS')));
-
-    define('ENABLE_RATEIT', $wc->getWikiConfig('ENABLE_RATEIT'));
-
-    define('UPLOAD_FILE_PATH', forge_get_config('groupdir_prefix').'/'.WIKI_NAME.'/www/uploads/');
-    // define('UPLOAD_DATA_PATH', SERVER_URL . '/www/'.WIKI_NAME.'/uploads/');
-    if ($project->isPublic()) {
-        define('UPLOAD_DATA_PATH', '/www/'.WIKI_NAME.'/uploads/');
-    } else {
-        define('UPLOAD_DATA_PATH', '/wiki/view.php/'.WIKI_NAME.'/uploads/');
-    }
-
-    // Do not use a directory per user but only one (per project)
-    define('UPLOAD_USERDIR', false);
-
-    // Allow Load File only from /tmp
-    define('ALLOWED_LOAD', '/tmp');
-
-    // Use black list of extensions instead of white list
-    define('DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS', true);
-
-    // Get the maximum upload filesize from PHP config
-    define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize')));
-
-    // Disable access log (already in Apache & FusionForge).
-    define('ACCESS_LOG_SQL', 0);
-
-    define('DEBUG', (forge_get_config('installation_environment') != 'production'));
-
-    // Postgresql
-    define('DATABASE_TYPE', 'SQL');
-    // Dummy value (to avoid warning in SystemInfo plugin)
-    define('DATABASE_DSN', 'pgsql://localhost/user_phpwiki');
-
-    // Disable VACUUM (they are performed every night)
-    define('DATABASE_OPTIMISE_FREQUENCY', 0);
-
-    // TBD: the name should be taken from FusionForge
-    // define('ADMIN_USER', 'ACOS Forge Administrator');
-    define('ADMIN_USER', 'The PhpWiki programming team');
-    // Dummy value
-    define('ADMIN_PASSWD', 'xxx');
-
-    // Allow ".svg" and ".swf" as extensions
-    define('INLINE_IMAGES', 'png|jpg|jpeg|gif|svg|swf');
-
-    // Allow <div> and <span> in wiki code
-    define('ENABLE_MARKUP_DIVSPAN', true);
-
-    define('ENABLE_AJAX', false);
-
-    define('TOOLBAR_PAGELINK_PULLDOWN', false);
-    define('TOOLBAR_TEMPLATE_PULLDOWN', 'Template*');
-    define('TOOLBAR_IMAGE_PULLDOWN', true);
-
-    // Enable external pages
-    define('ENABLE_EXTERNAL_PAGES', $is_external);
-
-    // Let all revisions be stored. Default since 1.3.11
-    define('MAJOR_MIN_KEEP', 2147483647);
-    define('MINOR_MIN_KEEP', 2147483647);
-    define('MAJOR_MAX_AGE', 2147483647);
-    define('MAJOR_KEEP', 2147483647);
-    define('MINOR_MAX_AGE', 2147483647);
-    define('MINOR_KEEP', 2147483647);
-    define('AUTHOR_MAX_AGE', 2147483647);
-    define('AUTHOR_KEEP', 2147483647);
-    define('AUTHOR_MIN_AGE', 2147483647);
-    define('AUTHOR_MAX_KEEP', 2147483647);
-
-    //
-    // Define access rights for the wiki.
-    //
-
-    // Do not allow anon users to edit pages
-    define('ALLOW_ANON_EDIT', false);
-
-    // Do not allow fake user
-    define('ALLOW_BOGO_LOGIN', false);
-
-    // A dedicated auth has been created to get auth from FusionForge
-    $USER_AUTH_ORDER = array("FusionForge");
-    define('USER_AUTH_ORDER', 'FusionForge');
-    define('USER_AUTH_POLICY', 'strict');
-
-    define('EXTERNAL_LINK_TARGET', '_top');
-
-    // Override the default configuration for CONSTANTS before index.php
-    $LC_ALL = language_name_to_locale_code(choose_language_from_context());
-    $LANG   = preg_replace('/_.*/', '', $LC_ALL);
-
-    // We use a local interwiki map file
-    define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map');
-
-    define('DEFAULT_WIKI_PAGES', "");
-
-    define('DBAUTH_AUTH_CHECK', "SELECT IF(passwd='\$password',1,0) as ok FROM plugin_wiki_pref WHERE userid='\$userid'");
-    define('DBAUTH_AUTH_USER_EXISTS', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid'");
-    define('DBAUTH_AUTH_CREATE', "INSERT INTO plugin_wiki_pref (passwd,userid) VALUES ('\$password','\$userid')");
-    define('DBAUTH_PREF_SELECT', "SELECT prefs FROM plugin_wiki_pref WHERE userid='\$userid'");
-    define('DBAUTH_PREF_UPDATE', "UPDATE plugin_wiki_pref SET prefs='\$pref_blob' WHERE userid='\$userid'");
-    define('DBAUTH_PREF_INSERT', "INSERT INTO plugin_wiki_pref (prefs,userid) VALUES ('\$pref_blob','\$userid')");
-    define('DBAUTH_IS_MEMBER', "SELECT userid FROM plugin_wiki_pref WHERE userid='\$userid' AND groupname='\$groupname'");
-    define('DBAUTH_GROUP_MEMBERS', "SELECT userid FROM plugin_wiki_pref WHERE groupname='\$groupname'");
-    define('DBAUTH_USER_GROUPS', "SELECT groupname FROM plugin_wiki_pref WHERE userid='\$userid'");
-
-    define('USE_DB_SESSION', true);
-
-    define('USE_BYTEA', true);
-
-    define('ENABLE_REVERSE_DNS', false);
-
-    // Web DAV location
-    define('DEFAULT_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidump/");
-    define('HTML_DUMP_DIR', forge_get_config('groupdir_prefix').'/'.$group_name."/wikidumphtml/");
-
-    define('COMPRESS_OUTPUT', false);
-
-    define('CACHE_CONTROL', "NO_CACHE");
-
-    $lg = language_name_to_locale_code(forge_get_config('default_language'));
-    $lg = preg_replace('/_.*/', '', $lg);
-    define('DEFAULT_LANGUAGE', $lg);
-
-    define('DISABLE_GETIMAGESIZE', true);
-
-    // If the user is logged in, let the Wiki know
-    if (session_loggedin()) {
-        $user = session_get_user();
-        if ($user && is_object($user) && !$user->isError() && $user->isActive()) {
-            $user_name = $user->getRealName();
-            $_SESSION['user_id'] = $user_name;
-            $_SERVER['PHP_AUTH_USER'] = $user_name;
-        }
-    } else {
-        // clear out the globals, just in case...
-    }
-
-    // Load the default configuration.
-    require_once(dirname(__FILE__).'/lib/prepend.php');
-    require_once(dirname(__FILE__).'/lib/IniConfig.php');
-    IniConfig(dirname(__FILE__)."/config/config-default.ini");
-
-    // Override the default configuration for VARIABLES after index.php:
-    // E.g. Use another DB:
-    $DBParams['dbtype'] = 'SQL';
-    $DBParams['dsn']    = 'ffpgsql://' . forge_get_config('database_user') . ':' .
-        forge_get_config('database_password') . '@' . forge_get_config('database_host') .'/' . forge_get_config('database_name');
-
-    $DBParams['prefix'] = "plugin_wiki_";
-
-    // Start the wiki
-    include dirname(__FILE__).'/lib/main.php';
-}
-
-/**
- * Return a number of octets from a string like "300M"
- */
-function octets($val) {
-    $val = trim($val);
-    $last = strtolower($val[strlen($val)-1]);
-    switch($last) {
-        // The 'G' modifier is available since PHP 5.1.0
-        case 'g':
-            $val *= 1024;
-        case 'm':
-            $val *= 1024;
-        case 'k':
-            $val *= 1024;
-    }
-    return $val;
-}

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-07-08 11:32:02 UTC (rev 9865)
+++ trunk/pgsrc/ReleaseNotes	2016-07-08 11:34:55 UTC (rev 9866)
@@ -1,4 +1,4 @@
-Date: Thu,  7 Jul 2016 22:43:03 +0000
+Date: Fri,  8 Jul 2016 13:33:33 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -22,6 +22,7 @@
 * Add HTML 5 <main> <header> <footer> <nav> in all themes
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
 * Repair PhotoAlbumPlugin
+* Remove Fusionforge-specific files (g wikiadmin.php wikilist.php)
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 

Deleted: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2016-07-08 11:32:02 UTC (rev 9865)
+++ trunk/wikiadmin.php	2016-07-08 11:34:55 UTC (rev 9866)
@@ -1,169 +0,0 @@
-<?php
-/*
- * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
- * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Wiki Configurator ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
-require_once dirname(__FILE__) . "/../../env.inc.php";
-require_once $gfcommon . 'include/pre.php';
-require_once forge_get_config('plugins_path') . '/wiki/common/WikiPlugin.class.php';
-require_once forge_get_config('plugins_path') . '/wiki/common/wikiconfig.class.php';
-
-$user = session_get_user(); // get the session user
-
-if (!$user || !is_object($user)) {
-    exit_error(_('Invalid User'), 'home');
-} elseif ($user->isError()) {
-    exit_error($user->getErrorMessage(), 'home');
-} elseif (!$user->isActive()) {
-    exit_error(_('User not active'), 'home');
-}
-
-$type = getStringFromRequest('type');
-$group_id = getIntFromRequest('group_id');
-$pluginname = 'wiki';
-$config = getArrayFromRequest('config');
-
-if (!$type) {
-    exit_missing_param('', array(_('No TYPE specified')), 'home');
-} elseif (!$group_id) {
-    exit_missing_param('', array(_('No ID specified')), 'home');
-} else {
-    if ($type == 'admin_post') {
-        $group = group_get_object($group_id);
-        if (!$group) {
-            exit_no_group();
-        }
-        if (!($group->usesPlugin($pluginname))) { //check if the group has the wiki plugin active
-            exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'), $pluginname), 'home');
-        }
-        $userperm = $group->getPermission(); //we'll check if the user belongs to the group
-        if (!$userperm->IsMember()) {
-            exit_permission_denied(_('You are not a member of this project'), 'home');
-        }
-        //only project admin can access here
-        if ($userperm->isAdmin()) {
-
-            $wc = new WikiConfig($group_id);
-
-            foreach ($wc->getWikiConfigNames() as $c) {
-                if (!array_key_exists($c, $config)) {
-                    $config[$c] = 0;
-                }
-            }
-
-            foreach ($config as $config_name => $config_value) {
-                $r = $wc->updateWikiConfig($config_name, $config_value);
-                if (!$r) exit_error("Error", $wc->getErrorMessage());
-            }
-
-            $type = 'admin';
-            $feedback = _('Configuration saved.');
-        } else {
-            exit_permission_denied(_('You are not a project Admin'), 'home');
-        }
-    }
-    if ($type == 'admin') {
-        $group = group_get_object($group_id);
-        if (!$group) {
-            exit_no_group();
-        }
-        if (!($group->usesPlugin($pluginname))) { //check if the group has the plugin active
-            exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'), $pluginname), 'home');
-        }
-        $userperm = $group->getPermission(); //we'll check if the user belongs to the group
-        if (!$userperm->IsMember()) {
-            exit_permission_denied(_('You are not a member of this project'), 'home');
-        }
-        //only project admin can access here
-        if ($userperm->isAdmin()) {
-            site_project_header(array('title' => _("Configuration for your project's wiki"),
-                'pagename' => $pluginname,
-                'group' => $group_id,
-                'toptab' => 'wiki',
-                'sectionvals' => array(group_getname($group_id))));
-
-            $wc = new WikiConfig($group_id);
-
-            print "<table>\n";
-            print "<tr>\n";
-            print "<td>\n";
-            print "<fieldset>\n";
-            print "<legend>" . _('Wiki Configuration') . "</legend>\n";
-            print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n";
-            print "<input type=\"hidden\" name=\"group_id\" value=\"$group_id\" />\n";
-            print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
-            print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n";
-
-            print '<table class="listing">';
-            print "\n<thead>\n<tr>\n<th>" .
-                _("Parameter") .
-                "</th>" .
-                "<th>" .
-                _("Value") .
-                "</th>\n" .
-                "</tr>\n</thead>\n";
-
-            foreach ($wc->getWikiConfigNames() as $c) {
-                $checked = $wc->getWikiConfig($c) ? ' checked="checked"' : '';
-                $desc = $wc->getWikiConfigDescription($c);
-
-                print "<tr>\n<td>$desc</td>\n" .
-                    '<td class="align-center">' .
-                    "<input type=\"checkbox\" name=\"config[$c]\" value=\"1\"$checked /></td>\n" .
-                    "</tr>\n";
-            }
-            print "</table>\n";
-            print '<p class="align-right"><input type="submit" value="' .
-                _("Save Configuration") .
-                "\" /></p>";
-            print "</form>\n";
-            print "</fieldset>\n";
-            print "</td>\n";
-            print "</tr>\n";
-            print "</table>\n";
-        } else {
-            exit_permission_denied(_('You are not a project Admin'), 'home');
-        }
-    }
-}
-
-site_project_footer();

Deleted: trunk/wikilist.php
===================================================================
--- trunk/wikilist.php	2016-07-08 11:32:02 UTC (rev 9865)
+++ trunk/wikilist.php	2016-07-08 11:34:55 UTC (rev 9866)
@@ -1,92 +0,0 @@
-<?php
-/**
- * List of active wikis in Forge
- *
- * Copyright 2009-2011 Marc-Etienne Vargenau, Alcatel-Lucent
- *
- * This file is part of FusionForge.
- *
- * FusionForge is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FusionForge is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with FusionForge; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-require_once dirname(__FILE__) . "/../../env.inc.php";
-require_once $gfcommon . 'include/pre.php';
-require_once $gfwww . 'admin/admin_utils.php';
-
-$title = _('List of active wikis in Forge');
-site_admin_header(array('title' => $title));
-
-$sortorder = getStringFromRequest('sortorder', 'group_name');
-$sortorder = util_ensure_value_in_set($sortorder, array('group_name', 'register_time', 'unix_group_name', 'is_public', 'is_external', 'members'));
-
-$res = db_query_params('SELECT group_name,register_time,unix_group_name,groups.group_id,is_public,is_external,status, COUNT(user_group.group_id) AS members
-            FROM groups LEFT JOIN user_group ON user_group.group_id=groups.group_id
-            WHERE status=$1
-            GROUP BY group_name,register_time,unix_group_name,groups.group_id,is_public,is_external,status
-            ORDER BY ' . $sortorder,
-    array('A'));
-
-$headers = array(
-    _('Project Name'),
-    _('Registered'),
-    _('Unix Name'),
-    _('Is Public?')
-);
-if (forge_get_config('allow_external')) {
-    $headers[] = _("External?");
-}
-$headers[] = _('Members');
-$headers[] = _('Upgrade');
-
-$headerLinks = array(
-    '/wiki/wikilist.php?sortorder=group_name',
-    '/wiki/wikilist.php?sortorder=register_time',
-    '/wiki/wikilist.php?sortorder=unix_group_name',
-    '/wiki/wikilist.php?sortorder=is_public');
-if (forge_get_config('allow_external')) {
-    $headerLinks[] = '?sortorder=is_external';
-}
-$headerLinks[] = '/wiki/wikilist.php?sortorder=members';
-$headerLinks[] = '';
-
-echo $HTML->listTableTop($headers, $headerLinks);
-
-$i = 0;
-while ($grp = db_fetch_array($res)) {
-
-    $project = group_get_object($grp['group_id']);
-    if ($project->usesPlugin("wiki")) {
-        $time_display = "";
-        if ($grp['register_time'] != 0) {
-            $time_display = date('Y-m-d H:i', $grp['register_time']);
-        }
-        echo '<tr ' . $HTML->boxGetAltRowStyle($i) . '>';
-        echo '<td><a href="/wiki/g/' . $grp['unix_group_name'] . '/">' . $grp['group_name'] . '</a></td>';
-        echo '<td>' . $time_display . '</td>';
-        echo '<td>' . $grp['unix_group_name'] . '</td>';
-        echo '<td>' . $grp['is_public'] . '</td>';
-        if (forge_get_config('allow_external')) {
-            echo '<td>' . $grp['is_external'] . '</td>';
-        }
-        echo '<td>' . $grp['members'] . '</td>';
-        echo '<td><a title="'._('Upgrade').' '.$grp['group_name'].'" href="/wiki/g/'.$grp['unix_group_name'].'/?action=upgrade&amp;nodb=true">'._('Upgrade').'</a></td>';
-        echo '</tr>';
-        $i++;
-    }
-}
-
-echo $HTML->listTableBottom();
-
-site_admin_footer();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9865] trunk

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

Revision: 9865
          http://sourceforge.net/p/phpwiki/code/9865
Author:   vargenau
Date:     2016-07-08 11:32:02 +0000 (Fri, 08 Jul 2016)
Log Message:
-----------
Update pgsrc/Help%2FPhotoAlbumPlugin

Modified Paths:
--------------
    trunk/lib/plugin/PhotoAlbum.php
    trunk/pgsrc/Help%2FPhotoAlbumPlugin

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016-07-07 20:51:47 UTC (rev 9864)
+++ trunk/lib/plugin/PhotoAlbum.php	2016-07-08 11:32:02 UTC (rev 9865)
@@ -53,7 +53,7 @@
  *     semi-colon on each line. Listed files must be in same directory as textfile
  *     itself, so don't use relative paths inside textfile.
  *
- * "url": defines the the webpath to the srcdir directory (formerly called weblocation)
+ * "url": defines the webpath to the srcdir directory
  */
 
 /**

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2016-07-07 20:51:47 UTC (rev 9864)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2016-07-08 11:32:02 UTC (rev 9865)
@@ -1,4 +1,4 @@
-Date: Thu,  7 Jul 2016 22:43:03 +0000
+Date: Fri,  8 Jul 2016 13:31:18 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
@@ -6,8 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-The **~PhotoAlbum** [[Help:WikiPlugin|plugin]] makes an 'album' by displaying a set of photos listed in a text file
-with optional descriptions.
+The **~PhotoAlbum** [[Help:WikiPlugin|plugin]] makes an 'album' by displaying a set of photos listed in a text file with optional descriptions.
 
 == Usage ==
 
@@ -20,7 +19,6 @@
          sort=false
          height=100%
          width=100%
-         weblocation=>false
 >>
 }}}
 
@@ -40,13 +38,13 @@
 description of each photo. Photos listed in the text file have to be in same
 directory as the file. Descriptions are optional.
 
-If the the local path points to a directory, is relative from PHPWIKI_DIR,
-and the main script is in PHPWIKI_DIR, weblocation must not be given, and
+If the local path points to a directory, is relative from PHPWIKI_DIR,
+and the main script is in PHPWIKI_DIR, ##url## must not be given, and
 all pictures from this directory are displayed.
 |
 |-
 | **url**
-| Defines the the webpath to the srcdir directory (formerly called weblocation)
+| Defines the webpath to the srcdir directory
 |
 |-
 | **mode**
@@ -56,9 +54,15 @@
 * "thumbs" - WinXP thumbnail style
 * "tiles"  - WinXP tiles style
 * "list"   - WinXP list style
+* "row"    - inline thumbnails
+* "column" - photos full-size, displayed in 1 column
 * "slide"  - slideshow mode, needs Javascript on client
 | normal
 |-
+| **numcols**
+| photos per row, columns
+| 3
+|-
 | **showdesc**
 |
 * "none"   - No descriptions next to photos
@@ -75,6 +79,12 @@
 photo will be shown full-size. Only works when mode != 'normal'
 | true
 |-
+| **attrib**
+| attrib arg allows multiple attributes: attrib=sort,nowrap,alt
+* "sort" sorts alphabetically,
+* "nowrap" for cells,
+* "alt" to use descs instead of filenames in image ALT-tags
+|-
 | **align**
 | center, right or left
 | center
@@ -122,15 +132,23 @@
 | **tablewidth**
 |
 table (75|100%)
-|
+| false
 |-
 | **p**
 | "displaythissinglephoto.jpg" only
-|
+| false
 |-
 | **h**
 | "highlightcolorofthisphoto.jpg" only
-|
+| false
+|-
+| **duration**
+| in slide mode, duration in seconds
+| 6
+|-
+| **thumbswidth**
+| width of thumbnails
+| 80
 |}
 
 == Examples ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9864] trunk

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

Revision: 9864
          http://sourceforge.net/p/phpwiki/code/9864
Author:   vargenau
Date:     2016-07-07 20:51:47 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
Repair PhotoAlbumPlugin

Modified Paths:
--------------
    trunk/lib/plugin/PhotoAlbum.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016-07-07 20:50:41 UTC (rev 9863)
+++ trunk/lib/plugin/PhotoAlbum.php	2016-07-07 20:51:47 UTC (rev 9864)
@@ -494,7 +494,7 @@
                     $html->pushContent(HTML::div($row));
                 else
                     $html->pushContent(HTML::tr($row));
-                $row->setContent('');
+                $row = HTML();
             }
         }
 

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-07-07 20:50:41 UTC (rev 9863)
+++ trunk/pgsrc/ReleaseNotes	2016-07-07 20:51:47 UTC (rev 9864)
@@ -1,4 +1,4 @@
-Date: Mon, 23 May 2016 11:22:45 +0000
+Date: Thu,  7 Jul 2016 22:43:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -21,6 +21,7 @@
 * Valid HTML5 and CSS3 logos (in debug mode)
 * Add HTML 5 <main> <header> <footer> <nav> in all themes
 * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth.
+* Repair PhotoAlbumPlugin
 
 == 1.5.5 2015-12-11 Marc-Etienne Vargenau ==
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9863] trunk/pgsrc/Help%2FPhotoAlbumPlugin

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

Revision: 9863
          http://sourceforge.net/p/phpwiki/code/9863
Author:   vargenau
Date:     2016-07-07 20:50:41 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
Add default values

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPhotoAlbumPlugin

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2016-07-07 16:05:27 UTC (rev 9862)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2016-07-07 20:50:41 UTC (rev 9863)
@@ -1,4 +1,4 @@
-Date: Thu,  7 Jul 2016 18:02:20 +0000
+Date: Thu,  7 Jul 2016 22:43:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
@@ -57,7 +57,7 @@
 * "tiles"  - WinXP tiles style
 * "list"   - WinXP list style
 * "slide"  - slideshow mode, needs Javascript on client
-|
+| normal
 |-
 | **showdesc**
 |
@@ -65,7 +65,7 @@
 * "name"   - Only filename shown
 * "desc"   - Only description (from textfile) shown
 * "both"   - If no description found, then filename will be used
-|
+| both
 |-
 | **link**
 |
@@ -73,7 +73,7 @@
 
 If true, each image will be hyperlinked to a page where the single
 photo will be shown full-size. Only works when mode != 'normal'
-|
+| true
 |-
 | **align**
 | center, right or left
@@ -98,7 +98,7 @@
 | **height**, **width**
 |
 Height and width are calculated compared to original metrics
-retrieved by [php-function:getimagesize] and can be absolute (50px)
+retrieved by [[php-function:getimagesize]] and can be absolute (50px)
 or a percentage (e.g. "50%").
 |
 |-

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9862] trunk/pgsrc/Help%2FPhotoAlbumPlugin

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

Revision: 9862
          http://sourceforge.net/p/phpwiki/code/9862
Author:   vargenau
Date:     2016-07-07 16:05:27 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
Wikicreole syntax

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPhotoAlbumPlugin

Modified: trunk/pgsrc/Help%2FPhotoAlbumPlugin
===================================================================
--- trunk/pgsrc/Help%2FPhotoAlbumPlugin	2016-07-07 15:04:23 UTC (rev 9861)
+++ trunk/pgsrc/Help%2FPhotoAlbumPlugin	2016-07-07 16:05:27 UTC (rev 9862)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Thu,  7 Jul 2016 18:02:20 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPhotoAlbumPlugin;
@@ -26,7 +26,7 @@
 
 == Arguments ==
 
-//Only the ='src'= parameter is required.//
+Only the ##src## parameter is required.
 
 {| class="bordered"
 |-

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9861] trunk

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

Revision: 9861
          http://sourceforge.net/p/phpwiki/code/9861
Author:   vargenau
Date:     2016-07-07 15:04:23 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
Allow Wikicreole syntax for plugins in theme templates

Modified Paths:
--------------
    trunk/lib/Template.php
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/MonoBook/templates/tags.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Sidebar/templates/tags.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl
    trunk/themes/blog/templates/top.tmpl
    trunk/themes/default/templates/blogform.tmpl
    trunk/themes/default/templates/editpage.tmpl
    trunk/themes/fusionforge/templates/blogform.tmpl
    trunk/themes/fusionforge/templates/browse.tmpl
    trunk/themes/fusionforge/templates/editpage.tmpl
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/lib/Template.php	2016-07-07 15:04:23 UTC (rev 9861)
@@ -60,6 +60,10 @@
         $orig[] = '/<\?plugin.*?\?>/se';
         $repl[] = "\$this->_mungePlugin('\\0')";
 
+        // Convert <<expr>> to < ?php $this->_printPluginPI("expr"); ? >
+        $orig[] = '/<<.*?>>/se';
+        $repl[] = "\$this->_mungePlugin('\\0')";
+
         // Convert < ?= expr ? > to < ?php $this->_print(expr); ? >
         $orig[] = '/<\?=(.*?)\?>/s';
         $repl[] = '<?php $this->_print(\1);?>';
@@ -74,6 +78,9 @@
 
     private function _mungePlugin($pi)
     {
+        $pi = preg_replace('/^<</', '<?plugin ', $pi);
+        $pi = preg_replace('/>>$/', ' ?>', $pi);
+
         // HACK ALERT: PHP's preg_replace, with the /e option seems to
         // escape both single and double quotes with backslashes.
         // So we need to unescape the double quotes here...

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/Crao/templates/editpage.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -57,7 +57,7 @@
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>

Modified: trunk/themes/MonoBook/templates/tags.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/tags.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/MonoBook/templates/tags.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -3,7 +3,7 @@
 <div class="portlet" id="p-tags">
   <h2><?php echo _("Favorite Categories") ?></h2>
   <div class="pBody">
-    <?plugin PopularTags ?>
+    <<PopularTags>>
   </div>
 </div>
 </nav>

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/Portland/templates/editpage.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -39,7 +39,7 @@
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>

Modified: trunk/themes/Sidebar/templates/tags.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/tags.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/Sidebar/templates/tags.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -3,7 +3,7 @@
 <div class="portlet" id="p-tags">
   <h2><?php echo _("Favorite Categories") ?> <?php echo $WikiTheme->folderArrow('p-tags', 'Open') ?></h2>
   <div class="pBody" id="p-tags-body">
-    <?plugin PopularTags ?>
+    << PopularTags >>
   </div>
 </div>
 </nav>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -55,7 +55,7 @@
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>

Modified: trunk/themes/blog/templates/top.tmpl
===================================================================
--- trunk/themes/blog/templates/top.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/blog/templates/top.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -12,6 +12,6 @@
 <div id="actionbar">
 <?php echo Template('actionbar') ?>
 </div>
-<div id="pagetrail"><?php echo _("Page Trail")?>: <?plugin PageTrail numberlinks=7 ?></div>
+<div id="pagetrail"><?php echo _("Page Trail")?>: <<PageTrail numberlinks=7 >></div>
 <?php } ?>
 

Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/default/templates/blogform.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -22,7 +22,7 @@
 <hr />
 <div class="wiki-edithelp">
   <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-  <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+  <<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>

Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/default/templates/editpage.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -75,5 +75,5 @@
 <div class="wiki-edithelp">
 <?php // FIXME: do we need this at all?  If so, it could probably be moved to TextFormattingRules ?>
 <p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help")."/"._("GoodStyle"))) ?></p>
-<?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?>
+<<IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1>>
 </div>

Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/fusionforge/templates/blogform.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -21,7 +21,7 @@
 
 <hr />
 <div class="wiki-edithelp">
-  <?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
+  <<IncludePage page="TextFormattingRules" section="Synopsis" quiet=1>>
 </div>
 <?php echo $HIDDEN_INPUTS?>
 </form>

Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/fusionforge/templates/browse.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -30,7 +30,7 @@
 <?php } ?>
 
 <?php if ($curuserprefs->get('pageTrail')) { ?>
-<?plugin PageTrail ?>
+<<PageTrail>>
 <?php } ?>
 
 <?php echo $CONTENT?>

Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -103,8 +103,8 @@
 <hr />
 <div class="wiki-edithelp">
 <?php if (WIKI_NAME == "help") { ?>
-<?plugin IncludePage page="Help/TextFormattingRules" section="Synopsis" quiet=1?>
+<<IncludePage page="Help/TextFormattingRules" section="Synopsis" quiet=1>>
 <?php } else { ?>
-<?plugin IncludePage page="TextFormattingRules" section="Synopsis" quiet=1?>
+<<IncludePage page="TextFormattingRules" section="Synopsis" quiet=1>>
 <?php } ?>
 </div>

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2016-07-07 14:55:58 UTC (rev 9860)
+++ trunk/themes/wikilens/templates/body.tmpl	2016-07-07 15:04:23 UTC (rev 9861)
@@ -17,7 +17,7 @@
   <?php echo Template('navbar') ?>
 </div>
 <hr />
-<?plugin IncludePage page="LeftbarContent" quiet="true" ?>
+<<IncludePage page="LeftbarContent" quiet="true" >>
 </nav>
 </td>
 <td class="content">

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9860] trunk/lib/plugin/PhotoAlbum.php

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

Revision: 9860
          http://sourceforge.net/p/phpwiki/code/9860
Author:   vargenau
Date:     2016-07-07 14:55:58 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
Use CSS

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

Modified: trunk/lib/plugin/PhotoAlbum.php
===================================================================
--- trunk/lib/plugin/PhotoAlbum.php	2016-07-07 13:59:29 UTC (rev 9859)
+++ trunk/lib/plugin/PhotoAlbum.php	2016-07-07 14:55:58 UTC (rev 9860)
@@ -501,7 +501,7 @@
         //create main table
         $table_attributes = array(
             "class" => "photoalbum",
-            "width" => $tablewidth ? $tablewidth : "100%");
+            "style" => $tablewidth ? "width: ".$tablewidth : "width: 100%");
 
         if (!empty($tableheight))
             $table_attributes = array_merge($table_attributes,
@@ -509,7 +509,7 @@
         if ($mode != 'row')
             $html = HTML::table($table_attributes, $html);
         // align all
-        return HTML::div(array("align" => $align), $html);
+        return HTML::div(array("class" => "align-".$align), $html);
     }
 
     /**

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9859] trunk/pgsrc

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

Revision: 9859
          http://sourceforge.net/p/phpwiki/code/9859
Author:   vargenau
Date:     2016-07-07 13:59:29 +0000 (Thu, 07 Jul 2016)
Log Message:
-----------
Wikicreole syntax; smart quotes

Modified Paths:
--------------
    trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
    trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
    trunk/pgsrc/Help%2FPagePermissions
    trunk/pgsrc/Help%2FWabiSabi

Modified: trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
===================================================================
--- trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users	2016-06-25 19:47:28 UTC (rev 9858)
+++ trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users	2016-07-07 13:59:29 UTC (rev 9859)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Thu,  7 Jul 2016 15:54:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAdvice%20for%20Mediawiki%20users;
@@ -16,8 +16,8 @@
 * Italics are ##//## (but you can also use ##''## like in Wikipedia)
 * Bold is ##~*~*## (you //cannot use// ##'''## like in Wikipedia)
 * Line break is ##~\~\## in Wikicreole, ##~<br />## in Mediawiki
-* There is **no automatic capitalisation** of first character of page name. Pages *<samp>~[~[foo~]~]</samp>* and *<samp>~[~[Foo~]~]</samp>* are different.
-* A space in a page name in not equivalent to an underscore. Pages *<samp>~[~[foo bar~]~]</samp>* and *<samp>~[~[foo_bar~]~]</samp>* are different. We recommend to use a space in the page names.
+* There is **no automatic capitalisation** of first character of page name. Pages **<samp>~[~[foo~]~]</samp>** and **<samp>~[~[Foo~]~]</samp>** are different.
+* A space in a page name in not equivalent to an underscore. Pages **<samp>~[~[foo bar~]~]</samp>** and **<samp>~[~[foo_bar~]~]</samp>** are different. We recommend to use a space in the page names.
 * Many things that are built-in in Mediawiki use plug-ins in Phpwiki (table of contents, redirections, back links, etc.).
 * Redirections are less sophisticated in Phpwiki (e.g. backlinks do not show redirected pages)
 

Modified: trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin
===================================================================
--- trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin	2016-06-25 19:47:28 UTC (rev 9858)
+++ trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin	2016-07-07 13:59:29 UTC (rev 9859)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Thu,  7 Jul 2016 15:54:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAnalyseAccessLogSqlPlugin;
@@ -13,7 +13,7 @@
 
 A small number of queries that may (or might not) use the ~MySQL
 specific dialect of SQL are provided in ##lib/plugin/~AnalyseAccessLogSql.php##.
-For more information, please see the section *Adding new queries* below.
+For more information, please see the section **Adding new queries** below.
 
 == Usage ==
 
@@ -32,15 +32,15 @@
 ! Default value
 |-
 | **mode**
-| The name of the query to execute. See *Adding new queries* below. Required parameter.
+| The name of the query to execute. See **Adding new queries** below. Required parameter.
 | referring_domains
 |-
 | **period**
-| Use in combination with the _count_ parameter. The type of history period to retrieve from the SQL access log. Blank (the default) for all history, or one of "*weeks*", "*days*", "*hours*", or "*minutes*".
+| Use in combination with the //count// parameter. The type of history period to retrieve from the SQL access log. Blank (the default) for all history, or one of “**weeks**”, “**days**”, “**hours**”, or “**minutes**”.
 |
 |-
 | **count**
-| Use in combination with the _period_ parameter. Must be a number. The number of periods to retrieve from the access log.
+| Use in combination with the //period// parameter. Must be a number. The number of periods to retrieve from the access log.
 | 0
 |-
 | **caption**
@@ -56,7 +56,7 @@
 |
 |-
 | **user**
-| Blank (the default) to retrieve all users, or a specific user, or "*<NONE>*" for SQL access log entries with no user.
+| Blank (the default) to retrieve all users, or a specific user, or “**<NONE>**” for SQL access log entries with no user.
 |
 |-
 | **host**
@@ -64,7 +64,7 @@
 |
 |-
 | **referrer**
-| Blank (the default) to retrieve all referrers, "*<NONE>*" to retrieve entries with no referrer, otherwise any referrer that matches this parameter, truncating longer referrers before matching. So a parameter of referrer='~http://localhost' will match '~http://localhost/wiki/index.php', '~http://localhost/wiki/index.php/~HomePage' etc.
+| Blank (the default) to retrieve all referrers, “**<NONE>**” to retrieve entries with no referrer, otherwise any referrer that matches this parameter, truncating longer referrers before matching. So a parameter of referrer='~http://localhost' will match '~http://localhost/wiki/index.php', '~http://localhost/wiki/index.php/~HomePage' etc.
 |
 |-
 | **local_referrers**
@@ -77,7 +77,7 @@
 The file ##lib/plugin/~AnalyseAccessLogSql.php## contains a default set of queries against the SQL access log.
 Feel free to change this file to suit your own needs, but please note that this requires filesystem access to the web server where ~PhpWiki is running.
 In particular, this file may need to be modified to correctly query databases other than MySQL.
-The queries supplied by default are: "*Referring URLs*", "*Referring Domains*", "*Remote Hosts*", "*Users*" and "*Host Users*".
+The queries supplied by default are: “**Referring URLs**”, “**Referring Domains**”, “**Remote Hosts**”, “**Users**” and “**Host Users**”.
 
 To add a new query, add a new section towards the end of the file, using one of the existing queries as a template. An example of an existing query is:
 <pre>
@@ -95,27 +95,27 @@
 == API for ~AnalyseAccessLogSql ==
 
 * input arguments:
-  - *$mode* contains the name of the query requested in the plugin parameters.
-  - *$accesslog* contains the qualified name of the accesslog table, which may or may not be equal to "accesslog".
-  - *$whereConditions* contains the conditions (specific user, etc.) requested in the plugin parameters.
+  - **$mode** contains the name of the query requested in the plugin parameters.
+  - **$accesslog** contains the qualified name of the accesslog table, which may or may not be equal to “accesslog”.
+  - **$whereConditions** contains the conditions (specific user, etc.) requested in the plugin parameters.
 
 * output:
-  - *$query* must contain the final SQL query to be executed.
+  - **$query** must contain the final SQL query to be executed.
 
 * conventions:
   - While constructing the query string,
     * each clause is on a separate line and
     * each clause contains the required trailing punctuation or space.
   - The mode parameter is, by default, displayed as the caption in the final output, so please choose a user friendly name.
-  - The column names displayed on the wiki page are generated from the SQL column names defined in the queries, so please choose user friendly names. MySQL allows column names to include spaces.  If spaces are not allowed, then "*_*" is probably the next best choice.
+  - The column names displayed on the wiki page are generated from the SQL column names defined in the queries, so please choose user friendly names. MySQL allows column names to include spaces.  If spaces are not allowed, then “**_**” is probably the next best choice.
 
 * language hints for PHP newbies - please remember:
-  - terminate statements with "*;*",
-  - assignment uses "*=*" and comparison uses "*==*",
-  - concatenate strings using the "*.*" operator,
-  - the parentheses around the expression "*=($whereConditions ? 'WHERE '.$whereConditions : '' )=*" are essential,
+  - terminate statements with “**;**”,
+  - assignment uses “**=**” and comparison uses “**==**”,
+  - concatenate strings using the “**.**” operator,
+  - the parentheses around the expression “**=($whereConditions ? 'WHERE '.$whereConditions : '' )=**” are essential,
   - strings enclosed in single quotes may not contain substrings enclosed in single quotes (actually the truth is more complex but let's leave it like that here), and
-  - strings enclosed in double quotes will evaluate and replace variable names so that, for example, *"FROM $accesslog "* might be evaluated to *"FROM phpwiki_accesslog "*.
+  - strings enclosed in double quotes will evaluate and replace variable names so that, for example, **"FROM $accesslog"** might be evaluated to **"FROM phpwiki_accesslog"**.
 
 == Authors ==
 * Charles Corrigan

Modified: trunk/pgsrc/Help%2FPagePermissions
===================================================================
--- trunk/pgsrc/Help%2FPagePermissions	2016-06-25 19:47:28 UTC (rev 9858)
+++ trunk/pgsrc/Help%2FPagePermissions	2016-07-07 13:59:29 UTC (rev 9859)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Thu,  7 Jul 2016 15:54:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPagePermissions;
@@ -55,15 +55,15 @@
        list in PageList => list
 }}}
 
-For simplicity we also map the ACL to the posix-style _owner_, _group_ and _world_ groups
-and _read_, _write_, _execute_ perms, in cygwin fashion.
+For simplicity we also map the ACL to the posix-style //owner//, //group// and //world// groups
+and //read//, //write//, //execute// perms, in cygwin fashion.
 
 == Groups - definition of group membership ==
 
 See ~WikiGroup how to enable and where to store user-specific group membership.
 Group methods: database, file, ldap, wikipage, none
 
-To do: _explain better._
+To do: //explain better.//
 
 The following special groups are always predefined, even if no other group methods are provided:
 * _EVERY
@@ -85,7 +85,7 @@
 == Perms - mapping of actions to permissions ==
 
 ~PhpWiki supports individual actions, the default is browse. To simplify ACL's these
-actions are mapped to some special permissions (vulgo _'perms'_).
+actions are mapped to some special permissions (vulgo //'perms'//).
 
 We currently support the following permissions which can be stored in every page, for every group.
 

Modified: trunk/pgsrc/Help%2FWabiSabi
===================================================================
--- trunk/pgsrc/Help%2FWabiSabi	2016-06-25 19:47:28 UTC (rev 9858)
+++ trunk/pgsrc/Help%2FWabiSabi	2016-07-07 13:59:29 UTC (rev 9859)
@@ -1,4 +1,4 @@
-Date: Thu, 10 Dec 2015 18:48:03 +0000
+Date: Thu,  7 Jul 2016 15:54:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWabiSabi;
@@ -10,26 +10,25 @@
 aesthetic system, it is difficult to explain precisely in western
 terms.  According to Leonard Koren, wabi-sabi is the most conspicuous
 and characteristic feature of what we think of as traditional Japanese
-beauty and it //"occupies roughly the same position in the Japanese
+beauty and it //“occupies roughly the same position in the Japanese
 pantheon of aesthetic values as do the Greek ideals of beauty and
-perfection in the West."//
+perfection in the West.”//
 
-_"Wabi-sabi is a beauty of things imperfect, impermanent, and_
-_incomplete._
+//“Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.”//
 
-_"It is the beauty of things modest and humble._
+//“It is the beauty of things modest and humble.”//
 
-_"It is the beauty of things unconventional."_
+//“It is the beauty of things unconventional.”//
 
-(quoted from "[WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS | http://www.amazon.com/exec/obidos/tg/detail/-/1880656124/qid=1054098290/sr=1-1/ref=sr_1_1/104-9834820-5562358?v=glance&s=books]," 1994, Leonard Koren)
+(quoted from “[[http://www.amazon.com/exec/obidos/tg/detail/-/1880656124/qid=1054098290/sr=1-1/ref=sr_1_1/104-9834820-5562358?v=glance&s=books|WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS]],” 1994, Leonard Koren)
 
 The concepts of wabi-sabi correlate with the concepts of Zen Buddhism,
 as the first Japanese involved with wabi-sabi were tea masters,
 priests, and monks who practiced Zen. Zen Buddhism originated in
 India, traveled to China in the 6th century, and was first introduced
-in Japan around the 12th century. Zen emphasizes //"direct, intuitive
+in Japan around the 12th century. Zen emphasizes //“direct, intuitive
 insight into transcendental truth beyond all intellectual
-conception."// At the core of wabi-sabi is the importance of
+conception.”// At the core of wabi-sabi is the importance of
 transcending ways of looking and thinking about things/existence.
 
 * All things are impermanent
@@ -38,14 +37,14 @@
 
 (also taken from WABI-SABI: FOR ARTISTS,DESIGNERS, POETS & PHILOSOPHERS, 1994, Leonard Koren):
 
-_Material characteristics of wabi-sabi:_
+//Material characteristics of wabi-sabi://
 
-* _suggestion of natural process_
-* _irregular_
-* _intimate_
-* _unpretentious_
-* _earthy_
-* _simple_
+* //suggestion of natural process//
+* //irregular//
+* //intimate//
+* //unpretentious//
+* //earthy//
+* //simple//
 
 For more about wabi-sabi, see [[http://c2.com/cgi/wiki?WabiSabi]].
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9858] trunk/pgsrc/Help%2FWikisUsingPhpWiki

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

Revision: 9858
          http://sourceforge.net/p/phpwiki/code/9858
Author:   vargenau
Date:     2016-06-25 19:47:28 +0000 (Sat, 25 Jun 2016)
Log Message:
-----------
Update pgsrc/Help%2FWikisUsingPhpWiki

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-06-16 15:56:51 UTC (rev 9857)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-06-25 19:47:28 UTC (rev 9858)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Jun 2016 17:55:45 +0000
+Date: Sat, 25 Jun 2016 17:55:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -8,61 +8,58 @@
 
 Here are some wikis using ~PhpWiki:
 
-|= URL                                                             |= ~PhpWiki release
-| http://adammoore.me.uk                                           | ??
-| http://alsach.at/phpwiki/                                        | 1.4.0RC1
+|= URL                                                             |= ~PhpWiki release | Theme
+| http://adammoore.me.uk                                           | 1.3.12p2          | Crao
+| http://alsach.at/phpwiki/                                        | 1.4.0RC1          | default
 | http://astro.milantiev.com/                                      | 1.5.5
-| http://bayernprovider.info                                       | 1.4.0RC1
-| http://bh.hallikainen.org                                        | 1.5.4
-| http://brainyplanet.com                                          | 1.3.11p1
-| http://crdo.up.univ-aix.fr/phpwiki/                              | 1.3.14
-| http://danm.ucsc.edu/web/                                        | 1.3.14
-| http://dev.cmeerw.org                                            | 1.5.5
-| http://drtedwilliams.net/kb/                                     | 1.3.14
-| http://esk.uz                                                    | 1.3.14
+| http://bayernprovider.info                                       | 1.4.0RC1          | Sidebar
+| http://bh.hallikainen.org                                        | 1.5.5             | Sidebar
+| http://brainyplanet.com                                          | 1.3.11p1          | default
+| http://crdo.up.univ-aix.fr/phpwiki/                              | 1.3.14            | default
+| http://danm.ucsc.edu/web/                                        | 1.3.14            | danm (custom)
+| http://dev.cmeerw.org                                            | 1.5.5             | Sidebar
+| http://drtedwilliams.net/kb/                                     | 1.3.14            | MacOSX
 | http://helpdesk.razorline.com/wiki/                              | 1.4.0RC1
 | http://ifellner.de/ingowiki/                                     | 1.4.0RC1
-| http://indiainvestments.awardspace.com                           | 1.3.12p2
+| http://indiainvestments.awardspace.com                           | 1.3.12p2          | default
 | http://iwant2know.net/singaporewiki/                             | 1.4.0RC1
 | http://logix.me/wiki/                                            | 1.4.0RC1
-| http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1
-| http://mtswiki.westwood-tech.com/mtswiki-index.php               | 1.4.0RC1
-| http://neckbeard.us/HomePage                                     | 1.5.4
+| http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1          | ~MonoBook
+| http://mtswiki.westwood-tech.com/mtswiki-index.php               | 1.4.0RC1          | default
+| http://neckbeard.us                                              | 1.5.4             | Sidebar
 | http://nextdoordiscount.com/nydba/                               | 1.4.0RC1
-| http://ohg82er.de/wiki/index.php/StartSeite                      | 1.3.2-jeffs-hacks
-| http://oldwiki.mingw.org                                         | 1.3.14
+| http://ohg82er.de/wiki/index.php/StartSeite                      | 1.3.2-jeffs-hacks | ~DigiLog (custom)
+| http://oldwiki.mingw.org                                         | 1.3.14            | default
 | http://open-innovation.alcatel-lucent.com/wiki/g/help/           | 1.3.14
-| http://pcsgwiki.com/wiki/                                        | 1.3.14
+| http://pcsgwiki.com/wiki/                                        | 1.3.14            | default
 | http://php-rql.dnsalias.net/wiki/                                | 1.4.0RC1
 | http://profit.colegiolasalleguaparo.edu.ve/wiki/                 | 1.3.14
-| http://rec-puzzles.org                                           | 1.3.11p1
-| http://rhythsmbox.com/wiki/index.php                             | 1.4.0RC1
-| http://sldr-test.lpl-aix.fr/phpwiki/                             | 1.3.14
-| http://stardrive.genesismuds.com/index.php/                      | 1.4.0RC1
-| https://storage.ct.infn.it/                                      | 1.3.10
+| http://rec-puzzles.org                                           | 1.3.11p1          | default
+| http://rhythsmbox.com/wiki/                                      | 1.4.0RC1
+| http://sldr-test.lpl-aix.fr/phpwiki/                             | 1.3.14            | default
+| http://stardrive.genesismuds.com/                                | 1.4.0RC1
+| http://storage.ct.infn.it/                                       | 1.3.10            | Crao
 | http://tuleap.net/wiki/index.php?pagename=HomePage&group_id=101  | ??
-| http://utenmelk.no/wiki/                                         | 1.4.0RC1
-| http://wac-tk.drni.de                                            | 1.3.11p1
-| http://wiki.cyberleo.net                                         | 1.4.0RC1
-| http://wiki.inde-mayenne.org                                     | 1.3.14
-| http://wiki.prideindustries.com                                  | 1.4.0RC1
-| http://wiki.rheelweb.co.nz                                       | 1.3.12p3
+| http://utenmelk.no/wiki/                                         | 1.4.0RC1          | Wordpress
+| http://wac-tk.drni.de                                            | 1.3.11p1          | Crao
+| http://wiki.cyberleo.net                                         | 1.4.0RC1          | MacOSX
+| http://wiki.prideindustries.com                                  | 1.4.0RC1          | Sidebar
+| http://wiki.rheelweb.co.nz                                       | 1.3.12p3          | Crao
+| http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil           | 1.4.0RC1          | default
 | http://www.allpsych.uni-giessen.de/wikidump/HomePage.html        | ??
-| http://www-bd.lip6.fr/ens/li345-2011/index.php/Accueil           | 1.4.0RC1
-| http://www.calt.insead.edu/LivingLab/AtGentive/Wiki/             | 1.3.14
+| http://www.calt.insead.edu/LivingLab/AtGentive/Wiki/             | 1.3.14            | ~AtGentive (custom)
 | http://www.dkbush.com/zphpwiki/                                  | 1.3.14
 | http://www.drtedwilliams.net/kb/                                 | 1.3.14
 | http://www.e38.org/phpwiki/                                      | 1.3.14
 | http://www.geroedel.de/wiki/                                     | 1.4.0
-| http://www.hollenback.net                                        | 1.4.0RC1
-| http://www.kcpralumni.org/wiki/                                  | 1.5.4
-| http://www.main.org/fcc/                                         | 1.3.4pre
+| http://www.hollenback.net                                        | 1.5.4             | Sidebar
+| http://www.kcpralumni.org/wiki/                                  | 1.5.4             | Sidebar
+| http://www.main.org/fcc/                                         | 1.3.4pre          | default
 | http://www.michelsystems.com/phpwiki/                            | 1.4.0RC1
-| http://www.mtjezreel.com/phpwiki/                                | 1.3.14
+| http://www.mtjezreel.com/phpwiki/                                | 1.3.14            | Crao
 | http://www.personalwelt.org                                      | 1.4.0RC1
 | http://www.the-bees-knees.info/phpwiki/                          | 1.5.4
-| http://www.toledoans.us/dart/index.php/HomePage                  | ??
-| http://www.wendellregenerative.info/index.php/HomePage           | ??
-| http://www.wmsforums.com/wiki/                                   | 1.3.14
-| http://xulfr.org/wiki/                                           | ??
+| http://www.toledoans.us/dart/index.php/HomePage                  | 1.3.11
+| http://www.wendellregenerative.info/index.php/HomePage           | 1.4.0RC1
+| http://www.wmsforums.com/wiki/                                   | 1.3.14            | default
 | http://zombiecouncil.com/zwiki/                                  | 1.4.0RC1

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9857] trunk/pgsrc/Help%2FWikisUsingPhpWiki

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

Revision: 9857
          http://sourceforge.net/p/phpwiki/code/9857
Author:   vargenau
Date:     2016-06-16 15:56:51 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
Add http://astro.milantiev.com/ in Help/WikisUsingPhpWiki

Modified Paths:
--------------
    trunk/pgsrc/Help%2FWikisUsingPhpWiki

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-06-16 15:50:45 UTC (rev 9856)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2016-06-16 15:56:51 UTC (rev 9857)
@@ -1,4 +1,4 @@
-Date: Fri, 29 Jan 2016 14:32:30 +0000
+Date: Thu, 16 Jun 2016 17:55:45 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.5)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -11,6 +11,7 @@
 |= URL                                                             |= ~PhpWiki release
 | http://adammoore.me.uk                                           | ??
 | http://alsach.at/phpwiki/                                        | 1.4.0RC1
+| http://astro.milantiev.com/                                      | 1.5.5
 | http://bayernprovider.info                                       | 1.4.0RC1
 | http://bh.hallikainen.org                                        | 1.5.4
 | http://brainyplanet.com                                          | 1.3.11p1

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9856] trunk/lib/WikiCallback.php

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

Revision: 9856
          http://sourceforge.net/p/phpwiki/code/9856
Author:   vargenau
Date:     2016-06-16 15:50:45 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
No public needed for function __construct

Modified Paths:
--------------
    trunk/lib/WikiCallback.php

Modified: trunk/lib/WikiCallback.php
===================================================================
--- trunk/lib/WikiCallback.php	2016-05-25 16:21:23 UTC (rev 9855)
+++ trunk/lib/WikiCallback.php	2016-06-16 15:50:45 UTC (rev 9856)
@@ -52,7 +52,7 @@
     /**
      * @param string $functionName Name of global function to call.
      */
-    public function __construct($functionName)
+    function __construct($functionName)
     {
         $this->functionName = $functionName;
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9855] trunk

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

Revision: 9855
          http://sourceforge.net/p/phpwiki/code/9855
Author:   vargenau
Date:     2016-05-25 16:21:23 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Use jquery.autoheight.js plugin for Transclude plugin

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/lib/plugin/Transclude.php

Added Paths:
-----------
    trunk/themes/default/jquery.autoheight.js

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-05-25 12:30:10 UTC (rev 9854)
+++ trunk/lib/WikiTheme.php	2016-05-25 16:21:23 UTC (rev 9855)
@@ -262,6 +262,7 @@
             $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-2.2.4.min.js"))));
             $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js"))));
         }
+        $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.autoheight.js"))));
         // by pixels
         if ((is_object($request) // guard against unittests
             and $request->getPref('doubleClickEdit'))

Modified: trunk/lib/plugin/Transclude.php
===================================================================
--- trunk/lib/plugin/Transclude.php	2016-05-25 12:30:10 UTC (rev 9854)
+++ trunk/lib/plugin/Transclude.php	2016-05-25 16:21:23 UTC (rev 9855)
@@ -102,8 +102,7 @@
             'height' => $height,
             'marginwidth' => 0,
             'marginheight' => 0,
-            'class' => 'transclude',
-            "onload" => "adjust_iframe_height(this);");
+            'class' => 'autoHeight transclude');
 
         $noframe_msg[] = fmt("See: %s", HTML::a(array('href' => $src), $src));
 
@@ -117,47 +116,10 @@
         */
 
         if ($quiet) {
-            return HTML($this->_js(), $iframe);
+            return $iframe;
         } else {
             return HTML(HTML::p(array('class' => 'transclusion-title'),
-                    fmt("Transcluded from %s", LinkURL($src))),
-                $this->_js(), $iframe);
+                    fmt("Transcluded from %s", LinkURL($src))), $iframe);
         }
     }
-
-    /**
-     * Produce our javascript.
-     *
-     * This is used to resize the iframe to fit the content.
-     * Currently it only works if the transcluded document comes
-     * from the same server as the wiki server.
-     */
-    private function _js()
-    {
-        static $seen = false;
-
-        if ($seen)
-            return '';
-        $seen = true;
-
-        return JavaScript('
-          function adjust_iframe_height(frame) {
-            var content = frame.contentDocument;
-            try {
-                frame.height = content.height + 2 * frame.marginHeight;
-            }
-            catch (e) {
-              // Cannot get content.height unless transcluded doc
-              // is from the same server...
-              return;
-            }
-          }
-
-          window.addEventListener("resize", function() {
-            f = this.document.body.getElementsByTagName("iframe");
-            for (var i = 0; i < f.length; i++)
-              adjust_iframe_height(f[i]);
-          }, false);
-          ');
-    }
 }

Added: trunk/themes/default/jquery.autoheight.js
===================================================================
--- trunk/themes/default/jquery.autoheight.js	                        (rev 0)
+++ trunk/themes/default/jquery.autoheight.js	2016-05-25 16:21:23 UTC (rev 9855)
@@ -0,0 +1,33 @@
+function doIframe(){
+    o = document.getElementsByTagName('iframe');
+    for(i=0;i<o.length;i++){
+        if (/\bautoHeight\b/.test(o[i].className)){
+            setHeight(o[i]);
+            addEvent(o[i],'load', doIframe);
+        }
+    }
+}
+
+function setHeight(e){
+    if(e.contentDocument){
+        e.height = e.contentDocument.body.offsetHeight + 35;
+    } else {
+        e.height = e.contentWindow.document.body.scrollHeight;
+    }
+}
+
+function addEvent(obj, evType, fn){
+    if(obj.addEventListener) {
+        obj.addEventListener(evType, fn,false);
+        return true;
+    } else if (obj.attachEvent){
+        var r = obj.attachEvent("on"+evType, fn);
+        return r;
+    } else {
+        return false;
+    }
+}
+
+if (document.getElementById && document.createTextNode){
+    addEvent(window,'load', doIframe);
+}

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

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

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

Revision: 9854
          http://sourceforge.net/p/phpwiki/code/9854
Author:   vargenau
Date:     2016-05-25 12:30:10 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/lib/BlockParser.php
    trunk/lib/Template.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/editpage.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/upgrade.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2016-05-25 12:16:28 UTC (rev 9853)
+++ trunk/lib/BlockParser.php	2016-05-25 12:30:10 UTC (rev 9854)
@@ -242,7 +242,7 @@
         //return ;
         $where = $this->where();
         $tab = str_repeat('____', $this->getDepth()) . $tab;
-        printXML(HTML::div("$tab $msg: at: '",
+        PrintXML(HTML::div("$tab $msg: at: '",
             HTML::samp($where),
             "'"));
         flush();

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-05-25 12:16:28 UTC (rev 9853)
+++ trunk/lib/Template.php	2016-05-25 12:30:10 UTC (rev 9854)
@@ -266,7 +266,7 @@
     if (!isset($args['HEADER']))
         $args['HEADER'] = $title;
 
-    printXML(new Template('html', $request, $args));
+    PrintXML(new Template('html', $request, $args));
 }
 
 /**

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-05-25 12:16:28 UTC (rev 9853)
+++ trunk/lib/WikiPluginCached.php	2016-05-25 12:30:10 UTC (rev 9854)
@@ -1054,7 +1054,7 @@
             // It is important that you close any pipes before calling
             // proc_close in order to avoid a deadlock
             proc_close($process);
-            if (empty($buf)) printXML($this->error($stderr));
+            if (empty($buf)) PrintXML($this->error($stderr));
             return $buf;
         }
         return '';

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016-05-25 12:16:28 UTC (rev 9853)
+++ trunk/lib/editpage.php	2016-05-25 12:30:10 UTC (rev 9854)
@@ -644,7 +644,7 @@
                 $WikiTheme->addMoreHeaders($js);
                 $WikiTheme->addMoreAttr('body', "SearchReplace", " onload='define_f()'");
             } else { // from an actionpage: WikiBlog, AddComment, WikiForum
-                printXML($js);
+                PrintXML($js);
             }
         } else {
             $WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()");
@@ -660,9 +660,9 @@
                 $WikiTheme->addMoreHeaders($init);
                 $WikiTheme->addMoreHeaders($js);
             } else { // from an actionpage: WikiBlog, AddComment, WikiForum
-                printXML($init);
-                printXML($js);
-                printXML(JavaScript('define_f()'));
+                PrintXML($init);
+                PrintXML($js);
+                PrintXML(JavaScript('define_f()'));
             }
             $toolbar = HTML::div(array('class' => 'edit-toolbar', 'id' => 'toolbar'));
             $toolbar->pushContent(HTML::input(array('src' => $WikiTheme->getImageURL("ed_save.png"),

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016-05-25 12:16:28 UTC (rev 9853)
+++ trunk/lib/plugin/RecentChanges.php	2016-05-25 12:30:10 UTC (rev 9854)
@@ -451,7 +451,7 @@
         $sidebar_button = $WikiTheme->makeButton("sidebar", 'javascript:addPanel();', 'sidebaricon',
             array('title' => _("Click to add this feed to your sidebar"),
                 'style' => 'font-size:9pt;font-weight:normal; vertical-align:middle;'));
-        $addsidebarjsclick = asXML($sidebar_button);
+        $addsidebarjsclick = AsXML($sidebar_button);
         $jsc = JavaScript("if ((typeof window.sidebar == 'object') &&\n"
                 . "    (typeof window.sidebar.addPanel == 'function'))\n"
                 . "   {\n"
@@ -744,11 +744,11 @@
         printf("<title>" . $title . "</title>\n");
         global $WikiTheme;
         $css = $WikiTheme->getCSS();
-        $css->PrintXML();
+        $css->printXML();
         printf("</head>\n");
 
         printf("<body class=\"sidebar\">\n");
-        $html->PrintXML();
+        $html->printXML();
         echo '<a href="http://www.feedvalidator.org/check.cgi?url=http://phpwiki.fr/RecentChanges?format=rss"><img src="themes/default/buttons/valid-rss.png" alt="[Valid RSS]" title="Validate the RSS feed" width="44" height="15" /></a>';
         printf("\n</body>\n");
         printf("</html>\n");

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-05-25 12:16:28 UTC (rev 9853)
+++ trunk/lib/upgrade.php	2016-05-25 12:30:10 UTC (rev 9854)
@@ -816,7 +816,7 @@
                     HTML::raw('&nbsp;'),
                     Button("submit:dbadmin[cancel]", _("Cancel"),
                         'button')))));
-        $form->printXml();
+        $form->printXML();
         echo "</div><!-- content -->\n";
         echo AsXML(Template("bottom"));
         echo "</body></html>\n";

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

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

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

Revision: 9853
          http://sourceforge.net/p/phpwiki/code/9853
Author:   vargenau
Date:     2016-05-25 12:16:28 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/lib/Captcha.php
    trunk/lib/Template.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/upgrade.php

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016-05-25 10:30:28 UTC (rev 9852)
+++ trunk/lib/Captcha.php	2016-05-25 12:16:28 UTC (rev 9853)
@@ -102,7 +102,7 @@
     function get_dictionary_word()
     {
         // Load In the Word List
-        $fp = fopen(findfile("lib/captcha/dictionary"), "r");
+        $fp = fopen(findFile("lib/captcha/dictionary"), "r");
         $text = array();
         while (!feof($fp))
             $text[] = trim(fgets($fp, 1024));
@@ -170,7 +170,7 @@
             elseif ($y > $height - 10) $y = $height - 11;
             $x += rand($size, $size * 2);
             imagettftext($jpg, $size, $angle, $x, $y, $tx,
-                realpath(findfile("lib/captcha/Vera.ttf")),
+                realpath(findFile("lib/captcha/Vera.ttf")),
                 $word[$i]);
         }
 

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-05-25 10:30:28 UTC (rev 9852)
+++ trunk/lib/Template.php	2016-05-25 12:16:28 UTC (rev 9853)
@@ -294,7 +294,7 @@
         $WikiTheme->DUMP_MODE = 'HTML';
 
     // FIXME: unfatal errors and login requirements
-    $html = asXML(new Template('htmldump', $request, $args));
+    $html = AsXML(new Template('htmldump', $request, $args));
 
     $HIDE_TOOLBARS = false;
     //$WikiTheme->DUMP_MODE = false;

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2016-05-25 10:30:28 UTC (rev 9852)
+++ trunk/lib/plugin/RecentChanges.php	2016-05-25 12:16:28 UTC (rev 9853)
@@ -688,7 +688,7 @@
         $linkurl->setAttr('target', '_content');
         $linkurl->setAttr('rel', 'nofollow');
         // FIXME: Smelly hack to get smaller diff buttons in sidebar
-        $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', asXML($linkurl)));
+        $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', AsXML($linkurl)));
         return $linkurl;
     }
 
@@ -697,7 +697,7 @@
         $linkurl = parent::historyLink($rev);
         $linkurl->setAttr('target', '_content');
         // FIXME: Smelly hack to get smaller history buttons in sidebar
-        $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', asXML($linkurl)));
+        $linkurl = new RawXML(str_replace('<img ', '<img style="height:2ex" ', AsXML($linkurl)));
         return $linkurl;
     }
 

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-05-25 10:30:28 UTC (rev 9852)
+++ trunk/lib/upgrade.php	2016-05-25 12:16:28 UTC (rev 9853)
@@ -818,7 +818,7 @@
                         'button')))));
         $form->printXml();
         echo "</div><!-- content -->\n";
-        echo asXML(Template("bottom"));
+        echo AsXML(Template("bottom"));
         echo "</body></html>\n";
         $this->request->finish();
         exit();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9852] trunk

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

Revision: 9852
          http://sourceforge.net/p/phpwiki/code/9852
Author:   vargenau
Date:     2016-05-25 10:30:28 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/doc/HISTORY
    trunk/lib/FileFinder.php
    trunk/lib/Google.php
    trunk/lib/IniConfig.php
    trunk/lib/PageType.php
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/backend/ADODB_sqlite.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/plugin/SqlResult.php
    trunk/lib/plugin/SystemInfo.php
    trunk/lib/plugin/WikiTranslation.php
    trunk/lib/stdlib.php
    trunk/lib/upgrade.php
    trunk/pgsrc/ReleaseNotes

Modified: trunk/doc/HISTORY
===================================================================
--- trunk/doc/HISTORY	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/doc/HISTORY	2016-05-25 10:30:28 UTC (rev 9852)
@@ -59,7 +59,7 @@
 * new Error-style with collapsed output of repeated messages
 * trim pagenames to avoid abuse
 * no double login page header, better login msg.
-* improved FileFinder include_path logic (NormalizeLocalFileName, ...)
+* improved FileFinder include_path logic (normalizeLocalFileName, ...)
 ** init global FileFinder to add proper include paths at startup
    adds PHPWIKI_DIR if started from another dir, lib/pear also
 ** fix slashify for Windows

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/FileFinder.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -456,7 +456,7 @@
 }
 
 // Search PHP's include_path to find file or directory.
-function FindFile($file, $missing_okay = false, $slashify = false)
+function findFile($file, $missing_okay = false, $slashify = false)
 {
     static $finder;
     if (!isset($finder)) {
@@ -478,7 +478,7 @@
 
 // Search PHP's include_path to find file or directory.
 // Searches for "locale/$LANG/$file", then for "$file".
-function FindLocalizedFile($file, $missing_okay = false, $re_init = false)
+function findLocalizedFile($file, $missing_okay = false, $re_init = false)
 {
     static $finder;
     if ($re_init or !isset($finder))
@@ -486,7 +486,7 @@
     return $finder->findFile($file, $missing_okay);
 }
 
-function FindLocalizedButtonFile($file, $missing_okay = false, $re_init = false)
+function findLocalizedButtonFile($file, $missing_okay = false, $re_init = false)
 {
     static $buttonfinder;
     if ($re_init or !isset($buttonfinder))
@@ -501,9 +501,9 @@
  *   require_once 'lib/file.php' loading style.
  * Doesn't expand "~" or symlinks yet. truename would be perfect.
  *
- * NormalizeLocalFileName("lib/config.php") => /home/user/phpwiki/lib/config.php
+ * normalizeLocalFileName("lib/config.php") => /home/user/phpwiki/lib/config.php
  */
-function NormalizeLocalFileName($file)
+function normalizeLocalFileName($file)
 {
     static $finder;
     if (!isset($finder)) {
@@ -525,7 +525,7 @@
 /**
  * Prefixes with DATA_PATH and slashify
  */
-function NormalizeWebFileName($file)
+function normalizeWebFileName($file)
 {
     static $finder;
     if (!isset($finder)) {

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/Google.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -170,7 +170,7 @@
         } else
             $this->license_key = GOOGLE_LICENSE_KEY;
 
-        $this->soapclient = new soapclient(SERVER_URL . NormalizeWebFileName("GoogleSearch.wsdl"), "wsdl");
+        $this->soapclient = new soapclient(SERVER_URL . normalizeWebFileName("GoogleSearch.wsdl"), "wsdl");
         $this->proxy = $this->soapclient->getProxy();
         if ($maxResults > 10) $maxResults = 10;
         if ($maxResults < 1) $maxResults = 1;

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/IniConfig.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -512,16 +512,16 @@
                 $GLOBALS['INCLUDE_PATH'] = $rs['INCLUDE_PATH'];
             }
             $rs['PLUGIN_CACHED_CACHE_DIR'] = TEMP_DIR . '/cache';
-            if (!FindFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) { // [29ms]
-                FindFile(TEMP_DIR, false, 1); // TEMP must exist!
+            if (!findFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) { // [29ms]
+                findFile(TEMP_DIR, false, 1); // TEMP must exist!
                 mkdir($rs['PLUGIN_CACHED_CACHE_DIR'], 0777);
             }
             // will throw an error if not exists.
-            define('PLUGIN_CACHED_CACHE_DIR', FindFile($rs['PLUGIN_CACHED_CACHE_DIR'], false, 1));
+            define('PLUGIN_CACHED_CACHE_DIR', findFile($rs['PLUGIN_CACHED_CACHE_DIR'], false, 1));
         } else {
             define('PLUGIN_CACHED_CACHE_DIR', $rs['PLUGIN_CACHED_CACHE_DIR']);
             // will throw an error if not exists.
-            FindFile(PLUGIN_CACHED_CACHE_DIR);
+            findFile(PLUGIN_CACHED_CACHE_DIR);
         }
     }
 
@@ -556,7 +556,7 @@
     global $FieldSeparator, $AllActionPages;
     global $DBParams;
     // init FileFinder to add proper include paths
-    FindFile("lib/interwiki.map", true);
+    findFile("lib/interwiki.map", true);
 
     // $FieldSeparator = "\xFF"; // this byte should never appear in utf-8
     $FieldSeparator = "\xFF";
@@ -735,7 +735,7 @@
 
     // If user has not defined PHPWIKI_DIR, and we need it
     if (!defined('PHPWIKI_DIR') and !file_exists("themes/default")) {
-        $themes_dir = FindFile("themes");
+        $themes_dir = findFile("themes");
         define('PHPWIKI_DIR', dirname($themes_dir));
     }
 
@@ -884,7 +884,7 @@
             // 1. If the script is not index.php but something like "de", on a different path
             //    then bindtextdomain() fails, but after chdir to the correct path it will work okay.
             // 2. But the weird error "Undefined variable: bindtextdomain" is generated then.
-            $bindtextdomain_path = FindFile("locale", false, true);
+            $bindtextdomain_path = findFile("locale", false, true);
             if (isWindows())
                 $bindtextdomain_path = str_replace("/", "\\", $bindtextdomain_path);
             $bindtextdomain_real = @bindtextdomain("phpwiki", $bindtextdomain_path);

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/PageType.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -212,8 +212,8 @@
             $url = getUploadFilePath();
             // calculate to a relative local path to /uploads for PDF images.
             $doc_root = $request->get("DOCUMENT_ROOT");
-            $ldir = NormalizeLocalFileName($url);
-            $wikiroot = NormalizeLocalFileName('');
+            $ldir = normalizeLocalFileName($url);
+            $wikiroot = normalizeLocalFileName('');
             if (isWindows()) {
                 $ldir = strtolower($ldir);
                 $doc_root = strtolower($doc_root);
@@ -222,7 +222,7 @@
             if (string_starts_with($ldir, $doc_root)) {
                 $link_prefix = substr($url, strlen($doc_root));
             } elseif (string_starts_with($ldir, $wikiroot)) {
-                $link_prefix = NormalizeWebFileName(substr($url, strlen($wikiroot)));
+                $link_prefix = normalizeWebFileName(substr($url, strlen($wikiroot)));
             }
         }
 

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiDB/ADODB.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -26,7 +26,7 @@
             if (is_string($dbparams['dsn']))
                 $dbparams['dsn'] = $backend . ':' . substr($dbparams['dsn'], 6);
         }
-        if (FindFile("lib/WikiDB/backend/ADODB_" . $backend . ".php", true)) {
+        if (findFile("lib/WikiDB/backend/ADODB_" . $backend . ".php", true)) {
             $backend = 'ADODB_' . $backend;
         } else {
             $backend = 'ADODB';

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiDB/PDO.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -25,7 +25,7 @@
         elseif (preg_match('/^(\w+):/', $dbparams['dsn'], $m))
             $backend = $m[1];
         // Do we have a override? Currently none: mysql, sqlite, oci, mssql
-        if (FindFile("lib/WikiDB/backend/PDO_$backend.php", true)) {
+        if (findFile("lib/WikiDB/backend/PDO_$backend.php", true)) {
             $backend = 'PDO_' . $backend;
         } else {
             $backend = 'PDO';

Modified: trunk/lib/WikiDB/backend/ADODB_sqlite.php
===================================================================
--- trunk/lib/WikiDB/backend/ADODB_sqlite.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiDB/backend/ADODB_sqlite.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -17,7 +17,7 @@
         if (!file_exists($parsed['database'])) {
             // creating the empty database
             $db = $parsed['database'];
-            $schema = FindFile("schemas/sqlite-initialize.sql");
+            $schema = findFile("schemas/sqlite-initialize.sql");
             `sqlite $db < $schema`;
             `echo "CREATE USER wikiuser" | sqlite $db`;
         }

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiTheme.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -227,8 +227,8 @@
         global $request;
 
         $this->_name = $theme_name;
-        $this->_themes_dir = NormalizeLocalFileName("themes");
-        $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : "";
+        $this->_themes_dir = normalizeLocalFileName("themes");
+        $this->_path = defined('PHPWIKI_DIR') ? normalizeLocalFileName("") : "";
         $this->_theme = "themes/$theme_name";
         $this->_parents = array();
 

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/WikiUser.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -1638,7 +1638,7 @@
 
     function sanify($value)
     {
-        if (!empty($value) and FindFile($this->_themefile($value)))
+        if (!empty($value) and findFile($this->_themefile($value)))
             return $value;
         return $this->default_value;
     }

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/loadsave.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -558,12 +558,12 @@
     // check if the dumped file will be accessible from outside
     $doc_root = $request->get("DOCUMENT_ROOT");
     if ($WikiTheme->DUMP_MODE == 'HTML') {
-        $ldir = NormalizeLocalFileName($directory);
-        $wikiroot = NormalizeLocalFileName('');
+        $ldir = normalizeLocalFileName($directory);
+        $wikiroot = normalizeLocalFileName('');
         if (string_starts_with($ldir, $doc_root)) {
             $link_prefix = substr($directory, strlen($doc_root)) . "/";
         } elseif (string_starts_with($ldir, $wikiroot)) {
-            $link_prefix = NormalizeWebFileName(substr($directory, strlen($wikiroot))) . "/";
+            $link_prefix = normalizeWebFileName(substr($directory, strlen($wikiroot))) . "/";
         } else {
             $prefix = '';
             if (isWindows()) {
@@ -1126,7 +1126,7 @@
         $error_html = sprintf(" " . _("%s: not defined"), "INTERWIKI_MAP_FILE");
         $goback = true;
     }
-    $mapfile = FindFile(INTERWIKI_MAP_FILE, 1);
+    $mapfile = findFile(INTERWIKI_MAP_FILE, 1);
     if (!$goback && !file_exists($mapfile)) {
         $error_html = sprintf(" " . _("File “%s” not found."), INTERWIKI_MAP_FILE);
         $goback = true;
@@ -1401,7 +1401,7 @@
         // with broken dirname or basename functions.
         // FIXME: windows uses \ and :
         if (is_integer(strpos($file_or_dir, "/"))) {
-            $newfile = FindFile($file_or_dir, true);
+            $newfile = findFile($file_or_dir, true);
             // Panic. urlencoded by the browser (e.g. San%20Diego => San Diego)
             if (!$newfile)
                 $file_or_dir = dirname($file_or_dir) . "/"
@@ -1498,9 +1498,9 @@
 
     StartLoadDump($request, _("Loading up virgin wiki"));
 
-    $pgsrc = FindLocalizedFile(WIKI_PGSRC);
-    $default_pgsrc = FindFile(DEFAULT_WIKI_PGSRC);
-    $theme_pgsrc = FindFile("themes/".THEME."/".WIKI_PGSRC, true);
+    $pgsrc = findLocalizedFile(WIKI_PGSRC);
+    $default_pgsrc = findFile(DEFAULT_WIKI_PGSRC);
+    $theme_pgsrc = findFile("themes/".THEME."/".WIKI_PGSRC, true);
 
     $request->setArg('overwrite', true);
     // Load theme pgsrc, if it exists
@@ -1540,10 +1540,10 @@
         $epage = urlencode($page);
         if (!$dbi->isWikiPage($page)) {
             // translated version provided?
-            if ($lf = FindLocalizedFile($pgsrc . $finder->_pathsep . $epage, 1)) {
+            if ($lf = findLocalizedFile($pgsrc . $finder->_pathsep . $epage, 1)) {
                 LoadAny($request, $lf);
             } else { // load english version of required action page
-                LoadAny($request, FindFile(DEFAULT_WIKI_PGSRC . $finder->_pathsep . urlencode($f)));
+                LoadAny($request, findFile(DEFAULT_WIKI_PGSRC . $finder->_pathsep . urlencode($f)));
                 $page = $f;
             }
         }

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/main.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -171,7 +171,7 @@
             if (isset($this->_user->_authhow) and $this->_user->_authhow == 'session')
                 $user_lang = $GLOBALS['LANG'];
             update_locale($user_lang);
-            FindLocalizedButtonFile(".", 'missing_ok', 'reinit');
+            findLocalizedButtonFile(".", 'missing_ok', 'reinit');
         }
         //if (empty($_lang->lang) and $GLOBALS['LANG'] != $_lang->default_value) ;
     }

Modified: trunk/lib/plugin/SqlResult.php
===================================================================
--- trunk/lib/plugin/SqlResult.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/plugin/SqlResult.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -83,7 +83,7 @@
 
     function getDsn($alias)
     {
-        $ini = parse_ini_file(FindFile("config/SqlResult.ini"));
+        $ini = parse_ini_file(findFile("config/SqlResult.ini"));
         return $ini[$alias];
     }
 

Modified: trunk/lib/plugin/SystemInfo.php
===================================================================
--- trunk/lib/plugin/SystemInfo.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/plugin/SystemInfo.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -453,7 +453,7 @@
 
     function available_plugins()
     {
-        $fileset = new FileSet(FindFile('lib/plugin'), '*.php');
+        $fileset = new FileSet(findFile('lib/plugin'), '*.php');
         $list = $fileset->getFiles();
         natcasesort($list);
         reset($list);

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/plugin/WikiTranslation.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -437,7 +437,7 @@
                 if (!is_array($exclude))
                     $exclude = $pagelist->explodePageList($exclude, false, $sortby,
                         $limit, $exclude);
-                $path = FindLocalizedFile(WIKI_PGSRC);
+                $path = findLocalizedFile(WIKI_PGSRC);
                 $pgsrc = new FileSet($path);
                 foreach ($pgsrc->getFiles($exclude, $sortby, $limit) as $pagename) {
                     $pagename = urldecode($pagename);
@@ -474,7 +474,7 @@
             // navbar links, actionpages, and admin requests
             case 'buttons':
                 $buttons = $GLOBALS['AllActionPages'];
-                $fileset = new FileSet(FindFile("themes/MacOSX/buttons/en"),
+                $fileset = new FileSet(findFile("themes/MacOSX/buttons/en"),
                     "*.png");
                 foreach ($fileset->getFiles() as $file) {
                     $b = urldecode(substr($file, 0, -4));

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/stdlib.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -465,7 +465,7 @@
     // Correct silently the most common error
     if ($url != $ori_url and empty($arr) and !preg_match("/^http/", $url)) {
         // space belongs to the path
-        $file = NormalizeLocalFileName($ori_url);
+        $file = normalizeLocalFileName($ori_url);
         if (file_exists($file)) {
             $link = HTML::img(array('src' => $ori_url));
             trigger_error(
@@ -508,9 +508,9 @@
         elseif (preg_match("/^http/", $url)) { // external url
             $size = @getimagesize($url);
         } else { // local file
-            if (file_exists($file = NormalizeLocalFileName($url))) { // here
+            if (file_exists($file = normalizeLocalFileName($url))) { // here
                 $size = @getimagesize($file);
-            } elseif (file_exists(NormalizeLocalFileName(urldecode($url)))) {
+            } elseif (file_exists(normalizeLocalFileName(urldecode($url)))) {
                 $size = @getimagesize($file);
                 $link->setAttr('src', rawurldecode($url));
             } elseif (string_starts_with($url, getUploadDataPath())) { // there

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/lib/upgrade.php	2016-05-25 10:30:28 UTC (rev 9852)
@@ -134,10 +134,10 @@
         $this->_rename_page_helper("_GroupInfo", "GroupAuthInfo"); //never officially existed
         $this->_rename_page_helper("InterWikiKarte", "InterWikiListe"); // german only
 
-        $path = FindFile('pgsrc');
+        $path = findFile('pgsrc');
         $pgsrc = new FileSet($path);
         // most actionpages have the same name as the plugin
-        $loc_path = FindLocalizedFile('pgsrc');
+        $loc_path = findLocalizedFile('pgsrc');
         foreach ($pgsrc->getFiles() as $filename) {
             if (substr($filename, -1, 1) == '~') continue;
             if (substr($filename, -5, 5) == '.orig') continue;
@@ -146,7 +146,7 @@
                 $translation = __($pagename);
                 if ($translation == $pagename)
                     $this->doPgsrcUpdate($pagename, $path, $filename);
-                elseif (FindLocalizedFile('pgsrc/' . urlencode($translation), 1))
+                elseif (findLocalizedFile('pgsrc/' . urlencode($translation), 1))
                     $this->doPgsrcUpdate($translation, $loc_path, urlencode($translation)); else
                     $this->doPgsrcUpdate($pagename, $path, $filename);
             }
@@ -184,9 +184,9 @@
         }
         $translation = __("HomePage");
         if ($translation == "HomePage") {
-            $path = FindFile(WIKI_PGSRC);
+            $path = findFile(WIKI_PGSRC);
         } else {
-            $path = FindLocalizedFile(WIKI_PGSRC);
+            $path = findLocalizedFile(WIKI_PGSRC);
         }
         $pgsrc = new FileSet($path);
         // fixme: verification, ...
@@ -943,7 +943,7 @@
     {
         $o_filename = $filename;
         if (!file_exists($filename))
-            $filename = FindFile($filename);
+            $filename = findFile($filename);
         if (!file_exists($filename))
             return array(false, sprintf(_("File “%s” not found."), $o_filename));
         $found = false;

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2016-05-25 10:17:43 UTC (rev 9851)
+++ trunk/pgsrc/ReleaseNotes	2016-05-25 10:30:28 UTC (rev 9852)
@@ -614,7 +614,7 @@
 * new Error-style with collapsed output of repeated messages
 * whitespace trim pagenames to avoid abuse
 * no double login page header, better login msg.
-* improved ~FileFinder include_path logic (~NormalizeLocalFileName, ...)
+* improved ~FileFinder include_path logic (~normalizeLocalFileName, ...)
 ** init global ~FileFinder to add proper include paths at startup
    adds PHPWIKI_DIR to the front if started from another dir, lib/pear to the end.
 ** fix slashify for Windows

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9851] trunk

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

Revision: 9851
          http://sourceforge.net/p/phpwiki/code/9851
Author:   vargenau
Date:     2016-05-25 10:17:43 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/lib/WikiPlugin.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUser.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/VisualWiki.php
    trunk/lib/plugin/text2png.php
    trunk/lib/wikilens/CustomPrefs.php
    trunk/themes/Sidebar/hyperapplet.php
    trunk/themes/Sidebar/hyperwiki.php
    trunk/themes/Sidebar/themeinfo.php

Modified: trunk/lib/WikiPlugin.php
===================================================================
--- trunk/lib/WikiPlugin.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiPlugin.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -467,7 +467,7 @@
 
     function expandPI($pi, &$request, &$markup, $basepage = false)
     {
-        if (!($ppi = $this->parsePi($pi)))
+        if (!($ppi = $this->parsePI($pi)))
             return false;
         list($pi_name, $plugin, $plugin_args) = $ppi;
 
@@ -513,7 +513,7 @@
 
     function getWikiPageLinks($pi, $basepage)
     {
-        if (!($ppi = $this->parsePi($pi)))
+        if (!($ppi = $this->parsePI($pi)))
             return false;
         list($pi_name, $plugin, $plugin_args) = $ppi;
         if (!is_object($plugin))

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiPluginCached.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -736,7 +736,7 @@
         }
         if (is_resource($imagehandle)) {
             $this->writeImage($content['imagetype'], $imagehandle, $tmpfile);
-            ImageDestroy($imagehandle);
+            imagedestroy($imagehandle);
             sleep(0.2);
         } elseif (is_string($imagehandle)) {
             $content['file'] = getUploadFilePath() . basename($tmpfile);
@@ -930,7 +930,7 @@
             }
             $this->writeHeader($imgtype);
             $this->writeImage($imgtype, $im);
-            ImageDestroy($im);
+            imagedestroy($im);
         }
     } // printError
 
@@ -977,8 +977,8 @@
             'width' => 600,
             'height' => 350);
 
-        $charx = ImageFontWidth($fontnr);
-        $chary = ImageFontHeight($fontnr);
+        $charx = imagefontwidth($fontnr);
+        $chary = imagefontheight($fontnr);
         $marginx = $charx;
         $marginy = floor($chary / 2);
 

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiTheme.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -1484,7 +1484,7 @@
          * A list of name => _UserPreference class pairs.
          * Rationale: Certain themes should be able to extend the predefined list
          * of preferences. Display/editing is done in the theme specific userprefs.tmpl
-         * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+         * but storage/sanification/update/... must be extended to the get/setPreferences methods.
          * See themes/wikilens/themeinfo.php
          */
         //$this->customUserPreference();
@@ -1506,7 +1506,7 @@
      * A list of name => _UserPreference class pairs.
      * Rationale: Certain themes should be able to extend the predefined list
      * of preferences. Display/editing is done in the theme specific userprefs.tmpl
-     * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+     * but storage/sanification/update/... must be extended to the get/setPreferences methods.
      * These values are just ignored if another theme is used.
      */
     function customUserPreferences($array)

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/WikiUser.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -88,7 +88,7 @@
  * 2004-04-04 rurban
  * 7) Certain themes should be able to extend the predefined list
  *    of preferences. Display/editing is done in the theme specific userprefs.tmpl,
- *    but storage must be extended to the Get/SetPreferences methods.
+ *    but storage must be extended to the get/setPreferences methods.
  *    <theme>/themeinfo.php must provide CustomUserPreferences:
  *      A list of name => _UserPreference class pairs.
  * 2010-06-07 rurban
@@ -1335,7 +1335,7 @@
     /** The default method is storing the password in prefs.
      *  Child methods (DB, File) may store in external auth also, but this
      *  must be explicitly enabled.
-     *  This may be called by plugin/UserPreferences or by ->SetPreferences()
+     *  This may be called by plugin/UserPreferences or by ->setPreferences()
      */
     function changePass($submitted_password)
     {
@@ -1350,7 +1350,7 @@
         if ($stored_password != $submitted_password) {
             $this->_prefs->set('passwd', $submitted_password);
             //update the storage (session, homepage, ...)
-            $this->SetPreferences($this->_prefs);
+            $this->setPreferences($this->_prefs);
             return true;
         }
         //Todo: return an error msg to the caller what failed?

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/RateIt.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -528,7 +528,7 @@
             if (!$this->rating)
                 $imgprops['style'] = 'display:none';
             $a0->pushContent(HTML::img($imgprops));
-            $a0->addToolTip($msg);
+            $a0->addTooltip($msg);
             $html->pushContent($a0);
         }
 

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/UpLoad.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -186,7 +186,7 @@
                 return HTML($message, $form);
             }
             if (move_uploaded_file($userfile_tmpname, $file_dir . $sanified_userfile_name) or
-                (IsWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
+                (isWindows() and rename($userfile_tmpname, $file_dir . $sanified_userfile_name))) {
                 $interwiki = new PageType_interwikimap();
                 if (UPLOAD_USERDIR) {
                     $link = $interwiki->link("[[Upload:$username/$sanified_userfile_name]]");

Modified: trunk/lib/plugin/VisualWiki.php
===================================================================
--- trunk/lib/plugin/VisualWiki.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/VisualWiki.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -548,7 +548,7 @@
         $upload_dir = getUploadDataPath();
         $tmpfile = tempnam($file_dir, "VisualWiki") . "." . $argarray['imgtype'];
         WikiPluginCached::writeImage($argarray['imgtype'], $imagehandle, $tmpfile);
-        ImageDestroy($imagehandle);
+        imagedestroy($imagehandle);
         return WikiPluginCached::embedMap(1, $upload_dir . basename($tmpfile), $content['html'],
             $dbi, $argarray, $request);
     }

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/plugin/text2png.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -180,15 +180,15 @@
                 $rgb = $this->hexcolor($shadowcolor, array(175, 175, 175));
                 $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
                 // shadow is 1 pixel down and 2 pixels right
-                ImageTTFText($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
+                imagettftext($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
             }
             // draw text
             $rgb = $this->hexcolor($fontcolor, array(0, 0, 0));
             $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
-            ImageTTFText($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
+            imagettftext($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
 
             /**
-             * An alternate text drawing method in case ImageTTFText
+             * An alternate text drawing method in case imagettftext
              * doesn't work.
              **/
             //imagestring($im, 2, 10, 40, $text, $text_color);
@@ -198,7 +198,7 @@
             //imagepng($im);
 
             // to save to file:
-            $success = ImagePng($im, $filepath . $filename);
+            $success = imagepng($im, $filepath . $filename);
 
         } else {
             $filepath .= "/";

Modified: trunk/lib/wikilens/CustomPrefs.php
===================================================================
--- trunk/lib/wikilens/CustomPrefs.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/lib/wikilens/CustomPrefs.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -5,7 +5,7 @@
  * A list of name => _UserPreference class pairs.
  * Rationale: Certain themes should be able to extend the predefined list
  * of preferences. Display/editing is done in the theme specific userprefs.tmpl
- * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+ * but storage/sanification/update/... must be extended to the get/setPreferences methods.
  *
  * This is just at alpha stage, a recommendation to the wikilens group.
  */

Modified: trunk/themes/Sidebar/hyperapplet.php
===================================================================
--- trunk/themes/Sidebar/hyperapplet.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/hyperapplet.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -10,12 +10,12 @@
 global $WikiTheme;
 ?>
 <applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline"
-        archive="<?php echo $WikiTheme->_finddata("hyperapplet.jar") ?>"
+        archive="<?php echo $WikiTheme->_findData("hyperapplet.jar") ?>"
         width="160" height="360">
     <?php // the dynamic version: ?>
     <!--param name="file" value="<?php echo WikiURL("LinkDatabase", array('format' => 'xml')) ?>" /-->
     <?php // The faster static version: dump it periodically ?>
-    <param name="file" value="<?php echo $WikiTheme->_finddata("LinkDatabase.xml") ?>"/>
-    <!--param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>" /-->
+    <param name="file" value="<?php echo $WikiTheme->_findData("LinkDatabase.xml") ?>"/>
+    <!--param name="properties" value="<?php echo $WikiTheme->_findData("hwiki.prop") ?>" /-->
     <param name="center" value="<?php echo $page->getName() ?>"/>
 </applet>

Modified: trunk/themes/Sidebar/hyperwiki.php
===================================================================
--- trunk/themes/Sidebar/hyperwiki.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/hyperwiki.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -8,9 +8,9 @@
 // via the RPC interface it goes like this...
 ?>
 <applet code="hypergraph.applications.hwiki.HWikiApplet.class"
-        archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>"
+        archive="<?php echo $WikiTheme->_findData("hyperwiki.jar") ?>"
         width="162" height="240">
     <param name="startPage" value="<?php echo $page->getName() ?>"/>
-    <param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>"/>
+    <param name="properties" value="<?php echo $WikiTheme->_findData("hwiki.prop") ?>"/>
     <param name="wikiURL" value="<?php echo PHPWIKI_BASE_URL ?>"/>
 </applet>

Modified: trunk/themes/Sidebar/themeinfo.php
===================================================================
--- trunk/themes/Sidebar/themeinfo.php	2016-05-25 10:01:54 UTC (rev 9850)
+++ trunk/themes/Sidebar/themeinfo.php	2016-05-25 10:17:43 UTC (rev 9851)
@@ -181,7 +181,7 @@
          * A list of name => _UserPreference class pairs.
          * Rationale: Certain themes should be able to extend the predefined list
          * of preferences. Display/editing is done in the theme specific userprefs.tmpl
-         * but storage/sanification/update/... must be extended to the Get/SetPreferences methods.
+         * but storage/sanification/update/... must be extended to the get/setPreferences methods.
          * See themes/wikilens/themeinfo.php
          */
         //$this->customUserPreference();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[9850] trunk

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

Revision: 9850
          http://sourceforge.net/p/phpwiki/code/9850
Author:   vargenau
Date:     2016-05-25 10:01:54 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/lib/Captcha.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/plugin/AppendText.php
    trunk/lib/plugin/AuthorHistory.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/GraphViz.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/WikiPoll.php
    trunk/lib/plugin/text2png.php
    trunk/themes/Wordpress/templates/signin.tmpl
    trunk/themes/default/templates/signin.tmpl

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/Captcha.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -183,15 +183,15 @@
         imageline($jpg, 0, $height - 1, $width - 1, $height - 1, $tx);
         imageline($jpg, $width - 1, 0, $width - 1, $height - 1, $tx);
 
-        if (function_exists("ImageJpeg")) {
+        if (function_exists("imagejpeg")) {
             header("Content-type: image/jpeg");
-            ImageJpeg($jpg);
-        } elseif (function_exists("ImagePNG")) {
+            imagejpeg($jpg);
+        } elseif (function_exists("imagepng")) {
             header("Content-type: image/png");
-            ImagePNG($jpg);
-        } elseif (function_exists("ImageGIF")) {
+            imagepng($jpg);
+        } elseif (function_exists("imagegif")) {
             header("Content-type: image/gif");
-            ImageGIF($jpg);
+            imagegif($jpg);
         } else {
             trigger_error("missing GD bitmap support", E_USER_WARNING);
         }

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/WikiPluginCached.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -916,7 +916,7 @@
         $talkedallready = ob_get_contents() || headers_sent();
         if (($imgtype == 'html') || $talkedallready) {
             if (is_object($errortext))
-                $errortext = $errortext->asXml();
+                $errortext = $errortext->asXML();
             trigger_error($errortext, E_USER_WARNING);
         } else {
             $red = array(255, 0, 0);

Modified: trunk/lib/plugin/AppendText.php
===================================================================
--- trunk/lib/plugin/AppendText.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/AppendText.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -148,7 +148,7 @@
 
         } else {
             $link = HTML::em(WikiLink($pagename));
-            $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXml())));
+            $message->pushContent(HTML::raw(sprintf(_("Go to %s."), $link->asXML())));
         }
 
         return $message;

Modified: trunk/lib/plugin/AuthorHistory.php
===================================================================
--- trunk/lib/plugin/AuthorHistory.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/AuthorHistory.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -136,7 +136,7 @@
                             'if_known'), $nbsp),
                         HTML::td($nbsp, $rev->get('summary')),
                         HTML::td(array('class' => 'align-right'),
-                            $WikiTheme->formatdatetime($rev->get('mtime')))
+                            $WikiTheme->formatDateTime($rev->get('mtime')))
                     );
 
                     $class = $isminor ? 'evenrow' : 'oddrow';
@@ -180,7 +180,7 @@
                             $includeminor ? (HTML::td($nbsp, ($isminor ? "minor" : "major"), $nbsp)) : "",
                             HTML::td($nbsp, $rev->get('summary')),
                             HTML::td(array('class' => 'align-right'),
-                                $WikiTheme->formatdatetime($rev->get('mtime')), $nbsp)
+                                $WikiTheme->formatDateTime($rev->get('mtime')), $nbsp)
                         );
 
                         $class = $isminor ? 'evenrow' : 'oddrow';

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/GoogleMaps.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -148,7 +148,7 @@
                 ($Marker
                     ? "
 var point = new GPoint(" . $Longitude . "," . $Latitude . ");
-var marker = createMarker(point, '" . $markertext->asXml() . "'); map.addOverlay(marker);"
+var marker = createMarker(point, '" . $markertext->asXML() . "'); map.addOverlay(marker);"
                     : "")
         );
         if ($Marker)

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/GraphViz.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -383,7 +383,7 @@
         $source = $this->processSource($argarray);
         if (empty($source)) {
             $this->complain("No dot graph given");
-            return array(false, $this->GetError());
+            return array(false, $this->getError());
         }
         //$ok = $ok and $this->createDotFile($tempfiles.'.dot', $argarray);
 
@@ -455,8 +455,8 @@
                 . (file_exists("$tempfiles.map") ? filesize("$tempfiles.map") : 'missing'));
             $this->complain("\ncmd-line: $cmdline1");
             $this->complain("\ncmd-line: $cmdline2");
-            //trigger_error($this->GetError(), E_USER_WARNING);
-            return array(false, $this->GetError());
+            //trigger_error($this->getError(), E_USER_WARNING);
+            return array(false, $this->getError());
         }
 
         // clean up tempfiles
@@ -469,7 +469,7 @@
         if ($ok)
             return array($img, $map);
         else
-            return array(false, $this->GetError());
+            return array(false, $this->getError());
     }
 
 }

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/RateIt.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -506,7 +506,7 @@
                     . "'$reImgId','$dimension','X')",
                     'style' => 'outline: 0'));
                 $msg = _("Cancel your rating");
-                $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt" . $imgPrefix . "Cancel"),
+                $imgprops = array('src' => $WikiTheme->getImageURL("RateIt" . $imgPrefix . "Cancel"),
                     'id' => $imgId . $imgPrefix . 'Cancel',
                     'alt' => $msg,
                     'title' => $msg,
@@ -521,7 +521,7 @@
             $a0 = HTML::a(array('href' => "javascript:clickRating('$reImgPrefix','$rePagename','$version',"
                 . "'$reImgId','$dimension','X')"));
             $msg = _("Cancel your rating");
-            $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt" . $imgPrefix . "Cancel"),
+            $imgprops = array('src' => $WikiTheme->getImageURL("RateIt" . $imgPrefix . "Cancel"),
                 'id' => $imgId . $imgPrefix . 'Cancel',
                 'alt' => $msg,
                 'title' => $msg);

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/WikiPoll.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -251,13 +251,13 @@
     private function bar($percent)
     {
         global $WikiTheme;
-        return HTML(HTML::img(array('src' => $WikiTheme->getImageUrl('leftbar'),
+        return HTML(HTML::img(array('src' => $WikiTheme->getImageURL('leftbar'),
                 'alt' => '<')),
-            HTML::img(array('src' => $WikiTheme->getImageUrl('mainbar'),
+            HTML::img(array('src' => $WikiTheme->getImageURL('mainbar'),
                 'alt' => '-',
                 'width' => sprintf("%02d", $percent),
                 'height' => 14)),
-            HTML::img(array('src' => $WikiTheme->getImageUrl('rightbar'),
+            HTML::img(array('src' => $WikiTheme->getImageURL('rightbar'),
                 'alt' => '>')));
     }
 

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/lib/plugin/text2png.php	2016-05-25 10:01:54 UTC (rev 9850)
@@ -163,7 +163,7 @@
              */
 
             // get ready to draw
-            $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
+            $s = imagettfbbox($fontsize, 0, $ttfont, $text);
             $im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
             if (empty($im)) {
                 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");

Modified: trunk/themes/Wordpress/templates/signin.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/signin.tmpl	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/themes/Wordpress/templates/signin.tmpl	2016-05-25 10:01:54 UTC (rev 9850)
@@ -41,7 +41,7 @@
     $userid = $user->getId();
     if ($user->isSignedIn())
       echo sprintf(_("You are signed but not authenticated as %s. "),
-           asXml(HTML::a(array(
+           asXML(HTML::a(array(
                        'href'=>'#',
                        'title' => sprintf(_("Click to authenticate as %s"),$userid),
                        'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),

Modified: trunk/themes/default/templates/signin.tmpl
===================================================================
--- trunk/themes/default/templates/signin.tmpl	2016-05-25 09:41:56 UTC (rev 9849)
+++ trunk/themes/default/templates/signin.tmpl	2016-05-25 10:01:54 UTC (rev 9850)
@@ -33,7 +33,7 @@
     $userid = $user->getId();
     if ($user->isSignedIn()) {
         echo sprintf(_("You are signed but not authenticated as %s. "),
-           asXml(HTML::a(array(
+           asXML(HTML::a(array(
                        'href'=>'#',
                        'title' => sprintf(_("Click to authenticate as %s"),$userid),
                        'onclick'=>'SignIn(document.forms["'.$FORMNAME.'"],"'.$userid.'");'),

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

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

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

Revision: 9849
          http://sourceforge.net/p/phpwiki/code/9849
Author:   vargenau
Date:     2016-05-25 09:41:56 +0000 (Wed, 25 May 2016)
Log Message:
-----------
Be case consistent

Modified Paths:
--------------
    trunk/lib/Captcha.php
    trunk/lib/Template.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/WysiwygEdit/CKeditor.php
    trunk/lib/WysiwygEdit/Wikiwyg.php
    trunk/lib/WysiwygEdit/tinymce.php
    trunk/lib/editpage.php
    trunk/lib/loadsave.php
    trunk/lib/plugin/AddComment.php
    trunk/lib/plugin/CacheTest.php
    trunk/lib/plugin/Calendar.php
    trunk/lib/plugin/TexToPng.php
    trunk/lib/plugin/text2png.php

Modified: trunk/lib/Captcha.php
===================================================================
--- trunk/lib/Captcha.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/Captcha.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -146,10 +146,10 @@
         $height =& $this->height;
 
         // Create the Image
-        $jpg = ImageCreate($width, $height);
-        $bg = ImageColorAllocate($jpg, 255, 255, 255);
-        $tx = ImageColorAllocate($jpg, 185, 140, 140);
-        ImageFilledRectangle($jpg, 0, 0, $width, $height, $bg);
+        $jpg = imagecreate($width, $height);
+        $bg = imagecolorallocate($jpg, 255, 255, 255);
+        $tx = imagecolorallocate($jpg, 185, 140, 140);
+        imagefilledrectangle($jpg, 0, 0, $width, $height, $bg);
 
         $x = rand(0, $width);
         $y = rand(0, $height);

Modified: trunk/lib/Template.php
===================================================================
--- trunk/lib/Template.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/Template.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -273,7 +273,7 @@
  * For dumping pages as html to a file.
  * Used for action=dumphtml,action=ziphtml,format=pdf,format=xml
  */
-function GeneratePageasXML($content, $title, $page_revision = null, $args = array())
+function GeneratePageAsXML($content, $title, $page_revision = null, $args = array())
 {
     global $request;
 

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WikiPluginCached.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -1010,16 +1010,16 @@
         $IMAGESIZE['height'] = $IMAGESIZE['rows'] * $chary + 2 * $marginy;
 
         // create blank image
-        $im = @ImageCreate($IMAGESIZE['width'], $IMAGESIZE['height']);
+        $im = @imagecreate($IMAGESIZE['width'], $IMAGESIZE['height']);
 
-        $col = ImageColorAllocate($im, $textcol[0], $textcol[1], $textcol[2]);
-        $bg = ImageColorAllocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
+        $col = imagecolorallocate($im, $textcol[0], $textcol[1], $textcol[2]);
+        $bg = imagecolorallocate($im, $bgcol[0], $bgcol[1], $bgcol[2]);
 
-        ImageFilledRectangle($im, 0, 0, $IMAGESIZE['width'] - 1, $IMAGESIZE['height'] - 1, $bg);
+        imagefilledrectangle($im, 0, 0, $IMAGESIZE['width'] - 1, $IMAGESIZE['height'] - 1, $bg);
 
         // write text lines
         foreach ($lines as $nr => $textstr) {
-            ImageString($im, $fontnr, $marginx, $marginy + $nr * $chary,
+            imagestring($im, $fontnr, $marginx, $marginy + $nr * $chary,
                 $textstr, $col);
         }
         return $im;

Modified: trunk/lib/WysiwygEdit/CKeditor.php
===================================================================
--- trunk/lib/WysiwygEdit/CKeditor.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/CKeditor.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -39,7 +39,7 @@
     {
         global $WikiTheme;
         $WikiTheme->addMoreHeaders
-        (Javascript('', array('src' => $this->BasePath . 'ckeditor.js',
+        (JavaScript('', array('src' => $this->BasePath . 'ckeditor.js',
             'language' => 'JavaScript')));
         return JavaScript("
 window.onload = function()

Modified: trunk/lib/WysiwygEdit/Wikiwyg.php
===================================================================
--- trunk/lib/WysiwygEdit/Wikiwyg.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/Wikiwyg.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -42,7 +42,7 @@
                      "Wikiwyg/Wysiwyg.js", "Wikiwyg/Phpwiki.js", "Wikiwyg/HTML.js",
                      "Wikiwyg/Toolbar.js") as $js) {
             $WikiTheme->addMoreHeaders
-            (Javascript('', array('src' => $this->BasePath . '/' . $js,
+            (JavaScript('', array('src' => $this->BasePath . '/' . $js,
                 'language' => 'JavaScript')));
         }
         $doubleClickToEdit = ($request->getPref('doubleClickEdit') or ENABLE_DOUBLECLICKEDIT)

Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/WysiwygEdit/tinymce.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -31,9 +31,9 @@
     {
         global $LANG, $WikiTheme;
         $WikiTheme->addMoreHeaders
-        (Javascript('', array('src' => $this->BasePath . 'tiny_mce.js',
+        (JavaScript('', array('src' => $this->BasePath . 'tiny_mce.js',
             'language' => 'JavaScript')));
-        return Javascript("
+        return JavaScript("
 tinyMCE.init({
     mode    : 'exact',
     elements: '$name',

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/editpage.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -626,7 +626,7 @@
             $undo_btn = $WikiTheme->getImageURL("ed_undo.png");
             $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
             // JS_SEARCHREPLACE from walterzorn.de
-            $js = Javascript("
+            $js = JavaScript("
 uri_undo_btn   = '" . $undo_btn . "'
 msg_undo_alt   = '" . _("Undo") . "'
 uri_undo_d_btn = '" . $undo_d_btn . "'

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/loadsave.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -651,7 +651,7 @@
         $msg = HTML();
 
         $DUMP_MODE = $WikiTheme->DUMP_MODE;
-        $data = GeneratePageasXML(new Template('browse', $request, $args),
+        $data = GeneratePageAsXML(new Template('browse', $request, $args),
             $pagename, $current, $args);
         $WikiTheme->DUMP_MODE = $DUMP_MODE;
 

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/AddComment.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -93,7 +93,7 @@
         if ($args['jshide']) {
             $div = HTML::div(array('id' => 'comments', 'style' => 'display:none;'));
             //$list->setAttr('style','display:none;');
-            $div->pushContent(Javascript("
+            $div->pushContent(JavaScript("
 function togglecomments(a) {
   comments=document.getElementById('comments');
   if (comments.style.display=='none') {

Modified: trunk/lib/plugin/CacheTest.php
===================================================================
--- trunk/lib/plugin/CacheTest.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/CacheTest.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -125,7 +125,7 @@
     function produceGraphics($text, $font)
     {
         // The idea (and some code) is stolen from the text2png plugin
-        // but I did not want to use TTF. ImageString is quite ugly
+        // but I did not want to use TTF. Imagestring is quite ugly
         // and quite compatible. It's only a usage example.
 
         if ($font < 1 || $font > 5) {
@@ -134,14 +134,14 @@
             $font = 3;
         }
 
-        $ok = ($im = @ImageCreate(400, 40));
-        $bg_color = ImageColorAllocate($im, 240, 240, 240);
-        $text_color1 = ImageColorAllocate($im, 120, 120, 120);
-        $text_color2 = ImageColorAllocate($im, 0, 0, 0);
+        $ok = ($im = @imagecreate(400, 40));
+        $bg_color = imagecolorallocate($im, 240, 240, 240);
+        $text_color1 = imagecolorallocate($im, 120, 120, 120);
+        $text_color2 = imagecolorallocate($im, 0, 0, 0);
 
-        ImageFilledRectangle($im, 0, 0, 149, 49, $bg_color);
-        ImageString($im, $font, 11, 12, $text, $text_color1);
-        ImageString($im, $font, 10, 10, $text, $text_color2);
+        imagefilledrectangle($im, 0, 0, 149, 49, $bg_color);
+        imagestring($im, $font, 11, 12, $text, $text_color1);
+        imagestring($im, $font, 10, 10, $text, $text_color2);
 
         if (!$ok) {
             // simple error handling by WikiPluginImageCache

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/Calendar.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -119,7 +119,7 @@
 
         $fs = $this->args['wday_format'];
         $row = HTML::tr();
-        $row->setattr('class', 'cal-dayname');
+        $row->setAttr('class', 'cal-dayname');
         if ($this->args['display_weeknum'])
             $row->pushContent(HTML::td(array('class' => 'cal-dayname align-center'),
                 _("Wk")));

Modified: trunk/lib/plugin/TexToPng.php
===================================================================
--- trunk/lib/plugin/TexToPng.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/TexToPng.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -287,7 +287,7 @@
             file_exists($tempfiles . '.png');
 
         if ($ok) {
-            if (!($img = ImageCreateFromPNG($tempfiles . '.png'))) {
+            if (!($img = imagecreatefrompng($tempfiles . '.png'))) {
                 $this->dbg("Could not open just created image file: $tempfiles");
                 $ok = false;
             }

Modified: trunk/lib/plugin/text2png.php
===================================================================
--- trunk/lib/plugin/text2png.php	2016-05-25 09:22:44 UTC (rev 9848)
+++ trunk/lib/plugin/text2png.php	2016-05-25 09:41:56 UTC (rev 9849)
@@ -164,7 +164,7 @@
 
             // get ready to draw
             $s = ImageTTFBBox($fontsize, 0, $ttfont, $text);
-            $im = @ImageCreate(abs($s[4]) + 20, abs($s[7]) + 10);
+            $im = @imagecreate(abs($s[4]) + 20, abs($s[7]) + 10);
             if (empty($im)) {
                 $error_html = _("PHP was unable to create a new GD image stream. Read 'lib/plugin/text2png.php' for details.");
                 // FIXME: Error manager does not transform URLs passed
@@ -175,27 +175,27 @@
                 return HTML::p($error_html);
             }
             $rgb = $this->hexcolor($backcolor, array(255, 255, 255));
-            $bg_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+            $bg_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
             if ($with_shadow) {
                 $rgb = $this->hexcolor($shadowcolor, array(175, 175, 175));
-                $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+                $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
                 // shadow is 1 pixel down and 2 pixels right
                 ImageTTFText($im, $fontsize, 0, 12, abs($s[7]) + 6, $text_color, $ttfont, $text);
             }
             // draw text
             $rgb = $this->hexcolor($fontcolor, array(0, 0, 0));
-            $text_color = ImageColorAllocate($im, $rgb[0], $rgb[1], $rgb[2]);
+            $text_color = imagecolorallocate($im, $rgb[0], $rgb[1], $rgb[2]);
             ImageTTFText($im, $fontsize, 0, 10, abs($s[7]) + 5, $text_color, $ttfont, $text);
 
             /**
              * An alternate text drawing method in case ImageTTFText
              * doesn't work.
              **/
-            //ImageString($im, 2, 10, 40, $text, $text_color);
+            //imagestring($im, 2, 10, 40, $text, $text_color);
 
             // To dump directly to browser:
             //header("Content-type: image/png");
-            //ImagePng($im);
+            //imagepng($im);
 
             // to save to file:
             $success = ImagePng($im, $filepath . $filename);

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