From c7e06ccf2ecb1e93a63b7054f41ff04c290f358b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Wed, 29 Dec 2010 22:34:11 +0100
Subject: [PATCH 01/17] Feature #2479 rev. introduction tool bar

---
 .../toolbars/extended/introduction.php        | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/main/inc/lib/fckeditor/toolbars/extended/introduction.php b/main/inc/lib/fckeditor/toolbars/extended/introduction.php
index bc1ee9c30b..15cabd415d 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/introduction.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/introduction.php
@@ -7,37 +7,46 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps,  asciimath, DocProps, Templates don't run ok here. fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS don't run ok here. 
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('NewPage','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll'),
-	array('Link','Unlink','Anchor'),
-	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-	array('Table','SpecialChar'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('Bold','Italic','Underline'),
-	array('JustifyLeft','JustifyCenter','JustifyRight')
+	array('Save','NewPage','Templates','-','PasteWord'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex','asciimath'),
+	array('UnorderedList','OrderedList','Rule'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','Save','NewPage','Preview'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('Save','NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.

From 33a4cf01189c102522ff4a451054a1dd69f55acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Wed, 29 Dec 2010 23:09:02 +0100
Subject: [PATCH 02/17] Feature #2479 rev. introduction tool bar disabled
 asciimath because does not run

---
 main/inc/lib/fckeditor/toolbars/extended/introduction.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/fckeditor/toolbars/extended/introduction.php b/main/inc/lib/fckeditor/toolbars/extended/introduction.php
index 15cabd415d..e37c80df30 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/introduction.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/introduction.php
@@ -8,7 +8,7 @@
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
 //NOTE: Does not include Replace because it is redundant, being in the same tab to Find
-//TODO: DocProps,  asciimath, DocProps, Templates don't run ok here. fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS don't run ok here. 
+//TODO: DocProps,  asciimath don't run ok here. Templates loses styles
 
 // Hide/show SpellCheck buttom
 if ((api_get_setting('allow_spellcheck') == 'true')) {
@@ -22,7 +22,7 @@ else{
 $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
-	array('Link','Image','flvPlayer','Table','mimetex','asciimath'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
 	array('UnorderedList','OrderedList','Rule'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
@@ -36,7 +36,7 @@ $config['ToolbarSets']['Maximized'] = array(
 	array('Cut','Copy','Paste','PasteText','PasteWord'),
 	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
 	array('Link','Unlink','Anchor','Glossary'),
-	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
 '/',
 	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
 	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),

From 885978218fd3a46f175d8102473f8787e8b2f8f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Wed, 29 Dec 2010 23:09:39 +0100
Subject: [PATCH 03/17] Feature #2479 rev. training description tool bar

---
 .../extended/training_description.php         | 57 +++++++++++--------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/main/inc/lib/fckeditor/toolbars/extended/training_description.php b/main/inc/lib/fckeditor/toolbars/extended/training_description.php
index b901a857fa..e426266748 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/training_description.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/training_description.php
@@ -7,37 +7,46 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps,  asciimath, don't run ok here. Templates loses styles
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('NewPage','Save','FitWindow','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
-	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-	array('Table','SpecialChar'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','Source'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('Bold','Italic','Underline'),
-	array('JustifyLeft','JustifyCenter','JustifyRight')
+	array('Save','NewPage','Templates','-','PasteWord'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','Save','NewPage','Preview'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('Save','NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.

From 2a22fa225c7df1aaaab956cf860a221de0abd683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Thu, 30 Dec 2010 00:19:08 +0100
Subject: [PATCH 04/17] Feature #2479 rev. notebook tool bars and add outdent
 and indent to wiki, documents, introduction and training description

---
 .../fckeditor/toolbars/extended/documents.php |  2 +-
 .../toolbars/extended/documents_student.php   |  3 +-
 .../toolbars/extended/introduction.php        |  2 +-
 .../fckeditor/toolbars/extended/notebook.php  | 57 ++++++++++--------
 .../toolbars/extended/notebook_student.php    | 58 +++++++++++--------
 .../extended/training_description.php         |  2 +-
 .../lib/fckeditor/toolbars/extended/wiki.php  |  2 +-
 .../toolbars/extended/wiki_student.php        |  2 +-
 .../fckeditor/toolbars/extended/wiki_task.php |  2 +-
 9 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents.php b/main/inc/lib/fckeditor/toolbars/extended/documents.php
index d5aa8603b0..67363273b3 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/documents.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/documents.php
@@ -23,7 +23,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
 	array('Link','Image','flvPlayer','Table','mimetex','asciimath'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')
diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php
index 4fda9677c2..4a3c97b143 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php
@@ -9,6 +9,7 @@
 
 //NOTE: Does not include Replace because it is redundant, being in the same tab to Find
 //TODO: DocProps, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS don't run ok here. 
+//NOTE: ONLY FOR TEACHERS: source, insert html
 
 // Hide/show SpellCheck buttom
 if ((api_get_setting('allow_spellcheck') == 'true')) {
@@ -23,7 +24,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
 	array('Link','Image','flvPlayer','Table','mimetex','asciimath'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')
diff --git a/main/inc/lib/fckeditor/toolbars/extended/introduction.php b/main/inc/lib/fckeditor/toolbars/extended/introduction.php
index e37c80df30..a5d60c74fe 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/introduction.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/introduction.php
@@ -23,7 +23,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
 	array('Link','Image','flvPlayer','Table','mimetex'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')
diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook.php b/main/inc/lib/fckeditor/toolbars/extended/notebook.php
index f6299b24a6..249105c805 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/notebook.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/notebook.php
@@ -7,37 +7,46 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps, ASCIIMath don't run ok here. 
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('Save','FitWindow','-','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-    array('Table','SpecialChar'),
-    array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'),
-    '/',
-    array('Style','FontFormat','FontName','FontSize'),
-    array('Bold','Italic','Underline'),
-    array('JustifyLeft','JustifyCenter','JustifyRight')
+	array('Save','NewPage','Templates','-','PasteWord'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','Save','NewPage','Preview'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('mimetex','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('Save','NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.
diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php
index 0207567f42..a3da1d5046 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php
@@ -7,40 +7,48 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps, ASCIIMath don't run ok here. 
+//NOTE: ONLY FOR TEACHERS: source, insert html
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('Save','FitWindow','-','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-    array('Table','SpecialChar'),
-    array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
-    '/',
-    array('Style','FontFormat','FontName','FontSize'),
-    array('Bold','Italic','Underline'),
-    array('JustifyLeft','JustifyCenter','JustifyRight'),
-	array('ShowBlocks')
+	array('Save','NewPage','Templates','-','PasteWord'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','Save','NewPage','Preview'),
+	array('Save','NewPage','Templates','-','Preview','Print'),
 	array('Cut','Copy','Paste','PasteText','PasteWord'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('mimetex','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks')
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks'),
+	array('FitWindow')
+	
 );
-
 // Sets whether the toolbar can be collapsed/expanded or not.
 // Possible values: true , false
 //$config['ToolbarCanCollapse'] = true;
diff --git a/main/inc/lib/fckeditor/toolbars/extended/training_description.php b/main/inc/lib/fckeditor/toolbars/extended/training_description.php
index e426266748..2420105356 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/training_description.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/training_description.php
@@ -23,7 +23,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteWord'),
 	array('Undo','Redo'),
 	array('Link','Image','flvPlayer','Table','mimetex'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')
diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki.php b/main/inc/lib/fckeditor/toolbars/extended/wiki.php
index 3d27c2057f..8f77a0e178 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/wiki.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/wiki.php
@@ -24,7 +24,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('Save','NewPage','Templates','-','PasteText'),
 	array('Undo','Redo'),
 	array('Wikilink','Link','Image','flvPlayer','Table','mimetex'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')
diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php
index e7077954c3..0811d14633 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php
@@ -25,7 +25,7 @@ $config['ToolbarSets']['Normal'] = array(
 array('Save','NewPage','Templates','-','PasteText'),
 	array('Undo','Redo'),
 	array('Wikilink','Link','Image','flvPlayer','Table','mimetex'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')
diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php
index dd84970cf3..9e513783e9 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php
@@ -24,7 +24,7 @@ $config['ToolbarSets']['Normal'] = array(
 	array('NewPage','Templates','-','PasteText'),
 	array('Undo','Redo'),
 	array('Link','Image','flvPlayer','Table','mimetex'),
-	array('UnorderedList','OrderedList','Rule'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
 	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
 	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),
 	array('FitWindow')

From ca822434f130ed9e612c173038432880af823ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Thu, 30 Dec 2010 00:28:34 +0100
Subject: [PATCH 05/17] Feature #2479 rev. announcements tool bars

---
 .../toolbars/extended/announcements.php       | 57 +++++++++++--------
 .../extended/announcements_student.php        | 57 +++++++++++--------
 2 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements.php b/main/inc/lib/fckeditor/toolbars/extended/announcements.php
index f673c0d422..4fd37466dc 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/announcements.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/announcements.php
@@ -7,37 +7,46 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps, ASCIIMath don't run ok here. 
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('Save','FitWindow','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-    array('Table','SpecialChar'),
-    array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'),
-    '/',
-    array('Style','FontFormat','FontName','FontSize'),
-    array('Bold','Italic','Underline'),
-    array('JustifyLeft','JustifyCenter','JustifyRight')
+	array('Save','NewPage','Templates','-','PasteWord'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','-','Save','NewPage','Preview'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('Save','NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.
diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php
index 185c510bf1..d962d078c9 100755
--- a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php
+++ b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php
@@ -7,38 +7,47 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+//TODO: DocProps, ASCIIMath don't run ok here. 
+//NOTE: ONLY FOR TEACHERS: source, insert html
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('Save','FitWindow','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink','Anchor'),
-    array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-    array('Table','SpecialChar'),
-    array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
-    '/',
-    array('Style','FontFormat','FontName','FontSize'),
-    array('Bold','Italic','Underline'),
-    array('JustifyLeft','JustifyCenter','JustifyRight'),
-	array('ShowBlocks')
+	array('Save','NewPage','Templates','-','PasteWord'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','-','Save','NewPage','Preview'),
+	array('Save','NewPage','Templates','-','Preview','Print'),
 	array('Cut','Copy','Paste','PasteText','PasteWord'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar'),
-	array('Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks')
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.

From 2af3626acbe26cfc2eb813ae036ba83220aa876b Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 30 Dec 2010 17:51:33 +0200
Subject: [PATCH 06/17] Feature #2132 - Development of "asciisvg" plug-in (2),
 unfinished work.

---
 .../fckeditor/editor/plugins/asciisvg/d.svg   |   8 +
 .../editor/plugins/asciisvg/fck_asciisvg.html |  83 +++-
 .../editor/plugins/asciisvg/fck_asciisvg.js   | 433 +++++++++++++++++-
 .../editor/plugins/asciisvg/fckplugin.js      |   2 +-
 .../plugins/asciisvg/fckplugin_compressed.js  |   2 +-
 5 files changed, 521 insertions(+), 7 deletions(-)
 create mode 100644 main/inc/lib/fckeditor/editor/plugins/asciisvg/d.svg

diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/d.svg b/main/inc/lib/fckeditor/editor/plugins/asciisvg/d.svg
new file mode 100644
index 0000000000..7403c650c8
--- /dev/null
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/d.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+  "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg id="root" xml:space="preserve" width="100%" height="100%"
+  preserveAspectRatio="xMidYMid meet"
+  xmlns="http://www.w3.org/2000/svg"
+  xmlns:xlink="http:///www.w3.org/1999/xlink">
+</svg>
diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html
index 1980d84f00..2d44604c6d 100644
--- a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html
@@ -2,7 +2,7 @@
 <!--
  *  Chamilo LMS
  *
- *  Copyright (c) 2010 Ivan Tcholakov <ivantcholakov@gmail.com>
+ *  Copyright (c) 2011 Ivan Tcholakov <ivantcholakov@gmail.com>
  *
  *  License:
  *  GNU Lesser General Public License, Version 3, 29 June 2007
@@ -36,5 +36,86 @@ form p { margin-top: 5px; margin-bottom: 5px; }
     </head>
 <body scroll="no" style="overflow: hidden;">
 
+Equation type: <select id="eqntype" onchange="javascript: AsciisvgDialog.changetype();">
+<option value="func">y=f(x)</option>
+<option value="polar">r=f(t)</option>
+<option value="param">x=f(t),y=g(t)</option>
+<option value="slope">dy/dx = f(x,y)</option>
+</select>
+&nbsp;&nbsp;&nbsp;
+<span id="eq1lbl">f(x)=</span> <input type="text" id="equation" size="15" value="sin(x)"/> <span id="eq2lbl"><i></i></span><span id="eq2"><i></i></span>
+&nbsp;from <input type="text" id="xstart" size="4" value=""/> to <input type="text" id="xend" size="4" value=""/>
+<hr/>
+
+Color: <Select id="gcolor">
+    <option value="black">Black</option>
+    <option value="red">Red</option>
+    <option value="orange">Orange</option>
+    <option value="yellow">Yellow</option>
+    <option value="green">Green</option>
+    <option value="blue">Blue</option>
+    <option value="purple">Purple</option>
+</select>
+Width: <Select id="strokewidth">
+    <option value="1">1</option>
+    <option value="2">2</option>
+    <option value="3">3</option>
+    <option value="4">4</option>
+</select>
+Line: <Select id="strokedash">
+    <option value="none">Solid</option>
+    <option value="2">Dotted</option>
+    <option value="5">Dashed</option>
+    <option value="5 2">Tight Dash</option>
+    <option value="7 3 2 3">Dash-Dot</option>
+</select>
+
+Start with: <Select id="gstart">
+    <option value="none">Nothing</option>
+    <option value="arrow">Arrow</option>
+    <option value="opendot">Open Dot</option>
+    <option value="dot">Dot</option>
+</select>
+End with: <Select id="gend">
+    <option value="none">Nothing</option>
+    <option value="arrow">Arrow</option>
+    <option value="opendot">Open Dot</option>
+    <option value="dot">Dot</option>
+</select>
+
+<hr/>
+
+xmin: <input type="text" id="xmin" size="4" value="-7.5" onChange='javascript: AsciisvgDialog.graphit();'/>
+xmax: <input type="text" id="xmax" size="4" value="7.5" onChange='javascript: AsciisvgDialog.graphit();'/>
+xscl: <input type="text" id="xscl" size="3" value="1" onChange='javascript: AsciisvgDialog.graphit();'/>
+&nbsp;&nbsp;
+ymin: <input type="text" id="ymin" size="4" value="-5" onChange='javascript: AsciisvgDialog.graphit();'/>
+ymax: <input type="text" id="ymax" size="4" value="5" onChange='javascript: AsciisvgDialog.graphit();'/>
+yscl: <input type="text" id="yscl" size="3" value="1" onChange='javascript: AsciisvgDialog.graphit();'/>
+<hr/>
+
+Show axis labels: <input type="checkbox" id="labels" value="Show Labels" onClick='javascript: AsciisvgDialog.graphit();' checked="checked"/>
+Show XY grid: <input type="checkbox" id="grid" value="Show Grid" onClick='javascript: AsciisvgDialog.graphit();' checked="checked"/>
+&nbsp;&nbsp;
+Resize to: <input type="text" id="gwidth" size="5" value="300"/> by <input type="text" id="gheight" size="5" value="200"/>
+<input type="button" value="Update" onclick="javascript: AsciisvgDialog.graphit();"/>
+<hr/>
+
+<input type="button" value="Add Graph" onclick="javascript: AsciisvgDialog.addgraph();"/>
+Graphs: <select id="graphs" onchange="javascript: AsciisvgDialog.loadeqn();"></select>
+<input type="button" value="Replace Selected Graph" onclick="javascript: AsciisvgDialog.replacegraph();"/>
+<input type="button" value="Remove" onclick="javascript: AsciisvgDialog.removegraph();"/>
+<select id="alignment" onchange="javascript: AsciisvgDialog.graphit();">
+<option value="text-top">Top</option>
+<option value="middle">Middle</option>
+<option value="text-bottom">Bottom</option>
+<option value="left">Float left</option>
+<option value="right">Float right</option>
+</select>
+
+<hr/>
+
+<div id="preview"><embed id="previewsvg" type="image/svg+xml" src="d.svg" style="width: 300px; height: 200px; vertical-align: middle; float: none;" sscr="-7.5,7.5,-5,5,1,1,1,1,1,300,200" /></div>
+
 </body>
 </html>
diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js
index 16d4523c2d..c54987c55f 100644
--- a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js
@@ -32,7 +32,9 @@ var alertIfNoMathML = false ;
 var notifyIfNoSVG = false ;
 var alertIfNoSVG = false ;
 // Formula translation will be called explicitly in this dialog after it loads.
-var translateOnLoad = false ;
+//var translateOnLoad = false ;
+var translateOnLoad = true ;
+//
 // Formula tooltips are hard-coded in this dialog, there is no need they to be generated.
 var showasciiformulaonhover = false ;
 // Font size of the formulas in this dialog.
@@ -43,7 +45,7 @@ function LoadSelection()
 {
     // ...
 
-    Preview() ;
+    UpdatePreview() ;
 }
 
 function Ok()
@@ -59,15 +61,438 @@ window.onload = function()
     oEditor.FCKLanguageManager.TranslatePage( document ) ;
 
     // Initialization of the script ASCIIMathML.js.
-    init() ;
+    //init() ;
+
+    // Initialization of the dialog's script.
+    AsciisvgDialog.init() ;
 
     // Load the selected element information (if any).
-    //LoadSelection() ;
+    LoadSelection() ;
 
     dialog.SetAutoSize( true ) ;
 
     // Activate the "OK" button.
     dialog.SetOkButton( true ) ;
+}
 
+function LoadSelection()
+{
+    UpdatePreview() ;
+}
+
+function UpdatePreview()
+{
+    AsciisvgDialog.graphit() ;
 }
 
+
+
+//tinyMCEPopup.requireLangPack();
+
+var AsciisvgDialog =
+{
+    width: 300 ,
+    height: 200 ,
+    alignm: 'middle' ,
+    //sscr: '' ,
+    sscr: '-7.5,7.5,-5,5,1,1,1,1,1,300,200' ,
+    //isnew: null ,
+    isnew: true ,
+    AScgiloc: null ,
+
+    init : function()
+    {
+        //var f = document.forms[ 0 ] ;
+
+        // Get the selected contents as text and place it in the input.
+        /*
+        this.width = tinyMCEPopup.getWindowArg( 'width' ) ;
+        this.height = tinyMCEPopup.getWindowArg( 'height' ) ;
+        this.isnew = tinyMCEPopup.getWindowArg( 'isnew' ) ;
+        this.sscr = tinyMCEPopup.getWindowArg( 'sscr' ) ;
+        */
+        //this.AScgiloc = tinyMCEPopup.getWindowArg( 'AScgiloc' ) ;
+        this.AScgiloc = AScgiloc ;
+        /*
+        this.alignm = tinyMCEPopup.getWindowArg( 'alignm' ) ;
+        */
+
+        if ( noSVG )
+        {
+            GetE( 'preview' ).innerHTML = '<img id="previewimg" style="width:' + this.width + 'px; height: ' + this.height + 'px; vertical-align: middle; float: none;" src="' + this.AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) + '" script=" " />' ;
+        }
+        else
+        {
+            //GetE( 'preview' ).innerHTML = '<embed id="previewsvg" type="image/svg+xml" src="' + FCKConfig.DrawingASCIISVG + '" style="width: 300px; height: 200px; vertical-align: middle; float: none;" sscr="-7.5,7.5,-5,5,1,1,1,1,1,300,200" />' ;
+            GetE( 'previewsvg' ).setAttribute( 'sscr' , this.sscr );
+        }
+        this.getsscr( this.sscr ) ;
+    } ,
+
+    insert : function()
+    {
+        ed = tinyMCEPopup.editor ;
+        // Insert the contents from the input into the document.
+        if ( this.isnew )
+        {
+            if ( this.alignm == 'left' || this.alignm == 'right' )
+            {
+                aligntxt = 'vertical-align: middle; float: ' + this.alignm + ';' ;
+            }
+            else
+            {
+                aligntxt = 'vertical-align: ' + this.alignm + '; float: none;' ;
+            }
+            tinyMCEPopup.editor.execCommand( 'mceInsertContent', false, '<img style="width: 300px; height: 200px; ' + aligntxt + '" src="' + this.AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) + '" sscr="' + this.sscr + '" script=" " />') ;
+        }
+        else
+        {
+            el = tinyMCEPopup.editor.selection.getNode() ;
+            ed.dom.setAttrib( el , 'sscr' , this.sscr ) ;
+            ed.dom.setAttrib( el , 'src' , this.AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) ) ;
+            ed.dom.setAttrib( el , 'width' , this.width ) ;
+            ed.dom.setAttrib( el , 'height' , this.height ) ;
+            ed.dom.setStyle( el , 'width' , this.width + 'px' ) ;
+            ed.dom.setStyle( el , 'height' , this.height + 'px') ;
+            if ( this.alignm == 'left' || this.alignm == 'right' )
+            {
+                ed.dom.setStyle( el , 'float' , this.alignm ) ;
+                ed.dom.setStyle( el , 'vertical-align' , 'middle' ) ;
+            }
+            else
+            {
+                ed.dom.setStyle( el , 'float' , 'none' ) ;
+                ed.dom.setStyle( el , 'vertical-align' , this.alignm ) ;
+            }
+        }
+        tinyMCEPopup.close() ;
+    } ,
+
+    addgraph : function()
+    {
+        var graphs = GetE( 'graphs' ) ;
+        var newopt = document.createElement( 'option' ) ;
+
+        var type = GetE( 'eqntype' ).value ;
+        var eq1 = GetE( 'equation' ).value ;
+        var eq2 = null ;
+
+        if ( type == 'func' )
+        {
+            newopt.text = 'y=' + eq1 ;
+        }
+        else if ( type == 'polar' )
+        {
+            newopt.text = 'r=' + eq1 ;
+        }
+        else if ( type == 'param' )
+        {
+            eq2= GetE( 'eqn2' ).value ;
+            newopt.text = '[x,y]=[' + eq1 + ','+ eq2 + ']' ;
+        }
+        else if ( type == 'slope' )
+        {
+            newopt.text = 'dy/dx=' + eq1 ;
+            eq2= GetE( 'eqn2' ).value ;
+        }
+
+        m_gstart = GetE( 'gstart' ).selectedIndex ;
+        m_gend = GetE( 'gend' ).selectedIndex ;
+        m_color = GetE( 'gcolor' ).value ;
+        m_strokewidth = GetE( 'strokewidth' ).value ;
+        m_strokedash = GetE( 'strokedash' ).value ;
+        if ( GetE( 'xstart' ).value.length > 0 )
+        {
+            //newopt.value = 'myplot(' + eqn +',"' + m_gstart+  '","' + m_gend + '",' + GetE( 'xstart' ).value + ',' + GetE( 'xend' ).value  + ');' ;
+            newopt.value = type + ',' + eq1 + ',' + eq2 + ',' + m_gstart + ',' + m_gend + ',' + GetE( 'xstart' ).value + ',' + GetE( 'xend' ).value + ',' + m_color + ',' + m_strokewidth + ',' + m_strokedash ;
+        }
+        else
+        {
+            //newopt.value = 'myplot(' + eqn + ',"' + m_gstart + '","' + m_gend + '");' ;
+            newopt.value = type + ',' + eq1 + ',' + eq2 + ',' + m_gstart + ',' + m_gend + ',,' + ',' + m_color + ',' + m_strokewidth + ',' + m_strokedash ;
+        }
+
+        graphs.options[ graphs.options.length ] = newopt ;
+        graphs.selectedIndex = graphs.options.length - 1 ;
+        this.graphit() ;
+        GetE( 'equation' ).focus() ;
+    } ,
+
+    replacegraph : function()
+    {
+        var graphs = GetE( 'graphs' ) ;
+        if ( graphs.selectedIndex >= 0 )
+        {
+            graphs.options[ graphs.selectedIndex ] = null ;  //standards compliant
+        }
+        this.addgraph() ;
+    } ,
+
+    removegraph : function()
+    {
+        var graphs = GetE( 'graphs' ) ;
+        if ( graphs.selectedIndex >= 0 ) {
+            graphs.options[ graphs.selectedIndex ] = null ;
+            if ( graphs.options.length > 0 ) { this.loadeqn() ; }
+        }
+        this.graphit() ;
+        GetE( 'equation' ).focus() ;
+    } ,
+
+    graphit : function()
+    {
+        //ed = tinyMCEPopup.editor ;
+        var commands ;
+        commands = '' ;
+
+        initialized = false ;
+
+        //commands = 'setBorder(5);' ;
+
+        m_xmin = GetE( 'xmin' ).value ;
+        m_xmax = GetE( 'xmax' ).value ;
+        m_ymin = GetE( 'ymin' ).value ;
+        m_ymax = GetE( 'ymax' ).value ;
+        if ( m_ymin == '' ) m_ymin = null ;
+        if ( m_ymax == '' ) m_ymax = null ;
+        commands += m_xmin + ',' + m_xmax + ',' + m_ymin + ',' + m_ymax + ',' ;
+
+        m_xscl = GetE( 'xscl' ).value ;
+        m_yscl = GetE( 'yscl' ).value ;
+        if ( m_xscl == '' ) m_xscl = null ;
+        if ( m_yscl == '' ) m_yscl = null ;
+        if ( GetE( 'labels' ).checked )
+        {
+            m_labels = '1' ;
+        }
+        else
+        {
+            m_labels = 'null' ;
+        }
+
+        if ( GetE( 'grid' ).checked )
+        {
+            m_grid = ',' + m_xscl + ',' + m_yscl ;
+        }
+        else
+        {
+            m_grid = ',null,null' ;
+        }
+        commands += m_xscl + ',' + m_yscl + ',' + m_labels + m_grid ;
+
+        commands += ',' + GetE( 'gwidth' ).value + ',' + GetE( 'gheight' ).value ;
+
+
+        graphs = GetE( 'graphs' ) ;
+        for ( i = 0 ; i < graphs.length ; i++ )
+        {
+            commands += ',' + graphs.options[i].value ;
+        }
+
+        this.width = GetE( 'gwidth' ).value ;
+        this.height = GetE( 'gheight' ).value ;
+        this.sscr = commands ;
+        this.alignm = GetE( 'alignment' ).value ;
+
+        if ( noSVG )
+        {
+            pvimg = GetE( 'previewimg' ) ;
+            pvimg.src = this.AScgiloc + '?sscr=' + encodeURIComponent(commands) ;
+            //ed.dom.setStyle( pvimg, 'width' , this.width + 'px' ) ;
+            //ed.dom.setStyle( pvimg, 'height' , this.height + 'px' ) ;
+        }
+        else
+        {
+            pvsvg = GetE( 'previewsvg' ) ;
+            parseShortScript( commands , this.width , this.height ) ;
+        }
+    } ,
+
+    changetype : function()
+    {
+        var type = GetE( 'eqntype' ).value ;
+
+        if ( type == 'func' )
+        {
+            this.chgtext( 'eq1lbl', 'f(x)=' ) ;
+            GetE( 'equation' ).value = 'sin(x)' ;
+            this.chgtext( 'eq2lbl' , '' ) ;
+            this.chgtext( 'eq2' , '' ) ;
+
+        }
+        else if ( type == 'polar' )
+        {
+            this.chgtext( 'eq1lbl' , 'r(t)=' ) ;
+            GetE( 'equation' ).value = 't' ;
+            this.chgtext( 'eq2lbl' , '' ) ;
+            this.chgtext( 'eq2' , '' ) ;
+
+        }
+        else if ( type == 'param' )
+        {
+            this.chgtext( 'eq1lbl' , 'f(t)=' ) ;
+            this.chgtext( 'eq2lbl' , 'g(t)= ' ) ;
+            var newinput = document.createElement( 'input' ) ;
+            newinput.type = 'text' ;
+            newinput.name = 'eqn2' ;
+            newinput.id = 'eqn2' ;
+            newinput.size = '15' ;
+            newinput.value = 'cos(t)' ;
+            var cnode = GetE( 'eq2' ) ;
+            cnode.replaceChild( newinput,cnode.lastChild ) ;
+            GetE( 'equation' ).value = 'sin(t)' ;
+
+        }
+        else if ( type == 'slope' )
+        {
+            this.chgtext( 'eq1lbl' , 'dy/dx (x,y) = ' ) ;
+            GetE( 'equation' ).value = 'x*y' ;
+            this.chgtext( 'eq2lbl' , 'every ' ) ;
+            var newinput = document.createElement( 'input' ) ;
+            newinput.type = 'text' ;
+            newinput.name = 'eqn2' ;
+            newinput.id = 'eqn2' ;
+            newinput.size = '2' ;
+            newinput.value = '1' ;
+            var cnode = GetE( 'eq2' ) ;
+            cnode.replaceChild( newinput , cnode.lastChild ) ;
+        }
+        GetE( 'gstart' ).selectedIndex = 0 ;
+        GetE( 'gend' ).selectedIndex = 0 ;
+        GetE( 'xstart' ).value = '' ;
+        GetE( 'xend' ).value = '' ;
+        GetE( 'gcolor' ).selectedIndex = 0 ;
+        GetE( 'strokewidth' ).selectedIndex = 0 ;
+        GetE( 'strokedash' ).selectedIndex = 0 ;
+    } ,
+
+    loadeqn : function()
+    {
+        graphs = GetE( 'graphs' ) ;
+
+        var sa = graphs.options[ graphs.selectedIndex ].value.split( ',' ) ;
+
+        if ( sa[0] == 'func' ) {
+            GetE( 'eqntype' ).selectedIndex = 0 ;
+        } else if ( sa[0] == 'polar' ) {
+            GetE( 'eqntype' ).selectedIndex = 1 ;
+        } else if ( sa[0] == 'param' ) {
+            GetE( 'eqntype' ).selectedIndex = 2 ;
+        } else if ( sa[0] == 'slope' ) {
+            GetE( 'eqntype' ).selectedIndex = 3 ;
+        }
+        this.changetype() ;
+        GetE( 'equation' ).value = sa[1] ;
+        if ( ( sa[0] == 'param' ) || ( sa[0] == 'slope' ) ) {
+            GetE( 'eqn2' ).value = sa[2] ;
+        }
+
+        GetE( 'gstart' ).selectedIndex = sa[ 3 ] ;
+        GetE( 'gend' ).selectedIndex = sa[ 4 ] ;
+        GetE( 'xstart' ).value = sa[ 5 ] ;
+        GetE( 'xend' ).value = sa[ 6 ] ;
+        switch ( sa[ 7 ] )
+        {
+            case 'black' : GetE( 'gcolor' ).selectedIndex = 0 ; break ;
+            case 'red' : GetE( 'gcolor' ).selectedIndex = 1 ; break ;
+            case 'orange' : GetE( 'gcolor' ).selectedIndex = 2 ; break ;
+            case 'yellow' : GetE( 'gcolor' ).selectedIndex = 3 ; break ;
+            case 'green' : GetE( 'gcolor' ).selectedIndex = 4 ; break ;
+            case 'blue' : GetE( 'gcolor' ).selectedIndex = 5 ; break ;
+            case 'purple' : GetE( 'gcolor' ).selectedIndex = 6 ; break ;
+        }
+        GetE( 'strokewidth' ).selectedIndex = sa[ 8 ] - 1 ;
+        switch ( sa[ 9 ] )
+        {
+            case '2' : GetE( 'strokedash' ).selectedIndex = 1 ; break ;
+            case '5' : GetE( 'strokedash' ).selectedIndex = 2 ; break ;
+            case '5 2' : GetE( 'strokedash' ).selectedIndex = 3 ; break ;
+            case '7 3 2 3' : GetE( 'strokedash' ).selectedIndex = 4 ; break ;
+            default : GetE( 'strokedash' ).selectedIndex = 0 ;
+        }
+    } ,
+
+    getsscr : function( text , alignment )
+    {
+        alignment = 'middle' ;
+        sa = text.split( ',' ) ;
+        GetE( 'xmin' ).value = sa[ 0 ] ;
+        GetE( 'xmax' ).value = sa[ 1 ] ;
+        GetE( 'ymin' ).value = sa[ 2 ] ;
+        GetE( 'ymax' ).value = sa[ 3 ] ;
+        GetE( 'xscl' ).value = sa[ 4 ] ;
+        GetE( 'yscl' ).value = sa[ 5 ] ;
+
+        if ( sa[ 6 ] != 'null' )
+        {
+            GetE( 'labels' ).checked = true ;
+        }
+        else
+        {
+            GetE( 'labels' ).checked = false ;
+        }
+        if ( typeof eval( sa[ 7 ] ) == 'number' )
+        {
+            GetE( 'grid' ).checked = true ;
+        }
+        else
+        {
+            GetE( 'grid' ).checked = false ;
+        }
+
+        GetE( 'gwidth' ).value = sa[ 9 ] ;
+        GetE( 'gheight' ).value = sa[ 10 ] ;
+
+        GetE( 'graphs' ).length = 0 ;
+
+        var inx = 11 ;
+        while ( sa.length > inx + 9 )
+        {
+            var newopt = document.createElement( 'option' ) ;
+
+            if ( sa[ inx ] == 'func' )
+            {
+                newopt.text = 'y=' + sa[ inx + 1 ] ;
+            }
+            else if ( sa[ inx ] == 'polar' )
+            {
+                newopt.text = 'r=' + sa[ inx + 1 ] ;
+            }
+            else if ( sa[inx] == 'param' )
+            {
+                newopt.text = '[x,y]=[' + sa[ inx + 1 ] + ',' + sa[ inx + 2 ] + ']' ;
+            }
+            else if ( sa[inx] == 'slope' )
+            {
+                newopt.text = 'dy/dx=' + sa[ inx + 1 ] ;
+            }
+            newopt.value = sa[inx] + ',' + sa[ inx + 1 ] + ',' + sa[ inx + 2 ] + ',' + sa[ inx + 3 ] + ',' + sa[ inx + 4 ] + ',' + sa[ inx + 5 ] + ',' + sa[ inx + 6 ] + ',' + sa[ inx + 7 ] + ',' + sa[ inx + 8] + ',' + sa[ inx + 9 ] ;
+            graphs = GetE( 'graphs' ) ;
+            graphs.options[ graphs.options.length ] = newopt ;
+            //GetE( 'graphs' ).add( newopt ) ;
+            inx += 10 ;
+        }
+        if ( inx > 11 ) {
+            this.loadeqn() ;
+        }
+
+        switch ( alignment.toLowerCase() )
+        {
+            case 'text-top' : GetE( 'alignment' ).selectedIndex = 0 ; break ;
+            case 'middle' : GetE( 'alignment' ).selectedIndex = 1 ; break ;
+            case 'text-bottom' : GetE( 'alignment' ).selectedIndex = 2 ; break ;
+            case 'left' : GetE( 'alignment' ).selectedIndex = 3 ; break ;
+            case 'right' : GetE( 'alignment' ).selectedIndex = 4 ; break ;
+            default: GetE( 'alignment' ).selectedIndex = 0 ; break ;
+        }
+
+        //this.graphit() ;
+    } ,
+
+    chgtext : function( tag , text )
+    {
+        var cnode = GetE( tag ) ;
+        cnode.replaceChild( document.createTextNode( text ) , cnode.lastChild ) ;
+    }
+
+} ;
diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin.js b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin.js
index 1f62ddad81..27a97cb5fb 100644
--- a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin.js
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin.js
@@ -24,7 +24,7 @@ var alertIfNoSVG = false;
 var translateASCIIMath = false ;
 
 // Registering the related command.
-FCKCommands.RegisterCommand( 'asciisvg', new FCKDialogCommand( FCKLang['DlgAsciiSvg'], FCKLang['DlgAsciiSvgGraphEditor'], FCKConfig.PluginsPath + 'asciisvg/fck_asciisvg.html', 500, 500 ) ) ;
+FCKCommands.RegisterCommand( 'asciisvg', new FCKDialogCommand( FCKLang['DlgAsciiSvg'], FCKLang['DlgAsciiSvgGraphEditor'], FCKConfig.PluginsPath + 'asciisvg/fck_asciisvg.html', 700, 600 ) ) ;
 
 // Create the "asciisvg" toolbar button.
 var oAsciiSvgItem = new FCKToolbarButton( 'asciisvg', FCKLang['DlgAsciiSvg'] ) ;
diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin_compressed.js b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin_compressed.js
index 1f62ddad81..27a97cb5fb 100644
--- a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin_compressed.js
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fckplugin_compressed.js
@@ -24,7 +24,7 @@ var alertIfNoSVG = false;
 var translateASCIIMath = false ;
 
 // Registering the related command.
-FCKCommands.RegisterCommand( 'asciisvg', new FCKDialogCommand( FCKLang['DlgAsciiSvg'], FCKLang['DlgAsciiSvgGraphEditor'], FCKConfig.PluginsPath + 'asciisvg/fck_asciisvg.html', 500, 500 ) ) ;
+FCKCommands.RegisterCommand( 'asciisvg', new FCKDialogCommand( FCKLang['DlgAsciiSvg'], FCKLang['DlgAsciiSvgGraphEditor'], FCKConfig.PluginsPath + 'asciisvg/fck_asciisvg.html', 700, 600 ) ) ;
 
 // Create the "asciisvg" toolbar button.
 var oAsciiSvgItem = new FCKToolbarButton( 'asciisvg', FCKLang['DlgAsciiSvg'] ) ;

From 424f57b2a73ff69ff12a820737d4ebe98f09b2b8 Mon Sep 17 00:00:00 2001
From: ywarnier <ywarnier@beeznest.org>
Date: Thu, 30 Dec 2010 12:49:39 -0500
Subject: [PATCH 07/17] Minor - updated comments about HTML style filtering

---
 main/forum/forumfunction.inc.php   |  5 +++--
 main/forum/viewthread_flat.inc.php | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 1558018ef8..14df283073 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -3262,8 +3262,9 @@ function prepare4display($input='') {
 				$counter++;
 			}
 		}
-		//return api_html_entity_decode(stripslashes($input));
-		return Security::remove_XSS($input, STUDENT);
+        //return api_html_entity_decode(stripslashes($input));
+        //change this to COURSEMANAGERLOWSECURITY or COURSEMANAGER to lower filtering and allow more styles (see comments of Security::remove_XSS() method to learn about other levels)
+        return Security::remove_XSS($input, STUDENT);
 	} else {
 		$returnarray=array_walk($input, 'api_html_entity_decode');
 		$returnarray=array_walk($input, 'stripslashes');
diff --git a/main/forum/viewthread_flat.inc.php b/main/forum/viewthread_flat.inc.php
index d4c1a11749..e3b7461e54 100755
--- a/main/forum/viewthread_flat.inc.php
+++ b/main/forum/viewthread_flat.inc.php
@@ -111,7 +111,7 @@ if (isset($current_thread['thread_id'])){
 			}
 		}
 		echo "</td>";
-		// show the
+		// prepare the notification icon
 		if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]) and !empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$row['post_id']]) and !empty($whatsnew_post_info[$_GET['forum']][$row['thread_id']])) {
 			$post_image=icon('../img/forumpostnew.gif');
 		} else {
@@ -124,10 +124,11 @@ if (isset($current_thread['thread_id'])){
 		
 		echo "</tr>";
 		
-		// The post message
-		echo "<tr>";
-		echo "<td class=\"$messageclass\">".prepare4display($row['post_text'])."</td>";
-		echo "</tr>";
+        // The post message
+        echo "<tr>";
+        // see comments inside forumfunction.inc.php to lower filtering and allow more visual changes
+        echo "<td class=\"$messageclass\">".prepare4display($row['post_text'])."</td>";
+        echo "</tr>";
 	
 		// The check if there is an attachment
 		 

From 1fb645d09dbd1afaad71e873ebdb6d10a5f66db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Thu, 30 Dec 2010 19:46:57 +0100
Subject: [PATCH 08/17] Feature #2484 function is_my_shared folder detect also
 the user's subfolders

---
 main/document/document.inc.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 1788eaf773..7c721c4f09 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -386,6 +386,7 @@ function build_move_to_selector($folders, $curdirpath, $move_file, $group_dir =
 		if ($curdirpath != '/') {
 			$form .= '<option value="/">'.get_lang('Documents').'</option>';
 		}
+		
 		if (is_array($folders)) {
 			foreach ($folders as & $folder) {
 				// You cannot move a file to:
@@ -550,15 +551,18 @@ function is_any_user_shared_folder($path, $current_session_id) {
 }
 
 /**
- * Checks whether the user is into his shared folder
- * @return return bool Return true when user is in his user shared folder
+ * Checks whether the user is into his shared folder or into a subfolder
+ * @return return bool Return true when user is in his user shared folder or into a subforder
  */
 function is_my_shared_folder($user_id, $path, $current_session_id) {
-	$clean_path = Security::remove_XSS($path);
-	if($clean_path == '/shared_folder/sf_user_'.$user_id){
+	$clean_path = Security::remove_XSS($path).'/';	
+	$main_user_shared_folder = '/shared_folder\/sf_user_'.$user_id.'\//';
+	$main_user_shared_folder_session='/shared_folder_session_'.$current_session_id.'\/sf_user_'.$user_id.'\//';
+	
+	if(preg_match($main_user_shared_folder, $clean_path)){
 		return true;
 	}
-	elseif($clean_path == '/shared_folder_session_'.$current_session_id.'/sf_user_'.$user_id){
+	elseif(preg_match($main_user_shared_folder_session, $clean_path)){
 		return true;
 	}
 	else{

From 62ede2dadd28375a36f445b0ec304eacfb4c0929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Thu, 30 Dec 2010 22:25:30 +0100
Subject: [PATCH 09/17] Feature #2484 Enabled move folders for students into
 his/her shared folder

---
 main/document/document.inc.php |  4 ++--
 main/document/document.php     | 27 +++++++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 7c721c4f09..a381255425 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -556,8 +556,8 @@ function is_any_user_shared_folder($path, $current_session_id) {
  */
 function is_my_shared_folder($user_id, $path, $current_session_id) {
 	$clean_path = Security::remove_XSS($path).'/';	
-	$main_user_shared_folder = '/shared_folder\/sf_user_'.$user_id.'\//';
-	$main_user_shared_folder_session='/shared_folder_session_'.$current_session_id.'\/sf_user_'.$user_id.'\//';
+	$main_user_shared_folder = '/shared_folder\/sf_user_'.$user_id.'\//';//for security does not remove the last slash
+	$main_user_shared_folder_session='/shared_folder_session_'.$current_session_id.'\/sf_user_'.$user_id.'\//';//for security does not remove the last slash
 	
 	if(preg_match($main_user_shared_folder, $clean_path)){
 		return true;
diff --git a/main/document/document.php b/main/document/document.php
index 90166df52b..a98c8cf81e 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -442,7 +442,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 
 	/*	MOVE FILE OR DIRECTORY */
 	//Only teacher and all users into their group
-	if($is_allowed_to_edit || $group_member_with_upload_rights){	
+	if($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id) || is_my_shared_folder($_user['user_id'], Security::remove_XSS($_POST['move_to']), $current_session_id)){	
 		$my_get_move = Security::remove_XSS($_GET['move']);
 		if (isset($_GET['move']) && $_GET['move'] != '') {
 			
@@ -459,13 +459,29 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 			}
 	
 			if (DocumentManager::get_document_id($_course, $my_get_move)) {
-				$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit || $group_member_with_upload_rights);				
+				$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit || $group_member_with_upload_rights);
 				
-				echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';
-				echo build_move_to_selector($folders, Security::remove_XSS($_GET['curdirpath']), $my_get_move, $group_properties['directory']);
+				//filter if is my shared folder. TODO: move this code to build_move_to_selector function
+				if(is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id) && !$is_allowed_to_edit){
+					$main_user_shared_folder_sub  = '/shared_folder\/sf_user_'.api_get_user_id().'\//';//all subfolders			
+					$main_user_shared_folder_main = '/shared_folder\/sf_user_'.api_get_user_id().'$/';//only main user shared folder
+					$user_shared_folders=array();
+					
+					foreach($folders as $fold){
+						if(preg_match($main_user_shared_folder_main, $fold) || preg_match($main_user_shared_folder_sub, $fold)){
+							$user_shared_folders[]=$fold;
+						}
+					}						
+					echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';
+					echo build_move_to_selector($user_shared_folders, Security::remove_XSS($_GET['curdirpath']), $my_get_move, $group_properties['directory']);
+				}
+				else{
+					echo '<div class="row"><div class="form_header">'.get_lang('Move').'</div></div>';
+					echo build_move_to_selector($folders, Security::remove_XSS($_GET['curdirpath']), $my_get_move, $group_properties['directory']);			
+				}
 			}
 		}
-	
+		
 		if (isset($_POST['move_to']) && isset($_POST['move_file'])) {
 			if (!$is_allowed_to_edit) {
 				if (DocumentManager::check_readonly($_course, $_user['user_id'], $my_get_move)) {
@@ -484,7 +500,6 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 			// This is needed for the update_db_info function
 			//$dbTable = $_course['dbNameGlu'].'document';
 			$dbTable = Database::get_course_table(TABLE_DOCUMENT);
-	
 			// Security fix: make sure they can't move files that are not in the document table
 			if (DocumentManager::get_document_id($_course, $_POST['move_file'])) {
 				if (move($base_work_dir.$_POST['move_file'], $base_work_dir.$_POST['move_to'])) {

From 1ba34370b05bfffa241f8fbd025cfa9a11832fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Thu, 30 Dec 2010 22:36:23 +0100
Subject: [PATCH 10/17] Feature #2484 Enabled delete files and folders for
 students into his/her shared folder

---
 main/document/document.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index a98c8cf81e..78a44d4bb5 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -441,7 +441,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 //START ACTION MENU
 
 	/*	MOVE FILE OR DIRECTORY */
-	//Only teacher and all users into their group
+	//Only teacher and all users into their group and each user into his/her shared folder
 	if($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id) || is_my_shared_folder($_user['user_id'], Security::remove_XSS($_POST['move_to']), $current_session_id)){	
 		$my_get_move = Security::remove_XSS($_GET['move']);
 		if (isset($_GET['move']) && $_GET['move'] != '') {
@@ -516,9 +516,10 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 			}
 		}
 	}
+	
 	/*	DELETE FILE OR DIRECTORY */
 	//Only teacher and all users into their group
-	if($is_allowed_to_edit || $group_member_with_upload_rights){
+	if($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id)){
 		if (isset($_GET['delete'])) {
 			
 			if (api_is_coach()) {

From e6f961d4a8f8841b60a5a0aa23bc08473df70af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Thu, 30 Dec 2010 22:44:29 +0100
Subject: [PATCH 11/17] Feature #2484 Enabled personal templates for students
 into his/her shared folder

---
 main/document/document.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/document/document.php b/main/document/document.php
index 78a44d4bb5..31ea925784 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -650,7 +650,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 	
 	/*	TEMPLATE ACTION */
 	//Only teacher and all users into their group
-	if($is_allowed_to_edit || $group_member_with_upload_rights){
+	if($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id)){
 		if (isset($_GET['add_as_template']) && !isset($_POST['create_template'])) {
 	
 			$document_id_for_template = intval($_GET['add_as_template']);

From c0d96cfcdfd3ec6c625621f9eb2e046ec0ffee22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Fri, 31 Dec 2010 01:16:45 +0100
Subject: [PATCH 12/17] Feature #2484 change shared by users and provide visual
 consistency

---
 main/document/document.inc.php                |  16 ++++++++--------
 main/group/group.php                          |   2 +-
 main/img/group_category.gif                   | Bin 0 -> 1245 bytes
 main/img/user_folders.gif                     | Bin 0 -> 1247 bytes
 main/inc/banner.inc.php                       |   4 ++--
 main/inc/lib/add_course.lib.inc.php           |   2 +-
 .../images/big_icon/bigfolderShared.png       | Bin 56265 -> 3351 bytes
 .../images/small_icon/folderShared.png        | Bin 621 -> 730 bytes
 main/lang/bulgarian/exercice.inc.php          |   2 +-
 main/lang/english/document.inc.php            |   1 +
 main/lang/english/install.inc.php             |   2 +-
 main/lang/english/trad4all.inc.php            |   1 +
 main/lang/spanish/document.inc.php            |   1 +
 main/lang/spanish/trad4all.inc.php            |   1 +
 14 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 main/img/group_category.gif
 create mode 100644 main/img/user_folders.gif
 mode change 100755 => 100644 main/lang/english/install.inc.php

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index a381255425..35fe72a71d 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -147,12 +147,12 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
 
 	$tooltip_title_alt = $tooltip_title;
 	if ($tooltip_title == 'shared_folder') {
-		$tooltip_title_alt = get_lang('SharedFolder');
+		$tooltip_title_alt = get_lang('UserFolder');
 	}elseif(strstr($tooltip_title, 'shared_folder_session_')) {
-		$tooltip_title_alt = get_lang('SharedFolder').' ('.api_get_session_name($current_session_id).')';
+		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_session_name($current_session_id).')';
 	}elseif(strstr($tooltip_title, 'sf_user_')) {
 		$userinfo = Database::get_user_info_from_id(substr($tooltip_title, 8));
-		$tooltip_title_alt = get_lang('SharedFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
+		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
 	}
 
 	$current_session_id=api_get_session_id();
@@ -214,19 +214,19 @@ function build_document_icon_tag($type, $path) {
 		$icon = choose_image($basename);
 	} else {
 		if ($basename == 'shared_folder') {
-			$icon = 'shared_folder.gif';
+			$icon = 'user_folders.gif';
 			if ($is_allowed_to_edit) {
 				$basename = get_lang('HelpSharedFolder');
 			} else {
-				$basename = get_lang('SharedFolder');
+				$basename = get_lang('UserFolder');
 			}
 		}elseif(strstr($basename, 'shared_folder_session_')) {
 			if ($is_allowed_to_edit) {
 				$basename = '***('.api_get_session_name($current_session_id).')*** '.get_lang('HelpSharedFolder');
 			} else {
-				$basename = get_lang('SharedFolder').' ('.api_get_session_name($current_session_id).')';
+				$basename = get_lang('UserFolder').' ('.api_get_session_name($current_session_id).')';
 			}
-			$icon = 'shared_folder.gif';
+			$icon = 'user_folders.gif';
 		}elseif(strstr($basename, 'sf_user_')) {
 			$userinfo = Database::get_user_info_from_id(substr($basename, 8));
 			$image_path = UserManager::get_user_picture_path_by_id(substr($basename, 8), 'web', false, true);
@@ -237,7 +237,7 @@ function build_document_icon_tag($type, $path) {
 				$icon = '../upload/users/'.substr($basename, 8).'/'.$image_path['file'];
 			}
 
-			$basename = get_lang('SharedFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
+			$basename = get_lang('UserFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
 
 		} else {
 			if (($basename =='audio' || $basename =='flash' || $basename =='images' || $basename =='video') && api_is_allowed_to_edit()) {
diff --git a/main/group/group.php b/main/group/group.php
index 9a7e53c123..217647a041 100755
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -189,7 +189,7 @@ foreach ($group_cats as $index => $category) {
 	$in_category = false;
 	if (api_get_setting('allow_group_categories') == 'true') {
 		if (isset ($_GET['show_all']) || (isset ($_GET['category']) && $_GET['category'] == $category['id'])) {
-			echo '<img src="../img/shared_folder.gif" alt=""/>';
+			echo '<img src="../img/group_category.gif" alt=""/>';
 			echo '<a href="group.php?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'">'.$category['title'].'</a>';
 			$in_category = true;
 		} else {
diff --git a/main/img/group_category.gif b/main/img/group_category.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a87108732612031aed6530b539e3fc89b6c82f86
GIT binary patch
literal 1245
zcmV<31S0!KNk%w1VHN-u0QUd@LxO=mbix0Q8S}@s__BD$Wf;t~#9L{X{?!1*p^vw+
zv017yg3<rfv{(12UH|xfq+K%k_W5zHl$)fy`P6mI>Ho%pU;pQT_3!Qfsw$r3cg@e)
z|LwG`*8h}jSi{hW`s_ge&VEpn;h%||w&|9ogmM4>rO2U#c)D)Jc|iaFTmP*;{@>F7
znKS?YGo+@X{qNh$>Al_h)Bd=t|GiMW=fY5(Jfync|I9O{)q4E!&;RqC?!Bt}%dY<N
zqvE5D*^mu{ilhJjNLr=&>dt(xdpUQBzW?o4&%JE^#ys}Z%&5irm5GVCtzPB!|NoRI
z<lx-;+?JWlnd6vxudB&$(?MpLX8!t&*3i$6<zB4Vu>bf(|Mn^Ru$g>^qvNT6-`k_)
z(!c-boY$(QynagmnE?6P#s0QK>Fen8sBmVPX4`@>_2OUUrf2fyrtrbT!p6w|x@7<E
zAWx0i|IkGL{c`{CJju71uaKg^f*k+ml<U&df4TFzyuV?wQUCP6{IVj|d<p2sjQP-v
z|HDN8_0Q<7MV7wq{p3*ppg`I9^0-+g-0uJ6wx;&~{KT1S=EsBoq#CBz|LVYPxySUR
zm6PY70Pg7Lvc1#%+i?Ew>BgqC;N02%yOPhej*Q3u|Khd(%x3@hl=-Y~|Mjc)-p=*q
z;I*)?s^X6S>~8+Xum9bhL4C{2#J#)fp~Q?l?#`&$v6KJ55C8sp_shNh!czX>s{i;_
z<JHRhzH_F(@&EPX(XE?`i=h74nE$3b|L(#6`^5dOY5nki|Fuf~=W6?}egE*T@B07$
z|IDVQxS5ux-=UK6%!B8ecmMy2m+D~u<-7jZZvX$S|NsC0|C#>yg#PE-^r2?|?$!VP
zQj5<2{oc>d>;M0mEB=fk|NJ}u|7KE_<p1!L{rC3%*v-tRiG<Yu`SkMt)_nZu*3a&~
z+x*i1z*?cl|KsK1dxom(?&|2TYOSE5#lXM+#7(zgAn)k!{Oj%i;HUr3y#B*m|Ml|E
zww(Xza{vGTA^8LW2LS&7EC2ui02Tli000R80RIUbNU)&6g9sBUTzIXMF<}l`2_&aU
zotYk;2naiK!qGqnN49{olOonbVR1rby71tEkRoUX0vdTFl`k=*NSUbiY*rl=+Fazp
z^0CmhYuO3~n`Yw5gP*sA2;l;R-oP}4VCVn_%*PI=&v5ngbO(eSOA7u`qxOYEHm=8Z
zh_Y74O&Ds01R*&>!NRCS33%x#^yiolQKBA%BcfwhG%=5u&G^9vfrkMh{&4U*tQaDH
zuxx?K*K7(teze9IVp1*_haKaj)k>0t4x~Y=qO?&$@meEu^i0Vkb)nq~8iZ(nXfmn6
zt8&*^u;5YR9lB8__O)1XhDJRwT56EGS(HN`xAQ+Lk^6^joVOOgesz};!_l5MiZ-cI
z)nx=6fzG5Oz!UJTumTFMtRsUAH&9{#9#kxWi9pOGA;32T{<4A}8lXag6uKbeL^n<#
zbHfJz#IuGhWwek%BpFyyMHbLV;7$dMIKfCahfE+47Hb4jfISd+P>B^bEC9eKl62st
zBz$-=5Ek>CLJt;~IC4)PFTgVd1KWgo&K$igBv1rKup*8)A_Q;%CuRzSfigkVxeOHl
H1Oxy($gcFR

literal 0
HcmV?d00001

diff --git a/main/img/user_folders.gif b/main/img/user_folders.gif
new file mode 100644
index 0000000000000000000000000000000000000000..143fae61d7aa851a405f531910c365d947cf5c29
GIT binary patch
literal 1247
zcmZ{j`Crlp9LB#My%J-&?sB$yZCP2Xw5(~1WnO8e<SMnAu4!fEZ2FoV+CnXpjMS`&
zX5mq(fv5>|cz{UZL=<nuR0f77l7(^zd_S{4VDF!wU!M2td3^l5x9^Bpjx0ws2vTxv
z%g&o)Xt$YvbeV2|r|QfG(kgjgLOrulPC-8Q-Q<+SQp&kN!DXM`D^tR(Byfx#eexAF
z49(_VOM>!solk<h6EW|b@?a)2plEh{V(ejy2EYZ3f540VrNtDZELYSuBpsE&h`Z_y
zQ!*%ieGv!Rq$n}~*(Lcd?M=Qfp!jz}kLN^JGG7bR4e^W_V27fwJ<3RDYTI<G(pY_c
zoKd6xlUNVZ>H?-51TN6OzLh~rYlYX5D?fBTh8(BvVI#`)M0;Zxm2`tRHZ+cA=xYIZ
zG+2~Hr*kH_w}6b4cIu54r{S$V{qhd<Q?YLP6Z$HfoooZB@5hFSq5N+(rN{JRZ$Z6Q
zM9csC!dcMnX%&q^9ZsnRaq{L6lEg6822J~PgO4@CBty0R;G~}aAgw?1i{sBAE4K#F
zOE7sDG{VMVZ35vbpW6r!1wDxa%**L4B`7(lavasBP8UYyGlw<J@laxoitqQdw;f1e
zz?26lVp!p}+Ug5cb)uSfb@jQmTH$``8yQ&u)6y2zKo!jK*d67D4JzSodOFZ{!OT<R
z2QjD$0Ejtfj}ZF-l(v3ZqpF9N_0;QU@)W5R8W3JFPF)eRZbE~VoVXb30zpon86By*
z?bTm(2bD(~MV`=?4)UvGs#&xz7p8J_)EFMSp>_ypltO(=1?ZbVdq}O*YdcZ_!uW-$
zf~Gp<m>jedFy5r6CxO9zZyduY3(UWsB5l7%&HkmiN0ZLiv#P85d!_g9lmiF^qqEYo
zzYOvo5JUmcV6tXz0dv)28vt#@!z2%827tUCpTt5l>_OR$&St<=1q>Fw(|}r%3-bGf
ztY`4@H|W}`=%99v1GUenV4nu=o)b(!yVF>0hHg%-8h}@LdqVjh&?$IvWlk9K|Jdow
zP39wN#QAgN^Cu7sKqfIZzLgYCip7$3NBKNrrBhfUMo_iJnh<tqq1W0D|6cZn^K7g`
z{I5UPIRy#)JU>~^vvfYV4IAvTWq;ujnR7@ee!~(QtJ=``=k{a8HXD!DHgmR~Yj#_T
zi;LiNJla=4aFZR~QtV^3Ea1S-KFPI6$0z13il36rZ{@KnMm9x`NKH;HIKF$+b~|3w
zA+w9eck|OtNPDkiofLg0on8b7-+}g#^LDs{n4rz2NvnC~D=~}lwjM?EoxdtSwyP!(
zpPXX-U5Iz3h$7;q<+z@zjubBvzBTo#!FyFsM|(fAQbe(SaI3&Qk0qGWJl}=yxf|l|
zSXLS=>mv8NF6Y$hrO}7)t=Q@$tL*jZ*|sdpewl7cA|Rje_%S5BFxt!IOVib{X(pcR
z!<d9`C@0JowYd@y2Zmz`|58AEIL>XJcVofI500k(9{*;1yt?s@)-HLcDl_PxCF_C_
z-+2#m7h5i6lsJ&KpP>f%e~q<pv{<#mJi-FWON<DxyyaRXv<VQ3ZeT~TjyE>=blLI0
ze<?$V<~S!aGpvnkwcncGotJvAvaX41&5JS5OvNnd=VmNyisiQ2nzfsp#3Ang0Wlib
AcmMzZ

literal 0
HcmV?d00001

diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php
index 2a9a28cf8d..b15f62fc7e 100755
--- a/main/inc/banner.inc.php
+++ b/main/inc/banner.inc.php
@@ -416,11 +416,11 @@ if (isset($interbreadcrumb) && is_array($interbreadcrumb)) {
 		$navigation_item['title'] = $breadcrumb_step['name'];
 		// titles for shared folders
 		if ($breadcrumb_step['name'] == 'shared_folder') {
-			$navigation_item['title'] = get_lang('SharedFolder');
+			$navigation_item['title'] = get_lang('UserFolders');
 		}			
 		elseif(strstr($breadcrumb_step['name'], 'shared_folder_session_')) {
 		
-			$navigation_item['title'] = get_lang('SharedFolder');
+			$navigation_item['title'] = get_lang('UserFolders');
 		}
 		elseif(strstr($breadcrumb_step['name'], 'sf_user_')) {			
 			$userinfo = Database::get_user_info_from_id(substr($breadcrumb_step['name'], 8));
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 266c32db0c..270a94b2ed 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -2231,7 +2231,7 @@ function fill_Db_course($course_db_name, $course_repository, $language, $default
     $example_doc_id = Database :: insert_id();
     Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
 
-    Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/shared_folder','".get_lang('SharedDocumentsDirectory')."','folder','0')");
+    Database::query("INSERT INTO `".$TABLETOOLDOCUMENT . "`(path,title,filetype,size) VALUES ('/shared_folder','".get_lang('UserFolders')."','folder','0')");
     $example_doc_id = Database :: insert_id();
     Database::query("INSERT INTO `".$TABLEITEMPROPERTY . "` (tool,insert_user_id,insert_date,lastedit_date,ref,lastedit_type,lastedit_user_id,to_group_id,to_user_id,visibility) VALUES ('document',1,NOW(),NOW(),$example_doc_id,'DocumentAdded',1,0,NULL,0)");
 
diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/big_icon/bigfolderShared.png b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/big_icon/bigfolderShared.png
index d2df3183de0e2362fe3cde5ab51277da44dce158..3e602941dd229be0dc1ca368a22063fdd742747c 100755
GIT binary patch
delta 3311
zcmV<L3=s3lw*!|NkV$_ZbVXQnQ*UN;cVTj608L?Ia&K*AWNBd_Mrm?ocW-iQb09di
zXwrB901S>vL_t(|ob6rBZydK3|8a&pyV|vOCF?V?<!)<NscScl8z2WCdZ`hh#~k}d
z^w=D8=-*QyhoI=CMSvPH0vB@PD89r8No!e>C2eKzmv(1{Gd+LolHzd4nb{9XcB3CK
z;P)Hy@$vETaaJNH?Rp3Us51@UZJt^9{{RZ~8KvU*`4?yQ(uLbq0Qb&}{&~T7n;<9c
zdZ;q6_SFLbKzZgq=BF7B{R$T78yq$5#B`RBoV0LM`x0~S{|U3d`s^acJuzq*`1;$=
z0RZ#AsRH>qpjUtIhwWEDX{ldHj*oz_^Bp!HJw$otK4$Lyb(}F=C}Iq(ef0p-?|p)W
zJMROH9iZ6+a=FtMo_Ct26k*{t0DzQ=BX!_l;~91yKSOcG7kQo6^sP-h<vC2h_la0J
z5eB~g_H%?&S5UcX<8^%l3w8mAtZNLNiaj7Q59%C^z`lQX4}7ftt82J&=Pv*NN}XvO
zKmP*F*N;%1{RlhH*5Nkl`0t>RDf}tIDbJz&^N(;;`x4=mdzk&@r~O?R0N9HS1k2a)
ziwA!O$c>Ba=i7_m2OK>6mq_|<Q(|Cc1&en-?I*(8x%cg@N7w*J8H;!RfYx_^2hcbF
z1OuJ&+-ZMB>+Xg0QH$V*i|)ZG228~AZvhM>P<tY{lt44W2HZv+z(4|Zrx1jVbMDm`
zAmwO()$}NBvd|d7n)sQNlqX9s4eCI%3_PvP5CUXrB`^z2j557kuCHr*-i)6Be7C8Q
zz^nrqcA3ldb#31zwJ|_k2fl-YxM)Nr@Eu%67ma_>b>JloI`D0T>z!?S#C+;ZD-!rN
z>Oj{6oZM;LRBkE*%;j<&(|Z!=$0bnJffqgVK>FZ$dDePq?@gm+?Tctc0{QVILRcm=
ztR(2_s~t<r&msxq<|j>nE<acn(TD^JXM%1(CZb98k~)#4qiOAQb<^r3#fNPNlO33(
zH&TCQ>gmQuD3{9!!w|M@BMjp=raVtB<8eZWwvJq`wv*Fxx!R`F>EL(2{!gqw<3R6?
z;S3sP<_Gm>W@fOov;;~ieBVbHhJq>bpm<znfXWOV6N4ZymYG7`B#wnd9Z1UQOHzeY
zpD`9IRvD$1$)PD<mL~P#`D#cAfn`~uEoXoJ*idvJjp)EJ%^1F1JkJwp8LGsop)9dF
z=5qRK9TR=dM8+6w+a7Cd0*VAu?JhhbWT}vsTvC1DR62NQ+cqrAg6DY=y{0Z<jwC%8
zq3sW@D=F>AlR_Yx$J-@JpeT`u$S~y(0aZeRAb@3Aux%Upd>%m%pxf<&5Q3?xDTIGv
zh+eNZ)Dkr6J<bfykhD;a^R|UkK}(lF(~RlzGB8$MmW(k_O403hvAeqq#u(b|HeSAb
z2|@@~S64ANH;09V1=zL?*L4%=r9x)Ru;6XGr-EjdK=oxwGc#nT<U!|hIqdK6<I$r>
zXfzsNjDZjW$8ivbAzr<D1>3f<y1IXgTeogud3hPW?;{9;n0`Gs3?+fXU|_Z+*?D0Y
zik*=Vf^N5q$B!T5`1ly5QYk`?+mb;LV0(KTwOS1yeDDG8-n}a}2HmpewB=1{qNYr$
z1dbu*x?NCZr0@H%EDM%p;mMOHsMqT#l}cJ8m@_<|&x0|BCr_TB*X!ZK4?llQHH)-N
zW0Hwx=lW?L%6Tg6)9-^q_Cmz<XJH+I5upyqvMdlnkjv$8czB2(fBX@S<MdxUup!kp
zJZ)JP9LK@ar%zF<)x<J4y;G*4=10aUkJmJI=7};Az9+KdXJOZiH4t$%t?7h3=p;Lj
zF@}we4Oo^1I@o+<qgQ4cm&|`42tX-CKA*?;-+zxzrz6^`%rl*8CW0$(;B<BXBza>v
z)EUvumWGKz5NJc7Z{yYLb?ol$BA3fW^q4yEAP7WT&Ui{GTCEngwzgnd7JxpZ)6ATS
zFp+scs{*%pU1aIKF%y8U!`$ZE-``Jk3YfqR^&kjPtJTD=tvf<$F^+#30|0goA=!&$
z=_PQ)7bQ6ec-(be?CtHv91UuFlYaAkACyuwn@zM@Eu+^*3)zm9$C=f*W?ozeY8l~<
zAnpp&lXMWJR7g@1!&LCItz}tgx7#>AK89`E*=<7gFd*ld>M8X@vKQ5Xx|ejiZX~S@
z)jWkM;)R-{+sVm^(Gh>3dt_ZGpKrO#Oq~c-j{=foBkQ5Sa8Mxrd{hU<7$`$wkoE<J
zw8@0<JWqIQ<hohFPat6!qFgTH>eZ`)*3ieg5fRcOA%Q>|17(<)CyRFm<2IkqizAuN
zcuoS}Fg(x0?CdNmm5SIvR9a`kNZ*f0VEk5Yz>Hkpp2$X`a~^*LL4aztim9oonDnGU
zmO#gGw7M^mR?<?{r8RL`0^|3>gNjambeENB7v^ck80P2av9`8`UazN>9Fy)Ngn&|N
zbS9|GV~j;~W`rr~&Z|qSaR8({lR*b&nJG>EEX$D_y^D*B;_if>IFi82J<mh2Sj6h;
zs$kHWEm;Gy>A-)qnbOS~(wWB?L$BAv{QNvV{`h0qwjE=Hjv@Rk-Rt#m`}S?DtgMJ#
z_}rjKBcL*HOh<ycT=^1|A6|zLf?Kz4p<FJD6Ga*rW60%lSX^9;oj%Tsk>Qor5N6CM
zFHmeXHIEOJAL~|ESJCVB#I7tuy@Bg?yJGj1O(ByGjlqA@2#8E4FkC!Ibx7+<!V(_$
ztcdt!l1VS}W7*A{H?h3DoO+%Of&h-=U~O$pY$Qqawcx+=(=ieNVcpY&p^kcLvD8B2
zEJ%peQOpt9BP{2u(!rPR{rmS(DwW_HjPWq+UzJv?RaC20aW^uw@ywZ$%f%VQe@K~@
zpQr<UAH;uR{mQ%nk4tGWQ#@aK!7viY!(y?BLZOi8k_yBA9g2FtJCg2`$7W)h9Li86
zFmCY4jZB0MajwI-b5vyrmrQxn;66R|P8o=QO~7|u`CKj2&4jFDGSxXbi4;wA6G^kl
z_`u~l`FtKHCnspP+cBeB{e+{{YQc3~aSb4U%5i@#yRhd0Q&W+wiSNQ3x&Z}2ApCiS
zLIIBBU~6j&4<9~6r_(WhvH?KcqkR4K*QnR);_C%Ym&eZ>iUjI^E604mrqQ@5)IjIX
zvMfvJFxPeQ^5siBfBqb`T1{LSB}uPkS@3-yJ3Bkr+uOs98#l1Fwuaf+*?u<%yLjTA
zaYBEejZoXjzu*Uy?*ru>hH2s|F&5pCxL)F?3){9qDHX@JX0wTdg9B`DZ{zUr5Wept
zpU-RcB@mwoexnzLAvQNRv9q&-YuBz}Wn~46i;E~0`+s_XF(w=r^5-LwF))qEX3Cex
z-Blzo(&4}cVbKa&VkzKmt4^nbH*emEOQe6}<72q4i!cm9DFvl8RcGqJ8Oa#K=H@20
zwzg0#7BM?Ji>0L{%*@Q7QmF`LbJdYLhNQ7^CfW(RFtIXT&KMvs*Zuu{eDlpWXfzt)
zN|F#Fbk`&lzir!sk)2Kl?RFb4Uc3OM6y<UmckbN5_3PIo8_`(MFgT(E!@vdsM*e>a
zi!YgOw~O`lbu^pJ$OSle2*`EifvL+_Ww4G3e0i$xsn_dRUtdS1QbDm;oZJVNiUdad
zfx<wRnP>WlNOM;bhW+nZ4h{}*baWKEF_U*n`NG_^jCEh5>LA;Oyj`JCK&R8e?(VL*
zjEePLMV9*?MG7Mx>Ci63U03p5NXmZ~S$q(UMngO3)Wg1p-mnh`pP*K&C3ImTlXN$6
z>OGJKR4aipvbeklA$O2^o)^(|9BIpFSX(Y>5@hc+?~mwj(ubC5OjP)xw*yD?%5*v%
z1VMmOsf22^8oRUAN#t395CYeAF+DwvMx%jVuLn4T!VKPZ<1$vy!jt^9=DmON-};fI
z!Sgo3Nw1O#iQbq?3=PGlpR#nh(^KdCl=Dn+9gVD^+&-xvS!pDdo9by0)qyqzdOg6l
zPaB!yjG4>S4#;tphFafLF2~j1d?b~bXq)nRoYP71lt=G{#hG_VX&R<%80k%-J&JS<
z6HgkC1pO|22|YASw2a=EOJsjS^xK#*e}x192!j5j%h!c!JgHsUc{b_2y7HtxWuXm|
z1e!XcK3O`*AIplC^HYb)AeAm}C!bPu@66I4^_@I!dPfGDG$w(b7bR$#6}c>J=F<jd
zYMVAWI)<oe(-@K_A*r5n+)S3h5k&gTG0a3{t&<g+$(Xzj{E0zGp!{dO$0ZEVNOM%=
zdOd`}_&>b<DS_~RMzHmd-@|^h3p;l~y6qhS^DMB+3aWqnHvpXeA#UGoqPhLg3+~>#
tf$5(;5dV>a$o~#Q{&y9Z&_g}?{ts-BZ7yK`_(cE!002ovPDHLkV1ijiVaEUf

literal 56265
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
VsS`P+`fI5BD`^F(QVD~A{{x$;(&hjF

diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/small_icon/folderShared.png b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/small_icon/folderShared.png
index fedfc5a637c809a3a0a1560c276002945b4e3a94..f021c3e12a72a17b100089cd10d1ff9f2788c224 100755
GIT binary patch
delta 706
zcmV;z0zLih1lk3VB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy
zVP|DhWnpA_ami&o0007PNkl<Z7#V%ROKePG7=YpTKXcC9I+?1_Qf)&ukq{BpDX|c?
zl(;M;Hcc8~V`FK-60x%o*RUW(5JV6`BvrQ{F0rbn5_gMMw14BwoXh`x+L%y_@jOOV
zsb=Tu#WS1ha#wSyOu<?~K@-{JjqQhTbW!0@#jbT7PGfD&#auF7up(GhA}hupEv?zT
zacK_~4pp?&YIaJdW_c!GOY6KjG&VILqKF7}nal|)T&hUw$EbeRY-#V>>`eEHOekrZ
zG3#;v?6H6fhkq*eecuyKot7QT;uD$_#>+Ax`0!Ncwl#)SxC7S<emXxtV~oRJ%K5FI
z;%$c(zC2aa-_hLCO38S5Cgj7%VeK7S)Z58#X5d<<wyk-DF$R=ziXT{Z9C$+O+<6oV
z0Z(t8#h5f+GEY-SH>Z!@iEqDpza@U$bHNN;E=b$jK7SK_J&X+#;N;oc8&R6Nnkk*L
z7%YOd{NXB0LwRxTUhwAa>rF0^K_$e7NmP`dLl5ZAzk>KUJfy1Qo35k|KHqc6#i)_E
z#OTl<(a0wxDpR*$JwMua@h@dU&V$jD%lML<N%Nu=NtejM&D1kv)qX%g6&r^nzTf1l
zU&gAXWPcO*F~l~axnT(gh@ZVEjd=aBOQfhR6Mj1hD8C6Qv1G|HCP|DKJQb`&xCB@r
z(b3*CXJy}rO8_b{7(f*ekO)U38r&b$8y_`A)G4A2lg_mB4mh)t5yrWMiot>^s09sC
z2|&uImQd@Xwur`~sPzG1GFL+(_J@(!19d<Xs5^QfDO74eBUD2$AviI%TxK#?%faWN
oBO4k}91Mp4QNY{<(P1in0X<zbFA)!j{r~^~07*qoM6N<$f?jDs6951J

delta 596
zcmV-a0;~Pn1?>coB!2;OQb$4nuFf3k00009a7bBm000XT000XT0n*)m`~Uy|2XskI
zMF-gd2?a11b8PK10000PbVXQnLvL+uWo~o;Lvm$dbY)~9cWHEJAV*0}P*;Ht7XSbO
z+DSw~R5;7kk-Kga0T4yc62I-lPvQs%EQBqEKsvCXr=UWB#DA-!r{NbUkW!@P3y|oL
z_y9s0C@mn7i9nIo$ZJUaSbOb#*t_;nSPn4+(a<o`G&A=ejqbpIUkZTw=DzrX$(e;W
z&;iJoHXxEyjx{R^J^;_q$lrMJyTa1YK0F1G=_nG)0}x)m1fcki>Yds;qhT5Ve=J2H
zc7@#4XUCpi-G6!jzzkq&mO+EQ{vOyQ5Xnt;u70SC7arpo+Ajc0!?lOVu#e@`NS%8~
zc(L@?5PbmBA44QZ;=&^Urg3`a7e>8J#M2S4GwG2*aQVr^GX<!<EDPUM(y<n8t;+7Z
zGFHQ+P@3n|+2NrPVC;5K#>VUgud6GV<xi}pY~s@A@_)74gfdx-ub-)Yd`UEOKw`l`
z+<gXS2!FK8oRj$ps8lKxR@PX&xJsM@kTx_N7E%cU#hY}s8vTBYNG!|zne&W?F43jy
zz^e&BtAEEd+9-Al{1)Q*u)9rMZ$vPeCR;2b&Plp$3w?Ksz|v{-z2`^1Fm@4r53O8f
zzt_PYoK3*BEP9<brqLzf7ZS-ZfjNV4WCYugT)PFlodj|3?j70L*%lGOwr%RFDs@#A
iz1dtB5&qQwq<#R!?(M(#v)1$g0000<MNUMnLSTZa2NM|p

diff --git a/main/lang/bulgarian/exercice.inc.php b/main/lang/bulgarian/exercice.inc.php
index dcfb3e546c..9d0d5c4d09 100644
--- a/main/lang/bulgarian/exercice.inc.php
+++ b/main/lang/bulgarian/exercice.inc.php
@@ -8,7 +8,7 @@ $langDeactivate = "Дезактивиране";
 $langNoEx = "Засега няма тестове.";
 $langNewEx = "Нов тест";
 $langQuestion = "Въпрос";
-$langQuestions = "Въпроса";
+$langQuestions = "Въпроси";
 $langAnswers = "Отговори";
 $langTrue = "Вярно";
 $langAnswer = "Отговор";
diff --git a/main/lang/english/document.inc.php b/main/lang/english/document.inc.php
index 84b7082e27..04d9bb4c54 100644
--- a/main/lang/english/document.inc.php
+++ b/main/lang/english/document.inc.php
@@ -227,4 +227,5 @@ $Draw = "Draw";
 $FileExistsChangeToSave = "This file name already exists, choose another to save your image.";
 $FileSavedAs = "File saved as";
 $FileExportAs = "File export as";
+$UserFolder = "User folder";
 ?>
\ No newline at end of file
diff --git a/main/lang/english/install.inc.php b/main/lang/english/install.inc.php
old mode 100755
new mode 100644
index 25619fc6fd..a833e51cc0
--- a/main/lang/english/install.inc.php
+++ b/main/lang/english/install.inc.php
@@ -5,7 +5,7 @@ for more information: see languages.txt in the lang folder.
 $langStatDB = "Tracking DB.";
 $langEnableTracking = "Enable Tracking";
 $langInstituteShortName = "Your company short name";
-$langWarningResponsible = "Use this script only after backup. Chamilo team is not responsible if you lost or corrupted data";
+$langWarningResponsible = "Use this script only after backup. The Chamilo team is not responsible for lost or corrupted data.";
 $langAllowSelfRegProf = "Allow self-registration as a trainer";
 $langEG = "ex.";
 $langDBHost = "Database Host";
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 2fa21d4cc2..b7a8730dbc 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -973,4 +973,5 @@ $FillWithExemplaryContent = "Fill with exemplary content";
 $ToolVideoconference = "Videoconference";
 $SelectSVGEditImage = "Select a picture";
 $OnlyAccessFromYourGroup = "Only accessible from your group";
+$UserFolders = "Folders of users";
 ?>
\ No newline at end of file
diff --git a/main/lang/spanish/document.inc.php b/main/lang/spanish/document.inc.php
index e037c126b6..8bf402695e 100644
--- a/main/lang/spanish/document.inc.php
+++ b/main/lang/spanish/document.inc.php
@@ -227,4 +227,5 @@ $Draw = "Dibujar";
 $FileExistsChangeToSave = "Este nombre de archivo ya existe, escoja otro para guardar su imagen.";
 $FileSavedAs = "Archivo guardado como";
 $FileExportAs = "Archivo exportado como";
+$UserFolder = "Carpeta del usuario";
 ?>
\ No newline at end of file
diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php
index 0e3da7b817..7f4d298b1d 100644
--- a/main/lang/spanish/trad4all.inc.php
+++ b/main/lang/spanish/trad4all.inc.php
@@ -974,4 +974,5 @@ $FillWithExemplaryContent = "Rellenar con contenido de ejemplo";
 $ToolVideoconference = "Videoconferencia";
 $SelectSVGEditImage = "Selecciones una imagen (svg, png)";
 $OnlyAccessFromYourGroup = "Sólo accesible desde su grupo";
+$UserFolders = "Carpetas de los usuarios";
 ?>
\ No newline at end of file

From 202b0f1b765e32034e45b2a864d22d177f97063e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Fri, 31 Dec 2010 11:41:20 +0100
Subject: [PATCH 13/17] Feature #2484 fix check main shared directory when a
 student move a file

---
 main/document/document.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index 31ea925784..a5771ce855 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -462,13 +462,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && api_get_sett
 				$folders = DocumentManager::get_all_document_folders($_course, $to_group_id, $is_allowed_to_edit || $group_member_with_upload_rights);
 				
 				//filter if is my shared folder. TODO: move this code to build_move_to_selector function
-				if(is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id) && !$is_allowed_to_edit){
-					$main_user_shared_folder_sub  = '/shared_folder\/sf_user_'.api_get_user_id().'\//';//all subfolders			
-					$main_user_shared_folder_main = '/shared_folder\/sf_user_'.api_get_user_id().'$/';//only main user shared folder
+				if(is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id) && !$is_allowed_to_edit){								
+					$main_user_shared_folder_main = '/shared_folder/sf_user_'.api_get_user_id();//only main user shared folder
+					$main_user_shared_folder_sub  = '/shared_folder\/sf_user_'.api_get_user_id().'\//';//all subfolders
 					$user_shared_folders=array();
 					
 					foreach($folders as $fold){
-						if(preg_match($main_user_shared_folder_main, $fold) || preg_match($main_user_shared_folder_sub, $fold)){
+						if($main_user_shared_folder_main==$fold || preg_match($main_user_shared_folder_sub, $fold)){
 							$user_shared_folders[]=$fold;
 						}
 					}						

From 7eb24723c94f33cd8f2f72a506ecc4ff879ed597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Fri, 31 Dec 2010 11:59:37 +0100
Subject: [PATCH 14/17] Feature #2484 fix two lang var

---
 main/document/document.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 35fe72a71d..9a2b490507 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -147,9 +147,9 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
 
 	$tooltip_title_alt = $tooltip_title;
 	if ($tooltip_title == 'shared_folder') {
-		$tooltip_title_alt = get_lang('UserFolder');
+		$tooltip_title_alt = get_lang('UserFolders');
 	}elseif(strstr($tooltip_title, 'shared_folder_session_')) {
-		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_session_name($current_session_id).')';
+		$tooltip_title_alt = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')';
 	}elseif(strstr($tooltip_title, 'sf_user_')) {
 		$userinfo = Database::get_user_info_from_id(substr($tooltip_title, 8));
 		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
@@ -218,13 +218,13 @@ function build_document_icon_tag($type, $path) {
 			if ($is_allowed_to_edit) {
 				$basename = get_lang('HelpSharedFolder');
 			} else {
-				$basename = get_lang('UserFolder');
+				$basename = get_lang('UserFolders');
 			}
 		}elseif(strstr($basename, 'shared_folder_session_')) {
 			if ($is_allowed_to_edit) {
 				$basename = '***('.api_get_session_name($current_session_id).')*** '.get_lang('HelpSharedFolder');
 			} else {
-				$basename = get_lang('UserFolder').' ('.api_get_session_name($current_session_id).')';
+				$basename = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')';
 			}
 			$icon = 'user_folders.gif';
 		}elseif(strstr($basename, 'sf_user_')) {

From 0ab559e76ff294372e11ac3e55219671c0041f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Fri, 31 Dec 2010 12:02:42 +0100
Subject: [PATCH 15/17] Feature #2484 cosmetic hack

---
 main/document/document.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/document/document.inc.php b/main/document/document.inc.php
index 9a2b490507..d8f6ce338f 100755
--- a/main/document/document.inc.php
+++ b/main/document/document.inc.php
@@ -152,7 +152,7 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
 		$tooltip_title_alt = get_lang('UserFolders').' ('.api_get_session_name($current_session_id).')';
 	}elseif(strstr($tooltip_title, 'sf_user_')) {
 		$userinfo = Database::get_user_info_from_id(substr($tooltip_title, 8));
-		$tooltip_title_alt = get_lang('UserFolder').' ('.api_get_person_name($userinfo['firstname'], $userinfo['lastname']).')';
+		$tooltip_title_alt = get_lang('UserFolder').' '.api_get_person_name($userinfo['firstname'], $userinfo['lastname']);
 	}
 
 	$current_session_id=api_get_session_id();

From 217b65137d721acfe16d0dbb757e6d9bc7bb7aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Fri, 31 Dec 2010 12:12:54 +0100
Subject: [PATCH 16/17] Feature #2484 Hide for student zip icon into other
 shared folder

---
 main/document/document.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/document/document.php b/main/document/document.php
index a5771ce855..57d3cf5466 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -944,8 +944,8 @@ if (!is_null($docs_and_folders)) {
 	global $total_size;
 	if (!$is_certificate_mode && $total_size != 0 && (api_get_setting('students_download_folders') == 'true' || api_is_allowed_to_edit() || api_is_platform_admin())) {
 		
-		//don't show icon into shared folder, and don´t show into main path (root)
-		if (!is_shared_folder($curdirpath, $current_session_id) && $curdirpath!='/' || api_is_allowed_to_edit() || api_is_platform_admin())
+		//for student does not show icon into other shared folder, and does not show into main path (root)
+		if (is_my_shared_folder($_user['user_id'], $curdirpath, $current_session_id) && $curdirpath!='/' || api_is_allowed_to_edit() || api_is_platform_admin())
 		{
 	    	echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=downloadfolder&path='.$curdirpathurl.'">'.Display::display_icon('zip_save.gif', get_lang('Save').' (ZIP)'). get_lang('Save').' (ZIP)</a>&nbsp';
 		}

From 135eb63d2e1f9edcb1c787b94e3a6dea68e44752 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Fri, 31 Dec 2010 17:20:45 +0200
Subject: [PATCH 17/17] Feature #2132 - Development of "asciisvg" plug-in (3),
 a file has been added temporarily.

---
 .../editor/plugins/asciisvg/ASCIIsvgPI.js     | 1402 +++++++++++++++++
 .../editor/plugins/asciisvg/fck_asciisvg.html |   23 +-
 .../editor/plugins/asciisvg/fck_asciisvg.js   |   46 +-
 3 files changed, 1439 insertions(+), 32 deletions(-)
 create mode 100644 main/inc/lib/fckeditor/editor/plugins/asciisvg/ASCIIsvgPI.js

diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/ASCIIsvgPI.js b/main/inc/lib/fckeditor/editor/plugins/asciisvg/ASCIIsvgPI.js
new file mode 100644
index 0000000000..4288ac529e
--- /dev/null
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/ASCIIsvgPI.js
@@ -0,0 +1,1402 @@
+/* ASCIIsvgPI.js
+==============
+This version contains modifications needed for ASCIIsvg to work with
+tinyMCE editor plugins.  Modifications made by David Lippman, (c) 2008
+Revised 8/14/09
+
+JavaScript routines to dynamically generate Scalable Vector Graphics
+using a mathematical xy-coordinate system (y increases upwards) and
+very intuitive JavaScript commands (no programming experience required).
+ASCIIsvg.js is good for learning math and illustrating online math texts.
+Works with Internet Explorer+Adobe SVGviewer and SVG enabled Mozilla/Firefox.
+
+Ver 1.2.7 Oct 13, 2005 (c) Peter Jipsen http://www.chapman.edu/~jipsen
+Latest version at http://www.chapman.edu/~jipsen/svg/ASCIIsvg.js
+If you use it on a webpage, please send the URL to jipsen@chapman.edu
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 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 (at http://www.gnu.org/copyleft/gpl.html) 
+for more details.*/
+
+//var AScgiloc = 'http://www.imathas.com/imathas/filter/graph/svgimg.php';
+var ASnoSVG = false;
+var checkIfSVGavailable = true;
+var notifyIfNoSVG = false;
+var alertIfNoSVG = false;
+var xunitlength = 20;  // pixels
+var yunitlength = 20;  // pixels
+var origin = [0,0];   // in pixels (default is bottom left corner)
+var defaultwidth = 300; defaultheight = 200; defaultborder = [0,0,0,0];
+var border = defaultborder;
+var strokewidth, strokedasharray, stroke, fill;
+var fontstyle, fontfamily, fontsize, fontweight, fontstroke, fontfill, fontbackground;
+var markerstrokewidth = "1";
+var markerstroke = "black";
+var markerfill = "yellow";
+var marker = "none";
+var arrowfill = stroke;
+var dotradius = 4;
+var ticklength = 4;
+var axesstroke = "black";
+var gridstroke = "grey";
+var pointerpos = null;
+var coordinates = null;
+var above = "above";
+var below = "below";
+var left = "left";
+var right = "right";
+var aboveleft = "aboveleft";
+var aboveright = "aboveright";
+var belowleft = "belowleft";
+var belowright = "belowright";
+var cpi = "\u03C0", ctheta = "\u03B8";
+var pi = Math.PI, ln = Math.log, e = Math.E;
+var arcsin = Math.asin, arccos = Math.acos, arctan = Math.atan;
+var sec = function(x) { return 1/Math.cos(x) };
+var csc = function(x) { return 1/Math.sin(x) };
+var cot = function(x) { return 1/Math.tan(x) };
+var xmin, xmax, ymin, ymax, xscl, yscl, 
+    xgrid, ygrid, xtick, ytick, initialized;
+var isIE = document.createElementNS==null;
+var picture, svgpicture, doc, width, height, a, b, c, d, i, n, p, t, x, y;
+var arcsec = function(x) { return arccos(1/x) };
+var arccsc = function(x) { return arcsin(1/x) };
+var arccot = function(x) { return arctan(1/x) };
+var sinh = function(x) { return (Math.exp(x)-Math.exp(-x))/2 };
+var cosh = function(x) { return (Math.exp(x)+Math.exp(-x))/2 };
+var tanh = 
+  function(x) { return (Math.exp(x)-Math.exp(-x))/(Math.exp(x)+Math.exp(-x)) };
+var sech = function(x) { return 1/cosh(x) };
+var csch = function(x) { return 1/sinh(x) };
+var coth = function(x) { return 1/tanh(x) };
+var arcsinh = function(x) { return ln(x+Math.sqrt(x*x+1)) };
+var arccosh = function(x) { return ln(x+Math.sqrt(x*x-1)) };
+var arctanh = function(x) { return ln((1+x)/(1-x))/2 };
+var sech = function(x) { return 1/cosh(x) };
+var csch = function(x) { return 1/sinh(x) };
+var coth = function(x) { return 1/tanh(x) };
+var arcsech = function(x) { return arccosh(1/x) };
+var arccsch = function(x) { return arcsinh(1/x) };
+var arccoth = function(x) { return arctanh(1/x) };
+var sign = function(x) { return (x==0?0:(x<0?-1:1)) };
+var logten = function(x) { return (Math.LOG10E*Math.log(x)) };
+
+
+function factorial(x,n) {
+  if (n==null) n=1;
+  for (var i=x-n; i>0; i-=n) x*=i;
+  return (x<0?NaN:(x==0?1:x));
+}
+
+
+function C(x,k) {
+  var res=1;
+  for (var i=0; i<k; i++) res*=(x-i)/(k-i);
+  return res;
+}
+
+
+function chop(x,n) {
+  if (n==null) n=0;
+  return Math.floor(x*Math.pow(10,n))/Math.pow(10,n);
+}
+
+
+function ran(a,b,n) {
+  if (n==null) n=0;
+  return chop((b+Math.pow(10,-n)-a)*Math.random()+a,n);
+}
+
+
+function myCreateElementXHTML(t) {
+  if (isIE) return document.createElement(t);
+  else return document.createElementNS("http://www.w3.org/1999/xhtml",t);
+}
+
+
+function isSVGavailable() {
+//Safari 3 can do SVG, but still has issues.  
+  if ((ver = navigator.userAgent.toLowerCase().match(/safari\/(\d+)/))!=null) {
+		//if (ver[1]>524) {
+		//	return null;
+		//}
+		return 1;
+ } 
+//Opera can do SVG, but not very pretty, so might want to skip it 
+ if ((ver = navigator.userAgent.toLowerCase().match(/opera\/([\d\.]+)/))!=null) {
+		if (ver[1]>9.1) {
+			return null;
+		}
+ }
+ //Mozillas. 
+  if (navigator.product && navigator.product=='Gecko') {
+	   var rv = navigator.userAgent.toLowerCase().match(/rv:\s*([\d\.]+)/);
+	   if (rv!=null) {
+		rv = rv[1].split('.');
+		if (rv.length<3) { rv[2] = 0;}
+		if (rv.length<2) { rv[1] = 0;}
+	   }
+	   if (rv!=null && 10000*rv[0]+100*rv[1]+1*rv[2]>=10800) return null;
+	   else return 1;
+  }
+  //IE + AdobeSVGviewer
+  if (navigator.appName.slice(0,9)=="Microsoft")
+    try	{
+      var oSVG=eval("new ActiveXObject('Adobe.SVGCtl.3');");
+        return null;
+    } catch (e) {
+        return 1;
+    }
+  else return 1;
+}
+
+function less(x,y) { return x < y }  // used for scripts in XML files
+                                     // since IE does not handle CDATA well
+function setText(st,id) { 
+  var node = document.getElementById(id);
+  if (node!=null)
+    if (node.childNodes.length!=0) node.childNodes[0].nodeValue = st;
+    else node.appendChild(document.createTextNode(st));
+}
+
+
+function myCreateElementSVG(t) {
+  if (isIE) return doc.createElement(t);
+  else return doc.createElementNS("http://www.w3.org/2000/svg",t);
+}
+
+
+function getX() {
+  return (doc.getElementById("pointerpos").getAttribute("cx")-origin[0])/xunitlength;
+}
+
+
+function getY() {
+  return (height-origin[1]-doc.getElementById("pointerpos").getAttribute("cy"))/yunitlength;
+}
+
+
+function mousemove_listener(evt) {
+  if (svgpicture.getAttribute("xbase")!=null)
+    pointerpos.cx.baseVal.value = evt.clientX-svgpicture.getAttribute("xbase");
+  if (svgpicture.getAttribute("ybase")!=null)
+    pointerpos.cy.baseVal.value = evt.clientY-svgpicture.getAttribute("ybase");
+}
+
+
+function top_listener(evt) {
+  svgpicture.setAttribute("ybase",evt.clientY);
+}
+
+
+function bottom_listener(evt) { 
+  svgpicture.setAttribute("ybase",evt.clientY-height+1);
+}
+
+
+function left_listener(evt) {
+  svgpicture.setAttribute("xbase",evt.clientX);
+}
+
+
+function right_listener(evt) {
+  svgpicture.setAttribute("xbase",evt.clientX-width+1);
+}
+
+
+function switchTo(id) {
+//alert(id);
+  picture = document.getElementById(id);
+  width = picture.getAttribute("width")-0;
+  height = picture.getAttribute("height")-0;
+  strokewidth = "1" // pixel
+  stroke = "black"; // default line color
+  fill = "none";    // default fill color
+  marker = "none";
+  if ((picture.nodeName == "EMBED" || picture.nodeName == "embed") && isIE) {
+    svgpicture = picture.getSVGDocument().getElementById("root");
+    doc = picture.getSVGDocument();
+  } else {
+    picture.setAttribute("onmousemove","updateCoords"+(id.slice(id.length-1)-1)+"()");
+//alert(picture.getAttribute("onmousemove")+"***");
+    svgpicture = picture;
+    doc = document;
+  }
+  xunitlength = svgpicture.getAttribute("xunitlength")-0;
+  yunitlength = svgpicture.getAttribute("yunitlength")-0;
+  xmin = svgpicture.getAttribute("xmin")-0;
+  xmax = svgpicture.getAttribute("xmax")-0;
+  ymin = svgpicture.getAttribute("ymin")-0;
+  ymax = svgpicture.getAttribute("ymax")-0;
+  origin = [svgpicture.getAttribute("ox")-0,svgpicture.getAttribute("oy")-0];
+}
+
+
+function updatePicture(obj) {
+//alert(typeof obj)
+  var src = document.getElementById((typeof obj=="string"?
+              obj:"picture"+(obj+1)+"input")).value;
+  xmin = null; xmax = null; ymin = null; ymax = null;
+  xscl = null; xgrid = null; yscl = null; ygrid = null;
+  initialized = false;
+  switchTo((typeof obj=="string"?obj.slice(0,8):"picture"+(obj+1)));
+  src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+?)\,/g,"plot\(\"$1\",");
+  src = src.replace(/plot\(\x20*([^\"f\[][^\n\r]+)\)/g,"plot(\"$1\")");
+  src = src.replace(/([0-9])([a-zA-Z])/g,"$1*$2");
+  src = src.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
+//alert(src);
+  try {
+    with (Math) eval(src);
+  } catch(err) {alert(err+"\n"+src)}
+}
+
+
+function showHideCode(obj) {
+  var node = obj.nextSibling;
+  while (node != null && node.nodeName != "BUTTON" && 
+
+    node.nodeName != "button") node = node.nextSibling;
+  if (node.style.display == "none") node.style.display = "";
+  else node.style.display = "none";
+  while (node != null && node.nodeName != "TEXTAREA" && 
+    node.nodeName != "textarea") node = node.previousSibling;
+  if (node.style.display == "none") node.style.display = "";
+  else node.style.display = "none";
+//  updatePicture(node.getAttribute("id"));
+}
+
+
+function hideCode() { //do nothing
+}
+
+
+function showcode() { //do nothing
+}
+
+
+function nobutton() { //do nothing
+}
+
+
+function setBorder(l,b,r,t) { 
+	if (t==null) {
+		border = new Array(l,l,l,l);
+	} else {
+		border = new Array(l,b,r,t);
+	}
+}
+
+
+function initPicture(x_min,x_max,y_min,y_max) {
+ if (!initialized) {
+  strokewidth = "1"; // pixel
+  strokedasharray = null;
+  stroke = "black"; // default line color
+  fill = "none";    // default fill color
+  fontstyle = "italic"; // default shape for text labels
+  fontfamily = "times"; // default font
+  fontsize = "16";      // default size
+  fontweight = "normal";
+  fontstroke = "black";  // default font outline color
+  fontfill = "black";    // default font color
+  fontbackground = "none";
+  marker = "none";
+  initialized = true;
+  if (x_min!=null) xmin = x_min;
+  if (x_max!=null) xmax = x_max;
+  if (y_min!=null) ymin = y_min;
+  if (y_max!=null) ymax = y_max;
+  if (xmin==null) xmin = -5;
+  if (xmax==null) xmax = 5;
+ if (typeof xmin != "number" || typeof xmax != "number" || xmin >= xmax) 
+   alert("Picture requires at least two numbers: xmin < xmax");
+ else if (y_max != null && (typeof y_min != "number" || 
+          typeof y_max != "number" || y_min >= y_max))
+   alert("initPicture(xmin,xmax,ymin,ymax) requires numbers ymin < ymax");
+ else {
+  //if (width==null) 
+  width = picture.getAttribute("width");
+  //else picture.setAttribute("width",width);
+  if (width==null || width=="") width=defaultwidth;
+  //if (height==null) 
+  height = picture.getAttribute("height");
+  //else picture.setAttribute("height",height);
+  if (height==null || height=="") height=defaultheight;
+  xunitlength = (width-border[0]-border[2])/(xmax-xmin);
+  yunitlength = xunitlength;
+//alert(xmin+" "+xmax+" "+ymin+" "+ymax)
+  if (ymin==null) {
+    origin = [-xmin*xunitlength+border[0],height/2];
+    ymin = -(height-border[1]-border[3])/(2*yunitlength);
+    ymax = -ymin;
+  } else {
+    if (ymax!=null) yunitlength = (height-border[1]-border[3])/(ymax-ymin);
+    else ymax = (height-border[1]-border[3])/yunitlength + ymin;
+    origin = [-xmin*xunitlength+border[0],-ymin*yunitlength+border[1]];
+  }
+  winxmin = Math.max(border[0]-5,0);
+  winxmax = Math.min(width-border[2]+5,width);
+  winymin = Math.max(border[3]-5,0);
+  winymax = Math.min(height-border[1]+5,height);
+//  if (true ||picture.nodeName == "EMBED" || picture.nodeName == "embed") {
+    if (isIE) {
+      svgpicture = picture.getSVGDocument().getElementById("root");
+      while (svgpicture.childNodes.length()>5) 
+        svgpicture.removeChild(svgpicture.lastChild); 
+      svgpicture.setAttribute("width",width);
+      svgpicture.setAttribute("height",height);
+      doc = picture.getSVGDocument();
+    } else {
+      var qnode = document.createElementNS("http://www.w3.org/2000/svg","svg");
+      qnode.setAttribute("id",picture.getAttribute("id"));
+      qnode.setAttribute("style","display:inline; "+picture.getAttribute("style"));
+      qnode.setAttribute("width",picture.getAttribute("width"));
+      qnode.setAttribute("height",picture.getAttribute("height"));
+      if (picture.parentNode!=null)
+        picture.parentNode.replaceChild(qnode,picture);
+      else
+        svgpicture.parentNode.replaceChild(qnode,svgpicture);
+      svgpicture = qnode;
+      doc = document;
+      pointerpos = doc.getElementById("pointerpos");
+      if (pointerpos==null) {
+        pointerpos = myCreateElementSVG("circle");
+        pointerpos.setAttribute("id","pointerpos");
+        pointerpos.setAttribute("cx",0);
+        pointerpos.setAttribute("cy",0);
+        pointerpos.setAttribute("r",0.5);
+        pointerpos.setAttribute("fill","red");
+        svgpicture.appendChild(pointerpos);
+      }
+    }
+//  } else {
+//    svgpicture = picture;
+//    doc = document;
+//  }
+  svgpicture.setAttribute("xunitlength",xunitlength);
+  svgpicture.setAttribute("yunitlength",yunitlength);
+  svgpicture.setAttribute("xmin",xmin);
+  svgpicture.setAttribute("xmax",xmax);
+  svgpicture.setAttribute("ymin",ymin);
+  svgpicture.setAttribute("ymax",ymax);
+  svgpicture.setAttribute("ox",origin[0]);
+  svgpicture.setAttribute("oy",origin[1]);
+  var node = myCreateElementSVG("rect");
+  node.setAttribute("x","0");
+  node.setAttribute("y","0");
+  node.setAttribute("width",width);
+  node.setAttribute("height",height);
+  node.setAttribute("style","stroke-width:1;fill:white");
+  svgpicture.appendChild(node);
+  if (!isIE && picture.getAttribute("onmousemove")!=null) {
+    svgpicture.addEventListener("mousemove", mousemove_listener, true);
+    var st = picture.getAttribute("onmousemove");
+    svgpicture.addEventListener("mousemove", eval(st.slice(0,st.indexOf("("))), true);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points","0,0 "+width+",0");
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", top_listener, true);
+    svgpicture.appendChild(node);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points","0,"+height+" "+width+","+height);
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", bottom_listener, true);
+    svgpicture.appendChild(node);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points","0,0 0,"+height);
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", left_listener, true);
+    svgpicture.appendChild(node);
+    node = myCreateElementSVG("polyline");
+    node.setAttribute("points",(width-1)+",0 "+(width-1)+","+height);
+    node.setAttribute("style","stroke:white; stroke-width:3");
+    node.addEventListener("mousemove", right_listener, true);
+    svgpicture.appendChild(node);
+  }
+  border = defaultborder;
+ }
+ }
+}
+
+
+function line(p,q,id) { // segment connecting points p,q (coordinates in units)
+  var node;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("path");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+  node.setAttribute("d","M"+(p[0]*xunitlength+origin[0])+","+
+    (height-p[1]*yunitlength-origin[1])+" "+
+    (q[0]*xunitlength+origin[0])+","+(height-q[1]*yunitlength-origin[1]));
+  node.setAttribute("stroke-width", strokewidth);
+  if (strokedasharray!=null) 
+    node.setAttribute("stroke-dasharray", strokedasharray);
+  node.setAttribute("stroke", stroke);
+  node.setAttribute("fill", fill);
+  if (marker=="dot" || marker=="arrowdot") {
+    ASdot(p,4,markerstroke,markerfill);
+    if (marker=="arrowdot") arrowhead(p,q);
+    ASdot(q,4,markerstroke,markerfill);
+  } else if (marker=="arrow") arrowhead(p,q);
+}
+
+
+function path(plist,id,c) {
+  if (c==null) c="";
+  var node, st, i;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("path");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+  if (typeof plist == "string") st = plist;
+  else {
+    st = "M";
+    st += (plist[0][0]*xunitlength+origin[0])+","+
+          (height-plist[0][1]*yunitlength-origin[1])+" "+c;
+    for (i=1; i<plist.length; i++)
+      st += (plist[i][0]*xunitlength+origin[0])+","+
+            (height-plist[i][1]*yunitlength-origin[1])+" ";
+  }
+  node.setAttribute("d", st);
+  node.setAttribute("stroke-width", strokewidth);
+  if (strokedasharray!=null) 
+    node.setAttribute("stroke-dasharray", strokedasharray);
+  node.setAttribute("stroke", stroke);
+  node.setAttribute("fill", fill);
+  if (marker=="dot" || marker=="arrowdot")
+    for (i=0; i<plist.length; i++)
+      if (c!="C" && c!="T" || i!=1 && i!=2)
+        ASdot(plist[i],4,markerstroke,markerfill);
+}
+
+
+function curve(plist,id) {
+  path(plist,id,"T");
+}
+
+
+function circle(center,radius,id) { // coordinates in units
+  var node;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("circle");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+
+  node.setAttribute("cx",center[0]*xunitlength+origin[0]);
+  node.setAttribute("cy",height-center[1]*yunitlength-origin[1]);
+  node.setAttribute("r",radius*xunitlength);
+  node.setAttribute("stroke-width", strokewidth);
+  node.setAttribute("stroke", stroke);
+  node.setAttribute("fill", fill);
+}
+
+
+function loop(p,d,id) { 
+// d is a direction vector e.g. [1,0] means loop starts in that direction
+  if (d==null) d=[1,0];
+  path([p,[p[0]+d[0],p[1]+d[1]],[p[0]-d[1],p[1]+d[0]],p],id,"C");
+  if (marker=="arrow" || marker=="arrowdot") 
+    arrowhead([p[0]+Math.cos(1.4)*d[0]-Math.sin(1.4)*d[1],
+               p[1]+Math.sin(1.4)*d[0]+Math.cos(1.4)*d[1]],p);
+}
+
+
+function arc(start,end,radius,id) { // coordinates in units
+  var node, v;
+//alert([fill, stroke, origin, xunitlength, yunitlength, height])
+  if (id!=null) node = doc.getElementById(id);
+  if (radius==null) {
+    v=[end[0]-start[0],end[1]-start[1]];
+    radius = Math.sqrt(v[0]*v[0]+v[1]*v[1]);
+  }
+  if (node==null) {
+    node = myCreateElementSVG("path");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+  node.setAttribute("d","M"+(start[0]*xunitlength+origin[0])+","+
+    (height-start[1]*yunitlength-origin[1])+" A"+radius*xunitlength+","+
+     radius*yunitlength+" 0 0,0 "+(end[0]*xunitlength+origin[0])+","+
+    (height-end[1]*yunitlength-origin[1]));
+  node.setAttribute("stroke-width", strokewidth);
+  node.setAttribute("stroke", stroke);
+  node.setAttribute("fill", fill);
+  if (marker=="arrow" || marker=="arrowdot") {
+    u = [(end[1]-start[1])/4,(start[0]-end[0])/4];
+    v = [(end[0]-start[0])/2,(end[1]-start[1])/2];
+//alert([u,v])
+    v = [start[0]+v[0]+u[0],start[1]+v[1]+u[1]];
+  } else v=[start[0],start[1]];
+  if (marker=="dot" || marker=="arrowdot") {
+    ASdot(start,4,markerstroke,markerfill);
+    if (marker=="arrowdot") arrowhead(v,end);
+    ASdot(end,4,markerstroke,markerfill);
+  } else if (marker=="arrow") arrowhead(v,end);
+}
+
+
+function ellipse(center,rx,ry,id) { // coordinates in units
+
+  var node;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("ellipse");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+  node.setAttribute("cx",center[0]*xunitlength+origin[0]);
+  node.setAttribute("cy",height-center[1]*yunitlength-origin[1]);
+  node.setAttribute("rx",rx*xunitlength);
+  node.setAttribute("ry",ry*yunitlength);
+  node.setAttribute("stroke-width", strokewidth);
+  node.setAttribute("stroke", stroke);
+  node.setAttribute("fill", fill);
+}
+
+
+function rect(p,q,id,rx,ry) { // opposite corners in units, rounded by radii
+  var node;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("rect");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+  }
+  node.setAttribute("x",p[0]*xunitlength+origin[0]);
+  node.setAttribute("y",height-q[1]*yunitlength-origin[1]);
+  node.setAttribute("width",(q[0]-p[0])*xunitlength);
+  node.setAttribute("height",(q[1]-p[1])*yunitlength);
+  if (rx!=null) node.setAttribute("rx",rx*xunitlength);
+  if (ry!=null) node.setAttribute("ry",ry*yunitlength);
+  node.setAttribute("stroke-width", strokewidth);
+  node.setAttribute("stroke", stroke);
+  node.setAttribute("fill", fill);
+}
+
+function text(p,st,pos,angle) {
+	p[0] = p[0]*xunitlength+origin[0];
+	p[1] = p[1]*yunitlength+origin[1];
+	textabs(p,st,pos,angle);
+}
+
+function textabs(p,st,pos,angle,id,fontsty) {
+  if (angle==null) {
+	  angle = 0;
+  } else {
+	  angle = (360 - angle)%360;
+  }
+  var textanchor = "middle";
+  var dx=0; var dy=0;
+  if (angle==270) {
+	  var dy = 0; var dx = fontsize/3;
+	  if (pos!=null) {
+	    if (pos.match(/left/)) {dx = -fontsize/2;}
+	    if (pos.match(/right/)) {dx = fontsize-0;}
+	    if (pos.match(/above/)) {
+	      textanchor = "start";
+	      dy = -fontsize/2;
+	    }
+	    if (pos.match(/below/)) {
+	      textanchor = "end";
+	      dy = fontsize/2;
+	    }
+	  }
+  } 
+  if (angle==90) {
+	  var dy = 0; var dx = -fontsize/3;
+	  if (pos!=null) {
+	    if (pos.match(/left/)) dx = -fontsize-0;
+	    if (pos.match(/right/)) dx = fontsize/2;
+	    if (pos.match(/above/)) {
+	      textanchor = "end";
+	      dy = -fontsize/2;
+	    }
+	    if (pos.match(/below/)) {
+	      textanchor = "start";
+	      dy = fontsize/2;
+	    }
+	  }
+  }
+  if (angle==0) {
+	  var dx = 0; var dy = fontsize/3;
+	  if (pos!=null) {
+	    if (pos.match(/above/)) { dy = -fontsize/3; }
+	    if (pos.match(/below/)) { dy = fontsize-0; }
+	    if (pos.match(/right/)) {
+	      textanchor = "start";
+	      dx = fontsize/3;
+	    }
+	    if (pos.match(/left/)) {
+	      textanchor = "end";
+	      dx = -fontsize/3;
+	    }
+	  }
+  }
+ 
+  var node;
+  if (id!=null) node = doc.getElementById(id);
+  if (node==null) {
+    node = myCreateElementSVG("text");
+    node.setAttribute("id", id);
+    svgpicture.appendChild(node);
+    node.appendChild(doc.createTextNode(st));
+  }
+  node.lastChild.nodeValue = st;
+  node.setAttribute("x",p[0]+dx);
+  node.setAttribute("y",height-p[1]+dy);
+  if (angle != 0) {
+	  node.setAttribute("transform","rotate("+angle+" "+(p[0]+dx)+" "+(height-p[1]+dy)+")");
+  }
+  node.setAttribute("font-style",(fontsty!=null?fontsty:fontstyle));
+  node.setAttribute("font-family",fontfamily);
+  node.setAttribute("font-size",fontsize);
+  node.setAttribute("font-weight",fontweight);
+  node.setAttribute("text-anchor",textanchor);
+  if (fontstroke!="none") node.setAttribute("stroke",fontstroke);
+  if (fontfill!="none") node.setAttribute("fill",fontfill);
+  node.setAttribute("stroke-width","0px");
+  if (fontbackground!="none") {
+	  var bgnode = myCreateElementSVG("rect");
+	  var bb = node.getBBox();
+	  bgnode.setAttribute("fill",fontbackground);
+	  bgnode.setAttribute("stroke-width","0px");
+	  bgnode.setAttribute("x",bb.x-2);
+	  bgnode.setAttribute("y",bb.y-2);
+	  bgnode.setAttribute("width",bb.width+4);
+	  bgnode.setAttribute("height",bb.height+4);
+	  if (angle != 0) {
+		   bgnode.setAttribute("transform","rotate("+angle+" "+(p[0]+dx)+" "+(height-p[1]+dy)+")");
+	  }
+	  svgpicture.insertBefore(bgnode,node);
+		  
+  }
+  return p;
+}
+
+
+function ASdot(center,radius,s,f) { // coordinates in units, radius in pixel
+  if (s==null) s = stroke; if (f==null) f = fill;
+  var node = myCreateElementSVG("circle");
+  node.setAttribute("cx",center[0]*xunitlength+origin[0]);
+  node.setAttribute("cy",height-center[1]*yunitlength-origin[1]);
+  node.setAttribute("r",radius);
+  node.setAttribute("stroke-width", strokewidth);
+  node.setAttribute("stroke", s);
+  node.setAttribute("fill", f);
+  svgpicture.appendChild(node);
+}
+
+
+function dot(center, typ, label, pos, id) {
+  var node;
+  var cx = center[0]*xunitlength+origin[0];
+  var cy = height-center[1]*yunitlength-origin[1];
+  if (id!=null) node = doc.getElementById(id);
+  if (typ=="+" || typ=="-" || typ=="|") {
+    if (node==null) {
+      node = myCreateElementSVG("path");
+      node.setAttribute("id", id);
+      svgpicture.appendChild(node);
+    }
+    if (typ=="+") {
+      node.setAttribute("d",
+        " M "+(cx-ticklength)+" "+cy+" L "+(cx+ticklength)+" "+cy+
+        " M "+cx+" "+(cy-ticklength)+" L "+cx+" "+(cy+ticklength));
+      node.setAttribute("stroke-width", .5);
+      node.setAttribute("stroke", axesstroke);
+    } else {
+      if (typ=="-") node.setAttribute("d",
+        " M "+(cx-ticklength)+" "+cy+" L "+(cx+ticklength)+" "+cy);
+      else node.setAttribute("d",
+        " M "+cx+" "+(cy-ticklength)+" L "+cx+" "+(cy+ticklength));
+      node.setAttribute("stroke-width", strokewidth);
+      node.setAttribute("stroke", stroke);
+    }
+  } else {
+    if (node==null) {
+      node = myCreateElementSVG("circle");
+      node.setAttribute("id", id);
+      svgpicture.appendChild(node);
+    }
+    node.setAttribute("cx",cx);
+    node.setAttribute("cy",cy);
+    node.setAttribute("r",dotradius);
+    node.setAttribute("stroke-width", strokewidth);
+    node.setAttribute("stroke", stroke);
+    node.setAttribute("fill", (typ=="open"?"white":stroke));
+  }
+  if (label!=null) 
+    text(center,label,(pos==null?"below":pos),(id==null?id:id+"label"))
+}
+
+
+function arrowhead(p,q) { // draw arrowhead at q (in units)
+  var up;
+  var v = [p[0]*xunitlength+origin[0],height-p[1]*yunitlength-origin[1]];
+  var w = [q[0]*xunitlength+origin[0],height-q[1]*yunitlength-origin[1]];
+  var u = [w[0]-v[0],w[1]-v[1]];
+  var d = Math.sqrt(u[0]*u[0]+u[1]*u[1]);
+  if (d > 0.00000001) {
+    u = [u[0]/d, u[1]/d];
+    up = [-u[1],u[0]];
+    var node = myCreateElementSVG("path");
+    node.setAttribute("d","M "+(w[0]-15*u[0]-4*up[0])+" "+
+      (w[1]-15*u[1]-4*up[1])+" L "+(w[0]-3*u[0])+" "+(w[1]-3*u[1])+" L "+
+      (w[0]-15*u[0]+4*up[0])+" "+(w[1]-15*u[1]+4*up[1])+" z");
+    node.setAttribute("stroke-width", markerstrokewidth);
+    node.setAttribute("stroke", stroke); /*was markerstroke*/
+    node.setAttribute("fill", stroke); /*was arrowfill*/
+    svgpicture.appendChild(node);    
+  }
+}
+
+
+function chopZ(st) {
+  var k = st.indexOf(".");
+  if (k==-1) return st;
+  for (var i=st.length-1; i>k && st.charAt(i)=="0"; i--);
+  if (i==k) i--;
+  return st.slice(0,i+1);
+}
+
+
+function grid(dx,dy) { // for backward compatibility
+  axes(dx,dy,null,dx,dy)
+}
+
+
+function noaxes() {
+  if (!initialized) initPicture();
+}
+
+
+function axes(dx,dy,labels,gdx,gdy,dox,doy) {
+//xscl=x is equivalent to xtick=x; xgrid=x; labels=true;
+  var x, y, ldx, ldy, lx, ly, lxp, lyp, pnode, st;
+  if (!initialized) initPicture();
+  if (typeof dx=="string") { labels = dx; dx = null; }
+  if (typeof dy=="string") { gdx = dy; dy = null; }
+  if (xscl!=null) {dx = xscl; gdx = xscl; labels = dx}
+  if (yscl!=null) {dy = yscl; gdy = yscl}
+  if (xtick!=null) {dx = xtick}
+  if (ytick!=null) {dy = ytick}
+  if (dox==null) {dox = true;}
+  if (doy==null) {doy = true;}
+  if (dox=="off" || dox==0) { dox = false;} else {dox = true;}
+  if (doy=="off" || doy==0) { doy = false;} else {doy = true;}
+//alert(null)
+  dx = (dx==null?xunitlength:dx*xunitlength);
+  dy = (dy==null?dx:dy*yunitlength);
+  fontsize = Math.floor(Math.min(dx/1.5,dy/1.5,16));//alert(fontsize)
+  ticklength = fontsize/4;
+  if (xgrid!=null) gdx = xgrid;
+  if (ygrid!=null) gdy = ygrid;
+  if (gdx!=null) {
+    gdx = (typeof gdx=="string"?dx:gdx*xunitlength);
+    gdy = (gdy==null?dy:gdy*yunitlength);
+    pnode = myCreateElementSVG("path");
+    st="";
+    if (dox && gdx>0) {
+	    for (x = origin[0]; x<=winxmax; x = x+gdx)
+	      if (x>=winxmin) st += " M"+x+","+winymin+" "+x+","+winymax;
+	    for (x = origin[0]-gdx; x>=winxmin; x = x-gdx)
+	      if (x<=winxmax) st += " M"+x+","+winymin+" "+x+","+winymax;
+    }
+    if (doy && gdy>0) {
+	    for (y = height-origin[1]; y<=winymax; y = y+gdy)
+	      if (y>=winymin) st += " M"+winxmin+","+y+" "+winxmax+","+y;
+	    for (y = height-origin[1]-gdy; y>=winymin; y = y-gdy)
+	      if (y<=winymax) st += " M"+winxmin+","+y+" "+winxmax+","+y;
+    }
+    pnode.setAttribute("d",st);
+    pnode.setAttribute("stroke-width", .5);
+    pnode.setAttribute("stroke", gridstroke);
+    pnode.setAttribute("fill", fill);
+    svgpicture.appendChild(pnode);
+  }
+  pnode = myCreateElementSVG("path");
+  if (dox) {
+	  st="M"+winxmin+","+(height-origin[1])+" "+winxmax+","+
+    (height-origin[1]);
+  }
+  if (doy) {
+	  st += " M"+origin[0]+","+winymin+" "+origin[0]+","+winymax;
+  }
+  if (dox) {
+	  for (x = origin[0]; x<winxmax; x = x+dx)
+	    if (x>=winymin) st += " M"+x+","+(height-origin[1]+ticklength)+" "+x+","+
+		   (height-origin[1]-ticklength);
+	  for (x = origin[0]-dx; x>winxmin; x = x-dx)
+	   if (x<=winxmax) st += " M"+x+","+(height-origin[1]+ticklength)+" "+x+","+
+		   (height-origin[1]-ticklength);
+  }
+  if (doy) {
+	  for (y = height-origin[1]; y<winymax; y = y+dy)
+	    if (y>=winymin) st += " M"+(origin[0]+ticklength)+","+y+" "+(origin[0]-ticklength)+","+y;
+	  for (y = height-origin[1]-dy; y>winymin; y = y-dy)
+	    if (y<=winymax) st += " M"+(origin[0]+ticklength)+","+y+" "+(origin[0]-ticklength)+","+y;
+  }
+  if (labels!=null) with (Math) {
+    ldx = dx/xunitlength;
+    ldy = dy/yunitlength;
+    lx = (xmin>0 || xmax<0?xmin:0);
+    ly = (ymin>0 || ymax<0?ymin:0);
+    lxp = (ly==0?"below":"above");
+    lyp = (lx==0?"left":"right");
+    var ddx = floor(1.1-log(ldx)/log(10))+1;
+    var ddy = floor(1.1-log(ldy)/log(10))+1;
+    if (ddy<0) { ddy = 0;}
+    if (ddx<0) { ddx = 0;}
+    if (dox) {
+	    for (x = (doy?ldx:0); x<=xmax; x = x+ldx)
+	      if (x>=xmin) text([x,ly],chopZ(x.toFixed(ddx)),lxp);
+	    for (x = -ldx; xmin<=x; x = x-ldx)
+	      if (x<=xmax) text([x,ly],chopZ(x.toFixed(ddx)),lxp);
+    }
+    if (doy) {
+	    for (y = (dox?ldy:0); y<=ymax; y = y+ldy)
+	      if (y>=ymin) text([lx,y],chopZ(y.toFixed(ddy)),lyp);
+	    for (y = -ldy; ymin<=y; y = y-ldy)
+	      if (y<=ymax) text([lx,y],chopZ(y.toFixed(ddy)),lyp);
+    }
+  }
+  pnode.setAttribute("d",st);
+  pnode.setAttribute("stroke-width", .5);
+  pnode.setAttribute("stroke", axesstroke);
+  pnode.setAttribute("fill", fill);
+  svgpicture.appendChild(pnode);
+}
+
+function safepow(base,power) {
+	if (base<0 && Math.floor(power)!=power) {
+		for (var j=3; j<50; j+=2) {
+			if (Math.abs(Math.round(j*power)-(j*power))<.000001) {
+				if (Math.round(j*power)%2==0) {
+					return Math.pow(Math.abs(base),power);
+				} else {
+					return -1*Math.pow(Math.abs(base),power);
+				}
+			}
+		}
+		return sqrt(-1);
+	} else {
+		return Math.pow(base,power);
+	}
+}
+
+function nthroot(n,base) {
+	return safepow(base,1/n);
+}
+function nthlogten(n,v) {
+	return ((Math.log(v))/(Math.log(n)));
+}
+function matchtolower(match) {
+	return match.toLowerCase();
+}
+
+function mathjs(st,varlist) {
+  //translate a math formula to js function notation
+  // a^b --> pow(a,b)
+  // na --> n*a
+  // (...)d --> (...)*d
+  // n! --> factorial(n)
+  // sin^-1 --> arcsin etc.
+  //while ^ in string, find term on left and right
+  //slice and concat new formula string
+  //parenthesizes the function variables
+  st = st.replace("[","(");
+  st = st.replace("]",")");
+  st = st.replace(/arc(sin|cos|tan)/g,"a#r#c $1");
+  if (varlist != null) {
+	  var reg = new RegExp("(sqrt|ln|log|sin|cos|tan|sec|csc|cot|abs)[\(]","g");
+	  st = st.replace(reg,"$1#(");
+	  var reg = new RegExp("("+varlist+")("+varlist+")$","g");
+	  st = st.replace(reg,"($1)($2)");
+	  var reg = new RegExp("("+varlist+")(a#|sqrt|ln|log|sin|cos|tan|sec|csc|cot|abs)","g");
+	  st = st.replace(reg,"($1)$2");
+	  var reg = new RegExp("("+varlist+")("+varlist+")([^a-df-zA-Z\(#])","g"); // 6/1/09 readded \( for f(350/x)
+	  st = st.replace(reg,"($1)($2)$3"); //get xy3
+	  //var reg = new RegExp("("+varlist+")("+varlist+")(\w*[^\(#])","g");
+	  //st = st.replace(reg,"($1)($2)$3"); //get xysin
+	  var reg = new RegExp("([^a-df-zA-Z#])("+varlist+")([^a-df-zA-Z#])","g");
+	  st = st.replace(reg,"$1($2)$3");	  
+	  var reg = new RegExp("^("+varlist+")([^a-df-zA-Z])","g");
+	  st = st.replace(reg,"($1)$2");
+	  var reg = new RegExp("([^a-df-zA-Z])("+varlist+")$","g");
+	  st = st.replace(reg,"$1($2)");
+  }
+  st = st.replace(/#/g,"");
+  st = st.replace(/a#r#c\s+(sin|cos|tan)/g,"arc$1");
+  st = st.replace(/\s/g,"");
+  st = st.replace(/(Sin|Cos|Tan|Sec|Csc|Cot|Arc|Abs|Log|Ln)/g, matchtolower);
+  st = st.replace(/log_(\d+)\(/,"nthlog($1,");
+  st = st.replace(/log/g,"logten");
+  
+  if (st.indexOf("^-1")!=-1) {
+    st = st.replace(/sin\^-1/g,"arcsin");
+    st = st.replace(/cos\^-1/g,"arccos");
+    st = st.replace(/tan\^-1/g,"arctan");
+    st = st.replace(/sec\^-1/g,"arcsec");
+    st = st.replace(/csc\^-1/g,"arccsc");
+    st = st.replace(/cot\^-1/g,"arccot");
+    st = st.replace(/sinh\^-1/g,"arcsinh");
+    st = st.replace(/cosh\^-1/g,"arccosh");
+    st = st.replace(/tanh\^-1/g,"arctanh");
+    st = st.replace(/sech\^-1/g,"arcsech");
+    st = st.replace(/csch\^-1/g,"arccsch");
+    st = st.replace(/coth\^-1/g,"arccoth");
+  }
+  
+  st = st.replace(/root\((\d+)\)\(/,"nthroot($1,");
+  //st = st.replace(/E/g,"(EE)");
+  st = st.replace(/([0-9])E([\-0-9])/g,"$1(EE)$2");
+  
+  st = st.replace(/^e$/g,"(E)");
+  st = st.replace(/pi/g,"(pi)");
+  st = st.replace(/^e([^a-zA-Z])/g,"(E)$1");
+  st = st.replace(/([^a-zA-Z])e$/g,"$1(E)");
+  
+  st = st.replace(/([^a-zA-Z])e([^a-zA-Z])/g,"$1(E)$2");
+  st = st.replace(/([0-9])([\(a-zA-Z])/g,"$1*$2");
+  st = st.replace(/(!)([0-9\(])/g,"$1*$2");
+  //want to keep scientific notation
+  st= st.replace(/([0-9])\*\(EE\)([\-0-9])/,"$1e$2");
+
+  
+  st = st.replace(/\)([\(0-9a-zA-Z])/g,"\)*$1");
+  
+  var i,j,k, ch, nested;
+  while ((i=st.indexOf("^"))!=-1) {
+
+    //find left argument
+    if (i==0) return "Error: missing argument";
+    j = i-1;
+    ch = st.charAt(j);
+    if (ch>="0" && ch<="9") {// look for (decimal) number
+      j--;
+      while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
+      if (ch==".") {
+        j--;
+        while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
+      }
+    } else if (ch==")") {// look for matching opening bracket and function name
+      nested = 1;
+      j--;
+      while (j>=0 && nested>0) {
+        ch = st.charAt(j);
+        if (ch=="(") nested--;
+        else if (ch==")") nested++;
+        j--;
+      }
+      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
+        j--;
+    } else if (ch>="a" && ch<="z" || ch>="A" && ch<="Z") {// look for variable
+      j--;
+      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
+        j--;
+    } else { 
+      return "Error: incorrect syntax in "+st+" at position "+j;
+    }
+    //find right argument
+    if (i==st.length-1) return "Error: missing argument";
+    k = i+1;
+    ch = st.charAt(k);
+    nch = st.charAt(k+1);
+    if (ch>="0" && ch<="9" || (ch=="-" && nch!="(") || ch==".") {// look for signed (decimal) number
+      k++;
+      while (k<st.length && (ch=st.charAt(k))>="0" && ch<="9") k++;
+      if (ch==".") {
+        k++;
+        while (k<st.length && (ch=st.charAt(k))>="0" && ch<="9") k++;
+      }
+    } else if (ch=="(" || (ch=="-" && nch=="(")) {// look for matching closing bracket and function name
+      if (ch=="-") { k++;}
+      nested = 1;
+      k++;
+      while (k<st.length && nested>0) {
+        ch = st.charAt(k);
+        if (ch=="(") nested++;
+        else if (ch==")") nested--;
+        k++;
+      }
+    } else if (ch>="a" && ch<="z" || ch>="A" && ch<="Z") {// look for variable
+      k++;
+      while (k<st.length && (ch=st.charAt(k))>="a" && ch<="z" ||
+               ch>="A" && ch<="Z") k++;
+      if (ch=='(' && st.slice(i+1,k).match(/^(sin|cos|tan|sec|csc|cot|logten|log|ln|exp|arcsin|arccos|arctan|arcsec|arccsc|arccot|sinh|cosh|tanh|sech|csch|coth|arcsinh|arccosh|arctanh|arcsech|arccsch|arccoth|sqrt|abs|nthroot)$/)) {
+	      nested = 1;
+	      k++;
+	      while (k<st.length && nested>0) {
+		ch = st.charAt(k);
+		if (ch=="(") nested++;
+		else if (ch==")") nested--;
+		k++;
+	      }
+      }
+    } else { 
+      return "Error: incorrect syntax in "+st+" at position "+k;
+    }
+    st = st.slice(0,j+1)+"safepow("+st.slice(j+1,i)+","+st.slice(i+1,k)+")"+
+           st.slice(k);
+  }
+  while ((i=st.indexOf("!"))!=-1) {
+    //find left argument
+    if (i==0) return "Error: missing argument";
+    j = i-1;
+    ch = st.charAt(j);
+    if (ch>="0" && ch<="9") {// look for (decimal) number
+      j--;
+      while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
+      if (ch==".") {
+        j--;
+        while (j>=0 && (ch=st.charAt(j))>="0" && ch<="9") j--;
+      }
+    } else if (ch==")") {// look for matching opening bracket and function name
+      nested = 1;
+      j--;
+      while (j>=0 && nested>0) {
+        ch = st.charAt(j);
+        if (ch=="(") nested--;
+        else if (ch==")") nested++;
+        j--;
+      }
+      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
+        j--;
+    } else if (ch>="a" && ch<="z" || ch>="A" && ch<="Z") {// look for variable
+      j--;
+      while (j>=0 && (ch=st.charAt(j))>="a" && ch<="z" || ch>="A" && ch<="Z")
+        j--;
+    } else { 
+      return "Error: incorrect syntax in "+st+" at position "+j;
+    }
+    st = st.slice(0,j+1)+"factorial("+st.slice(j+1,i)+")"+st.slice(i+1);
+  }
+  return st;
+}
+
+
+function slopefield(fun,dx,dy) {
+  var g = fun;
+  if (typeof fun=="string") 
+    eval("g = function(x,y){ with(Math) return "+mathjs(fun)+" }");
+  var gxy,x,y,u,v,dz;
+  if (dx==null) dx=1;
+  if (dy==null) dy=1;
+  dz = Math.sqrt(dx*dx+dy*dy)/6;
+  var x_min = Math.ceil(xmin/dx);
+  var y_min = Math.ceil(ymin/dy);
+  for (x = x_min; x <= xmax; x += dx)
+    for (y = y_min; y <= ymax; y += dy) {
+      gxy = g(x,y);
+      if (!isNaN(gxy)) {
+        if (Math.abs(gxy)=="Infinity") {u = 0; v = dz;}
+        else {u = dz/Math.sqrt(1+gxy*gxy); v = gxy*u;}
+        line([x-u,y-v],[x+u,y+v]);
+      }
+    }
+}
+
+
+//ASCIIsvgAddon.js dumped here
+function drawPictures() {
+	drawPics()
+}
+
+//ShortScript format:
+//xmin,xmax,ymin,ymax,xscl,yscl,labels,xgscl,ygscl,width,height plotcommands(see blow)
+//plotcommands: type,eq1,eq2,startmaker,endmarker,xmin,xmax,color,strokewidth,strokedash
+function parseShortScript(sscript,gw,gh) {
+	if (sscript == null) {
+		initialized = false;
+		sscript = picture.sscr;
+	}
+	
+	var sa= sscript.split(",");
+	
+	if (gw && gh) {
+		sa[9] = gw;
+		sa[10] = gh;
+		sscript = sa.join(",");
+		picture.setAttribute("sscr", sscript);
+	}
+	picture.setAttribute("width", sa[9]);
+	picture.setAttribute("height", sa[10]);
+	picture.style.width = sa[9] + "px";
+	picture.style.height = sa[10] + "px";
+	
+	if (sa.length > 10) {
+		commands = 'setBorder(5);';
+		commands += 'width=' +sa[9] + '; height=' +sa[10] + ';';
+		commands += 'initPicture(' + sa[0] +','+ sa[1] +','+ sa[2] +','+ sa[3] + ');';
+		commands += 'axes(' + sa[4] +','+ sa[5] +','+ sa[6] +','+ sa[7] +','+ sa[8]+ ');';
+				
+		var inx = 11;
+		var eqnlist = 'Graphs: ';
+		
+		while (sa.length > inx+9) {
+		   commands += 'stroke="' + sa[inx+7] + '";';
+		   commands += 'strokewidth="' + sa[inx+8] + '";'
+		   //commands += 'strokedasharray="' + sa[inx+9] + '";'	
+		   if (sa[inx+9] != "") {
+			   commands += 'strokedasharray="' + sa[inx+9].replace(/\s+/g,',') + '";';
+		   }
+		   if (sa[inx]=="slope") {
+			   eqnlist += "dy/dx="+sa[inx+1] + "; ";
+			commands += 'slopefield("' + sa[inx+1] + '",' + sa[inx+2] + ',' + sa[inx+2] + ');'; 
+		   } else {
+			if (sa[inx]=="func") {
+				eqnlist += "y="+sa[inx+1] + "; ";
+				eqn = '"' + sa[inx+1] + '"';
+			} else if (sa[inx] == "polar") {
+				eqnlist += "r="+sa[inx+1] + "; ";
+				eqn = '["cos(t)*(' + sa[inx+1] + ')","sin(t)*(' + sa[inx+1] + ')"]';
+			} else if (sa[inx] == "param") {
+				eqnlist += "[x,y]=["+sa[inx+1] + "," + sa[inx+2] + "]; ";
+				eqn = '["' + sa[inx+1] + '","'+ sa[inx+2] + '"]';
+			}
+			
+			
+			if (typeof eval(sa[inx+5]) == "number") {
+		//	if ((sa[inx+5]!='null')&&(sa[inx+5].length>0)) {
+				//commands += 'myplot(' + eqn +',"' + sa[inx+3] +  '","' + sa[inx+4]+'",' + sa[inx+5] + ',' + sa[inx+6]  +');';
+				commands += 'plot(' + eqn +',' + sa[inx+5] + ',' + sa[inx+6] +',null,null,' + sa[inx+3] +  ',' + sa[inx+4] +');';
+			
+			} else {
+				commands += 'plot(' + eqn +',null,null,null,null,' + sa[inx+3] +  ',' + sa[inx+4]+');';
+			}
+		   }
+		   inx += 10;
+		}
+		
+		try {
+			eval(commands);
+		} catch (e) {
+			setTimeout(function() {parseShortScript(sscript,gw,gh)},100);
+			//alert("Graph not ready");
+		}
+		
+		picture.setAttribute("alt",eqnlist);
+		//picture.setAttribute("width", sa[9]);
+		//picture.setAttribute("height", sa[9]);
+		
+		return commands;
+	}
+}
+
+
+
+
+function drawPics() {
+  var index, nd;
+  pictures = document.getElementsByTagName("embed");
+ // might be needed if setTimeout on parseShortScript isn't working
+  if (!ASnoSVG) {
+	   try {
+		  for (var i = 0; i < pictures.length; i++) {
+			  if (pictures[i].getAttribute("sscr")!='' || pictures[i].getAttribute("script")!='') {
+				  if (pictures[i].getSVGDocument().getElementById("root") == null) {
+					setTimeout(drawPics,100);
+					return;
+				  }
+			  }
+		  }
+	  } catch (e) {
+		  setTimeout(drawPics,100);
+		  return;
+	  }
+ }
+  var len = pictures.length;
+  
+  
+  for (index = 0; index < len; index++) {
+	  picture = ((!ASnoSVG && isIE) ? pictures[index] : pictures[0]);
+   // for (index = len-1; index >=0; index--) {
+	//  picture = pictures[index];
+	  
+	  if (!ASnoSVG) {
+		  initialized = false;
+		  var sscr = picture.getAttribute("sscr");
+		  if ((sscr != null) && (sscr != "")) { //sscr from editor
+			  try {
+				  parseShortScript(sscr);
+			  } catch (e) {}
+		  } else {
+			  src = picture.getAttribute("script"); //script from showplot
+			  if ((src!=null) && (src != "")) {
+				  try {
+					  with (Math) eval(src);
+				  } catch(err) {alert(err+"\n"+src)}
+			  }
+		  }
+	  } else {
+		  if (picture.getAttribute("sscr")!='') {
+			  n = document.createElement('img');
+			  n.setAttribute("style",picture.getAttribute("style"));
+			  n.setAttribute("src",AScgiloc+'?sscr='+encodeURIComponent(picture.getAttribute("sscr")));
+			  pn = picture.parentNode;
+			  pn.replaceChild(n,picture);
+		  }
+		  
+	  }
+	  
+  }
+}
+
+//modified by David Lippman from original in AsciiSVG.js by Peter Jipsen
+//added min/max type:  0:nothing, 1:arrow, 2:open dot, 3:closed dot
+function plot(fun,x_min,x_max,points,id,min_type,max_type) {
+  var pth = [];
+  var f = function(x) { return x }, g = fun;
+  var name = null;
+  if (typeof fun=="string") 
+    eval("g = function(x){ with(Math) return "+mathjs(fun)+" }");
+  else if (typeof fun=="object") {
+    eval("f = function(t){ with(Math) return "+mathjs(fun[0])+" }");
+    eval("g = function(t){ with(Math) return "+mathjs(fun[1])+" }");
+  }
+  if (typeof x_min=="string") { name = x_min; x_min = xmin }
+  else name = id;
+  var min = (x_min==null?xmin:x_min);
+  var max = (x_max==null?xmax:x_max);
+  if (max <= min) { return null;}
+  //else {
+  var inc = max-min-0.000001*(max-min);
+  inc = (points==null?inc/200:inc/points);
+  var gt;
+//alert(typeof g(min))
+  for (var t = min; t <= max; t += inc) {
+    gt = g(t);
+    if (!(isNaN(gt)||Math.abs(gt)=="Infinity")) pth[pth.length] = [f(t), gt];
+  }
+  path(pth,name);
+  if (min_type == 1) {
+	arrowhead(pth[1],pth[0]);
+  } else if (min_type == 2) {
+	dot(pth[0], "open");
+  } else if (min_type == 3) {
+	dot(pth[0], "closed");
+  }
+  if (max_type == 1) {
+	arrowhead(pth[pth.length-2],pth[pth.length-1]);
+  } else if (max_type == 2) {
+	dot(pth[pth.length-1], "open");
+  } else if (max_type == 3) {
+	dot(pth[pth.length-1], "closed");
+  }
+
+  return p;
+  //}
+}
+
+//end ASCIIsvgAddon.js dump
+
+function updateCoords(ind) {
+  switchTo("picture"+(ind+1));
+  var gx=getX(), gy=getY();
+  if ((xmax-gx)*xunitlength > 6*fontsize || (gy-ymin)*yunitlength > 2*fontsize)
+    text([xmax,ymin],"("+gx.toFixed(2)+", "+gy.toFixed(2)+")",
+         "aboveleft","AScoord"+ind,"");
+  else text([xmax,ymin]," ","aboveleft","AScoord"+ind,"");
+}
+
+
+function updateCoords0() {updateCoords(0)}
+function updateCoords1() {updateCoords(1)}
+function updateCoords2() {updateCoords(2)}
+function updateCoords3() {updateCoords(3)}
+function updateCoords4() {updateCoords(4)}
+function updateCoords5() {updateCoords(5)}
+function updateCoords6() {updateCoords(6)}
+function updateCoords7() {updateCoords(7)}
+function updateCoords8() {updateCoords(8)}
+function updateCoords9() {updateCoords(9)}
+ASfn = [function() {updatePicture(0)},
+  function() {updatePicture(1)},
+  function() {updatePicture(2)},
+  function() {updatePicture(3)},
+  function() {updatePicture(4)},
+  function() {updatePicture(5)},
+  function() {updatePicture(6)},
+  function() {updatePicture(7)},
+
+  function() {updatePicture(8)},
+  function() {updatePicture(9)}];
+ASupdateCoords = [function() {updateCoords(0)},
+  function() {updateCoords(1)},
+  function() {updateCoords(2)},
+  function() {updateCoords(3)},
+  function() {updateCoords(4)},
+  function() {updateCoords(5)},
+  function() {updateCoords(6)},
+  function() {updateCoords(7)},
+  function() {updateCoords(8)},
+  function() {updateCoords(9)}];
+
+
+// GO1.1 Generic onload by Brothercake 
+// http://www.brothercake.com/
+//onload function
+function generic()
+{
+  drawPictures();
+};
+//setup onload function
+if(typeof window.addEventListener != 'undefined')
+{
+  //.. gecko, safari, konqueror and standard
+  window.addEventListener('load', generic, false);
+}
+else if(typeof document.addEventListener != 'undefined')
+{
+  //.. opera 7
+  document.addEventListener('load', generic, false);
+}
+else if(typeof window.attachEvent != 'undefined')
+{
+  //.. win/ie
+  window.attachEvent('onload', generic);
+}
+//** remove this condition to degrade older browsers
+else
+{
+  //.. mac/ie5 and anything else that gets this far
+  //if there's an existing onload function
+  if(typeof window.onload == 'function')
+  {
+    //store it
+    var existing = onload;
+    //add new onload handler
+    window.onload = function()
+    {
+      //call existing onload function
+      existing();
+      //call generic onload function
+      generic();
+    };
+  }
+  else
+  {
+    //setup onload function
+    window.onload = generic;
+  }
+}
+
+
+if (checkIfSVGavailable) {
+  checkifSVGavailable = false;
+  nd = isSVGavailable();
+  ASnoSVG = nd!=null;
+}
diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html
index 2d44604c6d..c4829cf756 100644
--- a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.html
@@ -15,7 +15,8 @@
         <meta name="robots" content="noindex, nofollow" />
 
         <script type="text/javascript">
-document.write( '<scr' + 'ipt type="text/javascript" src="' + window.parent.frameElement._DialogArguments.Editor.FCKConfig.ScriptASCIIMathML + '"><\/scr' + 'ipt>' ) ;
+//document.write( '<scr' + 'ipt type="text/javascript" src="' + window.parent.frameElement._DialogArguments.Editor.FCKConfig.ScriptASCIIMathML + '"><\/scr' + 'ipt>' ) ;
+document.write( '<scr' + 'ipt type="text/javascript" src="ASCIIsvgPI.js"><\/scr' + 'ipt>' ) ;
         </script>
 
         <script src="../../dialog/common/fck_dialog_common.js" type="text/javascript"></script>
@@ -85,27 +86,27 @@ End with: <Select id="gend">
 
 <hr/>
 
-xmin: <input type="text" id="xmin" size="4" value="-7.5" onChange='javascript: AsciisvgDialog.graphit();'/>
-xmax: <input type="text" id="xmax" size="4" value="7.5" onChange='javascript: AsciisvgDialog.graphit();'/>
-xscl: <input type="text" id="xscl" size="3" value="1" onChange='javascript: AsciisvgDialog.graphit();'/>
+xmin: <input type="text" id="xmin" size="4" value="-7.5" onChange='javascript: UpdatePreview();'/>
+xmax: <input type="text" id="xmax" size="4" value="7.5" onChange='javascript: UpdatePreview();'/>
+xscl: <input type="text" id="xscl" size="3" value="1" onChange='javascript: UpdatePreview();'/>
 &nbsp;&nbsp;
-ymin: <input type="text" id="ymin" size="4" value="-5" onChange='javascript: AsciisvgDialog.graphit();'/>
-ymax: <input type="text" id="ymax" size="4" value="5" onChange='javascript: AsciisvgDialog.graphit();'/>
-yscl: <input type="text" id="yscl" size="3" value="1" onChange='javascript: AsciisvgDialog.graphit();'/>
+ymin: <input type="text" id="ymin" size="4" value="-5" onChange='javascript: UpdatePreview();'/>
+ymax: <input type="text" id="ymax" size="4" value="5" onChange='javascript: UpdatePreview();'/>
+yscl: <input type="text" id="yscl" size="3" value="1" onChange='javascript: UpdatePreview();'/>
 <hr/>
 
-Show axis labels: <input type="checkbox" id="labels" value="Show Labels" onClick='javascript: AsciisvgDialog.graphit();' checked="checked"/>
-Show XY grid: <input type="checkbox" id="grid" value="Show Grid" onClick='javascript: AsciisvgDialog.graphit();' checked="checked"/>
+Show axis labels: <input type="checkbox" id="labels" value="Show Labels" onClick='javascript: UpdatePreview();' checked="checked"/>
+Show XY grid: <input type="checkbox" id="grid" value="Show Grid" onClick='javascript: UpdatePreview();' checked="checked"/>
 &nbsp;&nbsp;
 Resize to: <input type="text" id="gwidth" size="5" value="300"/> by <input type="text" id="gheight" size="5" value="200"/>
-<input type="button" value="Update" onclick="javascript: AsciisvgDialog.graphit();"/>
+<input type="button" value="Update" onclick="javascript: UpdatePreview();"/>
 <hr/>
 
 <input type="button" value="Add Graph" onclick="javascript: AsciisvgDialog.addgraph();"/>
 Graphs: <select id="graphs" onchange="javascript: AsciisvgDialog.loadeqn();"></select>
 <input type="button" value="Replace Selected Graph" onclick="javascript: AsciisvgDialog.replacegraph();"/>
 <input type="button" value="Remove" onclick="javascript: AsciisvgDialog.removegraph();"/>
-<select id="alignment" onchange="javascript: AsciisvgDialog.graphit();">
+<select id="alignment" onchange="javascript: UpdatePreview();">
 <option value="text-top">Top</option>
 <option value="middle">Middle</option>
 <option value="text-bottom">Bottom</option>
diff --git a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js
index c54987c55f..5432a7d819 100644
--- a/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js
+++ b/main/inc/lib/fckeditor/editor/plugins/asciisvg/fck_asciisvg.js
@@ -40,6 +40,14 @@ var showasciiformulaonhover = false ;
 // Font size of the formulas in this dialog.
 var mathfontsize = "1.1em" ;
 
+var noSVG = ASnoSVG ; // Temporarily added.
+var width = 300 ;
+var height = 200 ;
+var alignm = 'middle' ;
+//var sscr = '' ;
+var sscr = '-7.5,7.5,-5,5,1,1,1,1,1,300,200' ;
+//var isnew = null ;
+var isnew = true ;
 
 function LoadSelection()
 {
@@ -98,7 +106,6 @@ var AsciisvgDialog =
     sscr: '-7.5,7.5,-5,5,1,1,1,1,1,300,200' ,
     //isnew: null ,
     isnew: true ,
-    AScgiloc: null ,
 
     init : function()
     {
@@ -110,16 +117,13 @@ var AsciisvgDialog =
         this.height = tinyMCEPopup.getWindowArg( 'height' ) ;
         this.isnew = tinyMCEPopup.getWindowArg( 'isnew' ) ;
         this.sscr = tinyMCEPopup.getWindowArg( 'sscr' ) ;
-        */
-        //this.AScgiloc = tinyMCEPopup.getWindowArg( 'AScgiloc' ) ;
-        this.AScgiloc = AScgiloc ;
-        /*
+        this.AScgiloc = tinyMCEPopup.getWindowArg( 'AScgiloc' ) ;
         this.alignm = tinyMCEPopup.getWindowArg( 'alignm' ) ;
         */
 
         if ( noSVG )
         {
-            GetE( 'preview' ).innerHTML = '<img id="previewimg" style="width:' + this.width + 'px; height: ' + this.height + 'px; vertical-align: middle; float: none;" src="' + this.AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) + '" script=" " />' ;
+            GetE( 'preview' ).innerHTML = '<img id="previewimg" style="width:' + this.width + 'px; height: ' + this.height + 'px; vertical-align: middle; float: none;" src="' + AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) + '" script=" " />' ;
         }
         else
         {
@@ -143,13 +147,13 @@ var AsciisvgDialog =
             {
                 aligntxt = 'vertical-align: ' + this.alignm + '; float: none;' ;
             }
-            tinyMCEPopup.editor.execCommand( 'mceInsertContent', false, '<img style="width: 300px; height: 200px; ' + aligntxt + '" src="' + this.AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) + '" sscr="' + this.sscr + '" script=" " />') ;
+            tinyMCEPopup.editor.execCommand( 'mceInsertContent', false, '<img style="width: 300px; height: 200px; ' + aligntxt + '" src="' + AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) + '" sscr="' + this.sscr + '" script=" " />') ;
         }
         else
         {
             el = tinyMCEPopup.editor.selection.getNode() ;
             ed.dom.setAttrib( el , 'sscr' , this.sscr ) ;
-            ed.dom.setAttrib( el , 'src' , this.AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) ) ;
+            ed.dom.setAttrib( el , 'src' , AScgiloc + '?sscr=' + encodeURIComponent( this.sscr ) ) ;
             ed.dom.setAttrib( el , 'width' , this.width ) ;
             ed.dom.setAttrib( el , 'height' , this.height ) ;
             ed.dom.setStyle( el , 'width' , this.width + 'px' ) ;
@@ -214,7 +218,7 @@ var AsciisvgDialog =
 
         graphs.options[ graphs.options.length ] = newopt ;
         graphs.selectedIndex = graphs.options.length - 1 ;
-        this.graphit() ;
+        UpdatePreview() ;
         GetE( 'equation' ).focus() ;
     } ,
 
@@ -235,7 +239,7 @@ var AsciisvgDialog =
             graphs.options[ graphs.selectedIndex ] = null ;
             if ( graphs.options.length > 0 ) { this.loadeqn() ; }
         }
-        this.graphit() ;
+        UpdatePreview() ;
         GetE( 'equation' ).focus() ;
     } ,
 
@@ -294,18 +298,18 @@ var AsciisvgDialog =
         this.sscr = commands ;
         this.alignm = GetE( 'alignment' ).value ;
 
-        if ( noSVG )
-        {
-            pvimg = GetE( 'previewimg' ) ;
-            pvimg.src = this.AScgiloc + '?sscr=' + encodeURIComponent(commands) ;
-            //ed.dom.setStyle( pvimg, 'width' , this.width + 'px' ) ;
-            //ed.dom.setStyle( pvimg, 'height' , this.height + 'px' ) ;
-        }
-        else
-        {
+        //if ( noSVG )
+        //{
+        //    pvimg = GetE( 'previewimg' ) ;
+        //    pvimg.src = AScgiloc + '?sscr=' + encodeURIComponent(commands) ;
+        //    //ed.dom.setStyle( pvimg, 'width' , this.width + 'px' ) ;
+        //    //ed.dom.setStyle( pvimg, 'height' , this.height + 'px' ) ;
+        //}
+        //else
+        //{
             pvsvg = GetE( 'previewsvg' ) ;
             parseShortScript( commands , this.width , this.height ) ;
-        }
+        //}
     } ,
 
     changetype : function()
@@ -486,7 +490,7 @@ var AsciisvgDialog =
             default: GetE( 'alignment' ).selectedIndex = 0 ; break ;
         }
 
-        //this.graphit() ;
+        //UpdatePreview() ;
     } ,
 
     chgtext : function( tag , text )