Permalink
Browse files

[merge -r4379:4519 http://svn.modxcms.com/svn/tattoo/tattoo/branches/…

…0.9.6]

* Reversed changes made to how rb_base_url and rb_base_path settings were handled. 
* Updated resource browser config to accommodate changes. Added checks that allow for better handling and detection of URL paths when strip_image_paths setting is off. 
* Updated TinyMCE config to accommodate changes.
* Updated image TV preview to account for TVs with underscores "_" in their name.
* Removing reference snippets to address http://secunia.com/Advisories/32824/
* Updating reference AjaxSearch snippet to be non-executable for security purposes
* Updated Image TV Preview plugin to support @INHERIT binding
* Fixed issues with paths and the strip_image_path setting in the resource browser 
* Added a few bits that fix issues with TinyMCE and FCKEditor
* Made one minor change to TinyMCE due to changes to resource browser config file
* [#MODX-468] and [#MODX-469] Japanese language file updates.
* Update calls in various manager actions/processors to mysql_query to use DBAPI.
* Modified strict sql_mode check to be a warning rather than an error that prevents installation.
* Fix XSS vulnerabilities in weblogin (error in preserveUrls() function and not escaping username input using htmlspecialchars() properly). [JVN#10170564]
  • Loading branch information...
1 parent c99c527 commit cbd8847bd34e75c267f08bd8244b30fd4ef3abf4 @opengeek opengeek committed Dec 5, 2008
Showing with 2,563 additions and 4,081 deletions.
  1. +3 −2 assets/plugins/tinymce3201/plugin.tinymce.tpl
  2. +10 −5 assets/plugins/tinymce3201/tinymce.functions.php
  3. +1 −1 assets/snippets/ajaxSearch/ajaxSearch_readme.txt
  4. 0 assets/snippets/ajaxSearch/{snippet.ajaxSearch.php → snippet.ajaxSearch.txt}
  5. +0 −1,084 assets/snippets/ditto/snippet.ditto.php
  6. +0 −482 assets/snippets/reflect/snippet.reflect.php
  7. +1 −1 assets/snippets/weblogin/weblogin.common.inc.php
  8. +1 −1 assets/snippets/weblogin/weblogin.inc.php
  9. +1 −1 assets/snippets/weblogin/weblogin.processor.inc.php
  10. +3 −4 install/action.summary.php
  11. +9 −0 install/changelog.txt
  12. +1 −1 install/instprocessor.php
  13. +5 −4 install/lang/english/english.inc.php
  14. +41 −40 install/lang/japanese-utf8/japanese-utf8.inc.php
  15. +12 −3 install/plugin.imageTVpreview.tpl
  16. +3 −2 install/plugin.tinymce.tpl
  17. +1 −1 install/setup.info.php
  18. +14 −4 manager/actions/mutate_settings.dynamic.php
  19. +230 −230 manager/actions/resources.static.php
  20. +98 −92 manager/includes/lang/japanese-utf8.inc.php
  21. +2 −2 manager/includes/version.inc.php
  22. +2 −2 manager/media/ImageEditor/config.inc.php
  23. +1 −1 manager/media/browser/mcpuk/browser.php
  24. +12 −6 manager/media/browser/mcpuk/connectors/php/config.php
  25. +128 −128 manager/processors/save_htmlsnippet.processor.php
  26. +184 −184 manager/processors/save_module.processor.php
  27. +177 −177 manager/processors/save_plugin.processor.php
  28. +69 −69 manager/processors/save_settings.processor.php
  29. +163 −163 manager/processors/save_snippet.processor.php
  30. +141 −141 manager/processors/save_template.processor.php
  31. +222 −222 manager/processors/save_tmplvars.processor.php
  32. +568 −568 manager/processors/save_user.processor.php
  33. +460 −460 manager/processors/save_web_user.processor.php
@@ -22,6 +22,7 @@ if(!isset($tinyPath)) {
$tinyURL = $modx->config['base_url'].'assets/plugins/'.$pluginfolder;
}
$base_url = $modx->config['base_url'];
+$site_url = $modx->config['site_url'];
$displayStyle = ( ($_SESSION['browser']=='mz') || ($_SESSION['browser']=='op') ) ? "table-row" : "block" ;
// Handle event
@@ -39,12 +40,12 @@ switch ($e->name) {
$frontend_language = isset($modx->config['fe_editor_lang']) ? $modx->config['fe_editor_lang']:"";
$tinymce_language = getTinyMCELang($frontend_language);
$webuser = (isset($modx->config['rb_webuser']) ? $modx->config['rb_webuser'] : null);
- $html = getTinyMCEScript($elementList,$webtheme,$width,$height,$tinymce_language,$frontend,$base_url, $webPlugins, $webButtons1, $webButtons2, $webButtons3, $webButtons4, $disabledButtons, $tinyFormats, $entity_encoding, $entities, $tinyPathOptions, $tinyCleanup, $tinyResizing, $modx->config['editor_css_path'], $modx->config['tinymce_css_selectors'], $modx->config['use_browser'], $webAlign, null, null, $tinyLinkList, $customparams, $tinyURL, $webuser);
+ $html = getTinyMCEScript($elementList,$webtheme,$width,$height,$tinymce_language,$frontend,$base_url, $site_url, $webPlugins, $webButtons1, $webButtons2, $webButtons3, $webButtons4, $disabledButtons, $tinyFormats, $entity_encoding, $entities, $tinyPathOptions, $tinyCleanup, $tinyResizing, $modx->config['editor_css_path'], $modx->config['tinymce_css_selectors'], $modx->config['use_browser'], $webAlign, null, null, $tinyLinkList, $customparams, $tinyURL, $webuser);
} else {
$frontend = 'false';
$manager_language = $modx->config['manager_language'];
$tinymce_language = getTinyMCELang($manager_language);
- $html = getTinyMCEScript($elementList, $modx->config['tinymce_editor_theme'], $width='100%', $height='400px', $tinymce_language, $frontend, $modx->config['base_url'], $modx->config['tinymce_custom_plugins'], $modx->config['tinymce_custom_buttons1'], $modx->config['tinymce_custom_buttons2'], $modx->config['tinymce_custom_buttons3'], $modx->config['tinymce_custom_buttons4'], $disabledButtons, $tinyFormats, $entity_encoding, $entities, $tinyPathOptions, $tinyCleanup, $tinyResizing, $modx->config['editor_css_path'], $modx->config['tinymce_css_selectors'], $modx->config['use_browser'], $modx->config['manager_direction'], $advimage_styles, $advlink_styles, $tinyLinkList, $customparams, $tinyURL, null);
+ $html = getTinyMCEScript($elementList, $modx->config['tinymce_editor_theme'], $width='100%', $height='400px', $tinymce_language, $frontend, $modx->config['base_url'], $modx->config['site_url'], $modx->config['tinymce_custom_plugins'], $modx->config['tinymce_custom_buttons1'], $modx->config['tinymce_custom_buttons2'], $modx->config['tinymce_custom_buttons3'], $modx->config['tinymce_custom_buttons4'], $disabledButtons, $tinyFormats, $entity_encoding, $entities, $tinyPathOptions, $tinyCleanup, $tinyResizing, $modx->config['editor_css_path'], $modx->config['tinymce_css_selectors'], $modx->config['use_browser'], $modx->config['manager_direction'], $advimage_styles, $advlink_styles, $tinyLinkList, $customparams, $tinyURL, null);
}
$e->output($html);
}
@@ -90,7 +90,7 @@ function getTinyMCESettings($_lang, $path, $manager_language='english', $use_edi
// getTinyMCEScript function
if (!function_exists('getTinyMCEScript')) {
- function getTinyMCEScript($elmList, $theme='simple', $width, $height, $language='en', $frontend, $base_url, $plugins, $buttons1, $buttons2, $buttons3, $buttons4, $disabledButtons, $blockFormats, $entity_encoding, $entities, $pathoptions, $cleanup, $resizing, $css_path, $css_selectors, $use_browser, $toolbar_align, $advimage_styles, $advlink_styles, $linklist, $customparams, $tinyURL, $webuser) {
+ function getTinyMCEScript($elmList, $theme='simple', $width, $height, $language='en', $frontend, $base_url, $site_url, $plugins, $buttons1, $buttons2, $buttons3, $buttons4, $disabledButtons, $blockFormats, $entity_encoding, $entities, $pathoptions, $cleanup, $resizing, $css_path, $css_selectors, $use_browser, $toolbar_align, $advimage_styles, $advlink_styles, $linklist, $customparams, $tinyURL, $webuser) {
// Set theme
if($theme == "editor" || $theme == "custom" || $theme == "full"){
$tinyTheme = "advanced";
@@ -110,24 +110,29 @@ function getTinyMCEScript($elmList, $theme='simple', $width, $height, $language=
switch($pathoptions){
case "rootrelative":
$relative_urls = "false";
- $convert_urls = false;
+ $document_base_url = " document_base_url : \"".$site_url."\",\n";
+ $convert_urls = true;
$remove_script_host = "true";
break;
case "docrelative":
$relative_urls = "true";
- $document_base_url = " document_base_url : \"".$base_url."\",\n";
+ $document_base_url = " document_base_url : \"".$site_url."\",\n";
+ $convert_urls = true;
$remove_script_host = "true";
break;
case "fullpathurl":
$relative_urls = "false";
+ $document_base_url = " document_base_url : \"".$site_url."\",\n";
$remove_script_host = "false";
+ $convert_urls = true;
break;
default:
$relative_urls = "true";
- $document_base_url = " document_base_url : \"".$base_url."\",\n";
+ $document_base_url = " document_base_url : \"".$site_url."\",\n";
+ $convert_urls = true;
$remove_script_host = "true";
}
@@ -164,7 +169,7 @@ function getTinyMCEScript($elmList, $theme='simple', $width, $height, $language=
$tinyCallback = <<<TINY_CALLBACK
function myFileBrowser (field_name, url, type, win) {
- var cmsURL = '{$base_url}manager/media/browser/mcpuk/browser.php?Connector={$base_url}manager/media/browser/mcpuk/connectors/php/connector.php&ServerPath={$base_url}&editor=tinymce3&editorpath={$tinyURL}'; // script URL - use an absolute path!
+ var cmsURL = '{$base_url}manager/media/browser/mcpuk/browser.php?Connector={$base_url}manager/media/browser/mcpuk/connectors/php/connector.php&ServerPath={$base_url}&editor=tinymce&editorpath={$tinyURL}'; // script URL - use an absolute path!
switch (type) {
case "image":
type = 'images';
@@ -464,7 +464,7 @@ This is done automatically with the addJscript parameter unless you set it to 0.
:: How-to use this snippet
-----------------------------------------------------------------
-1. Copy the contents of the file snippet.ajaxSearch.php into a new snippet named AjaxSearch
+1. Copy the contents of the file snippet.ajaxSearch.txt into a new snippet named AjaxSearch
2. Create a directory named ajaxSearch under the assets/snippets folder.
Oops, something went wrong.

0 comments on commit cbd8847

Please sign in to comment.