From 0010134059e0ea41cb894b6bfd4a02636f7595b6 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 21 Feb 2008 23:07:11 +0000
Subject: [PATCH] fixed: Rich editor page and image pickers are broken

---
 docs/changelog/7.x.x.txt                                  | 1 +
 lib/WebGUI/Operation.pm                                   | 8 --------
 .../tiny_mce/plugins/insertImage/insertImage.html         | 6 +++---
 .../jscripts/tiny_mce/plugins/pagetree/editor_plugin.js   | 2 +-
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 82446da33..62989ba47 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -7,6 +7,7 @@
  - More i18n for Gallery templates
  - fix: Add an Album button now appears on Gallery List Albums view for those
    authorized.
+ - fixed: Rich editor page and image pickers are broken
 
 7.5.2
  - add: Auth modules now accept a "returnUrl" form parameter when logging in
diff --git a/lib/WebGUI/Operation.pm b/lib/WebGUI/Operation.pm
index 45e8d0f04..7648b1626 100644
--- a/lib/WebGUI/Operation.pm
+++ b/lib/WebGUI/Operation.pm
@@ -130,15 +130,7 @@ sub getOperations {
 		'editDatabaseLinkSave' => 'DatabaseLink',
 		'listDatabaseLinks' => 'DatabaseLink',
 
-		'formAssetTree' => 'FormHelpers',
 		'formHelper' => 'FormHelpers',
-		'richEditAddFolder' => 'FormHelpers',
-		'richEditAddFolderSave' => 'FormHelpers',
-		'richEditAddImage' => 'FormHelpers',
-		'richEditAddImageSave' => 'FormHelpers',
-		'richEditImageTree' => 'FormHelpers',
-		'richEditPageTree' => 'FormHelpers',
-		'richEditViewThumbnail' => 'FormHelpers',
 
 		'addGroupsToGroupSave' => 'Group',
 		'addUsersToGroupSave' => 'Group',
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
index 8df65185a..59482a53e 100644
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/insertImage/insertImage.html
@@ -36,8 +36,8 @@ function Init() {
     var seperator = '';
     if (pageURL.match(/\?/)) { seperator = ';' } else { seperator = '?'}
     
-    document.getElementById("lister").src = pageURL + seperator + 'op=richEditImageTree&DPI=' + dpi;
-    document.getElementById("viewer").src = pageURL + seperator + 'op=richEditViewThumbnail&DPI=' + dpi;
+    document.getElementById("lister").src = pageURL + seperator + 'op=formHelper;class=HTMLArea;sub=imageTree&DPI=' + dpi;
+    document.getElementById("viewer").src = pageURL + seperator + 'op=formHelper;class=HTMLArea;sub=viewThumbnail&DPI=' + dpi;
 
     var txtFileName = document.getElementById("txtFileName");
 		
@@ -146,7 +146,7 @@ function resetForm() {
            document.getElementById("thumbnailSize").value = '';         
            document.getElementById("description").value = '';         
            document.getElementById("folder").value = '';
-           document.getElementById("viewer").src=window.opener.getWebguiProperty("pageURL") + "?op=richEditImageTree";
+           document.getElementById("viewer").src=window.opener.getWebguiProperty("pageURL") + "?op=formHelper;class=HTMLArea;sub=imageTree";
        }else {
        	   initialLoad=false;
        }
diff --git a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
index 55f40545c..62e78b99a 100755
--- a/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
+++ b/www/extras/tinymce2/jscripts/tiny_mce/plugins/pagetree/editor_plugin.js
@@ -27,7 +27,7 @@ function TinyMCE_pagetree_execCommand(editor_id, element, command, user_interfac
 			var template = new Array();
 			//Check for proper get delimiter
  	                var separator = getWebguiProperty("pageURL").match(/\?/)? ';' : '?';
- 	                template['file'] = "../../../../../.." + getWebguiProperty("pageURL") + separator + 'op=richEditPageTree';
+ 	                template['file'] = "../../../../../.." + getWebguiProperty("pageURL") + separator + 'op=formHelper;class=HTMLArea;sub=pageTree';
 			template['width'] = 500;
 			template['height'] = 500;
 			tinyMCE.openWindow(template, {editor_id : editor_id, scrollbars : "yes"} );