diff -aruN --binary 1/administrator/components/com_media/views/images/tmpl/default.php 2/administrator/components/com_media/views/images/tmpl/default.php
--- 1/administrator/components/com_media/views/images/tmpl/default.php	2009-05-29 14:51:30.000000000 +0200
+++ 2/administrator/components/com_media/views/images/tmpl/default.php	2009-07-23 04:25:36.000000000 +0200
@@ -50,17 +50,44 @@
 	<input type="hidden" id="f_file" name="f_file" />
 	<input type="hidden" id="tmpl" name="component" />
 </form>
-<form action="<?php echo JURI::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName().'='.$this->session->getId(); ?>&amp;pop_up=1&amp;<?php echo JUtility::getToken();?>=1" id="uploadForm" method="post" enctype="multipart/form-data">
-	<fieldset>
-		<legend><?php echo JText::_('Upload'); ?></legend>
-		<fieldset class="actions">
-			<input type="file" id="file-upload" name="Filedata" />
-			<input type="submit" id="file-upload-submit" value="<?php echo JText::_('Start Upload'); ?>"/>
-			<span id="upload-clear"></span>
+<?php	$params =& JComponentHelper::getParams('com_media');
+		$acl = & JFactory::getACL();
+		switch ($params->get('allowed_media_usergroup')) 
+		{
+			case '1':
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );
+				break;
+			case '2':
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'editor' );
+				break;
+			case '3': 
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'editor' );				
+				$acl->addACL( 'com_media', 'upload', 'users', 'author' );
+				break;								
+			case '4':
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );				
+				$acl->addACL( 'com_media', 'upload', 'users', 'editor' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'author' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'registered' );
+				break;
+		} ?>
+<?php $user = & JFactory::getUser(); ?>
+<?php $canUpload= ($user->authorize('com_media', 'upload')); ?> 	
+<?php if ($canUpload) : ?>			
+	<form action="<?php echo JURI::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName().'='.$this->session->getId(); ?>&amp;pop_up=1&amp;<?php echo JUtility::getToken();?>=1" id="uploadForm" method="post" enctype="multipart/form-data">
+		<fieldset>
+			<legend><?php echo JText::_('Upload'); ?></legend>
+			<fieldset class="actions">
+				<input type="file" id="file-upload" name="Filedata" />
+				<input type="submit" id="file-upload-submit" value="<?php echo JText::_('Start Upload'); ?>"/>
+				<span id="upload-clear"></span>
+			</fieldset>
+			<ul class="upload-queue" id="upload-queue">
+				<li style="display: none" />
+			</ul>
 		</fieldset>
-		<ul class="upload-queue" id="upload-queue">
-			<li style="display: none" />
-		</ul>
-	</fieldset>
-	<input type="hidden" name="return-url" value="<?php echo base64_encode('index.php?option=com_media&view=images&tmpl=component&e_name='.JRequest::getCmd('e_name')); ?>" />
+		<input type="hidden" name="return-url" value="<?php echo base64_encode('index.php?option=com_media&view=images&tmpl=component&e_name='.JRequest::getCmd('e_name')); ?>" />
 </form>
+<?php endif; ?>
diff -aruN --binary 1/administrator/components/com_media/views/media/tmpl/default.php 2/administrator/components/com_media/views/media/tmpl/default.php
--- 1/administrator/components/com_media/views/media/tmpl/default.php	2009-05-29 14:51:30.000000000 +0200
+++ 2/administrator/components/com_media/views/media/tmpl/default.php	2009-07-23 04:25:36.000000000 +0200
@@ -61,20 +61,23 @@
             </form>
 
             <!-- File Upload Form -->
-            <form action="<?php echo JURI::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName().'='.$this->session->getId(); ?>&amp;<?php echo JUtility::getToken();?>=1" id="uploadForm" method="post" enctype="multipart/form-data">
-                <fieldset>
-                    <legend><?php echo JText::_( 'Upload File' ); ?> [ <?php echo JText::_( 'Max' ); ?>&nbsp;<?php echo ($this->config->get('upload_maxsize') / 1000000); ?>M ]</legend>
-                    <fieldset class="actions">
-                        <input type="file" id="file-upload" name="Filedata" />
-                        <input type="submit" id="file-upload-submit" value="<?php echo JText::_('Start Upload'); ?>"/>
-                        <span id="upload-clear"></span>
-                    </fieldset>
-                    <ul class="upload-queue" id="upload-queue">
-                        <li style="display: none" />
-                    </ul>
-                </fieldset>
-                <input type="hidden" name="return-url" value="<?php echo base64_encode('index.php?option=com_media'); ?>" />
-            </form>
+			<?php $canUpload= ($this->user->authorize('com_media', 'upload')); ?> 	
+			<?php if ($canUpload) : ?>
+				<form action="<?php echo JURI::base(); ?>index.php?option=com_media&amp;task=file.upload&amp;tmpl=component&amp;<?php echo $this->session->getName().'='.$this->session->getId(); ?>&amp;<?php echo JUtility::getToken();?>=1" id="uploadForm" method="post" enctype="multipart/form-data">
+					<fieldset>
+						<legend><?php echo JText::_( 'Upload File' ); ?> [ <?php echo JText::_( 'Max' ); ?>&nbsp;<?php echo ($this->config->get('upload_maxsize') / 1000000); ?>M ]</legend>
+						<fieldset class="actions">
+							<input type="file" id="file-upload" name="Filedata" />
+							<input type="submit" id="file-upload-submit" value="<?php echo JText::_('Start Upload'); ?>"/>
+							<span id="upload-clear"></span>
+						</fieldset>
+						<ul class="upload-queue" id="upload-queue">
+							<li style="display: none" />
+						</ul>
+					</fieldset>
+					<input type="hidden" name="return-url" value="<?php echo base64_encode('index.php?option=com_media'); ?>" />
+				</form>
+			<?php endif; ?>
         </td>
     </tr>
 </table>
diff -aruN --binary 1/administrator/includes/framework.php 2/administrator/includes/framework.php
--- 1/administrator/includes/framework.php	2009-06-30 22:01:32.000000000 +0200
+++ 2/administrator/includes/framework.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: framework.php 12389 2009-07-01 00:34:45Z ian $
+* @version		$Id: framework.php 12543 2009-07-23 01:47:21Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.com_config.ini 2/administrator/language/ca-ES/ca-ES.com_config.ini
--- 1/administrator/language/ca-ES/ca-ES.com_config.ini	2009-06-26 08:51:58.000000000 +0200
+++ 2/administrator/language/ca-ES/ca-ES.com_config.ini	2009-06-28 22:26:28.000000000 +0200
@@ -1,7 +1,8 @@
-# $Id: ca-ES.com_config.ini 11784 2009-06-26 08:51:57 dverger ~0 $
-# author Joomla! Catalan Translation
-# copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
-# license Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+# $Id: ca-ES.com_config.ini 12308 2009-06-28 22:15:30Z dverger $
+# Joomla! Catalan Translation
+# Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+# Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
 # Note : All ini files need to be saved as UTF-8
 
@@ -140,9 +141,9 @@
 SMTP AUTH=Autorització de l'SMTP
 SMTP HOST=Amfitrió de l'SMTP
 SMTP PASS=Contrasenya de l'SMTP
-SMTP PORT=SMTP Port
+SMTP PORT=Port de l'SMTP
 SMTP SERVER=Servidor de l'SMTP
-SMTP SECURITY=SMTP Security
+SMTP SECURITY=Seguretat de l'SMTP
 SMTP USER=Usuari de l'SMTP
 STATISTICS=Estadístiques
 SYSTEM=Sistema
@@ -205,8 +206,8 @@
 TIPSHOWTITLEMETATAGITEMS=Mostra l'etiqueta meta del títol quan es mostrin els articles
 TIPSITENAME=Introduïu el nom del vostre lloc web. S'utilitzarà a diversos llocs (p.ex. a la barra de títol al lloc d'administració i a les pàgines <em>Lloc fora de línia</em>).
 TIPSMTPAUTH=Trieu 'Sí' si el vostre amfitrió SMTP necessita autenticació SMTP.
-TIPSMTPPORT=Enter the port number of your SMTP server.  Use 25 for most unsecure servers, and 465 or 587 for most secure servers.
-TIPSMTPSECURITY=Select the security model that your SMTP server uses.
+TIPSMTPPORT=Introduïu el número de port del servidor SMTP. Utilitzeu el 25 per a la majoria de servidors insegurs, i el 465 o bé el 587 per a la majoria de servidors segurs.
+TIPSMTPSECURITY=Seleccioneu el model de seguretat que el servidor SMTP utilitza.
 TIPSMTPHOST=Introduïu el nom de l'amfitrió SMTP.
 TIPSMTPUSER=Introduïu el nom d'usuari per a accedir a l'SMTP
 TIPSMTPPASS=Introduïu la contrasenya per a accedir a l'SMTP
@@ -221,4 +222,4 @@
 WARNPATHCHANGES=Podeu establir noves ubicacions per a les carpetes 'Camí a la carpeta de multimèdia' i 'Camí a la carpeta d'imatges'. Per altra banda, no elimineu ni canvieu la carpeta images existent. Les carpetes images/banners, images/M_images, images/smilies i images/stories són emprades per l'aplicació. Vegeu el tema d'ajuda per a aquesta pàgina si necessiteu assistència sobre com tornar a l'estructura de directoris original.
 WARNDONOTCHANGEDATABASETABLESPREFIX=No ho canvieu exceptuant el cas que tingueu una base de dades amb taules amb el prefix que esteu establint.
 WARNING=AVÍS!
-WYSIWYG EDITOR=Editor WYSIWYG
\ No hay ningún carácter de nueva línea al final del fichero
+WYSIWYG EDITOR=Editor WYSIWYG
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.com_content.ini 2/administrator/language/ca-ES/ca-ES.com_content.ini
--- 1/administrator/language/ca-ES/ca-ES.com_content.ini	2009-03-13 23:41:04.000000000 +0100
+++ 2/administrator/language/ca-ES/ca-ES.com_content.ini	2009-06-30 21:05:36.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: ca-ES.com_content.ini 11625 2009-03-13 22:44:06Z dverger $
+# $Id: ca-ES.com_content.ini 12386 2009-06-30 21:04:06Z dverger $
 # Joomla! Catalan Translation
 # Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
 # Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
@@ -188,3 +188,4 @@
 YOU CANNOT EDIT AN ARCHIVED ITEM=No podeu editar un article arxivat.
 YOU MUST SELECT A CATEGORY=Heu de seleccionar una categoria.
 YOU MUST SELECT A SECTION=Heu de seleccionar una secció.
+TOGGLE EDITOR=Canvia d'editor
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.com_media.ini 2/administrator/language/ca-ES/ca-ES.com_media.ini
--- 1/administrator/language/ca-ES/ca-ES.com_media.ini	2008-12-31 19:16:12.000000000 +0100
+++ 2/administrator/language/ca-ES/ca-ES.com_media.ini	2009-07-23 10:51:38.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: ca-ES.com_media.ini 10496 2008-07-28 20:00:40Z dverger $
+# $Id: ca-ES.com_media.ini 12540 2009-07-23 11:00:40Z dverger $
 # Joomla! Catalan Translation
 # Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 # Copyright (C) Translation 2008  Catalan Joomla Translation Team - joomla.cat
@@ -67,6 +67,7 @@
 MEDIA MANAGER=Gestor multimèdia
 NAME=Nom de la imatge
 NO IMAGES FOUND=No s'han trobat imatges
+NOT EMPTY!=el directori no és buit!
 NOT SET=No establert
 NUMFILES=Fitxers:
 NUMFOLDERS=Carpetes:
@@ -81,7 +82,7 @@
 THIS COMPONENT MANAGES SITE MEDIA=Aquest component gestiona els fitxers multimèdia del lloc web
 THIS FILE TYPE IS NOT SUPPORTED=Aquest tipus de fitxer no és suportat
 THUMBNAIL VIEW=Vista en miniatura
-UNABLE TO DELETE: NOT EMPTY!=No es pot eliminar! No és buit!
+UNABLE TO DELETE:=No es pot eliminar:
 UP=Amunt
 UPLOAD=Penja
 UPLOAD COMPLETE=Càrrega acabada
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.ini 2/administrator/language/ca-ES/ca-ES.ini
--- 1/administrator/language/ca-ES/ca-ES.ini	2009-06-26 08:49:04.000000000 +0200
+++ 2/administrator/language/ca-ES/ca-ES.ini	2009-07-05 22:41:12.000000000 +0200
@@ -1,7 +1,8 @@
-# $Id: ca-ES.ini 11779 2009-06-26 08:49:04 dverger ~0 $
-# author Joomla! Catalan Translation
-# copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
-# license Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+# $Id: ca-ES.ini 12308 2009-06-28 22:30:01Z dverger $
+# Joomla! Catalan Translation
+# Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+# Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
 # Note : All ini files need to be saved as UTF-8
 
@@ -12,7 +13,7 @@
 DATE_FORMAT_LC3=%e de %B de %Y
 DATE_FORMAT_LC4=%d.%m.%y
 DATE_FORMAT_JS1=y-m-d
-%Y-%M-%D=%Y-%M-%D
+%Y-%M-%D=%Y-%m-%d
 %A, %B %E=%A, %e de %B
 
 # Months
@@ -50,7 +51,7 @@
 SUNDAY=diumenge
 MON=dl.
 MONDAY=dilluns
-TUE=dm.
+TUE=dt.
 TUESDAY=dimarts
 WED=dc.
 WEDNESDAY=dimecres
@@ -134,7 +135,7 @@
 PHPMAILER_FILE_ACCESS=No s'ha pogut accedir al fitxer:
 PHPMAILER_FILE_OPEN=No s'ha pogut obrir el fitxer:
 PHPMAILER_ENCODING=Codificació desconeguda:
-PHPMAILER_SIGNING=Error de signatura:
+PHPMAILER_SIGNING=S'ha produït un error de signatura:
 
 A SHORT ALT ATTRIBUTE FOR IMAGE=Una etiqueta alternativa (Alt) breu per a una imatge
 ACCESS=Accés
@@ -602,4 +603,4 @@
 WRITABLE=Es pot escriure
 YES=Sí
 YOU MUST SELECT A CATEGORY=Heu de seleccionar una categoria
-YOU MUST SELECT A SECTION=Heu de seleccionar una secció
\ No hay ningún carácter de nueva línea al final del fichero
+YOU MUST SELECT A SECTION=Heu de seleccionar una secció
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.mod_quickicon.ini 2/administrator/language/ca-ES/ca-ES.mod_quickicon.ini
--- 1/administrator/language/ca-ES/ca-ES.mod_quickicon.ini	2009-06-25 14:22:12.000000000 +0200
+++ 2/administrator/language/ca-ES/ca-ES.mod_quickicon.ini	2008-12-31 19:41:32.000000000 +0100
@@ -4,7 +4,7 @@
 # Copyright (C) Translation 2008  Catalan Joomla Translation Team - joomla.cat
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
-# Note : All ini files need to be saved as UTF-8--MODIFICADO POR Joomla! Spanish
+# Note : All ini files need to be saved as UTF-8
 
 ADD NEW ARTICLE=Afegeix un nou article
 CATEGORY MANAGER=Gestor de categories
@@ -20,4 +20,3 @@
 THIS MODULE SHOWS QUICK ICONS THAT ARE VISIBLE ON THE ADMIN AREA HOME PAGE=Aquest mòdul mostra les icones d'execució ràpida que són visibles al tauler de control.
 TRASH MANAGER=Gestor de la paperera
 USER MANAGER=Gestor d'usuaris
-TRANSLATION MANAGER=Administrador de Traduccions
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.plg_editors_tinymce.ini 2/administrator/language/ca-ES/ca-ES.plg_editors_tinymce.ini
--- 1/administrator/language/ca-ES/ca-ES.plg_editors_tinymce.ini	2008-12-31 19:52:22.000000000 +0100
+++ 2/administrator/language/ca-ES/ca-ES.plg_editors_tinymce.ini	2009-07-06 14:24:56.000000000 +0200
@@ -1,7 +1,7 @@
-# $Id: ca-ES.plg_editors_tinymce.ini 10496 2008-07-30 00:48:54Z dverger $
+# $Id: ca-ES.plg_editors_tinymce.ini 12386 2009-06-30 20:48:54Z dverger $
 # Joomla! Catalan Translation
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
-# Copyright (C) Translation 2008  Catalan Joomla Translation Team - joomla.cat
+# Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+# Copyright (C) Translation 2008 - 2009 Catalan Joomla Translation Team - joomla.cat
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
 # Note : All ini files need to be saved as UTF-8
@@ -29,9 +29,9 @@
 ELEMENTS THAT WILL BE CLEANED FROM THE TEXT=Elements que es netejaran del text
 EXTENDED VALID ELEMENTS=Elements vàlids ampliats
 FLASH=Flash
-FORMAT OF INSERTED DATE. ONLY WORKS IN ADVANCED MODE=Format de la data inserida. Només funciona en mode avançat.
-FORMAT OF INSERTED TIME. ONLY WORKS IN ADVANCED MODE=Format de l'hora inserida. Només funciona en mode avançat
-FRONT ONLY=Només davant.
+FORMAT OF INSERTED DATE. ONLY WORKS IN ADVANCED MODE=Format de la data inserida. Només s'aplica en mode ampliat.
+FORMAT OF INSERTED TIME. ONLY WORKS IN ADVANCED MODE=Format de l'hora inserida. Només s'aplica en mode ampliat.
+FRONT ONLY=Només al front.
 FULLSCREEN=Pantalla completa
 FUNCTIONALITY=Funcionalitat
 HORIZONTAL RULE=Regle horitzontal
@@ -54,23 +54,23 @@
 PARAMELEMENTPATH=Si trieu 'Activa', mostra el conjunt de classes per al text marcat.
 PARAMENTITIECLEANUP=Si trieu 'No', les entitats s'eliminen del codi.
 PARAMEXTVALIDELEMENTS=Permet l'addició d'elements vàlids específics al conjunt existent de normes.
-PARAMFLASH=Mostra/Amaga el botó de Flash. Només funciona en mode avançat.
-PARAMFULLSCREEN=Mostra/Amaga el botó de pantalla completa. Només funciona en mode avançat.
-PARAMINSERTDATE=Mostra/Amaga el botó d'inserir data. Només funciona en mode avançat.
-PARAMINSERTTIME=Mostra/Amaga el botó d'inserir l'hora. Només funciona en mode avançat.
-PARAMHTMLHEIGHT=Alçada de la finestra emergent de mode HTML. Només funciona en mode avançat.
-PARAMHTMLWIDTH=Amplada de la finestra emergent de mode HTML. Només funciona en mode avançat.
-PARAMLAYER=Mostra/Amaga el botó de control de capes. Només funciona en mode avançat.
-PARAMPREVIEW=Mostra/Amaga els botons de previsualització. Només funciona en mode avançat.
-PARAMPREVIEWHEIGHT=Alçada de la finestra emergent de mode de previsualització. Només funciona en mode avançat.
-PARAMPREVIEWWIDTH=Amplada de la finestra emergent de mode de previsualització. Només funciona en mode avançat.
-PARAMSEARCHREPLACE=Mostra/Amaga el botó Cerca &amp; Reemplaça. Només funciona en mode avançat.
-PARAMSMILIES=Mostra/Amaga els botons d'emoticones. Només funciona en mode avançat.
-PARAMSTYLE=Mostra/Amaga el botó de control d'estils CSS. Només funciona en mode avançat.
-PARAMTABLE=Mostra/Amaga el botó de control de taules. Només funciona en mode avançat.
-PARAMTEMPLATE=Mostra/Amaga el botó de nova capa. Només funciona en mode avançat.
+PARAMFLASH=Mostra/Amaga el botó de Flash. Només s'aplica en mode ampliat.
+PARAMFULLSCREEN=Mostra/Amaga el botó de pantalla completa. Només s'aplica en mode ampliat.
+PARAMINSERTDATE=Mostra/Amaga el botó d'inserir data. Només s'aplica en mode ampliat.
+PARAMINSERTTIME=Mostra/Amaga el botó d'inserir l'hora. Només s'aplica en mode ampliat.
+PARAMHTMLHEIGHT=Alçada de la finestra emergent de mode HTML. Només s'aplica en mode ampliat.
+PARAMHTMLWIDTH=Amplada de la finestra emergent de mode HTML. Només s'aplica en mode ampliat.
+PARAMLAYER=Mostra/Amaga el botó de control de capes. Només s'aplica en mode ampliat.
+PARAMPREVIEW=Mostra/Amaga els botons de previsualització. Només s'aplica en mode ampliat.
+PARAMPREVIEWHEIGHT=Alçada de la finestra emergent de mode de previsualització. Només s'aplica en mode ampliat.
+PARAMPREVIEWWIDTH=Amplada de la finestra emergent de mode de previsualització. Només s'aplica en mode ampliat.
+PARAMSEARCHREPLACE=Mostra/Amaga el botó Cerca &amp; Reemplaça. Només s'aplica en mode ampliat.
+PARAMSMILIES=Mostra/Amaga els botons d'emoticones. Només s'aplica en mode ampliat.
+PARAMSTYLE=Mostra/Amaga el botó de control d'estils CSS. Només s'aplica en mode ampliat.
+PARAMTABLE=Mostra/Amaga el botó de control de taules. Només s'aplica en mode ampliat.
+PARAMTEMPLATE=Mostra/Amaga el botó Insereix contingut predefinit segons plantilla. Només s'aplica en mode ampliat.
 PARAMTEMPLATECSS=Per defecte el connector cerca un fitxer editor.css. Si no en pot trobar cap a la plantilla per defecte carrega el fitxer editor.css de la plantilla del sistema.
-PARAMXHTMLXTRAS=Mostra/Amaga les funcions XHTML addicionals. Només funciona en mode avançat.
+PARAMXHTMLXTRAS=Mostra/Amaga les funcions XHTML addicionals. Només s'aplica en mode ampliat.
 POSITION OF THE TOOLBAR=Posició de la barra d'eines
 PREVIEW=Previsualització
 PREVIEW HEIGHT=Alçada de la previsualització
@@ -81,7 +81,7 @@
 SAVE WARNING=Avís de desat
 SAVE WARNING - GIVES WARNING IF YOU CANCEL WITHOUT SAVING CHANGES=Avís de desat: dóna un avís si cancel·leu sense desar els canvis.
 SEARCH AND REPLACE=Cerca &amp; Reemplaça
-SELECT FUNCTIONALITY=Funcionalitat de selecció
+SELECT FUNCTIONALITY=Selecciona la funcionalitat
 SHOW/HIDE THE HORIZONTAL RULE BUTTON=Mostra/Amaga el botó de regle horitzontal
 SIMPLE=Simple
 SMILIES=Emoticones
@@ -94,3 +94,50 @@
 URL BEHAVIOUR=Comportament URL
 URLS=URL
 XHTMLXTRAS=XHTMLxtras
+
+# Noves definicions
+SKIN=Aparença
+SELECT SKIN=Selecciona l'aparença
+
+ADD CUSTOM BUTTON(S)=Afegeix botons personalitzats
+ADD CUSTOM PLUGIN(S)=Afegeix connectors personalitzats
+ADVANCED IMAGE=Imatge avançada
+ADVANCED LINK=Enllaç avançat
+ALIGNMENT OF THE TOOLBAR=Alineació de la barra d'eines
+ALL DIALOGS TO OPEN AS FLOATING DIV LAYERS INSTEAD OF POPUP WINDOWS. THIS OPTION CAN BE VERY USEFUL IN ORDER TO GET AROUND POPUP BLOCKERS.=Fes que tots els diàlegs s'obrin com a capes DIV flotants en lloc de com a finestres emergents. Aquesta opció pot ser molt útil per tal d'evitar els bloquejadors de finestres emergents.
+COLORS=Colors
+CONTEXT MENU=Menú contextual
+CONTROLS HOW ENTITIES GET PROCESSED BY EDITOR=Controla de quina forma l'editor processa les entitats
+CUSTOM BUTTON=Botó personalitzat
+CUSTOM PLUGIN=Connector personalitzat
+ENTITY ENCODING=Codificació d'entitat
+EXTENDED=Ampliat
+FONTS=Fonts
+INLINE POPUPS=Emergents en línia
+INSERT NONBREAKING SPACE ENTITIES=Insereix entitats d'espai en blanc
+NAMED=anomenat
+NONBREAKING=Espai en blanc
+NUMERIC=numèric
+OFFICE2007 BLACK=Office2007 Negre
+OFFICE2007 BLUE=Office2007 Blau
+OFFICE2007 SILVER=Office2007 Plata
+PARAMCOLORS=Mostra/Amaga els botons de control de colors. Només s'aplica en mode ampliat.
+PARAMS EXTENDED MODE=<strong>Opcions de mode ampliat</strong><br />Aquestes opcions només s'apliquen en mode ampliat.
+PARAMFONTS=Mostra/Amaga els selectors de fonts. Només s'aplica en mode ampliat
+PARAMMEDIA=Mostra/Amaga el botó d'imatge. Només s'aplica en mode ampliat
+PARAMPASTE=Mostra/Amaga els botons d'enganxar. Només s'aplica en mode ampliat
+PASTE=Enganxa
+POSSIBILITY TO SEE INVISIBLE CHARACTERS=Possibilitat de veure els caràcters invisibles
+RAW=cru
+SAFARI COMPATIBILITY=Compatibilitat amb el Safari
+SEARCH-REPLACE=Cerca-Reemplaça
+TEMPLATE=Plantilla
+TINYBROWSER=Tinybrowser
+TOOLBAR ALIGN=Alineació de la barra d'eines
+TURN ON/OFF A MORE ADVANCED IMAGE DIALOG=Activa/desactiva un diàleg d'imatge més avançat
+TURN ON/OFF A MORE ADVANCED LINK DIALOG=Activa/desactiva un diàleg d'enllaç més avançat
+TURN ON/OFF CONTEXT MENU=Activa/desactiva el menú contextual
+TURN ON/OFF SAFARI COMPATIBILITY PLUGIN=Activa/desactiva el connector de compatibilitat amb el Safari
+TURN ON/OFF TINYBROWSER FOR IMAGES/LINKS=Activa/desactiva el Tinybrowser per a imatges/enllaços
+VISUALCHARS=Caràcters visuals
+
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.tpl_ja_purity.ini 2/administrator/language/ca-ES/ca-ES.tpl_ja_purity.ini
--- 1/administrator/language/ca-ES/ca-ES.tpl_ja_purity.ini	2009-06-26 08:50:06.000000000 +0200
+++ 2/administrator/language/ca-ES/ca-ES.tpl_ja_purity.ini	2009-01-10 19:34:32.000000000 +0100
@@ -1,7 +1,8 @@
-# $Id: ca-ES.tpl_ja_purity.ini 11403 2009-06-26 08:50:06 dverger ~0 $
-# author Joomla! Catalan Translation
-# copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
-# license Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+# $Id: ca-ES.tpl_ja_purity.ini 11403 2009-01-10 14:22:55Z dverger $
+# Joomla! Catalan Translation
+# Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+# Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
+# license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
 # Note : All ini files need to be saved as UTF-8
 
@@ -57,4 +58,4 @@
 TEMPLATE FONT SIZE=<hr /><b>Mida de font de la plantilla</b>
 TEMPLATE_WIDTH=<hr /><b>Amplada de la plantilla</b>
 TEMPLATE STYLES=<hr /><b>Estils de la plantilla</b>
-RIGHT MODULES=<hr /><b>Funció d'ocultació dels mòduls de la dreta</b>
\ No hay ningún carácter de nueva línea al final del fichero
+RIGHT MODULES=<hr /><b>Funció d'ocultació dels mòduls de la dreta</b>
diff -aruN --binary 1/administrator/language/ca-ES/ca-ES.xml 2/administrator/language/ca-ES/ca-ES.xml
--- 1/administrator/language/ca-ES/ca-ES.xml	2009-05-16 03:29:10.000000000 +0200
+++ 2/administrator/language/ca-ES/ca-ES.xml	2009-06-30 21:21:28.000000000 +0200
@@ -3,8 +3,8 @@
 	<tag>ca-ES</tag>
 	<name>Catalan</name>
 	<description>Catalan language administrator pack for Joomla</description>
-	<version>1.5.11</version>
-	<creationDate>2009-05-16</creationDate>
+	<version>1.5.12</version>
+	<creationDate>2009-06-30</creationDate>
 	<author>Catalan Joomla Translation Team</author>
 	<authorUrl>www.joomla.cat</authorUrl>
 	<authorEmail>dverger@joomla.cat</authorEmail>
diff -aruN --binary 1/administrator/language/en-GB/en-GB.com_media.ini 2/administrator/language/en-GB/en-GB.com_media.ini
--- 1/administrator/language/en-GB/en-GB.com_media.ini	2009-05-29 14:50:44.000000000 +0200
+++ 2/administrator/language/en-GB/en-GB.com_media.ini	2009-07-23 04:25:36.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: en-GB.com_media.ini 10496 2008-07-03 07:08:39Z ircmaxell $
+# $Id: en-GB.com_media.ini 12540 2009-07-22 17:34:44Z ian $
 # Joomla! Project
 # Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 # License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
@@ -65,6 +65,7 @@
 MEDIA MANAGER=Media Manager
 NAME=Image Name
 NO IMAGES FOUND=No Images Found
+NOT EMPTY!=the directory is not empty!
 NOT SET=Not Set
 NUMFILES=Files:
 NUMFOLDERS=Folders:
@@ -79,7 +80,7 @@
 THIS COMPONENT MANAGES SITE MEDIA=This Component manages site media
 THIS FILE TYPE IS NOT SUPPORTED=This file type is not supported
 THUMBNAIL VIEW=Thumbnail View
-UNABLE TO DELETE: NOT EMPTY!=Unable to delete! Not empty!
+UNABLE TO DELETE:=Unable to delete:
 UP=Up
 UPLOAD=Upload
 UPLOAD COMPLETE=Upload Complete
diff -aruN --binary 1/administrator/language/es-ES/es-ES.com_media.ini 2/administrator/language/es-ES/es-ES.com_media.ini
--- 1/administrator/language/es-ES/es-ES.com_media.ini	2009-05-23 04:45:12.000000000 +0200
+++ 2/administrator/language/es-ES/es-ES.com_media.ini	2009-07-25 18:44:46.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: es-ES.com_media.ini 1.5.0 2009-05-23 04:45:12 15:24:34 ~0 $
+# $Id: es-ES.com_media.ini 1.5.0 2009-07-25 18:44:43 15:24:34 ~0 $
 # author Joomla! Spanish
 # copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
@@ -66,6 +66,7 @@
 MEDIA MANAGER=Gestor Multimedia
 NAME=Nombre del Item
 NO IMAGES FOUND=No encuentro imágenes
+NOT EMPTY!=¡el directorio no está vacío!
 NOT SET=Sin asignar
 NUMFILES=Archivos:
 NUMFOLDERS=Carpetas:
@@ -80,7 +81,7 @@
 THIS COMPONENT MANAGES SITE MEDIA=Este Componente gestiona archivos Multimedia
 THIS FILE TYPE IS NOT SUPPORTED=Este tipo de archivo no está soportado
 THUMBNAIL VIEW=Vista en Miniatura
-UNABLE TO DELETE: NOT EMPTY!=Imposible borrarlo: ¡No está vacio!
+UNABLE TO DELETE:=No se puede borrar:
 UP=Subir
 UPLOAD=Subida
 UPLOAD COMPLETE=Subida completada
@@ -96,4 +97,5 @@
 WARNINVALIDIMG=Imagen inválida.
 WARNINVALIDMIME=Se ha encontrado un tipo de MIME inválido o no autorizado.
 WARNNOTADMIN=El archivo subido no es una imagen y tú no eres usuario con rango de Autor o superior.
-WARNIEXSS=Se ha encontrado un posible ataque del tipo XSS.
\ No hay ningún carácter de nueva línea al final del fichero
+WARNIEXSS=Se ha encontrado un posible ataque del tipo XSS.
+UNABLE TO DELETE: NOT EMPTY!=Imposible borrarlo: ¡No está vacio!
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/administrator/language/es-ES/es-ES.mod_feed.ini 2/administrator/language/es-ES/es-ES.mod_feed.ini
--- 1/administrator/language/es-ES/es-ES.mod_feed.ini	2009-01-11 03:33:26.000000000 +0100
+++ 2/administrator/language/es-ES/es-ES.mod_feed.ini	2009-07-25 18:10:16.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: es-ES.mod_feed.ini 1.5.5 2009-01-11 02:33:26 ff ~0 $
+# $Id: es-ES.mod_feed.ini 1.5.5 2009-07-04 12:52:49 ff ~0 $
 # author Joomla! Spanish
 # copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
@@ -17,7 +17,7 @@
 ITEMS=Ítems
 MOD_FEED=mod feed
 PARAMITEMDESC=Mostrar la descripción o introducción de texto de cada uno de los artículos RSS
-PARAMWORDCOUNT=Le permite limitar la cantidad visible de texto de la descripción . 0 mostrará todo el texto
+PARAMWORDCOUNT=Le permite limitar la cantidad visible de texto en la descripción . 0 mostrará todo el texto
 RTL FEED=RTL feed
 SHOW THE DESCRIPTION TEXT FOR THE WHOLE FEED=Mostrar la descripción del texto para el conjunto del feed
 SHOW THE IMAGE ASSOCIATED WITH THE WHOLE FEED=Mostrar la imagen asociada con la totalidad del feed
diff -aruN --binary 1/administrator/language/es-ES/es-ES.xml 2/administrator/language/es-ES/es-ES.xml
--- 1/administrator/language/es-ES/es-ES.xml	2009-06-26 09:01:04.000000000 +0200
+++ 2/administrator/language/es-ES/es-ES.xml	2009-07-25 18:42:24.000000000 +0200
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<metafile version="1.5"  client="administrator" >
-	<tag>es-ES</tag>
-	<name>Español (spanish formal Internacional)</name>
-	<description>Idioma para usar en la parte administrativa de Joomla! 1.5. Creado por Joomla! Spanish - Traductor oficial asociado</description>
-	<version>1.5.12</version>
-	<creationDate>2009-05-21</creationDate>
-	<author>Joomla! Spanish</author>
-	<authorUrl>www.joomlaspanish.org</authorUrl>
-	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
-	<copyright>copyright (C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
-	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<metadata>
-		<name>Español (spanish formal Internacional)</name>
-		<tag>es-ES</tag>
-		<rtl>0</rtl>
-		<locale>es_ES.utf8, es_ES.UTF-8, es_ES, spanish, spanish.UTF-8, spa_ES.UTF-8, spa_ES, sp_ES, es</locale>
-		<winCodePage>iso-8859-1</winCodePage>
-		<backwardLang>spanish</backwardLang>
-		<pdfFontName>vera</pdfFontName>
-	</metadata>
-	<params></params>
-</metafile>
+<?xml version="1.0" encoding="utf-8"?>
+<metafile version="1.5"  client="administrator" >
+	<tag>es-ES</tag>
+	<name>Español (spanish formal Internacional)</name>
+	<description>Idioma para usar en la parte administrativa de Joomla! 1.5. Creado por Joomla! Spanish - Traductor oficial asociado</description>
+	<version>1.5.13</version>
+	<creationDate>2009-05-21</creationDate>
+	<author>Joomla! Spanish</author>
+	<authorUrl>www.joomlaspanish.org</authorUrl>
+	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
+	<copyright>copyright (C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
+	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<metadata>
+		<name>Español (spanish formal Internacional)</name>
+		<tag>es-ES</tag>
+		<rtl>0</rtl>
+		<locale>es_ES.utf8, es_ES.UTF-8, es_ES, spanish, spanish.UTF-8, spa_ES.UTF-8, spa_ES, sp_ES, es</locale>
+		<winCodePage>iso-8859-1</winCodePage>
+		<backwardLang>spanish</backwardLang>
+		<pdfFontName>vera</pdfFontName>
+	</metadata>
+	<params></params>
+</metafile>
diff -aruN --binary 1/CHANGELOG.php 2/CHANGELOG.php
--- 1/CHANGELOG.php	2009-06-30 22:01:32.000000000 +0200
+++ 2/CHANGELOG.php	2009-07-23 04:25:34.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: CHANGELOG.php 12389 2009-07-01 00:34:45Z ian $
+* @version		$Id: CHANGELOG.php 12543 2009-07-23 01:47:21Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
@@ -37,6 +37,20 @@
 - -> Removed
 ! -> Note
 
+
+-------------------- 1.5.13 Stable Release [22-July-2009] ------------------
+
+22-Jul-2009 Ian MacLennan
+ # [#15548] Plugin content/emailcloak: package oomla
+ # [#16073] Front End Account Creation does not save 'usertype' in jos_users table
+ # [#16726] Edit icon does not appear in correct area (buttonheading)
+ # [#17008] Untranslated error message in Media Manager
+ # [#17053] 1.5.12 Media Manager showing upload Error
+ # [#17101] Reversion of changes to Image Button in 1.5.12
+
+06-Jul-2009 Sam Moffatt
+ # [#17058] Incorrect _JEXEC check breaks TinyMCE JS when using compressed mode
+
 -------------------- 1.5.12 Stable Release [30-June-2009] ------------------
 
 29-Jun-2009 Ian MacLennan
diff -aruN --binary 1/components/com_content/views/frontpage/tmpl/default_item.php 2/components/com_content/views/frontpage/tmpl/default_item.php
--- 1/components/com_content/views/frontpage/tmpl/default_item.php	2009-05-29 15:22:46.000000000 +0200
+++ 2/components/com_content/views/frontpage/tmpl/default_item.php	2009-07-23 04:25:36.000000000 +0200
@@ -39,7 +39,7 @@
 	</td>
 	<?php endif; ?>
 	<?php if ($canEdit) : ?>
-	<td>
+	<td align="right" width="100%" class="buttonheading">
 		<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
 	</td>
 	<?php endif; ?>
diff -aruN --binary 1/components/com_content/views/section/tmpl/blog_item.php 2/components/com_content/views/section/tmpl/blog_item.php
--- 1/components/com_content/views/section/tmpl/blog_item.php	2009-05-29 15:22:46.000000000 +0200
+++ 2/components/com_content/views/section/tmpl/blog_item.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,15 +1,11 @@
 <?php // no direct access
 defined('_JEXEC') or die('Restricted access'); ?>
-<?php if ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')) : ?>
-	<div class="contentpaneopen_edit<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
-		<?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
-	</div>
-<?php endif; ?>
+<?php $canEdit   = ($this->user->authorize('com_content', 'edit', 'content', 'all') || $this->user->authorize('com_content', 'edit', 'content', 'own')); ?>
 <?php if ($this->item->state == 0) : ?>
 <div class="system-unpublished">
 <?php endif; ?>
 
-<?php if ($this->item->params->get('show_title') || $this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon')) : ?>
+<?php if ($this->item->params->get('show_title') || $this->item->params->get('show_pdf_icon') || $this->item->params->get('show_print_icon') || $this->item->params->get('show_email_icon') || $canEdit) : ?>
 <table class="contentpaneopen<?php echo $this->escape($this->item->params->get( 'pageclass_sfx' )); ?>">
 <tr>
 	<?php if ($this->item->params->get('show_title')) : ?>
@@ -40,6 +36,13 @@
 	<?php echo JHTML::_('icon.email', $this->item, $this->item->params, $this->access); ?>
 	</td>
 	<?php endif; ?>
+	
+	<?php if ($canEdit) : ?>
+	   <td align="right" width="100%" class="buttonheading">
+	   <?php echo JHTML::_('icon.edit', $this->item, $this->item->params, $this->access); ?>
+	   </td>
+   <?php endif; ?>
+	
 </tr>
 </table>
 <?php endif; ?>
diff -aruN --binary 1/components/com_media/media.php 2/components/com_media/media.php
--- 1/components/com_media/media.php	2009-05-29 14:53:10.000000000 +0200
+++ 2/components/com_media/media.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: media.php 11784 2009-04-24 17:34:11Z kdevine $
+ * @version		$Id: media.php 12542 2009-07-22 17:40:48Z ian $
  * @package		Joomla
  * @subpackage	Massmail
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -14,14 +14,7 @@
 
 // no direct access
 defined('_JEXEC') or die('Restricted access');
-
 $params =& JComponentHelper::getParams('com_media');
-$ranks = array('publisher', 'editor', 'author', 'registered');
-$acl = & JFactory::getACL();
-for($i = 0; $i < $params->get('allowed_media_usergroup', 3); $i++)
-{
-	$acl->addACL( 'com_media', 'popup', 'users', $ranks[$i] );
-}
 // Make sure the user is authorized to view this page
 $user = & JFactory::getUser();
 if (!$user->authorize( 'com_media', 'popup' )) {
diff -aruN --binary 1/components/com_user/controller.php 2/components/com_user/controller.php
--- 1/components/com_user/controller.php	2009-06-30 22:01:32.000000000 +0200
+++ 2/components/com_user/controller.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: controller.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: controller.php 12538 2009-07-22 17:26:51Z ian $
  * @package		Joomla
  * @subpackage	Content
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -250,7 +250,7 @@
 
 		// Set some initial user values
 		$user->set('id', 0);
-		$user->set('usertype', '');
+		$user->set('usertype', $newUsertype);
 		$user->set('gid', $authorize->get_group_id( '', $newUsertype, 'ARO' ));
 
 		$date =& JFactory::getDate();
diff -aruN --binary 1/includes/framework.php 2/includes/framework.php
--- 1/includes/framework.php	2009-06-30 22:01:32.000000000 +0200
+++ 2/includes/framework.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: framework.php 12389 2009-07-01 00:34:45Z ian $
+* @version		$Id: framework.php 12543 2009-07-23 01:47:21Z ian $
 * @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
diff -aruN --binary 1/language/ca-ES/ca-ES.com_content.ini 2/language/ca-ES/ca-ES.com_content.ini
--- 1/language/ca-ES/ca-ES.com_content.ini	2009-03-13 23:26:08.000000000 +0100
+++ 2/language/ca-ES/ca-ES.com_content.ini	2009-06-30 21:07:08.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: ca-ES.com_content.ini 11654 2009-03-13 23:26:36Z dverger $
+# $Id: ca-ES.com_content.ini 12386 2009-06-30 21:06:36Z dverger $
 # Joomla! Catalan Translation
 # Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
 # Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
@@ -116,3 +116,4 @@
 YOUR EMAIL=El vostre correu electrònic
 YOUR FRIENDS EMAIL=El correu electrònic del vostre amic
 YOUR NAME=El vostre nom
+TOGGLE EDITOR=Canvia d'editor
diff -aruN --binary 1/language/ca-ES/ca-ES.ini 2/language/ca-ES/ca-ES.ini
--- 1/language/ca-ES/ca-ES.ini	2009-01-10 20:11:32.000000000 +0100
+++ 2/language/ca-ES/ca-ES.ini	2009-07-05 22:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: ca-ES.ini 11391 2009-01-10 20:11:35Z dverger $
+# $Id: ca-ES.ini 12073 2009-06-28 23:11:35Z dverger $
 # Joomla! Catalan Translation
 # Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
 # Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
@@ -13,7 +13,7 @@
 DATE_FORMAT_LC3=%e de %B de %Y
 DATE_FORMAT_LC4=%d.%m.%y
 DATE_FORMAT_JS1=y-m-d
-%Y-%M-%D=%Y-%M-%D
+%Y-%M-%D=%Y-%m-%d
 %A, %B %E=%A, %e de %B
 
 # Months
@@ -50,7 +50,7 @@
 SUNDAY=diumenge
 MON=dl.
 MONDAY=dilluns
-TUE=dm.
+TUE=dt.
 TUESDAY=dimarts
 WED=dc.
 WEDNESDAY=dimecres
diff -aruN --binary 1/language/ca-ES/ca-ES.mod_feed.ini 2/language/ca-ES/ca-ES.mod_feed.ini
--- 1/language/ca-ES/ca-ES.mod_feed.ini	2009-01-10 20:49:26.000000000 +0100
+++ 2/language/ca-ES/ca-ES.mod_feed.ini	2009-06-28 23:15:16.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: ca-ES.mod_feed.ini 11371 2009-01-10 20:46:22Z dverger $
+# $Id: ca-ES.mod_feed.ini 12072 2009-06-28 23:16:22Z dverger $
 # Joomla! Catalan Translation
 # Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
 # Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
@@ -28,4 +28,4 @@
 SHOW THE IMAGE ASSOCIATED WITH THE WHOLE FEED=Mostra la imatge associada amb el canal sencer.
 THIS MODULE ALLOWS THE DISPLAYING OF A SYNDICATED FEED=Aquest mòdul permet la visualització d'un canal sindicat.
 WORD COUNT=Comptatge de paraules
-THE TIME IN SECONDS BEFORE THE MODULE IS RE-CACHED.=Temps en segons abans que el mòdul es torni a carregar a la memòria cau.
+THE TIME IN MINUTES BEFORE THE MODULE IS RE-CACHED.=Temps en minuts abans que el mòdul es torni a carregar a la memòria cau.
diff -aruN --binary 1/language/ca-ES/ca-ES.tpl_beez.ini 2/language/ca-ES/ca-ES.tpl_beez.ini
--- 1/language/ca-ES/ca-ES.tpl_beez.ini	2008-12-31 20:49:10.000000000 +0100
+++ 2/language/ca-ES/ca-ES.tpl_beez.ini	2009-06-28 23:18:06.000000000 +0200
@@ -1,7 +1,7 @@
-# $Id: ca-ES.tpl_beez.ini 10388 2008-07-24 01:17:10Z dverger $
+# $Id: ca-ES.tpl_beez.ini 12230 2009-06-28 23:17:10Z dverger $
 # Joomla! Catalan Translation
-# Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
-# Copyright (C) Translation 2008  Catalan Joomla Translation Team - joomla.cat
+# Copyright (C) 2005 - 2009 Open Source Matters. All rights reserved.
+# Copyright (C) Translation 2008 - 2009  Catalan Joomla Translation Team - joomla.cat
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 
 # Note : All ini files need to be saved as UTF-8
@@ -24,3 +24,4 @@
 SKIP TO CONTENT=Vés al contingut
 SMALLER=més petit
 YOU ARE HERE=Sou aquí:
+LOST PASSWORD?=Heu perdut la contrasenya?
diff -aruN --binary 1/language/ca-ES/ca-ES.xml 2/language/ca-ES/ca-ES.xml
--- 1/language/ca-ES/ca-ES.xml	2009-05-16 03:30:22.000000000 +0200
+++ 2/language/ca-ES/ca-ES.xml	2009-06-30 21:20:40.000000000 +0200
@@ -3,8 +3,8 @@
 	<tag>ca-ES</tag>
 	<name>Catalan</name>
 	<description>Catalan language site pack for Joomla</description>
-	<version>1.5.11</version>
-	<creationDate>2009-05-16</creationDate>
+	<version>1.5.12</version>
+	<creationDate>2009-06-30</creationDate>
 	<author>Catalan Joomla Translation Team</author>
 	<authorUrl>www.joomla.cat</authorUrl>
 	<authorEmail>dverger@joomla.cat</authorEmail>
diff -aruN --binary 1/language/es-ES/es-ES.ignore.php 2/language/es-ES/es-ES.ignore.php
--- 1/language/es-ES/es-ES.ignore.php	2008-07-08 21:20:26.000000000 +0200
+++ 2/language/es-ES/es-ES.ignore.php	2009-07-25 18:09:50.000000000 +0200
@@ -1,22 +1,22 @@
-<?php
-/**
-* @version		$Id: es-ES.ignore.php 6140 2007-01-02 03:44:18Z eddiea $
-* @package		Joomla
-* @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
-* @license		GNU/GPL, see LICENSE.php
-* Joomla! is free software. This version may have been modified pursuant
-* to the GNU General Public License, and as distributed it includes or
-* is derivative of works licensed under the GNU General Public License or
-* other free or open source software licenses.
-* See COPYRIGHT.php for copyright notices and details.
-*/
-
-$search_ignore[] = "and";
-$search_ignore[] = "in";
-$search_ignore[] = "on";
-
-$search_ignore[] = "el";
-$search_ignore[] = "la";
-$search_ignore[] = "lo";
-
+<?php
+/**
+* @version		$Id: es-ES.ignore.php 6140 2007-01-02 03:44:18Z eddiea $
+* @package		Joomla
+* @copyright	Copyright (C) 2005 - 2007 Open Source Matters. All rights reserved.
+* @license		GNU/GPL, see LICENSE.php
+* Joomla! is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*/
+
+$search_ignore[] = "and";
+$search_ignore[] = "in";
+$search_ignore[] = "on";
+
+$search_ignore[] = "el";
+$search_ignore[] = "la";
+$search_ignore[] = "lo";
+
 ?>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/language/es-ES/es-ES.ini 2/language/es-ES/es-ES.ini
--- 1/language/es-ES/es-ES.ini	2009-07-01 10:14:58.000000000 +0200
+++ 2/language/es-ES/es-ES.ini	2009-07-25 18:09:50.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: es-ES.ini 1.5.0 2009-07-01 10:14:58 2007-10-06 ~0 $
+# $Id: es-ES.ini 1.5.0 2009-07-06 10:50:23 2007-10-06 ~0 $
 # author Joomla! Spanish
 # copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
@@ -151,7 +151,7 @@
 A SEARCH ENGINE THAT HAS AN OUT-OF-DATE LISTING FOR THIS SITE=el sistema de búsqueda tiene<strong>un listado anticuado para este sitio</strong>
 A MIS-TYPED ADDRESS=a <strong>dirección mis-typed</strong>
 ATTENTION OPEN IN A NEW WINDOW=Atención, abrir en una nueva ventana.
-BACK=Retroceder
+BACK=[ Retroceder ]
 BANNER=Banner
 CACHE DIRECTORY UNWRITABLE=Directorio de caché No Escribible
 CANCEL=Cancelar
diff -aruN --binary 1/language/es-ES/es-ES.mod_feed.ini 2/language/es-ES/es-ES.mod_feed.ini
--- 1/language/es-ES/es-ES.mod_feed.ini	2009-07-01 10:16:20.000000000 +0200
+++ 2/language/es-ES/es-ES.mod_feed.ini	2009-07-25 18:09:50.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: es-ES.mod_feed.ini 1.5.0 2009-07-01 10:16:20 2007-10-06 ~0 $
+# $Id: es-ES.mod_feed.ini 1.5.0 2009-07-04 12:57:18 2007-10-06 ~0 $
 # author Joomla! Spanish
 # copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
@@ -8,7 +8,7 @@
 DISPLAY FEED IN RTL DIRECTION=Mostrar Feed en la dirección RTL
 DISPLAY NEWS FEED TITLE=Muestra el titulo de las noticias Feed
 ENTER NUMBER OF RSS ITEMS TO DISPLAY=Introduzca el número de elementos RSS para ver
-ENTER THE URL OF THE RSS/RDF FEED=Introduzca la URL de als feeds RSS/RDF
+ENTER THE URL OF THE RSS/RDF FEED=Introduzca la URL de las feeds RSS/RDF
 FEED DESCRIPTION=Descripción Feed
 FEED IMAGE=Imagen del Feed
 FEED DISPLAY=Presentación de la suscripción
diff -aruN --binary 1/language/es-ES/es-ES.mod_footer.ini 2/language/es-ES/es-ES.mod_footer.ini
--- 1/language/es-ES/es-ES.mod_footer.ini	2008-11-11 19:48:42.000000000 +0100
+++ 2/language/es-ES/es-ES.mod_footer.ini	2009-07-25 18:09:48.000000000 +0200
@@ -1,12 +1,12 @@
-# $Id: es-ES.mod_footer.ini 1.5.0 2008-07-08 20:37:33 2007-09-01 ~0 $
+# $Id: es-ES.mod_footer.ini 1.5.0 2009-07-06 13:37:55 2007-09-01 ~0 $
 # author Joomla! Spanish
-# copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
+# copyright (C) 2009 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
 
 # Note : All ini files need to be saved as UTF-8
 
 FOOTER=Footer (pie de página)
-FOOTER_LINE1=Copyright &#169; %date% Open Source Matters. Todos los derechos reservados.<br />
-FOOTER_LINE2=<a href="http://www.joomlaspanish.org/">Pack creado por Joomla! Spanish 2008</a> - <a href="http://www.webempresa.com/" title="Diseño web" alt="Diseño web" target="_blank">Patrocinado por Web Empresa</a><br /><a href="http://www.joomla.org">Joomla!</a> es un software libre publicado bajo la <a href="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL">licencia GNU/GPL.</a>
+FOOTER_LINE1=Copyright &#169; %date% %sitename%. Todos los derechos reservados.
+FOOTER_LINE2=<a href="http://www.joomlaspanish.org/">Pack creado por Joomla! Spanish 2008</a> - <a href="http://www.webempresa.com/" title="Diseño web" target="_blank">Patrocinado por Web Empresa</a><br /><a href="http://www.joomla.org">Joomla!</a> es un software libre publicado bajo la <a href="http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL">licencia GNU/GPL.</a>
 MOD_FOOTER=<em>mod_footer</em>
-THIS MODULE SHOWS THE JOOMLA! COPYRIGHT INFORMATION=Este módulo muestra información de los derechos de Copyright de Joomla!
\ No hay ningún carácter de nueva línea al final del fichero
+THIS MODULE SHOWS THE JOOMLA! COPYRIGHT INFORMATION=Este módulo muestra información del Copyright de Joomla!
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/language/es-ES/es-ES.mod_whosonline.ini 2/language/es-ES/es-ES.mod_whosonline.ini
--- 1/language/es-ES/es-ES.mod_whosonline.ini	2008-07-08 21:20:26.000000000 +0200
+++ 2/language/es-ES/es-ES.mod_whosonline.ini	2009-07-25 18:09:46.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: es-ES.mod_whosonline.ini 1.5.0 2008-07-08 20:13:51 2007-09-01 ~0 $
+# $Id: es-ES.mod_whosonline.ini 1.5.0 2009-07-06 10:55:42 2007-09-01 ~0 $
 # author Joomla! Spanish
 # copyright (C) 2008 JoomlaSpanish.org  All rights reserved.
 # license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
@@ -13,9 +13,9 @@
 MEMBER ONLINE=&nbsp;%s miembro en línea
 MEMBERS ONLINE=&nbsp;%s miembros en línea
 MOD_WHOSONLINE=<em>mod_whosonline</em>
-NO USERS ONLINE=No hay usuarios en líena
+NO USERS ONLINE=No hay usuarios en línea
 NUMBER OF GUESTS/MEMBERS=# de Invitados / Miembros
-ONLINE=conectado
+ONLINE=conectado(s)
 SELECT WHAT SHALL BE SHOWN=Seleccione que deberá ser mostrado
 GUEST=%s invitado
 GUESTS=%s invitados
diff -aruN --binary 1/language/es-ES/es-ES.xml 2/language/es-ES/es-ES.xml
--- 1/language/es-ES/es-ES.xml	2009-06-26 09:01:26.000000000 +0200
+++ 2/language/es-ES/es-ES.xml	2009-07-25 18:41:58.000000000 +0200
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<metafile version="1.5"  client="site" >
-	<tag>es-ES</tag>
-	<name>Español (spanish formal Internacional)</name>
-	<description>Idioma creado por Joomla! Spanish para Joomla 1.5 zona frontal - Traductor oficial asociado</description>
-	<version>1.5.12</version>
-	<creationDate>2009-05-21</creationDate>
-	<author>Joomla! Spanish</author>
-	<authorUrl>www.joomlaspanish.org</authorUrl>
-	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
-	<copyright>(C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
-	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<metadata>
-		<name>Español (spanish formal Internacional)</name>
-		<tag>es-ES</tag>
-		<rtl>0</rtl>
-		<locale>es_ES.UTF-8, spa_ES.UTF-8, es_ES, spanish.UTF-8, spanish, spa_ES, sp_ES, spain,es</locale>
-		<winCodePage>iso-8859-1</winCodePage>
-		<backwardLang>spanish</backwardLang>
-		<pdfFontName>freesans</pdfFontName>
-	</metadata>
-	<params></params>
-</metafile>
+<?xml version="1.0" encoding="utf-8"?>
+<metafile version="1.5"  client="site" >
+	<tag>es-ES</tag>
+	<name>Español (spanish formal Internacional)</name>
+	<description>Idioma creado por Joomla! Spanish para Joomla 1.5 zona frontal - Traductor oficial asociado</description>
+	<version>1.5.13</version>
+	<creationDate>2009-05-21</creationDate>
+	<author>Joomla! Spanish</author>
+	<authorUrl>www.joomlaspanish.org</authorUrl>
+	<authorEmail>extensiones@joomlaspanish.org</authorEmail>
+	<copyright>(C) 2009 JoomlaSpanish.org  All rights reserved.</copyright>
+	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<metadata>
+		<name>Español (spanish formal Internacional)</name>
+		<tag>es-ES</tag>
+		<rtl>0</rtl>
+		<locale>es_ES.UTF-8, spa_ES.UTF-8, es_ES, spanish.UTF-8, spanish, spa_ES, sp_ES, spain,es</locale>
+		<winCodePage>iso-8859-1</winCodePage>
+		<backwardLang>spanish</backwardLang>
+		<pdfFontName>freesans</pdfFontName>
+	</metadata>
+	<params></params>
+</metafile>
diff -aruN --binary 1/libraries/joomla/client/ldap.php 2/libraries/joomla/client/ldap.php
--- 1/libraries/joomla/client/ldap.php	2009-05-29 14:54:34.000000000 +0200
+++ 2/libraries/joomla/client/ldap.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
 
 /**
-* @version		$Id: ldap.php 10707 2008-08-21 09:52:47Z eddieajau $
+* @version		$Id: ldap.php 12543 2009-07-23 01:47:21Z ian $
 * @package		Joomla.Framework
 * @subpackage	Client
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -18,6 +18,10 @@
  * @subpackage	Client
  * @since		1.5
  */
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
+
 class JLDAP extends JObject
 {
 	/** @var string Hostname of LDAP server
diff -aruN --binary 1/libraries/joomla/filesystem/file.php 2/libraries/joomla/filesystem/file.php
--- 1/libraries/joomla/filesystem/file.php	2009-06-30 22:01:32.000000000 +0200
+++ 2/libraries/joomla/filesystem/file.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: file.php 12346 2009-06-24 13:16:14Z ian $
+ * @version		$Id: file.php 12541 2009-07-22 17:36:38Z ian $
  * @package		Joomla.Framework
  * @subpackage	FileSystem
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -336,6 +336,7 @@
 			// Copy the file to the destination directory
 			if (is_uploaded_file($src) && $ftp->store($src, $dest))
 			{
+			            $ret = true;
                 		unlink($src);
 			} else {
 				JError::raiseWarning(21, JText::_('WARNFS_ERR02'));
diff -aruN --binary 1/libraries/joomla/html/html/content.php 2/libraries/joomla/html/html/content.php
--- 1/libraries/joomla/html/html/content.php	2009-05-29 14:54:28.000000000 +0200
+++ 2/libraries/joomla/html/html/content.php	2009-07-23 04:25:36.000000000 +0200
@@ -12,6 +12,9 @@
 * See COPYRIGHT.php for copyright notices and details.
 */
 
+// no direct access
+defined('_JEXEC') or die('Restricted access');
+
 JLoader::register('JTableContent', JPATH_LIBRARIES . DS . 'joomla' . DS . 'database' . DS . 'table' . DS . 'content.php');
 
 /**
diff -aruN --binary 1/libraries/joomla/user/authorization.php 2/libraries/joomla/user/authorization.php
--- 1/libraries/joomla/user/authorization.php	2009-05-29 14:54:34.000000000 +0200
+++ 2/libraries/joomla/user/authorization.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version		$Id: authorization.php 11784 2009-04-24 17:34:11Z kdevine $
+* @version		$Id: authorization.php 12542 2009-07-22 17:40:48Z ian $
 * @package		Joomla.Framework
 * @subpackage	User
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
@@ -143,6 +143,13 @@
 		$this->addACL( 'com_media', 'popup', 'users', 'super administrator' );
 		$this->addACL( 'com_media', 'popup', 'users', 'administrator' );
 		$this->addACL( 'com_media', 'popup', 'users', 'manager' );
+		$this->addACL( 'com_media', 'popup', 'users', 'registered' );
+		$this->addACL( 'com_media', 'popup', 'users', 'author' );
+		$this->addACL( 'com_media', 'popup', 'users', 'editor' );
+		$this->addACL( 'com_media', 'popup', 'users', 'publisher' );
+		$this->addACL( 'com_media', 'upload', 'users', 'super administrator' );
+		$this->addACL( 'com_media', 'upload', 'users', 'administrator' );
+		$this->addACL( 'com_media', 'upload', 'users', 'manager' );
 
 		$this->addACL( 'com_menus', 'manage', 'users', 'administrator' );
 		$this->addACL( 'com_menus', 'manage', 'users', 'super administrator' );
diff -aruN --binary 1/libraries/joomla/utilities/compat/php50x.php 2/libraries/joomla/utilities/compat/php50x.php
--- 1/libraries/joomla/utilities/compat/php50x.php	2009-05-29 14:54:32.000000000 +0200
+++ 2/libraries/joomla/utilities/compat/php50x.php	2009-07-23 04:25:36.000000000 +0200
@@ -17,6 +17,10 @@
  *
  * @since		1.5
  */
+
+// Check to ensure this file is within the rest of the framework
+defined('JPATH_BASE') or die('Restricted access');
+
 if (!defined('FILE_USE_INCLUDE_PATH')) {
 	define('FILE_USE_INCLUDE_PATH', 1);
 }
@@ -97,9 +101,14 @@
 /**
  * Ported PHP5 function to PHP4 for forward compatibility
  */
-function clone($object) {
-	return unserialize(serialize($object));
-}
+
+if (version_compare(phpversion(), '5.0') < 0) {
+    eval('
+    function clone($object) {
+      return unserialize(serialize($object));
+    }
+    ');
+  }
 
 if(!function_exists('stripos')) {
  function stripos($haystack, $needle, $offset = 0) {
diff -aruN --binary 1/libraries/joomla/version.php 2/libraries/joomla/version.php
--- 1/libraries/joomla/version.php	2009-06-30 22:01:32.000000000 +0200
+++ 2/libraries/joomla/version.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: version.php 12389 2009-07-01 00:34:45Z ian $
+ * @version		$Id: version.php 12543 2009-07-23 01:47:21Z ian $
  * @package	Joomla.Framework
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -26,15 +26,15 @@
 	/** @var string Development Status */
 	var $DEV_STATUS = 'Stable';
 	/** @var int Sub Release Level */
-	var $DEV_LEVEL 	= '12';
+	var $DEV_LEVEL 	= '13';
 	/** @var int build Number */
 	var $BUILD	= '';
 	/** @var string Codename */
-	var $CODENAME 	= 'Wojmamni Ama Woi';
+	var $CODENAME 	= 'Wojmamni Ama Baji';
 	/** @var string Date */
-	var $RELDATE 	= '01-July-2009';
+	var $RELDATE 	= '23-July-2009';
 	/** @var string Time */
-	var $RELTIME 	= '02:00';
+	var $RELTIME 	= '04:00';
 	/** @var string Timezone */
 	var $RELTZ 	= 'GMT';
 	/** @var string Copyright Text */
diff -aruN --binary 1/plugins/content/emailcloak.php 2/plugins/content/emailcloak.php
--- 1/plugins/content/emailcloak.php	2009-05-29 14:52:46.000000000 +0200
+++ 2/plugins/content/emailcloak.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,7 +1,7 @@
 <?php
 /**
-* @version		$Id: emailcloak.php 10381 2008-06-01 03:35:53Z pasamio $
-* @package		oomla
+* @version		$Id: emailcloak.php 12537 2009-07-22 17:15:21Z ian $
+* @package		Joomla
 * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
 * @license		GNU/GPL, see LICENSE.php
 * Joomla! is free software. This version may have been modified pursuant
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advhr/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advimage/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/advlink/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/compat2x/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/compat2x/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/compat2x/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/compat2x/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/emotions/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/langs/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/langs/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/langs/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/example/langs/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/fullpage/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/media/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/pagebreak/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/paste/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/safari/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/safari/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/safari/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/safari/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/spellchecker/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/style/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tabfocus/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/table/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/template/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/config_tinybrowser.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/config_tinybrowser.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/config_tinybrowser.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/config_tinybrowser.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,125 +1,4 @@
-<?php
-/*
-TinyBrowser 1.41 - A TinyMCE file browser (C) 2008  Bryn Jones
-(author website - http://www.lunarvis.com)
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// switch off error handling, to use custom handler
-error_reporting(0); 
-
-// set script time out higher, to help with thumbnail generation
-set_time_limit(240);
-
-$tinybrowser = array();
-
-// Session control and security check - to enable please uncomment
-//if(isset($_GET['sessidpass'])) session_id($_GET['sessidpass']); // workaround for Flash session bug
-//session_start();
-//$tinybrowser['sessioncheck'] = 'authenticated_user'; //name of session variable to check
-
-// Random string used to secure Flash upload if session control not enabled - be sure to change!
-$tinybrowser['obfuscate'] = 's0merand0mjunk!!!111';
-
-// Set default language (ISO 639-1 code)
-//$tinybrowser['language'] = 'en';
-(isset($_COOKIE['tinybrowser_lang'])) ? $tinybrowser['language'] = $_COOKIE['tinybrowser_lang'] : $tinybrowser['language'] = 'en';
-
-// Set the integration type (TinyMCE is default)
-$tinybrowser['integration'] = 'tinymce'; // Possible values: 'tinymce', 'fckeditor'
-
-// Default is rtrim($_SERVER['DOCUMENT_ROOT'],'/') (suitable when using absolute paths, but can be set to '' if using relative paths)
-$tinybrowser['docroot'] = rtrim($_SERVER['DOCUMENT_ROOT'],'/');
-
-// Folder permissions for Unix servers only
-$tinybrowser['unixpermissions'] = 0777;
-
-// File upload paths (set to absolute by default)
-//$tinybrowser['path']['image'] = '/useruploads/images/'; // Image files location - also creates a '_thumbs' subdirectory within this path to hold the image thumbnails
-//$tinybrowser['path']['media'] = '/useruploads/media/'; // Media files location
-//$tinybrowser['path']['file']  = '/useruploads/files/'; // Other files location
-
-$tinybrowser['path']['image'] = str_replace($tinybrowser['docroot'],'', preg_replace('[\\\]', '/', realpath(dirname(__FILE__) . '/../../../../../../../images/stories'))) . '/'; // Image files location - also creates a '_thumbs' subdirectory within this path to hold the image thumbnails
-$tinybrowser['path']['media'] = str_replace($tinybrowser['docroot'],'', preg_replace('[\\\]', '/', realpath(dirname(__FILE__) . '/../../../../../../../images/stories'))) . '/'; // Media files location
-$tinybrowser['path']['file']  = str_replace($tinybrowser['docroot'],'', preg_replace('[\\\]', '/', realpath(dirname(__FILE__) . '/../../../../../../../images/stories'))) . '/'; // Other files location
-
-
-// File link paths - these are the paths that get passed back to TinyMCE or your application (set to equal the upload path by default)
-$tinybrowser['link']['image'] = $tinybrowser['path']['image']; // Image links
-$tinybrowser['link']['media'] = $tinybrowser['path']['media']; // Media links
-$tinybrowser['link']['file']  = $tinybrowser['path']['file']; // Other file links
-
-// File upload size limit (0 is unlimited)
-$tinybrowser['maxsize']['image'] = 0; // Image file maximum size
-$tinybrowser['maxsize']['media'] = 0; // Media file maximum size
-$tinybrowser['maxsize']['file']  = 0; // Other file maximum size
-
-// Image automatic resize on upload (0 is no resize)
-$tinybrowser['imageresize']['width']  = 0;
-$tinybrowser['imageresize']['height'] = 0;
-
-// Image thumbnail source (set to 'path' by default - shouldn't need changing)
-$tinybrowser['thumbsrc'] = 'path'; // Possible values: path, link
-
-// Image thumbnail size in pixels
-$tinybrowser['thumbsize'] = 80;
-
-// Image and thumbnail quality, higher is better (1 to 99)
-$tinybrowser['imagequality'] = 80; // only used when resizing or rotating
-$tinybrowser['thumbquality'] = 80;
-
-// Date format, as per php date function
-$tinybrowser['dateformat'] = 'd/m/Y H:i';
-
-// Permitted file extensions
-$tinybrowser['filetype']['image'] = '*.jpg, *.jpeg, *.gif, *.png'; // Image file types
-$tinybrowser['filetype']['media'] = '*.swf, *.dcr, *.mov, *.qt, *.mpg, *.mp3, *.mp4, *.mpeg, *.avi, *.wmv, *.wm, *.asf, *.asx, *.wmx, *.wvx, *.rm, *.ra, *.ram'; // Media file types
-$tinybrowser['filetype']['file']  = '*.*'; // Other file types
-
-// Prohibited file extensions
-$tinybrowser['prohibited'] = array('php','php3','php4','php5','phtml','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg','cgi', 'sh', 'py','asa','asax','config','com','inc');
-
-// Default file sort
-$tinybrowser['order']['by']   = 'name'; // Possible values: name, size, type, modified
-$tinybrowser['order']['type'] = 'asc'; // Possible values: asc, desc
-
-// Default image view method
-$tinybrowser['view']['image'] = 'thumb'; // Possible values: thumb, detail
-
-// File Pagination - split results into pages (0 is none)
-$tinybrowser['pagination'] = 0;
-
-// TinyMCE dialog.css file location, relative to tinybrowser.php (can be set to absolute link)
-$tinybrowser['tinymcecss'] = '../../themes/advanced/skins/default/dialog.css';
-
-// TinyBrowser pop-up window size
-$tinybrowser['window']['width']  = 770;
-$tinybrowser['window']['height'] = 480;
-
-// Assign Permissions for Upload, Edit, Delete & Folders
-$tinybrowser['allowupload']  = true;
-$tinybrowser['allowedit']    = true;
-$tinybrowser['allowdelete']  = true;
-$tinybrowser['allowfolders'] = true;
-
-// Clean filenames on upload
-$tinybrowser['cleanfilename'] = true;
-
-// Set default action for edit page
-$tinybrowser['defaultaction'] = 'delete'; // Possible values: delete, rename, move
-
-// Set delay for file process script, only required if server response is slow
-$tinybrowser['delayprocess'] = 0; // Value in seconds
-?>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,226 +1,4 @@
-<?php
-require_once("../config_tinybrowser.php");
-
-header ("Content-type: text/css");
-?>
-html { 
-overflow: -moz-scrollbars-vertical !important; 
-}
-.panel_wrapper div.currentmod {
-display:block;
-width:100%; 
-overflow-x:hidden;
-}
-.tabs li.right {
-float:right;
-margin:0;
-}
-.tabs span {
-font-size: 10px;
-}
-fieldset {
-padding-bottom: 10px;
-}
-form {
-margin: 0;
-padding: 0;
-font-size: 11px;
-}
-form.custom select, form.custom input {
-margin: 0 7px 0 0;
-padding: 0;
-}
-form.custom input {
-height: 14px;
-padding: 2px 0 0 2px;
-}
-form.custom select {
-margin-top: 1px;
-padding: 0;
-}
-form.custom label {
-margin-right: 2px;
-}
-.del {
-margin: 0;
-padding: 0;
-border: none;
-width: 13px !important; /* for IE */ 
-height: 13px !important; /* for IE */
-vertical-align: middle;
-}
-.rad {
-margin: 0;
-padding: 0;
-margin-left: 2px !important;
-border: none;
-background: none;
-vertical-align: middle;
-}
-img {
-vertical-align: middle !important;
-}
-button {
-vertical-align: top;
-font-size: 11px;
-background-color: #d5d5d5;
-border: 1px solid #666666;
-padding: 1px 2px;
-}
-*+html button { padding: 0; } /*IE7+ */
-* html button { padding: 0; } /*IE6- */
-button:hover {
-background-color:#8cca83;
-cursor: hand;
-}
-button.edit:hover {
-background-color:#ff9999;
-}
-.tabularwrapper {
-margin: 5px;
-}
-table.browse {
-clear: both;
-width: 100%;
-border: 1px solid #b7babc;
-border-right: 0;
-border-collapse: collapse;
-overflow: hidden;
-}
-table.browse th, table.browse td {
-font-size: 10px;
-text-align: left;
-padding: 0 7px;
-color: #0b333c;
-border-right: 1px solid #b7babc;
-line-height: 22px;
-}
-table.browse th {
-background-image: url(../img/back.png);
-background-repeat: repeat-x;
-background-position: bottom left;
-border-bottom: 1px solid #b7babc;
-}
-table.browse th a {
-color: #0b333c;
-display: block;
-width: 100%;
-text-decoration: none;
-background-repeat: no-repeat;
-background-position: center right;
-background-image: none;
-}
-table.browse th a.asc {
-background-image: url(../img/asc.gif);
-}
-table.browse th a.desc {
-background-image: url(../img/desc.gif);
-}
-table.browse tr.r0 td {
-	background-color: #FFFFFF;
-}
-table.browse tr.r1 td {
-	background-color: #f5f5f5;
-}
-table.browse tr.over td, table.browse th.over {
-background-color: #b2e1ff;
-background-image: none;
-}
-.img-browser {
-margin: 5px;
-border: 1px solid #e2e2e2;
-float: left;
-clear: none;
-text-align: center;
-height: <?php echo $tinybrowser['thumbsize']+40; ?>px;
-width: <?php echo $tinybrowser['thumbsize']+25; ?>px;
-font-size: <?php echo $tinybrowser['thumbsize']; ?>px;
-}
-*+html .img-browser { width: <?php echo $tinybrowser['thumbsize']+28; ?>px; } /*IE7+ */
-* html .img-browser { width: <?php echo $tinybrowser['thumbsize']+28; ?>px; } /*IE6- */
-.img-browser img {
-border: 0;
-vertical-align: middle;
-margin-top: -20px;
-}
-*+html .img-browser img { margin-top: 0; } /*IE7+ */
-* html .img-browser img { margin-top: 0; } /*IE6- */
-.img-browser a {
-display: block;
-width: 100%;
-height: 100%;
-text-decoration: none;
-}
-.img-browser a:hover {
-background-color: #b2e1ff;
-}
-.filename {
-font-family: Tahoma,Arial,Helvetica,sans-serif;
-clear:both;
-font-size: 11px;
-line-height: 13px;
-overflow: hidden;
-width: <?php echo $tinybrowser['thumbsize']+20; ?>px;
-height: 28px;
-margin-top: -6px;
-padding-left: 3px;
-}
-a.imghover {
-padding-left: 22px;
-display: block;
-position: relative; 
-z-index: 30;
-background-image: url(../img/preview.gif);
-background-repeat: no-repeat;
-background-position: 0 4px;
-}
-a.imghover img {
-position: absolute; 
-z-index: 31;
-background-color: #fff;
-padding: 4px;
-border: 1px solid #888888;
-display: none; 
-}
-a.imghover:hover img {
-top: -5px; 
-left: 140px; 
-display: block;
-}
-.pushleft {
-padding: 4px 5px;
-float: left;
-text-align: left;
-}
-.pushright {
-padding: 4px 5px;
-float: right;
-text-align: right;
-}
-a {
-outline: none;
-border: 0;
-}
-.alertsuccess, .alertfailure, .alertinfo {
-position: relative;
-clear: both;
-margin: 0 auto;
-padding: 4px 4px 4px 4px;
-width: 98%;
-text-align: center;
-border-style: solid;
-border-width: 1px;
-}
-.alertsuccess {
-border-color: #00C000;
-background-color: #BBFFBB;
-}
-.alertfailure {
-border-color: #CC0000;
-background-color: #FFBBBB;
-}
-.alertinfo {
-border-color: #1133DD;
-background-color: #AACCFF;
-}
-
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/edit.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/edit.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/edit.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/edit.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,537 +1,4 @@
-<?php
-require_once('config_tinybrowser.php');
-// Set language
-if(isset($tinybrowser['language']) && file_exists('langs/'.$tinybrowser['language'].'.php'))
-	{
-	require_once('langs/'.$tinybrowser['language'].'.php'); 
-	}
-else
-	{
-	require_once('langs/en.php'); // Falls back to English
-	}
-require_once('fns_tinybrowser.php');
-
-// Check session, if it exists
-if(session_id() != '')
-	{
-	if(!isset($_SESSION[$tinybrowser['sessioncheck']]))
-		{
-		echo TB_DENIED;
-		exit;
-		}
-	}
-	
-if(!$tinybrowser['allowedit'] && !$tinybrowser['allowdelete'])
-	{
-	echo TB_EDDENIED;
-	exit;
-	}
-
-// Assign file operation variables
-$validtypes = array('image','media','file');
-$typenow = ((isset($_GET['type']) && in_array($_GET['type'],$validtypes)) ? $_GET['type'] : 'image');
-$foldernow = str_replace(array('../','..\\','./','.\\'),'',($tinybrowser['allowfolders'] && isset($_REQUEST['folder']) ? urldecode($_REQUEST['folder']) : ''));
-$destfolder = (isset($_POST['destination']) ? $tinybrowser['path'][$typenow].urldecode($_POST['destination']) : '');
-$destfoldernow = (isset($_POST['destination']) ? urldecode($_POST['destination']) : $foldernow);
-
-// Assign edit and thumbnail path
-$editpath = $tinybrowser['path'][$typenow].$foldernow;
-$thumbpath = $tinybrowser[$tinybrowser['thumbsrc']][$typenow].$foldernow;
-
-// Assign browsing options
-$sortbynow = (isset($_REQUEST['sortby']) ? $_REQUEST['sortby'] : $tinybrowser['order']['by']);
-$sorttypenow = (isset($_REQUEST['sorttype']) ? $_REQUEST['sorttype'] : $tinybrowser['order']['type']);
-$sorttypeflip = ($sorttypenow == 'asc' ? 'desc' : 'asc');  
-$viewtypenow = 'detail';
-$findnow = (isset($_REQUEST['find']) && !empty($_REQUEST['find']) ? $_REQUEST['find'] : false);
-$actionnow = (isset($_REQUEST['action']) ? $_REQUEST['action'] : $tinybrowser['defaultaction'] );
-$showpagenow = (isset($_REQUEST['showpage']) ? $_REQUEST['showpage'] : 0);
-
-// Assign url pass variables
-$passfolder = '&folder='.urlencode($foldernow);
-$passfeid = (isset($_GET['feid']) && $_GET['feid']!='' ? '&feid='.$_GET['feid'] : '');
-$passaction = '&action='.$actionnow;
-$passsortby = '&sortby='.$sortbynow.'&sorttype='.$sorttypenow;
-
-// Assign sort parameters for column header links
-$sortbyget = array();
-$sortbyget['name'] = '&sortby=name';
-$sortbyget['size'] = '&sortby=size'; 
-$sortbyget['type'] = '&sortby=type'; 
-$sortbyget['modified'] = '&sortby=modified';
-$sortbyget['dimensions'] = '&sortby=dimensions'; 
-$sortbyget[$sortbynow] .= '&sorttype='.$sorttypeflip;
-
-// Assign css style for current sort type column
-$thclass = array();
-$thclass['name'] = '';
-$thclass['size'] = ''; 
-$thclass['type'] = ''; 
-$thclass['modified'] = '';
-$thclass['dimensions'] = ''; 
-$thclass[$sortbynow] = ' class="'.$sorttypenow.'"';
-
-// Initalise alert array
-$notify = array(
-	'type' => array(),
-	'message' => array()
-);
-$deleteqty = 0;
-$renameqty = 0;
-$resizeqty = 0;
-$rotateqty = 0;
-$moveqty = 0;
-$errorqty = 0;
-	
-// Set when rotating images to force thumbnail refresh
-$imagerefresh ='';
-
-// Delete any checked files
-if(isset($_POST['deletefile']))
-	{
-	foreach($_POST['deletefile'] as $delthis => $val)
-		{
-		$delthisfile = $tinybrowser['docroot'].$editpath.$_POST['actionfile'][$delthis];
-		if (file_exists($delthisfile) && unlink($delthisfile)) $deleteqty++; else $errorqty++;
-		if($typenow=='image')
-			{
-			$delthisthumb = $tinybrowser['docroot'].$editpath.'_thumbs/_'.$_POST['actionfile'][$delthis];
-			if (file_exists($delthisthumb)) unlink($delthisthumb);
-			}
-		}
-	}
-	
-// Rename any files with changed name
-if(isset($_POST['renamefile']))
-	{
-	foreach($_POST['renamefile'] as $namethis => $newname)
-		{
-		if($_POST['actionfile'][$namethis] != $newname.$_POST['renameext'][$namethis])
-			{
-			$namethisfilefrom = $tinybrowser['docroot'].$editpath.$_POST['actionfile'][$namethis];
-			$namethisfileto = $tinybrowser['docroot'].$editpath.clean_filename($newname.$_POST['renameext'][$namethis]);
-			if (file_exists($namethisfilefrom) && rename($namethisfilefrom,$namethisfileto)) $renameqty++; else $errorqty++;
-			if($typenow=='image')
-			   {
-				$namethisthumbfrom = $tinybrowser['docroot'].$editpath.'_thumbs/_'.$_POST['actionfile'][$namethis];
-				$namethisthumbto = $tinybrowser['docroot'].$editpath.'_thumbs/_'.clean_filename($newname.$_POST['renameext'][$namethis]);
-				if (file_exists($namethisthumbfrom)) rename($namethisthumbfrom,$namethisthumbto);
-			   }
-			}
-		}
-	}
-	
-// Move any checked files
-if(isset($_POST['movefile']))
-	{
-	foreach($_POST['movefile'] as $movethis => $val)
-		{
-		$movethisfile = $tinybrowser['docroot'].$editpath.$_POST['actionfile'][$movethis];
-		$movefiledest = $tinybrowser['docroot'].$destfolder.$_POST['actionfile'][$movethis];
-		if (!file_exists($movefiledest) && file_exists($movethisfile) && copy($movethisfile,$movefiledest))
-         {
-         $moveqty++;
-         unlink($movethisfile);
-         if($typenow=='image')
-			   {
-			   $movethisthumb = $tinybrowser['docroot'].$editpath.'_thumbs/_'.$_POST['actionfile'][$movethis];
-			   $movethumbdest = $tinybrowser['docroot'].$destfolder.'_thumbs/_'.$_POST['actionfile'][$movethis];
-			   if (file_exists($movethisthumb) && copy($movethisthumb,$movethumbdest)) unlink($movethisthumb);
-			   }
-         }
-      else $errorqty++;
-		}
-	}
-	
-// Resize any files with new size
-if(isset($_POST['resizefile']))
-	{
-	foreach($_POST['resizefile'] as $sizethis => $newsize)
-		{
-		$newsize = intval($newsize);
-		if($newsize)
-		   {
-			// detect silly sizes
-			if($newsize > $tinybrowser['thumbsize'])
-				{
-				// do image resize
-				$targetimg = $tinybrowser['docroot'].$editpath.$_POST['actionfile'][$sizethis];
-				if (file_exists($targetimg))
-				   {
-					$mime = getimagesize($targetimg);
-					if($_POST['resizetype'][$sizethis]=='width')
-					   {
-						$rw = $newsize;
-						$rh = $mime[1];
-						}
-					else
-					   {
-						$rw = $mime[0];
-						$rh = $newsize;
-						}
-					$im = convert_image($targetimg,$mime['mime']);
-					resizeimage($im,$rw,$rh,$targetimg,$tinybrowser['imagequality'],$mime['mime']);
-					imagedestroy($im);
-					$resizeqty++;
-				   }
-				else $errorqty++;
-				}
-         else $errorqty++;
-			}
-		}
-	}
-
-// Rotate any selected files
-if(isset($_POST['rotatefile']))
-	{
-	$imagerefresh = '?refresh='.uniqid('');
-	foreach($_POST['rotatefile'] as $rotatethis => $direction)
-		{
-		if($direction != 'none')
-			{
-			$targetimg = $tinybrowser['docroot'].$editpath.$_POST['actionfile'][$rotatethis];
-			if (file_exists($targetimg))
-				{
-				// rotate image
-				if($direction == 'clock') $degree=270; else $degree=90;
-				$mime = getimagesize($targetimg);
-				$im = convert_image($targetimg,$mime['mime']);
-				
-				// additional processing for png / gif transparencies (credit to Dirk Bohl)
-				if($mime['mime'] == 'image/x-png' || $mime['mime'] == 'image/png')
-					{
-					imagealphablending($newim, false);
-					imagesavealpha($newim, true);
-					}
-				elseif($mime['mime'] == 'image/gif')
-					{
-					$originaltransparentcolor = imagecolortransparent( $im );
-					if($originaltransparentcolor >= 0 && $originaltransparentcolor < imagecolorstotal( $im ))
-						{
-						$transparentcolor = imagecolorsforindex( $im, $originaltransparentcolor );
-						$newtransparentcolor = imagecolorallocate($newim,$transparentcolor['red'],$transparentcolor['green'],$transparentcolor['blue']);
-						imagefill( $newim, 0, 0, $newtransparentcolor );
-						imagecolortransparent( $newim, $newtransparentcolor );
-						}
-					}
-				$newim = imagerotate($im, $degree, 0);
-				imagedestroy($im);
-				
-            if($mime['mime'] == 'image/pjpeg' || $mime['mime'] == 'image/jpeg')
-            	imagejpeg ($newim,$targetimg,$tinybrowser['imagequality']);
-            elseif($mime['mime'] == 'image/x-png' || $mime['mime'] == 'image/png')
-               imagepng ($newim,$targetimg,substr($tinybrowser['imagequality'],0,1));
-            elseif($mime['mime'] == 'image/gif')
-               imagegif ($newim,$targetimg);
-				imagedestroy($newim);
-				$rotateqty++;
-
-				// delete and recreate thumbnail image
-				$targetthumb = $tinybrowser['docroot'].$editpath.'_thumbs/_'.$_POST['actionfile'][$rotatethis];
-				if (file_exists($targetthumb)) unlink($targetthumb);
-				$mime = getimagesize($targetimg);
-				$im = convert_image($targetimg,$mime['mime']);
-				resizeimage($im,$tinybrowser['thumbsize'],$tinybrowser['thumbsize'],$targetthumb,$tinybrowser['thumbquality'],$mime['mime']);
-				imagedestroy($im);
-				}
-			else $errorqty++;
-			}
-		}
-	}
-
-// Read directory contents and populate $file array
-$dh = opendir($tinybrowser['docroot'].$editpath);
-$file = array();
-while (($filename = readdir($dh)) !== false)
-	{
-	// get file extension
-	$nameparts = explode('.',$filename);
-	$ext = end($nameparts);
-
-	// filter directories and prohibited file types
-	if($filename != '.' && $filename != '..' && !is_dir($tinybrowser['docroot'].$editpath.$filename) && !in_array($ext, $tinybrowser['prohibited']) && ($typenow == 'file' || strpos(strtolower($tinybrowser['filetype'][$typenow]),strtolower($ext))))
-		{
-		// search file name if search term entered
-		if($findnow) $exists = strpos(strtolower($filename),strtolower($findnow));
-
-		// assign file details to array, for all files or those that match search
-		if(!$findnow || ($findnow && $exists !== false))
-			{
-			$file['name'][] = $filename;
-			$file['sortname'][] = strtolower($filename);
-			$file['modified'][] = filemtime($tinybrowser['docroot'].$editpath.$filename);
-			$file['size'][] = filesize($tinybrowser['docroot'].$editpath.$filename);
-
-			// image specific info or general
-			if($typenow=='image' && $imginfo = getimagesize($tinybrowser['docroot'].$editpath.$filename))
-				{
-				$file['width'][] = $imginfo[0];
-				$file['height'][] = $imginfo[1];
-				$file['dimensions'][] = $imginfo[0] + $imginfo[1];
-				$file['type'][] = $imginfo['mime'];
-				}
-			else
-				{
-				$file['width'][] = 'N/A';
-				$file['height'][] = 'N/A';
-				$file['dimensions'][] = 'N/A';
-				$file['type'][] = returnMIMEType($filename);
-				}
-			}
-		}
-	}
-closedir($dh);
-
-// Assign directory structure to array
-$editdirs=array();
-dirtree($editdirs,$tinybrowser['filetype'][$typenow],$tinybrowser['docroot'],$tinybrowser['path'][$typenow]);
-
-// generate alert if files deleted
-if($deleteqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGDELETE, $deleteqty);
-	}
-// generate alert if files renamed
-elseif($renameqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGRENAME, $renameqty);
-	}
-// generate alert if files renamed
-elseif($moveqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGMOVE, $moveqty);
-	}
-// generate alert if images resized
-elseif($resizeqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGRESIZE, $resizeqty);
-	}
-// generate alert if images rotated
-elseif($rotateqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGROTATE, $rotateqty);
-	}
-	
-// generate alert if file errors encountered
-if($errorqty>0)
-   {
-	$notify['type'][]='failure';
-	$notify['message'][]=sprintf(TB_MSGEDITERR, $errorqty);
-	}
-
-// determine sort order
-$sortorder = ($sorttypenow == 'asc' ? SORT_ASC : SORT_DESC);
-$num_of_files = (isset($file['name']) ? count($file['name']) : 0);
-
-if($num_of_files>0)
-	{
-	// sort files by selected order
-	sortfileorder($sortbynow,$sortorder,$file);
-	}
-
-// determine pagination
-if($tinybrowser['pagination']>0)
-	{
-	$showpagestart = ($showpagenow ? ($_REQUEST['showpage']*$tinybrowser['pagination'])-$tinybrowser['pagination'] : 0);
-	$showpageend = $showpagestart+$tinybrowser['pagination'];
-	if($showpageend>$num_of_files) $showpageend = $num_of_files;
-	}
-else
-	{
-	$showpagestart = 0;
-	$showpageend = $num_of_files;
-	}
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>TinyBrowser :: <?php echo TB_EDIT; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Pragma" content="no-cache" />
-<?php
-if(empty($passfeid) && $tinybrowser['integration']=='tinymce')
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="<?php echo $tinybrowser['tinymcecss']; ?>" /><?php 
-	}
-else
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="css/stylefull_tinybrowser.css" /><?php 
-	}
-?>
-<link rel="stylesheet" type="text/css" media="all" href="css/style_tinybrowser.css.php" />
-<script language="javascript" type="text/javascript" src="js/tinybrowser.js.php"></script>
-</head>
-<body onload="rowHighlight();">
-<?php
-if(count($notify['type'])>0) alert($notify);
-form_open('foldertab',false,'edit.php','?type='.$typenow.$passfeid);
-?>
-<div class="tabs">
-<ul>
-<li id="browse_tab"><span><a href="tinybrowser.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_BROWSE; ?></a></span></li>
-<?php
-if($tinybrowser['allowupload']) 
-	{
-	?><li id="upload_tab"><span><a href="upload.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_UPLOAD; ?></a></span></li>
-	<?php 
-	} ?>
-<li id="edit_tab" class="current"><span><a href="edit.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_EDIT; ?></a></span></li>
-<?php
-if($tinybrowser['allowfolders'])
-	{
-	?><li id="folders_tab"><span><a href="folders.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_FOLDERS; ?></a></span></li><?php
-	}
-// Display folder select, if multiple exist
-if(count($editdirs)>1)
-	{
-	?><li id="folder_tab" class="right"><span><?php
-	form_select($editdirs,'folder',TB_FOLDERCURR,urlencode($foldernow),true);
-	form_hidden_input('sortby',$sortbynow);
-   form_hidden_input('sorttype',$sorttypenow);
-   form_hidden_input('showpage',$showpagenow);
-	form_hidden_input('action',$actionnow);
-	?></span></li><?php
-	}
-?>
-</ul>
-</div>
-</form>
-<div class="panel_wrapper">
-<div id="general_panel" class="panel currentmod">
-<fieldset>
-<legend><?php echo TB_EDITFILES; ?></legend>
-<?php
-form_open('edit','custom','edit.php','?type='.$typenow.$passfolder.$passfeid);
-?>
-<div class="pushleft">
-<?php
-
-// Assign edit actions based on file type and permissions
-$select = array();
-if($tinybrowser['allowdelete']) $select[] = array('delete',TB_DELETE);
-if($tinybrowser['allowedit']) $select[] = array('rename',TB_RENAME);
-if($tinybrowser['allowfolders']) $select[] = array('move',TB_MOVE);
-if($typenow=='image' && $tinybrowser['allowedit'])
-	{
-	$select[] = array('resize',TB_RESIZE);
-	$select[] = array('rotate',TB_ROTATE);
-	}
-form_select($select,'action',TB_ACTION,$actionnow,true);
-
-// Show page select if pagination is set
-if($tinybrowser['pagination']>0)
-	{
-	$pagelimit = ceil($num_of_files/$tinybrowser['pagination'])+1;
-	$page = array();
-	for($i=1;$i<$pagelimit;$i++)
-		{
-		$page[] = array($i,TB_PAGE.' '.$i);
-		}
-	if($i>2) form_select($page,'showpage',SHOW,$showpagenow,true);
-	}
-?></div><div class="pushright"><?php
-
-form_hidden_input('sortby',$sortbynow);
-form_hidden_input('sorttype',$sorttypenow);
-form_text_input('find',false,$findnow,25,50);
-form_submit_button('search',TB_SEARCH,'');
-?></div><?php
-
-form_open('actionform','custom','edit.php','?type='.$typenow.$passfolder.$passfeid);
-
-if($actionnow=='move')
-   { ?><div class="pushleft"><?php
-   form_select($editdirs,'destination',TB_FOLDERDEST,urlencode($destfoldernow),false);
-   ?></div><?php
-   } 
-
-if($typenow=='image')
-	{
-	$selectresize = array(
-		array('width',TB_WIDTH),
-		array('height',TB_HEIGHT)
-		);
-	}
-
-switch($actionnow) 
-	{
-	case 'delete':
-		$actionhead = TB_DELETE;
-		break;
-	case 'rename':
-		$actionhead = TB_RENAME;
-		break;
-	case 'resize':
-		$actionhead = TB_RESIZE;
-		break;
-	case 'rotate':
-		$actionhead = TB_ROTATE;
-		break;
- 	case 'move':
-		$actionhead = TB_MOVE;
-		break;
-	default:
-		// do nothing
-	}
-?><div class="tabularwrapper"><table class="browse"><tr>
-<th><a href="?type=<?php echo $typenow.$passaction.$passfolder.$passfeid.$sortbyget['name']; ?>"<?php echo $thclass['name']; ?>><?php echo TB_FILENAME; ?></a></th>
-<th><a href="?type=<?php echo $typenow.$passaction.$passfolder.$passfeid.$sortbyget['size']; ?>"<?php echo $thclass['size']; ?>><?php echo TB_SIZE; ?></a></th>
-<th><a href="?type=<?php echo $typenow.$passaction.$passfolder.$passfeid.$sortbyget['type']; ?>"<?php echo $thclass['type']; ?>><?php echo TB_TYPE; ?></th>
-<th class="nohvr"><?php echo $actionhead; ?></th></tr>
-<?php
-
-for($i=$showpagestart;$i<$showpageend;$i++)
-	{
-	$alt = (IsOdd($i) ? 'r1' : 'r0');
-	echo '<tr class="'.$alt.'">';
-	if($typenow=='image') echo '<td><a class="imghover" href="#" onclick="return false;" title="'.$file['name'][$i].'&#13;&#10;'.TB_DIMENSIONS.': '.$file['width'][$i].' x '.$file['height'][$i].'&#13;&#10;'.TB_DATE.': '.date($tinybrowser['dateformat'],$file['modified'][$i]).'"><img src="'.$thumbpath.'_thumbs/_'.$file['name'][$i].$imagerefresh.'" alt="" />' .truncate_text($file['name'][$i],30).'</a></td>';
-	else echo '<td title="'.$file['name'][$i].'&#13;&#10;'.TB_DATE.': '.date($tinybrowser['dateformat'],$file['modified'][$i]).'">'.truncate_text($file['name'][$i],30).'</td>';
-	echo '<td>'.bytestostring($file['size'][$i],1).'</td><td>'.$file['type'][$i].'</td>'
-	.'<td>';
-	form_hidden_input('actionfile['.$i.']',$file['name'][$i]);
-	switch($actionnow) 
-		{
-		case 'delete':
-			echo '<input class="del" type="checkbox" name="deletefile['.$i.']" value="1" />';	
-			break;
-		case 'rename':
-			// get file extension
-			$nameparts = explode('.',$file['name'][$i]);
-			$ext = end($nameparts);
-			form_hidden_input('renameext['.$i.']',$ext);
-			form_text_input('renamefile['.$i.']',false,basename($file['name'][$i],$ext),30,120); echo $ext;
-			break;
-		case 'resize':
-			form_text_input('resizefile['.$i.']',false,'',4,4); form_select($selectresize,'resizetype['.$i.']',false,'',false);
-			break;
-		case 'rotate':
-			echo '<img src="img/rotate_c.gif" alt="'.TB_ROTATECW.'" /><input class="rad" type="radio" name="rotatefile['.$i.']" value="clock"><img src="img/rotate_ac.gif" alt="'.TB_ROTATECCW.'" /><input class="rad" type="radio" name="rotatefile['.$i.']" value="anticlock">'.TB_NONE.'<input class="rad" type="radio" name="rotatefile['.$i.']" value="none" checked>';
-			break;
-		case 'move':
-			echo '<input class="del" type="checkbox" name="movefile['.$i.']" value="1" />';
-			break;
-		default:
-			// do nothing
-		}
-	echo "</td></tr>\n";
-	}
-
-echo "</table></div>\n".'<div class="pushright">';
-if($tinybrowser['allowdelete'] || $tinybrowser['allowedit'])
-	{
-	form_hidden_input('sortby',$sortbynow);
-	form_hidden_input('sorttype',$sorttypenow);
-	form_hidden_input('find',$findnow);
-	form_hidden_input('showpage',$showpagenow);
-	form_hidden_input('action',$actionnow);
-	form_submit_button('commit',$actionhead.' '.TB_FILES,'edit');
-	}
-?>
-</div></fieldset></div></div>
-</body>
-</html>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php	2009-06-30 22:05:14.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,431 +1,4 @@
-<?php
-// *************************CREATE FOLDER**********************************
-function createfolder($dir,$perm) {
-is_dir(dirname($dir)) || createfolder(dirname($dir), $perm);
-    return is_dir($dir) || @mkdir($dir, $perm);
-}
-
-// *************************VALIDATE FILE EXTENSIONS**********************************
-function validateExtension($extension, $types) {
-if(in_array($extension,$types)) return false; else return true;
-}
-
-//*************************************Display Alert Notifications*********************************
-function alert(&$notify){
-$alert_num = count($notify['type']);
-for($i=0;$i<$alert_num;$i++)
-	{
-	?><div class="alert<?php echo $notify['type'][$i]; ?>"><?php echo $notify['message'][$i]; ?></div><br /><?php
-	}
-}
-
-// *************************SORT FILE ARRAY BY SELECTED ORDER**********************************
-function sortfileorder(&$sortbynow,&$sortorder,&$file) {
-
-switch($sortbynow) 
-	{
-	case 'name':
-		array_multisort($file['sortname'], $sortorder, $file['name'], $sortorder, $file['type'], $sortorder, $file['modified'], $sortorder, $file['size'], $sortorder, $file['dimensions'], $sortorder, $file['width'], $sortorder, $file['height'], $sortorder);
-		break;
-	case 'size':
-		array_multisort($file['size'], $sortorder, $file['sortname'], SORT_ASC, $file['name'], SORT_ASC, $file['type'], $sortorder, $file['modified'], $sortorder, $file['dimensions'], $sortorder, $file['width'], $sortorder, $file['height'], $sortorder);
-		break;
-	case 'type':
-		array_multisort($file['type'], $sortorder, $file['sortname'], SORT_ASC, $file['name'], SORT_ASC, $file['size'], $sortorder, $file['modified'], $sortorder, $file['dimensions'], $sortorder, $file['width'], $sortorder, $file['height'], $sortorder);
-		break;
-	case 'modified':
-		array_multisort($file['modified'], $sortorder, $file['name'], $sortorder, $file['name'], $sortorder, $file['type'], $sortorder, $file['size'], $sortorder, $file['dimensions'], $sortorder, $file['width'], $sortorder, $file['height'], $sortorder);
-		break;
-	case 'dimensions':
-		array_multisort($file['dimensions'], $sortorder, $file['width'], $sortorder, $file['sortname'], SORT_ASC, $file['name'], SORT_ASC, $file['modified'], $sortorder, $file['type'], $sortorder, $file['size'], $sortorder, $file['height'], $sortorder);
-		break;
-	default:
-		// do nothing
-	}
-}
-
-// **************************RESIZE IMAGE TO GIVEN SIZE*****************************************
-function resizeimage($im,$maxwidth,$maxheight,$urlandname,$comp,$imagetype){
-$width = imagesx($im);
-$height = imagesy($im);
-if(($maxwidth && $width > $maxwidth) || ($maxheight && $height > $maxheight))
-	{
-	if($maxwidth && $width > $maxwidth)
-		{
-		$widthratio = $maxwidth/$width;
-		$resizewidth=true;
-		} 
-	else $resizewidth=false;
-
-	if($maxheight && $height > $maxheight)
-		{
-		$heightratio = $maxheight/$height;
-		$resizeheight=true;
-		} 
-	else $resizeheight=false;
-
- 	if($resizewidth && $resizeheight)
-		{
-		if($widthratio < $heightratio) $ratio = $widthratio;
-		else $ratio = $heightratio;
-		}
-	elseif($resizewidth)
-		{
-		$ratio = $widthratio;
-		}
-	elseif($resizeheight)
-		{
-		$ratio = $heightratio;
-		}
-	$newwidth = $width * $ratio;
-	$newheight = $height * $ratio;
-		if(function_exists('imagecopyresampled') && $imagetype !='image/gif')
-		{
-		$newim = imagecreatetruecolor($newwidth, $newheight);
-		}
-	else
-		{
-		$newim = imagecreate($newwidth, $newheight);
-		}
-
-	// additional processing for png / gif transparencies (credit to Dirk Bohl)
-	if($imagetype == 'image/x-png' || $imagetype == 'image/png')
-		{
-		imagealphablending($newim, false);
-		imagesavealpha($newim, true);
-		}
-	elseif($imagetype == 'image/gif')
-		{
-		$originaltransparentcolor = imagecolortransparent( $im );
-		if($originaltransparentcolor >= 0 && $originaltransparentcolor < imagecolorstotal( $im ))
-			{
-			$transparentcolor = imagecolorsforindex( $im, $originaltransparentcolor );
-			$newtransparentcolor = imagecolorallocate($newim,$transparentcolor['red'],$transparentcolor['green'],$transparentcolor['blue']);
-			imagefill( $newim, 0, 0, $newtransparentcolor );
-			imagecolortransparent( $newim, $newtransparentcolor );
-			}
-		}
-
-   imagecopyresampled($newim, $im, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-   
-   if($imagetype == 'image/pjpeg' || $imagetype == 'image/jpeg')
-   	{
-   	imagejpeg ($newim,$urlandname,$comp);
-   	}
-   elseif($imagetype == 'image/x-png' || $imagetype == 'image/png')
-   	{
-   	imagepng ($newim,$urlandname,substr($comp,0,1));
-   	}
-   elseif($imagetype == 'image/gif')
-   	{
-   	imagegif ($newim,$urlandname);
-   	}
-	imagedestroy ($newim);
-	}
-else
-	{
-   if($imagetype == 'image/pjpeg' || $imagetype == 'image/jpeg')
-   	{
-   	imagejpeg ($im,$urlandname,$comp);
-   	}
-   elseif($imagetype == 'image/x-png' || $imagetype == 'image/png')
-   	{
-   	imagepng ($im,$urlandname,substr($comp,0,1));
-   	}
-   elseif($imagetype == 'image/gif')
-   	{
-   	imagegif ($im,$urlandname);
-   	}
-	}
-}
-
-// **************************CHECK IMAGE TYPE AND CONVERT TO TEMP TYPE*****************************
-function convert_image($imagetemp,$imagetype){
-
-if($imagetype == 'image/pjpeg' || $imagetype == 'image/jpeg')
-	{
-	$cim1 = imagecreatefromjpeg($imagetemp);
-	}
-elseif($imagetype == 'image/x-png' || $imagetype == 'image/png')
-	{
-	$cim1 = imagecreatefrompng($imagetemp);
-	imagealphablending($cim1, false);
-	imagesavealpha($cim1, true);
-	}
-elseif($imagetype == 'image/gif')
-	{
-	$cim1 = imagecreatefromgif($imagetemp);
-	}
-return $cim1;
-}
-
-// **************************GENERATE FORM OPEN*****************************
-function form_open($name,$class,$url,$parameters){
-?><form name="<?php echo $name; ?>" class="<?php echo $class; ?>" method="post" action="<?php echo $url.$parameters; ?>">
-<?php
-}
-
-// **************************GENERATE FORM SELECT ELEMENT*****************************
-function form_select($options,$name,$label,$current,$auto){
-if ($label) {?><label for="<?php echo $name; ?>"><?php echo $label; ?></label><?php } 
-?><select name="<?php echo $name; ?>" <?php if ($auto) {?>onchange="this.form.submit();"<?php }?>>
-<?php
-$loopnum = count($options); 
-for($i=0;$i<$loopnum;$i++)
-	{
-	$selected = ($options[$i][0] == $current ? ' selected' : ''); 
-	echo '<option value="'.$options[$i][0].'"'.$selected.'>'.$options[$i][1].'</option>';
-	}
-?></select><?php
-}
-
-// **************************GENERATE FORM HIDDEN ELEMENT*****************************
-function form_hidden_input($name,$value) {
-?><input type="hidden" name="<?php echo $name; ?>" value="<?php echo $value; ?>" />
-<?php
-}
-
-// **************************GENERATE FORM TEXT ELEMENT*****************************
-function form_text_input($name,$label,$value,$size,$maxlength) {
-if ($label) {?><label for="<?php echo $name; ?>"><?php echo $label; ?></label><?php } ?>
-<input type="text" name="<?php echo $name; ?>" size="<?php echo $size; ?>" maxlength="<?php echo $maxlength; ?>" value="<?php echo $value; ?>" /><?php
-}
-
-// **************************GENERATE FORM SUBMIT BUTTON*****************************
-function form_submit_button($name,$label,$class) {
-?><button <?php if ($class) {?>class="<?php echo $class; ?>"<?php } ?>type="submit" name="<?php echo $name; ?>"><?php echo $label; ?></button>
-</form>
-<?php
-}
-
-//********************************Returns True if Number is Odd**************************************
-function IsOdd($num)
-{
-return (1 - ($num & 1));
-}
-
-//********************************Truncate Text to Given Length If Required***************************
-function truncate_text($textstring,$length){
-	if (strlen($textstring) > $length)
-		{
-		$textstring = substr($textstring,0,$length).'...';
-		}
-	return $textstring;
-}
-
-/**
- * Present a size (in bytes) as a human-readable value
- * 
- * @param int    $size        size (in bytes)
- * @param int    $precision    number of digits after the decimal point
- * @return string
- */
-function bytestostring($size, $precision = 0) {
-    $sizes = array('YB', 'ZB', 'EB', 'PB', 'TB', 'GB', 'MB', 'KB', 'B');
-    $total = count($sizes);
-
-    while($total-- && $size > 1024) $size /= 1024;
-    return round($size, $precision).' '.$sizes[$total];
-}
-
-//function to clean a filename string so it is a valid filename
-function clean_filename($filename){
-    $filename = preg_replace('/^\W+|\W+$/', '', $filename); // remove all non-alphanumeric chars at begin & end of string
-    $filename = preg_replace('/\s+/', '_', $filename); // compress internal whitespace and replace with _
-    return strtolower(preg_replace('/\W-/', '', $filename)); // remove all non-alphanumeric chars except _ and -
-
-}
-
-//********************************Return File MIME Type***************************
-function returnMIMEType($filename)
-    {
-        preg_match("|\.([a-z0-9]{2,4})$|i", $filename, $fileSuffix);
-
-        switch(strtolower($fileSuffix[1]))
-        {
-            case 'js' :
-                return 'application/x-javascript';
-
-            case 'json' :
-                return 'application/json';
-
-            case 'jpg' :
-            case 'jpeg' :
-            case 'jpe' :
-                return 'image/jpg';
-
-            case 'png' :
-            case 'gif' :
-            case 'bmp' :
-            case 'tiff' :
-                return 'image/'.strtolower($fileSuffix[1]);
-
-            case 'css' :
-                return 'text/css';
-
-            case 'xml' :
-                return 'application/xml';
-
-            case 'doc' :
-            case 'docx' :
-                return 'application/msword';
-
-            case 'xls' :
-            case 'xlt' :
-            case 'xlm' :
-            case 'xld' :
-            case 'xla' :
-            case 'xlc' :
-            case 'xlw' :
-            case 'xll' :
-                return 'application/vnd.ms-excel';
-
-            case 'ppt' :
-            case 'pps' :
-                return 'application/vnd.ms-powerpoint';
-
-            case 'rtf' :
-                return 'application/rtf';
-
-            case 'pdf' :
-                return 'application/pdf';
-
-            case 'html' :
-            case 'htm' :
-            case 'php' :
-                return 'text/html';
-
-            case 'txt' :
-                return 'text/plain';
-
-            case 'mpeg' :
-            case 'mpg' :
-            case 'mpe' :
-                return 'video/mpeg';
-
-            case 'mp3' :
-                return 'audio/mpeg3';
-
-            case 'wav' :
-                return 'audio/wav';
-
-            case 'aiff' :
-            case 'aif' :
-                return 'audio/aiff';
-
-            case 'avi' :
-                return 'video/msvideo';
-
-            case 'wmv' :
-                return 'video/x-ms-wmv';
-
-            case 'mov' :
-                return 'video/quicktime';
-
-            case 'zip' :
-                return 'application/zip';
-
-            case 'tar' :
-                return 'application/x-tar';
-
-            case 'swf' :
-                return 'application/x-shockwave-flash';
-
-            default :
-            if(function_exists('mime_content_type'))
-            {
-                $fileSuffix = mime_content_type($filename);
-            }
-
-            return 'unknown/' . trim($fileSuffix[0], '.');
-        }
-    }
-
-//************************Return Array of Directory Structure***************************
-function dirtree(&$alldirs,$types='*.*',$root='',$tree='',$branch='',$level=0) {
-
-// filter file types according to type
-$filetypes = explode(',',preg_replace('{[ \t]+}', '',$types));
-
-if($level==0 && is_dir($root.$tree.$branch))
-	{
-	$filenum=0;
-	foreach($filetypes as $filetype)
-	   {
-   	$filenum = $filenum + count(glob($root.$tree.$branch.sql_regcase($filetype),GLOB_NOSORT));
-   	}
-   $treeparts = explode('/',rtrim($tree,'/'));
-	$topname = end($treeparts);
-	$alldirs[] = array($branch,rtrim($topname,'/').' ('.$filenum.')',rtrim($topname,'/'),rtrim($topname,'/'),$filenum,filemtime($root.$tree.$branch));
-	}
-$level++;
-
-$dh = opendir($root.$tree.$branch);
-while (($dirname = readdir($dh)) !== false)
-	{
-	if($dirname != '.' && $dirname != '..' && is_dir($root.$tree.$branch.$dirname) && $dirname != '_thumbs')
-		{
-		$filenum=0;
-		foreach($filetypes as $filetype)
-		   {
-			$filenum = $filenum + count(glob($root.$tree.$branch.$dirname.'/'.sql_regcase($filetype),GLOB_NOSORT));
-			}
-		$indent = '';
-		for($i=0;$i<$level;$i++) { $indent .= ' &nbsp; '; }
-      if(strlen($indent)>0) $indent .= '&rarr; ';
-		$alldirs[] = array(urlencode($branch.$dirname.'/'),$indent.$dirname.' ('.$filenum.')',$indent.$dirname,$dirname,$filenum,filemtime($root.$tree.$branch.$dirname));
-		dirtree($alldirs,$types,$root,$tree,$branch.$dirname.'/',$level);
-		}
-	}
-closedir($dh);
-$level--;
-}
-
-/* user defined error handling function. */
-function userErrorHandler($errno, $errmsg, $filename, $linenum, $vars)
-{
-    // timestamp for the error entry.
-    $dt = date('Y-m-d H:i:s (T)');
-
-    // define an assoc array of error string
-    // in reality the only entries we should
-    // consider are E_WARNING, E_NOTICE, E_USER_ERROR,
-    // E_USER_WARNING and E_USER_NOTICE.
-    $errortype = array (
-                E_ERROR => 'Error',
-                E_WARNING => 'Warning',
-                E_PARSE => 'Parsing Error',
-                E_NOTICE => 'Notice',
-                E_CORE_ERROR => 'Core Error',
-                E_CORE_WARNING => 'Core Warning',
-                E_COMPILE_ERROR => 'Compile Error',
-                E_COMPILE_WARNING => 'Compile Warning',
-                E_USER_ERROR => 'User Error',
-                E_USER_WARNING => 'User Warning',
-                E_USER_NOTICE => 'User Notice',
-                E_STRICT => 'Runtime Notice'
-                );
-    // set of errors for which a var trace will be saved.
-    $user_errors = array(E_USER_ERROR, E_USER_WARNING, E_USER_NOTICE);
-
-	 if($errno != E_STRICT) // exclude Runtime Notices
-		{
-	 	$err  = $dt. "\t";
-    	$err .= $errno.' '.$errortype[$errno]. "\t";
-    	$err .= $errmsg. "\t";
-    	$err .= 'File: '.basename($filename). "\t";
-    	$err .= 'Line: '.$linenum. "\t";
-
-    	if (in_array($errno, $user_errors))
-			{
-        	$err .= 'Trace: '.wddx_serialize_value($vars, 'Variables'). "\t";
-    		}
-    	$err .= "\n";
-
-	   // save to the error log file, and e-mail me if there is a critical user error.
-	   error_log($err, 3, 'error.log');
-	   }
-}
-$old_error_handler = set_error_handler('userErrorHandler');
-
-?>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/folders.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/folders.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/folders.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/folders.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,273 +1,4 @@
-<?php
-require_once('config_tinybrowser.php');
-// Set language
-if(isset($tinybrowser['language']) && file_exists('langs/'.$tinybrowser['language'].'.php'))
-	{
-	require_once('langs/'.$tinybrowser['language'].'.php'); 
-	}
-else
-	{
-	require_once('langs/en.php'); // Falls back to English
-	}
-require_once('fns_tinybrowser.php');
-
-// Check session, if it exists
-if(session_id() != '')
-	{
-	if(!isset($_SESSION[$tinybrowser['sessioncheck']]))
-		{
-		echo TB_DENIED;
-		exit;
-		}
-	}
-	
-if(!$tinybrowser['allowfolders'])
-	{
-	echo TB_FODENIED;
-	exit;
-	}
-
-// Assign request / get / post variables
-$validtypes = array('image','media','file');
-$typenow = ((isset($_GET['type']) && in_array($_GET['type'],$validtypes)) ? $_GET['type'] : 'image');
-$foldernow = str_replace(array('../','..\\','./','.\\'),'',($tinybrowser['allowfolders'] && isset($_REQUEST['folder']) ? urldecode($_REQUEST['folder']) : ''));
-$dirpath = $tinybrowser['path'][$typenow];
-$passfolder = '&folder='.urlencode($foldernow);
-$passfeid = (isset($_GET['feid']) && $_GET['feid']!='' ? '&feid='.$_GET['feid'] : '');
-
-
-
-// Assign browsing options
-$actionnow = (isset($_POST['editaction']) ? $_POST['editaction'] : 'create' );
-
-// Initalise alert array
-$notify = array(
-	'type' => array(),
-	'message' => array()
-);
-$createqty = 0;
-$deleteqty = 0;
-$renameqty = 0;
-$errorqty = 0;
-	
-// Create any child folders with entered name
-if(isset($_POST['createfolder']))
-	{
-	foreach($_POST['createfolder'] as $parent => $newfolder)
-		{
-		if($newfolder != '')
-			{
-			$createthisfolder = $tinybrowser['docroot'].$dirpath.urldecode($_POST['actionfolder'][$parent]).clean_filename($newfolder);
-			if (!file_exists($createthisfolder) && createfolder($createthisfolder,$tinybrowser['unixpermissions'])) $createqty++; else $errorqty++;
-			if($typenow=='image')
-			   {
-				createfolder($createthisfolder.'/_thumbs/',$tinybrowser['unixpermissions']);
-			   }
-			}
-		}
-	}
-	
-// Delete any checked folders
-if(isset($_POST['deletefolder']))
-	{
-	foreach($_POST['deletefolder'] as $delthis => $val)
-		{
-		if($typenow=='image')
-			{
-			$delthisthumbdir = $tinybrowser['docroot'].$dirpath.urldecode($_POST['actionfolder'][$delthis]).'_thumbs/';
-			if (is_dir($delthisthumbdir)) rmdir($delthisthumbdir);
-			}
-		$delthisdir = $tinybrowser['docroot'].$dirpath.urldecode($_POST['actionfolder'][$delthis]);
-		if (is_dir($delthisdir) && rmdir($delthisdir)) $deleteqty++; else $errorqty++;
-		if($foldernow==urldecode($_POST['actionfolder'][$delthis]))
-         {
-         $foldernow = '';
-         $passfolder = '';
-         }
-		}
-
-	}
-	
-// Rename any folders with changed name
-if(isset($_POST['renamefolder']))
-	{
-	foreach($_POST['renamefolder'] as $namethis => $newname)
-		{
-      $urlparts = explode('/',rtrim(urldecode($_POST['actionfolder'][$namethis]),'/'));
-		if(array_pop($urlparts) != $newname)
-			{
-			$namethisfolderfrom = $tinybrowser['docroot'].$dirpath.urldecode($_POST['actionfolder'][$namethis]);
-         $renameurl = implode('/',$urlparts).'/'.clean_filename($newname).'/';
-			$namethisfolderto = $tinybrowser['docroot'].$dirpath.$renameurl;
-			if (is_dir($namethisfolderfrom) && rename($namethisfolderfrom,$namethisfolderto)) $renameqty++; else $errorqty++;
-			if($foldernow==urldecode($_POST['actionfolder'][$namethis]))
-            {
-            $foldernow = ltrim($renameurl,'/');
-            $passfolder = '&folder='.urlencode(ltrim($renameurl,'/'));
-            }
-			}
-		}
-	}
-
-// Assign directory structure to array
-$dirs=array();
-dirtree($dirs,$tinybrowser['filetype'][$typenow],$tinybrowser['docroot'],$tinybrowser['path'][$typenow]);
-
-// generate alert if folders deleted
-if($createqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGCREATE, $createqty);
-	}
-// generate alert if folders deleted
-elseif($deleteqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGDELETE, $deleteqty);
-	}
-// generate alert if folders renamed
-elseif($renameqty>0)
-   {
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGRENAME, $renameqty);
-	}
-	
-// generate alert if file errors encountered
-if($errorqty>0)
-   {
-	$notify['type'][]='failure';
-	$notify['message'][]=sprintf(TB_MSGEDITERR, $errorqty);
-	}
-	
-// count folders
-$num_of_folders = (isset($dirs) ? count($dirs) : 0);
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>TinyBrowser :: <?php echo TB_FOLDERS; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Pragma" content="no-cache" />
-<?php
-if($passfeid == '' && $tinybrowser['integration']=='tinymce')
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="<?php echo $tinybrowser['tinymcecss']; ?>" /><?php 
-	}
-else
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="css/stylefull_tinybrowser.css" /><?php 
-	}
-?>
-<link rel="stylesheet" type="text/css" media="all" href="css/style_tinybrowser.css.php" />
-<script language="javascript" type="text/javascript" src="js/tinybrowser.js.php"></script>
-</head>
-<body onload="rowHighlight();">
-<?php
-if(count($notify['type'])>0) alert($notify);
-form_open('foldertab',false,'folders.php','?type='.$typenow.$passfeid);
-?>
-<div class="tabs">
-<ul>
-<li id="browse_tab"><span><a href="tinybrowser.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_BROWSE; ?></a></span></li>
-<?php
-if($tinybrowser['allowupload']) 
-	{
-	?><li id="upload_tab"><span><a href="upload.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_UPLOAD; ?></a></span></li>
-	<?php 
-	}
-if($tinybrowser['allowfolders'])
-	{
-   ?><li id="edit_tab"><span><a href="edit.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_EDIT; ?></a></span></li>
-   <?php
-   }
-?><li id="folders_tab" class="current"><span><a href="folders.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_FOLDERS; ?></a></span></li>
-</ul>
-</div>
-</form>
-<div class="panel_wrapper">
-<div id="general_panel" class="panel currentmod">
-<fieldset>
-<legend><?php echo TB_FOLDERS; ?></legend>
-<?php
-form_open('edit','custom','folders.php','?type='.$typenow.$passfolder.$passfeid);
-?>
-<div class="pushleft">
-<?php
-
-// Assign edit actions based on file type and permissions
-$select = array();
-if($tinybrowser['allowfolders']) $select[] = array('create',TB_CREATE);
-if($tinybrowser['allowdelete']) $select[] = array('delete',TB_DELETE);
-if($tinybrowser['allowedit']) $select[] = array('rename',TB_RENAME);
-
-form_select($select,'editaction',TB_ACTION,$actionnow,true);
-?></form></div><?php
-
-form_open('actionform','custom','folders.php','?type='.$typenow.$passfolder.$passfeid);
-
-if($actionnow=='move')
-   { ?><div class="pushleft"><?php
-   form_select($editdirs,'destination',TB_FOLDERDEST,urlencode($foldernow),false);
-   ?></div><?php
-   } 
-
-switch($actionnow) 
-	{
-	case 'delete':
-		$actionhead = TB_DELETE;
-		break;
-	case 'rename':
-		$actionhead = TB_RENAME;
-		break;
-	case 'create':
-		$actionhead = TB_CREATE;
-		break;
-	default:
-		// do nothing
-	}
-?><div class="tabularwrapper"><table class="browse"><tr>
-<th class="nohvr"><?php echo TB_FOLDERNAME; ?></th>
-<th class="nohvr"><?php echo TB_FILES; ?></th>
-<th class="nohvr"><?php echo TB_DATE; ?></th>
-<th class="nohvr"><?php echo $actionhead; ?></th></tr>
-<?php
-
-for($i=0;$i<$num_of_folders;$i++)
-	{
-	$disable = ($i == 0 ? true : false);
-	$alt = (IsOdd($i) ? 'r1' : 'r0');
-	echo '<tr class="'.$alt.'">';
-	echo '<td>'.$dirs[$i][2].'</td>';
-	echo '<td>'.$dirs[$i][4].'</td><td>'.date($tinybrowser['dateformat'],$dirs[$i][5]).'</td>'
-	.'<td>';
-	form_hidden_input('actionfolder['.$i.']',$dirs[$i][0]);
-	switch($actionnow) 
-		{
-		case 'create':
-         echo '&rarr; ';
-			form_text_input('createfolder['.$i.']',false,'',30,120);
-			break;
-		case 'delete':
-         $disabledel = ($dirs[$i][4] > 0 ? ' DISABLED' : '');
-			if(!$disable) echo '<input class="del" type="checkbox" name="deletefolder['.$i.']" value="1"'.$disabledel.' />';
-			break;
-		case 'rename':
-			if(!$disable) form_text_input('renamefolder['.$i.']',false,$dirs[$i][3],30,120);
-			break;
-		default:
-			// do nothing
-		}
-	echo "</td></tr>\n";
-	}
-
-echo "</table></div>\n".'<div class="pushright">';
-if($tinybrowser['allowdelete'] && $tinybrowser['allowedit'])
-	{
-	form_hidden_input('editaction',$actionnow);
-	form_submit_button('commit',$actionhead.' '.TB_FOLDERS,'edit');
-	}
-?>
-</div></fieldset></div></div>
-</body>
-</html>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,79 +1,4 @@
 <?php
-$mainpage = (strpos(basename($_SERVER['HTTP_REFERER']),'tinybrowser.php') === 0 ? true : false);
-require_once('../config_tinybrowser.php');
 
-if($mainpage && !isset($_GET['feid']) && $tinybrowser['integration'] == 'tinymce')
-	{?>
-	function selectURL(url)
-	{
-		document.passform.fileurl.value = url;
-		FileBrowserDialogue.mySubmit();
-	}
-	var FileBrowserDialogue = {
-	    init : function () {
-	        // Here goes your code for setting your custom things onLoad.
-				rowHighlight();
-	    },
-	    mySubmit : function () {
-	 		  var URL = document.passform.fileurl.value;
-	        var win = tinyMCEPopup.getWindowArg("window");
-	
-	        // insert information now
-	        win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
-	
-	        // for image browsers: update image dimensions
-			  if (typeof(win.ImageDialog) != "undefined" && document.URL.indexOf('type=image') != -1)
-				  {
-		        if (win.ImageDialog.getImageData) win.ImageDialog.getImageData();
-		        if (win.ImageDialog.showPreviewImage) win.ImageDialog.showPreviewImage(URL);
-				  }
-	
-	        // close popup window
-	        tinyMCEPopup.close();
-	    }
-	}
-	tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
-	<?php 
-	}
-elseif($mainpage && !isset($_GET['feid']) && $tinybrowser['integration'] == 'fckeditor')
-	{?>
-	function selectURL(url){
-	// window.opener.SetUrl( url, width, height, alt);
-	window.opener.SetUrl( url ) ;
-	window.close() ;
-	}
-	<?php
-	}
-elseif($mainpage && $_GET['feid'] != '')
-	{?>
-	function selectURL(url) {
-	opener.document.getElementById("<?php echo $_GET['feid']; ?>").value = url;
-	// Set img source of element id, if img id exists (format is elementid + "img")
-	if (
-        typeof(opener.document.getElementById("<?php echo $_GET['feid']; ?>img")) != "undefined"
-        && opener.document.getElementById("<?php echo $_GET['feid']; ?>img") != null
-        && opener.document.getElementById("<?php echo $_GET['feid']; ?>img").src.length != 0
-		)
-	   {
-		opener.document.getElementById("<?php echo $_GET['feid']; ?>img").src = url;
-		}
-	self.close();
-	}
-	<?php
-	}
-?>
-
-rowHighlight = function() {
-var x = document.getElementsByTagName('tr');
-for (var i=0;i<x.length;i++) 
-	{
-	x[i].onmouseover = function () {this.className = "over " + this.className;}
-	x[i].onmouseout = function () {this.className = this.className.replace("over", ""); this.className = this.className.replace(" ", "");}
-	}
-var y = document.getElementsByTagName('th');
-for (var ii=0;ii<y.length;ii++) 
-	{
-	y[ii].onmouseover = function () {if(this.className != "nohvr") this.className = "over " + this.className;}
-	y[ii].onmouseout = function () {this.className = this.className.replace("over", ""); this.className = this.className.replace(" ", "");}
-	}
-}
\ No hay ningún carácter de nueva línea al final del fichero
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/cs.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/cs.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/cs.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/cs.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,70 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.40 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'cs'
-Author: J. Frank
-*/
-		define("TB_BROWSE", "Prohlížet");
-		define("TB_EDIT", "Editovat");
-		define("TB_UPLOAD", "Nahrát");
-		define("TB_FOLDERS", "Složky");
- 		define("TB_FOLDERNAME", "Název složky");
-		define("TB_FOLDERCURR", "Aktuální složka ");
- 		define("TB_FOLDERDEST", "Cíl: ");
-		define("TB_VIEW", "Zobrazit: ");
-		define("TB_SHOW", "Ukázat: ");
-		define("TB_PAGE", "Strana");
-		define("TB_FILENAME", "Název souboru");
-		define("TB_SIZE", "Velikost");
-		define("TB_DIMENSIONS", "Rozměry");
-		define("TB_TYPE", "Typ");
-		define("TB_DATE", "Soubor modifikován");
-		define("TB_SEARCH", "Hledat");
-		define("TB_MOVE", "Přesunout");
-		define("TB_FILES", "Soubory");
-		define("TB_BROWSEFILES", "Prohlížet soubory");
-		define("TB_DETAILS", "Detaily");
-		define("TB_THUMBS", "Náhledy");
-		define("TB_EDITFILES", "Editovat soubory");
-		define("TB_ACTION", "Akce");
-		define("TB_CREATE", "Vytvořit");
-		define("TB_DELETE", "Vymazat");
-		define("TB_RENAME", "Přejmenovat");
-		define("TB_ROTATE", "Převrátit");
-		define("TB_RESIZE", "Změnit velikost");
-		define("TB_UPLOADFILES", "Nahrát soubory");
-		define("TB_PROGRESS", "");
-		define("TB_REMOVE", "Vyjmout");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "šířka");
-		define("TB_HEIGHT", "výška");
-		define("TB_NONE", "Nic");
-		define("TB_TYPEIMG", "Obrázky");
-		define("TB_TYPEMEDIA", "Multimédia");
-		define("TB_TYPEFILE", "Všechny soubory");
-		define("TB_ROTATECW", "Otočit 90 stupňů doprava");
-		define("TB_ROTATECCW", "Otočit 90 stupňů doleva");
-		define("TB_MSGNEWTHUMBS", "%s nový náhled byl vygenerován.");
-		define("TB_MSGMKDIR", "The '%s' složka byla úspěšně vytvořena.");
-		define("TB_MSGMKDIRFAIL", "Nelze vytvořit '%s' složku - prosím zkontrolujte práva přístupu.");
-		define("TB_MSGDELETE", "%s soubory byly úspěšně vymazány.");
-		define("TB_MSGRENAME", "%s soubory byly úspěšně přejmenovány.");
-		define("TB_MSGRESIZE", "%s obrázkům byla úspěšně změněna velikost.");
-		define("TB_MSGROTATE", "%s obrázky byly úspěšně otočeny.");
-		define("TB_MSGEDITERR", "%s soubory hlási chybu během požadované operace.");
-		define("TB_MSGUPGOOD", "%s soubory byly úspěšně nahrány.");
-		define("TB_MSGUPBAD", "%s soubory nebyly nahrány k vůli bezpečnostním omezením.");
-		define("TB_MSGUPDUP", "%s soubory nebyly nahrány, pravděpodobně již existují, vymažte je nebo změnte jejich názvy.");
-		define("TB_MSGUPFAIL", "Nahrání selhalo, prosím zkontroluje oprávnění pro '%s'.");
-		define("TB_MSGMAXSIZE", "soubor je větší než je maximální povolená hranice.");
-		define("TB_TTLMAXSIZE", "Špatná velikost souboru");
-		define("TB_DENIED", "Potřebujete povolení pro vstup na tutu stránku");
-		define("TB_UPDENIED", "Potřebujete povolení pro upload souborů.");
-		define("TB_EDDENIED", "Potřebujete povolení pro změnu nebo mazání souborů.");
-		define("TB_MSGCREATE", "%s Složky byly úspěšně vytvořeny.");
-	
-		
-
-	
-
-?>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/da.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/da.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/da.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/da.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,69 +1,4 @@
-<?php
-/*
-TinyBrowser 1.40 - En TinyMCE fil browser (C) 2008 Bryn Jones
-Default Language 'da'
-Forfatter: Peter Bentsen
-email: peter.bentsen [at] gmail [dot] com
-*/
-		define("TB_BROWSE", "Gennemse");
-		define("TB_EDIT", "Edit&eacute;r");
-		define("TB_UPLOAD", "Upload");
-		define("TB_FOLDERS", "Mapper");
-		define("TB_FOLDERNAME", "Mappe Navn");
-		define("TB_FOLDERCURR", "Aktuelle Mappe: ");
-		define("TB_FOLDERDEST", "Destination: ");
-		define("TB_VIEW", "Vis som:");
-		define("TB_SHOW", "Vis:");
-		define("TB_PAGE", "Side");
-		define("TB_FILENAME", "Fil Navn");
-		define("TB_SIZE", "St&oslash;rrelse");
-		define("TB_DIMENSIONS", "M&aring;l");
-		define("TB_TYPE", "Type");
-		define("TB_DATE", "Dato &AElig;ndret");
-		define("TB_SEARCH", "S&oslash;g");
-		define("TB_FILES", "Filer");
-		define("TB_BROWSEFILES", "Gennemse Filer");
-		define("TB_DETAILS", "Detaljer");
-		define("TB_THUMBS", "Miniaturer");
-		define("TB_EDITFILES", "Rediger Filer");
-		define("TB_ACTION", "Aktion");
-		define("TB_CREATE", "Opret");
-		define("TB_DELETE", "Slet");
-		define("TB_RENAME", "Omd&oslash;b");
-		define("TB_ROTATE", "Roter");
-		define("TB_RESIZE", "&AElig;ndre st&oslash;rrelse");
-		define("TB_MOVE", "Flyt");
-		define("TB_UPLOADFILES", "Upload Filer");
-		define("TB_PROGRESS", "Progression");
-		define("TB_REMOVE", "Fjern");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "bredde");
-		define("TB_HEIGHT", "h&oslash;jde");
-		define("TB_NONE", "Ingen");
-		define("TB_TYPEIMG", "Billeder");
-		define("TB_TYPEMEDIA", "Media");
-		define("TB_TYPEFILE", "Alle Filer");
-		define("TB_ROTATECW", "Roter 90 grader med uret");
-		define("TB_ROTATECCW", "Roter 90 grader mod uret");
-		define("TB_MSGNEWTHUMBS", "%s nye billede thumbnails er blevet genereret.");
-		define("TB_MSGMKDIR", "'%s' biblioteket er skabt med succes.");
-		define("TB_MSGMKDIRFAIL", "Kunne ikke oprette '%s' mappen - Kontroller dine tilladelser.");
-		define("TB_MSGCREATE", "%s mapperne er blevet oprettet med succes.");
-		define("TB_MSGDELETE", "%s filer er blevet slettet.");
-		define("TB_MSGRENAME", "%s filer er med succes er blevet omd&oslash;bt.");
- 		define("TB_MSGMOVE", "%s filer er med succes er blevet flyttet.");
-		define("TB_MSGRESIZE", "%s billeder er med succes er blevet tilpasset.");
-		define("TB_MSGROTATE", "%s billeder er med succes er blevet roteret.");
-		define("TB_MSGEDITERR", "%s filer st&oslash;dt p&aring; fejl under den &oslash;nskede handling.");
-		define("TB_MSGUPGOOD", "%s filer er blevet uploadet.");
-		define("TB_MSGUPBAD", "%s filer ikke er blevet uploadet, p&aring; grund af sikkerhedsm&aelig;ssige begr&aelig;nsninger.");
-		define("TB_MSGUPDUP", "%s filer ikke er blevet uploadet, da de findes i forvejen - du skal slette eller omd&oslash;be originale filer.");
-		define("TB_MSGUPFAIL", "Fil Upload mislykkedes - Kontroller dine tilladelser til '%s'.");
-		define("TB_MSGMAXSIZE", "kan ikke s&aelig;ttes i k&oslash; til upload, da st&oslash;rrelsen overstiger den maksimale gr&aelig;nse p&aring;");
-		define("TB_TTLMAXSIZE", "Filst&oslash;rrelse Fejl");
-		define("TB_DENIED", "Det kr&aelig;ve tilladelse for at se denne side.");
-		define("TB_UPDENIED", "Det kr&aelig;ver upload tilladelse for at se denne side.");
-		define("TB_EDDENIED", "Det kr&aelig;ve, redigere eller slette tilladelser for at se denne side.");
- 		define("TB_FODENIED", "Det kr&aelig;ver mappe redigerings tilladelse for at se denne side.");
-
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/de.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/de.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/de.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/de.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php
-/*
-TinyBrowser 1.41 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'de'
-Author: Konrad Richter
-email: webmaster[at]korinet[dot]de
-*/
-define("TB_BROWSE", "Durchsuchen");
-define("TB_EDIT", "Bearbeiten");
-define("TB_UPLOAD", "Hochladen");
-define("TB_FOLDERS", "Ordner");
-define("TB_FOLDERNAME", "Ordner Name");
-define("TB_FOLDERCURR", "Aktueller Ordner: ");
-define("TB_FOLDERDEST", "Zielordner: ");
-define("TB_VIEW", "Zeige: ");
-define("TB_SHOW", "Zeigen: ");
-define("TB_PAGE", "Seite");
-define("TB_FILENAME", "Dateiname");
-define("TB_SIZE", "Gr&ouml;&szlig;e");
-define("TB_DIMENSIONS", "Abmessungen");
-define("TB_TYPE", "Datei Typ");
-define("TB_DATE", "Letzte &Auml;nderung");
-define("TB_SEARCH", "Suchen");
-define("TB_FILES", "Dateien");
-define("TB_BROWSEFILES", "Vorhandene Dateien");
-define("TB_DETAILS", "Details");
-define("TB_THUMBS", "Vorschau");
-define("TB_EDITFILES", "Dateien bearbeiten");
-define("TB_ACTION", "Aktion: ");
-define("TB_CREATE", "Erstellen");
-define("TB_DELETE", "L&ouml;schen");
-define("TB_RENAME", "Umbenennen");
-define("TB_ROTATE", "Drehen");
-define("TB_RESIZE", "Gr&ouml;&szlig;e &auml;ndern");
-define("TB_MOVE", "Verschieben");
-define("TB_UPLOADFILES", "Dateien hochladen");
-define("TB_PROGRESS", "Fortschritt");
-define("TB_REMOVE", "L&ouml;schen");
-define("TB_BYTES", "bytes");
-define("TB_WIDTH", "Breite");
-define("TB_HEIGHT", "H&ouml;he");
-define("TB_NONE", "Keine");
-define("TB_TYPEIMG", "Bilder");
-define("TB_TYPEMEDIA", "Medien");
-define("TB_TYPEFILE", "Alle Dateien");
-define("TB_ROTATECW", "Drehung 90 Grad im Uhrzeigersinn");
-define("TB_ROTATECCW", "Drehung 90 Grad gegen den Uhrzeigersinn");
-define("TB_MSGNEWTHUMBS", "%s neue Vorschaubilder wurden generiert.");
-define("TB_MSGMKDIR", "Das Verzeichnis '%s' wurde erfolgreich angelegt.");
-define("TB_MSGMKDIRFAIL", "Verzeichnis '%s' konnte nicht angelegt werden - &Uuml;berpr&uuml;fen Sie die Schreibrechte.");
-define("TB_MSGCREATE", "%s Ornder wurde(n) erfolgreich erstellt.");
-define("TB_MSGDELETE", "%s Dateie(n) wurde(n) erfolgreich gel&ouml;scht.");
-define("TB_MSGRENAME", "%s Dateie(n) wurde(n) erfolgreich  umbenannt.");
-define("TB_MSGMOVE", "%s Datei(n) wurde(n) erfolgreich verschoben.");
-define("TB_MSGRESIZE", "%s Dateie(n) wurde(n) erfolgreich ge&auml;ndert.");
-define("TB_MSGROTATE", "%s Dateie(n) wurde(n) erfolgreich gedreht.");
-define("TB_MSGEDITERR", "%s Dateie(n) wurde(n) fehlerhaft verarbeitet.");
-define("TB_MSGUPGOOD", "%s Dateie(n) wurde(n) erfolgreich hochgeladen.");
-define("TB_MSGUPBAD", "%s Dateie(n) konnten aufgrund von Sicherheitseinschr&auml;nkungen nicht bearbeitet werden.");
-define("TB_MSGUPDUP", "%s Dateien konnten nicht hochgeladen werden, sollte(n) diese schon existieren, l&ouml;schen oder benennen Sie die entspr. Datei(en) um.");
-define("TB_MSGUPFAIL", "Dateiupload fehlgeschlagen - pr&uuml;fen Sie die Schreibrechte f&uuml;r '%s'.");
-define("TB_MSGMAXSIZE", " kann nicht zum hochladen vorgemerkt werden, da die Datei-Gr&ouml;&szlig;e das maximum &uuml;berschreitet: ");
-define("TB_TTLMAXSIZE", "Datei ist zu gro&szlig;");
-define("TB_DENIED", "Sie haben keine Berechtigung, um diese Seite anzuzeigen.");
-define("TB_UPDENIED", "Sie ben&ouml;tigen Berechtigungen zum Hochladen von Dateien, um diese Seite anzuzeigen.");
-define("TB_EDDENIED", "Sie ben&ouml;tigen Berechtigungen zum Bearbeiten/L&ouml;schen von Dateien, um diese Seite anzuzeigen.");
-define("TB_FODENIED", "Sie ben&ouml;tigen Berechtigungen zum Bearbeiten von Ordnern, um diese Seite anzuzeigen.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/en.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/en.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/en.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/en.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.41 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'en'
-Author: Bryn Jones
-email: bryn[at]lunarvis[dot]com
-*/
-		define("TB_BROWSE", "Browse");
-		define("TB_EDIT", "Edit");
-		define("TB_UPLOAD", "Upload");
-		define("TB_FOLDERS", "Folders");
- 		define("TB_FOLDERNAME", "Folder Name");
-		define("TB_FOLDERCURR", "Current Folder: ");
- 		define("TB_FOLDERDEST", "Destination: ");
-		define("TB_VIEW", "View As: ");
-		define("TB_SHOW", "Show: ");
-		define("TB_PAGE", "Page");
-		define("TB_FILENAME", "File Name");
-		define("TB_SIZE", "Size");
-		define("TB_DIMENSIONS", "Dimensions");
-		define("TB_TYPE", "Type");
-		define("TB_DATE", "Date Modified");
-		define("TB_SEARCH", "Search");
-		define("TB_FILES", "Files");
-		define("TB_BROWSEFILES", "Browse Files");
-		define("TB_DETAILS", "Details");
-		define("TB_THUMBS", "Thumbnails");
-		define("TB_EDITFILES", "Edit Files");
-		define("TB_ACTION", "Action: ");
- 		define("TB_CREATE", "Create");
-		define("TB_DELETE", "Delete");
-		define("TB_RENAME", "Rename");
-		define("TB_ROTATE", "Rotate");
-		define("TB_RESIZE", "Resize");
- 		define("TB_MOVE", "Move");
-		define("TB_UPLOADFILES", "Upload Files");
-		define("TB_PROGRESS", "Progress");
-		define("TB_REMOVE", "Remove");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "width");
-		define("TB_HEIGHT", "height");
-		define("TB_NONE", "None");
-		define("TB_TYPEIMG", "Images");
-		define("TB_TYPEMEDIA", "Media");
-		define("TB_TYPEFILE", "All Files");
-		define("TB_ROTATECW", "Rotate 90 degrees clockwise");
-		define("TB_ROTATECCW", "Rotate 90 degrees anti-clockwise");
-		define("TB_MSGNEWTHUMBS", "%s new image thumbnails have been generated.");
-		define("TB_MSGMKDIR", "The '%s' directory has been successfully created.");
-		define("TB_MSGMKDIRFAIL", "Unable to create the '%s' directory - please check your permissions.");
-		define("TB_MSGCREATE", "%s folders have been successfully created.");
-		define("TB_MSGDELETE", "%s files have been successfully deleted.");
-		define("TB_MSGRENAME", "%s files have been successfully renamed.");
- 		define("TB_MSGMOVE", "%s files have been successfully moved.");
-		define("TB_MSGRESIZE", "%s images have been successfully resized.");
-		define("TB_MSGROTATE", "%s images have been successfully rotated.");
-		define("TB_MSGEDITERR", "%s files encountered errors during the requested operation.");
-		define("TB_MSGUPGOOD", "%s files have been successfully uploaded.");
-		define("TB_MSGUPBAD", "%s files have not been uploaded, due to security restrictions.");
-		define("TB_MSGUPDUP", "%s files have not been uploaded, as they already exist - please delete or rename original files.");
-		define("TB_MSGUPFAIL", "File upload failed - please check your permissions for '%s' and also your php.ini settings.");
-		define("TB_MSGMAXSIZE", "cannot be queued for upload as the size exceeds the maximum limit of");
-		define("TB_TTLMAXSIZE", "File Size Error");
-		define("TB_DENIED", "You require permission to view this page.");
-		define("TB_UPDENIED", "You require upload permission to view this page.");
-		define("TB_EDDENIED", "You require edit or delete permissions to view this page.");
- 		define("TB_FODENIED", "You require folder maintenance permissions to view this page.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/es.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/es.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/es.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/es.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,59 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'en'
-Author: Bryn Jones. Fran Iglesias
-email: bryn[at]lunarvis[dot]com  franiglesias[at]mac[dot]com
-*/
-		define("TB_BROWSE", "Navegar");
-		define("TB_EDIT", "Editar");
-		define("TB_UPLOAD", "Subir");
-		define("TB_VIEW", "Ver como: ");
-		define("TB_SHOW", "Mostrar: ");
-		define("TB_PAGE", "Página");
-		define("TB_FILENAME", "Nombre de archivo");
-		define("TB_SIZE", "Tamaño");
-		define("TB_DIMENSIONS", "Dimensiones");
-		define("TB_TYPE", "Tipo");
-		define("TB_DATE", "Modificación");
-		define("TB_SEARCH", "Buscar");
-		define("TB_FILES", "Archivos");
-		define("TB_BROWSEFILES", "Navegar por archivos");
-		define("TB_DETAILS", "Detalles");
-		define("TB_THUMBS", "Previos");
-		define("TB_EDITFILES", "Editar archivos");
-		define("TB_ACTION", "Acción");
-		define("TB_DELETE", "Borrar");
-		define("TB_RENAME", "Cambiar nombre");
-		define("TB_ROTATE", "Rotar");
-		define("TB_RESIZE", "Cambiar tamaño");
-		define("TB_UPLOADFILES", "Subir archivos");
-		define("TB_PROGRESS", "Progreso");
-		define("TB_REMOVE", "Quitar");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "ancho");
-		define("TB_HEIGHT", "alto");
-		define("TB_NONE", "Nada");
-		define("TB_TYPEIMG", "Imégenes");
-		define("TB_TYPEMEDIA", "Medios");
-		define("TB_TYPEFILE", "Todos");
-		define("TB_ROTATECW", "Rotar 90 grados derecha");
-		define("TB_ROTATECCW", "Rotar 90 grados izquierda");
-		define("TB_MSGNEWTHUMBS", "%s se han generado previos de la imagen.");
-		define("TB_MSGMKDIR", "El directorio '%s' ha podido ser creado.");
-		define("TB_MSGMKDIRFAIL", "Incapaz de crear el directorio '%s'. Por favor, comprueba los permisos.");
-		define("TB_MSGDELETE", "%s archivos han sido borrados.");
-		define("TB_MSGRENAME", "%s archivos han cambiado de nombre.");
-		define("TB_MSGRESIZE", "%s imágenes han sido escaladas.");
-		define("TB_MSGROTATE", "%s imágenes han sido rotadas.");
-		define("TB_MSGEDITERR", "%s archivos han tenido errores en las operaciones solicitadas.");
-		define("TB_MSGUPGOOD", "%s archivos han sido cargados.");
-		define("TB_MSGUPBAD", "%s archivos no se han subido por restrucciones de seguridad.");
-		define("TB_MSGUPDUP", "%s archivos no se han subido porque ya existían - por favor, cambia su nombre o bárralos.");
-		define("TB_MSGUPFAIL", "No se ha podido subir el archivo. Comprueba los permisos de '%s'.");
-		define("TB_MSGMAXSIZE", "no se ha podido poner en cola para subir porque el tamaño es mayor del límite de");
-		define("TB_TTLMAXSIZE", "Error del tamaño de archivo");
-		define("TB_DENIED", "Necesitas permiso para ver esta página.");
-		define("TB_UPDENIED", "Necesitas permisos de subida de archivos para ver esta página.");
-		define("TB_EDDENIED", "Necesitas permisos de edición o borrado para ver esta página.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fi.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fi.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fi.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fi.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
 <?php
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'fi'
-Author: Iisakki Pirilä - Markus Sällinen
-email: iisakki[at]piuha[dot]fi
-*/
-define("TB_BROWSE", "Selaa");
-define("TB_EDIT", "Muokkaa");
-define("TB_UPLOAD", "Lataa palvelimelle");
-define("TB_FOLDERS", "Kansiot");
-define("TB_FOLDERNAME", "Kansion nimi");
-define("TB_FOLDERCURR", "Nykyinen kansio: ");
-define("TB_FOLDERDEST", "Kohde: ");
-define("TB_VIEW", "Näytä: ");
-define("TB_SHOW", "Näytä: ");
-define("TB_PAGE", "Sivu");
-define("TB_FILENAME", "Tiedostonimi");
-define("TB_SIZE", "Koko");
-define("TB_DIMENSIONS", "Kuvakoko");
-define("TB_TYPE", "Tyyppi");
-define("TB_DATE", "Muokattu");
-define("TB_SEARCH", "Etsi");
-define("TB_FILES", "tiedostot");
-define("TB_BROWSEFILES", "Selaa tiedostoja");
-define("TB_DETAILS", "Tarkat tiedot");
-define("TB_THUMBS", "Esikatselukuvat");
-define("TB_EDITFILES", "Muokkaa tiedostoja");
-define("TB_ACTION", "Toiminto");
-define("TB_CREATE", "Luo");
-define("TB_DELETE", "Poista");
-define("TB_RENAME", "Nimeä uudelleen");
-define("TB_ROTATE", "Käännä");
-define("TB_RESIZE", "Muuta kokoa");
-define("TB_MOVE", "Siirrä");
-define("TB_UPLOADFILES", "Lataa tiedostoja");
-define("TB_PROGRESS", "Vaihe");
-define("TB_REMOVE", "Poista");
-define("TB_BYTES", "tavua");
-define("TB_WIDTH", "leveys");
-define("TB_HEIGHT", "korkeus");
-define("TB_NONE", "Ei mitään");
-define("TB_TYPEIMG", "Kuvat");
-define("TB_TYPEMEDIA", "Mediatiedostot");
-define("TB_TYPEFILE", "Kaikki tiedostot");
-define("TB_ROTATECW", "Käännä 90 astetta myötäpäivään");
-define("TB_ROTATECCW", "Käännä 90 astetta vastapäivään");
-define("TB_MSGNEWTHUMBS", "%s uutta esikatselukuvaa luotu.");
-define("TB_MSGMKDIR", "Kansion '%s' luominen onnistui.");
-define("TB_MSGMKDIRFAIL", "Kansion '%s' luominen epäonnistui - tarkista oikeudet.");
-define("TB_MSGCREATE", "%s kansiota on luotu oninstuneesti.");
-define("TB_MSGDELETE", "%s tiedoston poistaminen onnistui.");
-define("TB_MSGRENAME", "%s tiedoston uudelleennimeäminen onnistui.");
-define("TB_MSGMOVE", "%s tiedostoa on siirretty onnistuneesti");
-define("TB_MSGRESIZE", "%s kuvan koon muuttaminen onnistui.");
-define("TB_MSGROTATE", "%s kuvan kääntäminen onnistui.");
-define("TB_MSGEDITERR", "Toiminto epäonnistui %s tiedostolle.");
-define("TB_MSGUPGOOD", "%s tiedoston lataaminen palvelimelle onnistui.");
-define("TB_MSGUPBAD", "%s tiedostoa ei ladattu palvelimelle tietoturvarajoitusten vuoksi.");
-define("TB_MSGUPDUP", "%s tiedostoa ei ladattu palvelimelle, koska samanniminen tiedosto on jo olemassa. Poista tai nimeä uudelleen alkuperäinen tiedosto.");
-define("TB_MSGUPFAIL", "Tiedoston lataaminen epäonnistui. Tarkista oikeudet kohteeseen '%s'.");
-define("TB_MSGMAXSIZE", "ei voida ladata palvelimelle, koska tiedoston koko ylittää ylärajan");
-define("TB_TTLMAXSIZE", "Tiedostokoossa virhe");
-define("TB_DENIED", "Tämä sivu vaatii käyttöoikeuden.");
-define("TB_UPDENIED", "Tämä sivu vaatii latausoikeudet.");
-define("TB_EDDENIED", "Tämä sivu vaatii muokkaus- tai poisto- oikeudet.");
-define("TB_FODENIED", "Tämä sivu vaatii kansioiden hallintaoikeudet.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fr.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fr.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fr.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/fr.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,66 +1,4 @@
-<?php
-/*
-Default Language 'fr'
-Traductions for TinyBrowser 1.4 Beta.
-Based on the 1.3 files, with folders traductions adds
-Author: Stéphane Rouillé , Ligne13 Web Agency
-email: stephane@ligne13.com
-*/
-define("TB_BROWSE", "Ouvrir...");
-define("TB_EDIT", "Editer");
-define("TB_UPLOAD", "Upload");
-define("TB_VIEW", "Affichage: ");
-define("TB_SHOW", "Montrer: ");
-define("TB_PAGE", "Page");
-define("TB_FILENAME", "Nom");
-define("TB_SIZE", "Taille");
-define("TB_DIMENSIONS", "Dimensions");
-define("TB_TYPE", "Type");
-define("TB_DATE", "Date Modification");
-define("TB_SEARCH", "Rechercher");
-define("TB_FILES", "Fichiers");
-define("TB_FOLDERS", "Dossiers");
-define("TB_BROWSEFILES", "Ouvrir Fichiers");
-define("TB_DETAILS", "Détails");
-define("TB_THUMBS", "Vignettes");
-define("TB_EDITFILES", "Editer Fichiers");
-define("TB_ACTION", "Action");
-define("TB_DELETE", "Supprimer");
-define("TB_RENAME", "Renommer");
-define("TB_ROTATE", "Pivoter");
-define("TB_MOVE", "Deplacer");
-define("TB_RESIZE", "Redimensionner");
-define("TB_UPLOADFILES", "Upload Fichiers");
-define("TB_PROGRESS", "Progression");
-define("TB_REMOVE", "Retirer");
-define("TB_BYTES", "bytes");
-define("TB_WIDTH", "largeur");
-define("TB_HEIGHT", "hauteur");
-define("TB_NONE", "Auncun");
-define("TB_TYPEIMG", "Images");
-define("TB_TYPEMEDIA", "Media");
-define("TB_TYPEFILE", "Tous Fichiers");
-define("TB_ROTATECW", "Rotation 90 degrés horaire");
-define("TB_ROTATECCW", "Rotation 90 degrés anti-horaire");
-define("TB_CREATE", "Créer");
-define("TB_FOLDERNAME", "Nom du dossier");
-define("TB_MSGCREATE", "Le dossier a bien été crée.");
-define("TB_FOLDERCURR", "Dossier actuel ");
-define("TB_MSGNEWTHUMBS", "%s nouvelles vignettes créées.");
-define("TB_MSGMKDIR", "Le '%s' répertoire a été créé avec succès.");
-define("TB_MSGMKDIRFAIL", "Impossible de créer le répertoire '%s' - vérifier vos permissions.");
-define("TB_MSGDELETE", "%s fichiers ont été supprimés avec succès.");
-define("TB_MSGRENAME", "%s fichiers ont été renommés avec succès.");
-define("TB_MSGRESIZE", "%s fichiers ont été redimensionnés avec succès.");
-define("TB_MSGROTATE", "%s images ont été pivotées avec succès.");
-define("TB_MSGEDITERR", "%s fichiers en état erreur pendant l'opération.");
-define("TB_MSGUPGOOD", "%s fichiers ont été uploadés avec succès.");
-define("TB_MSGUPBAD", "%s fichiers n'ont pas été uploadés, à cause des restrictions de sécurité.");
-define("TB_MSGUPDUP", "%s fichiers n'ont pas été uploadés car ils existent déjà - merci de supprimer ou renommer le fichier original.");
-define("TB_MSGUPFAIL", "Echec d'pload de fichier - verifier vos permissions pour '%s'.");
-define("TB_MSGMAXSIZE", "ne peut placer en liste: limite de taille de fichier maximum dépassé");
-define("TB_TTLMAXSIZE", "Erreur de taille de fichier");
-define("TB_DENIED", "Vous devez posséder la permission pour voir cette page.");
-define("TB_UPDENIED", "Vous devez posséder la permission upload pour voir cette page.");
-define("TB_EDDENIED", "Vous devez posséder la permission edition ou suppression pour voir cette page.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hr.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hr.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hr.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hr.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,59 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'hr'
-Author: Saša Tomislav Mataić
-email: stmataic[at]gmail[dot]com
-*/
-		define("TB_BROWSE", "Pretraži");
-		define("TB_EDIT", "Uredi");
-		define("TB_UPLOAD", "Pošalji");
-		define("TB_VIEW", "Vrste pregleda: ");
-		define("TB_SHOW", "Prikaži: ");
-		define("TB_PAGE", "Stranica");
-		define("TB_FILENAME", "Naziv datoteke");
-		define("TB_SIZE", "Veličina");
-		define("TB_DIMENSIONS", "Dimenzije");
-		define("TB_TYPE", "Tip");
-		define("TB_DATE", "Datum promjene");
-		define("TB_SEARCH", "Traži");
-		define("TB_FILES", "datoteke");
-		define("TB_BROWSEFILES", "Pretraži datoteke");
-		define("TB_DETAILS", "Detalji");
-		define("TB_THUMBS", "Sličice");
-		define("TB_EDITFILES", "Uredi datoteke");
-		define("TB_ACTION", "Akcija");
-		define("TB_DELETE", "Obriši");
-		define("TB_RENAME", "Preimenuj");
-		define("TB_ROTATE", "Rotiraj");
-		define("TB_RESIZE", "Promijeni veličinu");
-		define("TB_UPLOADFILES", "Pošalji datoteke");
-		define("TB_PROGRESS", "Napredak");
-		define("TB_REMOVE", "Makni");
-		define("TB_BYTES", "bytova");
-		define("TB_WIDTH", "širina");
-		define("TB_HEIGHT", "visina");
-		define("TB_NONE", "Ništa");
-		define("TB_TYPEIMG", "Slike");
-		define("TB_TYPEMEDIA", "Razno");
-		define("TB_TYPEFILE", "Sve datotke");
-		define("TB_ROTATECW", "Rotiraj 90 stupnjeva u smjeru kazaljki na satu");
-		define("TB_ROTATECCW", "Rotiraj 90 stupnjeva suprotno od smjera kazaljki na satu");
-		define("TB_MSGNEWTHUMBS", "Generirano %s novih sličica.");
-		define("TB_MSGMKDIR", "Uspješno kreirana mapa '%s'.");
-		define("TB_MSGMKDIRFAIL", "Nemoguće kreirati mapu '%s' - provjerite permissione.");
-		define("TB_MSGDELETE", "%s datoteka uspješno obrisano.");
-		define("TB_MSGRENAME", "%s datoteka uspješno preimenovano.");
-		define("TB_MSGRESIZE", "%s slika uspješno promijenjene dimenzije.");
-		define("TB_MSGROTATE", "%s slika uspješno rotirano.");
-		define("TB_MSGEDITERR", "%s datoteka nije moglo biti promijenjeno.");
-		define("TB_MSGUPGOOD", "%s datoteka uspješno poslano.");
-		define("TB_MSGUPBAD", "%s datoteka nije bilo poslano zbog sigurnosnih postavki.");
-		define("TB_MSGUPDUP", "%s datoteka nije bilo poslano, istoimene datoteke već postoje - obrišite ili preimenujte postojeće datoteke.");
-		define("TB_MSGUPFAIL", "Neuspjelo slanje datoteka - provjerite dozvole za '%s'.");
-		define("TB_MSGMAXSIZE", "nemoguće poslati jer ukupna veličina premašuje maksimalnu veličinu od");
-		define("TB_TTLMAXSIZE", "Greška u veličini datoteke");
-		define("TB_DENIED", "Potrebna vam je dozvola za pregled ove stranice.");
-		define("TB_UPDENIED", "Potrebna vam je dozvola za slanje datoteka za pregled ove stranice.");
-		define("TB_EDDENIED", "Potrebna vam je dozvola za uređivanje za pregled ove stranice.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hu.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hu.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hu.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/hu.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.40 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'en'
-Author: Bryn Jones
-email: bryn[at]lunarvis[dot]com
-*/
-		define("TB_BROWSE", "Tallózás");
-		define("TB_EDIT", "Szerkesztés");
-		define("TB_UPLOAD", "Feltöltés");
-		define("TB_FOLDERS", "Mappák");
- 		define("TB_FOLDERNAME", "Mappa neve");
-		define("TB_FOLDERCURR", "Aktuális mappa: ");
- 		define("TB_FOLDERDEST", "Cél: ");
-		define("TB_VIEW", "Megtekintés mint: ");
-		define("TB_SHOW", "Mutat: ");
-		define("TB_PAGE", "Oldal");
-		define("TB_FILENAME", "Fájl név");
-		define("TB_SIZE", "Méret");
-		define("TB_DIMENSIONS", "Méretek");
-		define("TB_TYPE", "Típus");
-		define("TB_DATE", "Módosítás dátuma");
-		define("TB_SEARCH", "Keresés");
-		define("TB_FILES", "Fájlok");
-		define("TB_BROWSEFILES", "Fájlok tallózása");
-		define("TB_DETAILS", "Részletek");
-		define("TB_THUMBS", "Miniatűrök");
-		define("TB_EDITFILES", "Fájlok szerkesztése");
-		define("TB_ACTION", "Művelet: ");
- 		define("TB_CREATE", "Létrehozás");
-		define("TB_DELETE", "Törlés");
-		define("TB_RENAME", "Átnevezés");
-		define("TB_ROTATE", "Forgatás");
-		define("TB_RESIZE", "Méretezés");
- 		define("TB_MOVE", "Mozgatás");
-		define("TB_UPLOADFILES", "Fájlok feltöltése");
-		define("TB_PROGRESS", "Folyamat");
-		define("TB_REMOVE", "Eltávolítás");
-		define("TB_BYTES", "byteok");
-		define("TB_WIDTH", "szélesség");
-		define("TB_HEIGHT", "magasság");
-		define("TB_NONE", "Semmi");
-		define("TB_TYPEIMG", "Képek");
-		define("TB_TYPEMEDIA", "Média");
-		define("TB_TYPEFILE", "Minden fájl");
-		define("TB_ROTATECW", "Forgatás 90 fokkal óramutató járása szerint");
-		define("TB_ROTATECCW", "Forgatás 90 fokkal óramutató járással ellentétesen");
-		define("TB_MSGNEWTHUMBS", "%s új miniatűr lett generálva.");
-		define("TB_MSGMKDIR", "A(z) '%s' könyvtár létrehozva");
-		define("TB_MSGMKDIRFAIL", "Nem lehetséges a(z) '%s' könyvtár létrehozása, ellenőrizd a jogokat!");
-		define("TB_MSGCREATE", "%s mappa sikeresen létrehozva.");
-		define("TB_MSGDELETE", "%s fájl sikeresen törölve.");
-		define("TB_MSGRENAME", "%s fájl sikeresen átnevezve.");
- 		define("TB_MSGMOVE", "%s fájl sikeresen mozgatva.");
-		define("TB_MSGRESIZE", "%s fájl sikeresen méretezve.");
-		define("TB_MSGROTATE", "%s kép sikeresen forgatva.");
-		define("TB_MSGEDITERR", "%s fájlnál hiba lépett fel a folgolgozáskor.");
-		define("TB_MSGUPGOOD", "%s fájl feltöltése sikeres.");
-		define("TB_MSGUPBAD", "%s fájl nem lett feltöltve biztonsági korlátozások miatt.");
-		define("TB_MSGUPDUP", "%s fájl nem lett feltöltve, mert már létezik ilyen. A meglévőt nevezd át vagy töröld!");
-		define("TB_MSGUPFAIL", "Fájl feltöltés sikeretelen, ellenőrizd a jogokat: '%s'.");
-		define("TB_MSGMAXSIZE", "nem vehető fel a feltöltési listába, mert a mérete nagyobb a megengedettnél: ");
-		define("TB_TTLMAXSIZE", "Fájl méret hiba");
-		define("TB_DENIED", "Nincs jogosultságod az oldal megjelenítéséhez.");
-		define("TB_UPDENIED", "Feltöltési jogosultsággal kell rendelkezned ennek az oldalanak a megtekintéséhez.");
-		define("TB_EDDENIED", "Szerkesztési jogosultsággal kell rendelkezned ennek az oldalanak a megtekintéséhez.");
- 		define("TB_FODENIED", "Könyvtárkezelési jogosultsággal kell rendelkezned ennek az oldalanak a megtekintéséhez");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/it.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/it.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/it.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/it.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'en'
-Author: Bryn Jones
-email: bryn[at]lunarvis[dot]com
-*/
-		define("TB_BROWSE", "Sfoglia");
-		define("TB_GALLERY", "Galleria");
-		define("TB_EDIT", "Modifica");
-		define("TB_UPLOAD", "Upload");
-		define("TB_FOLDERS", "Folders");
- 		define("TB_FOLDERNAME", "Nome Cartella");
-		define("TB_FOLDERCURR", "Cartella attuale: ");
- 		define("TB_FOLDERDEST", "Destinazione: ");		
-		define("TB_VIEW", "Vedi come: ");
-		define("TB_SHOW", "Mostra: ");
-		define("TB_PAGE", "Pagina");
-		define("TB_FILENAME", "Nome file");
-		define("TB_SIZE", "Dim. (KB)");
-		define("TB_DIMENSIONS", "Dimensioni img");
-		define("TB_TYPE", "Tipo");
-		define("TB_DATE", "Data Modifica");
-		define("TB_SEARCH", "Cerca");
-		define("TB_FILES", "Files");
-		define("TB_BROWSEFILES", "Sfoglia");
-		define("TB_DETAILS", "Dettagli");
-		define("TB_THUMBS", "Anteprime");
-		define("TB_EDITFILES", "Modifica Files");
-		define("TB_ACTION", "Azione");
- 		define("TB_CREATE", "Create");		
-		define("TB_DELETE", "Cancella");
-		define("TB_RENAME", "Rinomina");
-		define("TB_ROTATE", "Ruota");
-		define("TB_RESIZE", "Ridimensiona");
-		define("TB_UPLOADFILES", "Upload Files");
-		define("TB_PROGRESS", "Progresso");
-		define("TB_REMOVE", "Rimuovi");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "larghezza");
-		define("TB_HEIGHT", "altezza");
-		define("TB_NONE", "Nessuno");
-		define("TB_TYPEIMG", "Immagini");
-		define("TB_TYPEMEDIA", "Media");
-		define("TB_TYPEFILE", "Tutti i files");
-		define("TB_ROTATECW", "Ruota 90� orario");
-		define("TB_ROTATECCW", "Ruota 90� antiorario");
-		define("TB_MSGNEWTHUMBS", "%s nuove anteprime sono state generate.");
-		define("TB_MSGMKDIR", "Le '%s' cartelle sono state create.");
-		define("TB_MSGMKDIRFAIL", "Impossibile creare la cartella '%s' - controlla i tuoi permessi.");
-		define("TB_MSGCREATE", "%s cartelle create con successo.");		
-		define("TB_MSGDELETE", "%s files cancellati con successo.");
-		define("TB_MSGRENAME", "%s files rinominati con successo.");
- 		define("TB_MSGMOVE", "%s files spostati con successo.");		
-		define("TB_MSGRESIZE", "%s immagini ridimensionate con successo.");
-		define("TB_MSGROTATE", "%s immagini ruotate con successo.");
-		define("TB_MSGEDITERR", "%s files sono andati incontro ad un errore durante la operazione richiesta.");
-		define("TB_MSGUPGOOD", "%s files inviati con successo.");
-		define("TB_MSGUPBAD", "%s files non sono stati inviati a causa di restrizioni di sicurezza.");
-		define("TB_MSGUPDUP", "%s files non sono stati inviati, perche' gia' esistenti - cancella o rinomina i files originali.");
-		define("TB_MSGUPFAIL", "Errore nell'invio files - controlla i tuoi permessi per '%s'.");
-		define("TB_MSGMAXSIZE", "Non e possibile mettere in coda per l invio, in quanto le dimensioni del file superano il limite di");
-		define("TB_TTLMAXSIZE", "Errore dimensioni files");
-		define("TB_DENIED", "Devi avere i permessi per vedere questa pagina.");
-		define("TB_UPDENIED", "Devi avere il permesso di upload per vedere questa pagina.");
-		define("TB_EDDENIED", "Devi avere permesso di modifica o cancellazione per vedere questa pagina.");
- 		define("TB_FODENIED", "Devi avere i permessi di modifica delle cartelle per vedere questa pagina.");		
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/lv.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/lv.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/lv.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/lv.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,59 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'lv'
-Author: Raimonds Supulnieks
-email: raimonds6[at]gmail[dot]com
-*/
-		define("TB_BROWSE", "Caurlūkot");
-		define("TB_EDIT", "Labot");
-		define("TB_UPLOAD", "Augšupielādēt");
-		define("TB_VIEW", "Apskatīt kā: ");
-		define("TB_SHOW", "Parādīt: ");
-		define("TB_PAGE", "Lapa");
-		define("TB_FILENAME", "Faila nosaukums");
-		define("TB_SIZE", "Izmērs");
-		define("TB_DIMENSIONS", "Dimensijas");
-		define("TB_TYPE", "Tips");
-		define("TB_DATE", "Rediģēšanas datums");
-		define("TB_SEARCH", "Meklēt");
-		define("TB_FILES", "Faili");
-		define("TB_BROWSEFILES", "Caurlūkot failus");
-		define("TB_DETAILS", "Detaļas");
-		define("TB_THUMBS", "Mazie attēlojumi");
-		define("TB_EDITFILES", "Labot failus");
-		define("TB_ACTION", "Darbība");
-		define("TB_DELETE", "Dzēst");
-		define("TB_RENAME", "Pārsaukt");
-		define("TB_ROTATE", "Apgriezt");
-		define("TB_RESIZE", "Mainīt izmēru");
-		define("TB_UPLOADFILES", "Augšupielādēt failus");
-		define("TB_PROGRESS", "Progress");
-		define("TB_REMOVE", "Aizvākt");
-		define("TB_BYTES", "baiti");
-		define("TB_WIDTH", "garums");
-		define("TB_HEIGHT", "platums");
-		define("TB_NONE", "Nekas");
-		define("TB_TYPEIMG", "Bildes");
-		define("TB_TYPEMEDIA", "Media");
-		define("TB_TYPEFILE", "Visi faili");
-		define("TB_ROTATECW", "Apgriezt par 90 grādiem pa pulksteņa virzienu");
-		define("TB_ROTATECCW", "Apgriezt par 90 grādiem pret pulksteņa virzienu");
-		define("TB_MSGNEWTHUMBS", "%s jauni bilžu mazie attēlojumi tikuši izveidoti.");
-		define("TB_MSGMKDIR", "Mape '%s' tika veiksmīgi izveidota.");
-		define("TB_MSGMKDIRFAIL", "Neiespējami izveidot mapi '%s' - lūdzu pārbaudiet savas atļaujas.");
-		define("TB_MSGDELETE", "%s faili tika veiksmīgi izdzēsti.");
-		define("TB_MSGRENAME", "%s faili tika veiksmīgi pārsaukti.");
-		define("TB_MSGRESIZE", "%s bildām tika veiksmīgi izmainīts izmērs.");
-		define("TB_MSGROTATE", "%s bildes tika veiksmīgi apgrieztas.");
-		define("TB_MSGEDITERR", "%s failiem tika konstatēta kļūda pieprasītajā darbībā.");
-		define("TB_MSGUPGOOD", "%s faili tika veiksmīgi augšupielādēti.");
-		define("TB_MSGUPBAD", "%s faili netika augšupielādēti sakarā ar drošības ierobežojumiem.");
-		define("TB_MSGUPDUP", "%s faili netika augšupielādēti, jo tādi faili jau eksistē - lūdzu izdzēsiet vai pārsauciet orģinālos failus.");
-		define("TB_MSGUPFAIL", " Faila augšupielādē neizdevusies - lūdzu pārbaudiet atļaujas priekš '%s'.");
-		define("TB_MSGMAXSIZE", "nevar tikt augšupielādēts, jo ir sasniegts maksimālais izmērs");
-		define("TB_TTLMAXSIZE", " Faila izmēra kļūda");
-		define("TB_DENIED", "Jūs pieprasiet atļauju, lai apskatītu šo lapu.");
-		define("TB_UPDENIED", "Jūs pieprasiet augšupielādes atļauju, lai apskatītu šo lapu.");
-		define("TB_EDDENIED", "Jūs pieprasiet labošanas vai dzēšanas atļaujas, lai apskatītu šo lapu.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/nl.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/nl.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/nl.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/nl.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,69 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.40 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language: nl
-Author: Rudy Mens
-email: ruud[at]lazyadmin[dot]nl
-updated by fc.stuurman@hccnet.nl
-*/
-define("TB_BROWSE", "Bladeren");
-define("TB_EDIT", "Aanpassen");
-define("TB_UPLOAD", "Upload");
-define("TB_FOLDERS", "Folders");
-define("TB_FOLDERNAME", "Folder Naam");
-define("TB_FOLDERCURR", "Huidige Folder: ");
-define("TB_FOLDERDEST", "Doel Folder: ");
-define("TB_VIEW", "Beeld: ");
-define("TB_SHOW", "Show: ");
-define("TB_PAGE", "Pagina");
-define("TB_FILENAME", "Naam");
-define("TB_SIZE", "Grootte");
-define("TB_DIMENSIONS", "Afmeting");
-define("TB_TYPE", "Type");
-define("TB_DATE", "Gewijzigd op");
-define("TB_SEARCH", "Zoeken");
-define("TB_FILES", "bestanden");
-define("TB_BROWSEFILES", "Overzicht");
-define("TB_DETAILS", "Details");
-define("TB_THUMBS", "Miniatuurweergaven");
-define("TB_EDITFILES", "Bestanden aanpassen");
-define("TB_ACTION", "Actie");
-define("TB_CREATE", "Creer");
-define("TB_DELETE", "Verwijder");
-define("TB_RENAME", "Hernoem");
-define("TB_ROTATE", "Draaien");
-define("TB_RESIZE", "Formaat wijzigen");
-define("TB_MOVE", "Verplaats");
-define("TB_UPLOADFILES", "Upload Bestanden");
-define("TB_PROGRESS", "Voortgang");
-define("TB_REMOVE", "Verwijderen");
-define("TB_BYTES", "bytes");
-define("TB_WIDTH", "breedte");
-define("TB_HEIGHT", "hoogte");
-define("TB_NONE", "Niet");
-define("TB_TYPEIMG", "Afbeeldingen");
-define("TB_TYPEMEDIA", "Media");
-define("TB_TYPEFILE", "Alle bestanden");
-define("TB_ROTATECW", "Rechtsom draaien");
-define("TB_ROTATECCW", "Linksom draaien");
-define("TB_MSGNEWTHUMBS", "%s nieuwe miniatuurweergaven van de afbeeldingen zijn gegenareerd.");
-define("TB_MSGMKDIR", "De map '%s' is successvol aangemaakt.");
-define("TB_MSGMKDIRFAIL", "Kan de map '%s' niet aanmaken - Kijk je rechten instellingen na.");
-define("TB_MSGCREATE", "%s bestand(en) is/zijn succesvol gecreerd.");
-define("TB_MSGDELETE", "%s bestand(en) is/zijn succesvol verwijderd.");
-define("TB_MSGRENAME", "%s bestand(en) is/zijn succesvol hernoemd.");
-define("TB_MSGMOVE", "%s bestand(en) is/zijn succesvol verplaatst.");
-define("TB_MSGRESIZE", "%s afbeelding(en) is/zijn succesvol gewijzigd.");
-define("TB_MSGROTATE", "%s afbeelding(en) is/zijn succesvol hernoemd.");
-define("TB_MSGEDITERR", "%s bestand(en) gevonden met problemen tijdens deze handeling.");
-define("TB_MSGUPGOOD", "%s bestand(en) is/zijn succesvol geupload.");
-define("TB_MSGUPBAD", "%s bestand(en) is/zijn niet geupload door beveilings problemen.");
-define("TB_MSGUPDUP", "%s files have not been uploaded, as they already exist - please delete or rename original file.");
-define("TB_MSGUPFAIL", "Bestand upload mislukt - controleer de rechten voor '%s'.");
-define("TB_MSGMAXSIZE", "Kan niet worden toegevoegd aan de wachtrij om het bestand te groot is");
-define("TB_TTLMAXSIZE", "Bestand is te groot");
-define("TB_DENIED", "Je bent niet bevoegd om deze pagina te bekijken.");
-define("TB_UPDENIED", "Je hebt upload rechten nodig om deze pagina te bekijken.");
-define("TB_EDDENIED", "Je hebt verwijder of aanpas rechten nodig om deze pagina te bekijken.");
-define("TB_FODENIED", "Je hebt folder maintenance rechten nodig om deze pagina te bekijken.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pl.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pl.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pl.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pl.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'en'
-Author: Maja Bielawa
-email: ivoryeve[at]wp[dot]pl
-*/
-		define("TB_BROWSE", "Przeglądaj");
-		define("TB_EDIT", "Operacje");
-		define("TB_UPLOAD", "Załaduj");
-		define("TB_FOLDERS", "Foldery");
-		define("TB_FOLDERNAME", "Nazwa Folderu");
-		define("TB_FOLDERCURR", "Bieżący folder: ");
- 		define("TB_FOLDERDEST", "Docelowy folder: ");
-		define("TB_VIEW", "Pokaż jako");
-		define("TB_SHOW", "Pokaż");
-		define("TB_PAGE", "Strona");
-		define("TB_FILENAME", "Nazwa Pliku");
-		define("TB_SIZE", "Rozmiar");
-		define("TB_DIMENSIONS", "Wymiary");
-		define("TB_TYPE", "Typ");
-		define("TB_DATE", "Data modyfikacji");
-		define("TB_SEARCH", "Szukaj");
-		define("TB_FILES", "Pliki");
-		define("TB_BROWSEFILES", "Przeglądaj pliki");
-		define("TB_DETAILS", "Szczegóły");
-		define("TB_THUMBS", "Miniatura");
-		define("TB_EDITFILES", "Edytuj pliki");
-		define("TB_ACTION", "Akcja");
-		define("TB_CREATE", "Stwórz");
-		define("TB_DELETE", "Usuń");
-		define("TB_RENAME", "Zmień nazwę");
-		define("TB_ROTATE", "Obróć");
-		define("TB_RESIZE", "Zmień rozmiar");
-		define("TB_MOVE", "Przenieś");
-		define("TB_UPLOADFILES", "Załaduj pliki");
-		define("TB_PROGRESS", "Postęp");
-		define("TB_REMOVE", "Usuń");
-		define("TB_BYTES", "bajtów");
-		define("TB_WIDTH", "szerokość");
-		define("TB_HEIGHT", "wysokość");
-		define("TB_NONE", "brak");
-		define("TB_TYPEIMG", "Obrazy");
-		define("TB_TYPEMEDIA", "Media");
-		define("TB_TYPEFILE", "Wszystkie pliki");
-		define("TB_ROTATECW", "Obróć o 90 stopni w prawo");
-		define("TB_ROTATECCW", "Obróć o 90 stopni w lewo");
-		define("TB_MSGNEWTHUMBS", "Stworzono %s nowych miniatur.");
-		define("TB_MSGMKDIR", "Katalog '%s' został utworzony.");
-		define("TB_MSGMKDIRFAIL", "Utworzenie katalogu '%s' jest niemożliwe.");
-		define("TB_MSGCREATE", "%s katalogów zostało poprawnie utworzonych.");
-		define("TB_MSGDELETE", "%s plików zostały skasowanych.");
-		define("TB_MSGRENAME", "Zmieniono nazwę %s plików.");
-		define("TB_MSGMOVE", "Przeniesiono poprawnie %s plików.");
-		define("TB_MSGRESIZE", "Zmieniono rozmiar %s obrazów.");
-		define("TB_MSGROTATE", "Obrócono %s obrazów.");
-		define("TB_MSGEDITERR", "Wystąpił problem podczas operacji na %s plikach.");
-		define("TB_MSGUPGOOD", "Załadowano %s plików.");
-		define("TB_MSGUPBAD", "Nie załadowano %s plików ze względu na ograniczenia związane z bezpieczeństwem.");
-		define("TB_MSGUPDUP", "%s plików nie zostało załadowanych, ponieważ pliki z takimi nazwami już istnieją. Skasuj lub zmień nazwę plikom na serwerze.");
-		define("TB_MSGUPFAIL", "Pliki nie mogą zostać załadowane, sprawdź katalog '%s'.");
-		define("TB_MSGMAXSIZE", "nie może zostac załadowany, ponieważ rozmiar przekracza ustalony limit");
-		define("TB_TTLMAXSIZE", "Błąd rozmaru pliku");
-		define("TB_DENIED", "Nie masz uprawnień, aby otworzyć tę zakładkę.");
-		define("TB_UPDENIED", "Dostęp zabroniony - włącz możliwość ładowania plików, aby zobaczyć tą zakładkę.");
-		define("TB_EDDENIED", "Dostęp zabroniony - włącz możliwość kasowania lub zmiany nazw plików, aby zobaczyć tą zakładkę.");
-		define("TB_FODENIED", "Dostęp zabroniony - włącz możliwość zarządzania folderami, aby zobaczyć tą zakładkę.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pt.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pt.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pt.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/pt.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.40 Beta 3 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'pt'
-Author: Francis Rebou�as e MEM
-email: francisreboucas[at]gmail[dot]com e talofo[at]gmail[dot]com
-*/
-		define("TB_BROWSE", "Procurar");
-		define("TB_EDIT", "Editar");
-		define("TB_UPLOAD", "Upload");
-		define("TB_FOLDERS", "Pastas");//new
- 		define("TB_FOLDERNAME", "Nome da Pasta");//new
-		define("TB_FOLDERCURR", "Pasta Actual: ");//new
- 		define("TB_FOLDERDEST", "Destino: ");//new
-		define("TB_VIEW", "Visualizar: ");
-		define("TB_SHOW", "Mostrar: ");
-		define("TB_PAGE", "P&aacute;gina");
-		define("TB_FILENAME", "Nome");
-		define("TB_SIZE", "Tam.");
-		define("TB_DIMENSIONS", "Dimens&otilde;es");
-		define("TB_TYPE", "Tipo");
-		define("TB_DATE", "Data de Cria&ccedil;&atilde;o");
-		define("TB_SEARCH", "Procurar");
-		define("TB_FILES", "arquivos");
-		define("TB_BROWSEFILES", "Lista de Arquivos");
-		define("TB_DETAILS", "Detalhes");
-		define("TB_THUMBS", "Miniaturas");
-		define("TB_EDITFILES", "Editar Arquivos");
-		define("TB_ACTION", "Ac&ccedil;&atilde;o");
- 		define("TB_CREATE", "Criar");//new
-		define("TB_DELETE", "Apagar");
-		define("TB_RENAME", "Renomear");
-		define("TB_ROTATE", "Rodar");
-		define("TB_RESIZE", "Redimencionar");
- 		define("TB_MOVE", "Mover");//new
-		define("TB_UPLOADFILES", "Enviar Arquivos");
-		define("TB_PROGRESS", "Progresso");
-		define("TB_REMOVE", "Remover");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "largura");
-		define("TB_HEIGHT", "altura");
-		define("TB_NONE", "Nenhum");
-		define("TB_TYPEIMG", "Imagens");
-		define("TB_TYPEMEDIA", "Medias");
-		define("TB_TYPEFILE", "Todos os arquivos");
-		define("TB_ROTATECW", "Rodar 90 graus no sentido hor&aacute;rio");
-		define("TB_ROTATECCW", "Rodar 90 graus no sentido anti-hor&aacute;rio");
-		define("TB_MSGNEWTHUMBS", "%s novas miniaturas foram geradas.");
-		define("TB_MSGMKDIR", "O diret&oacute;rio %s foi criado com sucesso.");
-		define("TB_MSGMKDIRFAIL", "Incapaz de criar o diret&oacute;rio %s - verifique as suas permiss&otilde;es.");
-		define("TB_MSGCREATE", "%s pasta(s) foram criadas com sucesso.");//new
-		define("TB_MSGDELETE", "%s arquivos foram exclu&iacute;dos com sucesso.");
-		define("TB_MSGRENAME", "%s arquivos foram renomeados com sucesso.");
-		define("TB_MSGMOVE", "%s ficheiro(s) foram movidos com sucesso.");//new
-		define("TB_MSGRESIZE", "%s imagens foram redimensionadas com sucesso.");
-		define("TB_MSGROTATE", "%s imagens foram rodadas com sucesso.");
-		define("TB_MSGEDITERR", "%s arquivos encontraram erros durante a opera&ccedil;&atilde;o solicitada.");
-		define("TB_MSGUPGOOD", "%s arquivos foram enviados com sucesso.");
-		define("TB_MSGUPBAD", "%s arquivos n&atilde;o foram enviados, devido a restri&ccedil;&otilde;es de seguran�a.");
- 		define("TB_MSGUPDUP", "%s ficheiro(s) n&atilde;o foram enviados para o servidor. Ficheiros com o mesmo nome j&aacute; existem. - apague or renomeie o ficheiro original.");
-		define("TB_MSGUPFAIL", "Falha no upload de arquivo - Seleccionou algum arquivo?");
-		define("TB_MSGMAXSIZE", "n&atilde;o pode ser colocado em fila para carregar quando o tamanho exceder o limite m&aacute;ximo de");
-		define("TB_TTLMAXSIZE", "Erro no tamanho do ficheiro");
-		define("TB_DENIED", "Voc&ecirc; necessita de permiss&atilde;o para aceder a esta p&aacute;gina.");
-		define("TB_UPDENIED", "Voc&ecirc; necessita de permiss&atilde;o de upload para aceder a esta p&aacute;gina.");
-		define("TB_EDDENIED", "Voc&ecirc; necessita de permiss&atilde;o de excluir ou editar para aceder a esta p&aacute;gina.");
- 		define("TB_FODENIED", "Voc&ecirc; necessita de permiss&atilde;o de acesso a pastas para ver esta p&aacute;gina.");//new
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/ru.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/ru.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/ru.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/ru.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.40 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'ru'
-Author: Bryn Jones
-email: bryn[at]lunarvis[dot]com
-*/
-		define("TB_BROWSE", "Обзор");
-		define("TB_EDIT", "Изменить");
-		define("TB_UPLOAD", "Загрузить");
-		define("TB_FOLDERS", "Каталоги");
-                define("TB_FOLDERNAME", "Имя каталога");
-		define("TB_FOLDERCURR", "Текущий каталог: ");
- 		define("TB_FOLDERDEST", "Каталог назначения: ");
-		define("TB_VIEW", "Показать как: ");
-		define("TB_SHOW", "Просмотр: ");
-		define("TB_PAGE", "Страница");
-		define("TB_FILENAME", "Имя файла");
-		define("TB_SIZE", "Объем");
-		define("TB_DIMENSIONS", "Размерность");
-		define("TB_TYPE", "Тип");
-		define("TB_DATE", "Дата изменения");
-		define("TB_SEARCH", "Поиск");
-		define("TB_FILES", "Файлы");
-		define("TB_BROWSEFILES", "Обзор файлов");
-		define("TB_DETAILS", "Детали");
-		define("TB_THUMBS", "Миниатюры");
-		define("TB_EDITFILES", "Изменить файлы");
-		define("TB_ACTION", "Действие");
-                define("TB_CREATE", "Создать");
-		define("TB_DELETE", "Удалить");
-		define("TB_RENAME", "Переименовать");
-		define("TB_ROTATE", "Повернуть");
-		define("TB_RESIZE", "Изменить размер");
-                define("TB_MOVE", "Переместить");
-		define("TB_UPLOADFILES", "Загрузка файлов");
-		define("TB_PROGRESS", "Выполнение");
-		define("TB_REMOVE", "Убрать");
-		define("TB_BYTES", "байт");
-		define("TB_WIDTH", "ширина");
-		define("TB_HEIGHT", "высота");
-		define("TB_NONE", "Ничего");
-		define("TB_TYPEIMG", "Изображения");
-		define("TB_TYPEMEDIA", "Медиа");
-		define("TB_TYPEFILE", "Все файлы");
-		define("TB_ROTATECW", "Повернуть на 90 градусов по часовой");
-		define("TB_ROTATECCW", "Повернуть на 90 градусов против часовой");
-		define("TB_MSGNEWTHUMBS", "Для %s новых изображений были созданы миниатюры.");
-                define("TB_MSGMKDIR", "'%s' каталог(ов) были успешно созданы.");
-		define("TB_MSGMKDIRFAIL", "Невозможно создать каталог '%s' - пожалуйста проверьте права доступа.");
-		define("TB_MSGCREATE", "%s каталог(ов) успешно создан(о).");
-		define("TB_MSGDELETE", "%s файл(ов)  успешно удалены.");
-		define("TB_MSGRENAME", "%s файл(ов) успешно переименованы.");
- 		define("TB_MSGMOVE", "%s файл(ов) успешно перемещены.");
-		define("TB_MSGRESIZE", "%s изображения были успешно изменены.");
-		define("TB_MSGROTATE", "%s изображения успешно повернуты.");
-		define("TB_MSGEDITERR", "%s файл(а) возникли ошибки во время требуемой операции.");
-		define("TB_MSGUPGOOD", "%s файл(а) были успешно загружены.");
-		define("TB_MSGUPBAD", "%s файл(а) не были загружены, не из-за ограничений безопасности.");
-		define("TB_MSGUPDUP", "%s файл(а) не были загружены, поскольку они уже существуют - пожалуйста удалите или переименуйте оригинальные файлы.");
-		define("TB_MSGUPFAIL", "Невозможно загрузить файлы - пожалуйста проверьте права доступа для '%s'.");
-		define("TB_MSGMAXSIZE", "не может быть поставлен в очередь для загрузки, поскольку размер превышает максимальный предел");
-		define("TB_TTLMAXSIZE", "Ошибка размера файла");
-		define("TB_DENIED", "Вам требуется разрешение для просмотра этой страницы.");
-		define("TB_UPDENIED", "Вам требуется разрешение на загрузку файлов.");
-		define("TB_EDDENIED", "Вам требуется разрешение на редактирования или удаление.");
- 		define("TB_FODENIED", "Вам требуется разрешение на управление каталогами.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sk.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sk.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sk.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sk.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,59 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.32 - A TinyMCE file browser (C) 2008  Bryn Jones
-Default Language 'en'
-Author: Bryn Jones
-email: bryn[at]lunarvis[dot]com
-*/
-		define("TB_BROWSE", "Prechádzať");
-		define("TB_EDIT", "Upraviť");
-		define("TB_UPLOAD", "Nahrať");
-		define("TB_VIEW", "Zobraziť ako: ");
-		define("TB_SHOW", "Ukázať: ");
-		define("TB_PAGE", "Strana");
-		define("TB_FILENAME", "Meno súboru");
-		define("TB_SIZE", "Veľkosť");
-		define("TB_DIMENSIONS", "Rozlíšenie");
-		define("TB_TYPE", "Typ");
-		define("TB_DATE", "Zmenené");
-		define("TB_SEARCH", "Hľadať");
-		define("TB_FILES", "Súbory");
-		define("TB_BROWSEFILES", "Prechádzať súbory");
-		define("TB_DETAILS", "Detaily");
-		define("TB_THUMBS", "Náhľady");
-		define("TB_EDITFILES", "Upraviť súbory");
-		define("TB_ACTION", "Akcia");
-		define("TB_DELETE", "Zmazať");
-		define("TB_RENAME", "Premenovať");
-		define("TB_ROTATE", "Otočiť");
-		define("TB_RESIZE", "Zmenšiť/zväčšiť");
-		define("TB_UPLOADFILES", "Nahrať súbory");
-		define("TB_PROGRESS", "Priebeh");
-		define("TB_REMOVE", "Odstrániť");
-		define("TB_BYTES", "bytov");
-		define("TB_WIDTH", "širka");
-		define("TB_HEIGHT", "výška");
-		define("TB_NONE", "Žiadny");
-		define("TB_TYPEIMG", "Obrázky");
-		define("TB_TYPEMEDIA", "Médiá");
-		define("TB_TYPEFILE", "Všetky súbory");
-		define("TB_ROTATECW", "Otočiť o 90° po smere hodinových ručičiek");
-		define("TB_ROTATECCW", "Otočiť o 90° proti smere hodinových ručičiek");
-		define("TB_MSGNEWTHUMBS", "%s nové náhľady obrázkov boli generované.");
-		define("TB_MSGMKDIR", "Priečinok '%s' bol úspešne vytvorený.");
-		define("TB_MSGMKDIRFAIL", "Nemôžem vytvoriť priečinok '%s', skontrolujte práva zápisu.");
-		define("TB_MSGDELETE", "%s súbory boli úspešne zmazané.");
-		define("TB_MSGRENAME", "%s súbory boli úspešne premenované.");
-		define("TB_MSGRESIZE", "%s súbory boli úspešne zmenšené/zväčšené.");
-		define("TB_MSGROTATE", "%s súbory boli úspešne otočené.");
-		define("TB_MSGEDITERR", "U '%s'vznikli problémy počas požadovanej operácie.");
-		define("TB_MSGUPGOOD", "%s boli úspešne nahrané.");
-		define("TB_MSGUPBAD", "%s súbory neboli úspešne nahrané, kôli bezpečnostným obmedzeniam.");
-		define("TB_MSGUPDUP", "%s súbory neboli úspešne nahrané, pretože existujú - premenujte ich alebo zmažte.");
-		define("TB_MSGUPFAIL", "Nahrávanie súboru zlyhalo - prosím skontrolujte povolenia pre zápis u '%s'.");
-		define("TB_MSGMAXSIZE", "nemôže byť označený pre upload, pretože jeho veľkosť presiahla limit");
-		define("TB_TTLMAXSIZE", "Chyba veľkosti súboru");
-		define("TB_DENIED", "Potrebujete práva pre zobrazenie tejto stránky.");
-		define("TB_UPDENIED", "Potrebujete práva na nahrávanie pre zobrazenie tejto stránky.");
-		define("TB_EDDENIED", "Potrebujete práva pre úpravy alebo mazanie pre zobrazenie tejto stránky.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sv.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sv.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sv.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/sv.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php 
-/*
-TinyBrowser 1.41 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'sv' - Swedish
-Author: Robin Morero
-email: robin[at]morero[dot]se
-*/
-		define("TB_BROWSE", "Bl&auml;ddra");
-		define("TB_EDIT", "Redigera");
-		define("TB_UPLOAD", "Ladda upp");
-		define("TB_FOLDERS", "Mappar");
- 		define("TB_FOLDERNAME", "Mappnamn");
-		define("TB_FOLDERCURR", "Aktuell mapp: ");
- 		define("TB_FOLDERDEST", "Destination: ");
-		define("TB_VIEW", "Visa som: ");
-		define("TB_SHOW", "Visa: ");
-		define("TB_PAGE", "Sida");
-		define("TB_FILENAME", "Filnamn");
-		define("TB_SIZE", "Storlek");
-		define("TB_DIMENSIONS", "Dimensioner");
-		define("TB_TYPE", "Typ");
-		define("TB_DATE", "Modifieringsdatum");
-		define("TB_SEARCH", "S&ouml;k");
-		define("TB_FILES", "Filer");
-		define("TB_BROWSEFILES", "Bl&auml;ddra bland filer");
-		define("TB_DETAILS", "Detaljer");
-		define("TB_THUMBS", "Miniatyrer");
-		define("TB_EDITFILES", "Redigera filer");
-		define("TB_ACTION", "Val: ");
- 		define("TB_CREATE", "Skapa");
-		define("TB_DELETE", "Radera");
-		define("TB_RENAME", "Byt namn");
-		define("TB_ROTATE", "Rotera");
-		define("TB_RESIZE", "&Auml;ndra storlek");
- 		define("TB_MOVE", "Flytta");
-		define("TB_UPLOADFILES", "Ladda upp filer");
-		define("TB_PROGRESS", "Status");
-		define("TB_REMOVE", "Radera");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "bredd");
-		define("TB_HEIGHT", "h&ouml;jd");
-		define("TB_NONE", "Ingen");
-		define("TB_TYPEIMG", "Bilder");
-		define("TB_TYPEMEDIA", "Media");
-		define("TB_TYPEFILE", "Alla Filer");
-		define("TB_ROTATECW", "Rotera 90 grader medurs");
-		define("TB_ROTATECCW", "Rotera 90 grader moturs");
-		define("TB_MSGNEWTHUMBS", "%s nya miniatyrer har skapats.");
-		define("TB_MSGMKDIR", "Mappen: '%s' har skapats.");
-		define("TB_MSGMKDIRFAIL", "Kunde inte skapa mappen: '%s' directory - kontrollera r&auml;ttigheter.");
-		define("TB_MSGCREATE", "%s mappar har skapats.");
-		define("TB_MSGDELETE", "%s filer har tagits bort.");
-		define("TB_MSGRENAME", "%s filer har d&ouml;pts om.");
- 		define("TB_MSGMOVE", "%s filer har flyttats.");
-		define("TB_MSGRESIZE", "Dimensioner har &auml;ndrats p&aring; %s bilder.");
-		define("TB_MSGROTATE", "%s har roterats.");
-		define("TB_MSGEDITERR", "Fel uppstod vid behandling av %s filer.");
-		define("TB_MSGUPGOOD", "%s filer har laddats upp.");
-		define("TB_MSGUPBAD", "P&aring; grund av s&auml;kerhetsrestriktioner kunde inte %s filer laddas upp..");
-		define("TB_MSGUPDUP", "%s filer laddades inte upp, d&aring; de redan finns - radera eller d&ouml;p om orginalfilerna.");
-		define("TB_MSGUPFAIL", "Filuppladdningen misslyckades - kontrollera r&auml;ttigheter till '%s' samt inst&auml;llningar i php.ini.");
-		define("TB_MSGMAXSIZE", "kan inte k&ouml;as f&ouml;r uppladdning d&aring; storleken &auml;r st&ouml;rre &auml;n maximalt till&aring;tet v&auml;rde p&aring;");
-		define("TB_TTLMAXSIZE", "Ogiltig filstorlek");
-		define("TB_DENIED", "R&auml;ttigheter kr&auml;vs f&ouml;r att visa sidan.");
-		define("TB_UPDENIED", "R&auml;ttigheter att ladda upp filer kr&auml;vs f&ouml;r att visa sidan.");
-		define("TB_EDDENIED", "R&auml;ttigheter att redigera/radera filer kr&auml;vs f&ouml;r att visa sidan.");
- 		define("TB_FODENIED", "R&auml;ttigheter att redigera mappar kr&auml;vs f&ouml;r att visa sidan.");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-cn.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-cn.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-cn.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-cn.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php
-/*
-TinyBrowser 1.40 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'zh-cn'
-Author: John Tam , Last update:2008/10/17
-email: jokytam168[at]gmail[dot]com
-*/
-		define("TB_BROWSE", "浏览");
-		define("TB_EDIT", "编辑");
-		define("TB_UPLOAD", "上传档案");
-		define("TB_FOLDERS", "资料夹");
- 		define("TB_FOLDERNAME", "资料夹名称");
-		define("TB_FOLDERCURR", "当前资料夹: ");
- 		define("TB_FOLDERDEST", "目的地资料夹: ");
-		define("TB_VIEW", "排列图示依: ");
-		define("TB_SHOW", "展示: ");
-		define("TB_PAGE", "页");
-		define("TB_FILENAME", "档案名称");
-		define("TB_SIZE", "档案大小");
-		define("TB_DIMENSIONS", "尺寸");
-		define("TB_TYPE", "种类");
-		define("TB_DATE", "修改日期");
-		define("TB_SEARCH", "搜寻");
-		define("TB_FILES", "档案");
-		define("TB_BROWSEFILES", "档案浏览");
-		define("TB_DETAILS", "详细资料");
-		define("TB_THUMBS", "缩图");
-		define("TB_EDITFILES", "编辑档案");
-		define("TB_ACTION", "动作: ");
- 		define("TB_CREATE", "建立");
-		define("TB_DELETE", "删除");
-		define("TB_RENAME", "更名档案");
-		define("TB_ROTATE", "旋转图片");
-		define("TB_RESIZE", "调整大小");
- 		define("TB_MOVE", "移动档案");
-		define("TB_UPLOADFILES", "上传档案");
-		define("TB_PROGRESS", "上传进度");
-		define("TB_REMOVE", "移除");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "宽度");
-		define("TB_HEIGHT", "高度");
-		define("TB_NONE", "保持原状");
-		define("TB_TYPEIMG", "图片档案");
-		define("TB_TYPEMEDIA", "多媒体档案");
-		define("TB_TYPEFILE", "其他档案");
-		define("TB_ROTATECW", "顺时针旋转90度");
-		define("TB_ROTATECCW", "逆时针旋转90度");
-		define("TB_MSGNEWTHUMBS", "图片 %s 的缩图成功产生！");
-		define("TB_MSGMKDIR", "资料夹 %s 成功建立！");
-		define("TB_MSGMKDIRFAIL", "无法建立资料夹 %s ，请检查资料夹写入权限");
-		define("TB_MSGCREATE", "建立资料夹 %s 成功！");
-		define("TB_MSGDELETE", "删除 %s 笔档案完成");
-		define("TB_MSGRENAME", "档案 %s 更名完成");
- 		define("TB_MSGMOVE", "档案 %s 移动完成");
-		define("TB_MSGRESIZE", "图片 %s 调整大小完成");
-		define("TB_MSGROTATE", "图片 %s 旋转完成");
-		define("TB_MSGEDITERR", "在进行操作时，档案 %s 遭遇错误，无法进行您的要求！");
-		define("TB_MSGUPGOOD", "上传 %s 笔档案完成");
-		define("TB_MSGUPBAD", "由于写入权限及安全性问题，档案 %s 无法上传");
-		define("TB_MSGUPDUP", "档案 %s 无法更新，已存同样档名的档案，请先将同样档名的资料删除或更名");
-		define("TB_MSGUPFAIL", "档案 '%s' 上传失败，请检查档案的写入权限");
-		define("TB_MSGMAXSIZE", "已超过系统档案大小限制，无法再加入上传等待区，系统限制为");
-		define("TB_TTLMAXSIZE", "档案大小错误");
-		define("TB_DENIED", "您没有权限操作本项功能");
-		define("TB_UPDENIED", "您没有上传档案的权限");
-		define("TB_EDDENIED", "您没有修改及删除档案的权限");
- 		define("TB_FODENIED", "您没有建立及修改资料夹的权限");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-tw.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-tw.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-tw.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/langs/zh-tw.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,68 +1,4 @@
-<?php
-/*
-TinyBrowser 1.40 - A TinyMCE file browser (C) 2008  Bryn Jones
-Language 'zh-tw'
-Author: John Tam , Last update:2008/10/17
-email: jokytam168[at]gmail[dot]com
-*/
-		define("TB_BROWSE", "瀏覽");
-		define("TB_EDIT", "編輯");
-		define("TB_UPLOAD", "上傳檔案");
-		define("TB_FOLDERS", "資料夾");
- 		define("TB_FOLDERNAME", "資料夾名稱");
-		define("TB_FOLDERCURR", "當前資料夾: ");
- 		define("TB_FOLDERDEST", "目的地資料夾: ");
-		define("TB_VIEW", "排列圖示依: ");
-		define("TB_SHOW", "展示: ");
-		define("TB_PAGE", "頁");
-		define("TB_FILENAME", "檔案名稱");
-		define("TB_SIZE", "檔案大小");
-		define("TB_DIMENSIONS", "尺寸");
-		define("TB_TYPE", "種類");
-		define("TB_DATE", "修改日期");
-		define("TB_SEARCH", "搜尋");
-		define("TB_FILES", "檔案");
-		define("TB_BROWSEFILES", "檔案瀏覽");
-		define("TB_DETAILS", "詳細資料");
-		define("TB_THUMBS", "縮圖");
-		define("TB_EDITFILES", "編輯檔案");
-		define("TB_ACTION", "動作: ");
- 		define("TB_CREATE", "建立");
-		define("TB_DELETE", "刪除");
-		define("TB_RENAME", "更名檔案");
-		define("TB_ROTATE", "旋轉圖片");
-		define("TB_RESIZE", "調整大小");
- 		define("TB_MOVE", "移動檔案");
-		define("TB_UPLOADFILES", "上傳檔案");
-		define("TB_PROGRESS", "上傳進度");
-		define("TB_REMOVE", "移除");
-		define("TB_BYTES", "bytes");
-		define("TB_WIDTH", "寬度");
-		define("TB_HEIGHT", "高度");
-		define("TB_NONE", "保持原狀");
-		define("TB_TYPEIMG", "圖片檔案");
-		define("TB_TYPEMEDIA", "多媒體檔案");
-		define("TB_TYPEFILE", "其他檔案");
-		define("TB_ROTATECW", "順時針旋轉90度");
-		define("TB_ROTATECCW", "逆時針旋轉90度");
-		define("TB_MSGNEWTHUMBS", "圖片 %s 的縮圖成功產生！");
-		define("TB_MSGMKDIR", "資料夾 %s 成功建立！");
-		define("TB_MSGMKDIRFAIL", "無法建立資料夾 %s ，請檢查資料夾寫入權限");
-		define("TB_MSGCREATE", "建立資料夾 %s 成功！");
-		define("TB_MSGDELETE", "刪除 %s 筆檔案完成");
-		define("TB_MSGRENAME", "檔案 %s 更名完成");
- 		define("TB_MSGMOVE", "檔案 %s 移動完成");
-		define("TB_MSGRESIZE", "圖片 %s 調整大小完成");
-		define("TB_MSGROTATE", "圖片 %s 旋轉完成");
-		define("TB_MSGEDITERR", "在進行操作時，檔案 %s 遭遇錯誤，無法進行您的要求！");
-		define("TB_MSGUPGOOD", "上傳 %s 筆檔案完成");
-		define("TB_MSGUPBAD", "由於寫入權限及安全性問題，檔案 %s 無法上傳");
-		define("TB_MSGUPDUP", "檔案 %s 無法更新，已存同樣檔名的檔案，請先將同樣檔名的資料刪除或更名");
-		define("TB_MSGUPFAIL", "檔案 '%s' 上傳失敗，請檢查檔案的寫入權限");
-		define("TB_MSGMAXSIZE", "已超過系統檔案大小限制，無法再加入上傳等待區，系統限制為");
-		define("TB_TTLMAXSIZE", "檔案大小錯誤");
-		define("TB_DENIED", "您沒有權限操作本項功能");
-		define("TB_UPDENIED", "您沒有上傳檔案的權限");
-		define("TB_EDDENIED", "您沒有修改及刪除檔案的權限");
- 		define("TB_FODENIED", "您沒有建立及修改資料夾的權限");
-?>
\ No hay ningún carácter de nueva línea al final del fichero
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_standalone.js.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_standalone.js.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_standalone.js.php	2009-06-30 22:05:14.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_standalone.js.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,14 +1,4 @@
 <?php
-require_once("config_tinybrowser.php");
 
-$tbpath = pathinfo($_SERVER['SCRIPT_NAME']);
-$tbmain = $tbpath['dirname'].'/tinybrowser.php';
-?>
-
-function tinyBrowserPopUp(type,formelementid,folder) {
-   tburl = "<?php echo $tbmain; ?>" + "?type=" + type + "&feid=" + formelementid;
-   if (folder !== undefined) tburl += "&folder="+folder+"%2F";
-   newwindow=window.open(tburl,'tinybrowser','height=<?php echo $tinybrowser['window']['height']+15; ?>,width=<?php echo $tinybrowser['window']['width']+15; ?>,scrollbars=yes,resizable=yes');
-   if (window.focus) {newwindow.focus()}
-   return false;
-}
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,39 +1,4 @@
 <?php
-require_once("config_tinybrowser.php");
 
-$tbpath = pathinfo($_SERVER['SCRIPT_NAME']);
-$tbmain = $tbpath['dirname'].'/tinybrowser.php';
-?>
-
- function tinyBrowser (field_name, url, type, win) {
-
-    /* If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
-       the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
-       These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
-
-    var cmsURL = "<?php echo $tbmain; ?>";    // script URL - use an absolute path!
-    if (cmsURL.indexOf("?") < 0) {
-        //add the type as the only query parameter
-        cmsURL = cmsURL + "?type=" + type;
-    }
-    else {
-        //add the type as an additional query parameter
-        // (PHP session ID is now included if there is one at all)
-        cmsURL = cmsURL + "&type=" + type;
-    }
-
-    tinyMCE.activeEditor.windowManager.open({
-        file : cmsURL,
-        title : 'Tiny Browser',
-        width : <?php echo $tinybrowser['window']['width']; ?>, 
-        height : <?php echo $tinybrowser['window']['height']; ?>,
-        resizable : "yes",
-		  scrollbars : "yes",
-        inline : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
-        close_previous : "no"
-    }, {
-        window : win,
-        input : field_name
-    });
-    return false;
-  }
\ No hay ningún carácter de nueva línea al final del fichero
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tinybrowser.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tinybrowser.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tinybrowser.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tinybrowser.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,337 +1,4 @@
-<?php
-require_once('config_tinybrowser.php');
-// Set language
-if(isset($tinybrowser['language']) && file_exists('langs/'.$tinybrowser['language'].'.php'))
-	{
-	require_once('langs/'.$tinybrowser['language'].'.php'); 
-	}
-else
-	{
-	require_once('langs/en.php'); // Falls back to English
-	}
-require_once('fns_tinybrowser.php');
-
-// Check session, if it exists
-if(session_id() != '')
-	{
-	if(!isset($_SESSION[$tinybrowser['sessioncheck']]))
-		{
-		echo TB_DENIED;
-		exit;
-		}
-	}
-
-// Assign file operation variables
-$validtypes = array('image','media','file');
-$typenow = ((isset($_GET['type']) && in_array($_GET['type'],$validtypes)) ? $_GET['type'] : 'image');
-$standalone = ((isset($_GET['feid']) && $_GET['feid']!='') ? true : false);
-$foldernow = str_replace(array('../','..\\','./','.\\'),'',($tinybrowser['allowfolders'] && isset($_REQUEST['folder']) ? urldecode($_REQUEST['folder']) : ''));
-
-if($standalone)
-	{
-	$passfeid = '&feid='.$_GET['feid'];	
-	$rowhlightinit =  ' onload="rowHighlight();"';
-	}
-else
-	{
-	$passfeid = '';
-	$rowhlightinit =  '';	
-	}
-
-// Assign browsing options
-$sortbynow = (isset($_REQUEST['sortby']) ? $_REQUEST['sortby'] : $tinybrowser['order']['by']);
-$sorttypenow = (isset($_REQUEST['sorttype']) ? $_REQUEST['sorttype'] : $tinybrowser['order']['type']);
-$sorttypeflip = ($sorttypenow == 'asc' ? 'desc' : 'asc');  
-$viewtypenow = (isset($_REQUEST['viewtype']) ? $_REQUEST['viewtype'] : $tinybrowser['view']['image']);
-$findnow = (isset($_POST['find']) && !empty($_POST['find']) ? $_POST['find'] : false);
-$showpagenow = (isset($_REQUEST['showpage']) ? $_REQUEST['showpage'] : 0);
-
-// Assign url pass variables
-$passfolder = '&folder='.urlencode($foldernow);
-$passfeid = (isset($_GET['feid']) && $_GET['feid']!='' ? '&feid='.$_GET['feid'] : '');
-$passviewtype = '&viewtype='.$viewtypenow;
-$passsortby = '&sortby='.$sortbynow.'&sorttype='.$sorttypenow;
-
-// Assign view, thumbnail and link paths
-$browsepath = $tinybrowser['path'][$typenow].$foldernow;
-$linkpath = $tinybrowser['link'][$typenow].$foldernow;
-$thumbpath = $tinybrowser[$tinybrowser['thumbsrc']][$typenow].$foldernow;
-
-// Assign sort parameters for column header links
-$sortbyget = array();
-$sortbyget['name'] = '&viewtype='.$viewtypenow.'&sortby=name';
-$sortbyget['size'] = '&viewtype='.$viewtypenow.'&sortby=size'; 
-$sortbyget['type'] = '&viewtype='.$viewtypenow.'&sortby=type'; 
-$sortbyget['modified'] = '&viewtype='.$viewtypenow.'&sortby=modified';
-$sortbyget['dimensions'] = '&viewtype='.$viewtypenow.'&sortby=dimensions'; 
-$sortbyget[$sortbynow] .= '&sorttype='.$sorttypeflip;
-
-// Assign css style for current sort type column
-$thclass = array();
-$thclass['name'] = '';
-$thclass['size'] = ''; 
-$thclass['type'] = ''; 
-$thclass['modified'] = '';
-$thclass['dimensions'] = ''; 
-$thclass[$sortbynow] = ' class="'.$sorttypenow.'"';
-
-// Initalise alert array
-$notify = array(
-	'type' => array(),
-	'message' => array()
-);
-$newthumbqty = 0;
-
-// read folder contents if folder exists
-if(file_exists($tinybrowser['docroot'].$browsepath))
-	{
-	// Read directory contents and populate $file array
-	$dh = opendir($tinybrowser['docroot'].$browsepath);
-	$file = array();
-	while (($filename = readdir($dh)) !== false)
-		{
-		// get file extension
-		$nameparts = explode('.',$filename);
-		$ext = end($nameparts);
-
-		// filter directories and prohibited file types
-		if($filename != '.' && $filename != '..' && !is_dir($tinybrowser['docroot'].$browsepath.$filename) && !in_array($ext, $tinybrowser['prohibited']) && ($typenow == 'file' || strpos(strtolower($tinybrowser['filetype'][$typenow]),strtolower($ext))))
-			{
-			// search file name if search term entered
-			if($findnow) $exists = strpos(strtolower($filename),strtolower($findnow));
-	
-			// assign file details to array, for all files or those that match search
-			if(!$findnow || ($findnow && $exists !== false))
-				{
-				$file['name'][] = $filename;
-				$file['sortname'][] = strtolower($filename);
-				$file['modified'][] = filemtime($tinybrowser['docroot'].$browsepath.$filename);
-				$file['size'][] = filesize($tinybrowser['docroot'].$browsepath.$filename);
-	
-				// image specific info or general
-				if($typenow=='image' && $imginfo = getimagesize($tinybrowser['docroot'].$browsepath.$filename))
-					{
-					$file['width'][] = $imginfo[0];
-					$file['height'][] = $imginfo[1];
-					$file['dimensions'][] = $imginfo[0] + $imginfo[1];
-					$file['type'][] = $imginfo['mime'];
-					
-					// Check a thumbnail exists
-					if(!file_exists($tinybrowser['docroot'].$browsepath.'_thumbs/')) createfolder($tinybrowser['docroot'].$browsepath.'_thumbs/',$tinybrowser['unixpermissions']);
-			  		$thumbimg = $tinybrowser['docroot'].$browsepath.'_thumbs/_'.$filename;
-					if (!file_exists($thumbimg))
-						{
-						$nothumbimg = $tinybrowser['docroot'].$browsepath.$filename;
-						$mime = getimagesize($nothumbimg);
-						$im = convert_image($nothumbimg,$mime['mime']);
-						resizeimage($im,$tinybrowser['thumbsize'],$tinybrowser['thumbsize'],$thumbimg,$tinybrowser['thumbquality'],$mime['mime']);
-						imagedestroy($im);
-						$newthumbqty++;
-						}
-					}
-				else 
-					{
-					$file['width'][] = 'N/A';
-					$file['height'][] = 'N/A';
-					$file['dimensions'][] = 'N/A';
-					$file['type'][] = returnMIMEType($filename);
-					}
-				}			
-			}
-		}
-	closedir($dh);
-	}
-// create file upload folder
-else
-	{
-	$success = createfolder($tinybrowser['docroot'].$browsepath,$tinybrowser['unixpermissions']);
-	if($success)
-		{
-		if($typenow=='image') createfolder($tinybrowser['docroot'].$browsepath.'_thumbs/',$tinybrowser['unixpermissions']);
-		$notify['type'][]='success';
-		$notify['message'][]=sprintf(TB_MSGMKDIR, $browsepath);
-		}
-	else
-		{
-		$notify['type'][]='error';
-		$notify['message'][]=sprintf(TB_MSGMKDIRFAIL, $browsepath);
-		}
-	}
-	
-// Assign directory structure to array
-$browsedirs=array();
-dirtree($browsedirs,$tinybrowser['filetype'][$typenow],$tinybrowser['docroot'],$tinybrowser['path'][$typenow]);
-	
-// generate alert if new thumbnails created
-if($newthumbqty>0)
-   {
-	$notify['type'][]='info';
-	$notify['message'][]=sprintf(TB_MSGNEWTHUMBS, $newthumbqty);
-	}
-	
-
-// determine sort order
-$sortorder = ($sorttypenow == 'asc' ? SORT_ASC : SORT_DESC);
-$num_of_files = (isset($file['name']) ? count($file['name']) : 0);
-
-if($num_of_files>0)
-	{
-	// sort files by selected order
-	sortfileorder($sortbynow,$sortorder,$file);
-	}
-
-// determine pagination
-if($tinybrowser['pagination']>0)
-	{
-	$showpage_start = ($showpagenow ? ($_REQUEST['showpage']*$tinybrowser['pagination'])-$tinybrowser['pagination'] : 0);
-	$showpage_end = $showpage_start+$tinybrowser['pagination'];
-	if($showpage_end>$num_of_files) $showpage_end = $num_of_files;
-	}
-else
-	{
-	$showpage_start = 0;
-	$showpage_end = $num_of_files;
-	}
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>TinyBrowser :: <?php echo TB_BROWSE; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Pragma" content="no-cache" />
-<?php
-if(!$standalone && $tinybrowser['integration']=='tinymce')
-	{
-	?><script language="javascript" type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<link rel="stylesheet" type="text/css" media="all" href="<?php echo $tinybrowser['tinymcecss']; ?>" /><?php
-	}
-else
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="css/stylefull_tinybrowser.css" /><?php 
-	}
-?>
-<link rel="stylesheet" type="text/css" media="all" href="css/style_tinybrowser.css.php" />
-<script language="javascript" type="text/javascript" src="js/tinybrowser.js.php?<?php echo substr($passfeid,1); ?>"></script>
-</head>
-<body<?php echo $rowhlightinit; ?>>
-<?php
-if(count($notify['type'])>0) alert($notify);
-form_open('foldertab',false,'tinybrowser.php','?type='.$typenow.$passviewtype.$passsortby.$passfeid);
-?>
-<div class="tabs">
-<ul>
-<li id="browse_tab" class="current"><span><a href="tinybrowser.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_BROWSE; ?></a></span></li><?php
-if($tinybrowser['allowupload']) 
-	{
-	?><li id="upload_tab"><span><a href="upload.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_UPLOAD; ?></a></span></li><?php
-	}
-if($tinybrowser['allowedit'] || $tinybrowser['allowdelete'])
-	{
-	?><li id="edit_tab"><span><a href="edit.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_EDIT; ?></a></span></li><?php
-	}
-if($tinybrowser['allowfolders'])
-	{
-	?><li id="folders_tab"><span><a href="folders.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_FOLDERS; ?></a></span></li><?php
-	}
-// Display folder select, if multiple exist
-if(count($browsedirs)>1)
-	{
-	?><li id="folder_tab" class="right"><span><?php
-	form_select($browsedirs,'folder',TB_FOLDERCURR,urlencode($foldernow),true);
-	?></span></li><?php
-	} 
-?>
-</ul>
-</div>
-</form>
-<div class="panel_wrapper">
-<div id="general_panel" class="panel currentmod">
-<fieldset>
-<legend><?php echo TB_BROWSEFILES; ?></legend>
-<?php
-form_open('browse','custom','tinybrowser.php','?type='.$typenow.$passfolder.$passfeid);
-?>
-<div class="pushleft">
-<?php
-
-// Offer view type if file type is image
-if($typenow=='image')
-	{
-	$select = array(
-		array('thumb',TB_THUMBS),
-		array('detail',TB_DETAILS)
-	);
-	form_select($select,'viewtype',TB_VIEW,$viewtypenow,true);
-	}
-	
-// Show page select if pagination is set
-if($tinybrowser['pagination']>0)
-	{
-	$pagelimit = ceil($num_of_files/$tinybrowser['pagination'])+1;
-	$page = array();
-	for($i=1;$i<$pagelimit;$i++)
-		{
-		$page[] = array($i,TB_PAGE.' '.$i);
-		}
-	if($i>2) form_select($page,'showpage',TB_SHOW,$showpagenow,true);
-	}
-?></div><div class="pushright"><?php
-
-form_hidden_input('sortby',$sortbynow);
-form_hidden_input('sorttype',$sorttypenow);
-form_text_input('find',false,$findnow,25,50);
-form_submit_button('search',TB_SEARCH,'');
-
-?></div>
-<?php
-
-// if image show dimensions header
-if($typenow=='image')
-	{
-	$imagehead = '<th><a href="?type='.$typenow.$passfolder.$passfeid.$sortbyget['dimensions'].'"'.$thclass['dimensions'].'>'.TB_DIMENSIONS.'</a></th>';
-	}
-else $imagehead = '';
-
-echo '<div class="tabularwrapper"><table class="browse">'
-		.'<tr><th><a href="?type='.$typenow.$passfolder.$passfeid.$sortbyget['name'].'"'.$thclass['name'].'>'.TB_FILENAME.'</a></th>'
-		.'<th><a href="?type='.$typenow.$passfolder.$passfeid.$sortbyget['size'].'"'.$thclass['size'].'>'.TB_SIZE.'</a></th>'
-		.$imagehead
-		.'<th><a href="?type='.$typenow.$passfolder.$passfeid.$sortbyget['type'].'"'.$thclass['type'].'>'.TB_TYPE.'</th>'
-		.'<th><a href="?type='.$typenow.$passfolder.$passfeid.$sortbyget['modified'].'"'.$thclass['modified'].'>'.TB_DATE.'</th></tr>';
-
-// show image thumbnails, unless detail view is selected
-if($typenow=='image' && $viewtypenow != 'detail')
-	{
-	echo '</table></div>';
-
-	for($i=$showpage_start;$i<$showpage_end;$i++)
-		{
-		echo '<div class="img-browser"><a href="#" onclick="selectURL(\''.$linkpath.$file['name'][$i].'\');" title="'.TB_FILENAME.': '.$file['name'][$i]
-				.'&#13;&#10;'.TB_DIMENSIONS.': '.$file['width'][$i].' x '.$file['height'][$i]
-				.'&#13;&#10;'.TB_DATE.': '.date($tinybrowser['dateformat'],$file['modified'][$i])
-				.'&#13;&#10;'.TB_TYPE.': '.$file['type'][$i]
-				.'&#13;&#10;'.TB_SIZE.': '.bytestostring($file['size'][$i],1)
-				.'"><img src="'.$thumbpath.'_thumbs/_'.$file['name'][$i]
-				.'"  /><div class="filename">'.$file['name'][$i].'</div></a></div>';
-		}
-	}
-else
-	{
-	for($i=$showpage_start;$i<$showpage_end;$i++)
-		{
-		$alt = (IsOdd($i) ? 'r1' : 'r0');
-		echo '<tr class="'.$alt.'">';
-		if($typenow=='image') echo '<td><a class="imghover" href="#" onclick="selectURL(\''.$linkpath.$file['name'][$i].'\');" title="'.$file['name'][$i].'"><img src="'.$thumbpath.'_thumbs/_'.$file['name'][$i].'" alt="" />'.truncate_text($file['name'][$i],30).'</a></td>';
-		else echo '<td><a href="#" onclick="selectURL(\''.$linkpath.$file['name'][$i].'\');" title="'.$file['name'][$i].'">'.truncate_text($file['name'][$i],30).'</a></td>';
-		echo '<td>'.bytestostring($file['size'][$i],1).'</td>';
-		if($typenow=='image') echo '<td>'.$file['width'][$i].' x '.$file['height'][$i].'</td>';	
-		echo '<td>'.$file['type'][$i].'</td>'
-			.'<td>'.date($tinybrowser['dateformat'],$file['modified'][$i]).'</td></tr>'."\n";
-		}
-	echo '</table></div>';
-	}
-?>
-</fieldset></div></div>
-<form name="passform"><input name = "fileurl" type="hidden" value= "" /></form>
-</body>
-</html>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_file.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_file.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_file.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_file.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,40 +1,4 @@
-<?php
-require_once('config_tinybrowser.php');
-require_once('fns_tinybrowser.php');
-
-// Check session, if it exists
-if(session_id() != '')
-	{
-	if(!isset($_SESSION[$tinybrowser['sessioncheck']])) { echo 'Error!'; exit; }
-	}
-	
-// Check hash is correct (workaround for Flash session bug, to stop external form posting)
-if($_GET['obfuscate'] != md5($_SERVER['DOCUMENT_ROOT'].$tinybrowser['obfuscate'])) { echo 'Error!'; exit; } 
-
-// Check  and assign get variables
-if(isset($_GET['type'])) { $typenow = $_GET['type']; } else { echo 'Error!'; exit; } 
-if(isset($_GET['folder'])) { $dest_folder = urldecode($_GET['folder']); } else { echo 'Error!'; exit; } 
-
-// Check file extension isn't prohibited
-$nameparts = explode('.',$_FILES['Filedata']['name']);
-$ext = end($nameparts);
-
-if(!validateExtension($ext, $tinybrowser['prohibited'])) { echo 'Error!'; exit; } 
-
-// Check file data
-if ($_FILES['Filedata']['tmp_name'] && $_FILES['Filedata']['name'])
-	{	
-	$source_file = $_FILES['Filedata']['tmp_name'];
-	$file_name = stripslashes($_FILES['Filedata']['name']);
-	if($tinybrowser['cleanfilename']) $file_name = clean_filename($file_name);
-	if(is_dir($tinybrowser['docroot'].$dest_folder))
-		{
-		$success = copy($source_file,$tinybrowser['docroot'].$dest_folder.'/'.$file_name.'_');
-		}
-	if($success)
-		{
-		header('HTTP/1.1 200 OK'); //  if this doesn't work for you, try header('HTTP/1.1 201 Created');
-		?><html><head><title>File Upload Success</title></head><body>File Upload Success</body></html><?php
-		}
-	}		
-?>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,177 +1,4 @@
 <?php
-require_once('config_tinybrowser.php');
-// Set language
-if(isset($tinybrowser['language']) && file_exists('langs/'.$tinybrowser['language'].'.php'))
-	{
-	require_once('langs/'.$tinybrowser['language'].'.php'); 
-	}
-else
-	{
-	require_once('langs/en.php'); // Falls back to English
-	}
-require_once('fns_tinybrowser.php');
 
-// Check session, if it exists
-if(session_id() != '')
-	{
-	if(!isset($_SESSION[$tinybrowser['sessioncheck']]))
-		{
-		echo TB_DENIED;
-		exit;
-		}
-	}
-
-if(!$tinybrowser['allowupload'])
-	{
-	echo TB_UPDENIED;
-	exit;
-	}
-
-// Assign get variables
-$validtypes = array('image','media','file');
-$typenow = ((isset($_GET['type']) && in_array($_GET['type'],$validtypes)) ? $_GET['type'] : 'image');
-$foldernow = str_replace(array('../','..\\','./','.\\'),'',($tinybrowser['allowfolders'] && isset($_REQUEST['folder']) ? urldecode($_REQUEST['folder']) : ''));
-$passfolder = '&folder='.urlencode($foldernow);
-$passfeid = (isset($_GET['feid']) && $_GET['feid']!='' ? '&feid='.$_GET['feid'] : '');
-$passupfeid = (isset($_GET['feid']) && $_GET['feid']!='' ? $_GET['feid'] : '');
-
-// Assign upload path
-$uploadpath = urlencode($tinybrowser['path'][$typenow].$foldernow);
-
-// Assign directory structure to array
-$uploaddirs=array();
-dirtree($uploaddirs,$tinybrowser['filetype'][$typenow],$tinybrowser['docroot'],$tinybrowser['path'][$typenow]);
-
-// determine file dialog file types
-switch ($_GET['type'])
-	{
-	case 'image':
-		$filestr = TB_TYPEIMG;
-		break;
-	case 'media':
-		$filestr = TB_TYPEMEDIA;
-		break;
-	case 'file':
-		$filestr = TB_TYPEFILE;
-		break;
-	}
-$fileexts = str_replace(",",";",$tinybrowser['filetype'][$_GET['type']]);
-$filelist = $filestr.' ('.$tinybrowser['filetype'][$_GET['type']].')';
-
-// Initalise alert array
-$notify = array(
-	'type' => array(),
-	'message' => array()
-);
-$goodqty = (isset($_GET['goodfiles']) ? $_GET['goodfiles'] : 0);
-$badqty = (isset($_GET['badfiles']) ? $_GET['badfiles'] : 0);
-$dupqty = (isset($_GET['dupfiles']) ? $_GET['dupfiles'] : 0);
-
-if($goodqty>0)
-	{
-	$notify['type'][]='success';
-	$notify['message'][]=sprintf(TB_MSGUPGOOD, $goodqty);
-	}
-if($badqty>0)
-	{
-	$notify['type'][]='failure';
-	$notify['message'][]=sprintf(TB_MSGUPBAD, $badqty);
-	}
-if($dupqty>0)
-	{
-	$notify['type'][]='failure';
-	$notify['message'][]=sprintf(TB_MSGUPDUP, $dupqty);
-	}
-if(isset($_GET['permerror']))
-	{
-	$notify['type'][]='failure';
-	$notify['message'][]=sprintf(TB_MSGUPFAIL, $tinybrowser['docroot'].$tinybrowser['path'][$typenow]);
-	}
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title>TinyBrowser :: <?php echo TB_UPLOAD; ?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta http-equiv="Pragma" content="no-cache" />
-<?php
-if($passfeid == '' && $tinybrowser['integration']=='tinymce')
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="<?php echo $tinybrowser['tinymcecss']; ?>" /><?php 
-	}
-else
-	{
-	?><link rel="stylesheet" type="text/css" media="all" href="css/stylefull_tinybrowser.css" /><?php 
-	}
-?>
-<link rel="stylesheet" type="text/css" media="all" href="css/style_tinybrowser.css.php" />
-<script type="text/javascript" src="js/swfobject.js"></script>
-<script type="text/javascript">
-function uploadComplete(url) {
-document.location = url;
-}
-</script>
-</head>
-<body onload='
-      var so = new SWFObject("flexupload.swf", "mymovie", "100%", "340", "9", "#ffffff");
-      so.addVariable("folder", "<?php echo $uploadpath; ?>");
-      so.addVariable("uptype", "<?php echo $typenow; ?>");
-      so.addVariable("destid", "<?php echo $passupfeid; ?>");
-      so.addVariable("maxsize", "<?php echo $tinybrowser['maxsize'][$_GET['type']]; ?>");
-      so.addVariable("sessid", "<?php echo session_id(); ?>");
-      so.addVariable("obfus", "<?php echo md5($_SERVER['DOCUMENT_ROOT'].$tinybrowser['obfuscate']); ?>");
-      so.addVariable("filenames", "<?php echo $filelist; ?>");
-      so.addVariable("extensions", "<?php echo $fileexts; ?>");
-      so.addVariable("filenamelbl", "<?php echo TB_FILENAME; ?>");
-      so.addVariable("sizelbl", "<?php echo TB_SIZE; ?>");
-      so.addVariable("typelbl", "<?php echo TB_TYPE; ?>");
-      so.addVariable("progresslbl", "<?php echo TB_PROGRESS; ?>");
-      so.addVariable("browselbl", "<?php echo TB_BROWSE; ?>");
-      so.addVariable("removelbl", "<?php echo TB_REMOVE; ?>");
-      so.addVariable("uploadlbl", "<?php echo TB_UPLOAD; ?>");
-      so.addVariable("uplimitmsg", "<?php echo TB_MSGMAXSIZE; ?>");
-      so.addVariable("uplimitlbl", "<?php echo TB_TTLMAXSIZE; ?>");
-      so.addVariable("uplimitbyte", "<?php echo TB_BYTES; ?>");
-      so.addParam("allowScriptAccess", "always");
-      so.addParam("type", "application/x-shockwave-flash");
-      so.write("flashcontent");'>
-<?php
-if(count($notify['type'])>0) alert($notify);
-form_open('foldertab',false,'upload.php','?type='.$typenow.$passfeid);
-?>
-<div class="tabs">
-<ul>
-<li id="browse_tab"><span><a href="tinybrowser.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_BROWSE; ?></a></span></li>
-<li id="upload_tab" class="current"><span><a href="upload.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_UPLOAD; ?></a></span></li>
-<?php
-if($tinybrowser['allowedit'] || $tinybrowser['allowdelete'])
-	{
-	?><li id="edit_tab"><span><a href="edit.php?type=<?php echo $typenow.$passfolder.$passfeid ; ?>"><?php echo TB_EDIT; ?></a></span></li>
-	<?php 
-	}
-if($tinybrowser['allowfolders'])
-	{
-	?><li id="folders_tab"><span><a href="folders.php?type=<?php echo $typenow.$passfolder.$passfeid; ?>"><?php echo TB_FOLDERS; ?></a></span></li><?php
-	}
-// Display folder select, if multiple exist
-if(count($uploaddirs)>1)
-	{
-	?><li id="folder_tab" class="right"><span><?php
-	form_select($uploaddirs,'folder',TB_FOLDERCURR,urlencode($foldernow),true);
-	?></span></li><?php
-	}
-?>
-</ul>
-</div>
-</form>
-<div class="panel_wrapper">
-<div id="general_panel" class="panel currentmod">
-<fieldset>
-<legend><?php echo TB_UPLOADFILES; ?></legend>
-<?php
-
-?>
-    <div id="flashcontent"></div>
-</fieldset></div></div>
-</body>
-</html>
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_process.php 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_process.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_process.php	2009-06-30 22:05:16.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/upload_process.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,99 +1,4 @@
-<?php
-require_once('config_tinybrowser.php');
-require_once('fns_tinybrowser.php');
-
-// delay script if set
-if($tinybrowser['delayprocess']>0) sleep($tinybrowser['delayprocess']);
-
-// Initialise files array and error vars
-$files = array();
-$good = 0;
-$bad = 0;
-$dup = 0;
-$total = (isset($_GET['filetotal']) ? $_GET['filetotal'] : 0);
-
-
-// Assign get variables
-$folder = $tinybrowser['docroot'].urldecode($_GET['folder']);
-$foldernow = urlencode(str_replace($tinybrowser['path'][$_GET['type']],'',urldecode($_GET['folder'])));
-$passfeid = (isset($_GET['feid']) ? '&feid='.$_GET['feid'] : '');
-
-if ($handle = opendir($folder))
-	{
-	while (false !== ($file = readdir($handle)))
-		{
-		if ($file != "." && $file != ".." && substr($file,-1)=='_')
-			{
-			//-- File Naming
-			$tmp_filename = $folder.$file;
-			$dest_filename	 = $folder.rtrim($file,'_');
-        
-			//-- Duplicate Files
-			if(file_exists($dest_filename)) { unlink($tmp_filename); $dup++; continue; }
-
-			//-- Bad extensions
-			$nameparts = explode('.',$dest_filename);
-			$ext = end($nameparts);
-			
-			if(!validateExtension($ext, $tinybrowser['prohibited'])) { unlink($tmp_filename); continue; }
-        
-			//-- Rename temp file to dest file
-			rename($tmp_filename, $dest_filename);
-			$good++;
-			
-			//-- if image, perform additional processing
-			if($_GET['type']=='image')
-				{
-				//-- Good mime-types
-				$imginfo = getimagesize($dest_filename);
-	   		if($imginfo === false) { unlink($dest_filename); continue; }
-				$mime = $imginfo['mime'];
-
-				// resize image to maximum height and width, if set
-				if($tinybrowser['imageresize']['width'] > 0 || $tinybrowser['imageresize']['height'] > 0)
-					{
-					// assign new width and height values, only if they are less than existing image size
-					$widthnew  = ($tinybrowser['imageresize']['width'] > 0 && $tinybrowser['imageresize']['width'] < $imginfo[0] ? $tinybrowser['imageresize']['width'] : $imginfo[0]);
-					$heightnew = ($tinybrowser['imageresize']['height'] > 0 && $tinybrowser['imageresize']['height'] < $imginfo[1] ? $tinybrowser['imageresize']['height'] :  $imginfo[1]);
-
-					// only resize if width or height values are different
-					if($widthnew != $imginfo[0] || $heightnew != $imginfo[1])
-						{
-						$im = convert_image($dest_filename,$mime);
-						resizeimage($im,$widthnew,$heightnew,$dest_filename,$tinybrowser['imagequality'],$mime);
-						imagedestroy($im);
-						}
-					}
-
-				// generate thumbnail
-				$thumbimg = $folder.'_thumbs/_'.rtrim($file,'_');
-				if (!file_exists($thumbimg))
-					{
-					$im = convert_image($dest_filename,$mime);
-					resizeimage	($im,$tinybrowser['thumbsize'],$tinybrowser['thumbsize'],$thumbimg,$tinybrowser['thumbquality'],$mime);
-					imagedestroy ($im);
-					}
-				}
-
-      	}
-		}
-	closedir($handle);
-	}
-$bad = $total-($good+$dup);
-
-// Check for problem during upload
-if($total>0 && $bad==$total) Header('Location: ./upload.php?type='.$_GET['type'].$passfeid.'&permerror=1&total='.$total);
-else Header('Location: ./upload.php?type='.$_GET['type'].$passfeid.'&folder='.$foldernow.'&badfiles='.$bad.'&goodfiles='.$good.'&dupfiles='.$dup);
-?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="Pragma" content="no-cache" />
-		<title>TinyBrowser :: Process Upload</title>
-	</head>
-	<body>
-		<p>Sorry, there was an error processing file uploads.</p>
-	</body>
-</html>
+<?php
+
+// no direct access
+defined('_JEXEC') or die('Restricted access');
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/js/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/langs/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/langs/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/langs/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/langs/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/default/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/index.html 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/index.html
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/index.html	1970-01-01 01:00:00.000000000 +0100
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/index.html	2009-07-23 04:30:26.000000000 +0200
@@ -0,0 +1 @@
+<html><body bgcolor="#FFFFFF"></body></html>
\ No hay ningún carácter de nueva línea al final del fichero
diff -aruN --binary 1/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php 2/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php
--- 1/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php	2009-06-30 22:01:34.000000000 +0200
+++ 2/plugins/editors/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php	2009-07-23 04:25:36.000000000 +0200
@@ -10,8 +10,6 @@
  * Notice: This script defaults the button_tile_map option to true for extra performance.
  */
 
-	defined('_JEXEC') or die('Restricted access');
-
 	// Set the error reporting to minimal.
 	@error_reporting(E_ERROR | E_WARNING | E_PARSE);
 
diff -aruN --binary 1/plugins/editors/tinymce.php 2/plugins/editors/tinymce.php
--- 1/plugins/editors/tinymce.php	2009-06-30 22:01:34.000000000 +0200
+++ 2/plugins/editors/tinymce.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: tinymce.php 12354 2009-06-24 14:38:24Z ian $
+ * @version		$Id: tinymce.php 12543 2009-07-23 01:47:21Z ian $
  * @package		Joomla
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -322,14 +322,6 @@
 			$buttons4[]	= 'template';
 		}
 
-		// tinybrowser
-		$tinybrowser	= $this->params->def( 'tinybrowser', 1 );
-		if ( $tinybrowser ) {
-			$file_browser_callback	= "file_browser_callback : \"tinyBrowser\",";
-		} else {
-			$file_browser_callback	= "";
-		}
-
 		// advimage
 		$advimage = $this->params->def( 'advimage', 1 );
 		if ( $advimage ) {
@@ -535,10 +527,6 @@
 				}
 				});
 				</script>";
-				if ( $tinybrowser ) {
-					$return .="\t<script type=\"text/javascript\" src=\"".JURI::root()."plugins/editors/tinymce/jscripts/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php\"></script>\n";
-					setcookie('tinybrowser_lang', $langPrefix, 0, "/");
-				}
 		  break;
 		}
 
diff -aruN --binary 1/plugins/editors/tinymce.xml 2/plugins/editors/tinymce.xml
--- 1/plugins/editors/tinymce.xml	2009-06-30 22:01:34.000000000 +0200
+++ 2/plugins/editors/tinymce.xml	2009-07-23 04:25:36.000000000 +0200
@@ -167,10 +167,6 @@
  			<option value="1">Show</option>
  		</param>
  		<param name="@spacer" type="spacer" default="" label="" description="" />
- 		<param name="tinybrowser" type="radio" default="1" label="Tinybrowser" description="Turn on/off Tinybrowser for images/links">
- 			<option value="0">Off</option>
- 			<option value="1">On</option>
- 		</param>
  		<param name="advimage" type="radio" default="1" label="Advanced image" description="Turn on/off a more advanced image dialog">
  			<option value="0">Off</option>
  			<option value="1">On</option>
diff -aruN --binary 1/plugins/editors-xtd/image.php 2/plugins/editors-xtd/image.php
--- 1/plugins/editors-xtd/image.php	2009-05-29 14:52:04.000000000 +0200
+++ 2/plugins/editors-xtd/image.php	2009-07-23 04:25:36.000000000 +0200
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version		$Id: image.php 11784 2009-04-24 17:34:11Z kdevine $
+ * @version		$Id: image.php 12542 2009-07-22 17:40:48Z ian $
  * @package		Joomla
  * @copyright	Copyright (C) 2005 - 2008 Open Source Matters. All rights reserved.
  * @license		GNU/GPL, see LICENSE.php
@@ -49,12 +49,30 @@
 	{
 		global $mainframe;
 		$params =& JComponentHelper::getParams('com_media');
-		$ranks = array('publisher', 'editor', 'author', 'registered');
+		//Find out who has permission to upload and change the acl to let them.
 		$acl = & JFactory::getACL();
-		for($i = 0; $i < $params->get('allowed_media_usergroup', 3); $i++)
+		switch ($params->get('allowed_media_usergroup')) 
 		{
-			$acl->addACL( 'com_media', 'popup', 'users', $ranks[$i] );
+			case '1':
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );
+				break;
+			case '2':
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'editor' );
+				break;
+			case '3': 
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'editor' );				
+				$acl->addACL( 'com_media', 'upload', 'users', 'author' );
+				break;								
+			case '4':
+				$acl->addACL( 'com_media', 'upload', 'users', 'publisher' );				
+				$acl->addACL( 'com_media', 'upload', 'users', 'editor' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'author' );
+				$acl->addACL( 'com_media', 'upload', 'users', 'registered' );
+				break;
 		}
+	
 		//Make sure the user is authorized to view this page
 		$user = & JFactory::getUser();
 		if (!$user->authorize( 'com_media', 'popup' )) {
