From 6ed75123d8cf61f1cff2c85bbcb5a4f8cfa369e6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 9 May 2012 00:28:02 +0200
Subject: [PATCH] Fix: checkstyle

---
 htdocs/core/menus/standard/auguria.lib.php    |   1 +
 htdocs/core/menus/standard/eldy.lib.php       |   1 +
 htdocs/theme/amarok/ckeditor/config.js        | 164 ++--
 htdocs/theme/amarok/fckeditor/fck_dialog.css  | 804 +++++++--------
 .../theme/amarok/fckeditor/fck_dialog_ie6.js  | 220 ++---
 htdocs/theme/amarok/fckeditor/fck_editor.css  | 928 +++++++++---------
 htdocs/user/class/user.class.php              |   2 +-
 7 files changed, 1061 insertions(+), 1059 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index eeb6a5c20aa..bdaab26bb72 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -124,6 +124,7 @@ function print_start_menu_array_auguria()
  * Output start menu entry
  *
  * @param	string	$idsel		Text
+ * @param	string	$classname	String to add a css class
  * @return	void
  */
 function print_start_menu_entry_auguria($idsel,$classname)
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index e12636725af..89ed9d6570e 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -518,6 +518,7 @@ function print_start_menu_array()
  * Output start menu entry
  *
  * @param	string	$idsel		Text
+ * @param	string	$classname	String to add a css class
  * @return	void
  */
 function print_start_menu_entry($idsel,$classname)
diff --git a/htdocs/theme/amarok/ckeditor/config.js b/htdocs/theme/amarok/ckeditor/config.js
index ad6868029ee..699f7d61ec7 100644
--- a/htdocs/theme/amarok/ckeditor/config.js
+++ b/htdocs/theme/amarok/ckeditor/config.js
@@ -1,82 +1,82 @@
-/*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-CKEDITOR.editorConfig = function( config )
-{
-	// Define changes to default configuration here.
-	// http://docs.cksource.com/CKEditor_3.x/Developers_Guide
-	// http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
-	config.enterMode = CKEDITOR.ENTER_BR;
-	config.resize_enabled = false;
-	//config.resize_maxHeight = 3000;
-	//config.resize_maxWidth = 3000;
-	//config.height = '300px';
-	//config.resize_dir = 'vertical';	// horizontal, vertical, both
-	config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font';
-	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
-	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
-	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' 
-	//config.language = 'de';
-	//config.defaultLanguage = 'en';
-	//config.contentsLanguage = 'fr';
-	config.fullPage = false;	// Not a full html page string, just part of it
-	config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
-	//config.contentsCss = '/css/mysitestyles.css';
-	config.image_previewText=' ';
-
-	config.toolbar_Full =
-	[
-	    ['Source','-','Save','NewPage','Preview','-','Templates'],
-	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
-	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
-	    '/',
-	    ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
-	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['BidiLtr', 'BidiRtl'],
-	    ['Link','Unlink','Anchor'],
-	    ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
-	    '/',
-	    ['Styles','Format','Font','FontSize'],
-	    ['TextColor','BGColor'],
-	    ['Maximize', 'ShowBlocks','-','About']
-	];
-
-	config.toolbar_dolibarr_mailings = 
-	[
-	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker'],
-	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent'],
-	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	 	['Link','Unlink','Anchor','Image','Table','SpecialChar']
-	 ];
-	
-	config.toolbar_dolibarr_notes =
-	[
-	 	['Source'],
-	 	['Cut','Copy','Paste','-','SpellChecker'],
-	 	['Undo','Redo','-','Find','Replace'],
-	    ['Font','FontSize'],
-	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent'],
-	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['Link','Unlink','Image','Table','SpecialChar']
-	];
-	
-	config.toolbar_dolibarr_details =
-	[
-	 	['Source','Maximize'],
-	 	['Cut','Copy','Paste','-','SpellChecker'],
-	    ['Font','FontSize'],
-	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
-	 	['NumberedList','BulletedList','Outdent','Indent'],
-	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
-	    ['SpecialChar']
-	];
-};
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+	// Define changes to default configuration here.
+	// http://docs.cksource.com/CKEditor_3.x/Developers_Guide
+	// http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html
+	config.enterMode = CKEDITOR.ENTER_BR;
+	config.resize_enabled = false;
+	//config.resize_maxHeight = 3000;
+	//config.resize_maxWidth = 3000;
+	//config.height = '300px';
+	//config.resize_dir = 'vertical';	// horizontal, vertical, both
+	config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font';
+	config.removeDialogTabs = 'flash:advanced';	// config.removeDialogTabs = 'flash:advanced;image:Link';
+	config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // Prevent PHP Code to be formatted
+	//config.menu_groups = 'clipboard,table,anchor,link,image';	// for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' 
+	//config.language = 'de';
+	//config.defaultLanguage = 'en';
+	//config.contentsLanguage = 'fr';
+	config.fullPage = false;	// Not a full html page string, just part of it
+	config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)';
+	//config.contentsCss = '/css/mysitestyles.css';
+	config.image_previewText=' ';
+
+	config.toolbar_Full =
+	[
+	    ['Source','-','Save','NewPage','Preview','-','Templates'],
+	    ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'],
+	    ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+	    ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
+	    '/',
+	    ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
+	    ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
+	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	    ['BidiLtr', 'BidiRtl'],
+	    ['Link','Unlink','Anchor'],
+	    ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
+	    '/',
+	    ['Styles','Format','Font','FontSize'],
+	    ['TextColor','BGColor'],
+	    ['Maximize', 'ShowBlocks','-','About']
+	];
+
+	config.toolbar_dolibarr_mailings = 
+	[
+	 	['Source','Maximize'],
+	 	['Cut','Copy','Paste','-','SpellChecker'],
+	 	['Undo','Redo','-','Find','Replace'],
+	    ['Font','FontSize'],
+	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	 	['Link','Unlink','Anchor','Image','Table','SpecialChar']
+	 ];
+	
+	config.toolbar_dolibarr_notes =
+	[
+	 	['Source'],
+	 	['Cut','Copy','Paste','-','SpellChecker'],
+	 	['Undo','Redo','-','Find','Replace'],
+	    ['Font','FontSize'],
+	 	['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	    ['Link','Unlink','Image','Table','SpecialChar']
+	];
+	
+	config.toolbar_dolibarr_details =
+	[
+	 	['Source','Maximize'],
+	 	['Cut','Copy','Paste','-','SpellChecker'],
+	    ['Font','FontSize'],
+	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
+	 	['NumberedList','BulletedList','Outdent','Indent'],
+	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+	    ['SpecialChar']
+	];
+};
diff --git a/htdocs/theme/amarok/fckeditor/fck_dialog.css b/htdocs/theme/amarok/fckeditor/fck_dialog.css
index 53f16ef8d3c..4582b89bf81 100644
--- a/htdocs/theme/amarok/fckeditor/fck_dialog.css
+++ b/htdocs/theme/amarok/fckeditor/fck_dialog.css
@@ -1,402 +1,402 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the dialog boxes.
- */
-
-html, body
-{
-	background-color: transparent;
-	margin: 0px;
-	padding: 0px;
-}
-
-body
-{
-	padding: 10px;
-}
-
-body, td, input, select, textarea
-{
-	font-size: 11px;
-	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
-}
-
-body, .BackColor
-{
-	background-color: #f7f7f7;
-}
-
-.PopupBody
-{
-	height: 100%;
-	width: 100%;
-	overflow: hidden;
-	background-color: transparent;
-	padding: 0px;
-}
-
-#header
-{
-	cursor: move;
-}
-
-.PopupTitle
-{
-	font-weight: bold;
-	font-size: 14pt;
-	color: #504845;
-	background-color: #dedede;
-	padding: 3px 10px 3px 10px;
-}
-
-.PopupButtons
-{
-	position: absolute;
-	right: 0px;
-	left: 0px;
-	bottom: 0px;
-	border-top: #cec6b5 1px solid;
-	background-color: #DEDEDE;
-	padding: 7px 10px 7px 10px;
-}
-
-.Button
-{
-	border: #7a7261 1px solid;
-	color: #504845;
-	background-color: #cec6b5;
-}
-
-#btnOk
-{
-	width: 100px;
-}
-
-.DarkBackground
-{
-	background-color: #f2f2f2;
-}
-
-.LightBackground
-{
-	background-color: #ffffbe;
-}
-
-.PopupTitleBorder
-{
-	border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTabArea
-{
-	color: #504845;
-	background-color: #DEDEDE;
-}
-
-.PopupTabEmptyArea
-{
-	padding-left: 10px ;
-	border-bottom: #cec6b5 1px solid;
-}
-
-.PopupTab, .PopupTabSelected
-{
-	border-right: #cec6b5 1px solid;
-	border-top: #cec6b5 1px solid;
-	border-left: #cec6b5 1px solid;
-	padding: 3px 5px 3px 5px;
-	color: #504845;
-}
-
-.PopupTab
-{
-	margin-top: 1px;
-	border-bottom: #cec6b5 1px solid;
-	cursor: pointer;
-	cursor: hand;
-}
-
-.PopupTabSelected
-{
-	font-weight:bold;
-	cursor: default;
-	padding-top: 4px;
-	border-bottom: #f1f1e3 1px solid;
-	background-color: #f7f7f7;
-}
-
-.PopupSelectionBox
-{
-	border: #a9a9a9 1px solid !important;
-	background-color: #dcdcdc !important;
-	cursor: pointer;
-	cursor: hand;
-}
-
-#tdBrowse
-{
-	vertical-align: bottom;
-}
-
-/**
- * Dialog frame related styles.
- */
-
-.contents
-{
-	position: absolute;
-	top: 2px;
-	left: 16px;
-	right: 16px;
-	bottom: 20px;
-	background-color: #f7f7f7;
-	overflow: hidden;
-	z-index: 1;
-}
-
-.tl, .tr, .tc, .bl, .br, .bc
-{
-	position: absolute;
-	background-image: url(images/sprites.png);
-	background-repeat: no-repeat;
-}
-
-* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
-{
-	background-image: url(images/sprites.gif);
-}
-
-.ml, .mr
-{
-	position: absolute;
-	background-image: url(images/dialog.sides.png);
-	background-repeat: repeat-y;
-}
-
-* html .ml, * html .mr
-{
-	background-image: url(images/dialog.sides.gif);
-}
-
-.rtl .ml, .rtl .mr
-{
-	position: absolute;
-	background-image: url(images/dialog.sides.rtl.png);
-	background-repeat: repeat-y;
-}
-
-* html .rtl .ml, * html .rtl .mr
-{
-	background-image: url(images/dialog.sides.gif);
-}
-
-.tl
-{
-	top: 0px;
-	left: 0px;
-	width: 16px;
-	height: 16px;
-	background-position: -16px -16px;
-}
-
-.rtl .tl
-{
-	background-position: -16px -397px;
-}
-
-.tr
-{
-	top: 0px;
-	right: 0px;
-	width: 16px;
-	height: 16px;
-	background-position: -16px -76px;
-}
-
-.rtl .tr
-{
-	background-position: -16px -457px;
-}
-
-.tc
-{
-	top: 0px;
-	right: 16px;
-	left: 16px;
-	height: 16px;
-	background-position: 0px -136px;
-	background-repeat: repeat-x;
-}
-
-.ml
-{
-	top: 16px;
-	left: 0px;
-	width: 16px;
-	bottom: 51px;
-	background-position: 0px 0px;
-}
-
-.mr
-{
-	top: 16px;
-	right: 0px;
-	width: 16px;
-	bottom: 51px;
-	background-position: -16px 0px;
-}
-
-.bl
-{
-	bottom: 0px;
-	left: 0px;
-	width: 30px;
-	height: 51px;
-	background-position: -16px -196px;
-}
-
-.rtl .bl
-{
-	background-position: -16px -517px;
-}
-
-.br
-{
-	bottom: 0px;
-	right: 0px;
-	width: 30px;
-	height: 51px;
-	background-position: -16px -263px;
-}
-
-.rtl .br
-{
-	background-position: -16px -584px;
-}
-
-.bc
-{
-	bottom: 0px;
-	right: 30px;
-	left: 30px;
-	height: 51px;
-	background-position: 0px -330px;
-	background-repeat: repeat-x;
-}
-
-/* For IE6. Do not change it. */
-* html .blocker
-{
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	z-index: 12;
-	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
-}
-
-/* The layer used to cover the dialog when opening a child dialog. */
-.cover
-{
-	position: absolute;
-	top: 0px;
-	left: 14px;
-	right: 14px;
-	bottom: 18px;
-	z-index: 11;
-}
-
-#closeButton
-{
-	position: absolute;
-	right: 0px;
-	top: 0px;
-	margin-top: 5px;
-	margin-right: 10px;
-	width: 20px;
-	height: 20px;
-	cursor: pointer;
-	background-image: url(images/sprites.png);
-	background-repeat: no-repeat;
-	background-position: -16px -651px;
-}
-
-* html #closeButton
-{
-	cursor: hand;
-	background-image: url(images/sprites.gif);
-}
-
-.rtl #closeButton
-{
-	right: auto;
-	left: 10px;
-	margin-right: 0px;
-}
-
-#closeButton:hover
-{
-	background-position: -16px -687px;
-}
-
-#throbberBlock
-{
-	z-index: 10;
-}
-
-#throbberBlock div
-{
-	float: left;
-	width: 8px;
-	height: 9px;
-	margin-left: 2px;
-	margin-right: 2px;
-	font-size: 1px;	/* IE6 */
-}
-
-/*
-	Color Gradient Generator:
-	http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
-*/
-
-.throbber_1
-{
-	background-color: #504845;
-}
-
-.throbber_2
-{
-	background-color: #736D6B;
-}
-
-.throbber_3
-{
-	background-color: #979391;
-}
-
-.throbber_4
-{
-	background-color: #BAB8B7;
-}
-
-.throbber_5
-{
-	background-color: #DEDEDE;
-}
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the dialog boxes.
+ */
+
+html, body
+{
+	background-color: transparent;
+	margin: 0px;
+	padding: 0px;
+}
+
+body
+{
+	padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+body, .BackColor
+{
+	background-color: #f7f7f7;
+}
+
+.PopupBody
+{
+	height: 100%;
+	width: 100%;
+	overflow: hidden;
+	background-color: transparent;
+	padding: 0px;
+}
+
+#header
+{
+	cursor: move;
+}
+
+.PopupTitle
+{
+	font-weight: bold;
+	font-size: 14pt;
+	color: #504845;
+	background-color: #dedede;
+	padding: 3px 10px 3px 10px;
+}
+
+.PopupButtons
+{
+	position: absolute;
+	right: 0px;
+	left: 0px;
+	bottom: 0px;
+	border-top: #cec6b5 1px solid;
+	background-color: #DEDEDE;
+	padding: 7px 10px 7px 10px;
+}
+
+.Button
+{
+	border: #7a7261 1px solid;
+	color: #504845;
+	background-color: #cec6b5;
+}
+
+#btnOk
+{
+	width: 100px;
+}
+
+.DarkBackground
+{
+	background-color: #f2f2f2;
+}
+
+.LightBackground
+{
+	background-color: #ffffbe;
+}
+
+.PopupTitleBorder
+{
+	border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTabArea
+{
+	color: #504845;
+	background-color: #DEDEDE;
+}
+
+.PopupTabEmptyArea
+{
+	padding-left: 10px ;
+	border-bottom: #cec6b5 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+	border-right: #cec6b5 1px solid;
+	border-top: #cec6b5 1px solid;
+	border-left: #cec6b5 1px solid;
+	padding: 3px 5px 3px 5px;
+	color: #504845;
+}
+
+.PopupTab
+{
+	margin-top: 1px;
+	border-bottom: #cec6b5 1px solid;
+	cursor: pointer;
+	cursor: hand;
+}
+
+.PopupTabSelected
+{
+	font-weight:bold;
+	cursor: default;
+	padding-top: 4px;
+	border-bottom: #f1f1e3 1px solid;
+	background-color: #f7f7f7;
+}
+
+.PopupSelectionBox
+{
+	border: #a9a9a9 1px solid !important;
+	background-color: #dcdcdc !important;
+	cursor: pointer;
+	cursor: hand;
+}
+
+#tdBrowse
+{
+	vertical-align: bottom;
+}
+
+/**
+ * Dialog frame related styles.
+ */
+
+.contents
+{
+	position: absolute;
+	top: 2px;
+	left: 16px;
+	right: 16px;
+	bottom: 20px;
+	background-color: #f7f7f7;
+	overflow: hidden;
+	z-index: 1;
+}
+
+.tl, .tr, .tc, .bl, .br, .bc
+{
+	position: absolute;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+}
+
+* html .tl, * html .tr, * html .tc, * html .bl, * html .br, * html .bc
+{
+	background-image: url(images/sprites.gif);
+}
+
+.ml, .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.png);
+	background-repeat: repeat-y;
+}
+
+* html .ml, * html .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.rtl .ml, .rtl .mr
+{
+	position: absolute;
+	background-image: url(images/dialog.sides.rtl.png);
+	background-repeat: repeat-y;
+}
+
+* html .rtl .ml, * html .rtl .mr
+{
+	background-image: url(images/dialog.sides.gif);
+}
+
+.tl
+{
+	top: 0px;
+	left: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -16px;
+}
+
+.rtl .tl
+{
+	background-position: -16px -397px;
+}
+
+.tr
+{
+	top: 0px;
+	right: 0px;
+	width: 16px;
+	height: 16px;
+	background-position: -16px -76px;
+}
+
+.rtl .tr
+{
+	background-position: -16px -457px;
+}
+
+.tc
+{
+	top: 0px;
+	right: 16px;
+	left: 16px;
+	height: 16px;
+	background-position: 0px -136px;
+	background-repeat: repeat-x;
+}
+
+.ml
+{
+	top: 16px;
+	left: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: 0px 0px;
+}
+
+.mr
+{
+	top: 16px;
+	right: 0px;
+	width: 16px;
+	bottom: 51px;
+	background-position: -16px 0px;
+}
+
+.bl
+{
+	bottom: 0px;
+	left: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -196px;
+}
+
+.rtl .bl
+{
+	background-position: -16px -517px;
+}
+
+.br
+{
+	bottom: 0px;
+	right: 0px;
+	width: 30px;
+	height: 51px;
+	background-position: -16px -263px;
+}
+
+.rtl .br
+{
+	background-position: -16px -584px;
+}
+
+.bc
+{
+	bottom: 0px;
+	right: 30px;
+	left: 30px;
+	height: 51px;
+	background-position: 0px -330px;
+	background-repeat: repeat-x;
+}
+
+/* For IE6. Do not change it. */
+* html .blocker
+{
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: 12;
+	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);
+}
+
+/* The layer used to cover the dialog when opening a child dialog. */
+.cover
+{
+	position: absolute;
+	top: 0px;
+	left: 14px;
+	right: 14px;
+	bottom: 18px;
+	z-index: 11;
+}
+
+#closeButton
+{
+	position: absolute;
+	right: 0px;
+	top: 0px;
+	margin-top: 5px;
+	margin-right: 10px;
+	width: 20px;
+	height: 20px;
+	cursor: pointer;
+	background-image: url(images/sprites.png);
+	background-repeat: no-repeat;
+	background-position: -16px -651px;
+}
+
+* html #closeButton
+{
+	cursor: hand;
+	background-image: url(images/sprites.gif);
+}
+
+.rtl #closeButton
+{
+	right: auto;
+	left: 10px;
+	margin-right: 0px;
+}
+
+#closeButton:hover
+{
+	background-position: -16px -687px;
+}
+
+#throbberBlock
+{
+	z-index: 10;
+}
+
+#throbberBlock div
+{
+	float: left;
+	width: 8px;
+	height: 9px;
+	margin-left: 2px;
+	margin-right: 2px;
+	font-size: 1px;	/* IE6 */
+}
+
+/*
+	Color Gradient Generator:
+	http://www.herethere.net/~samson/php/color_gradient/?cbegin=504845&cend=DEDEDE&steps=4
+*/
+
+.throbber_1
+{
+	background-color: #504845;
+}
+
+.throbber_2
+{
+	background-color: #736D6B;
+}
+
+.throbber_3
+{
+	background-color: #979391;
+}
+
+.throbber_4
+{
+	background-color: #BAB8B7;
+}
+
+.throbber_5
+{
+	background-color: #DEDEDE;
+}
diff --git a/htdocs/theme/amarok/fckeditor/fck_dialog_ie6.js b/htdocs/theme/amarok/fckeditor/fck_dialog_ie6.js
index cd3cb75fddf..2415bc21607 100644
--- a/htdocs/theme/amarok/fckeditor/fck_dialog_ie6.js
+++ b/htdocs/theme/amarok/fckeditor/fck_dialog_ie6.js
@@ -1,110 +1,110 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- */
-
-(function()
-{
-	// IE6 doens't handle absolute positioning properly (it is always in quirks
-	// mode). This function fixes the sizes and positions of many elements that
-	// compose the skin (this is skin specific).
-	var fixSizes = window.DoResizeFixes = function()
-	{
-		var fckDlg = window.document.body ;
-
-		for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
-		{
-			var child = fckDlg.childNodes[i] ;
-			switch ( child.className )
-			{
-				case 'contents' :
-					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ;	// -left -right
-					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ;	// -bottom -top
-					break ;
-
-				case 'blocker' :
-				case 'cover' :
-					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ;	// -left -right + 4
-					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ;	// -bottom -top + 4
-					break ;
-
-				case 'tr' :
-					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
-					break ;
-
-				case 'tc' :
-					child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ;
-					break ;
-
-				case 'ml' :
-					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
-					break ;
-
-				case 'mr' :
-					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
-					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
-					break ;
-
-				case 'bl' :
-					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
-					break ;
-
-				case 'br' :
-					child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ;
-					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
-					break ;
-
-				case 'bc' :
-					child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ;
-					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
-					break ;
-			}
-		}
-	}
-
-	var closeButtonOver = function()
-	{
-		this.style.backgroundPosition = '-16px -687px' ;
-	} ;
-
-	var closeButtonOut = function()
-	{
-		this.style.backgroundPosition = '-16px -651px' ;
-	} ;
-
-	var fixCloseButton = function()
-	{
-		var closeButton = document.getElementById ( 'closeButton' ) ;
-
-		closeButton.onmouseover	= closeButtonOver ;
-		closeButton.onmouseout	= closeButtonOut ;
-	}
-
-	var onLoad = function()
-	{
-		fixSizes() ;
-		fixCloseButton() ;
-
-		window.attachEvent( 'onresize', fixSizes ) ;
-		window.detachEvent( 'onload', onLoad ) ;
-	}
-
-	window.attachEvent( 'onload', onLoad ) ;
-
-})() ;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ */
+
+(function()
+{
+	// IE6 doens't handle absolute positioning properly (it is always in quirks
+	// mode). This function fixes the sizes and positions of many elements that
+	// compose the skin (this is skin specific).
+	var fixSizes = window.DoResizeFixes = function()
+	{
+		var fckDlg = window.document.body ;
+
+		for ( var i = 0 ; i < fckDlg.childNodes.length ; i++ )
+		{
+			var child = fckDlg.childNodes[i] ;
+			switch ( child.className )
+			{
+				case 'contents' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 ) ;	// -left -right
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 ) ;	// -bottom -top
+					break ;
+
+				case 'blocker' :
+				case 'cover' :
+					child.style.width = Math.max( 0, fckDlg.offsetWidth - 16 - 16 + 4 ) ;	// -left -right + 4
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 20 - 2 + 4 ) ;	// -bottom -top + 4
+					break ;
+
+				case 'tr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					break ;
+
+				case 'tc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 16 - 16 ) ;
+					break ;
+
+				case 'ml' :
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'mr' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 16 ) ;
+					child.style.height = Math.max( 0, fckDlg.clientHeight - 16 - 51 ) ;
+					break ;
+
+				case 'bl' :
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'br' :
+					child.style.left = Math.max( 0, fckDlg.clientWidth - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+
+				case 'bc' :
+					child.style.width = Math.max( 0, fckDlg.clientWidth - 30 - 30 ) ;
+					child.style.top = Math.max( 0, fckDlg.clientHeight - 51 ) ;
+					break ;
+			}
+		}
+	}
+
+	var closeButtonOver = function()
+	{
+		this.style.backgroundPosition = '-16px -687px' ;
+	} ;
+
+	var closeButtonOut = function()
+	{
+		this.style.backgroundPosition = '-16px -651px' ;
+	} ;
+
+	var fixCloseButton = function()
+	{
+		var closeButton = document.getElementById ( 'closeButton' ) ;
+
+		closeButton.onmouseover	= closeButtonOver ;
+		closeButton.onmouseout	= closeButtonOut ;
+	}
+
+	var onLoad = function()
+	{
+		fixSizes() ;
+		fixCloseButton() ;
+
+		window.attachEvent( 'onresize', fixSizes ) ;
+		window.detachEvent( 'onload', onLoad ) ;
+	}
+
+	window.attachEvent( 'onload', onLoad ) ;
+
+})() ;
diff --git a/htdocs/theme/amarok/fckeditor/fck_editor.css b/htdocs/theme/amarok/fckeditor/fck_editor.css
index 0862d375fe6..3452f3aef39 100644
--- a/htdocs/theme/amarok/fckeditor/fck_editor.css
+++ b/htdocs/theme/amarok/fckeditor/fck_editor.css
@@ -1,465 +1,465 @@
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2008 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Styles used by the editor IFRAME and Toolbar.
- */
-
-/*
-	### Basic Editor IFRAME Styles.
-*/
-
-body
-{
-	padding: 1px;
-	margin: 0;
-	background-color: #ffffff;
-}
-
-#xEditingArea
-{
-    border: #696969 1px solid;
-}
-
-.SourceField
-{
-    padding: 5px;
-    margin: 0px;
-    font-family: Monospace;
-}
-
-/*
-	Toolbar
-*/
-
-.TB_ToolbarSet, .TB_Expand, .TB_Collapse
-{
-    cursor: default;
-    background-color: #f7f7f7;
-}
-
-.TB_ToolbarSet
-{
-    border-top: #f7f7f7 1px outset;
-    border-bottom: #f7f7f7 1px outset;
-}
-
-.TB_ToolbarSet TD
-{
-    font-size: 11px;
-    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.TB_Toolbar
-{
-	height: 24px;
-    display: inline-table;	/* inline = Opera jumping buttons bug */
-}
-
-.TB_Separator
-{
-    width: 1px;
-    height: 16px;
-    margin: 2px;
-    background-color: #999966;
-}
-
-.TB_Start
-{
-    background-image: url(images/toolbar.start.gif);
-    margin: 2px;
-    width: 3px;
-    background-repeat: no-repeat;
-    height: 16px;
-}
-
-.TB_End
-{
-    display: none;
-}
-
-.TB_ExpandImg
-{
-    background-image: url(images/toolbar.expand.gif);
-    background-repeat: no-repeat;
-}
-
-.TB_CollapseImg
-{
-    background-image: url(images/toolbar.collapse.gif);
-    background-repeat: no-repeat;
-}
-
-.TB_SideBorder
-{
-    background-color: #696969;
-}
-
-.TB_Expand, .TB_Collapse
-{
-    padding: 2px 2px 2px 2px;
-    border: #f7f7f7 1px outset;
-}
-
-.TB_Collapse
-{
-    width: 5px;
-}
-
-.TB_Break
-{
-    height: 24px; /* IE needs the height to be set, otherwise no break */
-}
-
-/*
-	Toolbar Button
-*/
-
-.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
-{
-    border: #f7f7f7 1px solid; /* This is the default border */
-    height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
-}
-
-.TB_Button_On
-{
-    border: #316ac5 1px solid;
-    background-color: #c1d2ee;
-}
-
-.TB_Button_On_Over, .TB_Button_Off_Over
-{
-    border: #316ac5 1px solid;
-    background-color: #dff1ff;
-}
-
-.TB_Button_Off
-{
-    filter: alpha(opacity=70); /* IE */
-    opacity: 0.70; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Disabled
-{
-    filter: gray() alpha(opacity=30); /* IE */
-    opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.TB_Button_Padding
-{
-    visibility: hidden;
-    width: 3px;
-    height: 22px;
-}
-
-.TB_Button_Image
-{
-    overflow: hidden;
-    width: 16px;
-    height: 16px;
-    margin: 3px;
-    background-repeat: no-repeat;
-}
-
-.TB_Button_Image img
-{
-    position: relative;
-}
-
-.TB_Button_Off .TB_Button_Text
-{
-   	background-color: #f7f7f7;  /* Needed because of a bug on Clear Type */
-}
-
-.TB_ConnectionLine
-{
-    background-color: #ffffff;
-    height: 1px;
-    margin-left: 1px;   /* ltr */
-    margin-right: 1px;  /* rtl */
-}
-
-.TB_Text
-{
-	height: 22px;
-}
-
-.TB_Button_Off .TB_Text
-{
-   	background-color: #f7f7f7 ;  /* Needed because of a bug on ClearType */
-}
-
-.TB_Button_On_Over .TB_Text
-{
-   	background-color: #dff1ff ;  /* Needed because of a bug on ClearType */
-}
-
-/*
-	Menu
-*/
-
-.MN_Menu
-{
-    border: 1px solid #8f8f73;
-    padding: 2px;
-    background-color: #ffffff;
-    cursor: default;
-}
-
-.MN_Menu, .MN_Menu .MN_Label
-{
-    font-size: 11px;
-    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.MN_Item_Padding
-{
-    visibility: hidden;
-    width: 3px;
-    height: 20px;
-}
-
-.MN_Icon
-{
-    background-color: #dedede;
-    text-align: center;
-    height: 20px;
-}
-
-.MN_Label
-{
-    padding-left: 3px;
-    padding-right: 3px;
-}
-
-.MN_Separator
-{
-    height: 3px;
-}
-
-.MN_Separator_Line
-{
-    border-top: #b9b99d 1px solid;
-}
-
-.MN_Item .MN_Icon IMG
-{
-    filter: alpha(opacity=70);
-    opacity: 0.70;
-}
-
-.MN_Item_Over
-{
-    color: #ffffff;
-    background-color: #8a857d;
-}
-
-.MN_Item_Over .MN_Icon
-{
-    background-color: #6c6761;
-}
-
-.MN_Item_Disabled IMG
-{
-    filter: gray() alpha(opacity=30); /* IE */
-    opacity: 0.30; /* Safari, Opera and Mozilla */
-}
-
-.MN_Item_Disabled .MN_Label
-{
-    color: #b7b7b7;
-}
-
-.MN_Arrow
-{
-    padding-right: 3px;
-    padding-left: 3px;
-}
-
-.MN_ConnectionLine
-{
-    background-color: #ffffff;
-}
-
-.Menu .TB_Button_On, .Menu .TB_Button_On_Over
-{
-    border: #8f8f73 1px solid;
-    background-color: #ffffff;
-}
-
-/*
-	### Panel Styles
-*/
-
-.FCK_Panel
-{
-    border: #8f8f73 1px solid;
-    padding: 2px;
-    background-color: #ffffff;
-}
-
-.FCK_Panel, .FCK_Panel TD
-{
-    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-    font-size: 11px;
-}
-
-/*
-	### Special Combos
-*/
-
-.SC_Panel
-{
-    overflow: auto;
-    white-space: nowrap;
-    cursor: default;
-    border: 1px solid #8f8f73;
-    padding-left: 2px;
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    http://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    http://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * Styles used by the editor IFRAME and Toolbar.
+ */
+
+/*
+	### Basic Editor IFRAME Styles.
+*/
+
+body
+{
+	padding: 1px;
+	margin: 0;
+	background-color: #ffffff;
+}
+
+#xEditingArea
+{
+    border: #696969 1px solid;
+}
+
+.SourceField
+{
+    padding: 5px;
+    margin: 0px;
+    font-family: Monospace;
+}
+
+/*
+	Toolbar
+*/
+
+.TB_ToolbarSet, .TB_Expand, .TB_Collapse
+{
+    cursor: default;
+    background-color: #f7f7f7;
+}
+
+.TB_ToolbarSet
+{
+    border-top: #f7f7f7 1px outset;
+    border-bottom: #f7f7f7 1px outset;
+}
+
+.TB_ToolbarSet TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.TB_Toolbar
+{
+	height: 24px;
+    display: inline-table;	/* inline = Opera jumping buttons bug */
+}
+
+.TB_Separator
+{
+    width: 1px;
+    height: 16px;
+    margin: 2px;
+    background-color: #999966;
+}
+
+.TB_Start
+{
+    background-image: url(images/toolbar.start.gif);
+    margin: 2px;
+    width: 3px;
+    background-repeat: no-repeat;
+    height: 16px;
+}
+
+.TB_End
+{
+    display: none;
+}
+
+.TB_ExpandImg
+{
+    background-image: url(images/toolbar.expand.gif);
+    background-repeat: no-repeat;
+}
+
+.TB_CollapseImg
+{
+    background-image: url(images/toolbar.collapse.gif);
+    background-repeat: no-repeat;
+}
+
+.TB_SideBorder
+{
+    background-color: #696969;
+}
+
+.TB_Expand, .TB_Collapse
+{
+    padding: 2px 2px 2px 2px;
+    border: #f7f7f7 1px outset;
+}
+
+.TB_Collapse
+{
+    width: 5px;
+}
+
+.TB_Break
+{
+    height: 24px; /* IE needs the height to be set, otherwise no break */
+}
+
+/*
+	Toolbar Button
+*/
+
+.TB_Button_On, .TB_Button_Off, .TB_Button_On_Over, .TB_Button_Off_Over, .TB_Button_Disabled
+{
+    border: #f7f7f7 1px solid; /* This is the default border */
+    height: 22px; /* The height is necessary, otherwise IE will not apply the alpha */
+}
+
+.TB_Button_On
+{
+    border: #316ac5 1px solid;
+    background-color: #c1d2ee;
+}
+
+.TB_Button_On_Over, .TB_Button_Off_Over
+{
+    border: #316ac5 1px solid;
+    background-color: #dff1ff;
+}
+
+.TB_Button_Off
+{
+    filter: alpha(opacity=70); /* IE */
+    opacity: 0.70; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Disabled
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.TB_Button_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 22px;
+}
+
+.TB_Button_Image
+{
+    overflow: hidden;
+    width: 16px;
+    height: 16px;
+    margin: 3px;
+    background-repeat: no-repeat;
+}
+
+.TB_Button_Image img
+{
+    position: relative;
+}
+
+.TB_Button_Off .TB_Button_Text
+{
+   	background-color: #f7f7f7;  /* Needed because of a bug on Clear Type */
+}
+
+.TB_ConnectionLine
+{
+    background-color: #ffffff;
+    height: 1px;
+    margin-left: 1px;   /* ltr */
+    margin-right: 1px;  /* rtl */
+}
+
+.TB_Text
+{
+	height: 22px;
+}
+
+.TB_Button_Off .TB_Text
+{
+   	background-color: #f7f7f7 ;  /* Needed because of a bug on ClearType */
+}
+
+.TB_Button_On_Over .TB_Text
+{
+   	background-color: #dff1ff ;  /* Needed because of a bug on ClearType */
+}
+
+/*
+	Menu
+*/
+
+.MN_Menu
+{
+    border: 1px solid #8f8f73;
+    padding: 2px;
+    background-color: #ffffff;
+    cursor: default;
+}
+
+.MN_Menu, .MN_Menu .MN_Label
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.MN_Item_Padding
+{
+    visibility: hidden;
+    width: 3px;
+    height: 20px;
+}
+
+.MN_Icon
+{
+    background-color: #dedede;
+    text-align: center;
+    height: 20px;
+}
+
+.MN_Label
+{
+    padding-left: 3px;
+    padding-right: 3px;
+}
+
+.MN_Separator
+{
+    height: 3px;
+}
+
+.MN_Separator_Line
+{
+    border-top: #b9b99d 1px solid;
+}
+
+.MN_Item .MN_Icon IMG
+{
+    filter: alpha(opacity=70);
+    opacity: 0.70;
+}
+
+.MN_Item_Over
+{
+    color: #ffffff;
+    background-color: #8a857d;
+}
+
+.MN_Item_Over .MN_Icon
+{
+    background-color: #6c6761;
+}
+
+.MN_Item_Disabled IMG
+{
+    filter: gray() alpha(opacity=30); /* IE */
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+}
+
+.MN_Item_Disabled .MN_Label
+{
+    color: #b7b7b7;
+}
+
+.MN_Arrow
+{
+    padding-right: 3px;
+    padding-left: 3px;
+}
+
+.MN_ConnectionLine
+{
+    background-color: #ffffff;
+}
+
+.Menu .TB_Button_On, .Menu .TB_Button_On_Over
+{
+    border: #8f8f73 1px solid;
+    background-color: #ffffff;
+}
+
+/*
+	### Panel Styles
+*/
+
+.FCK_Panel
+{
+    border: #8f8f73 1px solid;
+    padding: 2px;
+    background-color: #ffffff;
+}
+
+.FCK_Panel, .FCK_Panel TD
+{
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+    font-size: 11px;
+}
+
+/*
+	### Special Combos
+*/
+
+.SC_Panel
+{
+    overflow: auto;
+    white-space: nowrap;
+    cursor: default;
+    border: 1px solid #8f8f73;
+    padding-left: 2px;
     padding-right: 2px;
-    background-color: #ffffff;
-}
-
-.SC_Panel, .SC_Panel TD
-{
-    font-size: 11px;
-    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
-}
-
-.SC_Item, .SC_ItemSelected
-{
-    margin-top: 2px;
-    margin-bottom: 2px;
-    background-position: left center;
-    padding-left: 11px;
-    padding-right: 3px;
-    padding-top: 2px;
-    padding-bottom: 2px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    background-repeat: no-repeat;
-    border: #dddddd 1px solid;
-}
-
-.SC_Item *, .SC_ItemSelected *
-{
-    margin-top: 0px;
-    margin-bottom: 0px;
-}
-
-.SC_ItemSelected
-{
-    border: #9a9afb 1px solid;
-    background-image: url(images/toolbar.arrowright.gif);
-}
-
-.SC_ItemOver
-{
-    border: #404040 1px solid;
-}
-
-.SC_Field
-{
-    border: #b7b7a6 1px solid;
-    cursor: default;
-}
-
-.SC_FieldCaption
-{
-    overflow: visible;
-    padding-right: 5px;
-    padding-left: 5px;
-    opacity: 0.75; /* Safari, Opera and Mozilla */
-    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
-    height: 23px;
-    background-color: #f7f7f7;
-}
-
-.SC_FieldLabel
-{
-    white-space: nowrap;
-    padding: 2px;
-    width: 100%;
-    cursor: default;
-    background-color: #ffffff;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-
-.SC_FieldButton
-{
-    background-position: center center;
-    background-image: url(images/toolbar.buttonarrow.gif);
-    border-left: #b7b7a6 1px solid;
-    width: 14px;
-    background-repeat: no-repeat;
-}
-
-.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
-{
-    opacity: 0.30; /* Safari, Opera and Mozilla */
-    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
-}
-
-.SC_FieldOver
-{
-    border: #316ac5 1px solid;
-}
-
-.SC_FieldOver .SC_FieldButton
-{
-    border-left: #316ac5 1px solid;
-}
-
-/*
-	### Color Selector Panel
-*/
-
-.ColorBoxBorder
-{
-    border: #808080 1px solid;
-    position: static;
-}
-
-.ColorBox
-{
-    font-size: 1px;
-    width: 10px;
-    position: static;
-    height: 10px;
-}
-
-.ColorDeselected, .ColorSelected
-{
-    cursor: default;
-}
-
-.ColorDeselected
-{
-    border: #ffffff 1px solid;
-    padding: 2px;
-    float: left;
-}
-
-.ColorSelected
-{
-    border: #316ac5 1px solid;
-    padding: 2px;
-    float: left;
-    background-color: #c1d2ee;
-}
+    background-color: #ffffff;
+}
+
+.SC_Panel, .SC_Panel TD
+{
+    font-size: 11px;
+    font-family: 'Microsoft Sans Serif' , Tahoma, Arial, Verdana, Sans-Serif;
+}
+
+.SC_Item, .SC_ItemSelected
+{
+    margin-top: 2px;
+    margin-bottom: 2px;
+    background-position: left center;
+    padding-left: 11px;
+    padding-right: 3px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    background-repeat: no-repeat;
+    border: #dddddd 1px solid;
+}
+
+.SC_Item *, .SC_ItemSelected *
+{
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+
+.SC_ItemSelected
+{
+    border: #9a9afb 1px solid;
+    background-image: url(images/toolbar.arrowright.gif);
+}
+
+.SC_ItemOver
+{
+    border: #404040 1px solid;
+}
+
+.SC_Field
+{
+    border: #b7b7a6 1px solid;
+    cursor: default;
+}
+
+.SC_FieldCaption
+{
+    overflow: visible;
+    padding-right: 5px;
+    padding-left: 5px;
+    opacity: 0.75; /* Safari, Opera and Mozilla */
+    filter: alpha(opacity=70); /* IE */ /* -moz-opacity: 0.75; Mozilla (Old) */
+    height: 23px;
+    background-color: #f7f7f7;
+}
+
+.SC_FieldLabel
+{
+    white-space: nowrap;
+    padding: 2px;
+    width: 100%;
+    cursor: default;
+    background-color: #ffffff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.SC_FieldButton
+{
+    background-position: center center;
+    background-image: url(images/toolbar.buttonarrow.gif);
+    border-left: #b7b7a6 1px solid;
+    width: 14px;
+    background-repeat: no-repeat;
+}
+
+.SC_FieldDisabled .SC_FieldButton, .SC_FieldDisabled .SC_FieldCaption, .SC_FieldDisabled .TB_ButtonType_Text
+{
+    opacity: 0.30; /* Safari, Opera and Mozilla */
+    filter: gray() alpha(opacity=30); /* IE */ /* -moz-opacity: 0.30; Mozilla (Old) */
+}
+
+.SC_FieldOver
+{
+    border: #316ac5 1px solid;
+}
+
+.SC_FieldOver .SC_FieldButton
+{
+    border-left: #316ac5 1px solid;
+}
+
+/*
+	### Color Selector Panel
+*/
+
+.ColorBoxBorder
+{
+    border: #808080 1px solid;
+    position: static;
+}
+
+.ColorBox
+{
+    font-size: 1px;
+    width: 10px;
+    position: static;
+    height: 10px;
+}
+
+.ColorDeselected, .ColorSelected
+{
+    cursor: default;
+}
+
+.ColorDeselected
+{
+    border: #ffffff 1px solid;
+    padding: 2px;
+    float: left;
+}
+
+.ColorSelected
+{
+    border: #316ac5 1px solid;
+    padding: 2px;
+    float: left;
+    background-color: #c1d2ee;
+}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index e50f5a1bea6..1e51ed10c9d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1448,7 +1448,7 @@ class User extends CommonObject
             '',
             0,
             $msgishtml
-		);
+        );
 
 		if ($mailfile->sendfile())
 		{
-- 
GitLab