[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[21533] branches/experimental/kaltura_integration_two

[<jon...@us...>]

Revision: 21533
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21533&view=rev
Author:   jonnybradley
Date:     2009-09-16 14:03:44 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
[MRG] Automatic merge, trunk 21229 to 21531

Modified Paths:
--------------
    branches/experimental/kaltura_integration_two/categorize.php
    branches/experimental/kaltura_integration_two/comments.php
    branches/experimental/kaltura_integration_two/css/cssmenus.css
    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/img/tiki/tiki3.gif
    branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php
    branches/experimental/kaltura_integration_two/lib/freetag/freetaglib.php
    branches/experimental/kaltura_integration_two/lib/headerlib.php
    branches/experimental/kaltura_integration_two/lib/importer/mediawiki_dump.xsd
    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/newsletters/nllib.php
    branches/experimental/kaltura_integration_two/lib/prefs/feature.php
    branches/experimental/kaltura_integration_two/lib/prefs/global.php
    branches/experimental/kaltura_integration_two/lib/prefs/smarty.php
    branches/experimental/kaltura_integration_two/lib/prefs/wiki.php
    branches/experimental/kaltura_integration_two/lib/prefslib.php
    branches/experimental/kaltura_integration_two/lib/setup/js_detect.php
    branches/experimental/kaltura_integration_two/lib/setup/prefs.php
    branches/experimental/kaltura_integration_two/lib/smarty_tiki/function.menu.php
    branches/experimental/kaltura_integration_two/lib/structures/structlib.php
    branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_mediawiki_test.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/wiki/xmllib.php
    branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_bloglist.php
    branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_fancytable.php
    branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_files.php
    branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_sharethis.php
    branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_trackeritemfield.php
    branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_youtube.php
    branches/experimental/kaltura_integration_two/modules/mod-func-breadcrumb.php
    branches/experimental/kaltura_integration_two/modules/mod-func-featured_links.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-since_last_visit_new.php
    branches/experimental/kaltura_integration_two/styles/coelesce.css
    branches/experimental/kaltura_integration_two/styles/darkroom.css
    branches/experimental/kaltura_integration_two/styles/feb12.css
    branches/experimental/kaltura_integration_two/styles/layout/layout-reference.css
    branches/experimental/kaltura_integration_two/styles/layout/layout.css
    branches/experimental/kaltura_integration_two/styles/strasa/options/cool.css
    branches/experimental/kaltura_integration_two/styles/strasa/options/mono.css
    branches/experimental/kaltura_integration_two/styles/strasa.css
    branches/experimental/kaltura_integration_two/styles/thenews/options/narrow_left_column.css
    branches/experimental/kaltura_integration_two/styles/thenews.css
    branches/experimental/kaltura_integration_two/styles/tikinewt.css
    branches/experimental/kaltura_integration_two/templates/error.tpl
    branches/experimental/kaltura_integration_two/templates/fgal_context_menu.tpl
    branches/experimental/kaltura_integration_two/templates/footer.tpl
    branches/experimental/kaltura_integration_two/templates/freetag.tpl
    branches/experimental/kaltura_integration_two/templates/freetag_list.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/moderate_validation_mail.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-calendar_new.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-freetags_current.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-freetags_most_popular.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-freetags_prefered.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-last_blog_posts.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-shoutbox.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-switch_lang.tpl
    branches/experimental/kaltura_integration_two/templates/modules/mod-users_rank.tpl
    branches/experimental/kaltura_integration_two/templates/styles/coelesce/tiki-top_bar.tpl
    branches/experimental/kaltura_integration_two/templates/styles/strasa/tiki-view_blog.tpl
    branches/experimental/kaltura_integration_two/templates/styles/strasa/tiki-view_blog_post.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin-include-features.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin-include-general.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin-include-login.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin-include-look.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin-include-profiles.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin-include-textarea.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_calendars.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_categories.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_modules.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_newsletter_subscriptions.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_newsletters.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_polls.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_structures.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-admin_trackers.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-adminusers.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-browse_freetags.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-calendar.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-calendar_box.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-calendar_import.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-change_password.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-edit_wiki_section.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-editpage.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-import_xml_zip.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-listpages.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-listpages_content.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-objectpermissions.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-plugin_blocked.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-plugins.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-searchresults.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-send_newsletters.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-site_header.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-site_header_login.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-stats.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-top_bar.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-user_cssmenu.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-user_information.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-user_preferences.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-view_blog.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-view_blog_post.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-view_tracker_item.tpl
    branches/experimental/kaltura_integration_two/templates/tiki.tpl
    branches/experimental/kaltura_integration_two/templates/wiki_edit_actions.tpl
    branches/experimental/kaltura_integration_two/tests/upgrade_categperm.php
    branches/experimental/kaltura_integration_two/tiki-admin_include_features.php
    branches/experimental/kaltura_integration_two/tiki-admin_include_general.php
    branches/experimental/kaltura_integration_two/tiki-admin_include_login.php
    branches/experimental/kaltura_integration_two/tiki-admin_include_look.php
    branches/experimental/kaltura_integration_two/tiki-admin_modules.php
    branches/experimental/kaltura_integration_two/tiki-admin_newsletters.php
    branches/experimental/kaltura_integration_two/tiki-admin_structures.php
    branches/experimental/kaltura_integration_two/tiki-admin_toolbars.php
    branches/experimental/kaltura_integration_two/tiki-admin_trackers.php
    branches/experimental/kaltura_integration_two/tiki-browse_categories.php
    branches/experimental/kaltura_integration_two/tiki-browse_freetags.php
    branches/experimental/kaltura_integration_two/tiki-calendar_import.php
    branches/experimental/kaltura_integration_two/tiki-edit_structure.php
    branches/experimental/kaltura_integration_two/tiki-editpage.php
    branches/experimental/kaltura_integration_two/tiki-export_tracker.php
    branches/experimental/kaltura_integration_two/tiki-index.php
    branches/experimental/kaltura_integration_two/tiki-listpages.php
    branches/experimental/kaltura_integration_two/tiki-login.php
    branches/experimental/kaltura_integration_two/tiki-login_validate.php
    branches/experimental/kaltura_integration_two/tiki-plugins.php
    branches/experimental/kaltura_integration_two/tiki-send_newsletters.php
    branches/experimental/kaltura_integration_two/tiki-view_tracker_item.php

Added Paths:
-----------
    branches/experimental/kaltura_integration_two/installer/schema/20090904_wysiwyg_newsletters_tiki.sql
    branches/experimental/kaltura_integration_two/installer/schema/20090911_tracker_item_change_user.sql
    branches/experimental/kaltura_integration_two/installer/schema/20090912_change_feature_name_for_lesser_magic_tiki.sql
    branches/experimental/kaltura_integration_two/installer/schema/20090913_adedby_tik_security.sql
    branches/experimental/kaltura_integration_two/installer/schema/20090913_plugin_security_addedby_tiki.sql
    branches/experimental/kaltura_integration_two/installer/schema/20090915_change_perms_for_browse_cats_tiki.sql
    branches/experimental/kaltura_integration_two/lib/importer/xml.xsd
    branches/experimental/kaltura_integration_two/lib/prefs/tiki.php
    branches/experimental/kaltura_integration_two/lib/smarty_tiki/function.popup.php
    branches/experimental/kaltura_integration_two/styles/strasa/arrows-467aa7.png
    branches/experimental/kaltura_integration_two/styles/strasa/options/mono/arrows-000000.png
    branches/experimental/kaltura_integration_two/templates/styles/coelesce/tiki-site_header_options.tpl
    branches/experimental/kaltura_integration_two/templates/styles/coelesce/tiki-site_header_top.tpl
    branches/experimental/kaltura_integration_two/templates/styles/strasa/tiki-site_header.tpl
    branches/experimental/kaltura_integration_two/templates/styles/strasa/tiki-site_header_top.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-site_header_options.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-site_header_top.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-site_header_top_begin.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-site_header_top_end.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-sitemenu.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-sitesearchbar.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-top_bar_begin.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-top_bar_custom_code.tpl
    branches/experimental/kaltura_integration_two/templates/tiki-top_bar_end.tpl
    branches/experimental/kaltura_integration_two/tiki-send_mail.php

Removed Paths:
-------------
    branches/experimental/kaltura_integration_two/templates/styles/coelesce/tiki-site_header.tpl

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/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-21110,21216-21229
   + /branches/3.0:16998-18916
/branches/experimental/declfilter:15787-16031
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/trunk:20962-21110,21216-21531

Modified: branches/experimental/kaltura_integration_two/categorize.php
===================================================================
--- branches/experimental/kaltura_integration_two/categorize.php	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/categorize.php	2009-09-16 14:03:44 UTC (rev 21533)
@@ -60,14 +60,14 @@
  	$can = $catobjperms->modify_object_categories;
 
 	for ($iCat = 0; $iCat < $num_categories; $iCat++) {
-		$catperms = Perms::get( array( 'type' => 'category', 'object' => $categories[$i]['categId'] ) );
+		$catperms = Perms::get( array( 'type' => 'category', 'object' => $categories[$iCat]['categId'] ) );
 
 		if (in_array($categories[$iCat]["categId"], $cats)) {
 			$categories[$iCat]["incat"] = 'y';
-			$categories[$i]['canchange'] = ($can && $catperms->remove_object) || isset($cat_object_exists) && ! $cat_object_exists;
+			$categories[$iCat]['canchange'] = ($can && $catperms->remove_object) || isset($cat_object_exists) && ! $cat_object_exists;
 		} else {
 			$categories[$iCat]["incat"] = 'n';
-			$categories[$i]['canchange'] = $can && $catperms->add_object;
+			$categories[$iCat]['canchange'] = $can && $catperms->add_object;
 		}
 	}
 	$smarty->assign_by_ref('categories', $categories["data"]);

Modified: branches/experimental/kaltura_integration_two/comments.php
===================================================================
--- branches/experimental/kaltura_integration_two/comments.php	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/comments.php	2009-09-16 14:03:44 UTC (rev 21533)
@@ -31,25 +31,6 @@
 // user requests that could be used to change thread display settings
 $handled_requests = array('comments_per_page', 'thread_style', 'thread_sort_mode');
 
-// Set global site prefs to initialize vars
-foreach ( $handled_requests as $request_name ) {
-        if ( isset($prefs['forum_'.$request_name]) ) {
-                $$request_name = $prefs['forum_'.$request_name];
-        }
-}
-
-// First override existing values (e.g. coming from forum specific settings) by user specific requests if we allow them
-//   (we empty those user specific requests if they are denied)
-if ( $prefs['forum_thread_user_settings'] == 'y' ) {
-	foreach ( $handled_requests as $request_name ) {
-		if ( isset($_REQUEST[$request_name]) ) {
-			$$request_name = $_REQUEST[$request_name];
-			$smarty->assign($request_name.'_param', '&amp;'.$request_name.'='.$_REQUEST[$request_name]);
-			if ( $prefs['forum_thread_user_settings_keep'] == 'y' ) $_SESSION['forums_'.$request_name] = $_REQUEST[$request_name];
-		}
-	}
-} else foreach ( $handled_requests as $request_name ) unset($_REQUEST[$request_name]);
-
 // Then determine the final value for thread display settings
 if ( isset($forum_mode) && $forum_mode == 'y' ) {
 	// If we are in a forum thread

Modified: branches/experimental/kaltura_integration_two/css/cssmenus.css
===================================================================
--- branches/experimental/kaltura_integration_two/css/cssmenus.css	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/css/cssmenus.css	2009-09-16 14:03:44 UTC (rev 21533)
@@ -1,178 +1,123 @@
-/** CSS (suckerfish) menus **/
-.cssmenu,
-.cssmenu ul,
+/*** CSS (suckerfish) menus ***/
+/** essential styles **/
 .cssmenu_horiz,
-.cssmenu_horiz ul,
+.cssmenu_horiz * ,
 .cssmenu_vert,
-.cssmenu_vert ul {
+.cssmenu_vert * ,
+ul.cssmenu_vert ul {
+	margin: 0;
 	padding: 0;
-	margin: 0;
-	list-style: none;
-	line-height: 1;
-	overflow: visible}
+	padding-left: 0;
+	padding-right: 0;
+	list-style:	none;
+}
 
-.cssmenu ul,
-.cssmenu li,
+.cssmenu_horiz,
+.cssmenu_vert {
+	line-height: 1.0;
+}
+
 .cssmenu_horiz ul,
+.cssmenu_vert ul {
+	position: absolute;
+	top: -999em;
+	width: 10em; /* left offset of submenus need to match (see below) */
+	z-index: 751;
+}
+
 .cssmenu_horiz ul li,
-.cssmenu_vert,
-.cssmenu_vert ul,
-.cssmenu_vert li {width: 11em}
+.cssmenu_vert ul li {
+	width: 100%;
+}
 
-*:first-child+html body .cssmenu_horiz li {width: 11em}
+.cssmenu_horiz li:hover,
+.cssmenu_vert li:hover {
+	visibility:	inherit; /* fixes IE7 'sticky bug' */
+}
 
-.cssmenu li,
 .cssmenu_horiz li,
-.cssmenu_vert,
-.cssmenu_vert li,
-.cssmenu_vert ul,
-.cssmenu_vert ul li {float: left}
-
-/* helpful for ie6 */
-.cssmenu li,
-.cssmenu_horiz li,
 .cssmenu_vert li {
+	float: left;
 	position: relative;
-	height: 100%;
-	list-style: none}
-	
-.cssmenu_horiz li:hover,
-.cssmenu_vert li:hover {/*background: #dedede*/}
+}
 
-.cssmenu ul,
-.cssmenu_vert ul,
-.cssmenu_horiz ul {
-	position: absolute;
-	left: -999em;
-	z-index: 751}
-	
-.box-data .cssmenu_vert {padding-right: 0 !important}
+.cssmenu_horiz a,
+.cssmenu_vert a {
+	display:	block;
+	position: relative;
+}
 
-.cssmenu_vert li ul,
-.cssmenu_vert li.sfhover ul,
-.box-data .cssmenu_vert li ul { /* second-level lists */
-	margin-left: 10.9em;
-	margin-top: -1.5em;
-	/*padding-bottom: 1px; enable border to show */}
+.cssmenu_horiz li:hover ul,
+.cssmenu_horiz li.sfHover ul,
+.cssmenu_vert li:hover ul,
+.cssmenu_vert li.sfHover ul {
+	left:	0;
+	top: 2.5em; /* match top ul list item height */
+	z-index:	752;
+}
 
-/*.cssmenu li ul ul {left: -999em}*/
+.cssmenu_horiz li:hover li ul,
+.cssmenu_horiz li.sfHover li ul,
+.cssmenu_vert li:hover li ul,
+.cssmenu_vert li.sfHover li ul {
+	top: -999em;
+}
 
-.cssmenu_vert li:hover ul ul {z-index: 752}	/* z-indexes needed at ui-revamp to prevent hidden dropdowns */
-.cssmenu_horiz li ul ul {margin: -1.5em 0 0 10.9em}
+.cssmenu_horiz li li:hover ul,
+.cssmenu_horiz li li.sfHover ul,
+.cssmenu_vert li li:hover ul,
+.cssmenu_vert li li.sfHover ul {
+	left:	10em; /* match ul width */
+	top: 0;
+}
 
-/* dropdown menu hide-display */
-.cssmenu li:hover ul ul,
-.cssmenu li:hover ul ul ul,
-.cssmenu_horiz li:hover ul ul,
-.cssmenu_horiz li:hover ul ul ul,
-.cssmenu_vert li:hover ul ul,
-.cssmenu_vert li:hover ul ul ul,
-.cssmenu li.sfhover ul ul,
-.cssmenu li.sfhover ul ul ul,
-.cssmenu_horiz li.sfhover ul ul,
-.cssmenu_horiz li.sfhover ul ul ul,
-.cssmenu_vert li.sfhover ul ul,
-.cssmenu_vert li.sfhover ul ul ul {left: -999em}
+.cssmenu_horiz li li:hover li ul,
+.cssmenu_horiz li li.sfHover li ul,
+.cssmenu_vert li li:hover li ul,
+.cssmenu_vert li li.sfHover li ul {
+	top: -999em;
+}
 
-.cssmenu li:hover ul,
-.cssmenu li li:hover ul,
-.cssmenu li li li:hover ul,
-.cssmenu_horiz li:hover ul,
-.cssmenu_horiz li li:hover ul,
 .cssmenu_horiz li li li:hover ul,
-.cssmenu_vert li:hover ul,
-.cssmenu_vert li li:hover ul,
+.cssmenu_horiz li li li.sfHover ul
 .cssmenu_vert li li li:hover ul,
-.cssmenu li.sfhover ul,
-.cssmenu li li.sfhover ul,
-.cssmenu li li li.sfhover ul,
-.cssmenu_horiz li.sfhover ul,
-.cssmenu_horiz li li.sfhover ul,
-.cssmenu_horiz li li li.sfhover ul,
-.cssmenu_vert li.sfhover ul,
-.cssmenu_vert li li.sfhover ul,
-.cssmenu_vert li li li.sfhover ul {left: auto}
+.cssmenu_vert li li li.sfHover ul {
+	left: 10em; /* match ul width */
+	top: 0;
+}
 
-/* li hover bg color */
-.cssmenu li ul,
-.cssmenu_horiz li ul,
-.cssmenu_vert li ul {
-	/*border: 1px solid #acccdd;*/
-	background: #fff}
+/* Suggested style */
+.cssmenu_horiz li.selected a,
+.cssmenu_vert li.selected a {
+	font-style: italic;
+}
 
-/* selected and selected ascendant */
-.cssmenu > li.selected,
-.cssmenu_horiz > li.selected,
-.cssmenu_vert > li.selected {font-style: italic}
+.cssmenu_horiz li.selected ul li a,
+.cssmenu_vert li.selected ul li a {
+	font-style: normal;
+}
 
-.cssmenu li.selected li,
-.cssmenu_horiz li.selected li,
-.cssmenu_vert li.selected li {font-style: normal}
+/*** (demo skin removed) ***/
 
-.cssmenu li.selectedAscendant,
-.cssmenu_horiz li.selectedAscendant,
-.cssmenu_vert li.selectedAscendant {/*font-weight: bold*/}
-
-/* link styles */
-.cssmenu a,	
-.cssmenu_horiz a,
-.cssmenu_vert a {
-	text-decoration: none;
-	display: block;
-	padding: 3px 3px 3px 6px}
-	
-* html .cssmenu a,	
-* html .cssmenu_horiz a,
-* html .cssmenu_vert a {}
-
-.cssmenu a:hover,
-.cssmenu_vert a:hover,	
-.cssmenu_horiz a:hover {/*color: darkviolet*/}
-
-* html .cssmenu li ul a {background: none}
-
-div#col2,
-td#leftcolumn,
-div.cssmenubox {overflow: visible !important}
-
-.box-data .cssmenu_vert {z-index: 750}
-
-#header .cssmenu_horiz {
-	z-index: 800;
-	position: relative}
-	
-.cssmenu_horiz li.menuLevel0 a {padding-right: 12px}
-.cssmenu_horiz li.menuSection a {padding-right: 24px}
-.cssmenu_horiz li.menuLevel1 a {padding-right: 12px}
-
-#header .cssmenu_horiz {}
-#header .cssmenu_horiz > li {}
-#header .cssmenu_horiz > li > a {}
-#header .cssmenu_horiz > li > a:hover {}
-#header .cssmenu_horiz li:hover {}
-#header .cssmenu_horiz li ul a {}
-#header .cssmenu_horiz ul li a:hover {}
-
-* html h3.box-title {position: static}
-
-/*** arrows (from lib/jquery/superfish css )**/
+/*** arrows **/
 .cssmenu_horiz a.sf-with-ul,
 .cssmenu_vert a.sf-with-ul {
-	min-width: 1px; /* trigger IE7 hasLayout so spans position accurately */
+	padding-right: 2.25em;
+	min-width:	1px; /* trigger IE7 hasLayout so spans position accurately */
 }
+
 .sf-sub-indicator {
 	position: absolute;
-	display:	block;
+	display: block;
 	right: .75em;
 	top: 1.05em; /* IE6 only */
 	width: 10px;
 	height: 10px;
 	text-indent: -999em;
 	overflow: hidden;
-	background: url(../lib/jquery/superfish/images/arrows-ffffff.png)  no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only; */}
+	background: url(../lib/jquery/superfish/images/arrows-ffffff.png) no-repeat -10px -100px; /* 8-bit indexed alpha png. IE6 gets solid image only */
+}
 
-.cssmenu_vert .sf-sub-indicator,
-.cssmenu_horiz ul .sf-sub-indicator {margin-top: -5px}	
 a > .sf-sub-indicator {  /* give all except IE6 the correct values */
 	top: .8em;
 	background-position: 0 -100px; /* use translucent arrow for modern browsers*/
@@ -182,43 +127,47 @@
 a:hover > .sf-sub-indicator,
 a:active > .sf-sub-indicator,
 li:hover > a > .sf-sub-indicator,
-li.sfHover > a > .sf-sub-indicator {background-position: -10px -100px; /* arrow hovers for modern browsers*/
+li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px -100px; /* arrow hovers for modern browsers*/
 }
 
-
 /* point right for anchors in subs */
-.cssmenu_horiz ul .sf-sub-indicator,
-.cssmenu_vert ul .sf-sub-indicator { background-position:  -10px 0; }
-.cssmenu_horiz ul a > .sf-sub-indicator,
-.cssmenu_vert ul a > .sf-sub-indicator { background-position:  0 0; }
+.cssmenu_horiz ul .sf-sub-indicator { background-position:  -10px 0; }
+.cssmenu_horiz ul a > .sf-sub-indicator { background-position:  0 0; }
 /* apply hovers to modern browsers */
 .cssmenu_horiz ul a:focus > .sf-sub-indicator,
-.cssmenu_vert ul a:focus > .sf-sub-indicator,
 .cssmenu_horiz ul a:hover > .sf-sub-indicator,
-.cssmenu_vert ul a:hover > .sf-sub-indicator,
 .cssmenu_horiz ul a:active > .sf-sub-indicator,
-.cssmenu_vert ul a:active > .sf-sub-indicator,
 .cssmenu_horiz ul li:hover > a > .sf-sub-indicator,
-.cssmenu_vert ul li:hover > a > .sf-sub-indicator,
-.cssmenu_horiz ul li.sfHover > a > .sf-sub-indicator
-.cssmenu_vert ul li.sfHover > a > .sf-sub-indicator {
+.cssmenu_horiz ul li.sfHover > a > .sf-sub-indicator {
 	background-position: -10px 0; /* arrow hovers for modern browsers*/
 }
 
 /*** shadows for all but IE6 ***/
-.sf-shadow ul {
-	background: transparent url('../lib/jquery/superfish/images/shadow.png') no-repeat bottom right !important;
-	border: none !important;
-	padding: 0 8px 8px 0 !important;/*
-	-moz-border-radius-bottomleft: 17px;
+ul.sf-shadow ul {
+	background:	url(../lib/jquery/superfish/images/shadow.png) no-repeat bottom right;
+	padding: 0 8px 9px 0;
+/*	-moz-border-radius-bottomleft: 17px;
 	-moz-border-radius-topright: 17px;
 	-webkit-border-top-right-radius: 17px;
 	-webkit-border-bottom-left-radius: 17px;*/
 }
+ul.sf-shadow ul.sf-shadow-off {
+	background: transparent;
+}
 
-.sf-shadow ul.sf-shadow-off {
-	background: transparent}
+/*** vertical menus ***/
+.cssmenu_vert,
+.cssmenu_vert li {
+	width: 10em;
+}
 
+.cssmenu_vert li:hover ul,
+.cssmenu_vert li.sfHover ul {
+	left:	10em; /* match ul width */
+	top:	0;
+}
+
 /*** alter arrow directions ***/
 .cssmenu_vert .sf-sub-indicator { background-position: -10px 0; } /* IE6 gets solid image only */
 .cssmenu_vert a > .sf-sub-indicator { background-position: 0 0; } /* use translucent arrow for modern browsers*/
@@ -229,4 +178,110 @@
 .cssmenu_vert a:active > .sf-sub-indicator,
 .cssmenu_vert li:hover > a > .sf-sub-indicator,
 .cssmenu_vert li.sfHover > a > .sf-sub-indicator {
-	background-position: -10px 0; /* arrow hovers for modern browsers*/}
+	background-position: -10px 0; /* arrow hovers for modern browsers*/
+}
+
+div#col2,
+td#leftcolumn,
+div.cssmenubox {
+	overflow: visible !important;
+}
+
+
+/*** adding a parent div.sf-navbar to .cssmenu_horiz to create an all-horizontal nav-bar menu ***/
+div.navbar .cssmenu_horiz {
+	background:	#BDD2FF;
+	height: 2.5em;
+	padding-bottom: 2.5em;
+	position: relative;
+}
+div.navbar .cssmenu_horiz li {
+	background:	#AABDE6;
+	position: static;
+}
+div.navbar .cssmenu_horiz a {
+	border-top:	none;
+}
+div.navbar .cssmenu_horiz li ul {
+	width: 44em; /*IE6 soils itself without this*/
+}
+div.navbar .cssmenu_horiz li li {
+	background:	#BDD2FF;
+	position: relative;
+}
+div.navbar .cssmenu_horiz li li ul {
+	width: 13em;
+}
+div.navbar .cssmenu_horiz li li li {
+	width: 100%;
+}
+div.navbar .cssmenu_horiz ul li {
+	width: auto;
+	float: left;
+}
+div.navbar .cssmenu_horiz a,
+div.navbar .cssmenu_horiz a:visited {
+	border: none;
+}
+div.navbar .cssmenu_horiz li.current {
+	background:	#BDD2FF;
+}
+div.navbar .cssmenu_horiz li:hover,
+div.navbar .cssmenu_horiz li.sfHover,
+div.navbar .cssmenu_horiz li li.current,
+div.navbar .cssmenu_horiz a:focus,
+div.navbar .cssmenu_horiz a:hover,
+div.navbar .cssmenu_horiz a:active {
+	background:	#BDD2FF;
+}
+div.navbar .cssmenu_horiz ul li:hover,
+div.navbar .cssmenu_horiz ul li.sfHover,
+uldiv.navbar .cssmenu_horiz ul li:hover li,
+uldiv.navbar .cssmenu_horiz ul li.sfHover li,
+div.navbar .cssmenu_horiz ul a:focus,
+div.navbar .cssmenu_horiz ul a:hover,
+div.navbar .cssmenu_horiz ul a:active {
+	background:	#D1DFFF;
+}
+div.navbar ul.cssmenu_horiz li li li:hover,
+div.navbar ul.cssmenu_horiz li li li.sfHover,
+div.navbar .cssmenu_horiz li li.current li.current,
+div.navbar .cssmenu_horiz ul li li a:focus, div.navbar .cssmenu_horiz ul li li a:hover, div.navbar .cssmenu_horiz ul li li a:active {
+	background:		#E6EEFF;
+}
+div.navbar ul.cssmenu_horiz .current ul,
+div.navbar ul.cssmenu_horiz ul li:hover ul,
+div.navbar ul.cssmenu_horiz ul li.sfHover ul {
+	left:	0;
+	top: 2.5em; /* match top ul list item height */
+}
+div.navbar ul.cssmenu_horiz .current ul ul {
+	top: -999em;
+}
+
+div.navbar .cssmenu_horiz li li.current > a {
+	font-weight:	bold;
+}
+
+/*** point all arrows down ***/
+/* point right for anchors in subs */
+div.navbar .cssmenu_horiz ul .sf-sub-indicator { background-position: -10px -100px; }
+div.navbar .cssmenu_horiz ul a > .sf-sub-indicator { background-position: 0 -100px; }
+/* apply hovers to modern browsers */
+div.navbar .cssmenu_horiz ul a:focus > .sf-sub-indicator,
+div.navbar .cssmenu_horiz ul a:hover > .sf-sub-indicator,
+div.navbar .cssmenu_horiz ul a:active > .sf-sub-indicator,
+div.navbar .cssmenu_horiz ul li:hover > a > .sf-sub-indicator,
+div.navbar .cssmenu_horiz ul li.sfHover > a > .sf-sub-indicator {
+	background-position: -10px -100px; /* arrow hovers for modern browsers*/
+}
+
+/*** remove shadow on first submenu ***/
+div.navbar .cssmenu_horiz > li > ul {
+	background: transparent;
+	padding: 0;
+	-moz-border-radius-bottomleft: 0;
+	-moz-border-radius-topright: 0;
+	-webkit-border-top-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+}
\ No newline at end of file

Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql
===================================================================
--- branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/db/tiki-4.0-mysql.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -1351,7 +1351,7 @@
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Search','tiki-searchindex.php',13,'feature_search','tiki_p_search','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Contact Us','tiki-contact.php',20,'feature_contact,feature_messages','','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Stats','tiki-stats.php',23,'feature_stats','tiki_p_view_stats','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','',0);
+INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_category','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Freetags','tiki-browse_freetags.php',27,'feature_freetags','tiki_p_view_freetags','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Calendar','tiki-calendar.php',35,'feature_calendar','tiki_p_view_calendar','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Users Map','tiki-gmap_usermap.php',36,'feature_gmap','','',0);
@@ -2015,6 +2015,7 @@
   `subject` varchar(200) default NULL,
   `data` longblob,
   `datatxt` longblob,
+  `wysiwyg` char(1) default NULL,
   PRIMARY KEY (`editionId`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
@@ -2325,8 +2326,10 @@
   `itemId` int(12) NOT NULL auto_increment,
   `trackerId` int(12) NOT NULL default '0',
   `created` int(14) default NULL,
+  `createdBy` varchar(200) default NULL,
   `status` char(1) default NULL,
   `lastModif` int(14) default NULL,
+  `lastModifBy` varchar(200) default NULL,
   PRIMARY KEY (`itemId`),
   INDEX trackerId (trackerId)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 ;

Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql
===================================================================
--- branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/db/tiki-4.0-mysqli.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -1351,7 +1351,7 @@
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Search','tiki-searchindex.php',13,'feature_search','tiki_p_search','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Contact Us','tiki-contact.php',20,'feature_contact,feature_messages','','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Stats','tiki-stats.php',23,'feature_stats','tiki_p_view_stats','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','',0);
+INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_category','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Freetags','tiki-browse_freetags.php',27,'feature_freetags','tiki_p_view_freetags','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Calendar','tiki-calendar.php',35,'feature_calendar','tiki_p_view_calendar','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Users Map','tiki-gmap_usermap.php',36,'feature_gmap','','',0);
@@ -2008,6 +2008,7 @@
   `subject` varchar(200) default NULL,
   `data` longblob,
   `datatxt` longblob,
+  `wysiwyg` char(1) default NULL,
   PRIMARY KEY (`editionId`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
@@ -2318,8 +2319,10 @@
   `itemId` int(12) NOT NULL auto_increment,
   `trackerId` int(12) NOT NULL default '0',
   `created` int(14) default NULL,
+  `createdBy` varchar(200) default NULL,
   `status` char(1) default NULL,
   `lastModif` int(14) default NULL,
+  `lastModifBy` varchar(200) default NULL,
   PRIMARY KEY (`itemId`),
   INDEX trackerId (trackerId)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 ;

Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql
===================================================================
--- branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/db/tiki-4.0-pgsql.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -1535,7 +1535,7 @@
 
 INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Stats','tiki-stats.php',23,'feature_stats','tiki_p_view_stats','',0);
 
-INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','',0);
+INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_category','',0);
 
 INSERT INTO "tiki_menu_options" ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Freetags','tiki-browse_freetags.php',27,'feature_freetags','tiki_p_view_freetags','',0);
 
@@ -2461,6 +2461,7 @@
   "subject" varchar(200) default NULL,
   "data" bytea,
   "datatxt" bytea,
+  "wysiwyg" char(1) default NULL,
   PRIMARY KEY ("editionId")
 ) ;
 
@@ -2818,8 +2819,10 @@
   "itemId" bigserial,
   "trackerId" bigint NOT NULL default '0',
   "created" bigint default NULL,
+  "createdBy" varchar(200) default NULL,
   "status" char(1) default NULL,
   "lastModif" bigint default NULL,
+  "lastModifBy" varchar(200) default NULL,
   PRIMARY KEY ("itemId")
 ) ;
 CREATE INDEX "tiki_tracker_items_trackerId" ON "tiki_tracker_items" ("trackerId");

Modified: branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql
===================================================================
--- branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/db/tiki-4.0-sqlite.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -1545,7 +1545,7 @@
 
 INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Stats','tiki-stats.php',23,'feature_stats','tiki_p_view_stats','',0);
 
-INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','',0);
+INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_category','',0);
 
 INSERT INTO "," ("menuId","type","name","url","position","section","perm","groupname","userlevel") VALUES (42,'o','Freetags','tiki-browse_freetags.php',27,'feature_freetags','tiki_p_view_freetags','',0);
 
@@ -2472,6 +2472,7 @@
   subject varchar(200) default NULL,
   data bytea,
   datatxt bytea,
+  wysiwyg char(1) default NULL,
   PRIMARY KEY (editionId)
 ) ENGINE=MyISAM ;
 
@@ -2830,8 +2831,10 @@
   itemId INTEGER,
   trackerId bigint NOT NULL default '0',
   created bigint default NULL,
+  createdBy varchar(200) default NULL,
   status char(1) default NULL,
   lastModif bigint default NULL,
+  lastModifBy varchar(200) default NULL,
   PRIMARY KEY (itemId),
   "INDEX" trackerId (trackerId)
 ) ENGINE=MyISAM ;

Modified: branches/experimental/kaltura_integration_two/db/tiki.sql
===================================================================
--- branches/experimental/kaltura_integration_two/db/tiki.sql	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/db/tiki.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -1351,7 +1351,7 @@
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Search','tiki-searchindex.php',13,'feature_search','tiki_p_search','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Contact Us','tiki-contact.php',20,'feature_contact,feature_messages','','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Stats','tiki-stats.php',23,'feature_stats','tiki_p_view_stats','',0);
-INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_categories','',0);
+INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Categories','tiki-browse_categories.php',25,'feature_categories','tiki_p_view_category','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Freetags','tiki-browse_freetags.php',27,'feature_freetags','tiki_p_view_freetags','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Calendar','tiki-calendar.php',35,'feature_calendar','tiki_p_view_calendar','',0);
 INSERT INTO `tiki_menu_options` (`menuId`, `type`, `name`, `url`, `position`, `section`, `perm`, `groupname`, `userlevel`) VALUES (42,'o','Users Map','tiki-gmap_usermap.php',36,'feature_gmap','','',0);
@@ -2015,6 +2015,7 @@
   `subject` varchar(200) default NULL,
   `data` longblob,
   `datatxt` longblob,
+  `wysiwyg` char(1) default NULL,
   PRIMARY KEY (`editionId`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
 
@@ -2325,8 +2326,10 @@
   `itemId` int(12) NOT NULL auto_increment,
   `trackerId` int(12) NOT NULL default '0',
   `created` int(14) default NULL,
+  `createdBy` varchar(200) default NULL,
   `status` char(1) default NULL,
   `lastModif` int(14) default NULL,
+  `lastModifBy` varchar(200) default NULL,
   PRIMARY KEY (`itemId`),
   INDEX trackerId (trackerId)
 ) ENGINE=MyISAM AUTO_INCREMENT=1 ;

Modified: branches/experimental/kaltura_integration_two/img/tiki/tiki3.gif
===================================================================
(Binary files differ)


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-21110,21216-21229
   + /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,21216-21531


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-21110,21216-21229
   + /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,21216-21531


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-21110,21216-21229
   + /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,21216-21531


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-21110,21216-21229
   + /trunk/installer/schema/20090727_category_permissions_tiki.sql:20962-21110,21216-21531


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-21110,21216-21229
   + /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,21216-21531


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-21110,21216-21229
   + /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,21216-21531

Copied: branches/experimental/kaltura_integration_two/installer/schema/20090904_wysiwyg_newsletters_tiki.sql (from rev 21531, trunk/installer/schema/20090904_wysiwyg_newsletters_tiki.sql)
===================================================================
--- branches/experimental/kaltura_integration_two/installer/schema/20090904_wysiwyg_newsletters_tiki.sql	                        (rev 0)
+++ branches/experimental/kaltura_integration_two/installer/schema/20090904_wysiwyg_newsletters_tiki.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -0,0 +1 @@
+ALTER TABLE `tiki_sent_newsletters` ADD COLUMN `wysiwyg` char(1) default NULL;
\ No newline at end of file

Copied: branches/experimental/kaltura_integration_two/installer/schema/20090911_tracker_item_change_user.sql (from rev 21531, trunk/installer/schema/20090911_tracker_item_change_user.sql)
===================================================================
--- branches/experimental/kaltura_integration_two/installer/schema/20090911_tracker_item_change_user.sql	                        (rev 0)
+++ branches/experimental/kaltura_integration_two/installer/schema/20090911_tracker_item_change_user.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -0,0 +1,2 @@
+ALTER TABLE `tiki_tracker_items` ADD COLUMN `createdBy` varchar(200) default NULL;
+ALTER TABLE `tiki_tracker_items` ADD COLUMN `lastModifBy` varchar(200) default NULL;

Copied: branches/experimental/kaltura_integration_two/installer/schema/20090912_change_feature_name_for_lesser_magic_tiki.sql (from rev 21531, trunk/installer/schema/20090912_change_feature_name_for_lesser_magic_tiki.sql)
===================================================================
--- branches/experimental/kaltura_integration_two/installer/schema/20090912_change_feature_name_for_lesser_magic_tiki.sql	                        (rev 0)
+++ branches/experimental/kaltura_integration_two/installer/schema/20090912_change_feature_name_for_lesser_magic_tiki.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -0,0 +1,7 @@
+#pkdille
+update tiki_preferences set name='feature_use_minified_scripts' where name='use_minified_scripts';
+update tiki_preferences set name='feature_debug_ignore_xdebug' where name='debug_ignore_xdebug';
+
+
+
+

Copied: branches/experimental/kaltura_integration_two/installer/schema/20090913_adedby_tik_security.sql (from rev 21531, trunk/installer/schema/20090913_adedby_tik_security.sql)
===================================================================
--- branches/experimental/kaltura_integration_two/installer/schema/20090913_adedby_tik_security.sql	                        (rev 0)
+++ branches/experimental/kaltura_integration_two/installer/schema/20090913_adedby_tik_security.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -0,0 +1,2 @@
+#ricks99
+ALTER TABLE tiki_plugin_security ADD added_by VARCHAR( 200 ) NULL AFTER status;
\ No newline at end of file

Copied: branches/experimental/kaltura_integration_two/installer/schema/20090913_plugin_security_addedby_tiki.sql (from rev 21531, trunk/installer/schema/20090913_plugin_security_addedby_tiki.sql)
===================================================================
--- branches/experimental/kaltura_integration_two/installer/schema/20090913_plugin_security_addedby_tiki.sql	                        (rev 0)
+++ branches/experimental/kaltura_integration_two/installer/schema/20090913_plugin_security_addedby_tiki.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -0,0 +1,2 @@
+#ricks99
+ALTER TABLE tiki_plugin_security ADD added_by VARCHAR( 200 ) NULL AFTER status;
\ No newline at end of file

Copied: branches/experimental/kaltura_integration_two/installer/schema/20090915_change_perms_for_browse_cats_tiki.sql (from rev 21531, trunk/installer/schema/20090915_change_perms_for_browse_cats_tiki.sql)
===================================================================
--- branches/experimental/kaltura_integration_two/installer/schema/20090915_change_perms_for_browse_cats_tiki.sql	                        (rev 0)
+++ branches/experimental/kaltura_integration_two/installer/schema/20090915_change_perms_for_browse_cats_tiki.sql	2009-09-16 14:03:44 UTC (rev 21533)
@@ -0,0 +1 @@
+UPDATE `tiki_menu_options` SET `perm` = 'tiki_p_view_category' WHERE `perm` = 'tiki_p_view_categories';

Modified: branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php
===================================================================
--- branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php	2009-09-16 12:21:05 UTC (rev 21532)
+++ branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php	2009-09-16 14:03:44 UTC (rev 21533)
@@ -35,6 +35,7 @@
 		}
 		
 		$distinct = '';
+		$join_tables = '';
 		if (!empty($filter)) {
 			$tmp_mid = array();
 			foreach ($filter as $type=>$val) {
@@ -60,7 +61,7 @@
 				$mid .= implode( ' and ', $tmp_mid ) . ')';
 			}
 		}
-		if (is_array($join_bindvars)) {
+		if (!empty($join_bindvars)) {
 			$bindvars = array_merge($bindvars, $join_bindvars);
 		}
 
@@ -616,33 +617,48 @@
 	}
 	
 	function importCSV($fname, $calendarId) {
-		global $user;
-		$fhandle = fopen($fname, "r");
-		$fields = fgetcsv($fhandle, 1000);
+		global $user, $smarty;
+		$fields = false;
+		if ($fhandle = fopen($fname, 'r')) {
+			$fields = fgetcsv($fhandle, 1000);
+		}
 		if ($fields === false) {
 			$smarty->assign('msg', tra("The file is not a CSV file or has not a correct syntax"));
 			$smarty->display("error.tpl");
 			die;
 		}
-
-		while (!feof($fhandle)) {
-			$data = fgetcsv($fhandle, 1000);
+		$nb = 0;
+		while (($data = fgetcsv($fhandle, 1000)) !== FALSE) {
 			$d = array("calendarId"=>$calendarId, "calitemId"=>"0", "name"=>"", "description" =>"", "locationId"=>"", 
-					"organizers"=>"", "participants"=>"","status"=>"0","priority"=>"5","categoryId"=>"0","newloc"=>"0","newcat"=>"","nlId"=>"","lang"=>"");
+					   "organizers"=>"", "participants"=>"","status"=>"0","priority"=>"5","categoryId"=>"0","newloc"=>"0","newcat"=>"","nlId"=>"","lang"=>"", 'start'=>'', 'end'=>'');
 			foreach ($fields as $field) {
-				$d[strtolower($field)] = $data[array_search($field, $fields)];
+				$d[$field] = $data[array_search($field, $fields)];
 			}
 			if (isset($d["subject"]) && empty($d["name"]))
 				$d["name"] = $d["subject"];
-			if (isset($d["start date"]) && isset($d["start time"]))
-				$d["start"] = strtotime($d["start time"], strtotime($d["start date"]));
-			if (isset($d["end date"]) && isset($d["end time"]))
-				$d["end"] = strtotime($d["end time"], strtotime($d["end date"]));
+			if (isset($d['start date'])) {
+				if (isset($d['start time'])) {
+					$d['start'] = strtotime($d['start time'], strtotime($d['start date']));
+				} else {
+					$d['start'] = strtotime($d['start date']);
+				}
+			}
+			if (isset($d['end date'])) {
+				echo 'fff';
+				if (isset($d['end time'])) {
+					$d['end'] = strtotime($d['end time'], strtotime($d['end date']));
+				} else {
+					$d['end'] = strtotime($d['end date']);
+				}
+			}
 // TODO do a replace if name, calendarId, start, end exists
-			$this->set_item($user, 0, $d);
+			if (!empty($d['start']) && !empty($d['end'])) {		
+				$this->set_item($user, 0, $d);
+				++$nb;
+			}
 		}
 		fclose ($fhandle);
-		return true;
+		return $nb;
 	}
 
 	function upcoming_events($maxrows = -1, $calendarId = 0, $maxDays = -1, $order = 'start_asc', $priorDays = 0) {


Property changes on: branches/experimental/kaltura_integration_two/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:20049-20460,20962-21110,21216-21229
   + /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:20049-20460,20962-21110,21216-21531


Property changes on: branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0/lib/core/lib/Multilingual/...
 
[truncated message content]