Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21114] branches/experimental/coe
|
From: <se...@us...> - 2009-08-27 12:22:32
|
Revision: 21114
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21114&view=rev
Author: sept_7
Date: 2009-08-27 12:20:18 +0000 (Thu, 27 Aug 2009)
Log Message:
-----------
[MRG] Automatic merge, trunk 21084 to 21110
Modified Paths:
--------------
branches/experimental/coe/db/tiki-4.0-mysql.sql
branches/experimental/coe/db/tiki-4.0-mysqli.sql
branches/experimental/coe/db/tiki-4.0-pgsql.sql
branches/experimental/coe/db/tiki-4.0-sqlite.sql
branches/experimental/coe/db/tiki.sql
branches/experimental/coe/freetag_list.php
branches/experimental/coe/lib/directory/dirlib.php
branches/experimental/coe/lib/prefs/feature.php
branches/experimental/coe/lib/setup/prefs.php
branches/experimental/coe/lib/smarty_tiki/modifier.duration_short.php
branches/experimental/coe/lib/tikilib.php
branches/experimental/coe/lib/userslib.php
branches/experimental/coe/templates/freetag.tpl
branches/experimental/coe/templates/modules/mod-directory_stats.tpl
branches/experimental/coe/templates/modules/mod-forums_most_commented_forums.tpl
branches/experimental/coe/templates/modules/mod-forums_most_read_topics.tpl
branches/experimental/coe/templates/modules/mod-forums_most_visited_forums.tpl
branches/experimental/coe/templates/modules/mod-freetag.tpl
branches/experimental/coe/templates/modules/mod-online_users.tpl
branches/experimental/coe/templates/modules/mod-quick_edit.tpl
branches/experimental/coe/templates/modules/mod-switch_theme.tpl
branches/experimental/coe/templates/tiki-admin-include-features.tpl
branches/experimental/coe/templates/tiki-admin_modules.tpl
branches/experimental/coe/templates/tiki-admingroups.tpl
branches/experimental/coe/templates/tiki-directory_add_site.tpl
branches/experimental/coe/templates/tiki-directory_admin_categories.tpl
branches/experimental/coe/templates/tiki-directory_admin_sites.tpl
branches/experimental/coe/templates/tiki-directory_browse.tpl
branches/experimental/coe/templates/tiki-my-workspaces.tpl
branches/experimental/coe/templates/tiki-workspaces-index.tpl
branches/experimental/coe/tests/upgrade_categperm.php
branches/experimental/coe/tiki-admin_include_features.php
branches/experimental/coe/tiki-admingroups.php
branches/experimental/coe/tiki-listpages.php
branches/experimental/coe/tiki-login.php
branches/experimental/coe/tiki-objectpermissions.php
branches/experimental/coe/tiki-view_blog.php
branches/experimental/coe/tiki-workspaces-index.php
Added Paths:
-----------
branches/experimental/coe/installer/schema/20090806_menu_list_trackers_tiki.sql
branches/experimental/coe/installer/schema/20090826_group_expiration_tiki.sql
branches/experimental/coe/modules/mod-func-directory_stats.php
branches/experimental/coe/modules/mod-func-forums_most_commented_forums.php
branches/experimental/coe/modules/mod-func-forums_most_read_topics.php
branches/experimental/coe/modules/mod-func-forums_most_visited_forums.php
branches/experimental/coe/modules/mod-func-online_users.php
branches/experimental/coe/modules/mod-func-quick_edit.php
branches/experimental/coe/modules/mod-func-switch_theme.php
Removed Paths:
-------------
branches/experimental/coe/modules/mod-directory_stats.php
branches/experimental/coe/modules/mod-forums_most_commented_forums.php
branches/experimental/coe/modules/mod-forums_most_read_topics.php
branches/experimental/coe/modules/mod-forums_most_visited_forums.php
branches/experimental/coe/modules/mod-online_users.php
branches/experimental/coe/modules/mod-quick_edit.php
branches/experimental/coe/modules/mod-switch_theme.php
Property Changed:
----------------
branches/experimental/coe/
branches/experimental/coe/installer/schema/20081125_tiki_tracker_types_tiki.sql
branches/experimental/coe/installer/schema/20090513_calendar_priority_tiki.sql
branches/experimental/coe/installer/schema/20090513_wiki_similar_permission_tiki.sql
branches/experimental/coe/installer/schema/20090727_category_permissions_tiki.sql
branches/experimental/coe/installer/schema/20090727_user_votings_index_tiki.sql
branches/experimental/coe/installer/schema/20090805_kill_newsreader_tiki.sql
branches/experimental/coe/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
branches/experimental/coe/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
branches/experimental/coe/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
branches/experimental/coe/lib/importer/tikiimporter.php
branches/experimental/coe/lib/importer/tikiimporter_wiki.php
branches/experimental/coe/lib/importer/tikiimporter_wiki_mediawiki.php
branches/experimental/coe/lib/jquery/
branches/experimental/coe/lib/jquery/cluetip/
branches/experimental/coe/lib/jquery/jquery-autocomplete/
branches/experimental/coe/lib/jquery/reflection-jquery/
branches/experimental/coe/lib/jquery/superfish/
branches/experimental/coe/lib/jquery_tiki/
branches/experimental/coe/lib/search/searchlib-mysql.php
branches/experimental/coe/lib/search/searchlib-tiki.php
branches/experimental/coe/lib/wiki-plugins/wikiplugin_mediaplayer.php
branches/experimental/coe/pics/icons/announce.png
branches/experimental/coe/pics/icons/announce_new.png
branches/experimental/coe/pics/icons/hot.png
branches/experimental/coe/pics/icons/hot_new.png
branches/experimental/coe/pics/icons/lock_new.png
branches/experimental/coe/pics/icons/page_new.png
branches/experimental/coe/pics/icons/sticky.png
branches/experimental/coe/pics/icons/sticky_new.png
branches/experimental/coe/styles/strasa/options/mono/pics/
branches/experimental/coe/tests/test_php_beautifier.php
Property changes on: branches/experimental/coe
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0:16998-18916
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/trunk:16626-20428,20611-21084
+ /branches/3.0:16998-18916
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/trunk:16626-20428,20611-21110
Modified: branches/experimental/coe/db/tiki-4.0-mysql.sql
===================================================================
--- branches/experimental/coe/db/tiki-4.0-mysql.sql 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/db/tiki-4.0-mysql.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -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);
@@ -1464,10 +1464,6 @@
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Newsletters','tiki-newsletters.php',900,'feature_newsletters','tiki_p_list_newsletters','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Send Newsletters','tiki-send_newsletters.php',905,'feature_newsletters','tiki_p_send_newsletters','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Newsletters','tiki-admin_newsletters.php',910,'feature_newsletters','tiki_p_admin_newsletters','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Workspaces', 'tiki-workspaces-index.php',920, 'feature_workspaces','','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Workspaces Home', 'tiki-workspaces-index.php',925, 'feature_workspaces','','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','My Workspaces', 'tiki-my-workspaces.php',930, 'feature_workspaces','','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Manage Workspaces', 'tiki-manage-workspaces.php',935, 'feature_workspaces','tiki_p_ws_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_categories','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_banners','',0);
@@ -2705,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`;
@@ -2978,6 +2976,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/coe/db/tiki-4.0-mysqli.sql
===================================================================
--- branches/experimental/coe/db/tiki-4.0-mysqli.sql 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/db/tiki-4.0-mysqli.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -541,7 +541,6 @@
`description` varchar(250) default NULL,
`parentId` int(12) default NULL,
`hits` int(8) default NULL,
- `rootCategId` int(12) default NULL,
PRIMARY KEY (`categId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
@@ -1451,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);
@@ -1465,10 +1464,6 @@
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Newsletters','tiki-newsletters.php',900,'feature_newsletters','tiki_p_list_newsletters','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Send Newsletters','tiki-send_newsletters.php',905,'feature_newsletters','tiki_p_send_newsletters','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Admin Newsletters','tiki-admin_newsletters.php',910,'feature_newsletters','tiki_p_admin_newsletters','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'s','Workspaces', 'tiki-workspaces-index.php',920, 'feature_workspaces','','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Workspaces Home', 'tiki-workspaces-index.php',925, 'feature_workspaces','','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','My Workspaces', 'tiki-my-workspaces.php',930, 'feature_workspaces','','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Manage Workspaces', 'tiki-manage-workspaces.php',935, 'feature_workspaces','tiki_p_ws_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_categories','',0);
INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_banners','',0);
@@ -1538,7 +1533,6 @@
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);
-
@@ -2707,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`;
@@ -2980,6 +2976,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/coe/db/tiki-4.0-pgsql.sql
===================================================================
--- branches/experimental/coe/db/tiki-4.0-pgsql.sql 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/db/tiki-4.0-pgsql.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -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);
@@ -1761,14 +1761,6 @@
INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Admin Newsletters','tiki-admin_newsletters.php',910,'feature_newsletters','tiki_p_admin_newsletters','',0);
-INSERT INTO "tiki_menu_options" ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'s','Workspaces', 'tiki-workspaces-index.php',920, 'feature_workspaces','','',0);
-
-INSERT INTO "tiki_menu_options" ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'o','Workspaces Home', 'tiki-workspaces-index.php',925, 'feature_workspaces','','',0);
-
-INSERT INTO "tiki_menu_options" ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'o','My Workspaces', 'tiki-my-workspaces.php',930, 'feature_workspaces','','',0);
-
-INSERT INTO "tiki_menu_options" ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'o','Manage Workspaces', 'tiki-manage-workspaces.php',935, 'feature_workspaces','tiki_p_ws_admin','',0);
-
INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin','',0);
INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_categories','',0);
@@ -3260,9 +3252,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";
@@ -3779,6 +3773,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/coe/db/tiki-4.0-sqlite.sql
===================================================================
--- branches/experimental/coe/db/tiki-4.0-sqlite.sql 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/db/tiki-4.0-sqlite.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -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);
@@ -1771,14 +1771,6 @@
INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Admin Newsletters','tiki-admin_newsletters.php',910,'feature_newsletters','tiki_p_admin_newsletters','',0);
-INSERT INTO "," ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'s','Workspaces', 'tiki-workspaces-index.php',920, 'feature_workspaces','','',0);
-
-INSERT INTO "," ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'o','Workspaces Home', 'tiki-workspaces-index.php',925, 'feature_workspaces','','',0);
-
-INSERT INTO "," ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'o','My Workspaces', 'tiki-my-workspaces.php',930, 'feature_workspaces','','',0);
-
-INSERT INTO "," ("menuId", "type", "name", "url", "position", "section", "perm", "groupname", "userlevel") VALUES (42,'o','Manage Workspaces', 'tiki-manage-workspaces.php',935, 'feature_workspaces','tiki_p_ws_admin','',0);
-
INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin','',0);
INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'r','Admin','tiki-admin.php',1050,'','tiki_p_admin_categories','',0);
@@ -3272,8 +3264,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;
@@ -3791,6 +3785,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/coe/db/tiki.sql
===================================================================
--- branches/experimental/coe/db/tiki.sql 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/db/tiki.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -1451,8 +1451,8 @@
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 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,'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,'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);
@@ -2701,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`;
@@ -2974,6 +2976,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/coe/freetag_list.php
===================================================================
--- branches/experimental/coe/freetag_list.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/freetag_list.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -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/coe/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:19070-20460,20611-21084
+ /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:19070-20460,20611-21110
Property changes on: branches/experimental/coe/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:19070-20460,20611-21084
+ /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:19070-20460,20611-21110
Property changes on: branches/experimental/coe/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:19070-20460,20611-21084
+ /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:19070-20460,20611-21110
Property changes on: branches/experimental/coe/installer/schema/20090727_category_permissions_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/installer/schema/20090727_category_permissions_tiki.sql:20611-21084
+ /trunk/installer/schema/20090727_category_permissions_tiki.sql:20611-21110
Property changes on: branches/experimental/coe/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:20611-21084
+ /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:20611-21110
Property changes on: branches/experimental/coe/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:20611-21084
+ /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:20611-21110
Copied: branches/experimental/coe/installer/schema/20090806_menu_list_trackers_tiki.sql (from rev 21110, trunk/installer/schema/20090806_menu_list_trackers_tiki.sql)
===================================================================
--- branches/experimental/coe/installer/schema/20090806_menu_list_trackers_tiki.sql (rev 0)
+++ branches/experimental/coe/installer/schema/20090806_menu_list_trackers_tiki.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -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/coe/installer/schema/20090826_group_expiration_tiki.sql (from rev 21110, trunk/installer/schema/20090826_group_expiration_tiki.sql)
===================================================================
--- branches/experimental/coe/installer/schema/20090826_group_expiration_tiki.sql (rev 0)
+++ branches/experimental/coe/installer/schema/20090826_group_expiration_tiki.sql 2009-08-27 12:20:18 UTC (rev 21114)
@@ -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`);
Property changes on: branches/experimental/coe/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16626-20428,20611-21084
+ /branches/3.0/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16626-20428,20611-21110
Property changes on: branches/experimental/coe/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16626-20428,20611-21084
+ /branches/3.0/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16626-20428,20611-21110
Property changes on: branches/experimental/coe/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16626-20428,20611-21084
+ /branches/3.0/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16998-18916
/branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16626-20428,20611-21110
Modified: branches/experimental/coe/lib/directory/dirlib.php
===================================================================
--- branches/experimental/coe/lib/directory/dirlib.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/lib/directory/dirlib.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -35,10 +35,10 @@
global $prefs;
$path = '';
$info = $this->dir_get_category($categId);
- $path = '<a class="dirlink" href="tiki-directory_browse.php?parent=' . $info["categId"] . '">' . $info["name"] . '</a>';
+ $path = '<a class="dirlink" href="tiki-directory_browse.php?parent=' . $info["categId"] . '">' . htmlspecialchars($info["name"]) . '</a>';
while ($info["parent"] != 0) {
$info = $this->dir_get_category($info["parent"]);
- $path = '<a class="dirlink" href="tiki-directory_browse.php?parent=' . $info["categId"] . '">' . $info["name"] . '</a> ' . $prefs['site_crumb_seper'] . ' ' . $path;
+ $path = '<a class="dirlink" href="tiki-directory_browse.php?parent=' . $info["categId"] . '">' . htmlspecialchars($info["name"]) . '</a> ' . $prefs['site_crumb_seper'] . ' ' . $path;
}
return $path;
Property changes on: branches/experimental/coe/lib/importer/tikiimporter.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/TikiImporter.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter.php:20033-20428,20611-21084
+ /branches/3.0/lib/importer/TikiImporter.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter.php:20033-20428,20611-21110
Property changes on: branches/experimental/coe/lib/importer/tikiimporter_wiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/TikiImporter_Wiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki.php:20033-20428,20611-21084
+ /branches/3.0/lib/importer/TikiImporter_Wiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki.php:20033-20428,20611-21110
Property changes on: branches/experimental/coe/lib/importer/tikiimporter_wiki_mediawiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/importer/TikiImporter_Wiki_Mediawiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki_Mediawiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki_Mediawiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki_mediawiki.php:20033-20428,20611-21084
+ /branches/3.0/lib/importer/TikiImporter_Wiki_Mediawiki.php:16998-18916
/branches/experimental/declfilter/lib/importer/TikiImporter_Wiki_Mediawiki.php:15787-16031
/branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki_Mediawiki.php:16728-16731,16999-17002
/trunk/lib/importer/tikiimporter_wiki_mediawiki.php:20033-20428,20611-21110
Property changes on: branches/experimental/coe/lib/jquery
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery:17151-18916
/branches/experimental/jquery/lib/jquery:16288-16292
/trunk/lib/jquery:18953-20428,20611-21084
+ /branches/3.0/lib/jquery:17151-18916
/branches/experimental/jquery/lib/jquery:16288-16292
/trunk/lib/jquery:18953-20428,20611-21110
Property changes on: branches/experimental/coe/lib/jquery/cluetip
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery/cluetip:17063-18916
/trunk/lib/jquery/cluetip:18953-20428,20611-21084
+ /branches/3.0/lib/jquery/cluetip:17063-18916
/trunk/lib/jquery/cluetip:18953-20428,20611-21110
Property changes on: branches/experimental/coe/lib/jquery/jquery-autocomplete
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery/jquery-autocomplete:17063-18916
/trunk/lib/jquery/jquery-autocomplete:18953-20428,20611-21084
+ /branches/3.0/lib/jquery/jquery-autocomplete:17063-18916
/trunk/lib/jquery/jquery-autocomplete:18953-20428,20611-21110
Property changes on: branches/experimental/coe/lib/jquery/reflection-jquery
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery/reflection-jquery:17063-18916
/trunk/lib/jquery/reflection-jquery:18953-20428,20611-21084
+ /branches/3.0/lib/jquery/reflection-jquery:17063-18916
/trunk/lib/jquery/reflection-jquery:18953-20428,20611-21110
Property changes on: branches/experimental/coe/lib/jquery/superfish
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery/superfish:17063-18916
/trunk/lib/jquery/superfish:18953-20428,20611-21084
+ /branches/3.0/lib/jquery/superfish:17063-18916
/trunk/lib/jquery/superfish:18953-20428,20611-21110
Property changes on: branches/experimental/coe/lib/jquery_tiki
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/jquery_tiki:17151-18916
/branches/experimental/jquery/lib/jquery_tiki:16288-16292
/trunk/lib/jquery_tiki:18953-20428,20611-21084
+ /branches/3.0/lib/jquery_tiki:17151-18916
/branches/experimental/jquery/lib/jquery_tiki:16288-16292
/trunk/lib/jquery_tiki:18953-20428,20611-21110
Modified: branches/experimental/coe/lib/prefs/feature.php
===================================================================
--- branches/experimental/coe/lib/prefs/feature.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/lib/prefs/feature.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -285,5 +285,11 @@
'help' => 'Quickperms',
'type' => 'flag',
),
+ 'feature_purifier' => array(
+ 'name' => tra('HTML Purifier'),
+ 'description' => tra('HTML Purifier'),
+ 'help' => 'HTML Purifier',
+ 'type' => 'flag',
+ ),
);
}
Property changes on: branches/experimental/coe/lib/search/searchlib-mysql.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-mysql.php:20233-20460,20611-21084
+ /branches/3.0/lib/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-mysql.php:20233-20460,20611-21110
Property changes on: branches/experimental/coe/lib/search/searchlib-tiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/search/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/search/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/search/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-tiki.php:20233-20460,20611-21084
+ /branches/3.0/lib/search/searchlib.php:16998-18916
/branches/experimental/declfilter/lib/search/searchlib.php:15787-16031
/branches/experimental/ui-revamp2/lib/search/searchlib.php:16728-16731,16999-17002
/trunk/lib/search/searchlib-tiki.php:20233-20460,20611-21110
Modified: branches/experimental/coe/lib/setup/prefs.php
===================================================================
--- branches/experimental/coe/lib/setup/prefs.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/lib/setup/prefs.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -1288,6 +1288,7 @@
'use_proxy' => 'n',
'user_list_order' => 'score_desc',
'webserverauth' => 'n',
+ 'feature_purifier' => 'y',
'feature_shadowbox' => 'y',
'log_sql' => 'n',
'log_sql_perf_min' => '0.05',
Modified: branches/experimental/coe/lib/smarty_tiki/modifier.duration_short.php
===================================================================
--- branches/experimental/coe/lib/smarty_tiki/modifier.duration_short.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/lib/smarty_tiki/modifier.duration_short.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -25,7 +25,7 @@
} elseif ($string > 60) {
$mins = floor($string/(60));
$result = "$mins minutes";
- } elseif ($string > 0) {
+ } else {
$result = "$string seconds";
}
return $result;
Modified: branches/experimental/coe/lib/tikilib.php
===================================================================
--- branches/experimental/coe/lib/tikilib.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/lib/tikilib.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -2874,9 +2874,9 @@
$join = '';
$where = '';
}
-
- array_push( $bindvars );
- $query = "select * from `tiki_blogs` $join where `blogId`=$blogId $where";
+ array_push( $bindvars, $blogId );
+ if (!empty($where)) $where = '1=1 '.$where.' AND ';
+ $query = "SELECT * FROM `tiki_blogs` $join WHERE $where `blogId`=?";
$result = $this->query($query, $bindvars);
if ($result->numRows()) {
$res = $result->fetchRow();
@@ -4694,7 +4694,7 @@
return false;
$html=$is_html?1:0;
- if ($html) {
+ if ($html && $prefs['feature_purifier'] != 'n') {
require_once('lib/htmlpurifier_tiki/HTMLPurifier.tiki.php');
$edit_data = HTMLPurifier($edit_data);
}
@@ -7028,7 +7028,7 @@
}
$html=$is_html?1:0;
- if ($html) {
+ if ($html&& $prefs['feature_purifier'] != 'n') {
require_once('lib/htmlpurifier_tiki/HTMLPurifier.tiki.php');
$edit_data = HTMLPurifier($edit_data);
}
Modified: branches/experimental/coe/lib/userslib.php
===================================================================
--- branches/experimental/coe/lib/userslib.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/lib/userslib.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -2077,11 +2077,8 @@
$userid = $this->get_user_id($user);
if ( $userid > 0 ){
- $query = "insert into `users_usergroups`(`userId`,`groupName`) values(?,?)";
- $result = $this->query($query, array(
- $userid,
- $group
- ), -1, -1, false);
+ $query = "insert into `users_usergroups`(`userId`,`groupName`, `created`) values(?,?,?)";
+ $result = $this->query($query, array($userid, $group, $tikilib->now), -1, -1, false);
$group_ret = true;
}
return $group_ret;
@@ -2499,12 +2496,13 @@
return true;
}
- function add_group($group, $desc='', $home='', $utracker=0, $gtracker=0, $rufields='', $userChoice='', $defcat=0, $theme='', $ufield=0, $gfield=0,$isexternal='n') {
+ function add_group($group, $desc='', $home='', $utracker=0, $gtracker=0, $rufields='', $userChoice='', $defcat=0, $theme='', $ufield=0, $gfield=0,$isexternal='n', $expireAfter=0) {
+ global $tikilib;
$group = trim($group);
if ( $this->group_exists($group) ) return false;
- $query = "insert into `users_groups` (`groupName`, `groupDesc`, `groupHome`,`groupDefCat`,`groupTheme`,`usersTrackerId`,`groupTrackerId`, `registrationUsersFieldIds`, `userChoice`, `usersFieldId`, `groupFieldId`,`isExternal`) values(?,?,?,?,?,?,?,?,?,?,?,?)";
- $this->query($query, array($group, $desc, $home, $defcat, $theme, (int)$utracker, (int)$gtracker, $rufields, $userChoice, (int)$ufield, (int)$gfield,$isexternal) );
+ $query = "insert into `users_groups` (`groupName`, `groupDesc`, `groupHome`,`groupDefCat`,`groupTheme`,`usersTrackerId`,`groupTrackerId`, `registrationUsersFieldIds`, `userChoice`, `usersFieldId`, `groupFieldId`,`isExternal`, `expireAfter`) values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ $this->query($query, array($group, $desc, $home, $defcat, $theme, (int)$utracker, (int)$gtracker, $rufields, $userChoice, (int)$ufield, (int)$gfield,$isexternal, $expireAfter) );
global $cachelib;
$cachelib->invalidate('grouplist');
@@ -2514,7 +2512,7 @@
return $this->getOne($query, array($group));
}
- function change_group($olgroup,$group,$desc,$home,$utracker=0,$gtracker=0,$ufield=0,$gfield=0,$rufields='',$userChoice='',$defcat=0,$theme='',$isexternal='n') {
+ function change_group($olgroup,$group,$desc,$home,$utracker=0,$gtracker=0,$ufield=0,$gfield=0,$rufields='',$userChoice='',$defcat=0,$theme='',$isexternal='n', $expireAfter=0) {
if ( $olgroup == 'Anonymous' || $olgroup == 'Registered' ) {
// Changing group name of 'Anonymous' and 'Registered' is not allowed.
@@ -2522,13 +2520,13 @@
}
if ( ! $this->group_exists($olgroup) ) {
- return $this->add_group($group, $desc, $home, $utracker,$gtracker, $userChoice, $defcat, $theme);
+ return $this->add_group($group, $desc, $home, $utracker,$gtracker, $userChoice, $defcat, $theme, $isExternal, $expireAfter);
}
global $cachelib;
- $query = "update `users_groups` set `groupName`=?, `groupDesc`=?, `groupHome`=?, `groupDefCat`=?, `groupTheme`=?, `usersTrackerId`=?, `groupTrackerId`=?, `usersFieldId`=?, `groupFieldId`=? , `registrationUsersFieldIds`=?, `userChoice`=?, `isExternal`=? where `groupName`=?";
- $result = $this->query($query, array($group, $desc, $home, $defcat, $theme, (int)$utracker, (int)$gtracker, (int)$ufield, (int)$gfield, $rufields, $userChoice, $isexternal, $olgroup));
+ $query = "update `users_groups` set `groupName`=?, `groupDesc`=?, `groupHome`=?, `groupDefCat`=?, `groupTheme`=?, `usersTrackerId`=?, `groupTrackerId`=?, `usersFieldId`=?, `groupFieldId`=? , `registrationUsersFieldIds`=?, `userChoice`=?, `isExternal`=?, `expireAfter`=? where `groupName`=?";
+ $result = $this->query($query, array($group, $desc, $home, $defcat, $theme, (int)$utracker, (int)$gtracker, (int)$ufield, (int)$gfield, $rufields, $userChoice, $isexternal, $expireAfter, $olgroup));
if ( $olgroup != $group ) {
$query = array();
@@ -2588,6 +2586,8 @@
$query = "delete from `tiki_group_inclusion` where `groupName` = ?";
$result = $this->query($query, array($group));
+ global $cachelib; require_once('lib/cache/cachelib.php');
+ $cachelib->empty_type_cache('group_inclusion_'.$group);
$this->groupinclude_cache = array();
return true;
}
@@ -3109,6 +3109,15 @@
$result = $client->send($msg);
return $result;
}
+ function update_expired_groups() {
+ global $tikilib;
+ $query = 'SELECT uu.* FROM `users_usergroups` uu, `users_groups` ug WHERE uu.`groupName`= ug.`groupName` AND ug.`expireAfter` > 0 AND uu.`created` IS NOT NULL AND uu.`created` + ug.`expireAfter`*24*60*60 < ?';
+ $result = $this->query($query, array($tikilib->now));
+ $query = 'DELETE FROM `users_usergroups` WHERE `groupName`=? AND `userId`=?';
+ while ($res = $result->fetchrow()) {
+ $this->query($query, array($res['groupName'], $res['userId']));
+ }
+ }
}
Property changes on: branches/experimental/coe/lib/wiki-plugins/wikiplugin_mediaplayer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-18916
/trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:16626-20428,20611-21084
/trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737
+ /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-18916
/trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:16626-20428,20611-21110
/trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737
Deleted: branches/experimental/coe/modules/mod-directory_stats.php
===================================================================
--- branches/experimental/coe/modules/mod-directory_stats.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/modules/mod-directory_stats.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -1,16 +0,0 @@
-<?php
-
-//this script may only be included - so its better to die if called directly.
-if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
- header("location: index.php");
- exit;
-}
-global $prefs, $tikilib, $smarty;
-
-if ($prefs['feature_directory'] == 'y') {
- $ranking = $tikilib->dir_stats();
-
- $smarty->assign('modDirStats', $ranking);
-}
-
-
Deleted: branches/experimental/coe/modules/mod-forums_most_commented_forums.php
===================================================================
--- branches/experimental/coe/modules/mod-forums_most_commented_forums.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/modules/mod-forums_most_commented_forums.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -1,15 +0,0 @@
-<?php
-
-//this script may only be included - so its better to die if called directly.
-if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
- header("location: index.php");
- exit;
-}
-global $smarty;
-global $ranklib; include_once ('lib/rankings/ranklib.php');
-
-$ranking = $ranklib->forums_ranking_most_commented_forum($module_rows);
-$smarty->assign('modForumsMostCommentedForums', $ranking["data"]);
-$smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n');
-
-
Deleted: branches/experimental/coe/modules/mod-forums_most_read_topics.php
===================================================================
--- branches/experimental/coe/modules/mod-forums_most_read_topics.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/modules/mod-forums_most_read_topics.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -1,25 +0,0 @@
-<?php
-
-//this script may only be included - so its better to die if called directly.
-if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
- header("location: index.php");
- exit;
-}
-global $smarty;
-global $ranklib; include_once ('lib/rankings/ranklib.php');
-
-if (isset($module_params['forumId'])) {
- if (strstr($module_params['forumId'], ':')) {
- $forumId = explode(':',$module_params['forumId']);
- } else {
- $forumId = $module_params['forumId'];
- }
-} else {
- $forumId = '';
-}
-
-$ranking = $ranklib->forums_ranking_most_read_topics($module_rows, $forumId);
-$smarty->assign('modForumsMostReadTopics', $ranking["data"]);
-$smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n');
-
-
Deleted: branches/experimental/coe/modules/mod-forums_most_visited_forums.php
===================================================================
--- branches/experimental/coe/modules/mod-forums_most_visited_forums.php 2009-08-27 12:03:15 UTC (rev 21113)
+++ branches/experimental/coe/modules/mod-forums_most_visited_forums.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -1,15 +0,0 @@
-<?php
-
-//this script may only be included - so its better to die if called directly.
-if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
- header("location: index.php");
- exit;
-}
-global $smarty;
-global $ranklib; include_once ('lib/rankings/ranklib.php');
-
-$ranking = $ranklib->forums_ranking_most_visited_forums($module_rows);
-$smarty->assign('modForumsMostVisitedForums', $ranking["data"]);
-$smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n');
-
-
Copied: branches/experimental/coe/modules/mod-func-directory_stats.php (from rev 21110, trunk/modules/mod-func-directory_stats.php)
===================================================================
--- branches/experimental/coe/modules/mod-func-directory_stats.php (rev 0)
+++ branches/experimental/coe/modules/mod-func-directory_stats.php 2009-08-27 12:20:18 UTC (rev 21114)
@@ -0,0 +1,23 @@
+<?php
+
+//this script may only be included - so its better to die if called directly.
+if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
+ header("location: index.php");
+ exit;
+}
+
+function module_directory_stats_info() {
+ return array(
+ 'name' => tra('Directory statistics'),
+ 'description' => tra('Displays statistics about the directory, including the number of sites validated and to validate, the number of categories, of searches and of visited links.'),
+ 'prefs' => array( 'feature_directory' ),
+ 'params' => array()
+ );
+}
+
+function module_directory_stats( $mod_reference, $module_params ) {
+ global $prefs, $tikilib, $smarty;
+
+ $ranking = $tikilib->dir_stats();
+ $smarty->assign('modDirStats', $ranking);
+}
\ No newline at end of file
Copied: branches/experimental/coe/modules/mod-func-forums_most_commented_forums.php (from rev 21110, trunk/modules/mod-func-forums_most_commented_forums.php)
===================================================================
--- branches/experimental/coe/modules/mod-func-fo...
[truncated message content] |