From: <jon...@us...> - 2009-08-27 12:03:44
|
Revision: 21113 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21113&view=rev Author: jonnybradley Date: 2009-08-27 12:03:15 +0000 (Thu, 27 Aug 2009) Log Message: ----------- [MRG] Automatic merge, trunk 21021 to 21110 Modified Paths: -------------- branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql branches/experimental/kaltura_integration_two/db/tiki.sql branches/experimental/kaltura_integration_two/freetag_list.php branches/experimental/kaltura_integration_two/lang/ar/language.php branches/experimental/kaltura_integration_two/lang/ca/language.php branches/experimental/kaltura_integration_two/lang/cn/language.php branches/experimental/kaltura_integration_two/lang/cs/language.php branches/experimental/kaltura_integration_two/lang/da/language.php branches/experimental/kaltura_integration_two/lang/de/language.php branches/experimental/kaltura_integration_two/lang/el/language.php branches/experimental/kaltura_integration_two/lang/en/language.php branches/experimental/kaltura_integration_two/lang/en-uk/language.php branches/experimental/kaltura_integration_two/lang/es/language.php branches/experimental/kaltura_integration_two/lang/fa/language.php branches/experimental/kaltura_integration_two/lang/fi/language.php branches/experimental/kaltura_integration_two/lang/fj/language.php branches/experimental/kaltura_integration_two/lang/fr/language.php branches/experimental/kaltura_integration_two/lang/gl/language.php branches/experimental/kaltura_integration_two/lang/he/language.php branches/experimental/kaltura_integration_two/lang/hr/language.php branches/experimental/kaltura_integration_two/lang/hu/language.php branches/experimental/kaltura_integration_two/lang/it/language.php branches/experimental/kaltura_integration_two/lang/ja/language.php branches/experimental/kaltura_integration_two/lang/ko/language.php branches/experimental/kaltura_integration_two/lang/nl/language.php branches/experimental/kaltura_integration_two/lang/no/language.php branches/experimental/kaltura_integration_two/lang/pl/language.php branches/experimental/kaltura_integration_two/lang/pt/language.php branches/experimental/kaltura_integration_two/lang/pt-br/language.php branches/experimental/kaltura_integration_two/lang/ru/language.php branches/experimental/kaltura_integration_two/lang/sb/language.php branches/experimental/kaltura_integration_two/lang/sk/language.php branches/experimental/kaltura_integration_two/lang/sl/language.php branches/experimental/kaltura_integration_two/lang/sr/language.php branches/experimental/kaltura_integration_two/lang/sr-latn/language.php branches/experimental/kaltura_integration_two/lang/sv/language.php branches/experimental/kaltura_integration_two/lang/tv/language.php branches/experimental/kaltura_integration_two/lang/tw/language.php branches/experimental/kaltura_integration_two/lang/uk/language.php branches/experimental/kaltura_integration_two/lib/categories/categlib.php branches/experimental/kaltura_integration_two/lib/commentslib.php branches/experimental/kaltura_integration_two/lib/directory/dirlib.php branches/experimental/kaltura_integration_two/lib/jquery_tiki/tiki-jquery.js branches/experimental/kaltura_integration_two/lib/modules/modlib.php branches/experimental/kaltura_integration_two/lib/prefs/feature.php branches/experimental/kaltura_integration_two/lib/setup/prefs.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/block.popup_link.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/block.tab.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/block.tabset.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/block.tikimodule.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/function.listfilter.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/function.treetable.php branches/experimental/kaltura_integration_two/lib/smarty_tiki/modifier.duration_short.php branches/experimental/kaltura_integration_two/lib/tikilib.php branches/experimental/kaltura_integration_two/lib/trackers/trackerlib.php branches/experimental/kaltura_integration_two/lib/userslib.php branches/experimental/kaltura_integration_two/lib/webmail/tikimaillib.php branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_tracker.php branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_trackerstat.php branches/experimental/kaltura_integration_two/modules/mod-func-categories.php branches/experimental/kaltura_integration_two/modules/mod-minichat.php branches/experimental/kaltura_integration_two/setup_smarty.php branches/experimental/kaltura_integration_two/styles/layout/layout.css branches/experimental/kaltura_integration_two/templates/freetag.tpl branches/experimental/kaltura_integration_two/templates/header.tpl branches/experimental/kaltura_integration_two/templates/header_jquery.tpl branches/experimental/kaltura_integration_two/templates/mail/user_watch_calendar.tpl branches/experimental/kaltura_integration_two/templates/mail/user_watch_image_gallery_upload.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-change_category.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-directory_stats.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-featured_links.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-file_galleries.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-forums_best_voted_topics.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-forums_last_posts.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-forums_most_commented_forums.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-forums_most_read_topics.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-forums_most_visited_forums.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-freetag.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-logged_users.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-menupage.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-minichat.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-online_users.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-quick_edit.tpl branches/experimental/kaltura_integration_two/templates/modules/mod-switch_theme.tpl branches/experimental/kaltura_integration_two/templates/tiki-admin-include-features.tpl branches/experimental/kaltura_integration_two/templates/tiki-admin.tpl branches/experimental/kaltura_integration_two/templates/tiki-admin_forums.tpl branches/experimental/kaltura_integration_two/templates/tiki-admin_links.tpl branches/experimental/kaltura_integration_two/templates/tiki-admin_modules.tpl branches/experimental/kaltura_integration_two/templates/tiki-admingroups.tpl branches/experimental/kaltura_integration_two/templates/tiki-batch_upload_files.tpl branches/experimental/kaltura_integration_two/templates/tiki-directory_add_site.tpl branches/experimental/kaltura_integration_two/templates/tiki-directory_admin_categories.tpl branches/experimental/kaltura_integration_two/templates/tiki-directory_admin_sites.tpl branches/experimental/kaltura_integration_two/templates/tiki-directory_browse.tpl branches/experimental/kaltura_integration_two/templates/tiki-forums.tpl branches/experimental/kaltura_integration_two/templates/tiki-install.tpl branches/experimental/kaltura_integration_two/templates/tiki-my-workspaces.tpl branches/experimental/kaltura_integration_two/templates/tiki-objectpermissions.tpl branches/experimental/kaltura_integration_two/templates/tiki-view_forum.tpl branches/experimental/kaltura_integration_two/templates/tiki-view_forum_thread.tpl branches/experimental/kaltura_integration_two/templates/tiki-workspaces-index.tpl branches/experimental/kaltura_integration_two/templates/tracker_item_field_input.tpl branches/experimental/kaltura_integration_two/templates/tracker_item_field_value.tpl branches/experimental/kaltura_integration_two/templates/wiki-plugins/wikiplugin_stat.tpl branches/experimental/kaltura_integration_two/tiki-admin_include_features.php branches/experimental/kaltura_integration_two/tiki-admin_modules.php branches/experimental/kaltura_integration_two/tiki-admingroups.php branches/experimental/kaltura_integration_two/tiki-listpages.php branches/experimental/kaltura_integration_two/tiki-login.php branches/experimental/kaltura_integration_two/tiki-objectpermissions.php branches/experimental/kaltura_integration_two/tiki-view_blog.php branches/experimental/kaltura_integration_two/tiki-view_tracker.php branches/experimental/kaltura_integration_two/tiki-view_tracker_item.php branches/experimental/kaltura_integration_two/tiki-workspaces-index.php Added Paths: ----------- branches/experimental/kaltura_integration_two/installer/schema/20090806_menu_list_trackers_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090826_group_expiration_tiki.sql branches/experimental/kaltura_integration_two/modules/mod-func-change_category.php branches/experimental/kaltura_integration_two/modules/mod-func-directory_stats.php branches/experimental/kaltura_integration_two/modules/mod-func-featured_links.php branches/experimental/kaltura_integration_two/modules/mod-func-file_galleries.php branches/experimental/kaltura_integration_two/modules/mod-func-forums_best_voted_topics.php branches/experimental/kaltura_integration_two/modules/mod-func-forums_last_posts.php branches/experimental/kaltura_integration_two/modules/mod-func-forums_most_commented_forums.php branches/experimental/kaltura_integration_two/modules/mod-func-forums_most_read_topics.php branches/experimental/kaltura_integration_two/modules/mod-func-forums_most_visited_forums.php branches/experimental/kaltura_integration_two/modules/mod-func-logged_users.php branches/experimental/kaltura_integration_two/modules/mod-func-menupage.php branches/experimental/kaltura_integration_two/modules/mod-func-online_users.php branches/experimental/kaltura_integration_two/modules/mod-func-quick_edit.php branches/experimental/kaltura_integration_two/modules/mod-func-switch_theme.php branches/experimental/kaltura_integration_two/pics/icons/tick.png branches/experimental/kaltura_integration_two/tests/upgrade_categperm.php Removed Paths: ------------- branches/experimental/kaltura_integration_two/lib/smarty_tiki/function.html_select_date.php branches/experimental/kaltura_integration_two/modules/mod-change_category.php branches/experimental/kaltura_integration_two/modules/mod-directory_stats.php branches/experimental/kaltura_integration_two/modules/mod-featured_links.php branches/experimental/kaltura_integration_two/modules/mod-file_galleries.php branches/experimental/kaltura_integration_two/modules/mod-forums_best_voted_topics.php branches/experimental/kaltura_integration_two/modules/mod-forums_last_posts.php branches/experimental/kaltura_integration_two/modules/mod-forums_most_commented_forums.php branches/experimental/kaltura_integration_two/modules/mod-forums_most_read_topics.php branches/experimental/kaltura_integration_two/modules/mod-forums_most_visited_forums.php branches/experimental/kaltura_integration_two/modules/mod-logged_users.php branches/experimental/kaltura_integration_two/modules/mod-menupage.php branches/experimental/kaltura_integration_two/modules/mod-online_users.php branches/experimental/kaltura_integration_two/modules/mod-quick_edit.php branches/experimental/kaltura_integration_two/modules/mod-switch_theme.php Property Changed: ---------------- branches/experimental/kaltura_integration_two/ branches/experimental/kaltura_integration_two/installer/schema/20081125_tiki_tracker_types_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090513_calendar_priority_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090513_wiki_similar_permission_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090727_category_permissions_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090727_user_votings_index_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090805_kill_newsreader_tiki.sql branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/BilingualAligner.php branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php branches/experimental/kaltura_integration_two/lib/importer/index.php branches/experimental/kaltura_integration_two/lib/importer/tikiimporter.php branches/experimental/kaltura_integration_two/lib/importer/tikiimporter_wiki.php branches/experimental/kaltura_integration_two/lib/importer/tikiimporter_wiki_mediawiki.php branches/experimental/kaltura_integration_two/lib/jquery_tiki/ branches/experimental/kaltura_integration_two/lib/search/searchlib-mysql.php branches/experimental/kaltura_integration_two/lib/search/searchlib-tiki.php branches/experimental/kaltura_integration_two/lib/test/AllTests.php branches/experimental/kaltura_integration_two/lib/test/TikiTestCase.php branches/experimental/kaltura_integration_two/lib/test/core/AllTests.php branches/experimental/kaltura_integration_two/lib/test/core/Category/ branches/experimental/kaltura_integration_two/lib/test/core/DeclFilter/ branches/experimental/kaltura_integration_two/lib/test/core/JitFilter/ branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/ branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/AllTests.php branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php branches/experimental/kaltura_integration_two/lib/test/core/Perms/ branches/experimental/kaltura_integration_two/lib/test/core/TikiFilter/ branches/experimental/kaltura_integration_two/lib/test/core/WikiParser/ branches/experimental/kaltura_integration_two/lib/test/core/bootstrap.php branches/experimental/kaltura_integration_two/lib/test/core/phpunit.xml branches/experimental/kaltura_integration_two/lib/test/importer/AllTests.php branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/ branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/index.php branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/mediawiki_invalid_upload.xml branches/experimental/kaltura_integration_two/lib/test/importer/index.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_test.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_testcase.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_mediawiki_test.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_test.php branches/experimental/kaltura_integration_two/lib/test/index.php branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mediaplayer.php branches/experimental/kaltura_integration_two/pics/icons/announce.png branches/experimental/kaltura_integration_two/pics/icons/announce_new.png branches/experimental/kaltura_integration_two/pics/icons/hot.png branches/experimental/kaltura_integration_two/pics/icons/hot_new.png branches/experimental/kaltura_integration_two/pics/icons/lock_new.png branches/experimental/kaltura_integration_two/pics/icons/page_new.png branches/experimental/kaltura_integration_two/pics/icons/sticky.png branches/experimental/kaltura_integration_two/pics/icons/sticky_new.png branches/experimental/kaltura_integration_two/styles/strasa/options/mono/pics/ branches/experimental/kaltura_integration_two/templates/ branches/experimental/kaltura_integration_two/templates/modules/mod-forums_last_posts.tpl branches/experimental/kaltura_integration_two/tests/test_php_beautifier.php Property changes on: branches/experimental/kaltura_integration_two ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/experimental/declfilter:15787-16031 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /trunk:20962-21021 + /branches/3.0:16998-18916 /branches/experimental/declfilter:15787-16031 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /trunk:20962-21110 Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql =================================================================== --- branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -1450,9 +1450,9 @@ INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Quiz Stats','tiki-quiz_stats.php',760,'feature_quizzes','tiki_p_view_quiz_stats','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Quizzes','tiki-edit_quiz.php',765,'feature_quizzes','tiki_p_admin_quizzes','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','TikiSheet','tiki-sheets.php',780,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List TikiSheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_view_trackers','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Sheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_list_trackers','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_list_trackers','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Trackers','tiki-admin_trackers.php',810,'feature_trackers','tiki_p_admin_trackers','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Surveys','tiki-list_surveys.php',850,'feature_surveys','tiki_p_take_survey','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Surveys','tiki-list_surveys.php',855,'feature_surveys','tiki_p_take_survey','',0); @@ -2708,8 +2708,10 @@ `groupDefCat` int(12) default 0, `groupTheme` varchar(255) default '', `isExternal` char(1) default 'n', + `expireAfter` int(14) default 0, PRIMARY KEY (`id`), - UNIQUE KEY `groupName` (groupName) + UNIQUE KEY `groupName` (groupName), + KEY `expireAfter` (`expireAfter`) ) ENGINE=MyISAM AUTO_INCREMENT=1; DROP TABLE IF EXISTS `users_objectpermissions`; @@ -2989,6 +2991,7 @@ CREATE TABLE `users_usergroups` ( `userId` int(8) NOT NULL default '0', `groupName` varchar(255) NOT NULL default '', + `created` int(14) default NULL, PRIMARY KEY (`userId`,`groupName`(30)) ) ENGINE=MyISAM; Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql =================================================================== --- branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -1450,9 +1450,9 @@ INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Quiz Stats','tiki-quiz_stats.php',760,'feature_quizzes','tiki_p_view_quiz_stats','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Quizzes','tiki-edit_quiz.php',765,'feature_quizzes','tiki_p_admin_quizzes','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','TikiSheet','tiki-sheets.php',780,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List TikiSheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_view_trackers','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Sheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_list_trackers','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_list_trackers','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Trackers','tiki-admin_trackers.php',810,'feature_trackers','tiki_p_admin_trackers','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Surveys','tiki-list_surveys.php',850,'feature_surveys','tiki_p_take_survey','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Surveys','tiki-list_surveys.php',855,'feature_surveys','tiki_p_take_survey','',0); @@ -1533,16 +1533,9 @@ INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Comments','tiki-list_comments.php',1260,'feature_faq_comments','tiki_p_admin','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Contribution','tiki-admin_contribution.php',1265,'feature_contribution','tiki_p_admin_contribution','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Workspaces','tiki-admin.php?page=workspaces',1270,'feature_workspaces','tiki_p_admin','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Workspaces','tiki-admin.php?page=workspaces',1270,'feature_workspaces','tiki_p_admin','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Workspaces','tiki-admin.php?page=workspaces',1270,'feature_workspaces','tiki_p_admin','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Workspaces','tiki-admin.php?page=workspaces',1270,'feature_workspaces','tiki_p_admin','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42, 's', 'Kaltura', 'tiki-list_kaltura_entries.php', 950, 'feature_kaltura', 'tiki_p_admin | tiki_p_admin_kaltura | tiki_p_list_videos', '', 0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42, 'o', 'List Entries', 'tiki-list_kaltura_entries.php', 952, 'feature_kaltura', 'tiki_p_admin | tiki_p_admin_kaltura | tiki_p_list_videos', '', 0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42, 'o', 'Upload Media', 'tiki-kaltura_video.php', 954, 'feature_kaltura', 'tiki_p_admin | tiki_p_admin_kaltura | tiki_p_upload_videos', '', 0); - DROP TABLE IF EXISTS `tiki_menus`; CREATE TABLE `tiki_menus` ( `menuId` int(8) NOT NULL auto_increment, @@ -2708,8 +2701,10 @@ `groupDefCat` int(12) default 0, `groupTheme` varchar(255) default '', `isExternal` char(1) default 'n', + `expireAfter` int(14) default 0, PRIMARY KEY (`id`), - UNIQUE KEY `groupName` (groupName) + UNIQUE KEY `groupName` (groupName), + KEY `expireAfter` (`expireAfter`) ) ENGINE=MyISAM AUTO_INCREMENT=1; DROP TABLE IF EXISTS `users_objectpermissions`; @@ -2975,20 +2970,13 @@ INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_trigger_transition', 'Can trigger the transition between two states', 'admin', 'transition', NULL, 'feature_group_transition,feature_category_transition'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_admin_kaltura', 'Can admin kaltura feature', 'admin', 'kaltura', 'y', 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_upload_videos', 'Can upload video on kaltura server', 'editors', 'kaltura', NULL, 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_edit_videos', 'Can edit information of kaltura entry', 'editors', 'kaltura', NULL, 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_remix_videos', 'Can create kaltura remix video', 'editors', 'kaltura', NULL, 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_delete_videos', 'Can delete kaltura entry', 'editors', 'kaltura', NULL, 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_download_videos', 'Can download kaltura entry', 'registered', 'kaltura', NULL, 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_list_videos', 'Can list kaltura entries', 'basic', 'kaltura', NULL, 'feature_kaltura'); -INSERT INTO `users_permissions` (`permName`, `permDesc`, `level`, `type`, `admin`, `feature_check`) VALUES('tiki_p_view_videos', 'Can view kaltura entry', 'basic', 'kaltura', NULL, 'feature_kaltura'); DROP TABLE IF EXISTS `users_usergroups`; CREATE TABLE `users_usergroups` ( `userId` int(8) NOT NULL default '0', `groupName` varchar(255) NOT NULL default '', + `created` int(14) default NULL, PRIMARY KEY (`userId`,`groupName`(30)) ) ENGINE=MyISAM; @@ -3572,4 +3560,3 @@ KEY `transition_lookup` (`type`, `from`) ) ENGINE=MyISAM; - Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql =================================================================== --- branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -1733,11 +1733,11 @@ INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'s','TikiSheet','tiki-sheets.php',780,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List TikiSheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); +INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List Sheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_list_trackers','',0); -INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_list_trackers','',0); INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Admin Trackers','tiki-admin_trackers.php',810,'feature_trackers','tiki_p_admin_trackers','',0); @@ -3265,9 +3265,11 @@ "groupDefCat" bigint default 0, "groupTheme" varchar(255) default '', "isExternal" char(1) default 'n', + "expireAfter" bigint default 0, PRIMARY KEY ("id"), UNIQUE ("groupName") ); +CREATE INDEX "users_groups_users_groups_expireAfter" ON "users_groups" ("expireAfter"); DROP TABLE IF EXISTS "users_objectpermissions"; @@ -3800,6 +3802,7 @@ CREATE TABLE "users_usergroups" ( "userId" integer NOT NULL default '0', "groupName" varchar(255) NOT NULL default '', + "created" bigint default NULL, PRIMARY KEY ("userId","groupName") ); Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql =================================================================== --- branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -1743,11 +1743,11 @@ INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'s','TikiSheet','tiki-sheets.php',780,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List TikiSheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); +INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List Sheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_list_trackers','',0); -INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_list_trackers','',0); INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Admin Trackers','tiki-admin_trackers.php',810,'feature_trackers','tiki_p_admin_trackers','',0); @@ -3277,8 +3277,10 @@ groupDefCat bigint default 0, groupTheme varchar(255) default '', isExternal char(1) default 'n', + expireAfter bigint default 0, PRIMARY KEY (id), - UNIQUE KEY groupName (groupName) + UNIQUE KEY groupName (groupName), + KEY expireAfter (expireAfter) ) ENGINE=MyISAM; @@ -3812,6 +3814,7 @@ CREATE TABLE users_usergroups ( userId integer NOT NULL default '0', groupName varchar(255) NOT NULL default '', + created bigint default NULL, PRIMARY KEY (userId,groupName(30)) ) ENGINE=MyISAM; Modified: branches/experimental/kaltura_integration_two/db/tiki.sql =================================================================== --- branches/experimental/kaltura_integration_two/db/tiki.sql 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/db/tiki.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -1450,9 +1450,9 @@ INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Quiz Stats','tiki-quiz_stats.php',760,'feature_quizzes','tiki_p_view_quiz_stats','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Quizzes','tiki-edit_quiz.php',765,'feature_quizzes','tiki_p_admin_quizzes','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','TikiSheet','tiki-sheets.php',780,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List TikiSheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_view_trackers','',0); -INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_view_trackers','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Sheets','tiki-sheets.php',782,'feature_sheet','tiki_p_view_sheet','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Trackers','tiki-list_trackers.php',800,'feature_trackers','tiki_p_list_trackers','',0); +INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Trackers','tiki-list_trackers.php',805,'feature_trackers','tiki_p_list_trackers','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Trackers','tiki-admin_trackers.php',810,'feature_trackers','tiki_p_admin_trackers','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Surveys','tiki-list_surveys.php',850,'feature_surveys','tiki_p_take_survey','',0); INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','List Surveys','tiki-list_surveys.php',855,'feature_surveys','tiki_p_take_survey','',0); @@ -2708,8 +2708,10 @@ `groupDefCat` int(12) default 0, `groupTheme` varchar(255) default '', `isExternal` char(1) default 'n', + `expireAfter` int(14) default 0, PRIMARY KEY (`id`), - UNIQUE KEY `groupName` (groupName) + UNIQUE KEY `groupName` (groupName), + KEY `expireAfter` (`expireAfter`) ) ENGINE=MyISAM AUTO_INCREMENT=1; DROP TABLE IF EXISTS `users_objectpermissions`; @@ -2989,6 +2991,7 @@ CREATE TABLE `users_usergroups` ( `userId` int(8) NOT NULL default '0', `groupName` varchar(255) NOT NULL default '', + `created` int(14) default NULL, PRIMARY KEY (`userId`,`groupName`(30)) ) ENGINE=MyISAM; Modified: branches/experimental/kaltura_integration_two/freetag_list.php =================================================================== --- branches/experimental/kaltura_integration_two/freetag_list.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/freetag_list.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -27,7 +27,11 @@ $tagarray = array(); $taglist = ''; for ($i=0; $i<sizeof($tags['data']); $i++) { - $taglist .= $tags['data'][$i]['tag'] . ' '; + if (strstr($tags['data'][$i]['tag'], ' ')) { + $taglist .= '"'.$tags['data'][$i]['tag'] . '" '; + } else { + $taglist .= $tags['data'][$i]['tag'] . ' '; + } $tagarray[] = $tags['data'][$i]['tag']; } Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20081125_tiki_tracker_types_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002 /trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:20049-20460,20962-21021 + /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002 /trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:20049-20460,20962-21110 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090513_calendar_priority_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_calendar_priority_tiki.sql:20049-20460,20962-21021 + /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_calendar_priority_tiki.sql:20049-20460,20962-21110 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090513_wiki_similar_permission_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:20049-20460,20962-21021 + /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:20049-20460,20962-21110 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090727_category_permissions_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/installer/schema/20090727_category_permissions_tiki.sql:20962-21021 + /trunk/installer/schema/20090727_category_permissions_tiki.sql:20962-21110 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090727_user_votings_index_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090727_user_votings_index.php:16998-18916 /branches/experimental/declfilter/installer/schema/20090727_user_votings_index.php:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090727_user_votings_index.php:16728-16731,16999-17002 /trunk/installer/schema/20090727_user_votings_index_tiki.sql:20962-21021 + /branches/3.0/installer/schema/20090727_user_votings_index.php:16998-18916 /branches/experimental/declfilter/installer/schema/20090727_user_votings_index.php:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090727_user_votings_index.php:16728-16731,16999-17002 /trunk/installer/schema/20090727_user_votings_index_tiki.sql:20962-21110 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090805_kill_newsreader_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090805_kill_newsreader.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090805_kill_newsreader.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090805_kill_newsreader.sql:16728-16731,16999-17002 /trunk/installer/schema/20090805_kill_newsreader_tiki.sql:20962-21021 + /branches/3.0/installer/schema/20090805_kill_newsreader.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090805_kill_newsreader.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090805_kill_newsreader.sql:16728-16731,16999-17002 /trunk/installer/schema/20090805_kill_newsreader_tiki.sql:20962-21110 Copied: branches/experimental/kaltura_integration_two/installer/schema/20090806_menu_list_trackers_tiki.sql (from rev 21110, trunk/installer/schema/20090806_menu_list_trackers_tiki.sql) =================================================================== --- branches/experimental/kaltura_integration_two/installer/schema/20090806_menu_list_trackers_tiki.sql (rev 0) +++ branches/experimental/kaltura_integration_two/installer/schema/20090806_menu_list_trackers_tiki.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -0,0 +1 @@ +update `tiki_menu_options` set `perm`='tiki_p_list_trackers' where `url`='tiki-list_trackers.php'; \ No newline at end of file Copied: branches/experimental/kaltura_integration_two/installer/schema/20090826_group_expiration_tiki.sql (from rev 21110, trunk/installer/schema/20090826_group_expiration_tiki.sql) =================================================================== --- branches/experimental/kaltura_integration_two/installer/schema/20090826_group_expiration_tiki.sql (rev 0) +++ branches/experimental/kaltura_integration_two/installer/schema/20090826_group_expiration_tiki.sql 2009-08-27 12:03:15 UTC (rev 21113) @@ -0,0 +1,3 @@ +ALTER TABLE `users_groups` ADD COLUMN `expireAfter` int(14) default 0; +ALTER TABLE `users_usergroups` ADD COLUMN `created` int(14) default NULL; +ALTER TABLE `users_groups` ADD KEY `expireAfter` (`expireAfter`); Modified: branches/experimental/kaltura_integration_two/lang/ar/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/ar/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/ar/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -5275,6 +5275,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Edit Post" => "Edit Post", Modified: branches/experimental/kaltura_integration_two/lang/ca/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/ca/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/ca/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -2593,6 +2593,7 @@ "Remaining:" => "Queda:", "you or someone registered this email address at" => "tu o alguna persona ha registrat aquesta adreça de correu-e a", "Your Tiki information registration" => "El teu registre d'informació de Tiki", +"Your registration" => "El teu registre d'informació de Tiki", "left/right" => "esquerra/dreta", "Unassign module" => "Mòdul no assignat", "home" => "inici", @@ -4488,6 +4489,7 @@ // "eg. from \"misc/screenshots/digicam0001.jpg\" a description \"screenshots\" will be created" => "eg. from \"misc/screenshots/digicam0001.jpg\" a description \"screenshots\" will be created", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Use Wysiwyg Editor" => "Use Wysiwyg Editor", Modified: branches/experimental/kaltura_integration_two/lang/cn/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/cn/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/cn/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -1840,6 +1840,7 @@ "unread private messages" => "未读私人消息", "you or someone registered this email address at" => "你或是某位注册此电子邮件地址的人", "Your Tiki information registration" => "您登记的Tiki信息", +"Your registration" => "您登记的Tiki信息", "left/right" => "左/右", "home" => "主页", "chat" => "聊天", @@ -5501,6 +5502,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Use Wysiwyg Editor" => "Use Wysiwyg Editor", Modified: branches/experimental/kaltura_integration_two/lang/cs/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/cs/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/cs/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -3157,6 +3157,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Use Wysiwyg Editor" => "Use Wysiwyg Editor", Modified: branches/experimental/kaltura_integration_two/lang/da/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/da/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/da/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -1076,6 +1076,7 @@ "UsrMenu" => "UsrMenu", "you or someone registered this email address at" => "du eller en anden registrerede denne email addresse på", "Your Tiki information registration" => "Din Tiki informations registrering", +"Your registration" => "Din Tiki informations registrering", "home" => "startside", "contact us" => "kontakt os", "debugger console" => "debugger konsol", @@ -5036,6 +5037,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Use Wysiwyg Editor" => "Use Wysiwyg Editor", Modified: branches/experimental/kaltura_integration_two/lang/de/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/de/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/de/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -1163,6 +1163,7 @@ "unread private messages" => "ungelesene persönliche Nachrichten", "you or someone registered this email address at" => "Sie oder jemand anderes hat Ihre eMail-Adresse bei", "Your Tiki information registration" => "Ihre Tiki Registrierungsinformationen", +"Your registration" => "Ihre Tiki Registrierungsinformationen", "left/right" => "links/rechts", "Unassign module" => "Modul wegnehmen", "home" => "Hauptseite", @@ -9491,6 +9492,7 @@ "Browse File Gallery" => "Dateiarchiv durchsehen", "Please do not use this feature to upload data into the database." => "Mit dieser Funktion bitte keine Daten in die Datenbank laden.", "available files" => "verfügbare Dateien", +"Available Files" => "verfügbare Dateien", "Select a File Gallery" => "Dateiarchiv auswählen", "Process files" => "Dateien verarbeiten", "Edit Post" => "Eintrag bearbeiten", Modified: branches/experimental/kaltura_integration_two/lang/el/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/el/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/el/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -5190,6 +5190,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Edit Post" => "Edit Post", Modified: branches/experimental/kaltura_integration_two/lang/en/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/en/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/en/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -5438,6 +5438,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Edit Post" => "Edit Post", Modified: branches/experimental/kaltura_integration_two/lang/en-uk/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/en-uk/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/en-uk/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -5440,6 +5440,7 @@ // "Browse File Gallery" => "Browse File Gallery", // "Please do not use this feature to upload data into the database" => "Please do not use this feature to upload data into the database", // "available files" => "available files", +// "Available Files" => "available files", // "Select a File Gallery" => "Select a File Gallery", // "Process files" => "Process files", // "Edit Post" => "Edit Post", Modified: branches/experimental/kaltura_integration_two/lang/es/language.php =================================================================== --- branches/experimental/kaltura_integration_two/lang/es/language.php 2009-08-27 12:02:45 UTC (rev 21112) +++ branches/experimental/kaltura_integration_two/lang/es/language.php 2009-08-27 12:03:15 UTC (rev 21113) @@ -1550,6 +1550,7 @@ "This module requires parameters trackerId and name set" => "Este módulo requiere parámetros trackerId y nombre llenados", "you or someone registered this email address at" => "usted o alguien regitró esta dirección de correo en", "Your Tiki information registration" => "Su información de registro en Tiki", +"Your registration" => "Su registro", "left/right" => "izquierda/derecha", "Unassign module" => "Inhabilitar módulo", "home" => "inicio", @@ -2080,75 +2081,75 @@ "Includes a list of articles within the page" => "Incluye una lista de los artículos dentro de la página", "Articles displayed" => "Artículos mostrados", "The amount of articles to display in the list" => "La cantidad de artículos a mostrar en la lista", -// "Topics expression" => "Topics expression", +//"Topics expression" => "Topics expression", // "Topic ID expression" => "Topic ID expression", // "Type expression" => "Type expression", -// "Category ID" => "Category ID", -// "The ID of the category to list from" => "The ID of the category to list from", -// "The article language to list" => "The article language to list", -// "Sort order" => "Sort order", -// "The column and order of the sort in columnName_asc or columnName_desc format" => "The column and order of the sort in columnName_asc or columnName_desc format", -// "Quiet" => "Quiet", -// "Whether to not report when there are no articles" => "Whether to not report when there are no articles", -// "Title only" => "Title only", -// "Whether to only show the title of the articles" => "Whether to only show the title of the articles", -// "Includes articles listing into a wiki page" => "Includes articles listing into a wiki page", -// "~np~{ARTICLES(max=>3, topic=>topicName, topicId=>id, type=>type, categId=>Category parent ID, lang=>en, sort=>columnName_asc|columnName_desc), quiet=>y|n, titleonly=>y|n}{ARTICLES}~/np~" => "~np~{ARTICLES(max=>3, topic=>topicName, topicId=>id, type=>type, categId=>Category parent ID, lang=>en, sort=>columnName_asc|columnName_desc), quiet=>y|n, titleonly=>y|n}{ARTICLES}~/np~", -// "Bullets" => "Bullets", -// "Inline" => "Inline", -// "Number" => "Number", -// "Show icon" => "Show icon", -// "Gives the name of the attached file to link to" => "Gives the name of the attached file to link to", -// "Same as name" => "Same as name", -// "Gives the name of another page the attached file is on. The file on that page is linked to instead. Only works with wiki pages" => "Gives the name of another page the attached file is on. The file on that page is linked to instead. Only works with wiki pages", -// "Shows the description as the link text instead of the file name" => "Shows the description as the link text instead of the file name", -// "Makes the list of attachments a bulleted list" => "Makes the list of attachments a bulleted list", -// "Says that this file is an image, and should be displayed inline using the img tag" => "Says that this file is an image, and should be displayed inline using the img tag", -// "Puts the stuff between {ATTACH} tags as the link text instead of the file name or description" => "Puts the stuff between {ATTACH} tags as the link text instead of the file name or description", -// "Shows all attachments from the whole wiki" => "Shows all attachments from the whole wiki", -// "Gives the number, in the list of attachments, of the attachment to link to" => "Gives the number, in the list of attachments, of the attachment to link to", -// "Gives the actual id of the attachment to link in. You probably should never use this" => "Gives the actual id of the attachment to link in. You probably should never use this", -// "Puts the number of downloads in the alt comment" => "Puts the number of downloads in the alt comment", -// "Shows a file icon" => "Shows a file icon", -// "The wiki page the avatar will link to" => "The wiki page the avatar will link to", -// "Float" => "Float", -// "left|right" => "left|right", -// "Displays a link that allows to go back in the browser history" => "Displays a link that allows to go back in the browser history", -// "Insert back link on wiki page" => "Insert back link on wiki page", -// "List all pages linking to the specified page" => "List all pages linking to the specified page", -// "The page links will point to. Default value is the current page" => "The page links will point to. Default value is the current page", -// "Displayed information" => "Displayed information", -// "Pipe separated list of fields to display. ex: hits|user" => "Pipe separated list of fields to display. ex: hits|user", -// "Excluded pages" => "Excluded pages", -// "Pipe separated list of pages to be excluded from the listing. ex: HomePage|Sandbox" => "Pipe separated list of pages to be excluded from the listing. ex: HomePage|Sandbox", -// "Include Self" => "Include Self", -// "1|0" => "1|0", -// "No Header" => "No Header", -// "Banner" => "Banner", -// "Insert a banner" => "Insert a banner", -// "Target" => "Target", -// "missing parameter" => "missing parameter", -// "Blog List" => "Blog List", -// "Use BLOGLIST to include posts from a blog" => "Use BLOGLIST to include posts from a blog", -// "Blog ID" => "Blog ID", -// "Numeric value" => "Numeric value", -// "Maximum amount of entries to list" => "Maximum amount of entries to list", -// "Use BLOGLIST to include posts from a blog. Syntax is" => "Use BLOGLIST to include posts from a blog. Syntax is", -// "where Id is t... [truncated message content] |