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

[phpwiki-checkins] SF.net SVN: phpwiki:[10674] trunk/themes/Sidebar/templates/actionbar.tmpl

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

Revision: 10674
          http://sourceforge.net/p/phpwiki/code/10674
Author:   vargenau
Date:     2021-11-22 20:23:38 +0000 (Mon, 22 Nov 2021)
Log Message:
-----------
"rename" is not a page

Modified Paths:
--------------
    trunk/themes/Sidebar/templates/actionbar.tmpl

Modified: trunk/themes/Sidebar/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/actionbar.tmpl	2021-11-22 10:28:56 UTC (rev 10673)
+++ trunk/themes/Sidebar/templates/actionbar.tmpl	2021-11-22 20:23:38 UTC (rev 10674)
@@ -26,7 +26,7 @@
     <?php echo ActionButton(__("PageHistory"), _("History"), false, array('title'=>_("Past versions of this page."))) ?>
     <?php echo ActionButton("diff") ?>
     <?php if ($user->isSignedIn()) { ?>
-      <?php echo ActionButton(__("rename"), _("Rename"), false,
+      <?php echo ActionButton("rename", _("Rename"), false,
                array('title'=>_("Rename this page"))) ?>
       <?php echo ActionButton(__("WatchPage"), _("Watch"), false,
                array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes"))) ?>

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10673] trunk/themes/blog/Kubrick.css

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

Revision: 10673
          http://sourceforge.net/p/phpwiki/code/10673
Author:   vargenau
Date:     2021-11-22 10:28:56 +0000 (Mon, 22 Nov 2021)
Log Message:
-----------
themes/blog/Kubrick.css: use CSS table-row and table-cell for layout

Modified Paths:
--------------
    trunk/themes/blog/Kubrick.css

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2021-11-22 09:41:55 UTC (rev 10672)
+++ trunk/themes/blog/Kubrick.css	2021-11-22 10:28:56 UTC (rev 10673)
@@ -99,6 +99,8 @@
 }
 
 #content {
+    display:table-cell;
+    padding-left: 19px;
     font-size: 1.2em
 }
 
@@ -274,12 +276,9 @@
     color: #b85b5a;
 }
 
-/* ie quirks */
 #sidebar {
+    display: table-cell;
     font: 1em 'Lucida Grande', Verdana, Arial, sans-serif;
-    left: 1000px;
-    position: absolute;
-    z-index: 2;
     top: 260px;
     /* top, right, bottom, left */
     padding: 0 10px 10px 0;
@@ -375,7 +374,7 @@
 }
 
 #bodyContent {
-    float: left;
+    display: table-row;
     padding: 0 0 20px 25px;
     margin: 0 0 0;
     width: 550px;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10672] trunk/themes/blog/templates/browse-footer.tmpl

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

Revision: 10672
          http://sourceforge.net/p/phpwiki/code/10672
Author:   vargenau
Date:     2021-11-22 09:41:55 +0000 (Mon, 22 Nov 2021)
Log Message:
-----------
Better link in Sourceforge, use https, remove dead link

Modified Paths:
--------------
    trunk/themes/blog/templates/browse-footer.tmpl

Modified: trunk/themes/blog/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/blog/templates/browse-footer.tmpl	2021-11-21 19:47:44 UTC (rev 10671)
+++ trunk/themes/blog/templates/browse-footer.tmpl	2021-11-22 09:41:55 UTC (rev 10672)
@@ -3,5 +3,5 @@
 <?php if( $page->getName() != _("HomePage")) { ?>
 <?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?><br />
 <?php } ?>
-This site is powered by <a href="http://phpwiki.sourceforge.net">PhpWiki</a>. Page design based on <a href="http://binarybonsai.com/kubrick/">Kubrick</a>,<br />adapted by <a href="http://the.taoofmac.com">Rui Carmo</a> from an original design by <a href="http://binarybonsai.com">Michael Heilemann</a>.</p>
+This site is powered by <a href="https://sourceforge.net/projects/phpwiki/">PhpWiki</a>. Page design based on Kubrick,<br />adapted by <a href="https://the.taoofmac.com">Rui Carmo</a> from an original design by <a href="https://binarybonsai.com">Michael Heilemann</a>.</p>
 </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:[10671] trunk/lib/plugin/WhoIsOnline.php

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

Revision: 10671
          http://sourceforge.net/p/phpwiki/code/10671
Author:   vargenau
Date:     2021-11-21 19:47:44 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
Ensure $stats is an array

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

Modified: trunk/lib/plugin/WhoIsOnline.php
===================================================================
--- trunk/lib/plugin/WhoIsOnline.php	2021-11-21 19:37:12 UTC (rev 10670)
+++ trunk/lib/plugin/WhoIsOnline.php	2021-11-21 19:47:44 UTC (rev 10671)
@@ -196,6 +196,7 @@
                 $dbi->set('stats', $stats);
             }
         } else {
+            $stats = array();
             $stats['max_online_num'] = $num_users;
             $stats['max_online_time'] = time();
             $dbi->set('stats', $stats);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10670] trunk/themes/default/templates/tags.tmpl

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

Revision: 10670
          http://sourceforge.net/p/phpwiki/code/10670
Author:   vargenau
Date:     2021-11-21 19:37:12 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
Add dummy themes/default/templates/tags.tmpl to avoid error when switching from Sidebar or MonoBook to other theme

Added Paths:
-----------
    trunk/themes/default/templates/tags.tmpl

Added: trunk/themes/default/templates/tags.tmpl
===================================================================
--- trunk/themes/default/templates/tags.tmpl	                        (rev 0)
+++ trunk/themes/default/templates/tags.tmpl	2021-11-21 19:37:12 UTC (rev 10670)
@@ -0,0 +1 @@
+<!-- dummy -->

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10669] trunk/schemas/psql-1_3_12.sql

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

Revision: 10669
          http://sourceforge.net/p/phpwiki/code/10669
Author:   vargenau
Date:     2021-11-21 18:18:58 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
Remove schemas/psql-1_3_12.sql

Removed Paths:
-------------
    trunk/schemas/psql-1_3_12.sql

Deleted: trunk/schemas/psql-1_3_12.sql
===================================================================
--- trunk/schemas/psql-1_3_12.sql	2021-11-21 18:18:08 UTC (rev 10668)
+++ trunk/schemas/psql-1_3_12.sql	2021-11-21 18:18:58 UTC (rev 10669)
@@ -1,174 +0,0 @@
-\set QUIET
-
--- Init the database with:
--- $ /usr/sbin/createdb phpwiki
--- $ /usr/sbin/createuser -S -R -d phpwiki # (see httpd_user below)
--- $ /usr/bin/psql phpwiki < /usr/share/postgresql/contrib/tsearch2.sql
--- $ /usr/bin/psql phpwiki < psql-initialize.sql
-
--- ================================================================
--- Prefix for table names.
---
--- You should set this to the same value you specified for
--- DATABASE_PREFIX in config.ini
-
-\set prefix 	''
-
--- ================================================================
--- Which postgres user gets access to the tables?
---
--- You should set this to the name of the postgres
--- user who will be accessing the tables.
--- See DATABASE_DSN in config.ini
---
--- Commonly, connections from php are made under
--- the user name of 'nobody', 'apache' or 'www'.
-
-\set httpd_user	'phpwiki'
-
--- ================================================================
---
--- Don't modify below this point unless you know what you are doing.
---
--- ================================================================
-
-\set page_tbl 		:prefix 'page'
-\set page_id_seq 	:prefix 'page_id_seq'
-\set page_id_idx 	:prefix 'page_id_idx'
-\set page_name_idx 	:prefix 'page_name_idx'
-
-\set version_tbl 	:prefix 'version'
-\set vers_id_idx 	:prefix 'vers_id_idx'
-\set vers_mtime_idx 	:prefix 'vers_mtime_idx'
-
-\set recent_tbl		:prefix 'recent'
-\set recent_id_idx 	:prefix 'recent_id_idx'
-
-\set nonempty_tbl	:prefix 'nonempty'
-\set nonmt_id_idx 	:prefix 'nonmt_id_idx'
-
-\set link_tbl 		:prefix 'link'
-\set link_from_idx 	:prefix 'link_from_idx'
-\set link_to_idx 	:prefix 'link_to_idx'
-\set relation_idx 	:prefix 'relation_idx'
-
-\set session_tbl 	:prefix 'session'
-\set sess_id_idx 	:prefix 'sess_id_idx'
-\set sess_date_idx 	:prefix 'sess_date_idx'
-\set sess_ip_idx 	:prefix 'sess_ip_idx'
-
-\set pref_tbl 	 	:prefix 'pref'
-\set pref_id_idx 	:prefix 'pref_id_idx'
--- \set user_tbl 	 	:prefix 'users'
--- \set user_id_idx  	:prefix 'users_id_idx'
-\set member_tbl  	:prefix 'member'
-\set member_id_idx  	:prefix 'member_id_idx'
-\set member_group_idx 	:prefix 'member_group_idx'
-
-\set rating_tbl		:prefix 'rating'
-\set rating_id_idx 	:prefix 'rating_id_idx'
-
-\set accesslog_tbl 	:prefix 'accesslog'
-\set accesslog_time_idx :prefix 'log_time_idx'
-\set accesslog_host_idx :prefix 'log_host_idx'
-
--- ================================================================
-\echo schema enhancements
-
-ALTER TABLE :page_tbl
-	ALTER COLUMN id TYPE SERIAL /* PRIMARY KEY */,
-        ALTER COLUMN pagename TYPE VARCHAR(100),
-	ALTER COLUMN pagename SET NOT NULL,
-	ADD UNIQUE(pagename),
-	ADD CHECK (pagename <> '');
-ALTER TABLE :version_tbl
-	ALTER COLUMN id TYPE INT4,
-        ADD FOREIGN KEY (id) REFERENCES :page_tbl ON DELETE CASCADE;
-ALTER TABLE :nonempty_tbl
-	ALTER COLUMN id TYPE INT4,
-        ADD FOREIGN KEY (id) REFERENCES :page_tbl ON DELETE CASCADE;
-
-\echo Creating experimental page views (not yet used)
-
--- nonempty versiondata
-CREATE VIEW existing_page AS
-  SELECT * FROM :page_tbl P INNER JOIN :nonempty_tbl N USING (id);
-
--- latest page version
-CREATE VIEW curr_page AS
-  SELECT P.id,P.pagename,P.hits,P.pagedata,P.cached_html,
-	 V.version,V.mtime,V.minor_edit,V.content,V.versiondata
-  FROM :page_tbl P
-    JOIN :version_tbl V USING (id)
-    JOIN :recent_tbl  R ON (V.id=R.id AND V.version=R.latestversion);
-
-ALTER TABLE :link_tbl
-	ALTER COLUMN linkfrom TYPE INT4,
-	ALTER COLUMN linkto   TYPE INT4,
-	ADD COLUMN   relation INT4 REFERENCES :page_tbl (id) ON DELETE CASCADE,
-        ADD FOREIGN KEY (linkfrom) REFERENCES :page_tbl (id) ON DELETE CASCADE,
-        ADD FOREIGN KEY (linkto)   REFERENCES :page_tbl (id) ON DELETE CASCADE;
-CREATE INDEX :relation_idx ON :link_tbl (relation);
-ALTER TABLE :rating_tbl
-	ALTER COLUMN raterpage TYPE INT8,
-	ALTER COLUMN rateepage TYPE INT8,
-        ADD FOREIGN KEY (raterpage) REFERENCES :page_tbl (id) ON DELETE CASCADE,
-        ADD FOREIGN KEY (rateepage) REFERENCES :page_tbl (id) ON DELETE CASCADE;
-ALTER TABLE :member_tbl
-	ALTER COLUMN userid TYPE CHAR(48),
-	ALTER COLUMN userid SET NOT NULL,
-	ADD FOREIGN KEY (userid) REFERENCES :pref_tbl;
-
--- ================================================================
-
-\echo add tsearch2 fulltextsearch extension
--- Use the tsearch2 fulltextsearch extension: (recommended) 7.4, 8.0, 8.1
--- At first init it for the database:
-
--- example of ISpell dictionary
---   UPDATE pg_ts_dict SET dict_initoption='DictFile="/usr/local/share/ispell/russian.dict",
---     AffFile ="/usr/local/share/ispell/russian.aff", StopFile="/usr/local/share/ispell/russian.stop"'
---     WHERE dict_name='ispell_template';
--- example of synonym dict
---   UPDATE pg_ts_dict SET dict_initoption='/usr/local/share/ispell/english.syn' WHERE dict_id=5;
-
-GRANT SELECT ON pg_ts_dict, pg_ts_parser, pg_ts_cfg, pg_ts_cfgmap TO :httpd_user;
-ALTER TABLE :version_tbl ADD COLUMN idxFTI tsvector;
-UPDATE :version_tbl SET idxFTI=to_tsvector('default', content);
-VACUUM FULL ANALYZE;
-CREATE INDEX idxFTI_idx ON :version_tbl USING gist(idxFTI);
-VACUUM FULL ANALYZE;
-CREATE TRIGGER tsvectorupdate BEFORE UPDATE OR INSERT ON :version_tbl
-       FOR EACH ROW EXECUTE PROCEDURE tsearch2(idxFTI, content);
-
--- ================================================================
-
-\echo Initializing stored procedures
-
-CREATE OR REPLACE FUNCTION update_recent (id INT4, version INT4)
-	RETURNS void AS '
-DELETE FROM recent  WHERE id=$1;
-INSERT INTO recent (id, latestversion, latestmajor, latestminor)
-  SELECT id, MAX(version), MAX(CASE WHEN minor_edit=0  THEN version END),
-	                   MAX(CASE WHEN minor_edit<>0 THEN version END)
-    FROM version WHERE id=$2 GROUP BY id;
-DELETE FROM nonempty WHERE id=$1;
-INSERT INTO nonempty (id)
-  SELECT recent.id
-    FROM recent, version
-    WHERE recent.id=version.id
-          AND version=latestversion
-          AND content<>''''
-          AND recent.id=$1;
-' LANGUAGE SQL;
-
-CREATE OR REPLACE FUNCTION prepare_rename_page (oldid INT4, newid INT4)
-        RETURNS void AS '
-DELETE FROM page     WHERE id=$2;
-DELETE FROM version  WHERE id=$2;
-DELETE FROM recent   WHERE id=$2;
-DELETE FROM nonempty WHERE id=$2;
--- We have to fix all referring tables to the old id
-UPDATE link SET linkfrom=$1 WHERE linkfrom=$2;
-UPDATE link SET linkto=$1   WHERE linkto=$2;
-' LANGUAGE sql;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10668] trunk/schemas/mysql-1_3_11.sql

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

Revision: 10668
          http://sourceforge.net/p/phpwiki/code/10668
Author:   vargenau
Date:     2021-11-21 18:18:08 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
Remove schemas/mysql-1_3_11.sql

Removed Paths:
-------------
    trunk/schemas/mysql-1_3_11.sql

Deleted: trunk/schemas/mysql-1_3_11.sql
===================================================================
--- trunk/schemas/mysql-1_3_11.sql	2021-11-21 18:01:13 UTC (rev 10667)
+++ trunk/schemas/mysql-1_3_11.sql	2021-11-21 18:18:08 UTC (rev 10668)
@@ -1,29 +0,0 @@
--- phpwiki 1.3.11 upgrade from 1.3.10
-
--- if ACCESS_LOG_SQL > 0
--- only if you need fast log-analysis (spam prevention, recent referrers)
--- see http://www.outoforder.cc/projects/apache/mod_log_sql/docs-2.0/#id2756178
-CREATE TABLE accesslog (
-        time_stamp    int unsigned,
-	remote_host   varchar(50),
-	remote_user   varchar(50),
-        request_method varchar(10),
-	request_line  varchar(255),
-	request_args  varchar(255),
-	request_file  varchar(255),
-	request_uri   varchar(255),
-	request_time  char(28),
-	status 	      smallint unsigned,
-	bytes_sent    smallint unsigned,
-        referer       varchar(255),
-	agent         varchar(255),
-	request_duration float
-);
-CREATE INDEX log_time ON accesslog (time_stamp);
-CREATE INDEX log_host ON accesslog (remote_host);
-
--- and use ?action=upgrade as WIKI_ADMIN then
-ALTER TABLE page ADD cached_html MEDIUMBLOB;
-
--- support ipv6
-ALTER TABLE session CHANGE sess_ip sess_ip CHAR(40) NOT NULL;

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

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

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

Revision: 10667
          http://sourceforge.net/p/phpwiki/code/10667
Author:   vargenau
Date:     2021-11-21 18:01:13 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
First argument of WikiLink must be "__"

Modified Paths:
--------------
    trunk/lib/editpage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentEdits.php
    trunk/lib/plugin/RelatedChanges.php
    trunk/themes/MonoBook/templates/browse-footer.tmpl

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/editpage.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -586,10 +586,10 @@
     private function getModeratedMessage()
     {
         return
-            HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
+            HTML(HTML::h2(WikiLink(__("ModeratedPage"))),
                 HTML::p(fmt("You can edit away, but your changes will have to be approved by the defined moderators at the definition in %s", WikiLink(_("ModeratedPage")))),
                 HTML::p(fmt("The approval has a grace period of 5 days. If you have your e-mail defined in your %s, you will get a notification of approval or rejection.",
-                    WikiLink(_("UserPreferences")))));
+                    WikiLink(__("UserPreferences")))));
     }
 
     protected function getConflictMessage($unresolved = false)

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/plugin/RateIt.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -349,8 +349,7 @@
             $argstr .= $key . "=" . $value;
         $widget = $this->run($request->_dbi, $argstr, $request, $basepage);
 
-        return $this->makeBox(WikiLink(_("RateIt"), '', _("Rate It")),
-            $widget);
+        return $this->makeBox(WikiLink(__("RateIt"), '', _("Rate It")), $widget);
     }
 
     /**

Modified: trunk/lib/plugin/RecentEdits.php
===================================================================
--- trunk/lib/plugin/RecentEdits.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/plugin/RecentEdits.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -58,7 +58,7 @@
         $args['show_deleted'] = false;
         $args['show_all'] = true;
         $args['days'] = 90;
-        return $this->makeBox(WikiLink(_("RecentEdits"), '', _("Recent Edits")),
+        return $this->makeBox(WikiLink(__("RecentEdits"), '', _("Recent Edits")),
             $this->format($this->getChanges($request->_dbi, $args), $args));
     }
 }

Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/plugin/RelatedChanges.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -92,7 +92,7 @@
         $args['show_deleted'] = false;
         $args['show_all'] = false;
         $args['days'] = 90;
-        return $this->makeBox(WikiLink(_("RelatedChanges"), '', _("Related Changes")),
+        return $this->makeBox(WikiLink(__("RelatedChanges"), '', _("Related Changes")),
             $this->format($this->getChanges($request->_dbi, $args), $args));
     }
 

Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl	2021-11-21 18:01:13 UTC (rev 10667)
@@ -11,8 +11,8 @@
       <a class="internal" href="http://phpwiki.demo.free.fr/index.php/Copyrights">Copyrights</a>
 <?php } ?>
 </b> for details).<br /></li>
-<?php if ($request->_dbi->isWikiPage(__("About").WIKI_NAME)) { ?>
-      <?php echo WikiLink(_("About").WIKI_NAME) ?>
+<?php if ($request->_dbi->isWikiPage(__("About")." ".WIKI_NAME)) { ?>
+      <?php echo WikiLink(__("About")." ".WIKI_NAME) ?>
 <?php } else { ?>
       <li id="f-about"><a href="http://phpwiki.demo.free.fr/index.php/Help/PhpWiki">About PhpWiki</a></li>
 <?php } ?>

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

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

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

Revision: 10666
          http://sourceforge.net/p/phpwiki/code/10666
Author:   vargenau
Date:     2021-11-21 17:48:24 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
Get language from preferences if possible

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-11-21 17:20:48 UTC (rev 10665)
+++ trunk/lib/WikiTheme.php	2021-11-21 17:48:24 UTC (rev 10666)
@@ -1618,7 +1618,12 @@
 
         $dbi = $request->getDbh();
         // display flat calender dhtml in the sidebar
-        $jslang = @$GLOBALS['LANG'];
+        if (isset($request->_prefs)) {
+            $pref = $request->_prefs;
+            $jslang = $pref->get('lang');
+        } else {
+            $jslang = "en";
+        }
         $this->addMoreHeaders(
                 $this->_CSSlink(0,
                     $this->_findFile('jscalendar/calendar-phpwiki.css'), 'all'));

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10665] trunk/themes/blog/Kubrick.css

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

Revision: 10665
          http://sourceforge.net/p/phpwiki/code/10665
Author:   vargenau
Date:     2021-11-21 17:20:48 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
Fix blog layout

Modified Paths:
--------------
    trunk/themes/blog/Kubrick.css

Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2021-11-21 16:46:41 UTC (rev 10664)
+++ trunk/themes/blog/Kubrick.css	2021-11-21 17:20:48 UTC (rev 10665)
@@ -277,7 +277,7 @@
 /* ie quirks */
 #sidebar {
     font: 1em 'Lucida Grande', Verdana, Arial, sans-serif;
-    left: 585px;
+    left: 1000px;
     position: absolute;
     z-index: 2;
     top: 260px;
@@ -556,7 +556,7 @@
 #sidebar ul li {
     list-style-type: none;
     list-style-image: none;
-    margin-bottom: 15px;
+    margin-bottom: 1px;
 }
 
 #sidebar ul p, #sidebar ul select {

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10664] trunk/doc/THEMES

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

Revision: 10664
          http://sourceforge.net/p/phpwiki/code/10664
Author:   vargenau
Date:     2021-11-21 16:46:41 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
doc/THEMES: switching to blog theme

Modified Paths:
--------------
    trunk/doc/THEMES

Modified: trunk/doc/THEMES
===================================================================
--- trunk/doc/THEMES	2021-11-20 18:14:27 UTC (rev 10663)
+++ trunk/doc/THEMES	2021-11-21 16:46:41 UTC (rev 10664)
@@ -64,7 +64,7 @@
 
 == Theme switching ==
 
-If you change the theme in your user preferences, you might need to run an upgrade to create the pages that are needed by the theme. For example, the wikilens theme needs the page ##LeftbarContent## (located in ##themes/wikilens/pgsrc/LeftbarContent##).
+If you change the theme in your user preferences, you might need to run an upgrade to create the pages that are needed by the theme. For example, the wikilens theme needs the page ##LeftbarContent## (located in ##themes/wikilens/pgsrc/LeftbarContent##). Same for blog theme that needs ##About##, ##Blog##, ##CategoryHowTo##, ##HowTo## and ##PhotoAlbum##.
 
 ----
 [[PhpWikiDocumentation]]

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10663] trunk/themes/default/templates/sidebar.tmpl

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

Revision: 10663
          http://sourceforge.net/p/phpwiki/code/10663
Author:   vargenau
Date:     2021-11-20 18:14:27 +0000 (Sat, 20 Nov 2021)
Log Message:
-----------
Add dummy themes/default/templates/sidebar.tmpl to avoid error when switching from blog to other theme

Added Paths:
-----------
    trunk/themes/default/templates/sidebar.tmpl

Added: trunk/themes/default/templates/sidebar.tmpl
===================================================================
--- trunk/themes/default/templates/sidebar.tmpl	                        (rev 0)
+++ trunk/themes/default/templates/sidebar.tmpl	2021-11-20 18:14:27 UTC (rev 10663)
@@ -0,0 +1 @@
+<!-- dummy -->

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10662] trunk/doc/THEMES

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

Revision: 10662
          http://sourceforge.net/p/phpwiki/code/10662
Author:   vargenau
Date:     2021-11-19 18:28:39 +0000 (Fri, 19 Nov 2021)
Log Message:
-----------
Update doc/THEMES

Modified Paths:
--------------
    trunk/doc/THEMES

Modified: trunk/doc/THEMES
===================================================================
--- trunk/doc/THEMES	2021-11-19 18:01:13 UTC (rev 10661)
+++ trunk/doc/THEMES	2021-11-19 18:28:39 UTC (rev 10662)
@@ -6,39 +6,42 @@
   want to modify, duplicate them in your new theme folder with the
   same directory structure and modify them there instead of the
   originals.
-* Fix the name in themeinfo.php:
+* Fix the name in ##themeinfo.php##:
+  {{{
   $WikiTheme = new WikiTheme('NewName');
-* or if you have to override some default WikiTheme methods
+  }}}
+* or if you have to override some default ~WikiTheme methods
+  {{{
   class WikiTheme_NewName extends WikiTheme;
   ...
   $WikiTheme = new WikiTheme_NewName('NewName');
+  }}}
 
-
-Note:
+Note: \\
 If you base your theme on the default theme instead of one of the
 others, you can safely delete any files you DID NOT modify from the
 original (so long as you keep the default theme!).
 
-Review the themeinfo.php for any necessary changes, and add the name
-of your theme to index.php.
+Review the ##themeinfo.php## for any necessary changes, and add the name
+of your theme to ##index.php##.
+  {{{
   define('THEME','NewName');
+  }}}
 
 == Template Structure ==
 
-Templates currently must use the .tmpl extension (simple PHP parsed files).
-Other file extensions are reserved for future use (i.e. .tpl for Smarty or
-.html for our old template expansion.)
+Templates must use the ##.tmpl## extension (simple PHP parsed files).
 
-Only one template is called, usually the "html.tmpl" template,
+Only one template is called, usually the ##html.tmpl## template,
 which includes all other templates then.
 
-WikiTheme templates are regular xhtml, but the php parts within "<?php" and "?>"
-are treated especially by phpwiki. HTML entities within the php parts
-should be created by our HtmlElement methods, which create well-formed
+~WikiTheme templates are regular HTML, but the PHP parts within "<?php" and "?>"
+are treated especially by ~PhpWiki. HTML entities within the PHP parts
+should be created by our ~HtmlElement methods, which create well-formed
 HTML objects.
-Pure HTML entities, e.g. <?php echo "<br>" ?> will be escaped to &lt;br&gt;.
+Pure HTML entities, e.g. {{{<?php echo "<br>" ?>}}} will be escaped to ##&lt;br&gt;##.
 
-You can easily embed other templates by your own, e.g. <?php echo Template('body') ?>
+You can easily embed other templates by your own, e.g. ##<?php echo Template('body') ?>##
 
 Templates are used
 * by the master action (html and htmldump), which include most other
@@ -48,14 +51,20 @@
 * by certain pagetypes (e.g. wikiblog, comment, wikiforum)
 
 To include templates from other themes use this syntax:
+  {{{
   <?php echo Template('default/search') ?>
+  }}}
 includes the search template from the default theme.
 
 Warning!
 When you write your own templates or change existing ones, you might
-easily destroy XHTML validity of the generated pages. By using
-the various HTML() methods within a plugin's php code it is guaranteed
-to produce validating XHTML, by using custom templates not.
+easily destroy HTML validity of the generated pages. By using
+the various HTML() methods within a plugin's PHP code it is guaranteed
+to produce validating HTML, by using custom templates not.
 
+== Theme switching ==
+
+If you change the theme in your user preferences, you might need to run an upgrade to create the pages that are needed by the theme. For example, the wikilens theme needs the page ##LeftbarContent## (located in ##themes/wikilens/pgsrc/LeftbarContent##).
+
 ----
 [[PhpWikiDocumentation]]

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10661] trunk/themes/default/templates/logo.tmpl

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

Revision: 10661
          http://sourceforge.net/p/phpwiki/code/10661
Author:   vargenau
Date:     2021-11-19 18:01:13 +0000 (Fri, 19 Nov 2021)
Log Message:
-----------
Add dummy themes/default/templates/logo.tmpl to avoid error when switching from Sidebar or MonoBook to other theme

Added Paths:
-----------
    trunk/themes/default/templates/logo.tmpl

Added: trunk/themes/default/templates/logo.tmpl
===================================================================
--- trunk/themes/default/templates/logo.tmpl	                        (rev 0)
+++ trunk/themes/default/templates/logo.tmpl	2021-11-19 18:01:13 UTC (rev 10661)
@@ -0,0 +1 @@
+<!-- dummy -->

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10660] trunk/lib/plugin/CreateToc.php

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

Revision: 10660
          http://sourceforge.net/p/phpwiki/code/10660
Author:   vargenau
Date:     2021-11-19 08:17:57 +0000 (Fri, 19 Nov 2021)
Log Message:
-----------
Remove unused public

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2021-11-18 14:39:10 UTC (rev 10659)
+++ trunk/lib/plugin/CreateToc.php	2021-11-19 08:17:57 UTC (rev 10660)
@@ -42,8 +42,6 @@
 class WikiPlugin_CreateToc
     extends WikiPlugin
 {
-    public $_markup;
-
     function getDescription()
     {
         return _("Create a Table of Contents and automatically link to headers.");

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10659] trunk/themes/wikilens/pgsrc/LeftbarContent

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

Revision: 10659
          http://sourceforge.net/p/phpwiki/code/10659
Author:   vargenau
Date:     2021-11-18 14:39:10 +0000 (Thu, 18 Nov 2021)
Log Message:
-----------
themes/wikilens/pgsrc/LeftbarContent: use Wikicreole syntax

Modified Paths:
--------------
    trunk/themes/wikilens/pgsrc/LeftbarContent

Modified: trunk/themes/wikilens/pgsrc/LeftbarContent
===================================================================
--- trunk/themes/wikilens/pgsrc/LeftbarContent	2021-11-18 08:48:38 UTC (rev 10658)
+++ trunk/themes/wikilens/pgsrc/LeftbarContent	2021-11-18 14:39:10 UTC (rev 10659)
@@ -1,4 +1,4 @@
-Date: Thu, 13 Oct 2016 15:09:36 +0000
+Date: Thu, 18 Nov 2021 15:36:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=LeftbarContent;
@@ -8,11 +8,4 @@
 
 <strong>Categories:</strong>
 
-<?plugin BackLinks page="CategoryCategory" noheader="true" info="" exclude="InterWikiMap,Category*Template" ?>
-
-<?plugin Comment
-<strong>Lists this is on:</strong>
-<~?~plugin CategoryFieldSearch category="List" field="items" value="[pagename]" search_style="list" header=" " ~?~>
-
-<~?~plugin AddToListForm ~?~>
-?>
+<<BackLinks page="CategoryCategory" noheader="true" info="" exclude="InterWikiMap,Category*Template" >>

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

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

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

Revision: 10658
          http://sourceforge.net/p/phpwiki/code/10658
Author:   vargenau
Date:     2021-11-18 08:48:38 +0000 (Thu, 18 Nov 2021)
Log Message:
-----------
$args must be an array

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

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2021-11-17 18:51:03 UTC (rev 10657)
+++ trunk/lib/WikiTheme.php	2021-11-18 08:48:38 UTC (rev 10658)
@@ -1076,7 +1076,7 @@
     {
         extract($this->_get_name_and_rev($page_or_rev));
 
-        $args = $version ? array('version' => $version) : false;
+        $args = $version ? array('version' => $version) : array();
         if ($action) $args['action'] = $action;
 
         return $this->makeButton($label ? $label : $pagename,

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

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

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

Revision: 10657
          http://sourceforge.net/p/phpwiki/code/10657
Author:   vargenau
Date:     2021-11-17 18:51:03 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
Spelling

Modified Paths:
--------------
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/WikiDB.php
    trunk/lib/editpage.php
    trunk/lib/mimelib.php
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/config/config-dist.ini	2021-11-17 18:51:03 UTC (rev 10657)
@@ -859,7 +859,7 @@
 ;
 ; The map will be taken from a page name InterWikiMap.
 ; If that page is not found (or is not locked), or map
-; data can not be found in it, then the file specified
+; data cannot be found in it, then the file specified
 ; by INTERWIKI_MAP_FILE (if any) will be used.
 ;INTERWIKI_MAP_FILE = lib/interwiki.map
 

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/configurator.php	2021-11-17 18:51:03 UTC (rev 10657)
@@ -1282,7 +1282,7 @@
 
 The map will be taken from a page name InterWikiMap.
 If that page is not found (or is not locked), or map
-data can not be found in it, then the file specified
+data cannot be found in it, then the file specified
 by INTERWIKI_MAP_FILE (if any) will be used.");
 
 $properties["WARN_NONPUBLIC_INTERWIKIMAP"] =

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/lib/WikiDB.php	2021-11-17 18:51:03 UTC (rev 10657)
@@ -61,7 +61,7 @@
  * zero.
  *
  * <tt>WikiDB_PageRevision</tt>s have read-only semantics. One can
- * only create new revisions or delete old ones --- one can not modify
+ * only create new revisions or delete old ones --- one cannot modify
  * an existing revision.
  */
 class WikiDB

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/lib/editpage.php	2021-11-17 18:51:03 UTC (rev 10657)
@@ -573,7 +573,7 @@
     {
         return
             HTML(HTML::h2(_("Page Locked")),
-                HTML::p(_("This page has been locked by the administrator so your changes can not be saved.")),
+                HTML::p(_("This page has been locked by the administrator so your changes cannot be saved.")),
                 HTML::p(_("(Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.)")),
                 HTML::p(_("Sorry for the inconvenience.")));
     }
@@ -618,7 +618,7 @@
         return
             HTML(HTML::h2(_("Conflicting Edits!")),
                 HTML::p(_("In the time since you started editing this page, another user has saved a new version of it.")),
-                HTML::p(_("Your changes can not be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below.")),
+                HTML::p(_("Your changes cannot be saved as they are, since doing so would overwrite the other author's changes. So, your changes and those of the other author have been combined. The result is shown below.")),
                 $message);
     }
 

Modified: trunk/lib/mimelib.php
===================================================================
--- trunk/lib/mimelib.php	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/lib/mimelib.php	2021-11-17 18:51:03 UTC (rev 10657)
@@ -85,7 +85,7 @@
 {
     global $mime_multipart_count;
 
-    // The string "=_" can not occur in quoted-printable encoded data.
+    // The string "=_" cannot occur in quoted-printable encoded data.
     $boundary = "=_multipart_boundary_" . ++$mime_multipart_count;
 
     $head = MimeContentTypeHeader('multipart', 'mixed',

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/de.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -238,7 +238,7 @@
 msgstr "Seite Gesperrt"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 "Diese Seite wurde vom Administrator für die allgemeine Bearbeitung gesperrt. "
@@ -294,9 +294,9 @@
 "hat ein anderer Benutzer bereits eine neuere Version gespeichert."
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 "Ihre Änderungen können so, wie sie sind, nicht gespeichert werden. Das hätte "
 "unzulässigerweise die bereits gesicherten Änderungen des anderen Autors "
@@ -5051,6 +5051,9 @@
 msgid "Page Execution took %s seconds"
 msgstr "Ausführung dieser Seite dauerte %s Sekunden"
 
+msgid "Author History"
+msgstr "Autoren Protokoll"
+
 msgid "Diff previous Revision"
 msgstr "Diff zu voriger Version"
 
@@ -5660,9 +5663,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr "Autoren Protokoll"
-
 msgid "Purge HTML cache"
 msgstr "HTML-Cachedatei Säubern"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/es.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -239,7 +239,7 @@
 msgstr "Página Bloqueada"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 "Esta página ha sido bloqueada por el administrador y no puede ser editada."
@@ -293,9 +293,9 @@
 "ahorrado una nueva versión de ella."
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 "Sus cambios no se pueden ahorrar como son, desde hacer así que "
 "sobreescribirían los cambios del otro autor. Así pues, se han combinado sus "
@@ -4946,6 +4946,9 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
+msgid "Author History"
+msgstr ""
+
 msgid "Diff previous Revision"
 msgstr ""
 
@@ -5531,9 +5534,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/fr.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -237,7 +237,7 @@
 msgstr "Page verrouillée"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 "Cette page a été verrouillée par l'administrateur et vos changements n'ont "
@@ -299,9 +299,9 @@
 "a enregistré une nouvelle version."
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 "Vos modifications ne peuvent être enregistrées, puisqu'elles écraseraient "
 "celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de "
@@ -5039,6 +5039,9 @@
 msgid "Page Execution took %s seconds"
 msgstr "L'exécution de la page a pris %s secondes"
 
+msgid "Author History"
+msgstr "Historique des auteurs"
+
 msgid "Diff previous Revision"
 msgstr "Différences avec la version précédente"
 
@@ -5459,7 +5462,7 @@
 msgstr ""
 "Cacher ou montrer les icônes de liens (si supportées par le thème actuel). "
 "Très utile pour les navigateurs ne supportant pas les images ou pour les "
-"connexion bas débit."
+"connexions bas débit."
 
 #, php-format
 msgid "Add %s"
@@ -5651,9 +5654,6 @@
 msgid "Special Actions"
 msgstr "Actions spéciales"
 
-msgid "Author History"
-msgstr "Historique des auteurs"
-
 msgid "Purge HTML cache"
 msgstr "Purger le cache HTML"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/it.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -227,7 +227,7 @@
 msgstr "Pagina Bloccata"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 "Spiacente, ma questa pagina è stata bloccata dall'amministratore,quindi le "
@@ -282,9 +282,9 @@
 "utente ha conservato una nuova versione di esso."
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 "I vostri cambiamenti non possono essere conservati mentre sono, dal fare in "
 "modo da scriverebbero sopra i cambiamenti dell'altro autore. Così, i vostri "
@@ -4906,6 +4906,9 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
+msgid "Author History"
+msgstr ""
+
 msgid "Diff previous Revision"
 msgstr ""
 
@@ -5491,9 +5494,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr "RimuoviDallaCacheHtml"
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/ja.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -228,7 +228,7 @@
 msgstr "ページをロックしました"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 
@@ -274,9 +274,9 @@
 msgstr ""
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 
 msgid "Undo"
@@ -4892,6 +4892,9 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
+msgid "Author History"
+msgstr ""
+
 msgid "Diff previous Revision"
 msgstr ""
 
@@ -5477,9 +5480,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/nl.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -230,7 +230,7 @@
 msgstr "Sidan är Låst"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 "Deze pagina is afgesloten door de beheerder en je veranderingen kan niet "
@@ -280,9 +280,9 @@
 msgstr ""
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 
 msgid "Undo"
@@ -4898,6 +4898,9 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
+msgid "Author History"
+msgstr ""
+
 msgid "Diff previous Revision"
 msgstr ""
 
@@ -5483,9 +5486,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/phpwiki.pot	2021-11-17 18:51:03 UTC (rev 10657)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -228,7 +228,7 @@
 msgstr ""
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr ""
 
@@ -274,9 +274,9 @@
 msgstr ""
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 
 msgid "Undo"
@@ -4892,6 +4892,9 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
+msgid "Author History"
+msgstr ""
+
 msgid "Diff previous Revision"
 msgstr ""
 
@@ -5477,9 +5480,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/sv.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -227,7 +227,7 @@
 msgstr "Sidan är Låst"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr "Den här sidan är låst av administratören och kan ej redigeras."
 
@@ -275,9 +275,9 @@
 msgstr ""
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 
 msgid "Undo"
@@ -4893,6 +4893,9 @@
 msgid "Page Execution took %s seconds"
 msgstr ""
 
+msgid "Author History"
+msgstr ""
+
 msgid "Diff previous Revision"
 msgstr ""
 
@@ -5478,9 +5481,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr ""
-
 msgid "Purge HTML cache"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-11-17 18:21:02 UTC (rev 10656)
+++ trunk/locale/po/zh.po	2021-11-17 18:51:03 UTC (rev 10657)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:29+0100\n"
+"POT-Creation-Date: 2021-11-17 19:48+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -226,7 +226,7 @@
 msgstr "頁面已被鎖定"
 
 msgid ""
-"This page has been locked by the administrator so your changes can not be "
+"This page has been locked by the administrator so your changes cannot be "
 "saved."
 msgstr "此頁面已被管理者鎖定,所以你的更動無法儲存."
 
@@ -275,9 +275,9 @@
 msgstr "從你上次修改這個頁面到現在的這段時間,已經有使用者儲存了較新的版本."
 
 msgid ""
-"Your changes can not be saved as they are, since doing so would overwrite "
-"the other author's changes. So, your changes and those of the other author "
-"have been combined. The result is shown below."
+"Your changes cannot be saved as they are, since doing so would overwrite the "
+"other author's changes. So, your changes and those of the other author have "
+"been combined. The result is shown below."
 msgstr ""
 "無法儲存你所變更的部份,在你編輯的這段時間,已經有其他作者變更了.所以你所變更的"
 "部份已經和其他作者變更的部份合併.結果顯示在下面."
@@ -4914,6 +4914,9 @@
 msgid "Page Execution took %s seconds"
 msgstr "執行此頁面花了 %s 秒"
 
+msgid "Author History"
+msgstr "作者歷程"
+
 msgid "Diff previous Revision"
 msgstr "與上個修訂做比對"
 
@@ -5505,9 +5508,6 @@
 msgid "Special Actions"
 msgstr ""
 
-msgid "Author History"
-msgstr "作者歷程"
-
 msgid "Purge HTML cache"
 msgstr ""
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

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

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

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

Revision: 10656
          http://sourceforge.net/p/phpwiki/code/10656
Author:   vargenau
Date:     2021-11-17 18:21:02 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
TitleSearch and FullTextSearch: add limit=1000 to display (almost) all results instead of default 50

Modified Paths:
--------------
    trunk/pgsrc/FullTextSearch
    trunk/pgsrc/TitleSearch

Modified: trunk/pgsrc/FullTextSearch
===================================================================
--- trunk/pgsrc/FullTextSearch	2021-11-17 18:12:35 UTC (rev 10655)
+++ trunk/pgsrc/FullTextSearch	2021-11-17 18:21:02 UTC (rev 10656)
@@ -1,4 +1,4 @@
-Date: Wed,  3 Aug 2021 09:27:34 +0000
+Date: Wed, 17 Nov 2021 19:13:32 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=FullTextSearch;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-<<FullTextSearch>>
+<<FullTextSearch limit=1000>>
 
 ----
 

Modified: trunk/pgsrc/TitleSearch
===================================================================
--- trunk/pgsrc/TitleSearch	2021-11-17 18:12:35 UTC (rev 10655)
+++ trunk/pgsrc/TitleSearch	2021-11-17 18:21:02 UTC (rev 10656)
@@ -1,4 +1,4 @@
-Date: Wed,  3 Aug 2021 09:27:34 +0000
+Date: Wed, 17 Nov 2021 19:13:32 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=TitleSearch;
@@ -6,7 +6,7 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
-<<TitleSearch>>
+<<TitleSearch limit=1000>>
 
 ----
 

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10655] trunk/lib/PageList.php

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

Revision: 10655
          http://sourceforge.net/p/phpwiki/code/10655
Author:   vargenau
Date:     2021-11-17 18:12:35 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
explicitly cast to int to avoid warning

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2021-11-17 17:28:49 UTC (rev 10654)
+++ trunk/lib/PageList.php	2021-11-17 18:12:35 UTC (rev 10655)
@@ -1808,7 +1808,7 @@
         foreach (array_reverse($rows) as $one_row) {
             $pagehtml = $one_row['render'];
             if (!$pagehtml) continue;
-            $group = ($i++ / $this->_group_rows);
+            $group = (int)($i++ / $this->_group_rows);
             //TODO: here we switch every row, in tables every third.
             //      unification or parametrized?
             $class = ($group % 2) ? 'oddrow' : 'evenrow';

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

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

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

Revision: 10654
          http://sourceforge.net/p/phpwiki/code/10654
Author:   vargenau
Date:     2021-11-17 17:28:49 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
pgsrc/Help%2FWikisUsingPhpWiki: add //math.drhuang.com/wiki/Index.php/HomePage

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

Modified: trunk/pgsrc/Help%2FWikisUsingPhpWiki
===================================================================
--- trunk/pgsrc/Help%2FWikisUsingPhpWiki	2021-11-17 08:14:15 UTC (rev 10653)
+++ trunk/pgsrc/Help%2FWikisUsingPhpWiki	2021-11-17 17:28:49 UTC (rev 10654)
@@ -1,4 +1,4 @@
-Date: Fri, 17 Sep 2021 10:38:33 +0000
+Date: Wed, 17 Nov 2021 15:57:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FWikisUsingPhpWiki
@@ -32,6 +32,7 @@
 | http://joomlacode.org/gf/user/mat978/userwiki/                   |                   | Gforge
 | http://kcpralumni.org/wiki/                                      | 1.6.0             | Sidebar
 | http://kqlives.sourceforge.net/                                  | 1.3.14            | kq (custom)
+| http://math.drhuang.com/wiki/Index.php/HomePage                  | 1.4.0RC1          | Sidebar
 | http://matthieuachard.free.fr/wiki/                              | 1.2.10
 | http://meanwhile.sourceforge.net/wiki/                           | 1.4.0RC1          | ~MonoBook
 | http://mtswiki.westwood-tech.com/mtswiki-index.php/HomePage      | 1.6.0             | Sidebar

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

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

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

Revision: 10653
          http://sourceforge.net/p/phpwiki/code/10653
Author:   vargenau
Date:     2021-11-17 08:14:15 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
Remove durations

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/lib/display.php
    trunk/lib/main.php

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-11-17 08:09:41 UTC (rev 10652)
+++ trunk/lib/IniConfig.php	2021-11-17 08:14:15 UTC (rev 10653)
@@ -431,7 +431,7 @@
                 $GLOBALS['INCLUDE_PATH'] = $rs['INCLUDE_PATH'];
             }
             $rs['PLUGIN_CACHED_CACHE_DIR'] = TEMP_DIR . '/cache';
-            if (!findFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) { // [29ms]
+            if (!findFile($rs['PLUGIN_CACHED_CACHE_DIR'], 1)) {
                 findFile(TEMP_DIR, false, 1); // TEMP must exist!
                 mkdir($rs['PLUGIN_CACHED_CACHE_DIR'], 0777);
             }
@@ -459,8 +459,8 @@
     unset($rs);
     unset($rsdef);
 
-    fixup_static_configs($file); //[1ms]
-    fixup_dynamic_configs(); // [100ms]
+    fixup_static_configs($file);
+    fixup_dynamic_configs();
 }
 
 function fixup_static_configs($file)

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2021-11-17 08:09:41 UTC (rev 10652)
+++ trunk/lib/display.php	2021-11-17 08:14:15 UTC (rev 10653)
@@ -35,7 +35,7 @@
     require_once 'lib/TextSearchQuery.php';
     $search = new TextSearchQuery(KEYWORDS, true);
     $KeywordLinkRegexp = $search->asRegexp();
-    // iterate over the pagelinks (could be a large number) [15ms on PluginManager]
+    // iterate over the pagelinks (could be a large number)
     // or do a titleSearch and check the categories if they are linked?
     $links = $page->getPageLinks();
     $keywords[] = SplitPagename($page->getName());

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2021-11-17 08:09:41 UTC (rev 10652)
+++ trunk/lib/main.php	2021-11-17 08:14:15 UTC (rev 10653)
@@ -39,7 +39,7 @@
 function mayAccessPage($access, $pagename)
 {
     if (defined('ENABLE_PAGEPERM') and ENABLE_PAGEPERM)
-        return _requiredAuthorityForPagename($access, $pagename); // typically [10-20ms per page]
+        return _requiredAuthorityForPagename($access, $pagename);
     else
         return true;
 }
@@ -54,7 +54,6 @@
     function __construct()
     {
         $this->_dbi = WikiDB::open($GLOBALS['DBParams']);
-        // first mysql request costs [958ms]! [670ms] is mysql_connect()
 
         if (in_array('File', $this->_dbi->getAuthParam('USER_AUTH_ORDER'))) {
             include_once 'lib/pear/File_Passwd.php';
@@ -86,7 +85,7 @@
                     . $dbi->getParam('db_session_table'));
         }
 
-        parent::__construct(); // [90ms]
+        parent::__construct();
 
         // Normalize args...
         $this->setArg('pagename', $this->_deducePagename());
@@ -227,7 +226,6 @@
     // This really maybe should be part of the constructor, but since it
     // may involve HTML/template output, the global $request really needs
     // to be initialized before we do this stuff.
-    // [50ms]: 36ms if wikidb_page::exists
     function updateAuthAndPrefs()
     {
 
@@ -752,7 +750,6 @@
         $this->finish(); // NORETURN
     }
 
-    // [574ms] mainly template:printexpansion: 393ms and template::expandsubtemplate [100+70+60ms]
     function handleAction()
     {
         // Check illegal characters in page names: <>[]{}|"

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

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

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

Revision: 10652
          http://sourceforge.net/p/phpwiki/code/10652
Author:   vargenau
Date:     2021-11-17 08:09:41 +0000 (Wed, 17 Nov 2021)
Log Message:
-----------
PopularTagsPlugin: pagename and noheader are not used, update help page

Modified Paths:
--------------
    trunk/lib/plugin/PopularTags.php
    trunk/pgsrc/Help%2FPopularTagsPlugin

Modified: trunk/lib/plugin/PopularTags.php
===================================================================
--- trunk/lib/plugin/PopularTags.php	2021-11-16 16:48:37 UTC (rev 10651)
+++ trunk/lib/plugin/PopularTags.php	2021-11-17 08:09:41 UTC (rev 10652)
@@ -45,10 +45,9 @@
 
     function getDefaultArguments()
     {
-        return array('pagename' => '[pagename]',
+        return array(
             'limit' => 10,
             'mincount' => 5,
-            'noheader' => 0,
         );
     }
 
@@ -71,8 +70,7 @@
             $name = $b->getName();
             if (preg_match("/^" . _("Template") . "/", $name)) continue;
             $pages = $b->getBackLinks();
-            $bl[] = array('name' => $name,
-                'count' => $pages->count());
+            $bl[] = array('name' => $name, 'count' => $pages->count());
         }
 
         usort($bl, array($this, 'cmp_by_count'));
@@ -84,8 +82,7 @@
             $count = $b['count'];
             if ($count < $mincount) break;
             if ($i > $limit) break;
-            $wo = preg_replace("/^(" . _("Category") . "|"
-                . _("Topic") . ")/", "", $name);
+            $wo = preg_replace("/^(" . _("Category") . "|" . _("Topic") . ")/", "", $name);
             $wo = HTML(HTML::span($wo), HTML::raw("&nbsp;"), HTML::small("(" . $count . ")"));
             $link = WikiLink($name, 'auto', $wo);
             $html->pushContent(HTML::li($link));

Modified: trunk/pgsrc/Help%2FPopularTagsPlugin
===================================================================
--- trunk/pgsrc/Help%2FPopularTagsPlugin	2021-11-16 16:48:37 UTC (rev 10651)
+++ trunk/pgsrc/Help%2FPopularTagsPlugin	2021-11-17 08:09:41 UTC (rev 10652)
@@ -1,4 +1,4 @@
-Date: Tue, 16 Nov 2021 17:02:08 +0000
+Date: Wed, 17 Nov 2021 09:08:23 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FPopularTagsPlugin;
@@ -22,21 +22,13 @@
 ! Description
 ! Default value
 |-
-| **pagename**
-|
-|
-|-
 | **limit**
-|
+| Maximum number of tags to display
 | 10
 |-
 | **mincount**
-|
+| Minimum popularity of the tag (number of backlinks)
 | 5
-|-
-| **noheader**
-| Boolean. If true, header should be omitted.
-| false
 |}
 
 == Example ==

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10651] trunk/themes/blog/templates/info.tmpl

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

Revision: 10651
          http://sourceforge.net/p/phpwiki/code/10651
Author:   vargenau
Date:     2021-11-16 16:48:37 +0000 (Tue, 16 Nov 2021)
Log Message:
-----------
Better label

Modified Paths:
--------------
    trunk/themes/blog/templates/info.tmpl

Modified: trunk/themes/blog/templates/info.tmpl
===================================================================
--- trunk/themes/blog/templates/info.tmpl	2021-11-16 16:31:11 UTC (rev 10650)
+++ trunk/themes/blog/templates/info.tmpl	2021-11-16 16:48:37 UTC (rev 10651)
@@ -1,6 +1,6 @@
 <?php echo Template("default/info") ?>
 <div class="actionbuttons">
-  <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("AuthorHistory")) ?>
+  <?php echo $SEP?><?php echo Button(__("AuthorHistory"), _("Author History")) ?>
   <?php echo $SEP?><?php echo Button("Diff") ?>
   <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
   <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>

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

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

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

Revision: 10650
          http://sourceforge.net/p/phpwiki/code/10650
Author:   vargenau
Date:     2021-11-16 16:31:11 +0000 (Tue, 16 Nov 2021)
Log Message:
-----------
Remove themes/default/templates/homepage.tmpl, unused

Modified Paths:
--------------
    trunk/locale/Makefile
    trunk/locale/de/LC_MESSAGES/phpwiki.mo
    trunk/locale/es/LC_MESSAGES/phpwiki.mo
    trunk/locale/fr/LC_MESSAGES/phpwiki.mo
    trunk/locale/it/LC_MESSAGES/phpwiki.mo
    trunk/locale/ja/LC_MESSAGES/phpwiki.mo
    trunk/locale/nl/LC_MESSAGES/phpwiki.mo
    trunk/locale/po/de.po
    trunk/locale/po/es.po
    trunk/locale/po/fr.po
    trunk/locale/po/it.po
    trunk/locale/po/ja.po
    trunk/locale/po/nl.po
    trunk/locale/po/phpwiki.pot
    trunk/locale/po/sv.po
    trunk/locale/po/zh.po
    trunk/locale/sv/LC_MESSAGES/phpwiki.mo
    trunk/locale/zh/LC_MESSAGES/phpwiki.mo

Removed Paths:
-------------
    trunk/themes/default/templates/homepage.tmpl

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/Makefile	2021-11-16 16:31:11 UTC (rev 10650)
@@ -417,7 +417,6 @@
 ${POT_FILE}: .././themes/default/templates/editpage.tmpl
 ${POT_FILE}: .././themes/default/templates/forumadd.tmpl
 ${POT_FILE}: .././themes/default/templates/head.tmpl
-${POT_FILE}: .././themes/default/templates/homepage.tmpl
 ${POT_FILE}: .././themes/default/templates/htmldump.tmpl
 ${POT_FILE}: .././themes/default/templates/html.tmpl
 ${POT_FILE}: .././themes/default/templates/info.tmpl

Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/de.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5214,18 +5214,6 @@
 msgid "Add Message"
 msgstr "Neue Nachricht"
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr "Sie können einige Einstellungen in %s individuell gestalten."
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-"(Ihre Einstellungen sind als versteckte Daten in dieser Seite hintergelegt.)"
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr "Die %s UnterSeite ermöglicht ein einfaches Weblog."
-
 msgid "1 word"
 msgstr "1 Wort"
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/es.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5104,17 +5104,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr ""
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr ""
-
 msgid "1 word"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/fr.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5201,17 +5201,6 @@
 msgid "Add Message"
 msgstr "Ajouter un message"
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr "Vous pouvez personnaliser quelques préférences dans %s."
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr "(Vos préférences sont enregistrées en mode invisible sur cette page.)"
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr "Les sous-pages de %s permettent l'utilisation d'un blog simple."
-
 msgid "1 word"
 msgstr "1 mot"
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/it.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2005-02-12 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5064,17 +5064,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr ""
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr ""
-
 msgid "1 word"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/ja.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5050,17 +5050,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr ""
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr ""
-
 msgid "1 word"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/nl.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5056,17 +5056,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr ""
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr ""
-
 msgid "1 word"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/phpwiki.pot	2021-11-16 16:31:11 UTC (rev 10650)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5050,17 +5050,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr ""
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr ""
-
 msgid "1 word"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/sv.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5051,17 +5051,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr ""
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr ""
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr ""
-
 msgid "1 word"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/locale/po/zh.po	2021-11-16 16:31:11 UTC (rev 10650)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-16 17:07+0100\n"
+"POT-Creation-Date: 2021-11-16 17:29+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5072,17 +5072,6 @@
 msgid "Add Message"
 msgstr ""
 
-#, php-format
-msgid "You can personalize various settings in %s."
-msgstr "你可以在 %s 自訂多種個人化設定."
-
-msgid "(Your preferences are stored as hidden data within this page.)"
-msgstr "(你的偏好設定已經存放並隱藏在此頁面中.)"
-
-#, php-format
-msgid "The %s subpage enables simple weblogging."
-msgstr "%s 子頁面啟動簡易 weblogging."
-
 msgid "1 word"
 msgstr "1 個單字"
 

Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)

Deleted: trunk/themes/default/templates/homepage.tmpl
===================================================================
--- trunk/themes/default/templates/homepage.tmpl	2021-11-16 16:08:27 UTC (rev 10649)
+++ trunk/themes/default/templates/homepage.tmpl	2021-11-16 16:31:11 UTC (rev 10650)
@@ -1,36 +0,0 @@
-<?php
-/**
- * Note: Automatic homepage creation is not yet functional.
- */
-$UserName = $user->getId();
-$DefaultMessage = sprintf(_("Describe %s here."), $UserName);
-
-$UserPreferencesMessage[0] =
-    sprintf(_("You can personalize various settings in %s."),
-            _("UserPreferences"));
-$UserPreferencesMessage[1] =
-    _("(Your preferences are stored as hidden data within this page.)");
-
-$CalendarSubpage = sprintf('[%s]', '/' . _("Calendar"));
-$calendarMessage = sprintf(_("The %s subpage enables simple weblogging."),
-                           $CalendarSubpage);
-
-$BackLinks = sprintf('<'.'?plugin BackLinks ?'.'>');
-$FullTextSearch = sprintf('<'.'?plugin-form FullTextSearch s=%s ?'.'>',
-                          $UserName);
-/**
- * WikiMarkup with embedded PHP follows:
- */
-?>
-<?php echo $DefaultMessage?>
-
-----
-<?php echo $UserPreferencesMessage[0]?>%%%
-_<?php echo $UserPreferencesMessage[1]?>_
-
-<?php echo $CalendarMessage?>
-----
-<?php echo $BackLinks?>
-<?php echo $FullTextSearch?>
-----
-<?php echo _("CategoryHomePages")?>

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