Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[18023] trunk
|
From: <sy...@us...> - 2009-04-15 23:29:49
|
Revision: 18023
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18023&view=rev
Author: sylvieg
Date: 2009-04-15 23:29:36 +0000 (Wed, 15 Apr 2009)
Log Message:
-----------
[MRG] Automatic merge, branches/3.0 17913 to 18022
Modified Paths:
--------------
trunk/_htaccess
trunk/changelog.txt
trunk/copyright.txt
trunk/css/cssmenus.css
trunk/db/features.csv
trunk/db/tiki-3.0-mysql.sql
trunk/db/tiki-3.0-mysqli.sql
trunk/db/tiki-3.0-oci8.sql
trunk/db/tiki-3.0-pgsql.sql
trunk/db/tiki-3.0-sqlite.sql
trunk/db/tiki-3.0-sybase.sql
trunk/doc/devtools/release.php
trunk/doc/devtools/tikirelease.sh
trunk/installer/installlib.php
trunk/installer/tiki-installer.php
trunk/lang/ar/language.php
trunk/lang/ca/language.php
trunk/lang/cn/language.php
trunk/lang/cs/language.php
trunk/lang/da/language.php
trunk/lang/de/language.php
trunk/lang/el/language.php
trunk/lang/en/language.php
trunk/lang/en-uk/language.php
trunk/lang/es/language.php
trunk/lang/fa/language.php
trunk/lang/fi/language.php
trunk/lang/fj/language.php
trunk/lang/fr/language.php
trunk/lang/gl/language.php
trunk/lang/he/language.php
trunk/lang/hr/language.php
trunk/lang/hu/language.php
trunk/lang/it/language.php
trunk/lang/ja/language.php
trunk/lang/ko/language.php
trunk/lang/nl/language.php
trunk/lang/no/language.php
trunk/lang/pl/language.php
trunk/lang/pt/language.php
trunk/lang/pt-br/language.php
trunk/lang/ru/language.php
trunk/lang/sb/language.php
trunk/lang/sk/language.php
trunk/lang/sr/language.php
trunk/lang/sr-latn/language.php
trunk/lang/sv/language.php
trunk/lang/tv/language.php
trunk/lang/tw/language.php
trunk/lang/uk/language.php
trunk/lib/articles/artlib.php
trunk/lib/banners/bannerlib.php
trunk/lib/blogs/bloglib.php
trunk/lib/breadcrumblib.php
trunk/lib/cache/cachelib.php
trunk/lib/profilelib/installlib.php
trunk/lib/profilelib/listlib.php
trunk/lib/profilelib/profilelib.php
trunk/lib/rss/rsslib.php
trunk/lib/search/searchlib.php
trunk/lib/searchlib.php
trunk/lib/setup/prefs.php
trunk/lib/setup/twversion.class.php
trunk/lib/smarty_tiki/block.pagination_links.php
trunk/lib/smarty_tiki/block.self_link.php
trunk/lib/smarty_tiki/function.query.php
trunk/lib/tiki-js.js
trunk/lib/tikilib.php
trunk/lib/trackers/trackerlib.php
trunk/lib/tree/categ_browse_tree.php
trunk/lib/wiki-plugins/wikiplugin_article.php
trunk/lib/wiki-plugins/wikiplugin_fancylist.php
trunk/lib/wiki-plugins/wikiplugin_mouseover.php
trunk/lib/wiki-plugins/wikiplugin_trackerstat.php
trunk/modules/cache/README
trunk/modules/mod-since_last_visit_new.php
trunk/modules/mod-top_image_galleries.php
trunk/robots.txt
trunk/styles/coelesce.css
trunk/styles/darkroom.css
trunk/styles/feb12.css
trunk/styles/strasa.css
trunk/styles/thenews.css
trunk/styles/tikinewt.css
trunk/templates/blog-heading.tpl
trunk/templates/comment-header.tpl
trunk/templates/header.tpl
trunk/templates/header_simple.tpl
trunk/templates/mail/tracker_changed_notification.tpl
trunk/templates/mail/user_validation_mail.tpl
trunk/templates/mail/user_validation_mail_subject.tpl
trunk/templates/styles/coelesce/comment-header.tpl
trunk/templates/tiki-admin-include-blogs.tpl
trunk/templates/tiki-admin-include-general.tpl
trunk/templates/tiki-admin-include-i18n.tpl
trunk/templates/tiki-admin-include-look.tpl
trunk/templates/tiki-admin-include-profiles.tpl
trunk/templates/tiki-admin-include-sefurl.tpl
trunk/templates/tiki-admin-include-textarea.tpl
trunk/templates/tiki-admin-include-wiki.tpl
trunk/templates/tiki-admin.tpl
trunk/templates/tiki-admin_modules.tpl
trunk/templates/tiki-admin_tracker_fields.tpl
trunk/templates/tiki-admin_trackers.tpl
trunk/templates/tiki-adminusers.tpl
trunk/templates/tiki-bot_bar.tpl
trunk/templates/tiki-browse_gallery.tpl
trunk/templates/tiki-calendar.tpl
trunk/templates/tiki-custom_home.tpl
trunk/templates/tiki-edit_help.tpl
trunk/templates/tiki-edit_help_tool.tpl
trunk/templates/tiki-install.tpl
trunk/templates/tiki-list_file_gallery.tpl
trunk/templates/tiki-listpages_content.tpl
trunk/templates/tiki-mods.tpl
trunk/templates/tiki-pagehistory.tpl
trunk/templates/tiki-plugin_blocked.tpl
trunk/templates/tiki-plugin_help.tpl
trunk/templates/tiki-sheets.tpl
trunk/templates/tiki-show_help.tpl
trunk/templates/tiki-show_page.tpl
trunk/templates/tiki-site_header.tpl
trunk/templates/tiki-view_forum.tpl
trunk/templates/tiki-view_tracker.tpl
trunk/templates/tiki-view_tracker_item.tpl
trunk/templates/tiki-webmail.tpl
trunk/templates/wiki_edit.tpl
trunk/tiki-admin.php
trunk/tiki-admin_include_general.php
trunk/tiki-admin_include_i18n.php
trunk/tiki-admin_include_login.php
trunk/tiki-admin_include_look.php
trunk/tiki-admin_include_profiles.php
trunk/tiki-admin_include_sefurl.php
trunk/tiki-admin_include_textarea.php
trunk/tiki-admin_include_wiki.php
trunk/tiki-admin_system.php
trunk/tiki-adminusers.php
trunk/tiki-articles_rss.php
trunk/tiki-blog_post.php
trunk/tiki-calendar.php
trunk/tiki-calendar_edit_item.php
trunk/tiki-edit_structure.php
trunk/tiki-edit_submission.php
trunk/tiki-editpage.php
trunk/tiki-install.php
trunk/tiki-register.php
trunk/tiki-sefurl.php
trunk/tiki-send_newsletters.php
trunk/tiki-upload_image.php
trunk/tiki-view_blog.php
Added Paths:
-----------
trunk/lib/smarty_tiki/function.filegal_manager_url.php
trunk/styles/coelesce/arrows-467aa7.png
Removed Paths:
-------------
trunk/lib/wiki-plugins/wikiplugin_example.php
Property Changed:
----------------
trunk/
trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
trunk/lib/core/test/Multilingual/Aligner/AllTests.php
trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php
trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php
trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php
trunk/lib/jquery/
trunk/lib/jquery/cluetip/
trunk/lib/jquery/jquery-autocomplete/
trunk/lib/jquery/reflection-jquery/
trunk/lib/jquery/superfish/
trunk/lib/jquery_tiki/
trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0:16998-17913
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
+ /branches/3.0:16998-18022
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
Modified: trunk/_htaccess
===================================================================
--- trunk/_htaccess 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/_htaccess 2009-04-15 23:29:36 UTC (rev 18023)
@@ -69,6 +69,8 @@
RewriteRule ^workspaces$ tiki-workspaces_admin.php [L]
# access any object by its numeric identifier
+RewriteRule ^article([0-9]+)\-.*$ article$1
+RewriteRule ^blog([0-9]+)\-.*$ blog$1
RewriteRule ^article([0-9]+) tiki-read_article.php?articleId=$1 [QSA,L]
RewriteRule ^art([0-9]+) tiki-read_article.php?articleId=$1 [QSA,L]
RewriteRule ^cat([0-9]+) tiki-browse_categories.php?parentId=$1 [QSA,L]
Modified: trunk/changelog.txt
===================================================================
--- trunk/changelog.txt 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/changelog.txt 2009-04-15 23:29:36 UTC (rev 18023)
@@ -23,6 +23,82 @@
------------------
----------------------------------------------
+r17921 | nyloth | 2009-04-11 09:10:27 +0200 (Sat, 11 Apr 2009) | 1 line
+
+[FIX] fix tiki.sql for comments locking which was causing troubles on fresh installs
+----------------------------------------------
+r17920 | sylvieg | 2009-04-10 23:43:23 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX]perm: tiki_p_blog_post, tiki_p_add_events, tiki_p_upload_images, tiki_p_remove are more related to tiki_p_edit_categorized than tiki_p_view_categorized
+----------------------------------------------
+r17919 | lphuberdeau | 2009-04-10 23:00:45 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] Rebuild patch list after clean install to make sure they are all recorded during reinstall and add DB out of date notification in admin panel
+----------------------------------------------
+r17917 | sylvieg | 2009-04-10 22:18:49 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] reverse 17912 and fix it correctly
+----------------------------------------------
+r17916 | sewilco | 2009-04-10 21:56:52 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] Do not ignore Group perm on categorized object.
+----------------------------------------------
+r17914 | marclaporte | 2009-04-10 20:43:01 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] feature_print_indexed is a new feature, never should have been activated by default
+----------------------------------------------
+r17913 | lphuberdeau | 2009-04-10 19:55:14 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] Avoid name conflicts
+----------------------------------------------
+r17912 | lphuberdeau | 2009-04-10 19:52:14 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] Bad method names cause crashes
+----------------------------------------------
+r17911 | sewilco | 2009-04-10 18:10:07 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[ENH] add "offset" parameter so article list doesnt have to start at first one.
+----------------------------------------------
+r17909 | luciash | 2009-04-10 11:58:12 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] tracker email notification: translations by watcher language
+----------------------------------------------
+r17908 | marclaporte | 2009-04-10 07:20:39 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] Restore file which seems to have been deleted accidentally in revision 17868
+----------------------------------------------
+r17907 | marclaporte | 2009-04-10 07:16:40 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] After saving a page, can use edit plugin interface without the .rbox-title that overlaps
+----------------------------------------------
+r17905 | pkdille | 2009-04-10 01:00:19 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[REL] SecDB for 3.0beta2
+----------------------------------------------
+r17903 | pkdille | 2009-04-10 00:53:20 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[FIX] release.php: wait between each directory for php -l
+----------------------------------------------
+r17902 | pkdille | 2009-04-10 00:45:10 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[REL] update version in tiki-installer
+----------------------------------------------
+r17901 | pkdille | 2009-04-10 00:29:23 +0200 (Fri, 10 Apr 2009) | 1 line
+
+[REL] SecDB for 3.0beta2
+----------------------------------------------
+r17897 | pkdille | 2009-04-09 23:40:04 +0200 (Thu, 09 Apr 2009) | 1 line
+
+[REL] SecDB for 3.0beta2
+----------------------------------------------
+r17896 | luciash | 2009-04-09 23:26:59 +0200 (Thu, 09 Apr 2009) | 1 line
+
+[ENH] tracker email notification: highlight item names and New: changes and better look of the notification mail for readability
+----------------------------------------------
+r17895 | nyloth | 2009-04-09 23:16:03 +0200 (Thu, 09 Apr 2009) | 1 line
+
+[REL] Preparing 3.0beta2 release
+----------------------------------------------
r17893 | sylvieg | 2009-04-09 19:12:52 +0200 (Thu, 09 Apr 2009) | 1 line
[FIX]tracker: fix language of the tracker notification message
Modified: trunk/copyright.txt
===================================================================
--- trunk/copyright.txt 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/copyright.txt 2009-04-15 23:29:36 UTC (rev 18023)
@@ -12,7 +12,7 @@
http://dev.tikiwiki.org/SocialContract
List of members of the Community
-As of 2009-04-09, the community has:
+As of 2009-04-11, the community has:
* 436 members on Sourceforge,
* 201 of those people who made at least one code commit
@@ -1183,8 +1183,8 @@
Nickname: lphuberdeau
Name: Louis-Philippe Huberdeau
First Commit: 2004-04-10
-Last Commit: 2009-04-06
-Number of Commits: 902
+Last Commit: 2009-04-10
+Number of Commits: 907
SF Role: Developer
Nickname: lrargerich
@@ -1205,8 +1205,8 @@
Nickname: luciash
Name: luciash d' being
First Commit: 2003-08-05
-Last Commit: 2009-04-09
-Number of Commits: 533
+Last Commit: 2009-04-10
+Number of Commits: 535
SF Role: Developer
Nickname: lueders
@@ -1250,8 +1250,8 @@
Nickname: marclaporte
Name: Marc Laporte
First Commit: 2003-11-28
-Last Commit: 2009-04-09
-Number of Commits: 345
+Last Commit: 2009-04-10
+Number of Commits: 348
SF Role: Project Manager
Nickname: marcmont
@@ -1535,8 +1535,8 @@
Nickname: nyloth
Name: Patrice W.
First Commit: 2006-11-09
-Last Commit: 2009-04-09
-Number of Commits: 1140
+Last Commit: 2009-04-11
+Number of Commits: 1144
SF Role: Developer
Nickname: obnoxxx
@@ -1662,8 +1662,8 @@
Nickname: pkdille
First Commit: 2007-03-14
-Last Commit: 2009-04-09
-Number of Commits: 629
+Last Commit: 2009-04-10
+Number of Commits: 638
SF Role: Developer
Nickname: plillevold
@@ -1783,8 +1783,8 @@
Nickname: ricks99
Name: rick
First Commit: 2007-07-19
-Last Commit: 2009-04-07
-Number of Commits: 243
+Last Commit: 2009-04-10
+Number of Commits: 244
SF Role: Developer
Nickname: ripero
@@ -1907,8 +1907,8 @@
Nickname: sewilco
Name: Scot Wilcoxon
First Commit: 2008-09-18
-Last Commit: 2009-03-19
-Number of Commits: 45
+Last Commit: 2009-04-10
+Number of Commits: 47
SF Role: Developer
Nickname: sghane
@@ -1994,8 +1994,8 @@
Nickname: sylvieg
Name: Sylvie Greverend
First Commit: 2003-05-28
-Last Commit: 2009-04-09
-Number of Commits: 4245
+Last Commit: 2009-04-10
+Number of Commits: 4247
SF Role: Developer
Nickname: syracine
Modified: trunk/css/cssmenus.css
===================================================================
--- trunk/css/cssmenus.css 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/css/cssmenus.css 2009-04-15 23:29:36 UTC (rev 18023)
@@ -13,7 +13,8 @@
.cssmenu ul,
.cssmenu li,
-.cssmenu_horiz li,
+.cssmenu_horiz ul,
+.cssmenu_horiz ul li,
.cssmenu_vert,
.cssmenu_vert ul,
.cssmenu_vert li {width: 11em}
@@ -135,6 +136,9 @@
#header .cssmenu_horiz {
z-index: 800;
position: relative}
+
+.cssmenu_horiz > li a {padding-right: 12px}
+.cssmenu_horiz > li.menuSection a {padding-right: 24px}
#header .cssmenu_horiz {}
#header .cssmenu_horiz > li {}
Modified: trunk/db/features.csv
===================================================================
--- trunk/db/features.csv 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/features.csv 2009-04-15 23:29:36 UTC (rev 18023)
@@ -822,7 +822,6 @@
934,Definition List,913,,wikiplugin_dl,flag,,tiki_p_admin,,,,,,
935,Equation,913,,wikiplugin_equation,flag,,tiki_p_admin,,,,,,
936,Events,913,,wikiplugin_events,flag,,tiki_p_admin,,,,,,
-937,Example,913,,wikiplugin_example,flag,,tiki_p_admin,,,,,,
938,Fancy Table,913,,wikiplugin_fancytable,flag,,tiki_p_admin,,,,,,
939,Flash video,913,,wikiplugin_flash,flag,,tiki_p_admin,,,,,,
940,Gauge,913,,wikiplugin_gauge,flag,,tiki_p_admin,,,,,,
Modified: trunk/db/tiki-3.0-mysql.sql
===================================================================
--- trunk/db/tiki-3.0-mysql.sql 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/tiki-3.0-mysql.sql 2009-04-15 23:29:36 UTC (rev 18023)
@@ -553,6 +553,7 @@
name varchar(200) default NULL,
href varchar(200) default NULL,
hits int(8) default NULL,
+ comments_locked char(1) NOT NULL default 'n',
PRIMARY KEY (objectId),
KEY (type, objectId),
KEY (itemId, type)
@@ -699,6 +700,7 @@
comment_rating tinyint(2) default NULL,
archived char(1) default NULL,
approved char(1) NOT NULL default 'y',
+ locked char(1) NOT NULL default 'n',
PRIMARY KEY (threadId),
UNIQUE KEY no_repeats (parentId, userName(40), title(100), commentDate, message_id(40), in_reply_to(40)),
KEY title (title),
Modified: trunk/db/tiki-3.0-mysqli.sql
===================================================================
--- trunk/db/tiki-3.0-mysqli.sql 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/tiki-3.0-mysqli.sql 2009-04-15 23:29:36 UTC (rev 18023)
@@ -553,6 +553,7 @@
name varchar(200) default NULL,
href varchar(200) default NULL,
hits int(8) default NULL,
+ comments_locked char(1) NOT NULL default 'n',
PRIMARY KEY (objectId),
KEY (type, objectId),
KEY (itemId, type)
@@ -699,6 +700,7 @@
comment_rating tinyint(2) default NULL,
archived char(1) default NULL,
approved char(1) NOT NULL default 'y',
+ locked char(1) NOT NULL default 'n',
PRIMARY KEY (threadId),
UNIQUE KEY no_repeats (parentId, userName(40), title(100), commentDate, message_id(40), in_reply_to(40)),
KEY title (title),
Modified: trunk/db/tiki-3.0-oci8.sql
===================================================================
--- trunk/db/tiki-3.0-oci8.sql 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/tiki-3.0-oci8.sql 2009-04-15 23:29:36 UTC (rev 18023)
@@ -762,6 +762,7 @@
"name" varchar(200) default NULL,
"href" varchar(200) default NULL,
"hits" number(8) default NULL,
+ "comments_locked" char(1) default 'n' NOT NULL,
PRIMARY KEY (objectId),
KEY (type, objectId),
KEY (itemId, type)
@@ -962,6 +963,7 @@
"comment_rating" number(2) default NULL,
"archived" char(1) default NULL,
"approved" char(1) default 'y' NOT NULL,
+ "locked" char(1) default 'n' NOT NULL,
PRIMARY KEY (threadId)
) ENGINE=MyISAM ;
Modified: trunk/db/tiki-3.0-pgsql.sql
===================================================================
--- trunk/db/tiki-3.0-pgsql.sql 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/tiki-3.0-pgsql.sql 2009-04-15 23:29:36 UTC (rev 18023)
@@ -620,6 +620,7 @@
"name" varchar(200) default NULL,
"href" varchar(200) default NULL,
"hits" integer default NULL,
+ "comments_locked" char(1) NOT NULL default 'n',
PRIMARY KEY ("objectId"),
KEY (type, objectId),
KEY (itemId, type)
@@ -790,6 +791,7 @@
"comment_rating" smallint default NULL,
"archived" char(1) default NULL,
"approved" char(1) NOT NULL default 'y',
+ "locked" char(1) NOT NULL default 'n',
PRIMARY KEY ("threadId")
) ENGINE=MyISAM ;
Modified: trunk/db/tiki-3.0-sqlite.sql
===================================================================
--- trunk/db/tiki-3.0-sqlite.sql 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/tiki-3.0-sqlite.sql 2009-04-15 23:29:36 UTC (rev 18023)
@@ -624,6 +624,7 @@
"name" varchar(200) default NULL,
"href" varchar(200) default NULL,
"hits" integer default NULL,
+ "comments_locked" char(1) NOT NULL default 'n',
PRIMARY KEY (objectId),
KEY (type, objectId),
KEY (itemId, type)
@@ -794,6 +795,7 @@
"comment_rating" smallint default NULL,
"archived" char(1) default NULL,
"approved" char(1) NOT NULL default 'y',
+ "locked" char(1) NOT NULL default 'n',
PRIMARY KEY (threadId)
) ENGINE=MyISAM ;
Modified: trunk/db/tiki-3.0-sybase.sql
===================================================================
--- trunk/db/tiki-3.0-sybase.sql 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/db/tiki-3.0-sybase.sql 2009-04-15 23:29:36 UTC (rev 18023)
@@ -797,6 +797,7 @@
"name" varchar(200) default NULL NULL,
"href" varchar(200) default NULL NULL,
"hits" numeric(8,0) default NULL NULL,
+ "comments_locked" char(1) default 'n' NOT NULL,
PRIMARY KEY (objectId),
KEY (type, objectId),
KEY (itemId, type)
@@ -1015,6 +1016,7 @@
"comment_rating" numeric(2,0) default NULL NULL,
"archived" char(1) default NULL NULL,
"approved" char(1) default 'y' NOT NULL,
+ "locked" char(1) default 'n' NOT NULL,
PRIMARY KEY (threadId)
) ENGINE=MyISAM
go
Modified: trunk/doc/devtools/release.php
===================================================================
--- trunk/doc/devtools/release.php 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/doc/devtools/release.php 2009-04-15 23:29:36 UTC (rev 18023)
@@ -6,7 +6,7 @@
require_once TOOLS . '/svntools.php';
if( $_SERVER['argc'] <= 1 )
- die( "Usage: php doc/devtools/release.php <version-number> [ <subrelease> ]
+ die( "Usage: php doc/devtools/release.php [ --nocheck ] <version-number> [ <subrelease> ]
Examples:
php doc/devtools/release.php 2.0 preRC3
php doc/devtools/release.php 2.0 RC3
@@ -16,7 +16,19 @@
Subreleases begining with pre will not be tagged.
" );
-if( has_uncommited_changes( '.' ) )
+$noCheck = false;
+$argv = array();
+foreach ( $_SERVER['argv'] as $arg ) {
+ if ( $arg == '--nocheck' ) {
+ $noCheck = true;
+ continue;
+ }
+ $argv[] = $arg;
+}
+$_SERVER['argv'] = $argv;
+unset($argv);
+
+if( ! $noCheck && has_uncommited_changes( '.' ) )
die( "Uncommited changes exist in the working folder.\n" );
update_working_copy( '.' );
@@ -29,10 +41,12 @@
if( ! preg_match( "/^\d+\.\d+$/", $version ) )
die( "Version number should be in X.X format.\n" );
-print "\nChecking syntax of all PHP files\n";
-$error_msg = '';
-$dir = '.';
-check_php_syntax( $dir, $error_msg ) or die( $error_msg );
+if ( ! $noCheck ) {
+ print "\nChecking syntax of all PHP files\n";
+ $error_msg = '';
+ $dir = '.';
+ check_php_syntax( $dir, $error_msg ) or die( $error_msg );
+}
$isPre = strpos( $subrelease, 'pre' ) === 0;
Modified: trunk/doc/devtools/tikirelease.sh
===================================================================
--- trunk/doc/devtools/tikirelease.sh 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/doc/devtools/tikirelease.sh 2009-04-15 23:29:36 UTC (rev 18023)
@@ -24,7 +24,8 @@
# - in lib/setup/twversion.class.php
# - increment the version number in the constructor
# - update list of valid releases in getVersions()
-# - commit your changes
+# - commit your changes with this commit message (change $VERSION by the version of the release):
+# [REL] Preparing $VERSION release
#
# 1/ Create and test pre-release packages by executing the script with the release
# version as argument, using the format major.minor.sub
@@ -51,12 +52,10 @@
# mailing-list to launch the announce-speading process
# (Freshmeat, SourceForge and tikiwiki.org (manually for now).
#
-# post/ After release, update templates/tiki-install.tpl and
-# templates/tiki-top_bar.tpl (including templates/styles/*/tiki-top_bar.tpl)
-# to next version number with SVN ex.: 1.9.2 (SVN) . This helps later on to
-# know exactly which files were included or not in a release.
+# post/ After release, update to next version number with SVN ex.: 1.9.2 (SVN) .
+# This helps later on to know exactly which files were included or not in a release.
#
-# - Also, update appropriate tw.o/*.version file with new release version
+# - Also, update appropriate http://tikiwiki.org/stable.version file with new release version
# (or ask the TAG to do this)
#
#
Modified: trunk/installer/installlib.php
===================================================================
--- trunk/installer/installlib.php 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/installer/installlib.php 2009-04-15 23:29:36 UTC (rev 18023)
@@ -25,9 +25,12 @@
$dbversion_tiki = $TWV->getBaseVersion();
$this->runFile( dirname(__FILE__) . '/../db/tiki-'.$dbversion_tiki.'-'.$db_tiki.'.sql' );
+ $this->buildPatchList();
+ $this->buildScriptList();
// Base SQL file contains the distribution tiki patches up to this point
- foreach( $this->patches as $patch ) {
+ $patches = $this->patches;
+ foreach( $patches as $patch ) {
if( preg_match( '/_tiki$/', $patch ) ) {
$this->recordPatch( $patch );
}
@@ -193,6 +196,8 @@
function buildPatchList() // {{{
{
+ $this->patches = array();
+
$files = glob( dirname(__FILE__) . '/schema/*_*.sql' );
foreach( $files as $file ) {
$filename = basename( $file );
@@ -245,6 +250,11 @@
return in_array( $tableName, $list );
} // }}}
+
+ function requiresUpdate() // {{{
+ {
+ return count( $this->patches ) > 0 ;
+ } // }}}
}
?>
Modified: trunk/installer/tiki-installer.php
===================================================================
--- trunk/installer/tiki-installer.php 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/installer/tiki-installer.php 2009-04-15 23:29:36 UTC (rev 18023)
@@ -518,19 +518,20 @@
$smarty->assign('lang', $language);
// Tiki Database schema version
-$tiki_version = '4.0';
-$smarty->assign('tiki_version', $tiki_version);
-$smarty->assign('tiki_version_name', $tiki_version . ' BETA2');
+include_once ('lib/setup/twversion.class.php');
+$TWV = new TWVersion();
+$smarty->assign('tiki_version_name', preg_replace('/^(\d+\.\d+)([^\d])/', '\1 \2', $TWV->version));
+unset($TWV);
// Available DB Servers
$dbservers = array();
-if ( function_exists('mysqli_connect') ) $dbservers['mysqli'] = 'MySQL Improved (mysqli). Requires MySQL 4.1+';
-if ( function_exists('mysql_connect') ) $dbservers['mysql'] = 'MySQL classic (mysql)';
-if ( function_exists('pg_connect') ) $dbservers['pgsql'] = 'PostgeSQL 7.2+';
-if ( function_exists('oci_connect') ) $dbservers['oci8'] = 'Oracle';
-if ( function_exists('sybase_connect') ) $dbservers['sybase'] = 'Sybase';
-if ( function_exists('sqlite_open') ) $dbservers['sqlite'] = 'SQLLite';
-if ( function_exists('mssql_connect') ) $dbservers['mssql'] = 'MSSQL';
+if ( function_exists('mysqli_connect') ) $dbservers['mysqli'] = tra('MySQL Improved (mysqli). Requires MySQL 4.1+');
+if ( function_exists('mysql_connect') ) $dbservers['mysql'] = tra('MySQL classic (mysql)');
+if ( function_exists('pg_connect') ) $dbservers['pgsql'] = tra('PostgeSQL 7.2+');
+if ( function_exists('oci_connect') ) $dbservers['oci8'] = tra('Oracle');
+if ( function_exists('sybase_connect') ) $dbservers['sybase'] = tra('Sybase');
+if ( function_exists('sqlite_open') ) $dbservers['sqlite'] = tra('SQLLite');
+if ( function_exists('mssql_connect') ) $dbservers['mssql'] = tra('MSSQL');
$smarty->assign_by_ref('dbservers', $dbservers);
$errors = '';
@@ -606,7 +607,7 @@
$dbcon = false;
$smarty->assign('dbcon', 'n');
} else {
- $dbTiki = &ADONewConnection($db_tiki);
+ $dbTiki = ADONewConnection($db_tiki);
if (!$dbTiki->Connect($host_tiki, $user_tiki, $pass_tiki, $dbs_tiki)) {
$dbcon = false;
Modified: trunk/lang/ar/language.php
===================================================================
--- trunk/lang/ar/language.php 2009-04-15 22:29:47 UTC (rev 18022)
+++ trunk/lang/ar/language.php 2009-04-15 23:29:36 UTC (rev 18023)
@@ -173,6 +173,11 @@
"Proxy Host" => "Proxy اسم/عنوان",
"EMail notifications" => "إخطارات البريد الإلكترونيّ",
"You can not download files" => "عذراً. لا يمكنك تحميل ملفات",
+"Show Categories" => "اظهر التصنيفات",
+"Hide Categories" => "اخفي التصنيفات",
+"Show Category Path" => "عرض مسار الفئة",
+"Show Babelfish Translation URLs" => " Babelfish إظهار روابط الترجمة",
+"SearchStats" => "إحصائيات البحث",
// ### end of unused words
// ### start of untranslated words
@@ -205,8 +210,6 @@
// "Locked by" => "Locked by",
// "Explorer" => "Explorer",
// "Path" => "Path",
-// "The text in RED is" => "The text in RED is",
-// "character(s) too long - please edit it" => "character(s) too long - please edit it",
// "Afghanistan" => "Afghanistan",
// "Aland Islands" => "Aland Islands",
// "Albania" => "Albania",
@@ -646,6 +649,9 @@
// "You have to enter a title and text" => "You have to enter a title and text",
// "Invalid Email" => "Invalid Email",
// "Your message has been queued for approval, the message will be posted after a moderator approves it" => "Your message has been queued for approval, the message will be posted after a moderator approves it",
+// "This forum is locked" => "This forum is locked",
+// "This thread is locked" => "This thread is locked",
+// "Those comments are locked" => "Those comments are locked",
// "Foo" => "Foo",
// "Sample plugin" => "Sample plugin",
// "Face" => "Face",
@@ -759,6 +765,7 @@
// "Tracker item" => "Tracker item",
// "Simple" => "Simple",
// "Advanced" => "Advanced",
+// "<!-- jq smarty plugin inactive: feature_jquery off -->" => "<!-- jq smarty plugin inactive: feature_jquery off -->",
// "Fast Next" => "Fast Next",
// "Fast Prev" => "Fast Prev",
// "Prev" => "Prev",
@@ -772,6 +779,7 @@
// "Admin Feature" => "Admin Feature",
// "Hide" => "Hide",
// "The text is" => "The text is",
+// "character(s) too long - please edit it" => "character(s) too long - please edit it",
// "Date Selector" => "Date Selector",
// "phplayers are not available on this site" => "phplayers are not available on this site",
// "Select All" => "Select All",
@@ -847,6 +855,7 @@
// "Item" => "Item",
// "Item creation" => "Item creation",
// "Tracker was modified at " => "Tracker was modified at ",
+// "View the tracker item at" => "View the tracker item at",
// "Field is not numeric" => "Field is not numeric",
// "Field is not a link to mp3 in the gallery" => "Field is not a link to mp3 in the gallery",
// "Field is not a link to FLV in the gallery" => "Field is not a link to FLV in the gallery",
@@ -856,54 +865,54 @@
// "prepend" => "prepend",
// "append" => "append",
// "max" => "max",
-// "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a one-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append,max</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible length of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a one-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append,max</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible length of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a one-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append,max</strong>\n\t\t\t\t<dt>Example: 0,80,\$,,80\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible length of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a one-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append,max</strong>\n\t\t\t\t<dt>Example: 0,80,\$,,80\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible length of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
// "textarea" => "textarea",
-// "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a multi-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>quicktags,width,height,max,listmax,wordmax</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[quicktags]</strong> enables quicktags if a 1 is specified;\n\t\t\t\t<dd><strong>[width]</strong> is the width of the box, in chars;\n\t\t\t\t<dd><strong>[height]</strong> is the number of visible lines in the box;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd><strong>[listmax]</strong> is the maximum number of characters that are displayed in list mode;\n\t\t\t\t<dd><strong>[wordmax]</strong> will alert if word count exceeded with a positive number (1+) or display a word count with a negative number (-1);\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a multi-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>quicktags,width,height,max,listmax,wordmax</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[quicktags]</strong> enables quicktags if a 1 is specified;\n\t\t\t\t<dd><strong>[width]</strong> is the width of the box, in chars;\n\t\t\t\t<dd><strong>[height]</strong> is the number of visible lines in the box;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd><strong>[listmax]</strong> is the maximum number of characters that are displayed in list mode;\n\t\t\t\t<dd><strong>[wordmax]</strong> will alert if word count exceeded with a positive number (1+) or display a word count with a negative number (-1);\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a multi-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>quicktags,width,height,max,listmax,wordmax</strong>\n\t\t\t\t<dt>Example: 0,80,5,30,200\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[quicktags]</strong> enables quicktags if a 1 is specified;\n\t\t\t\t<dd><strong>[width]</strong> is the width of the box, in chars;\n\t\t\t\t<dd><strong>[height]</strong> is the number of visible lines in the box;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd><strong>[listmax]</strong> is the maximum number of characters that are displayed in list mode;\n\t\t\t\t<dd><strong>[wordmax]</strong> will alert if word count exceeded with a positive number (1+) or display a word count with a negative number (-1);\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows alphanumeric text input in a multi-line field of arbitrary size.\n\t\t\t\t<dt>Usage: <strong>quicktags,width,height,max,listmax,wordmax</strong>\n\t\t\t\t<dt>Example: 0,80,5,30,200\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[quicktags]</strong> enables quicktags if a 1 is specified;\n\t\t\t\t<dd><strong>[width]</strong> is the width of the box, in chars;\n\t\t\t\t<dd><strong>[height]</strong> is the number of visible lines in the box;\n\t\t\t\t<dd><strong>[max]</strong> is the maximum number of characters that can be saved;\n\t\t\t\t<dd><strong>[listmax]</strong> is the maximum number of characters that are displayed in list mode;\n\t\t\t\t<dd><strong>[wordmax]</strong> will alert if word count exceeded with a positive number (1+) or display a word count with a negative number (-1);\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
// "checkbox" => "checkbox",
-// "<dl>\n\t\t\t\t<dt>Function: Provides a checkbox field for yes/no, on/off input.\n\t\t\t\t<dt>Usage: <strong>samerow</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field on the same row if a 1 is specified.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a checkbox field for yes/no, on/off input.\n\t\t\t\t<dt>Usage: <strong>samerow</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field on the same row if a 1 is specified.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Provides a checkbox field for yes/no, on/off input.\n\t\t\t\t<dt>Usage: <strong>samerow</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field on the same row if a 1 is specified.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a checkbox field for yes/no, on/off input.\n\t\t\t\t<dt>Usage: <strong>samerow</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field on the same row if a 1 is specified.\n\t\t\t\t</dl>",
// "numeric field" => "numeric field",
-// "<dl>\n\t\t\t\t<dt>Function: Provides a one-line field for numeric input only. Prepend or append values may be alphanumeric.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible size of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a one-line field for numeric input only. Prepend or append values may be alphanumeric.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible size of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Provides a one-line field for numeric input only. Prepend or append values may be alphanumeric.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append</strong>\n\t\t\t\t<dt>Example: 0,60,,hours\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible size of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a one-line field for numeric input only. Prepend or append values may be alphanumeric.\n\t\t\t\t<dt>Usage: <strong>samerow,size,prepend,append</strong>\n\t\t\t\t<dt>Example: 0,60,,hours\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[samerow]</strong> will display the next field or checkbox in the same row if a 1 is specified;\n\t\t\t\t<dd><strong>[size]</strong> is the visible size of the field in characters;\n\t\t\t\t<dd><strong>[prepend]</strong> is text that will be displayed before the field;\n\t\t\t\t<dd><strong>[append]</strong> is text that will be displayed just after the field;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
// "drop down" => "drop down",
-// "<dl>\n\t\t\t\t<dt>Function: Allows users to select only from a specified set of options in a drop-down bar.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows users to select only from a specified set of options in a drop-down bar.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows users to select only from a specified set of options in a drop-down bar.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Example: yes,no\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows users to select only from a specified set of options in a drop-down bar.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Example: yes,no\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>",
// "drop down with other textfield" => "drop down with other textfield",
-// "<dl>\n\t\t\t\t<dt>Function: Allows users to select from a specified set of options in a drop-down bar, or provide an alternate selection in a one-line text field.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows users to select from a specified set of options in a drop-down bar, or provide an alternate selection in a one-line text field.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows users to select from a specified set of options in a drop-down bar, or provide an alternate selection in a one-line text field.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Example: yes,no\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows users to select from a specified set of options in a drop-down bar, or provide an alternate selection in a one-line text field.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Example: yes,no\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list_of_items]</strong> is the list of all values you want in the drop-down, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear once in the list as the default selection.\n\t\t\t\t</dl>",
// "radio buttons" => "radio buttons",
-// "<dl>\n\t\t\t\t<dt>Function: Provides a multiple-choice-style set of options from which a user may only choose one.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list of items]</strong> is the list of all values you want in the set, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear as the one selected.\n\t\t\t\t<dd>If first option is <br>, options will be separated with a carriaage return\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a multiple-choice-style set of options from which a user may only choose one.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list of items]</strong> is the list of all values you want in the set, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear as the one selected.\n\t\t\t\t<dd>If first option is <br>, options will be separated with a carriaage return\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Provides a multiple-choice-style set of options from which a user may only choose one.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Example: yes,no\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list of items]</strong> is the list of all values you want in the set, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear as the one selected.\n\t\t\t\t<dd>If first option is <br>, options will be separated with a carriaage return\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a multiple-choice-style set of options from which a user may only choose one.\n\t\t\t\t<dt>Usage: <strong>list_of_items</strong>\n\t\t\t\t<dt>Example: yes,no\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[list of items]</strong> is the list of all values you want in the set, separated by commas;\n\t\t\t\t<dd>if you wish to specify a default value other than the first item, enter the value twice, consecutively, and it will appear as the one selected.\n\t\t\t\t<dd>If first option is <br>, options will be separated with a carriaage return\n\t\t\t\t</dl>",
// "user selector" => "user selector",
-// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usernames.\n\t\t\t\t<dt>Usage: <strong>auto-assign,email_notify</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1, or will set the selection to the user who last modified the item if set to 2, or will give the choice between all the users for other values;\n\t\t\t\t<dd><strong>[email_notify]</strong> will send an email to the assigned user when the item is saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usernames.\n\t\t\t\t<dt>Usage: <strong>auto-assign,email_notify</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1, or will set the selection to the user who last modified the item if set to 2, or will give the choice between all the users for other values;\n\t\t\t\t<dd><strong>[email_notify]</strong> will send an email to the assigned user when the item is saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usernames.\n\t\t\t\t<dt>Usage: <strong>auto-assign,email_notify</strong>\n\t\t\t\t<dt>Example: 1,1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1, or will set the selection to the user who last modified the item if set to 2, or will give the choice between all the users for other values;\n\t\t\t\t<dd><strong>[email_notify]</strong> will send an email to the assigned user when the item is saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usernames.\n\t\t\t\t<dt>Usage: <strong>auto-assign,email_notify</strong>\n\t\t\t\t<dt>Example: 1,1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1, or will set the selection to the user who last modified the item if set to 2, or will give the choice between all the users for other values;\n\t\t\t\t<dd><strong>[email_notify]</strong> will send an email to the assigned user when the item is saved;\n\t\t\t\t<dd>multiple options must appear in the order specified, separated by commas.\n\t\t\t\t</dl>",
// "group selector" => "group selector",
-// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usergroups.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the field to the usergroup of the creator if set to 1, or will set the selection to the group of the user who last modified the item if set to 2, or will give the choice between all the groups for other values;\n\t\t\t\t<dd>if the user does not have a default group set, the first group the user belongs to will be chosen, otherwise Registered group will be used.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usergroups.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the field to the usergroup of the creator if set to 1, or will set the selection to the group of the user who last modified the item if set to 2, or will give the choice between all the groups for other values;\n\t\t\t\t<dd>if the user does not have a default group set, the first group the user belongs to will be chosen, otherwise Registered group will be used.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usergroups.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the field to the usergroup of the creator if set to 1, or will set the selection to the group of the user who last modified the item if set to 2, or will give the choice between all the groups for other values;\n\t\t\t\t<dd>if the user does not have a default group set, the first group the user belongs to will be chosen, otherwise Registered group will be used.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of usergroups.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the field to the usergroup of the creator if set to 1, or will set the selection to the group of the user who last modified the item if set to 2, or will give the choice between all the groups for other values;\n\t\t\t\t<dd>if the user does not have a default group set, the first group the user belongs to will be chosen, otherwise Registered group will be used.\n\t\t\t\t</dl>",
// "ip selector" => "ip selector",
-// "<dl>\n\t\t\t\t<dt>Function: Provides a field for entering an IP address.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-populate the field with the IP address of the user who created the item if set to 1, or will set the field to the IP of the user who last modified the item if set to 2, or will be a free IP for other values.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a field for entering an IP address.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-populate the field with the IP address of the user who created the item if set to 1, or will set the field to the IP of the user who last modified the item if set to 2, or will be a free IP for other values.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Provides a field for entering an IP address.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-populate the field with the IP address of the user who created the item if set to 1, or will set the field to the IP of the user who last modified the item if set to 2, or will be a free IP for other values.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Provides a field for entering an IP address.\n\t\t\t\t<dt>Usage: <strong>auto-assign</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-populate the field with the IP address of the user who created the item if set to 1, or will set the field to the IP of the user who last modified the item if set to 2, or will be a free IP for other values.\n\t\t\t\t</dl>",
// "page selector" => "page selector",
-// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from the list of pages.\n\t\t\t\t<dt>Usage: <strong>auto-assign, size, create</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1\n\t\t\t\t<dd><strong>[size]</strong> is the visible input length of the field in characters (<=0 not limited);\n\t\t\t\t<dd><strong>[create]</strong>: will create the page if not exits copy of the page with name value of this param.which pagename is the value of this param\n\t\t\t\t<dd>\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from the list of pages.\n\t\t\t\t<dt>Usage: <strong>auto-assign, size, create</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1\n\t\t\t\t<dd><strong>[size]</strong> is the visible input length of the field in characters (<=0 not limited);\n\t\t\t\t<dd><strong>[create]</strong>: will create the page if not exits copy of the page with name value of this param.which pagename is the value of this param\n\t\t\t\t<dd>\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from the list of pages.\n\t\t\t\t<dt>Usage: <strong>auto-assign, size, create</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1\n\t\t\t\t<dd><strong>[size]</strong> is the visible input length of the field in characters (<=0 not limited);\n\t\t\t\t<dd><strong>[create]</strong>: will create the page if not exits copy of the page with name value of this param.which pagename is the value of this param\n\t\t\t\t<dd>\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from the list of pages.\n\t\t\t\t<dt>Usage: <strong>auto-assign, size, create</strong>\n\t\t\t\t<dt>Example: 1\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[auto-assign]</strong> will auto-assign the creator of the item if set to 1\n\t\t\t\t<dd><strong>[size]</strong> is the visible input length of the field in characters (<=0 not limited);\n\t\t\t\t<dd><strong>[create]</strong>: will create the page if not exits copy of the page with name value of this param.which pagename is the value of this param\n\t\t\t\t<dd>\n\t\t\t\t</dl>",
// "country selector" => "country selector",
-// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of countries.\n\t\t\t\t<dt>Usage: <strong>name_flag,sort</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[name_flag]</strong> default is 0 and will display both the country name and its flag, 1 will display only the country name, while 2 will show only the country flag;\n\t\t\t\t<dd><strong>[sortorder]</strong> specifies the order the country list should be displayed in, where 0 is the default and sorts according to the translated name, and 1 sorts according to the english name;\n\t\t\t\t<dd>if the country names are translated and option 1 is selected for the sort order, the countries will still appear translated, but will merely be in english order.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of countries.\n\t\t\t\t<dt>Usage: <strong>name_flag,sort</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[name_flag]</strong> default is 0 and will display both the country name and its flag, 1 will display only the country name, while 2 will show only the country flag;\n\t\t\t\t<dd><strong>[sortorder]</strong> specifies the order the country list should be displayed in, where 0 is the default and sorts according to the translated name, and 1 sorts according to the english name;\n\t\t\t\t<dd>if the country names are translated and option 1 is selected for the sort order, the countries will still appear translated, but will merely be in english order.\n\t\t\t\t</dl>",
+// "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of countries.\n\t\t\t\t<dt>Usage: <strong>name_flag,sort</strong>\n\t\t\t\t<dt>Example: 1,0\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[name_flag]</strong> default is 0 and will display both the country name and its flag, 1 will display only the country name, while 2 will show only the country flag;\n\t\t\t\t<dd><strong>[sortorder]</strong> specifies the order the country list should be displayed in, where 0 is the default and sorts according to the translated name, and 1 sorts according to the english name;\n\t\t\t\t<dd>if the country names are translated and option 1 is selected for the sort order, the countries will still appear translated, but will merely be in english order.\n\t\t\t\t</dl>" => "<dl>\n\t\t\t\t<dt>Function: Allows a selection from a specified list of countries.\n\t\t\t\t<dt>Usage: <strong>name_flag,sort</strong>\n\t\t\t\t<dt>Example: 1,0\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[name_flag]</strong> default is 0 and will display both the country name and its flag, 1 will display only the country name, while 2 will show only the country flag;\n\t\t\t\t<dd><strong>[sortorder]</strong> specifies the order the country list should be displayed in, where 0 is the default and sorts according to the translated name, and 1 sorts according to the english name;\n\t\t\t\t<dd>if the country names are translated and option 1 is selected for the sort order, the countries will still appear translated, but will merely be in english order.\n\t\t\t\t</dl>",
// "date and time" => "date and time",
-// "<dl>\n\t\t\t\t<dt>Function: Provides drop-down options to accurately select a date and/or time.\n\t\t\t\t<dt>Usage: <strong>datetime,startyear,endyear,blankdate</strong>\n\t\t\t\t<dt>Description:\n\t\t\t\t<dd><strong>[datetime]</strong> will only allow a date to be selected if set to \"d\", and allows a full date and time selection if set to \"dt\", defaulting to \"dt\";\n\t\t\t\t<dd><strong>[startyear]</strong> allows you to specify a custom first year in the date range (eg. 1987), default is current year;\n\t\t\t\t<dd><strong>[endyear]</strong> allows you to specify a custom end year in the date range (eg. 2020), default is 4 years from now;\n\t\t\t\t<dd><strong>[blankdate]</strong> when set to \"blan...
[truncated message content] |