Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.180.2.96 -r1.180.2.97
--- openacs-4/packages/xowiki/xowiki.info 9 Apr 2022 11:00:45 -0000 1.180.2.96
+++ openacs-4/packages/xowiki/xowiki.info 14 Apr 2022 10:14:43 -0000 1.180.2.97
@@ -10,7 +10,7 @@
t
xowiki
-
+
Gustaf Neumann
A xotcl-based enterprise wiki system with multiple object types
2021-09-15
@@ -55,7 +55,7 @@
BSD-Style
2
-
+
Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -r1.47.2.21 -r1.47.2.22
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 26 Jan 2022 10:34:55 -0000 1.47.2.21
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 14 Apr 2022 10:14:43 -0000 1.47.2.22
@@ -197,7 +197,8 @@
Ver�ffentlichungsdatum
Inhalt
Titel der Seite
- Another item with the name '%value%' exists already in this folder
+ %errorMsg%
+ Another item with the name '%value%' exists already in this folder
Page Order ung�ltig, nur Buchstaben, Ziffern, Punkte und Unterstrich sind erlaubt.
Art
Seitentitel
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -r1.71.2.26 -r1.71.2.27
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 26 Jan 2022 10:34:55 -0000 1.71.2.26
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 14 Apr 2022 10:14:43 -0000 1.71.2.27
@@ -208,7 +208,8 @@
Content
Page Title
%errorMsg%
- Another item with the name '%value%' exists already in this folder
+ %errorMsg%
+ Another item with the name '%value%' exists already in this folder
Page Order invalid; might only contain upper and lowercase letters, underscore, digits and dots
Type
XoWiki Page
Index: openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml,v
diff -u -r1.16.2.7 -r1.16.2.8
--- openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml 15 Jan 2022 16:16:04 -0000 1.16.2.7
+++ openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml 14 Apr 2022 10:14:43 -0000 1.16.2.8
@@ -213,7 +213,8 @@
Contenido
T�tulo de la P�gina
%errorMsg%
- Otro elemento con el valor '%value%' ya existe en �sta carpeta
+ %errorMsg%
+ Otro elemento con el valor '%value%' ya existe en �sta carpeta
Orden de p�gina no v�lido: s�lo puede contener letras, gui�n bajo, d�gitos y puntos
Tipo
P�gina XoWiki
Index: openacs-4/packages/xowiki/catalog/xowiki.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.it_IT.ISO-8859-1.xml,v
diff -u -r1.3.2.10 -r1.3.2.11
--- openacs-4/packages/xowiki/catalog/xowiki.it_IT.ISO-8859-1.xml 8 Feb 2022 10:11:49 -0000 1.3.2.10
+++ openacs-4/packages/xowiki/catalog/xowiki.it_IT.ISO-8859-1.xml 14 Apr 2022 10:14:43 -0000 1.3.2.11
@@ -213,7 +213,8 @@
Contenuto
Titolo Pagina
%errorMsg%
- Esiste gi� un altro oggetto di nome '%value%' in questa cartella
+ %errorMsg%
+ Esiste gi� un altro oggetto di nome '%value%' in questa cartella
Ordine Pagina non valido; pu� contenere solo caratteri maiuscoli e minuscoli, underscore, cifre e punti
Tipo
Pagina XoWiki
Index: openacs-4/packages/xowiki/catalog/xowiki.ru_RU.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.ru_RU.utf-8.xml,v
diff -u -r1.1.4.2 -r1.1.4.3
--- openacs-4/packages/xowiki/catalog/xowiki.ru_RU.utf-8.xml 15 Jan 2022 16:16:04 -0000 1.1.4.2
+++ openacs-4/packages/xowiki/catalog/xowiki.ru_RU.utf-8.xml 14 Apr 2022 10:14:43 -0000 1.1.4.3
@@ -175,7 +175,8 @@
Содержание
Наименование страницы
%errorMsg%
- Другой элемент с наименование '%value%' уже существует в этой директории
+ %errorMsg%
+ Другой элемент с наименование '%value%' уже существует в этой директории
Недопустимый порядок страниц; может содержать заглавные и строчные буквы, подчёркивание, цифры и точки
Тип
XoWiki страница
Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v
diff -u -r1.147.2.22 -r1.147.2.23
--- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 4 Mar 2022 10:53:28 -0000 1.147.2.22
+++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 14 Apr 2022 10:14:43 -0000 1.147.2.23
@@ -24,8 +24,10 @@
{f.description "="}
{f.nls_language "="}
{validate {
- {name {\[::xowiki::validate_name\]} {Another item with this name exists \
- already in this folder}}
+ {name {\[::xowiki::validate_name\]}
+ {Another item with this name exists already in this folder} }
+ {name {[string length \$name] < 4}
+ {The name is too long. Please enter a value of at most 4000 characters long} }
{page_order {\[::xowiki::validate_form_field page_order\]} {Page Order invalid; \
might only contain upper and lowercase letters, underscore, digits and dots}}
}}
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.542.2.153 -r1.542.2.154
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 9 Apr 2022 11:00:45 -0000 1.542.2.153
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 14 Apr 2022 10:14:43 -0000 1.542.2.154
@@ -2913,12 +2913,31 @@
upvar nls_language nls_language
set success [::xowiki::validate_name [self]]
if {$success} {
- # set the instance variable with a potentially prefixed name
- # the classical validators do just an upvar
+ set actual_length [string length $name]
+ set max_length 400
+ if {$actual_length > $max_length} {
+ set errorMsg [_ acs-tcl.lt_name_is_too_long__Ple \
+ [list name $name max_length $max_length actual_length $actual_length]]
+ set success 0
+ }
+ } else {
+ set errorMsg [_ xowiki.Page-validate_name-duplicate_item [list value $name]]
+ }
+
+ if {$success} {
+ #
+ # Set the instance variable with a potentially prefixed
+ # name. The classical validators (like xowiki::validate_name) do
+ # just an upvar. Therefore, the "name" value is already
+ # normalized and prefixed.
+ #
set :name $name
+ } else {
+ uplevel [list set errorMsg $errorMsg]
}
return $success
}
+
Page instproc validate=page_order {value} {
if {[info exists :page_order]} {
set page_order [string trim $value " ."]