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

[phpwiki-checkins] SF.net SVN: phpwiki:[10924] trunk/config/config-default.ini

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

Revision: 10924
          http://sourceforge.net/p/phpwiki/code/10924
Author:   vargenau
Date:     2022-01-21 08:35:16 +0000 (Fri, 21 Jan 2022)
Log Message:
-----------
sort config/config-default.ini like config/config-dist.ini

Modified Paths:
--------------
    trunk/config/config-default.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2022-01-21 08:32:38 UTC (rev 10923)
+++ trunk/config/config-default.ini	2022-01-21 08:35:16 UTC (rev 10924)
@@ -1,68 +1,61 @@
 ; This is the default PhpWiki configuration for undefined config.ini entries.
 DEBUG = 0
-ENABLE_PAGEPERM = true
 ENABLE_EDIT_TOOLBAR = true
-TOOLBAR_IMAGE_PULLDOWN = true
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
+ENABLE_WYSIWYG = false
+WYSIWYG_BACKEND = Wikiwyg
+WYSIWYG_DEFAULT_PAGETYPE_HTML = false
+UPLOAD_USERDIR = true
+DISABLE_UNITS = false
 ENABLE_OPEN_GRAPH = false
-ISREADONLY = false
-WIKIDB_NOCACHE_MARKUP = false
 ENABLE_SPAMASSASSIN = false
 ENABLE_SPAMBLOCKLIST = false
+NUM_SPAM_LINKS = 20
+DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = false
 GOOGLE_LINKS_NOFOLLOW = true
-NUM_SPAM_LINKS = 20
+ENABLE_AJAX = true
 ENABLE_DISCUSSION_LINK = false
 ENABLE_CAPTCHA = false
-ENABLE_MAILNOTIFY = true
 USE_CAPTCHA_RANDOM_WORD = false
-DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = false
-ENABLE_WYSIWYG = false
-WYSIWYG_BACKEND = Wikiwyg
-WYSIWYG_DEFAULT_PAGETYPE_HTML = false
-UPLOAD_USERDIR = true
-DISABLE_UNITS = false
+BLOG_DEFAULT_EMPTY_PREFIX = true
 ENABLE_SEARCHHIGHLIGHT = true
+ENABLE_MAILNOTIFY = true
 ENABLE_RECENTCHANGESBOX = false
-ENABLE_RATEIT = false
 ENABLE_PAGE_PUBLIC = false
-ENABLE_AJAX = true
+ISREADONLY = false
 WIKI_NAME = PhpWiki
+ENCRYPTED_PASSWD = true
 ENABLE_REVERSE_DNS = true
-ENCRYPTED_PASSWD = true
 ZIPDUMP_AUTH = false
 ENABLE_RAW_HTML = true
 ENABLE_RAW_HTML_LOCKEDONLY = true
 ENABLE_RAW_HTML_SAFE = true
-STRICT_MAILABLE_PAGEDUMPS = false
-DEFAULT_DUMP_DIR = /tmp/wikidump
-HTML_DUMP_DIR = /tmp/wikidumphtml
-HTML_DUMP_SUFFIX = .html
-MAX_UPLOAD_SIZE = 16777216
-MINOR_EDIT_TIMEOUT = 604800
 INSECURE_ACTIONS_LOCALHOST_ONLY = true
 ENABLE_MODERATEDPAGE_ALL = false
 ACCESS_LOG = ""
 CACHE_CONTROL = LOOSE
 CACHE_CONTROL_MAX_AGE = 600
+WIKIDB_NOCACHE_MARKUP = false
+COOKIE_EXPIRATION_DAYS = 365
+COOKIE_DOMAIN = "/"
 DATABASE_TYPE = dba
 DATABASE_PREFIX = ""
 DATABASE_SESSION_TABLE = session
 DATABASE_DIRECTORY = /tmp
+DATABASE_PERSISTENT = false
 DATABASE_DBA_HANDLER = db4
 DATABASE_TIMEOUT = 20
 DATABASE_OPTIMISE_FREQUENCY = 50
-DATABASE_PERSISTENT = false
-COOKIE_EXPIRATION_DAYS = 365
-COOKIE_DOMAIN = "/"
 ALLOW_ANON_USER = true
 ALLOW_ANON_EDIT = true
 ALLOW_BOGO_LOGIN = true
 ALLOW_USER_PASSWORDS = true
 USER_AUTH_ORDER = PersonalPage
+ENABLE_AUTH_OPENID = false
 PASSWORD_LENGTH_MINIMUM = 0
 USER_AUTH_POLICY = first-only
-ENABLE_AUTH_OPENID = false
+ENABLE_PAGEPERM = true
 AUTH_USER_FILE_STORABLE = false
 AUTH_SESS_USER = userid
 AUTH_SESS_LEVEL = 2
@@ -98,10 +91,17 @@
 ENABLE_MARKUP_TEMPLATE = true
 DISABLE_MARKUP_WIKIWORD = false
 ENABLE_MARKUP_DIVSPAN = false
+STRICT_MAILABLE_PAGEDUMPS = false
+DEFAULT_DUMP_DIR = /tmp/wikidump
+HTML_DUMP_DIR = /tmp/wikidumphtml
+HTML_DUMP_SUFFIX = .html
+MAX_UPLOAD_SIZE = 16777216
+MINOR_EDIT_TIMEOUT = 604800
 DISABLE_GETIMAGESIZE = true
-BLOG_DEFAULT_EMPTY_PREFIX = true
+TOOLBAR_IMAGE_PULLDOWN = true
 EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
 BABYCART_PATH = /usr/local/bin/babycart
+ENABLE_RATEIT = false
 PLUGIN_CACHED_DATABASE = file
 PLUGIN_CACHED_FILENAME_PREFIX = phpwiki
 PLUGIN_CACHED_HIGHWATER = 4194304

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10923] trunk/config/config-dist.ini

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

Revision: 10923
          http://sourceforge.net/p/phpwiki/code/10923
Author:   vargenau
Date:     2022-01-21 08:32:38 +0000 (Fri, 21 Jan 2022)
Log Message:
-----------
config/config-dist.ini: comment defaults

Modified Paths:
--------------
    trunk/config/config-dist.ini

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2022-01-20 18:17:10 UTC (rev 10922)
+++ trunk/config/config-dist.ini	2022-01-21 08:32:38 UTC (rev 10923)
@@ -515,10 +515,10 @@
 
 ; allow anon users to view or edit any existing pages
 ; Default: true
-;ALLOW_ANON_USER = true
+;ALLOW_ANON_USER = false
 ; allow anon users to edit pages
 ; Default: true
-;ALLOW_ANON_EDIT = true
+;ALLOW_ANON_EDIT = false
 
 ; If ALLOW_BOGO_LOGIN is true, users are allowed to login (with
 ; any/no password) using any userid which:
@@ -528,7 +528,7 @@
 ; If such a user will create a so called HomePage with his userid, he will
 ; be able to store his preferences and password there.
 ; Default: true
-;ALLOW_BOGO_LOGIN = true
+;ALLOW_BOGO_LOGIN = false
 
 ; True User Authentication:
 ; To require user passwords:
@@ -538,7 +538,7 @@
 ;   ALLOW_USER_PASSWORDS = true.
 ; Otherwise any anon or bogo user might login without any or a wrong password.
 ; Default: true
-;ALLOW_USER_PASSWORDS = true
+;ALLOW_USER_PASSWORDS = false
 
 ; Many different methods can be used to check user's passwords:
 ;   BogoLogin:     WikiWord username, with no *actual* password checking,
@@ -645,7 +645,6 @@
 ; Default: ou=Groups
 ;LDAP_OU_GROUP = ou=Groups
 
-
 ; IMAP authentication options:
 ;
 ; The IMAP server to check usernames from.  Defaults to localhost.
@@ -1105,12 +1104,12 @@
 
 ; Here you can change the default dump directories.
 ; (Can be overridden by the directory argument)
-DEFAULT_DUMP_DIR = /tmp/wikidump
-HTML_DUMP_DIR    = /tmp/wikidumphtml
+;DEFAULT_DUMP_DIR = /tmp/wikidump
+;HTML_DUMP_DIR    = /tmp/wikidumphtml
 
 ; Filename suffix used for XHTML page dumps.
 ; If you don't want any suffix just comment this out.
-HTML_DUMP_SUFFIX = .html
+;HTML_DUMP_SUFFIX = .html
 
 ; The maximum file upload size, in bytes.
 ; Default: 16777216 (16 MB)

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10922] trunk/config/config-default.ini

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

Revision: 10922
          http://sourceforge.net/p/phpwiki/code/10922
Author:   vargenau
Date:     2022-01-20 18:17:10 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
config/config-default.ini: remove commented values

Modified Paths:
--------------
    trunk/config/config-default.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2022-01-20 18:14:46 UTC (rev 10921)
+++ trunk/config/config-default.ini	2022-01-20 18:17:10 UTC (rev 10922)
@@ -1,18 +1,12 @@
 ; This is the default PhpWiki configuration for undefined config.ini entries.
-
-; recent development and debugging features:
 DEBUG = 0
 ENABLE_PAGEPERM = true
 ENABLE_EDIT_TOOLBAR = true
 TOOLBAR_IMAGE_PULLDOWN = true
-; TOOLBAR_PAGELINK_PULLDOWN = *
-; TOOLBAR_TEMPLATE_PULLDOWN = Template*
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_OPEN_GRAPH = false
 ISREADONLY = false
-
-; calculated dynamically, but need a default
 WIKIDB_NOCACHE_MARKUP = false
 ENABLE_SPAMASSASSIN = false
 ENABLE_SPAMBLOCKLIST = false
@@ -28,13 +22,11 @@
 WYSIWYG_DEFAULT_PAGETYPE_HTML = false
 UPLOAD_USERDIR = true
 DISABLE_UNITS = false
-; UNITS_EXE = /usr/bin/units
 ENABLE_SEARCHHIGHLIGHT = true
 ENABLE_RECENTCHANGESBOX = false
 ENABLE_RATEIT = false
 ENABLE_PAGE_PUBLIC = false
 ENABLE_AJAX = true
-
 WIKI_NAME = PhpWiki
 ENABLE_REVERSE_DNS = true
 ENCRYPTED_PASSWD = true
@@ -48,13 +40,9 @@
 HTML_DUMP_SUFFIX = .html
 MAX_UPLOAD_SIZE = 16777216
 MINOR_EDIT_TIMEOUT = 604800
-; DISABLED_ACTIONS = "dumpserial : loadfile"
 INSECURE_ACTIONS_LOCALHOST_ONLY = true
 ENABLE_MODERATEDPAGE_ALL = false
 ACCESS_LOG = ""
-; ACCESS_LOG_SQL: on SQL 2, else 0
-; ACCESS_LOG_SQL = 0
-; COMPRESS_OUTPUT = true
 CACHE_CONTROL = LOOSE
 CACHE_CONTROL_MAX_AGE = 600
 DATABASE_TYPE = dba
@@ -65,10 +53,8 @@
 DATABASE_TIMEOUT = 20
 DATABASE_OPTIMISE_FREQUENCY = 50
 DATABASE_PERSISTENT = false
-
 COOKIE_EXPIRATION_DAYS = 365
 COOKIE_DOMAIN = "/"
-
 ALLOW_ANON_USER = true
 ALLOW_ANON_EDIT = true
 ALLOW_BOGO_LOGIN = true
@@ -77,15 +63,6 @@
 PASSWORD_LENGTH_MINIMUM = 0
 USER_AUTH_POLICY = first-only
 ENABLE_AUTH_OPENID = false
-;LDAP_AUTH_HOST = "ldap://localhost:389"
-;LDAP_BASE_DN = "ou=Users,o=Development,dc=mycompany.com"
-;LDAP_SET_OPTION = ""
-;LDAP_AUTH_USER = "CN=ldapuser,CN=Users"
-;LDAP_AUTH_PASSWORD = ""
-;LDAP_SEARCH_FIELD = "uid"
-;IMAP_AUTH_HOST = "localhost:143/imap/notls"
-;POP3_AUTH_HOST = "localhost:110"
-;AUTH_USER_FILE = /etc/passwd
 AUTH_USER_FILE_STORABLE = false
 AUTH_SESS_USER = userid
 AUTH_SESS_LEVEL = 2
@@ -102,14 +79,10 @@
 DBAUTH_IS_MEMBER   = "SELECT userid FROM pref WHERE userid='$userid' AND groupname='$groupname'"
 DBAUTH_GROUP_MEMBERS = "SELECT userid FROM pref WHERE groupname='$groupname'"
 DBAUTH_USER_GROUPS = "SELECT groupname FROM pref WHERE userid='$userid'"
-
 THEME = Sidebar
-; DEFAULT_LANGUAGE =
 WIKI_PGSRC = pgsrc
 DEFAULT_WIKI_PGSRC = pgsrc
-; untranslated pgsrc pages to always include
 DEFAULT_WIKI_PAGES = "ReleaseNotes"
-
 ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
 INLINE_IMAGES = "png|jpg|jpeg|gif"
 WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
@@ -118,44 +91,18 @@
 KEYWORDS = "Category* OR Topic*"
 COPYRIGHTPAGE_TITLE = "GNU General Public License"
 COPYRIGHTPAGE_URL = "http://www.gnu.org/copyleft/gpl.html#SEC1"
-; COPYRIGHTPAGE_TITLE = GNU Free Documentation License
-; COPYRIGHTPAGE_URL = http://www.gnu.org/copyleft/fdl.html
-; COPYRIGHTPAGE_TITLE = Creative Commons License 1.0
-; COPYRIGHTPAGE_URL = http://creativecommons.org/licenses/by/1.0/
 AUTHORPAGE_TITLE = "The PhpWiki Programming Team"
 AUTHORPAGE_URL = "http://phpwiki.demo.free.fr/index.php/The%20PhpWiki%20programming%20team"
-
 TOC_FULL_SYNTAX = true
 ENABLE_MARKUP_COLOR = true
 ENABLE_MARKUP_TEMPLATE = true
 DISABLE_MARKUP_WIKIWORD = false
 ENABLE_MARKUP_DIVSPAN = false
-
-; these not:
-; DBAUTH_AUTH_DSN =
-; SERVER_NAME =
-; SERVER_PORT =
-; SCRIPT_NAME =
-; DATA_PATH =
-; PHPWIKI_DIR =
-; VIRTUAL_PATH =
-; USE_PATH_INFO =
-; TEMP_DIR = /tmp
-; ALLOWED_LOAD = /tmp
-
 DISABLE_GETIMAGESIZE = true
-; FORTUNE_DIR = /usr/share/fortune
-; GOOGLE_LICENSE_KEY = "..."
 BLOG_DEFAULT_EMPTY_PREFIX = true
-
-; External executables:
-; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"
 EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
 BABYCART_PATH = /usr/local/bin/babycart
-; GRAPHVIZ_EXE = /usr/bin/dot
-
 PLUGIN_CACHED_DATABASE = file
-; PLUGIN_CACHED_CACHE_DIR = /tmp/cache
 PLUGIN_CACHED_FILENAME_PREFIX = phpwiki
 PLUGIN_CACHED_HIGHWATER = 4194304
 PLUGIN_CACHED_LOWWATER  = 3145728

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10921] trunk/config/config-dist.ini

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

Revision: 10921
          http://sourceforge.net/p/phpwiki/code/10921
Author:   vargenau
Date:     2022-01-20 18:14:46 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
config/config-dist.ini: add comment about default value

Modified Paths:
--------------
    trunk/config/config-dist.ini

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2022-01-20 18:03:55 UTC (rev 10920)
+++ trunk/config/config-dist.ini	2022-01-20 18:14:46 UTC (rev 10921)
@@ -33,21 +33,23 @@
 ; Default: 0
 ;DEBUG = 1
 
-; Graphical buttons on edit. Default: true
-; Reportedly broken on MacOSX Safari
+; Graphical buttons on edit.
+; Default: true
 ;ENABLE_EDIT_TOOLBAR = false
 
 ; Adds two additional buttons in EDIT_TOOLBAR, Search&Replace and Undo.
-; Undo is experimental. Default: true
-;JS_SEARCHREPLACE = true
+; Undo is experimental.
+; Default: true
+;JS_SEARCHREPLACE = false
 
 ; Edit a page by double-click into the text. This will conflict with word-selection.
 ; Note: Enable it for all users. Otherwise as per-user setting in UserPreferences.
 ; Default: false
-;ENABLE_DOUBLECLICKEDIT = false
+;ENABLE_DOUBLECLICKEDIT = true
 
 ; Enable WYSIWYG editing. Converting back HTML to wikitext does not work in most engines.
 ; Experimental!
+; Default: false
 ;ENABLE_WYSIWYG = true
 
 ; Which backend? Might need to be separately installed. See lib/WysiwygEdit/
@@ -59,15 +61,18 @@
 ;  spaw        http://sourceforge.net/projects/spaw
 ;  htmlarea3
 ;  htmlarea2
+; Default: Wikiwyg
 ;WYSIWYG_BACKEND = Wikiwyg
 
 ; Store all WYSIWYG pages as HTML? Will loose most link and plugin options.
 ; Not recommended, but presented here to test several WYSIWYG backends.
-;WYSIWYG_DEFAULT_PAGETYPE_HTML = false
+; Default: false
+;WYSIWYG_DEFAULT_PAGETYPE_HTML = true
 
-; Upload into separate userdirs. If enabled (default since 1.3.13) the generated Upload: link
+; Upload into separate userdirs. If enabled the generated Upload: link
 ; will include the username plus "/". This will make all uploaded links longer, but we
 ; avoid nameclashes and you see who uploaded what file.
+; Default: true
 ;UPLOAD_USERDIR = false
 
 ; SemanticWeb Units require the standard units executable, available in every distribution.
@@ -86,19 +91,23 @@
 ;UNITS_EXE = /usr/local/bin/gunits
 
 ; Needed for FacebookLike plugin
+; Default: false
 ;ENABLE_OPEN_GRAPH = true
 
 ; Needs babycart installed.
-; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart
+; Optionally define BABYCART_PATH. 
+; Default: false
 ;ENABLE_SPAMASSASSIN = true
 
 ; Check for links to blocked external tld domains in new edits, against
 ; multi.surbl.org and bl.spamcop.net.
+; Default: false
 ;ENABLE_SPAMBLOCKLIST = true
 
 ; If more than this number of external links appear on non-authenticated
 ; edits it will be rejected as spam.
 ; Setting NUM_SPAM_LINKS to 0 will disable the check.
+; Default: 20
 ;NUM_SPAM_LINKS = 20
 
 ; By setting DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS to true, you get
@@ -107,7 +116,7 @@
 ; like executable scripts, so we disable now everything and enable
 ; only some extension.  See lib/plugin/UpLoad.php.
 ; Default: false
-;DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = false
+;DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS = true
 
 ; If GOOGLE_LINKS_NOFOLLOW is true, ref=nofollow is added to
 ; all external links to discourage spam. You might want to turn it off,
@@ -114,6 +123,7 @@
 ; if you want to improve pageranks on external links.
 ; TODO: Add ref=nofollow only for external links added by anonymous users.
 ; All internal action links do contain ref=nofollow
+; Default: true
 ;GOOGLE_LINKS_NOFOLLOW = false
 
 ; Aysnchronous ajax callbacks to dynamically display pages
@@ -120,22 +130,27 @@
 ; (as format=xml) on demand.
 ; Experimental feature for plugin DynamicIncludePage, which might fail on
 ; some strictly non-conformant entities.
+; Default: true
 ;ENABLE_AJAX = false
 
 ; Experimental WikiPedia feature: Force Discussion/Article link at the topnavbar.
+; Default: false
 ;ENABLE_DISCUSSION_LINK = true
 
 ; If set to true, add some anti-spam countermeasures based on captcha
 ; tests.  See http://www.captcha.net/ for more information on captcha.
+; Default: false
 ;ENABLE_CAPTCHA = true
 
 ; If USE_CAPTCHA_RANDOM_WORD is set to true,
 ; Captcha will use a random word, otherwise a dictionary word.
-;USE_CAPTCHA_RANDOM_WORD = false
+; Default: false
+;USE_CAPTCHA_RANDOM_WORD = true
 
 ; If true don't use UserName/Blog/day/time pagenames for the ADMIN_USER, but
 ; Blog/day/time only. Convenience for a single-user blog theme.
-;BLOG_DEFAULT_EMPTY_PREFIX = true
+; Default: true
+;BLOG_DEFAULT_EMPTY_PREFIX = false
 
 ; External Searchengine hits are detected automatically and will be
 ; highlighted in the displayed page if enabled.
@@ -183,6 +198,7 @@
 ; It is recommended this be a relatively short WikiWord like the
 ; InterWiki monikers found in the InterWikiMap. (For examples, see
 ; lib/interwiki.map).
+; Default: PhpWiki
 WIKI_NAME = PhpWiki
 
 ; Username and password of administrator.
@@ -214,7 +230,8 @@
 ; You might have to set it to false, if your PHP doesn't support crypt().
 ; To use plain text passwords, in particular for the ADMIN_PASSWD, set
 ; ENCRYPTED_PASSWD to false.
-ENCRYPTED_PASSWD = false
+; Default: true
+;ENCRYPTED_PASSWD = false
 
 ; Visitor Hostname Lookup
 ;
@@ -221,27 +238,32 @@
 ; If set, reverse dns lookups will be performed to attempt to convert
 ; the user's IP number into a host name, in the case where the http
 ; server does not do this.
-ENABLE_REVERSE_DNS = true
+; Default: true
+;ENABLE_REVERSE_DNS = false
 
 ; Private ZIP Dumps of All Wiki Pages
 ;
 ; If true, only the admin user can make zip dumps. Otherwise anyone
 ; may download all wiki pages as a single zip archive.
-ZIPDUMP_AUTH = false
+; Default: false
+;ZIPDUMP_AUTH = true
 
 ; The RawHtml plugin allows page authors to embed real, raw HTML into Wiki
 ; pages.  This is a possible security threat, as much HTML (or, rather,
 ; JavaScript) can be very risky.  If you are in a controlled environment,
 ; or you are using the two options below, however, it could be of use.
-ENABLE_RAW_HTML = true
+; Default: true
+;ENABLE_RAW_HTML = false
 
 ; If this is set, only pages locked by the Administrator may contain the
 ; RawHtml plugin
-ENABLE_RAW_HTML_LOCKEDONLY = true
+; Default: true
+;ENABLE_RAW_HTML_LOCKEDONLY = false
 
 ; If this is set, all unsafe html code is stripped automatically (experimental!)
 ; See http://chxo.com/scripts/safe_html-test.php
-ENABLE_RAW_HTML_SAFE = true
+; Default: true
+;ENABLE_RAW_HTML_SAFE = false
 
 ; Actions listed in this array will not be allowed.  The complete list
 ; of actions can be found in lib/main.php with the function
@@ -256,12 +278,13 @@
 ; Allow for localhost only
 ; If true, only the admin user or users from localhost (without password) can do:
 ;   RPC2, SOAP, ziphtml and dumphtml
-INSECURE_ACTIONS_LOCALHOST_ONLY = true
+; Default: true
+;INSECURE_ACTIONS_LOCALHOST_ONLY = false
 
-
 ; If you enable this option, every page is moderated by the ModeratedPage
 ; actionpage plugin. Changing a moderated page will be delayed to be
-; granted by a moderator by email. Default: false to allow finer control.
+; granted by a moderator by email. 
+; Default: false to allow finer control.
 ;ENABLE_MODERATEDPAGE_ALL = true
 
 ; PhpWiki can generate an access_log (in "NCSA combined log" format)
@@ -337,12 +360,14 @@
 ;
 ; The recommended default is currently LOOSE.
 ;
-CACHE_CONTROL = LOOSE
+; Default: LOOSE
+;CACHE_CONTROL = LOOSE
 
 ; Maximum page staleness, in seconds.
 ;
 ; This only has effect if CACHE_CONTROL is set to ALLOW_STALE.
-CACHE_CONTROL_MAX_AGE = 600
+; Default: 600
+;CACHE_CONTROL_MAX_AGE = 600
 
 ; PhpWiki normally caches a preparsed version (i.e. mostly
 ; converted to HTML) of the most recent version of each page.
@@ -359,9 +384,12 @@
 ; Default: false
 ;WIKIDB_NOCACHE_MARKUP = true
 
-COOKIE_EXPIRATION_DAYS = 365
+; Default: 365
+;COOKIE_EXPIRATION_DAYS = 365
+
 ; Default path for the wikiuser cookie. You need to specify this more explicitly
 ; if you want to enable different users on different wikis on the same host.
+; Default: "/"
 ;COOKIE_DOMAIN = "/"
 
 ; The login code now uses PHP's session support. Usually, the default
@@ -391,7 +419,8 @@
 ;       dba:   use one of the standard UNIX dbm libraries. Use BerkeleyDB (db3,4) (fastest)
 ;       file:  use a serialized file database. (easiest)
 ;       flatfile:  use a flat file database. (experimental, readable, slow)
-DATABASE_TYPE = dba
+; Default: dba
+;DATABASE_TYPE = dba
 
 ; Prefix for filenames or table names
 ;
@@ -400,6 +429,7 @@
 ; during the installation.
 ; Note: This prefix is NOT prepended to the default DBAUTH_
 ;       tables user, pref and member!
+; Default: empty
 ;DATABASE_PREFIX = phpwiki_
 
 ; For SQL based backends, specify the database as a DSN (Data Source Name),
@@ -423,15 +453,16 @@
 
 ; Keep persistent connections:
 ; Recommended is false for bigger servers, and true for small servers
-; with not so many connections. postgresql: Please leave it false. Default: false
+; with not so many connections. postgresql: Please leave it false. 
 ; Should really be set as database option in the DSN above.
-DATABASE_PERSISTENT = false
+; Default: false
+;DATABASE_PERSISTENT = false
 
 ; A table to store session information.  Only needed by SQL backends.
-;
 ; A word of warning - any prefix defined above will be prepended to whatever
 ; is given here.
-DATABASE_SESSION_TABLE = session
+; Default: session
+;DATABASE_SESSION_TABLE = session
 
 ; For the file and dba backends, this specifies where the data files will be
 ; located.  Ensure that the user that the webserver runs as has write access
@@ -439,7 +470,8 @@
 ;
 ; WARNING: leaving this as the default of '/tmp' will almost guarantee that
 ; you'll lose your wiki data at some stage.
-DATABASE_DIRECTORY = /tmp
+; Default: /tmp
+;DATABASE_DIRECTORY = /tmp
 
 ; For the dba backend, this defines which DBA variant you wish to use.
 ;     gdbm - commonly available, Fedora not. Not recommended anymore.
@@ -448,11 +480,13 @@
 ;     db4 - Berkeley DB v4; current version. Default.
 ;     dbm - Older dba handler; suffers from limits on the size of data items.
 ; Better not use other hacks such as inifile, flatfile or cdb.
-DATABASE_DBA_HANDLER = db4
+; Default: db4
+;DATABASE_DBA_HANDLER = db4
 
 ; How long will the system wait for a database operation to complete?
 ; Specified in seconds.
-DATABASE_TIMEOUT = 12
+; Default: 20
+;DATABASE_TIMEOUT = 20
 
 ; How often to try and optimise the database. Specified in seconds.
 ; Set to 0 to disable optimisation completely. Default is 50 (seconds).
@@ -463,6 +497,7 @@
 ; With most modern databases (eg. Postgres) and distributions (eg. Debian)
 ; the system maintenance scripts take care of this nightly, so you will want
 ; to set this parameter to 0 (disabled).
+; Default: 50
 ;DATABASE_OPTIMISE_FREQUENCY = 50
 
 ;========================================================================
@@ -479,9 +514,11 @@
 ; ALLOW_USER_PASSWORDS    default true
 
 ; allow anon users to view or edit any existing pages
-ALLOW_ANON_USER = true
+; Default: true
+;ALLOW_ANON_USER = true
 ; allow anon users to edit pages
-ALLOW_ANON_EDIT = true
+; Default: true
+;ALLOW_ANON_EDIT = true
 
 ; If ALLOW_BOGO_LOGIN is true, users are allowed to login (with
 ; any/no password) using any userid which:
@@ -490,7 +527,8 @@
 ; If true, users may be created by themselves. Otherwise we need separate auth.
 ; If such a user will create a so called HomePage with his userid, he will
 ; be able to store his preferences and password there.
-ALLOW_BOGO_LOGIN = true
+; Default: true
+;ALLOW_BOGO_LOGIN = true
 
 ; True User Authentication:
 ; To require user passwords:
@@ -499,7 +537,8 @@
 ;   ALLOW_BOGO_LOGIN = false,
 ;   ALLOW_USER_PASSWORDS = true.
 ; Otherwise any anon or bogo user might login without any or a wrong password.
-ALLOW_USER_PASSWORDS = true
+; Default: true
+;ALLOW_USER_PASSWORDS = true
 
 ; Many different methods can be used to check user's passwords:
 ;   BogoLogin:     WikiWord username, with no *actual* password checking,
@@ -522,15 +561,18 @@
 ; USER_AUTH_POLICY, below.  To specify multiple authentication methods,
 ; separate the name of each one with colons.
 ; USER_AUTH_ORDER = "BogoLogin : PersonalPage"
+; Default: PersonalPage
 ;USER_AUTH_ORDER = "PersonalPage : Db"
 
 ; Enable/Disable additional OpenID Authentification.
 ; See http://openid.net/
-;ENABLE_AUTH_OPENID = false
+; Default: false
+;ENABLE_AUTH_OPENID = true
 
 ; For "security" purposes, you can specify that a password be at least a
 ; certain number of characters long.  This applies even to the BogoLogin
-; method. Default: 0 (to allow immediate passwordless BogoLogin)
+; method. 
+; Default: 0 (to allow immediate passwordless BogoLogin)
 ;PASSWORD_LENGTH_MINIMUM = 6
 
 ; The following policies are available for user authentication:
@@ -544,7 +586,8 @@
 ;       stacked:    check the given user - password combination for all
 ;                       methods and return true on the first success.
 ;                   Note: May result in crashes on endless recursion
-USER_AUTH_POLICY = first-only
+; Default: first-only
+;USER_AUTH_POLICY = first-only
 
 ; Use access control lists (as in Solaris and Windows NTFS) per page and group,
 ; not per user for the whole wiki.
@@ -634,14 +677,17 @@
 ; Defines whether the user is able to change their own password via PHPWiki.
 ; Note that this means that the webserver user must be able to write to the
 ; file specified in AUTH_USER_FILE.
-;AUTH_USER_FILE_STORABLE = false
+; Default: false
+;AUTH_USER_FILE_STORABLE = true
 
 ; Session Auth:
 ; Name of the session variable which holds the already authenticated username.
 ; Sample: "userid", "user[username]", "user->username"
+; Default: userid
 ;AUTH_SESS_USER = userid
 
 ; Which level will the user be? 1 = Bogo or 2 = Pass
+; Default: 2
 ;AUTH_SESS_LEVEL = 2
 
 ; Group membership.  PhpWiki supports defining permissions for a group as
@@ -654,14 +700,17 @@
 ;       FILE            Flatfile. See AUTH_GROUP_FILE below.
 ;       LDAP            LDAP groups. See "LDAP authentication options" above and
 ;                       lib/WikiGroup.php. (experimental)
-GROUP_METHOD = WIKIPAGE
+; Default: WIKIPAGE
+;GROUP_METHOD = WIKIPAGE
 
-; Page where all groups are listed. Default: Translation of "CategoryGroup"
+; Page where all groups are listed. 
+; Default: CategoryGroup
 ;CATEGORY_GROUP_PAGE = CategoryGroup
 
 ; For GROUP_METHOD = FILE, the file given below is referenced to obtain
 ; group membership information.  It should be in the same format as the
 ; standard unix /etc/groups(5) file.
+; Default: /etc/groups
 ;AUTH_GROUP_FILE = /etc/groups
 
 ; External database authentication and authorization.
@@ -685,11 +734,13 @@
 ; Check to see if the supplied username/password pair is OK
 ;
 ; Plaintext Passwords:
+; Default: "SELECT IF(passwd='$password',1,0) as ok FROM pref WHERE userid='$userid'"
 ; DBAUTH_AUTH_CHECK = "SELECT IF(TRIM(passwd)='$password',1,0) AS ok FROM pref WHERE TRIM(userid)='$userid'"
 ;
 ; Database-hashed passwords (more secure):
 ;DBAUTH_AUTH_CHECK = "SELECT IF(TRIM(passwd)=PASSWORD('$password'),1,0) AS ok FROM pref WHERE TRIM(userid)='$userid'"
-DBAUTH_AUTH_CRYPT_METHOD = plain
+; Default: plain
+;DBAUTH_AUTH_CRYPT_METHOD = plain
 
 ; If you want to use Unix crypt()ed passwords, you can use DBAUTH_AUTH_CHECK
 ; to get the password out of the database with a simple SELECT query, and
@@ -760,7 +811,7 @@
 ; white on yellow with fat blue links:
 ;THEME = default
 ; a MonoBook extension, the new default
-THEME = Sidebar
+;THEME = Sidebar
 ; almost fully iconized classic grey MacOSX design:
 ;THEME = MacOSX
 ; as default, just some tricks to make the buttons smaller:
@@ -783,6 +834,7 @@
 ;THEME = SpaceWiki
 ; random heavy images:
 ;THEME = Hawaiian
+; Default: Sidebar
 
 ; Select your language/locale - Default language is "" for auto-detection.
 ; Available languages:
@@ -798,7 +850,8 @@
 ;
 ; If you set DEFAULT_LANGUAGE to the empty string, the users
 ; preferred language as determined by the browser setting will be used.
-DEFAULT_LANGUAGE = en
+; Default: en
+;DEFAULT_LANGUAGE = en
 
 ; WIKI_PGSRC -- specifies the source for the initial page contents of
 ; the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is
@@ -805,6 +858,7 @@
 ; accessed for the first time (or after clearing the database.)
 ; WIKI_PGSRC can either name a directory or a zip file. In either case
 ; WIKI_PGSRC is scanned for files -- one file per page.
+; Default: pgsrc
 ;WIKI_PGSRC = pgsrc
 
 ; DEFAULT_WIKI_PGSRC is only used when the language is *not* the
@@ -811,9 +865,11 @@
 ; default (English) and when reading from a directory: in that case
 ; some English pages are inserted into the wiki as well.
 ; DEFAULT_WIKI_PGSRC defines where the English pages reside.
+; Default: pgsrc
 ;DEFAULT_WIKI_PGSRC = pgsrc
 
 ; These are ':'-separated pages which will get loaded untranslated from DEFAULT_WIKI_PGSRC.
+; Default: "ReleaseNotes"
 ;DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ;=========================================================================
@@ -825,6 +881,7 @@
 ; within a named link [name|uri] one more protocol is defined: phpwiki
 ; Separate each of the protocol names with a vertical pipe, and ensure there
 ; is no extraneous whitespace.
+; Default: "http|https|mailto|ftp|news|nntp|ssh|gopher"
 ;ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
 
 ; URLs ending with the following extension should be inlined as images.
@@ -833,6 +890,7 @@
 ; which will create embedded object instead of img.
 ; Typical CGI extensions as pl or cgi maybe allowed too,
 ; but those two will be enforced to img.
+; Default: "png|jpg|jpeg|gif"
 ;INLINE_IMAGES = "png|jpg|jpeg|gif"
 
 ; Perl regexp for WikiNames ("bumpy words"):
@@ -843,6 +901,7 @@
 ;   WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]\.]+){2,}(?![[:alnum:]])"
 ; Default old behaviour, no digits as lowerchars.
 ;WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])"
+; Default: "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
 
 ; InterWiki linking -- wiki-style links to other wikis on the web
 ;
@@ -850,11 +909,13 @@
 ; If that page is not found (or is not locked), or map
 ; data cannot be found in it, then the file specified
 ; by INTERWIKI_MAP_FILE (if any) will be used.
+; Default: lib/interwiki.map
 ;INTERWIKI_MAP_FILE = lib/interwiki.map
 
 ; Display a warning if the internal lib/interwiki.map is used, and
 ; not the public InterWikiMap page. This file is not readable from outside.
-;WARN_NONPUBLIC_INTERWIKIMAP = false
+; Default: false
+;WARN_NONPUBLIC_INTERWIKIMAP = true
 
 ; Search term used for automatic page classification by keyword extraction.
 ;
@@ -864,6 +925,7 @@
 ; used as the keyword.
 ;
 ; The default behavior is to match Category* or Topic* links.
+; Default: "Category* OR Topic*"
 ;KEYWORDS = "Category* OR Topic*"
 
 ; Author and Copyright Site Navigation Links
@@ -882,20 +944,29 @@
 ; COPYRIGHTPAGE_TITLE = "Creative Commons License 2.0"
 ; COPYRIGHTPAGE_URL = "http://creativecommons.org/licenses/by/2.0/"
 ;  see http://creativecommons.org/learn/licenses/ for variations
-;AUTHORPAGE_TITLE = The PhpWiki Programming Team
-;AUTHORPAGE_URL = http://phpwiki.demo.free.fr/index.php/The%20PhpWiki%20programming%20team
 
+; Default: "The PhpWiki Programming Team"
+;AUTHORPAGE_TITLE = "The PhpWiki Programming Team"
+
+; Default: "http://phpwiki.demo.free.fr/index.php/The%20PhpWiki%20programming%20team"
+;AUTHORPAGE_URL = "http://phpwiki.demo.free.fr/index.php/The%20PhpWiki%20programming%20team"
+
 ; Allow full markup in headers to be parsed by the CreateToc plugin.
 ;
 ; If false you may not use WikiWords or [] links or any other markup in
 ; headers in pages with the CreateToc plugin. But if false the parsing is
 ; faster and more stable.
-;TOC_FULL_SYNTAX = true
+; Default: true
+;TOC_FULL_SYNTAX = false
 
 ; If false the %color=... %% syntax will be disabled.
 ; Default: true
 ;ENABLE_MARKUP_COLOR = false
 
+; Enable Mediawiki-like templates
+; Default: true
+;ENABLE_MARKUP_TEMPLATE = false
+
 ; Disable automatic linking of camelcase (wiki-)words to pages.
 ; Internal page links must be forced with [[pagename]] then.
 ; Default: false
@@ -902,6 +973,7 @@
 ;DISABLE_MARKUP_WIKIWORD = true
 
 ; Enable "div" and "span" HTML blocks and attributes. Experimental.
+; Default: false
 ;ENABLE_MARKUP_DIVSPAN = true
 
 ;==========================================================================
@@ -1028,7 +1100,8 @@
 ;
 ; Probably you can just leave this set to false, in which case you get
 ; raw ('binary' content-encoding) page dumps.
-STRICT_MAILABLE_PAGEDUMPS = false
+; Default: false
+;STRICT_MAILABLE_PAGEDUMPS = true
 
 ; Here you can change the default dump directories.
 ; (Can be overridden by the directory argument)
@@ -1040,14 +1113,14 @@
 HTML_DUMP_SUFFIX = .html
 
 ; The maximum file upload size, in bytes.
-; The default, 16777216, is 16MB.
-MAX_UPLOAD_SIZE = 16777216
+; Default: 16777216 (16 MB)
+;MAX_UPLOAD_SIZE = 16777216
 
 ; If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the
 ; default state for the "minor edit" checkbox on the edit page form
 ; will be off.
 ; The default, 604800, is one week (7 days): 7 * 24 * 3600
-MINOR_EDIT_TIMEOUT = 604800
+;MINOR_EDIT_TIMEOUT = 604800
 
 ; If you get a crash at loading LinkIcons you might want to disable
 ; the getimagesize() function, which crashes on certain php versions and
@@ -1057,7 +1130,8 @@
 ;
 ; Per default too small ploaded or external images are not displayed,
 ; to prevent from external 1 pixel spam.
-;DISABLE_GETIMAGESIZE = true
+; Default: true
+;DISABLE_GETIMAGESIZE = false
 
 ; Enable random quotes from a fortune directory when adding a new page.
 ; Usually at /usr/share/fortune or /usr/share/games/fortune
@@ -1073,7 +1147,8 @@
 ;TOOLBAR_TEMPLATE_PULLDOWN = Template*
 
 ; Insert an already uploaded image:
-;TOOLBAR_IMAGE_PULLDOWN = true
+; Default: true
+;TOOLBAR_IMAGE_PULLDOWN = false
 
 ; Overide the default localized stoplist.
 ;FULLTEXTSEARCH_STOPLIST = (A|An|And|But|By|For|From|In|Is|It|Of|On|Or|The|To|With)
@@ -1094,14 +1169,16 @@
 
 ; On format=pdf with pagelist actionpages.
 ; The multifile variant: book (with index and toc) or webpage format
-;EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --book --format pdf14"
-EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
+; Default: "htmldoc --quiet --webpage --format pdf14"
+;EXTERNAL_HTML2PDF_PAGELIST = "htmldoc --quiet --webpage --format pdf14"
 
 ; Optional: SPAMASSASSIN wrapper. Only used if ENABLE_SPAMASSASSIN = true
 ; http://www.cynistar.net/~apthorpe/code/babycart/babycart.html
-BABYCART_PATH = /usr/local/bin/babycart
+; Default: /usr/local/bin/babycart
+;BABYCART_PATH = /usr/local/bin/babycart
 
 ; RateIt widget. Can be enabled in Sidebar theme.
+; Default: false
 ;ENABLE_RATEIT = true
 ; style of the stars: empty = yellow, red or red
 ;RATEIT_IMGPREFIX =
@@ -1140,6 +1217,7 @@
 ;===========================================================================
 
 ; Cache_Container storage class: 'file' is the fastest. See pear/Cache/Container/
+; Default: file
 ;PLUGIN_CACHED_DATABASE = file
 
 ; This is only used if database is set to file.
@@ -1146,6 +1224,7 @@
 ; The webserver must have write access to this dir!
 ;PLUGIN_CACHED_CACHE_DIR = /tmp/cache
 ; Every file name in the cache begins with this prefix
+; Default: phpwiki
 ;PLUGIN_CACHED_FILENAME_PREFIX = phpwiki
 
 ; The maximum total space in bytes of all files in the cache. When

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10920] trunk/config/config-default.ini

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

Revision: 10920
          http://sourceforge.net/p/phpwiki/code/10920
Author:   vargenau
Date:     2022-01-20 18:03:55 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
config-default.ini: ENABLE_RATEIT = false

Modified Paths:
--------------
    trunk/config/config-default.ini

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2022-01-20 15:46:54 UTC (rev 10919)
+++ trunk/config/config-default.ini	2022-01-20 18:03:55 UTC (rev 10920)
@@ -31,7 +31,7 @@
 ; UNITS_EXE = /usr/bin/units
 ENABLE_SEARCHHIGHLIGHT = true
 ENABLE_RECENTCHANGESBOX = false
-ENABLE_RATEIT = true
+ENABLE_RATEIT = false
 ENABLE_PAGE_PUBLIC = false
 ENABLE_AJAX = true
 
@@ -90,8 +90,8 @@
 AUTH_SESS_USER = userid
 AUTH_SESS_LEVEL = 2
 GROUP_METHOD = WIKIPAGE
-;CATEGORY_GROUP_PAGE = CategoryGroup
-;AUTH_GROUP_FILE = /etc/groups
+CATEGORY_GROUP_PAGE = CategoryGroup
+AUTH_GROUP_FILE = /etc/groups
 DBAUTH_AUTH_CHECK = "SELECT IF(passwd='$password',1,0) as ok FROM pref WHERE userid='$userid'"
 DBAUTH_AUTH_CRYPT_METHOD = plain
 DBAUTH_AUTH_USER_EXISTS = "SELECT userid FROM pref WHERE userid='$userid'"
@@ -164,4 +164,3 @@
 PLUGIN_CACHED_USECACHE = true
 PLUGIN_CACHED_FORCE_SYNCMAP = true
 PLUGIN_CACHED_IMGTYPES = "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm"
-

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10919] trunk/themes/Crao/index.php

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

Revision: 10919
          http://sourceforge.net/p/phpwiki/code/10919
Author:   vargenau
Date:     2022-01-20 15:46:54 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Add empty themes/Crao/index.php to avoid warning in the logs

Added Paths:
-----------
    trunk/themes/Crao/index.php

Added: trunk/themes/Crao/index.php
===================================================================
--- trunk/themes/Crao/index.php	                        (rev 0)
+++ trunk/themes/Crao/index.php	2022-01-20 15:46:54 UTC (rev 10919)
@@ -0,0 +1 @@
+<?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:[10918] trunk

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

Revision: 10918
          http://sourceforge.net/p/phpwiki/code/10918
Author:   vargenau
Date:     2022-01-20 15:27:13 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Remove _DEBUG_APD

Modified Paths:
--------------
    trunk/lib/config.php
    trunk/lib/main.php
    trunk/lib/prepend.php
    trunk/tests/unit/test.php

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2022-01-20 15:22:30 UTC (rev 10917)
+++ trunk/lib/config.php	2022-01-20 15:27:13 UTC (rev 10918)
@@ -43,7 +43,6 @@
 define ('_DEBUG_PARSER', 4); // verbose parsing steps
 define ('_DEBUG_TRACE', 8); // test php memory usage, prints php debug backtraces
 define ('_DEBUG_INFO', 16);
-define ('_DEBUG_APD', 32); // APD tracing/profiling
 define ('_DEBUG_LOGIN', 64); // verbose login debug-msg (settings and reason for failure)
 define ('_DEBUG_SQL', 128); // force check db, force optimize, print some debugging logs
 define ('_DEBUG_REMOTE', 256); // remote debug into subrequests (xmlrpc, ajax, wikiwyg, ...)

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2022-01-20 15:22:30 UTC (rev 10917)
+++ trunk/lib/main.php	2022-01-20 15:27:13 UTC (rev 10918)
@@ -1387,13 +1387,9 @@
         validateSessionPath();
 
     global $request;
-    if ((DEBUG & _DEBUG_APD) and extension_loaded("apd")) {
-        //apd_set_session_trace(9);
-        apd_set_pprof_trace();
-    }
+    global $ErrorManager;
 
     // Postpone warnings
-    global $ErrorManager;
     if (defined('E_STRICT')) // and (E_ALL & E_STRICT)) // strict php5?
         $ErrorManager->setPostponedErrorMask(E_NOTICE | E_USER_NOTICE | E_USER_WARNING | E_WARNING | E_STRICT | E_DEPRECATED);
     else

Modified: trunk/lib/prepend.php
===================================================================
--- trunk/lib/prepend.php	2022-01-20 15:22:30 UTC (rev 10917)
+++ trunk/lib/prepend.php	2022-01-20 15:27:13 UTC (rev 10918)
@@ -58,9 +58,6 @@
     xdebug_start_trace("trace"); // on Dbgp protocol add 2
     xdebug_enable();
 }
-if (defined('DEBUG') and (DEBUG & 32) and extension_loaded("apd")) {
-    apd_set_pprof_trace();
-}
 
 // Used for debugging purposes
 class DebugTimer

Modified: trunk/tests/unit/test.php
===================================================================
--- trunk/tests/unit/test.php	2022-01-20 15:22:30 UTC (rev 10917)
+++ trunk/tests/unit/test.php	2022-01-20 15:27:13 UTC (rev 10918)
@@ -305,7 +305,6 @@
                    'PARSER' 	=> 4,
                    'TRACE' 	=> 8,
                    'INFO' 	=> 16,
-                   'APD' 	=> 32,
                    'LOGIN' 	=> 64,
                    'SQL' 	=> 128,
                    'REMOTE' 	=> 256,

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10917] trunk/lib/main.php

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

Revision: 10917
          http://sourceforge.net/p/phpwiki/code/10917
Author:   vargenau
Date:     2022-01-20 15:22:30 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Set mb_regex_encoding so that mb_ereg_replace works; setlocale to UTF-8 so that basename works

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

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2022-01-20 15:15:20 UTC (rev 10916)
+++ trunk/lib/main.php	2022-01-20 15:22:30 UTC (rev 10917)
@@ -1425,6 +1425,8 @@
     // Should this go into the constructor?
     $request->initializeTheme('default');
     $request->updateAuthAndPrefs();
+    setlocale(LC_ALL, 'en_US.UTF-8');
+    mb_regex_encoding('UTF-8');
     $request->initializeLang();
 
     $request->possiblyDeflowerVirginWiki();

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10916] trunk/lib/Google.php

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

Revision: 10916
          http://sourceforge.net/p/phpwiki/code/10916
Author:   vargenau
Date:     2022-01-20 15:15:20 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Use https

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

Modified: trunk/lib/Google.php
===================================================================
--- trunk/lib/Google.php	2022-01-20 15:12:52 UTC (rev 10915)
+++ trunk/lib/Google.php	2022-01-20 15:15:20 UTC (rev 10916)
@@ -167,7 +167,7 @@
         if ($license_key)
             $this->license_key = $license_key;
         elseif (!defined('GOOGLE_LICENSE_KEY')) {
-            trigger_error("\nYou must first obtain a license key at http://www.google.com/apis/"
+            trigger_error("\nYou must first obtain a license key at https://www.google.com/apis/"
                 . "\nto be able to use the Google API." .
                 "\nIt's free however.", E_USER_WARNING);
             return false;

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10915] trunk/lib/FileFinder.php

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

Revision: 10915
          http://sourceforge.net/p/phpwiki/code/10915
Author:   vargenau
Date:     2022-01-20 15:12:52 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
replace array_search by in_array

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

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2022-01-20 15:11:56 UTC (rev 10914)
+++ trunk/lib/FileFinder.php	2022-01-20 15:12:52 UTC (rev 10915)
@@ -216,7 +216,7 @@
     {
         $dir = $this->slashifyPath($dir);
         // remove duplicates
-        if ($i = array_search($dir, $this->_path) !== false) {
+        if ($i = in_array($dir, $this->_path)) {
             array_splice($this->_path, $i, 1);
         }
         array_unshift($this->_path, $dir);

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10914] trunk/lib/BlockParser.php

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

Revision: 10914
          http://sourceforge.net/p/phpwiki/code/10914
Author:   vargenau
Date:     2022-01-20 15:11:56 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
lib/BlockParser.php: remove duplicate for trim

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

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2022-01-20 15:09:53 UTC (rev 10913)
+++ trunk/lib/BlockParser.php	2022-01-20 15:11:56 UTC (rev 10914)
@@ -1179,7 +1179,7 @@
         $input->advance();
 
         $pi = trim($pi);
-        $pi = trim($pi, "}}");
+        $pi = trim($pi, "}");
 
         if (strpos($pi, "|") === false) {
             $imagename = $pi;

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

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

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

Revision: 10913
          http://sourceforge.net/p/phpwiki/code/10913
Author:   vargenau
Date:     2022-01-20 15:09:53 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Use https

Modified Paths:
--------------
    trunk/lib/plugin/FacebookLike.php
    trunk/lib/plugin/GoogleMaps.php
    trunk/lib/plugin/YouTube.php

Modified: trunk/lib/plugin/FacebookLike.php
===================================================================
--- trunk/lib/plugin/FacebookLike.php	2022-01-20 11:19:14 UTC (rev 10912)
+++ trunk/lib/plugin/FacebookLike.php	2022-01-20 15:09:53 UTC (rev 10913)
@@ -62,7 +62,7 @@
         $args = $this->getArgs($argstr, $request);
         extract($args);
 
-        //$iframe = "<iframe src=\"http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fexample.com%2Fpage%2Fto%2Flike&amp;layout=standard&amp;show_faces=false&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=35" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;\" allowTransparency=\"true\"></iframe>";
+        //$iframe = "<iframe src=\"https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fexample.com%2Fpage%2Fto%2Flike&amp;layout=standard&amp;show_faces=false&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=35" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:35px;\" allowTransparency=\"true\"></iframe>";
         $urlargs = array(
             "layout" => $layout,
             "show_faces" => $show_faces,
@@ -72,7 +72,7 @@
             "height" => $height
         );
         $pagename = $request->getArg('pagename');
-        $url = "http://www.facebook.com/plugins/like.php?"
+        $url = "https://www.facebook.com/plugins/like.php?"
             . "href=" . urlencode(WikiURL($pagename, $urlargs, true));
         $url = str_replace("%3D", "=", $url);
         $params = array("src" => $url,

Modified: trunk/lib/plugin/GoogleMaps.php
===================================================================
--- trunk/lib/plugin/GoogleMaps.php	2022-01-20 11:19:14 UTC (rev 10912)
+++ trunk/lib/plugin/GoogleMaps.php	2022-01-20 15:09:53 UTC (rev 10913)
@@ -27,7 +27,7 @@
  *
  * This plugin displays a marker with further infos (when clicking) on given coordinates.
  * Hint: You need to sign up for a Google Maps API key!
- *         http://www.google.com/apis/maps/signup.html
+ *         https://www.google.com/apis/maps/signup.html
  *       Then enter the key in config/config.ini under GOOGLE_LICENSE_KEY=
  *
  * Usage:
@@ -46,8 +46,7 @@
  * @author Reini Urban
  *
  * @see plugin/GooglePlugin
- *      http://www.giswiki.de/index.php/Google_Maps_Extensions
- *      http://www.google.com/apis/maps/, http://maps.google.com/
+ *      https://www.google.com/apis/maps/, https://maps.google.com/
  *      http://libgmail.sourceforge.net/googlemaps.html
  *
  * NOT YET SUPPORTED:
@@ -107,7 +106,7 @@
             return $this->error(_('Latitude must be a number.'));
         }
 
-        $maps = JavaScript('', array('src' => "http://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));
+        $maps = JavaScript('', array('src' => "https://maps.google.com/maps?file=api&v=1&key=" . GOOGLE_LICENSE_KEY));
         $id = GenerateId("googlemap");
         switch ($MapType) {
             case "Satellite":

Modified: trunk/lib/plugin/YouTube.php
===================================================================
--- trunk/lib/plugin/YouTube.php	2022-01-20 11:19:14 UTC (rev 10912)
+++ trunk/lib/plugin/YouTube.php	2022-01-20 15:09:53 UTC (rev 10913)
@@ -131,7 +131,7 @@
                 $t = $time ? $this->_time[$time] : 't';
                 $c = $category ? $this->_category[$category] : '0';
                 $l = $language ? $this->_language[$language] : '';
-                $url = "http://www.youtube.com/browse?s=$s&t=$t&c=$c&l=$l";
+                $url = "https://www.youtube.com/browse?s=$s&t=$t&c=$c&l=$l";
                 $m = array('', '');
                 if ($xml = url_get_contents($url)) {
                     if ($index) {
@@ -149,7 +149,7 @@
             return $this->error(fmt("Invalid argument %s", "v"));
         if (strcspn($v, "-_0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"))
             return $this->error(fmt("Invalid argument %s", "v"));
-        $url = "http://www.youtube.com/v/" . $v;
+        $url = "https://www.youtube.com/v/" . $v;
         if ($autoplay)
             $url .= "?autoplay=1";
         if ($size != 'medium') {
@@ -176,9 +176,9 @@
                 $width = 90;
                 $height = 60;
             }
-            // img: http://img.youtube.com/vi/KKTDRqQtPO8/2.jpg or 0.jpg
+            // img: https://img.youtube.com/vi/KKTDRqQtPO8/2.jpg or 0.jpg
             return HTML::a(array('href' => $url),
-                HTML::img(array('src' => "http://img.youtube.com/vi/" .
+                HTML::img(array('src' => "https://img.youtube.com/vi/" .
                     $v . "/" . (($size == 'large') ? "0" : "2") . ".jpg",
                     'width' => $width,
                     'height' => $height,
@@ -200,7 +200,7 @@
 
     private function Daily_pick()
     {
-        if ($xml = url_get_contents("http://www.youtube.com/categories")) {
+        if ($xml = url_get_contents("https://www.youtube.com/categories")) {
             if (preg_match('/<div class="heading"><b>Pick of The Day<\/b><\/div>.*?<a href="\/watch\?v=(\w+)">/s', $xml, $m))
                 return $m[1];
         }

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

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

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

Revision: 10912
          http://sourceforge.net/p/phpwiki/code/10912
Author:   vargenau
Date:     2022-01-20 11:19:14 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
RecentChangesCached plugin removed, RecentChanges plugin is fast enough

Modified Paths:
--------------
    trunk/doc/README.phpwiki-cache
    trunk/lib/IniConfig.php
    trunk/lib/WikiDB.php
    trunk/lib/WikiPluginCached.php
    trunk/lib/plugin/WikiTranslation.php
    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/it/pgsrc/NoteDiRilascio
    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
    trunk/pgsrc/ReleaseNotes
    trunk/themes/Sidebar/templates/rc.tmpl

Removed Paths:
-------------
    trunk/lib/plugin/RecentChangesCached.php
    trunk/pgsrc/Help%2FRecentChangesCachedPlugin

Modified: trunk/doc/README.phpwiki-cache
===================================================================
--- trunk/doc/README.phpwiki-cache	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/doc/README.phpwiki-cache	2022-01-20 11:19:14 UTC (rev 10912)
@@ -54,25 +54,11 @@
 * VisualWiki and TexToPng use png image type for communication with
   the image creating scripts (dot and pstoimg), so they rely on
   CreateImageFronPNG(...)
-* RecentChangesCached produces a strange RSS-link for the RSS-image
-  when it has to store a new html snippet in the cache immediately
-  after an edit/save cycle.
 
-
-
-
-
-
-
-
-
-
 !!!Examples
 
 This extension of WikiPlugin replaces my old WikiPluginImageCache and allows to cache the following kinds of output:
 
-* html
-** example: [RecentChangesCached - source|http://amor.rz.hu-berlin.de/~h0444nmx/wiki/RecentChangesCached_php] (RecentChanges with a 15 minutes caching interval)
 * images
 ** example: [TexToPng - source|http://amor.rz.hu-berlin.de/~h0444nmx/wiki/TexToPng_php] (TeX to image converter)
 ** and  [CacheTest - source|http://amor.rz.hu-berlin.de/~h0444nmx/wiki/CacheTest_php] (simple example)
@@ -115,7 +101,6 @@
 **      !TexToPng.php             ''into''  lib/plugin/!TexToPng.php
 **      !CacheTest.php            ''into''  lib/plugin/!CacheText.php
 **      !VisualWiki.php           ''into''  lib/plugin/!VisualWiki.php
-**      !RecentChangesCached.php  ''into''  lib/plugin/!RecentChangesCached.php
 **      Cache.php                 ''into''  lib/pear/Cache.php
 **      Error.php                 ''into''  lib/pear/Cache/Error.php
 **      Container.php             ''into''  lib/pear/Cache/Container.php
@@ -135,7 +120,6 @@
 
 !!!To Do
 * complete doc
-* There is a bug in RecentChangesCached which scrambles the rss link during the first run.
 * VisualWiki and TexToPng use png image type for communication with the image creating scripts (dot and pstoimg), so they rely on CreateImageFromPNG(...) which is not necessary.
 
 --JohannesGroße

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/lib/IniConfig.php	2022-01-20 11:19:14 UTC (rev 10912)
@@ -545,7 +545,6 @@
     $AllAllowedPlugins[] = 'PrevNext';
     $AllAllowedPlugins[] = 'Processing';
     $AllAllowedPlugins[] = 'RawHtml';
-    $AllAllowedPlugins[] = 'RecentChangesCached';
     $AllAllowedPlugins[] = 'RecentReferrers';
     $AllAllowedPlugins[] = 'RedirectTo';
     $AllAllowedPlugins[] = 'RichTable';

Modified: trunk/lib/WikiDB.php
===================================================================
--- trunk/lib/WikiDB.php	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/lib/WikiDB.php	2022-01-20 11:19:14 UTC (rev 10912)
@@ -1081,7 +1081,7 @@
         ) {
             require_once 'lib/WikiPlugin.php';
             $w = new WikiPluginLoader();
-            $p = $w->getPlugin("RecentChangesCached");
+            $p = $w->getPlugin("RecentChanges");
             $p->box_update(false, $request, $this->_pagename);
         }
         return $newrevision;

Modified: trunk/lib/WikiPluginCached.php
===================================================================
--- trunk/lib/WikiPluginCached.php	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/lib/WikiPluginCached.php	2022-01-20 11:19:14 UTC (rev 10912)
@@ -49,7 +49,6 @@
  * Have a look at the example files
  * <ul><li>plugin/TexToPng.php</li>
  *     <li>plugin/CacheTest.php (extremely simple example)</li>
- *     <li>plugin/RecentChangesCached.php</li>
  *     <li>plugin/VisualWiki.php</li>
  *     <li>plugin/Ploticus.php</li>
  * </ul>

Deleted: trunk/lib/plugin/RecentChangesCached.php
===================================================================
--- trunk/lib/plugin/RecentChangesCached.php	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/lib/plugin/RecentChangesCached.php	2022-01-20 11:19:14 UTC (rev 10912)
@@ -1,168 +0,0 @@
-<?php
-/**
- * Copyright © 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam
- * Copyright © 2002 Johannes Große                                   |
- *
- * 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.
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- *
- */
-
-/* There is a bug in it:
- * When the cache is empty and you safe the wikipages,
- * an immediately created cached output of
- * RecentChanges will at the rss-image-link include
- * an action=edit
- */
-
-require_once 'lib/WikiPluginCached.php';
-require_once 'lib/plugin/RecentChanges.php';
-
-class WikiPlugin_RecentChangesCached
-    extends WikiPluginCached
-{
-    public $_args;
-    public $_type;
-    public $_static;
-    public $_dbi;
-
-    function getPluginType()
-    {
-        return PLUGIN_CACHED_HTML;
-    }
-
-    function getDescription()
-    {
-        return _('Cache output of RecentChanges called with default arguments.');
-    }
-
-    function getDefaultArguments()
-    {
-        $rc = new WikiPlugin_RecentChanges();
-        return $rc->getDefaultArguments();
-    }
-
-    function getExpire($dbi, $argarray, $request)
-    {
-        return '+900'; // 15 minutes
-    }
-
-    /**
-     * We don't go through pi parsing, instead we go directly to the
-     * better plugin methods.
-     *
-     * @param WikiDB $dbi
-     * @param string $argarray
-     * @param WikiRequest $request
-     * @param string $basepage
-     * @return mixed
-     */
-    protected function getHtml($dbi, $argarray, $request, $basepage)
-    {
-        $plugin = new WikiPlugin_RecentChanges();
-        $changes = $plugin->getChanges($dbi, $argarray);
-        return $plugin->format($changes, $argarray);
-        /*
-        $loader = new WikiPluginLoader();
-        return $loader->expandPI('<?plugin RecentChanges '
-            . WikiPluginCached::glueArgs($argarray)
-                                 . ' ?>', $request, $this, $basepage);
-        */
-    }
-
-    protected function getImage($dbi, $argarray, $request)
-    {
-        trigger_error('pure virtual', E_USER_ERROR);
-    }
-
-    protected function getMap($dbi, $argarray, $request)
-    {
-        trigger_error('pure virtual', E_USER_ERROR);
-    }
-
-    /**
-     * ->box is used to display a fixed-width, narrow version with common header.
-     * Just a limited list of pagenames, without date.
-     * This does not use ->run, to avoid pi construction and deconstruction
-     *
-     * @param string $args
-     * @param WikiRequest $request
-     * @param string $basepage
-     * @param bool $do_save
-     * @return $this|HtmlElement|XmlContent
-     */
-    function box($args = '', $request = null, $basepage = '', $do_save = false)
-    {
-        if (!$request) $request =& $GLOBALS['request'];
-        if (!isset($args['limit'])) $args['limit'] = 12;
-        $args['format'] = 'box';
-        $args['show_minor'] = false;
-        $args['show_major'] = true;
-        $args['show_deleted'] = 'sometimes';
-        $args['show_all'] = false;
-        $args['days'] = 90;
-
-        $cache = $this->newCache();
-        if (is_array($args))
-            ksort($args);
-        $argscopy = $args;
-        unset($argscopy['limit']);
-        $this->_args =& $args;
-        $this->_type = $this->getPluginType();
-        $this->_static = false;
-
-        /* OLD: */
-        //list($id, $url) = $this->genUrl($cache, $args);
-
-        /* NEW: This cache entry needs an update on major changes.
-         * So we should rather use an unique ID, because there will only be
-         * one global cached box.
-         */
-        $id = $cache->generateId(serialize(array("RecentChangesCachedBox", $argscopy)));
-        $content = $cache->get($id, 'imagecache');
-        if ($do_save || !$content || !$content['html']) {
-            $this->resetError();
-            $plugin = new WikiPlugin_RecentChanges();
-            $title = WikiLink($this->getName(), '', SplitPagename($this->getName()));
-            $changes = $plugin->getChanges($request->_dbi, $args);
-            $content['html'] =
-                $this->makeBox($title,
-                    $plugin->format($changes, $args));
-            if ($errortext = $this->getError()) {
-                $this->printError($errortext, 'html');
-                return HTML();
-            }
-            $do_save = true;
-        }
-        if ($do_save) {
-            $content['args'] = md5($this->_pi);
-            $expire = $this->getExpire($request->_dbi, $content['args'], $request);
-            $cache->save($id, $content, $expire, 'imagecache');
-        }
-        if ($content['html'])
-            return $content['html'];
-        return HTML();
-    }
-
-    // force box cache update on major changes.
-    function box_update($args = '', $request = null, $basepage = '')
-    {
-        $this->box($args, $request, $basepage, true);
-    }
-
-}

Modified: trunk/lib/plugin/WikiTranslation.php
===================================================================
--- trunk/lib/plugin/WikiTranslation.php	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/lib/plugin/WikiTranslation.php	2022-01-20 11:19:14 UTC (rev 10912)
@@ -162,7 +162,6 @@
     _("RawHtml") . ',' .
     _("RawHtmlPlugin") . ',' .
     _("RecentChanges") . ',' .
-    _("RecentChangesCached") . ',' .
     _("RecentComments") . ',' .
     _("RecentEdits") . ',' .
     _("RecentReferrers") . ',' .

Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/Makefile	2022-01-20 11:19:14 UTC (rev 10912)
@@ -231,7 +231,6 @@
 ${POT_FILE}: .././lib/plugin/RandomPage.php
 ${POT_FILE}: .././lib/plugin/RateIt.php
 ${POT_FILE}: .././lib/plugin/RawHtml.php
-${POT_FILE}: .././lib/plugin/RecentChangesCached.php
 ${POT_FILE}: .././lib/plugin/RecentChanges.php
 ${POT_FILE}: .././lib/plugin/RecentComments.php
 ${POT_FILE}: .././lib/plugin/RecentEdits.php

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/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-20 11:19:14 UTC (rev 10912)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Jan 2022 16:58:09 +0000
+Date: Thu, 20 Jan 2022 12:14:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -37,6 +37,7 @@
 * UpLoad plugin: allow more filenames (e.g. with Chinese characters)
 * ~PreferencesInfo plugin removed
 * ~CategoryPage plugin removed, categories are better created with the button in the toolbar
+* ~RecentChangesCached plugin removed, ~RecentChanges plugin is fast enough
 
 == 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 

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	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/de.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+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."
@@ -2494,9 +2494,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr "%s wird/werden nur in gesperrten Seiten erlaubt."
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr "BenutzerBewertungen"
 
@@ -4261,9 +4258,6 @@
 msgid "RawHtmlPlugin"
 msgstr "RawHtmlPlugin"
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/es.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -2430,9 +2430,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4164,9 +4161,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/fr.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+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."
@@ -2472,9 +2472,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr "%s n'est autorisé que dans les pages verrouillées."
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4250,9 +4247,6 @@
 msgid "RawHtmlPlugin"
 msgstr "GreffonHtmlPur"
 
-msgid "RecentChangesCached"
-msgstr "DernièresModifsEnCache"
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/it.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+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"
@@ -2411,9 +2411,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4141,9 +4138,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/ja.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+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"
@@ -2397,9 +2397,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4127,9 +4124,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/nl.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+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"
@@ -2403,9 +2403,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4133,9 +4130,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/phpwiki.pot	2022-01-20 11:19:14 UTC (rev 10912)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+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"
@@ -2397,9 +2397,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4127,9 +4124,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/sv.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -2398,9 +2398,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr ""
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4128,9 +4125,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/locale/po/zh.po	2022-01-20 11:19:14 UTC (rev 10912)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-20 11:03+0100\n"
+"POT-Creation-Date: 2022-01-20 12:14+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -2406,9 +2406,6 @@
 msgid "%s is only allowed in locked pages."
 msgstr "%s 只允許在鎖定的頁面中."
 
-msgid "Cache output of RecentChanges called with default arguments."
-msgstr ""
-
 msgid "UserContribs"
 msgstr ""
 
@@ -4138,9 +4135,6 @@
 msgid "RawHtmlPlugin"
 msgstr ""
 
-msgid "RecentChangesCached"
-msgstr ""
-
 msgid "RecentReferrers"
 msgstr ""
 

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

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

Deleted: trunk/pgsrc/Help%2FRecentChangesCachedPlugin
===================================================================
--- trunk/pgsrc/Help%2FRecentChangesCachedPlugin	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/pgsrc/Help%2FRecentChangesCachedPlugin	2022-01-20 11:19:14 UTC (rev 10912)
@@ -1,36 +0,0 @@
-Date: Thu, 13 Oct 2016 15:09:28 +0000
-Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
-Content-Type: application/x-phpwiki;
-  pagename=Help%2FRecentChangesCachedPlugin;
-  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
-  charset=UTF-8
-Content-Transfer-Encoding: binary
-
-Cache output of RecentChanges called with default arguments.
-
-== Usage ==
-{{{
-<<RecentChangesCached>>
-}}}
-
-== Arguments ==
-
-Same as [[Help:RecentChangesPlugin]]
-
-== Example ==
-
-{{{
-<<RecentChangesCached limit=10>>
-}}}
-
-<<RecentChangesCached limit=10>>
-
-== Author ==
-* [[Help:Reini Urban|Reini Urban]]
-
-== See Also ==
-
-<noinclude>
-----
-[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
-</noinclude>

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/pgsrc/ReleaseNotes	2022-01-20 11:19:14 UTC (rev 10912)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Jan 2022 16:58:09 +0000
+Date: Thu, 20 Jan 2022 12:14:25 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -37,6 +37,7 @@
 * UpLoad plugin: allow more filenames (e.g. with Chinese characters)
 * ~PreferencesInfo plugin removed
 * ~CategoryPage plugin removed, categories are better created with the button in the toolbar
+* ~RecentChangesCached plugin removed, ~RecentChanges plugin is fast enough
 
 == 1.6.0 2021-08-12 Marc-Etienne Vargenau ==
 

Modified: trunk/themes/Sidebar/templates/rc.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/rc.tmpl	2022-01-20 10:05:03 UTC (rev 10911)
+++ trunk/themes/Sidebar/templates/rc.tmpl	2022-01-20 11:19:14 UTC (rev 10912)
@@ -1,4 +1,4 @@
-<?php // RecentChangesCached Box ?>
+<?php // RecentChanges Box ?>
 <nav role="navigation" aria-label="<?php echo _("Recent Changes Menu") ?>">
 <div class="portlet" id="p-rc">
   <h2><?php echo _("Recent Changes") ?> <?php echo $WikiTheme->folderArrow('p-rc', 'Closed') ?></h2>
@@ -5,7 +5,7 @@
   <div class="pBody" id="p-rc-body" style="display:none;">
 <?php
   require_once("lib/WikiTheme.php");
-  $box = new PluginSidebarBox("RecentChangesCached", array("limit"=>12));
+  $box = new PluginSidebarBox("RecentChanges", array("limit"=>12));
   printXml($box->format());
 ?>
   </div>

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

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

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

Revision: 10911
          http://sourceforge.net/p/phpwiki/code/10911
Author:   vargenau
Date:     2022-01-20 10:05:03 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Add quotes in error message for clarity

Modified Paths:
--------------
    trunk/lib/stdlib.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/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/lib/stdlib.php	2022-01-20 10:05:03 UTC (rev 10911)
@@ -479,7 +479,7 @@
         } else {
             $url = substr(strrchr($ori_url, "/"), 1);
             return HTML::span(array('class' => 'error'),
-                sprintf(_("Invalid attribute %s=%s for image %s"),
+                sprintf(_("Invalid attribute “%s=%s” for image “%s”"),
                     $attr, $value, $url));
         }
     }

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	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/de.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+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."
@@ -4535,8 +4535,8 @@
 msgstr "URL Formfehler für Bild"
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
-msgstr "Ungültiger Parameter %s=%s für Bild %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
+msgstr "Ungültiger Parameter »%s=%s« für Bild »%s«"
 
 #, php-format
 msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/es.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -4432,7 +4432,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/fr.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+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."
@@ -4526,8 +4526,8 @@
 msgstr "URL incorrecte pour l'image"
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
-msgstr "Attribut non valable %s=%s pour l'image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
+msgstr "Attribut non valable « %s=%s » pour l'image « %s »"
 
 #, php-format
 msgid "Invalid image link fixed “%s” => “%s”. Spaces must be quoted with %%20."

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/it.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+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"
@@ -4409,7 +4409,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/ja.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+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"
@@ -4395,7 +4395,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/nl.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+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"
@@ -4401,7 +4401,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/phpwiki.pot	2022-01-20 10:05:03 UTC (rev 10911)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+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"
@@ -4395,7 +4395,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/sv.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -4396,7 +4396,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-20 10:00:37 UTC (rev 10910)
+++ trunk/locale/po/zh.po	2022-01-20 10:05:03 UTC (rev 10911)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-14 15:31+0100\n"
+"POT-Creation-Date: 2022-01-20 11:03+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -4410,7 +4410,7 @@
 msgstr ""
 
 #, php-format
-msgid "Invalid attribute %s=%s for image %s"
+msgid "Invalid attribute “%s=%s” for image “%s”"
 msgstr ""
 
 #, php-format

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:[10910] trunk/lib/stdlib.php

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

Revision: 10910
          http://sourceforge.net/p/phpwiki/code/10910
Author:   vargenau
Date:     2022-01-20 10:00:37 +0000 (Thu, 20 Jan 2022)
Log Message:
-----------
Better handle images with space in the filename

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2022-01-19 14:40:36 UTC (rev 10909)
+++ trunk/lib/stdlib.php	2022-01-20 10:00:37 UTC (rev 10910)
@@ -415,8 +415,17 @@
         $alt = "";
     }
     // Extract URL
-    $arr = explode(' ', $url);
-    if (!empty($arr)) $url = $arr[0];
+    // Space might be part of the filename, or separate the filename and the attributes
+    // [[Upload:raton laveur.jpg]] here the $url ends with an image extension, so space is part of the filename
+    // [[Upload:sanglier.jpg size=20% align=right]] here the space separates the filename and the attributes
+    // [[Upload:raton laveur.jpg size=20% align=right]] will fail
+    // It should be encoded as [[Upload:admin/raton%20laveur.jpg size=20% align=right]]
+    if (!is_image($url)) {
+        $arr = explode(' ', $url);
+        if (!empty($arr)) {
+            $url = $arr[0];
+        }
+    }
     if (!IsSafeURL($url)) {
         return HTML::span(array('class' => 'error'), _('Bad URL for image').' -- '._('Remove all of <, >, "'));
     }

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10909] trunk/lib/HtmlParser.php

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

Revision: 10909
          http://sourceforge.net/p/phpwiki/code/10909
Author:   vargenau
Date:     2022-01-19 14:40:36 +0000 (Wed, 19 Jan 2022)
Log Message:
-----------
lib/HtmlParser.php: oups, wrong semi-colon

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

Modified: trunk/lib/HtmlParser.php
===================================================================
--- trunk/lib/HtmlParser.php	2022-01-18 17:01:26 UTC (rev 10908)
+++ trunk/lib/HtmlParser.php	2022-01-19 14:40:36 UTC (rev 10909)
@@ -426,8 +426,8 @@
             //                 then we'll add it to the [Image] syntax
             if (!$alignment and preg_match("/float\:\s*(right|left)/i", $css_style, $m))
                 $alignment = $m[1];
-            if (!$alignment and preg_match("/float(right|left)/i", $css_class, $m)) ;
-            $alignment = $m[1];
+            if (!$alignment and preg_match("/float(right|left)/i", $css_class, $m))
+                $alignment = $m[1];
             if ($alignment) {
                 $attrs[] = "class=align-$alignment";
                 $this->log("  Image is contained within a DIV that specifies $alignment alignment");

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10908] trunk/lib/plugin/UpLoad.php

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

Revision: 10908
          http://sourceforge.net/p/phpwiki/code/10908
Author:   vargenau
Date:     2022-01-18 17:01:26 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
In case there is an UPLOAD_USERDIR, the "/" must not be urlencoded

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

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2022-01-18 15:58:50 UTC (rev 10907)
+++ trunk/lib/plugin/UpLoad.php	2022-01-18 17:01:26 UTC (rev 10908)
@@ -223,6 +223,8 @@
                         } else {
                             // $image_link might contain a space
                             $image_link = 'Upload:' . rawurlencode($image_link);
+                            // In case there is an UPLOAD_USERDIR, the "/" must not be urlencoded
+                            $image_link = str_replace("%2F", "/", $image_link);
                         }
                         $newtext = $text . "\n* " . $image_link;
                         $meta = $current->_data;

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

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

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

Revision: 10907
          http://sourceforge.net/p/phpwiki/code/10907
Author:   vargenau
Date:     2022-01-18 15:58:50 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Make the toolbar image button work when UPLOAD_USERDIR is set

Modified Paths:
--------------
    trunk/lib/editpage.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2022-01-18 15:29:48 UTC (rev 10906)
+++ trunk/lib/editpage.php	2022-01-18 15:58:50 UTC (rev 10907)
@@ -980,8 +980,11 @@
         if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) {
             $image_dir .= "/" . $request->_user->_userid;
             $pd = new ImageOrVideoSet($image_dir, '*');
-            $images = array_merge($images, $pd->getFiles());
+            $userimages = $pd->getFiles();
             unset($pd);
+            foreach ($userimages as $image) {
+                $images[] = $request->_user->_userid . '/' . $image;
+            }
         }
         sort($images);
         if (!empty($images)) {

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-18 15:29:48 UTC (rev 10906)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-18 15:58:50 UTC (rev 10907)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Jan 2022 16:29:05 +0000
+Date: Tue, 18 Jan 2022 16:58:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -17,6 +17,7 @@
 * Make list of pages work with PDO (~AllPages, ~MostPopular...).
 * Better handling of theme change in ~UserPreferences.
 * In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).
+* Make the toolbar image button work when ##UPLOAD_USERDIR## is set.
 * blog theme improved.
 
 === Changes ===

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-18 15:29:48 UTC (rev 10906)
+++ trunk/pgsrc/ReleaseNotes	2022-01-18 15:58:50 UTC (rev 10907)
@@ -1,4 +1,4 @@
-Date: Tue, 18 Jan 2022 16:29:05 +0000
+Date: Tue, 18 Jan 2022 16:58:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -17,6 +17,7 @@
 * Make list of pages work with PDO (~AllPages, ~MostPopular...).
 * Better handling of theme change in ~UserPreferences.
 * In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).
+* Make the toolbar image button work when ##UPLOAD_USERDIR## is set.
 * blog theme improved.
 
 === 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:[10906] trunk

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

Revision: 10906
          http://sourceforge.net/p/phpwiki/code/10906
Author:   vargenau
Date:     2022-01-18 15:29:48 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
TOOLBAR_IMAGE_PULLDOWN is true by default

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/Help%2FImages
    trunk/pgsrc/ReleaseNotes

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2022-01-18 14:07:21 UTC (rev 10905)
+++ trunk/config/config-default.ini	2022-01-18 15:29:48 UTC (rev 10906)
@@ -4,6 +4,9 @@
 DEBUG = 0
 ENABLE_PAGEPERM = true
 ENABLE_EDIT_TOOLBAR = true
+TOOLBAR_IMAGE_PULLDOWN = true
+; TOOLBAR_PAGELINK_PULLDOWN = *
+; TOOLBAR_TEMPLATE_PULLDOWN = Template*
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
 ENABLE_OPEN_GRAPH = false
@@ -144,8 +147,6 @@
 ; FORTUNE_DIR = /usr/share/fortune
 ; GOOGLE_LICENSE_KEY = "..."
 BLOG_DEFAULT_EMPTY_PREFIX = true
-; TOOLBAR_PAGELINK_PULLDOWN = *
-; TOOLBAR_TEMPLATE_PULLDOWN = Template*
 
 ; External executables:
 ; USE_EXTERNAL_HTML2PDF = "htmldoc --quiet --format pdf14 --no-toc --no-title %s"

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-18 14:07:21 UTC (rev 10905)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-18 15:29:48 UTC (rev 10906)
@@ -1,4 +1,4 @@
-Date: Sun, 16 Jan 2022 20:37:57 +0000
+Date: Tue, 18 Jan 2022 16:29:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -21,6 +21,7 @@
 
 === Changes ===
 * Warn user that leaving the page will lose modifications.
+* TOOLBAR_IMAGE_PULLDOWN is true by default.
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add “Rename” tab in Sidebar theme.
 * Page locking and unlocking is now saved in page history (in Edit mode).

Modified: trunk/pgsrc/Help%2FImages
===================================================================
--- trunk/pgsrc/Help%2FImages	2022-01-18 14:07:21 UTC (rev 10905)
+++ trunk/pgsrc/Help%2FImages	2022-01-18 15:29:48 UTC (rev 10906)
@@ -1,4 +1,4 @@
-Date: Mon, 28 Dec 2020 19:46:14 +0000
+Date: Tue, 18 Jan 2022 16:29:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FImages;
@@ -22,6 +22,8 @@
 
 Select an image and click //Insert//. The image will be inserted without options or alternative text.
 
+##TOOLBAR_IMAGE_PULLDOWN## must be set to ##true## for the icon to appear in the toolbar (default). 
+
 === Syntax ===
 
 You give access to the uploaded image with the following syntax.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-18 14:07:21 UTC (rev 10905)
+++ trunk/pgsrc/ReleaseNotes	2022-01-18 15:29:48 UTC (rev 10906)
@@ -1,4 +1,4 @@
-Date: Sun, 16 Jan 2022 20:37:57 +0000
+Date: Tue, 18 Jan 2022 16:29:05 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -21,6 +21,7 @@
 
 === Changes ===
 * Warn user that leaving the page will lose modifications.
+* TOOLBAR_IMAGE_PULLDOWN is true by default.
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add “Rename” tab in Sidebar theme.
 * Page locking and unlocking is now saved in page history (in Edit mode).

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10905] trunk/lib/config.php

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

Revision: 10905
          http://sourceforge.net/p/phpwiki/code/10905
Author:   vargenau
Date:     2022-01-18 14:07:21 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Avoid double slash in Upload URL

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

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2022-01-16 19:38:49 UTC (rev 10904)
+++ trunk/lib/config.php	2022-01-18 14:07:21 UTC (rev 10905)
@@ -153,6 +153,9 @@
         return string_ends_with(UPLOAD_DATA_PATH, "/")
             ? UPLOAD_DATA_PATH : UPLOAD_DATA_PATH . "/";
     }
-    return SERVER_URL . (string_ends_with(DATA_PATH, "/") ? '' : "/")
-        . DATA_PATH . '/uploads/';
+    if (defined('DATA_PATH') && (DATA_PATH != '')) {
+        return SERVER_URL . (string_ends_with(DATA_PATH, "/") ? '' : "/") . DATA_PATH . '/uploads/';
+    } else {
+        return SERVER_URL . '/uploads/';
+    }
 }

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

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

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

Revision: 10904
          http://sourceforge.net/p/phpwiki/code/10904
Author:   vargenau
Date:     2022-01-16 19:38:49 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/file.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/WikiDB/backend/file.php
===================================================================
--- trunk/lib/WikiDB/backend/file.php	2022-01-15 16:46:50 UTC (rev 10903)
+++ trunk/lib/WikiDB/backend/file.php	2022-01-16 19:38:49 UTC (rev 10904)
@@ -322,13 +322,15 @@
      * @param string $pagename Page name.
      * @param array $newdata hash New meta-data.
      *
-     * This will create a new page if page being requested does not
-     * exist.
      */
     function update_pagedata($pagename, $newdata)
     {
         $data = $this->get_pagedata($pagename);
         if (count($data) == 0) {
+            // Do not update metadata if page does not exist
+            if ($this->get_latest_version($pagename) == 0) {
+                return;
+            }
             $this->_savePageData($pagename, $newdata); // create a new pagedata-file
             return;
         }

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-15 16:46:50 UTC (rev 10903)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-16 19:38:49 UTC (rev 10904)
@@ -1,4 +1,4 @@
-Date: Fri, 14 Jan 2022 15:40:31 +0000
+Date: Sun, 16 Jan 2022 20:37:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -14,9 +14,10 @@
 ##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1.
 
 === Fixes ===
-* Make list of pages work with PDO (~AllPages, ~MostPopular...)
-* blog theme improved
+* Make list of pages work with PDO (~AllPages, ~MostPopular...).
 * Better handling of theme change in ~UserPreferences.
+* In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).
+* blog theme improved.
 
 === Changes ===
 * Warn user that leaving the page will lose modifications.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-15 16:46:50 UTC (rev 10903)
+++ trunk/pgsrc/ReleaseNotes	2022-01-16 19:38:49 UTC (rev 10904)
@@ -1,4 +1,4 @@
-Date: Fri, 14 Jan 2022 15:40:31 +0000
+Date: Sun, 16 Jan 2022 20:37:57 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -14,9 +14,10 @@
 ##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1.
 
 === Fixes ===
-* Make list of pages work with PDO (~AllPages, ~MostPopular...)
-* blog theme improved
+* Make list of pages work with PDO (~AllPages, ~MostPopular...).
 * Better handling of theme change in ~UserPreferences.
+* In DATABASE_TYPE = file, do not update metadata if page does not exist (reported by Harold Hallikainen).
+* blog theme improved.
 
 === Changes ===
 * Warn user that leaving the page will lose modifications.

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10903] trunk/themes/MacOSX/themeinfo.php

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

Revision: 10903
          http://sourceforge.net/p/phpwiki/code/10903
Author:   vargenau
Date:     2022-01-15 16:46:50 +0000 (Sat, 15 Jan 2022)
Log Message:
-----------
MacOSX theme: let us have a space as separator

Modified Paths:
--------------
    trunk/themes/MacOSX/themeinfo.php

Modified: trunk/themes/MacOSX/themeinfo.php
===================================================================
--- trunk/themes/MacOSX/themeinfo.php	2022-01-15 16:30:32 UTC (rev 10902)
+++ trunk/themes/MacOSX/themeinfo.php	2022-01-15 16:46:50 UTC (rev 10903)
@@ -141,7 +141,7 @@
         $this->setLinkIcon('wikiuser');
         $this->setLinkIcon('*', 'url');
 
-        $this->setButtonSeparator(""); //use no separator instead of default
+        $this->setButtonSeparator(" ");
 
         $this->addButtonAlias('?', 'uww');
         $this->addButtonAlias(_("Lock Page"), "Lock Page");

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

[phpwiki-checkins] SF.net SVN: phpwiki:[10902] trunk/themes/MonoBook/templates/navbar.tmpl

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

Revision: 10902
          http://sourceforge.net/p/phpwiki/code/10902
Author:   vargenau
Date:     2022-01-15 16:30:32 +0000 (Sat, 15 Jan 2022)
Log Message:
-----------
MonoBook theme: better Help link

Modified Paths:
--------------
    trunk/themes/MonoBook/templates/navbar.tmpl

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2022-01-14 14:41:07 UTC (rev 10901)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2022-01-15 16:30:32 UTC (rev 10902)
@@ -16,7 +16,7 @@
       <li><?php echo WikiLink(__("RecentNewPages"), "", _("Recent New Pages")) ?></li>
       <li><?php echo Button(array('action'=>__("LikePages")),_("Like Pages"), $page->getName()) ?></li>
       <li><?php echo WikiLink(__("RandomPage"), "", _("Random Page")) ?></li>
-      <li><?php echo WikiLink(__("PhpWikiDocumentation"),"", _("Help")) ?></li>
+      <li><?php echo WikiLink(__("Help"),"", _("Help")) ?></li>
     </ul>
   </div>
 </div>

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

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

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

Revision: 10901
          http://sourceforge.net/p/phpwiki/code/10901
Author:   vargenau
Date:     2022-01-14 14:41:07 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
Warn user that leaving the page will lose modifications: in all themes

Modified Paths:
--------------
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/ReleaseNotes
    trunk/themes/Crao/templates/editpage.tmpl
    trunk/themes/Portland/templates/editpage.tmpl
    trunk/themes/Wordpress/templates/editpage.tmpl

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-14 14:33:17 UTC (rev 10900)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2022-01-14 14:41:07 UTC (rev 10901)
@@ -1,4 +1,4 @@
-Date: Wed, 12 Jan 2022 14:33:19 +0000
+Date: Fri, 14 Jan 2022 15:40:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -19,6 +19,7 @@
 * Better handling of theme change in ~UserPreferences.
 
 === Changes ===
+* Warn user that leaving the page will lose modifications.
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add “Rename” tab in Sidebar theme.
 * Page locking and unlocking is now saved in page history (in Edit mode).

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2022-01-14 14:33:17 UTC (rev 10900)
+++ trunk/pgsrc/ReleaseNotes	2022-01-14 14:41:07 UTC (rev 10901)
@@ -1,4 +1,4 @@
-Date: Wed, 12 Jan 2022 14:33:19 +0000
+Date: Fri, 14 Jan 2022 15:40:31 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -19,6 +19,7 @@
 * Better handling of theme change in ~UserPreferences.
 
 === Changes ===
+* Warn user that leaving the page will lose modifications.
 * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO.
 * Add “Rename” tab in Sidebar theme.
 * Page locking and unlocking is now saved in page history (in Edit mode).

Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2022-01-14 14:33:17 UTC (rev 10900)
+++ trunk/themes/Crao/templates/editpage.tmpl	2022-01-14 14:41:07 UTC (rev 10901)
@@ -16,6 +16,35 @@
       <?php echo _("Saving this page will overwrite the current version.") ?>
       </p>
 <?php } ?>
+<script type="text/javascript">
+<!--//
+$(document).ready(function() {
+    ret=window.sessionStorage.getItem('wiki_modified');
+    if (ret) {
+        wiki_modified=ret;
+    } else {
+        wiki_modified=0;
+    }
+    sessionStorage.removeItem('wiki_modified');
+    $('form *').change(function(){
+        wiki_modified=1;
+    });
+    window.onbeforeunload = confirmExit;
+    function confirmExit() {
+        if (wiki_modified == 1) {
+            return "Warning: leaving the page will lose all your modifications!";
+        }
+    }
+    $("input[name='edit[save]']").click(function() {
+        wiki_modified=0;
+        sessionStorage.removeItem('wiki_modified');
+    });
+    $("input[name='edit[preview]'],input[name='edit[diff]']").click(function() {
+        window.sessionStorage.setItem('wiki_modified', wiki_modified);
+        wiki_modified=0;
+    });
+});
+// --></script>
 <form method="post" id="editpage" name="editpage"
       action="<?php echo $request->getPostURL() ?>"
       accept-charset="UTF-8">

Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2022-01-14 14:33:17 UTC (rev 10900)
+++ trunk/themes/Portland/templates/editpage.tmpl	2022-01-14 14:41:07 UTC (rev 10901)
@@ -13,6 +13,35 @@
       <?php echo _("Saving this page will overwrite the current version.") ?>
       </p>
 <?php } ?>
+<script type="text/javascript">
+<!--//
+$(document).ready(function() {
+    ret=window.sessionStorage.getItem('wiki_modified');
+    if (ret) {
+        wiki_modified=ret;
+    } else {
+        wiki_modified=0;
+    }
+    sessionStorage.removeItem('wiki_modified');
+    $('form *').change(function(){
+        wiki_modified=1;
+    });
+    window.onbeforeunload = confirmExit;
+    function confirmExit() {
+        if (wiki_modified == 1) {
+            return "Warning: leaving the page will lose all your modifications!";
+        }
+    }
+    $("input[name='edit[save]']").click(function() {
+        wiki_modified=0;
+        sessionStorage.removeItem('wiki_modified');
+    });
+    $("input[name='edit[preview]'],input[name='edit[diff]']").click(function() {
+        window.sessionStorage.setItem('wiki_modified', wiki_modified);
+        wiki_modified=0;
+    });
+});
+// --></script>
 </td>
 </tr>
 </table>

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2022-01-14 14:33:17 UTC (rev 10900)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2022-01-14 14:41:07 UTC (rev 10901)
@@ -15,6 +15,35 @@
       <?php echo _("Saving this page will overwrite the current version.") ?>
       </p>
 <?php } ?>
+<script type="text/javascript">
+<!--//
+$(document).ready(function() {
+    ret=window.sessionStorage.getItem('wiki_modified');
+    if (ret) {
+        wiki_modified=ret;
+    } else {
+        wiki_modified=0;
+    }
+    sessionStorage.removeItem('wiki_modified');
+    $('form *').change(function(){
+        wiki_modified=1;
+    });
+    window.onbeforeunload = confirmExit;
+    function confirmExit() {
+        if (wiki_modified == 1) {
+            return "Warning: leaving the page will lose all your modifications!";
+        }
+    }
+    $("input[name='edit[save]']").click(function() {
+        wiki_modified=0;
+        sessionStorage.removeItem('wiki_modified');
+    });
+    $("input[name='edit[preview]'],input[name='edit[diff]']").click(function() {
+        window.sessionStorage.setItem('wiki_modified', wiki_modified);
+        wiki_modified=0;
+    });
+});
+// --></script>
 </td>
 <td>
 </td>

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

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

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

Revision: 10900
          http://sourceforge.net/p/phpwiki/code/10900
Author:   vargenau
Date:     2022-01-14 14:33:17 +0000 (Fri, 14 Jan 2022)
Log Message:
-----------
themes/Portland/templates/actionbar.tmpl: add separator, better link message

Modified Paths:
--------------
    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
    trunk/themes/Portland/templates/actionbar.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	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/de.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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."
@@ -5737,6 +5737,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Diese Seite bearbeiten"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s von dieser Seite"
@@ -5806,9 +5809,6 @@
 #~ msgid "EditText"
 #~ msgstr "TextBearbeiten"
 
-#~ msgid "Edit this page"
-#~ msgstr "Diese Seite bearbeiten"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Ungültiger Dateiname."
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/es.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5612,6 +5612,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Corrija esta página"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5666,9 +5669,6 @@
 #~ msgid "EditText"
 #~ msgstr "Editar"
 
-#~ msgid "Edit this page"
-#~ msgstr "Corrija esta página"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Nombre de archivo inválido."
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/fr.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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."
@@ -5726,6 +5726,9 @@
 msgid "Favorite Categories"
 msgstr "Catégories populaires"
 
+msgid "Edit this page"
+msgstr "Modifier cette page"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s de cette page"
@@ -5799,9 +5802,6 @@
 #~ msgid "EditText"
 #~ msgstr "ÉditerLeContenu"
 
-#~ msgid "Edit this page"
-#~ msgstr "Modifier cette page"
-
 #~ msgid "Invalid filename."
 #~ msgstr "Nom de fichier incorrect."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/it.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5572,6 +5572,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Modifica la pagina"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s di questa pagina"

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/ja.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5558,6 +5558,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "ページを編集しています"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""
@@ -5621,9 +5624,6 @@
 #~ msgid "Language"
 #~ msgstr "言語"
 
-#~ msgid "Edit this page"
-#~ msgstr "ページを編集しています"
-
 #~ msgid "Deleted"
 #~ msgstr "削除しました"
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/nl.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5564,6 +5564,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Verander pagina"
+
 #, php-format
 msgid "%s of this page"
 msgstr ""

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/phpwiki.pot	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+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"
@@ -5558,6 +5558,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr ""
+
 #, php-format
 msgid "%s of this page"
 msgstr ""

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/sv.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5559,6 +5559,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "Redigera den här sidan"
+
 #, php-format
 msgid "%s of this page"
 msgstr "%s för den här sidan"

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/locale/po/zh.po	2022-01-14 14:33:17 UTC (rev 10900)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-01-12 18:09+0100\n"
+"POT-Creation-Date: 2022-01-14 15:31+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5586,6 +5586,9 @@
 msgid "Favorite Categories"
 msgstr ""
 
+msgid "Edit this page"
+msgstr "編輯此頁面"
+
 #, php-format
 msgid "%s of this page"
 msgstr "此頁面的 %s"
@@ -5649,9 +5652,6 @@
 #~ msgid "Language"
 #~ msgstr "語言"
 
-#~ msgid "Edit this page"
-#~ msgstr "編輯此頁面"
-
 #~ msgid "Deleted"
 #~ msgstr "已刪除"
 

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

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

Modified: trunk/themes/Portland/templates/actionbar.tmpl
===================================================================
--- trunk/themes/Portland/templates/actionbar.tmpl	2022-01-14 12:33:00 UTC (rev 10899)
+++ trunk/themes/Portland/templates/actionbar.tmpl	2022-01-14 14:33:17 UTC (rev 10900)
@@ -1,15 +1,21 @@
 <?php
 if ($revision && (!$page->get('locked') || $user->isAdmin())) {
-    $EditB = Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+    if ($revision->isCurrent()) {
+        $EditB = Button("edit", _("Edit this page"));
+    } else {
+        $EditB = Button("edit", _("Edit Old Revision"));
+        $EditB = fmt("%s of this page", $EditB);
+    }
 } else {
     $EditB = Button("viewsource", _("View Source"));
+    $EditB = fmt("%s of this page", $EditB);
 }
-$EditB = fmt("%s of this page", $EditB);
 if (empty($revision)) {
     $revision = $page->getCurrentRevision(false);
 }
 ?>
 <?php echo $EditB ?>
+<?php echo $SEP?>
 <a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <?php echo $SEP?>
 <?php echo Button(__("PageHistory"), _("Page History")) ?>

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