Changeset 892

Timestamp:

09/14/07 18:19:33 (6 years ago)

Author:

ray

Message:

update branch with changes from trunk

Location:

branches/ray

Files:

• XinhaCore.js (modified) (29 diffs)
• contrib/compress.php (modified) (1 diff)
• contrib/lc_parse_strings.php (modified) (6 diffs)
• examples/Newbie.html (added)
• examples/XinhaConfig.js (added)
• lang/pt_br.js (modified) (1 diff)
• lang/th.js (added)
• modules/ColorPicker/lang (added)
• modules/ColorPicker/lang/pt_br.js (added)
• modules/CreateLink/lang (added)
• modules/CreateLink/lang/pt_br.js (added)
• modules/CreateLink/link.html (deleted)
• modules/CreateLink/link.js (moved) (moved from branches/ray/modules/CreateLink/CreateLink.js)
• modules/FullScreen/lang/pt_br.js (added)
• modules/Gecko/lang (added)
• modules/Gecko/lang/pt_br.js (added)
• modules/GetHtml/DOMwalk.js (modified) (1 diff)
• modules/GetHtml/TransformInnerHTML.js (modified) (1 diff)
• modules/GetHtml/lang (added)
• modules/GetHtml/lang/pt_br.js (added)
• modules/InsertImage/insert_image.html (deleted)
• modules/InsertImage/insert_image.js (moved) (moved from branches/ray/modules/InsertImage/InsertImage.js)
• modules/InsertTable/insert_table.html (deleted)
• modules/InsertTable/insert_table.js (moved) (moved from branches/ray/modules/InsertTable/InsertTable.js)
• plugins/CharacterMap/lang/pt_br.js (added)
• plugins/ExtendedFileManager/extended-file-manager.js (modified) (1 diff)
• plugins/ExtendedFileManager/lang/nl.js (modified) (3 diffs)
• plugins/ExtendedFileManager/lang/pt_br.js (added)
• plugins/ImageManager/assets/manager.js (modified) (3 diffs)
• plugins/ImageManager/images.php (modified) (2 diffs)
• plugins/ImageManager/lang/nl.js (added)
• plugins/ImageManager/lang/pt_br.js (added)
• plugins/InsertAnchor/lang/pt_br.js (added)
• plugins/InsertSnippet/lang/nl.js (added)
• plugins/InsertSnippet/lang/pt_br.js (added)
• plugins/InsertSnippet/snippets.php (modified) (1 diff)
• plugins/Linker/lang/nl.js (added)
• plugins/Linker/lang/pt_br.js (added)
• plugins/PasteText/lang/nl.js (added)
• plugins/PasteText/lang/pt_br.js (added)
• plugins/SaveSubmit/lang/nl.js (added)
• plugins/SaveSubmit/lang/pt_br.js (added)
• plugins/SmartReplace/lang/nl.js (added)
• plugins/SmartReplace/lang/pt_br.js (added)
• plugins/Stylist/lang/nl.js (added)
• plugins/Stylist/lang/pt_br.js (added)
• plugins/SuperClean/lang/nl.js (added)
• plugins/SuperClean/lang/pt_br.js (added)
• plugins/SuperClean/tidy.php (modified) (1 diff)
• plugins/TableOperations/lang/pt_br.js (added)
• popups/popup.js (modified) (1 diff)
• skins/silva/skin.css (modified) (1 diff)

branches/ray/XinhaCore.js

@@ -671 +671 @@
   this.stripBaseHref = true;
 
-   /**  We can strip the url of the editor page from named links (eg <a href="#top">...</a>)
-   *  reason for this is that mozilla at least (and IE ?) prefixes location.href to any anchor
-   *  that don't have a url prefixing them<br />
+   /**  We can strip the url of the editor page from named links (eg &lt;a href="#top"&gt;...&lt;/a&gt;) and links 
+   *  that consist only of URL parameters (eg &lt;a href="?parameter=value"&gt;...&lt;/a&gt;)
+   *  reason for this is that browsers tend to prefixe location.href to any href that
+   *  that don't have a full url<br />
    *  Default: <code>true</code>
    *  @type Boolean
@@ -970 +971 @@
   this.URIs =
   {
-   "blank": "popups/blank.html",
+   "blank": _editor_url + "popups/blank.html",
    "link":  _editor_url + "modules/CreateLink/link.html",
    "insert_image": _editor_url + "modules/InsertImage/insert_image.html",
    "insert_table":  _editor_url + "modules/InsertTable/insert_table.html",
-   "select_color": "select_color.html",
-   "about": "about.html",
-   "help": "editor_help.html"
+   "select_color": _editor_url + "popups/select_color.html",
+   "about": _editor_url + "popups/about.html",
+   "help": _editor_url + "popups/editor_help.html"
   };
 
@@ -2013 +2014 @@
     if ( !found )
     {
-      Xinha.loadStyle(_editor_css,null,"XinhaCoreDesign");
+      Xinha.loadStyle(_editor_css,null,"XinhaCoreDesign",true);
     }
   }
@@ -2037 +2038 @@
   {
     url = _editor_url + 'modules/InternetExplorer/InternetExplorer.js';
-    if ( typeof InternetExplorer == 'undefined' && !document.getElementById(url) )
+    if ( !Xinha.loadPlugins(["InternetExplorer"], function() { editor.generate(); }, url ) )
     {            
-      Xinha.loadPlugin("InternetExplorer", function() { editor.generate(); }, url );
       return false;
     }
@@ -2047 +2047 @@
   {
     url = _editor_url + 'modules/Gecko/Gecko.js';
-    if ( typeof Gecko == 'undefined' && !document.getElementById(url) )
+    if ( !Xinha.loadPlugins(["Gecko"], function() { editor.generate(); }, url ) )
     {            
-      Xinha.loadPlugin("Gecko", function() { editor.generate(); }, url );
       return false;
     }
@@ -2066 +2065 @@
   
   url = _editor_url + 'modules/FullScreen/full-screen.js';
-  if ( typeof FullScreen == "undefined" && !document.getElementById(url) )
-  {
-    Xinha.loadPlugin("FullScreen", function() { editor.generate(); }, url );
+  if ( !Xinha.loadPlugins(["FullScreen"], function() { editor.generate(); }, url ))
+  {
     return false;
   }
   
   url = _editor_url + 'modules/ColorPicker/ColorPicker.js';
-  if ( typeof ColorPicker == 'undefined' && !document.getElementById(url) )
-  {
-    Xinha.loadPlugin("ColorPicker", function() { editor.generate(); } , url );
+  if ( !Xinha.loadPlugins(["ColorPicker"], function() { editor.generate(); } , url ) )
+  {
     return false;
   }
@@ -2091 +2088 @@
         break;
         case "insertimage":
-          url = _editor_url + 'modules/InsertImage/InsertImage.js';
-          if ( typeof InsertImage == 'undefined' && typeof Xinha.prototype._insertImage == 'undefined' && !document.getElementById(url) )
+          url = _editor_url + 'modules/InsertImage/insert_image.js';
+          if ( typeof Xinha.prototype._insertImage == 'undefined' && !Xinha.loadPlugins(["InsertImage"], function() { editor.generate(); } , url ) )
           {
-            Xinha.loadPlugin("InsertImage", function() { editor.generate(); } , url );
             return false;
           }
@@ -2100 +2096 @@
         break;
         case "createlink":
-          url = _editor_url + 'modules/CreateLink/CreateLink.js';
-          if ( typeof CreateLink == 'undefined' && typeof Xinha.prototype._createLink == 'undefined' &&  typeof Linker == 'undefined' && !document.getElementById(url))
+          url = _editor_url + 'modules/CreateLink/link.js';
+          if ( typeof Linker == 'undefined' && !Xinha.loadPlugins(["CreateLink"], function() { editor.generate(); } , url ))
           {
-            Xinha.loadPlugin("CreateLink", function() { editor.generate(); } , url );
             return false;
           }
@@ -2109 +2104 @@
         break;
         case "inserttable":
-          url = _editor_url + 'modules/InsertTable/InsertTable.js';
-          if ( typeof InsertTable == 'undefined' && typeof Xinha.prototype._insertTable == 'undefined' && !document.getElementById(url) )
+          url = _editor_url + 'modules/InsertTable/insert_table.js';
+          if ( !Xinha.loadPlugins(["InsertTable"], function() { editor.generate(); } , url ) )
           {
-            Xinha.loadPlugin("InsertTable", function() { editor.generate(); } , url );
             return false;
           }
@@ -2133 +2127 @@
       break;
     }
-    if ( typeof EnterParagraphs == 'undefined'  && !document.getElementById(ParaHandlerPlugin) )
-    {
-      Xinha.loadPlugin("EnterParagraphs", function() { editor.generate(); }, ParaHandlerPlugin );
+    if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, ParaHandlerPlugin ) )
+    {
       return false;
     }
@@ -2151 +2144 @@
   }
   
-  if (typeof GetHtmlImplementation == 'undefined'  && !document.getElementById(getHtmlMethodPlugin))
-  {
-    Xinha.loadPlugin("GetHtmlImplementation", function() { editor.generate(); } , getHtmlMethodPlugin);
+  if ( !Xinha.loadPlugins(["GetHtmlImplementation"], function() { editor.generate(); } , getHtmlMethodPlugin))
+  {
     return false;        
   }
@@ -2240 +2232 @@
     // create the IFRAME & add to container
   var iframe = document.createElement("iframe");
-  iframe.src = _editor_url + editor.config.URIs.blank;
+  iframe.src = this.popupURL(editor.config.URIs.blank);
   iframe.id = "XinhaIFrame_" + this._textArea.id;
   this._framework.ed_cell.appendChild(iframe);
@@ -2282 +2274 @@
       function()
       {
+        editor.firePluginEvent('onBeforeSubmit');
         editor._textArea.value = editor.outwardHtml(editor.getHTML());
         return true;
@@ -2325 +2318 @@
     function()
     {
+      editor.firePluginEvent('onBeforeUnload');
       textarea.value = editor.outwardHtml(editor.getHTML());
       if (!Xinha.is_ie)
@@ -3324 +3318 @@
  * @param {Array} plugins
  * @param {Function} callbackIfNotReady function that is called repeatedly until all files are
+ * @param {String} optional url URL of the plugin file; obviously plugins should contain only one item if url is given
  * @returns {Boolean} true if all plugins are loaded, false otherwise
  */
-Xinha.loadPlugins = function(plugins, callbackIfNotReady)
+Xinha.loadPlugins = function(plugins, callbackIfNotReady,url)
 {
   if ( !Xinha.isSupportedBrowser ) return;
@@ -3344 +3339 @@
         function(plugin)
         {
-          // @todo : try to avoid the use of eval()
-          if ( eval('typeof ' + plugin) != 'undefined' )
+          if ( typeof window[plugin] != 'undefined' )
           {
             Xinha._pluginLoadStatus[plugin] = 'ready';
@@ -3358 +3352 @@
             Xinha._pluginLoadStatus[plugin] = 'failed';
           }
-        }
+        },url
       );
       retVal = false;
@@ -3489 +3483 @@
  *                 or later removing it again
  */
-Xinha.loadStyle = function(style, plugin, id)
+Xinha.loadStyle = function(style, plugin, id,prepend)
 {
   var url = _editor_url || '';
@@ -3512 +3506 @@
   link.type = "text/css";
   if (id) link.id = id;
-  head.appendChild(link);
+  if (prepend)
+  {
+    head.insertBefore(link,head.getElementsByTagName('link')[0]);
+  }
+  else
+  {
+    head.appendChild(link);
+  }
+  
 };
 
@@ -4877 +4879 @@
   
   //prevent execution of JavaScript (Ticket #685)
-  html = html.replace(/(<script[^>]*)(freezescript)/gi,"$1javascript");
+  html = html.replace(/(<script[^>]*((type=[\"\']text\/)|(language=[\"\'])))(freezescript)/gi,"$1javascript");
 
   // If in fullPage mode, strip the coreCSS
@@ -4920 +4922 @@
   html = this.inwardSpecialReplacements(html);
 
-  html = html.replace(/(<script[^>]*)(javascript)/gi,"$1freezescript");
+  html = html.replace(/(<script[^>]*((type=[\"\']text\/)|(language=[\"\'])))(javascript)/gi,"$1freezescript");
 
   // For IE's sake, make any URLs that are semi-absolute (="/....") to be
@@ -5024 +5026 @@
   if ( typeof this.config.stripSelfNamedAnchors != 'undefined' && this.config.stripSelfNamedAnchors )
   {
-    var stripRe = new RegExp(Xinha.escapeStringForRegExp(document.location.href.replace(/&/g,'&amp;')) + '(#[^\'" ]*)', 'g');
-    html = html.replace(stripRe, '$1');
+    var stripRe = new RegExp("((href|src|background)=\")("+Xinha.escapeStringForRegExp(document.location.href.replace(/&/g,'&amp;')) + ')([#?][^\'" ]*)', 'g');
+    html = html.replace(stripRe, '$1$4');
   }
 
@@ -5689 +5691 @@
     url = _editor_url + "plugins/" + plugin + "/popups/" + popup;
   }
-  else if ( file.match(/^\/.*?/) )
+  else if ( file.match(/^\/.*?/) || file.match(/^https?:\/\//))
   {
     url = file;
@@ -5764 +5766 @@
 {
     var coreCSS = 
-    "<style title=\"Xinha Internal CSS\" type=\"text/css\">"
+    "<style id=\"XinhaInternalCSS\" type=\"text/css\">"
     + ".htmtableborders, .htmtableborders td, .htmtableborders th {border : 1px dashed lightgrey ! important;}\n"
     + "html, body { border: 0px; } \n"
@@ -5792 +5794 @@
 Xinha.stripCoreCSS = function(html)
 {
-  return html.replace(/<style[^>]+title="Xinha Internal CSS"(.|\n)*?<\/style>/i, ''); 
+  return html.replace(/<style[^>]+id="XinhaInternalCSS"(.|\n)*?<\/style>/i, ''); 
 }
 /** Removes one CSS class (that is one of possible more parts 
@@ -5942 +5944 @@
  *                             as argument                             
  */
+ 
+// mod_security (an apache module which scans incoming requests for potential hack attempts)
+// has a rule which triggers when it gets an incoming Content-Type with a charset
+// see ticket:1028 to try and work around this, if we get a failure in a postback
+// then Xinha._postback_send_charset will be set to false and the request tried again (once)
+Xinha._postback_send_charset = true;
 Xinha._postback = function(url, data, handler)
 {
@@ -5971 +5979 @@
         }
       }
+      else if(Xinha._postback_send_charset)
+      {        
+        Xinha._postback_send_charset = false;
+        Xinha._postback(url,data,handler);
+      }
       else
       {
@@ -5981 +5994 @@
 
   req.open('POST', url, true);
-  req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+  req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'+(Xinha._postback_send_charset ? '; charset=UTF-8' : ''));
   //alert(content);
   req.send(content);
@@ -6834 +6847 @@
   else if ( obj )
   {
-    try { obj[prop] = null; } catch(x) {}
+    if ( prop.indexOf('src') == -1 ) // if src (also lowsrc, and maybe dynsrc ) is set to null, a file named "null" is requested from the server (see #1001)
+    {
+      try { obj[prop] = null; } catch(x) {}
+    }
   }
 };

branches/ray/contrib/compress.php

@@ -1 +1 @@
 <?
-die("Run this script to batch-compress the current Xinha snapshot. To run the script, open the file and comment out the die() command");
+die("Run this script to batch-compress the current Xinha snapshot. To run the script, open the file and uncomment the die() command");
 
 error_reporting(E_ALL);

branches/ray/contrib/lc_parse_strings.php

@@ -1 @@
-<?php
+<?php
 die("this script is disabled for security");
 
@@ -23 +23 @@
 $ret = array();
 $files = getFiles("../", "js$");
-foreach($files as $file)
-{
+foreach($files as $file) {
     $fp = fopen($file, "r");
     $data = "";
@@ -80 +79 @@
 
 $plugins = getFiles("../plugins/");
-foreach($plugins as $pluginDir)
-{
+foreach($plugins as $pluginDir) {
     $plugin = substr($pluginDir, 12);
     if($plugin=="ibrowser") continue;
@@ -145 +143 @@
 }
 
-foreach($langData as $plugin=>$strings)
-{
+$plugins = getFiles("../modules/");
+foreach($plugins as $pluginDir) {
+    $plugin = substr($pluginDir, 12);
+    $ret = array();
+    $files = getFiles("$pluginDir/", "js$");
+    foreach($files as $file)
+    {
+        $fp = fopen($file, "r");
+        $data = "";
+        if($fp) {
+            echo "$file open...<br>";
+            while(!feof($fp)) {
+              $data .= fread($fp, 1024);
+            }
+            preg_match_all('#_lc\("([^"]+)"|_lc\(\'([^\']+)\'#', $data, $m);
+            foreach($m[1] as $i) {
+                if(trim(strip_tags($i))=="") continue;
+                $ret[] = $i;
+            }
+            foreach($m[2] as $i) {
+                if(trim(strip_tags($i))=="") continue;
+                $ret[] = $i;
+            }
+        }
+    }
+    $ret = array_unique($ret);
+    $langData[$plugin] = $ret;
+}
+
+
+foreach($langData as $plugin=>$strings) {
     if(sizeof($strings)==0) continue;
     
@@ -152 +179 @@
     $data = "// I18N constants\n";
     $data .= "//\n";
-    $data .= "//LANG: \"base\", ENCODING: UTF-8\n";
-    $data .= "//Author: Translator-Name, <email@example.com>\n";
+    $data .= "// LANG: \"base\", ENCODING: UTF-8\n";
+    $data .= "// Author: Translator-Name, <email@example.com>\n";
+    $data .= "//\n";   
+    $data .= "// Last revision: 06 september 2007\n";
+    $data .= "// Please don´t remove this information\n";
+    $data .= "// If you modify any source, please insert a comment with your name and e-mail\n";
+    $data .= "//\n";
+    $data .= "// Distributed under the same terms as HTMLArea itself.\n";
+    $data .= "// This notice MUST stay intact for use (see license.txt).\n";
+    $data .= "//\n";
+    $data .= "// (Please, remove information below)\n";   
     $data .= "// FOR TRANSLATORS:\n";
     $data .= "//\n";
@@ -173 +209 @@
     $data .= "}\n";
 
-    if($plugin=="HTMLArea")
-        $file = "../lang/base.js";
-    else
-        $file = "../plugins/$plugin/lang/base.js";
-    
-    $fp = fopen($file, "w");
-    if(!$fp) continue;
-    fwrite($fp, $data);
-    fclose($fp);
-    echo "$file written...<br>";
+    if($plugin=="HTMLArea") {
+       $file = "../lang/base.js";
+                        $fp = fopen($file, "w");
+                  if(!$fp) continue;
+                        fwrite($fp, $data);
+                        fclose($fp);
+                        echo "$file written...<br>";
+                }       elseif (($plugin=="InternetExplorer")||($plugin=="InsertTable")||($plugin=="InsertImage")||($plugin=="GetHtml")||($plugin=="Gecko")||($plugin=="Dialogs")||($plugin=="CreateLink")||($plugin=="ColorPicker")) {
+        $file = "../modules/$plugin/lang/base.js";      
+                        $fp = fopen($file, "w");
+                  if(!$fp) continue;
+                        fwrite($fp, $data);
+                        fclose($fp);
+                        echo "$file written...<br>";
+                } elseif ($plugin=="FullScreen") {
+        $file = "../modules/$plugin/lang/base.js";
+                        $fp = fopen($file, "w");
+                  if(!$fp) continue;
+                        fwrite($fp, $data);
+                        fclose($fp);
+                        echo "$file written...<br>";
+                                $file = "../plugins/$plugin/lang/base.js";              
+                        $fp = fopen($file, "w");
+                  if(!$fp) continue;
+                        fwrite($fp, $data);
+                        fclose($fp);
+                        echo "$file written...<br>";
+                } else {
+        $file = "../plugins/$plugin/lang/base.js";              
+                        $fp = fopen($file, "w");
+                  if(!$fp) continue;
+                        fwrite($fp, $data);
+                        fclose($fp);
+                        echo "$file written...<br>";
+                }       
 }
 

branches/ray/lang/pt_br.js

@@ -1 @@
-// I18N constants
-
-// LANG: "bt_br", ENCODING: UTF-8
-// Brazilian Portuguese Translation by Alex Piaz <webmaster@globalmap.com>
-
+// I18N constants
+//
+// LANG: "pt_br", ENCODING: UTF-8
+// Portuguese Brazilian Translation
+//
+// Initial basic work by Alex Piaz <webmaster@globalmap.com>
+//
+// Author: Marcio Barbosa, <marcio@mpg.com.br>
+// MSN: tomarshall@msn.com - ICQ: 69419933
+// Site: http://www.mpg.com.br
+//
+// Last revision: 06 september 2007
+// Please don´t remove this information
+// If you modify any source, please insert a comment with your name and e-mail
+//
+// Distributed under the same terms as HTMLArea itself.
+// This notice MUST stay intact for use (see license.txt)
 {
+  "About": "Sobre",
+  "About Xinha": "Sobre o Xinha",
+  "Absbottom": "Inferior absoluto",
+  "Absmiddle": "Meio absoluto",
+  "Alignment:": "Alinhamento",
+  "Alternate text:": "Texto alternativo",
+  "Baseline": "Linha base",
   "Bold": "Negrito",
-  "Italic": "Itálico",
+  "Border thickness:": "Espessura da borda",
+  "Bottom": "Botão",
+  "CTRL-0 (zero)": "CTRL-0 (zero)",
+  "CTRL-1 .. CTRL-6": "CTRL-1 .. CTRL-6",
+  "CTRL-A": "CTRL-A",
+  "CTRL-B": "CTRL-B",
+  "CTRL-C": "CTRL-C",
+  "CTRL-E": "CTRL-E",
+  "CTRL-I": "CTRL-I",
+  "CTRL-J": "CTRL-J",
+  "CTRL-L": "CTRL-L",
+  "CTRL-N": "CTRL-N",
+  "CTRL-R": "CTRL-R",
+  "CTRL-S": "CTRL-S",
+  "CTRL-U": "CTRL-U",
+  "CTRL-V": "CTRL-V",
+  "CTRL-X": "CTRL-X",
+  "CTRL-Y": "CTRL-Y",
+  "CTRL-Z": "CTRL-Z",
+  "Cancel": "Cancelar",
+  "Cell padding:": "Espaçamento interno da célula:",
+  "Cell spacing:": "Espaçamento da célula:",
+  "Clean content pasted from Word": "Limpar conteúdo copiado do Word",
+  "Close": "Fechar",
+  "Collapse borders:": "Bordas fechadas:",
+  "Cols:": "Colunas:",
+  "Constructing object": "Construindo objeto",
+  "Copy selection": "Copiar seleção",
+  "Create Statusbar": "Criar barra de informação (statusbar)",
+  "Create Toolbar": "Criar Barra de Ferramentas",
+  "Current style": "Estilo Atual",
+  "Cut selection": "Recortar seleção",
+  "Developer": "Desenvolvedor",
+  "ENTER": "ENTRAR",
+  "Editor Help": "Ajuda do Editor",
+  "Em": "Em",
+  "Enter the image URL here": "Entre aqui com a URL da imagem",
+  "Finishing": "Terminando",
+  "Fixed width columns": "Colunas com largura fixa",
+  "For browsers that don't support images": "Para navegadores que não suportam imagens",
+  "Generate Xinha framework": "Gerar Área de Trabalho do Xinha",
+  "Headings": "Títulos",
+  "Horizontal padding": "Espaçamento interno horizontal",
+  "Horizontal:": "Horizontal:",
+  "Image Preview:": "Visualização da Imagem:",
+  "Image URL:": "URL da imagem:",
+  "Init editor size": "Iniciar tamanho do editor",
+  "Insert Image": "Inserir Imagem",
+  "Insert Table": "Inserir Tabela",
+  "Insert/Modify Link": "Inserir/Modificar Link",
+  "Italic": "Itálico",
+  "Justify Center": "Justificar Centralizado",
+  "Justify Full": "Justificar Completamente",
+  "Justify Left": "Justificar à Esquerda",
+  "Justify Right": "Justificar à Direita",
+  "Keyboard shortcuts": "Atalhos de Teclado",
+  "Layout": "Esquema",
+  "Leave empty for no border": "Deixe em branco para não ter bordas",
+  "Left": "Esquerda",
+  "License": "Licença",
+  "Loading in progress. Please wait!": "Carregamento em processo. Por favor, aguarde!",
+  "Middle": "Meio",
+  "Name": "Nome",
+  "New window (_blank)": "Nova janela (_blank)",
+  "None (use implicit)": "Nenhum (uso implicito)",
+  "Not set": "Não definido",
+  "Number of columns": "Número de colunas",
+  "Number of rows": "Número de linhas",
+  "OK": "OK",
+  "Paste from clipboard": "Colar da Área de Transferência",
+  "Path": "Caminho",
+  "Percent": "Porcentagem",
+  "Pixels": "Pixels",
+  "Plugins": "Plugins",
+  "Positioning of this image": "Posicionamento desta imagem",
+  "Positioning of this table": "Posicionamento desta tabela",
+  "Preview": "Visualização",
+  "Preview the image in a new window": "Visualizar a imagem em uma nova janela",
+  "Redoes your last action": "Refazer sua última ação",
+  "Right": "Direita",
+  "Rows:": "Linhas:",
+  "SHIFT-ENTER": "SHIFT-ENTER",
+  "Same frame (_self)": "Mesmo frame (_self)",
+  "Select Color": "Selecionar côr",
+  "Select all": "Selecionar tudo",
+  "Set format to paragraph": "Definir formato para o parágrafo",
+  "Space between adjacent cells": "Espaço entre células adjacentes",
+  "Space between content and border in cell": "Espaço entre conteúdo e borda na célula",
+  "Spacing": "Espaçamento",
+  "Sponsored by": "Patrocinado por",
+  "Strikethrough": "Tachado",
+  "Target:": "Destino:",
+  "Texttop": "Texto no topo",
+  "Thanks": "Agradecimentos",
+  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "O botão Colar não funciona em navegadores baseado no Mozilla (por razões técnicas de segurança). Pressione CTRL-V no seu teclado para colar diretamente.",
+  "The editor provides the following key combinations:": "Este editor fornece a seguinte combinação de teclas:",
+  "Title (tooltip):": "Título (tooltip)",
+  "Top": "Topo",
+  "Top frame (_top)": "Frame no topo (_top)",
+  "URL:": "URL:",
   "Underline": "Sublinhado",
-  "Strikethrough": "Tachado",
+  "Undoes your last action": "Desfazer sua última ação",
+  "Version": "Versão",
+  "Vertical padding": "Espaçamento interno vertical",
+  "Vertical:": "Vertical:",
+  "Width of the table": "Larguran da tabela",
+  "Width unit": "Unidade de largura",
+  "Width:": "Largura:",
+  "Would you like to clear font colours?": "Deseja limpar as cores de fonte",
+  "Would you like to clear font sizes?": "Deseja limpar os tamanhos de fonte",
+  "Would you like to clear font typefaces?": "Deseja limpar os tipos de fonte",
+  "Xinha Help": "Ajuda do Xinha",
+  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Você está no MODO TEXTO.  Use o botão [<>] para mudar para o modo de Visualização (WYSIWYG)",
+  "Your Document is not well formed. Check JavaScript console for details.": "Seu Documento não está formatado corretamente. Verifique o console do JavaScript para maiores detalhes.",
+  "insert linebreak": "inserir quebra de linha",
+  "new paragraph": "novo parágrafo",
+  
+  // not find with lc_parse_strings.php
   "Subscript": "Subescrito",
   "Superscript": "Sobrescrito",
-  "Justify Left": "Alinhar à Esquerda",
-  "Justify Center": "Centralizar",
-  "Justify Right": "Alinhar à Direita",
-  "Justify Full": "Justificar",
+  "Direction left to right": "Da esquerda para direita",
+  "Direction right to left": "Da direita para esquerda",
+  "Remove formatting": "Remover formatação",
+  "Select all": "Selecionar tudo",
+  "Print document": "Imprimir documento",
+  "Clear MSOffice tags": "Limpar tags do MS Office",
+  "Clear Inline Font Specifications": "Limpar especificações de fontes inline",
+  "Split Block": "Dividir Bloco",
+  "Toggle Borders": "Mudar Bordas",
+  "Save as": "Salvar como",
+  "Insert/Overwrite": "Inserir/Sobrescrever",
+  "&mdash; format &mdash;": "&mdash; formato &mdash;",
+  "Heading 1": "Título 1",
+  "Heading 2": "Título 2",
+  "Heading 3": "Título 3",
+  "Heading 4": "Título 4",
+  "Heading 5": "Título 5",
+  "Heading 6": "Título 6",
+  "Normal": "Normal",
+  "Address": "Endereço",
+  "Formatted": "Formatado",
+  "&mdash; font &mdash;": "&mdash; fonte &mdash;",
+  "&mdash; size &mdash;": "&mdash; tamanho &mdash;",
   "Ordered List": "Lista Numerada",
   "Bulleted List": "Lista Marcadores",
-  "Decrease Indent": "Diminuir Indentação",
-  "Increase Indent": "Aumentar Indentação",
+  "Decrease Indent": "Diminuir Indentação",
+  "Increase Indent": "Aumentar Indentação",
   "Font Color": "Cor da Fonte",
   "Background Color": "Cor do Fundo",
   "Horizontal Rule": "Linha Horizontal",
   "Insert Web Link": "Inserir Link",
-  "Insert/Modify Image": "Inserir Imagem",
+  "Insert/Modify Image": "Inserir/Modificar Imagem",
   "Insert Table": "Inserir Tabela",
-  "Toggle HTML Source": "Ver Código-Fonte",
+  "Toggle HTML Source": "Ver Código-Fonte",
   "Enlarge Editor": "Expandir Editor",
-  "About this editor": "Sobre",
-  "Help using editor": "Ajuda",
-  "Current style": "Estilo Atual"
+  "About this editor": "Sobre este editor",
+  "Help using editor": "Ajuda - Usando o editor"
 }

branches/ray/modules/GetHtml/DOMwalk.js

@@ -299 +299 @@
       else if(root.data.trim() == '')
       {
-        html = '';
+        if(root.data)
+        {
+          html = ' ';
+        }
+        else
+        {
+          html = '';
+        }
       }
       else

branches/ray/modules/GetHtml/TransformInnerHTML.js

@@ -136 +136 @@
     s = s.replace(/^\s*/,'').//strip leading whitespace
         replace(/ +\n/g,'\n').//strip spaces at end of lines
-        replace(/[\r\n]+<\/script>/g,'\n</script>');//strip returns added into scripts
+        replace(/[\r\n]+(\s+)<\/script>/g,'\n$1</script>');//strip returns added into scripts
     return s;
 };

branches/ray/plugins/ExtendedFileManager/extended-file-manager.js

@@ -178 +178 @@
                 case "f_backgroundColor": img.style.backgroundColor = value; break;
                 case "f_align"  : img.align  = value; break;
-                case "f_width"  : img.width = parseInt(value || "0"); break;
-                case "f_height"  : img.height = parseInt(value || "0"); break;
+                case "f_width"  : 
+                    if ( parseInt( value ) > 0 )
+                    {
+                        img.width = parseInt(value);
+                    }
+                break;
+                case "f_height"  : 
+                    if ( parseInt( value ) > 0 )
+                    {
+                        img.height = parseInt(value);
+                    }
+                break;
                 case "f_padding": img.style.padding =
                                           /[^0-9]/.test(value) ? value : (value != '') ? (parseInt(value) + 'px') :''; break;

branches/ray/plugins/ExtendedFileManager/lang/nl.js

@@ -1 +1 @@
 // I18N constants
-// LANG: "de", ENCODING: UTF-8
-// translated: Alun Jones a.jones@hccnet.nl
+// LANG: "nl", ENCODING: UTF-8
+// Author: Maarten Molenschot, maarten@nrgmm.nl
 {
   "File Manager": "Bestandsbeheer",
@@ -72 +72 @@
   "Alt": "Alt",
   "File Name": "Bestandsnaam",
-  "Thumbnail View": "Miniatuuransicht",
-  "List View": "Listenansicht",
+  "Thumbnail View": "Miniaturen",
+  "List View": "Lijst",
   "Title (tooltip)": "Titel (tooltip)",
   "Target Window": "Doel venster",
   "Name": "Naam",
-  "Size": "Grote",
+  "Size": "Grootte",
   "Date Modified": "Datum aangepast",
   "Total Size": "Totaalgrootte",
@@ -87 +87 @@
   "You must select some text before making a new link.": "Eerst tekst selecteren.",
   "Folder is not empty. Please delete all Files and Subfolders inside.": "Map is niet leeg. Verwijder eerst alle bestanden en onderliggendemappen.",
-  "Image Size": "Beeld grote",
+  "Image Size": "Beeld afmetingen",
   "Other" : "Andere...",
   "Rename": "Naam wijzigen",
   "Please enter new name for this file...": "Nieuwe bestandsnaam...",
-  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Herbenoemen niet mogelijk. Bestand bestaat al of\nmap heeft geen schrijf toestemming.",
-  "Cancelled rename.": "Herbenoemen geannuleerd.",
-  'File "$file" successfully uploaded.': '"$file" bestand upload komplet.',
-  "Cannot upload. Maximum folder size reached.": "Uploaden niet mogelijk. Map is vol.",
+  "Unable to rename file. File of the same name already exists or\nfolder doesn't have write permission.": "Hernoemen niet mogelijk. Bestand bestaat al of\nmap heeft geen schrijf toestemming.",
+  "Cancelled rename.": "Hernoemen geannuleerd.",
+  'File "$file" successfully uploaded.': '"$file" bestand upload voltooid.',
+  "Cannot upload. Maximum folder size reached.": "Uploaden is niet mogelijk. De doel map is vol.",
   "Maximum file size [$max_size KB] exceeded.": "Maximale bestandgrootte [$max_size KB] overschreden.",
-  "Cannot upload $extension Files. Permission denied.": "Niet mogelijk om $extension bestanden te uploaden.",
-  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.": "Bestands upload niet mogelijk.\nMaximale bestandsgrootte [$max_size KB] overtreden\nof map heeft geen schrijf toestemming.",
-  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Totaalgrootte: $max_foldersize_mb MB, noch vrij: $free_space",
-  "Please enter new name for this folder...":"Please enter new name for this folder...",
+  "Cannot upload $extension Files. Permission denied.": "Het is niet mogelijk om $extension bestanden te uploaden.",
+  "Unable to upload File. \nEither Maximum file size [$max_size KB] exceeded or\nFolder doesn\'t have write permission.": "Bestands upload niet mogelijk.\nMaximale bestandsgrootte [$max_size KB] overtreden\nof de map heeft geen schrijf toestemming.",
+  "Total Size : $max_foldersize_mb MB, Free Space: $free_space": "Totaalgrootte: $max_foldersize_mb MB, nog vrij: $free_space",
+  "Please enter new name for this folder...":"Geef een nieuwe naam voor deze map...",
 
-  "Cut":"Cut",
-  "Copy":"Copy",
-  "Paste":"Paste",
+  "Cut":"Knippen",
+  "Copy":"Kopiëren",
+  "Paste":"Plakken",
   
-  'Copy "$file" from "$dir" here': 'Copy "$file" from "$dir" here',
-  'Copy folder "$file" from "$dir" here' : 'Copy folder "$file" from "$dir" here',
-  'Move "$file" from "$dir" here':'Move "$file" from "$dir" here',
-  'Move folder "$file" from "$dir" here':'Move folder "$file" from "$dir" here',
+  'Copy "$file" from "$dir" here': 'Kopieer "$file" van "$dir" naar',
+  'Copy folder "$file" from "$dir" here' : 'Kopieer map "$file" van "$dir" naar',
+  'Move "$file" from "$dir" here':'Verplaats "$file" van "$dir" naar',
+  'Move folder "$file" from "$dir" here':'Verplaats map "$file" van "$dir" naar',
   
-  "Source file/folder not found.":"Source file/folder not found.",
-  "Paste failed.\nMaybe folder doesn't have write permission.": "Paste failed.\nMaybe folder doesn't have write permission.",
-  "Could not create destination folder.":"Could not create destination folder.",
-  "Destination file/folder already exists.":"Destination file/folder already exists.",
-  "File pasted OK.": "File pasted OK."
+  "Source file/folder not found.":"Bron bestand/map niet gevonden.",
+  "Paste failed.\nMaybe folder doesn't have write permission.": "Plakken mislukt..\nDe map heeft mogelijk niet de juiste schrijfrechten.",
+  "Could not create destination folder.":"Bestemmings map kon niet worden gemaakt..",
+  "Destination file/folder already exists.":"Bestemmings bestand/map bestaat al."
 };

branches/ray/plugins/ImageManager/assets/manager.js

@@ -81 +81 @@
       // Locate to the correct directory
       var dreg = new RegExp('^(.*/)([^/]+)$');
-      if(dreg.test(param['f_url']))
+      if(dreg.test(param['f_url']) && !(new RegExp('^https?://','i')).test(param['f_url']))
       {
         changeDir(RegExp.$1);
@@ -212 +212 @@
         {
                 if(typeof imgManager != 'undefined')
-                        imgManager.changeDir(newDir);
+    {      
+            imgManager.changeDir(newDir);
+    }
         }
 
@@ -336 +338 @@
                 }
         }
+  
         addEvent(window, 'load', init);

branches/ray/plugins/ImageManager/images.php

@@ -210 +210 @@
 
         if(window.top)
-                HTMLArea = window.top.HTMLArea;
+    HTMLArea = Xinha    = window.top.Xinha;
 
         function hideMessage()
@@ -275 +275 @@
 </script>
 <script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/images.js"></script>
+<script type="text/javascript" src="../../popups/popup.js"></script>
 <script type="text/javascript" src="assets/popup.js"></script>
 </head>

branches/ray/plugins/InsertSnippet/snippets.php

@@ -2 +2 @@
 print '<?xml version="1.0" encoding="UTF-8"?>'."\n";
 ?>
-
+<snXML>
+<categories>
 <?php
 foreach ($categories as $c) {

branches/ray/plugins/SuperClean/tidy.php

@@ -61 +61 @@
 
 //  Open the connection to the host
-    $socket = fsockopen($Host, 80, &$errno, &$errstr);
+    $socket = fsockopen($Host, 80, $errno, $errstr);
     if (!$socket) {
       $result = "($errno) $errstr";

branches/ray/popups/popup.js

@@ -11 +11 @@
 //
 // $Id$
-Xinha = window.opener.Xinha;
+if(typeof Xinha == 'undefined')
+  Xinha = window.opener.Xinha;
+
 // Backward compatibility will be removed some time or not?
-HTMLArea = window.opener.Xinha;
+HTMLArea = Xinha;
 
 function getAbsolutePos(el) {

branches/ray/skins/silva/skin.css

@@ -163 +163 @@
 .htmlarea textarea.xinha_textarea {
   background:url(html.gif) bottom right no-repeat;
-  padding:5px;
-  border:2px dotted #bbb;
+  /*padding:5px;
+  border:2px dotted #bbb;*/
   font-family: "Lucida Console",Courier,monospace;
   font-size: 10pt;