documents tools and advanced file manager, disabled show svgz compress files, and

enabled show ogg, ogx, ogv and oga files

main/document/document.inc.php

@@ -125,7 +125,7 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
 		$ext = strtolower($ext[sizeof($ext) - 1]);
 		
 		// "htmlfiles" are shown in a frameset
-		if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png' || $ext == 'pdf' || $ext == 'swf' || $ext == 'mp3' || ($ext == 'svg' || $ext =='svgz' && api_support_svg())) {
+		if ($ext == 'htm' || $ext == 'html' || $ext == 'gif' || $ext == 'jpg' || $ext == 'jpeg' || $ext == 'png' || $ext == 'pdf' || $ext == 'swf' || $ext == 'mp3' || ($ext == 'svg' && api_support_svg())) {
 			$url = 'showinframes.php?'.api_get_cidreq().'&file='.$url_path.$req_gid;
 		} else {
 			// url-encode for problematic characters (we may not call them dangerous characters...)

main/inc/lib/document.lib.php

@@ -151,6 +151,10 @@ class DocumentManager {
 			'mxu' => 'video/vnd.mpegurl',
 			'nc' => 'application/x-netcdf',
 			'oda' => 'application/oda',
+			'oga'=> 'audio/ogg',
+			'ogg'=> 'application/ogg',
+			'ogx'=> 'application/ogg',
+			'ogv'=> 'video/ogg',	
 			'pbm' => 'image/x-portable-bitmap',
 			'pct' => 'image/pict',
 			'pdb' => 'chemical/x-pdb',
@@ -197,7 +201,7 @@ class DocumentManager {
 			'sv4crc' => 'application/x-sv4crc',
 			'svf' => 'application/vnd.svf',
 			'svg' => 'image/svg+xml',
-			'svgz'=> 'image/svg+xml',
+			//'svgz' => 'image/svg+xml',
 			'swf' => 'application/x-shockwave-flash',
 			'sxc' => 'application/vnd.sun.xml.calc',
 			'sxi' => 'application/vnd.sun.xml.impress',

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php

@@ -41,8 +41,8 @@ class manager
 			array(array("zip", "sit", "rar", "gz", "tar"), "fileZip", SEARCH_TYPE_ARCHIVE, 0),
 			array(array("htm", "html", "php", "jsp", "asp", 'js', 'css'), "fileCode", SEARCH_TYPE_HTML, 1),
 			array(array("mov", "ram", "rm", "asx", "dcr", "wmv"), "fileVideo", SEARCH_TYPE_VIDEO, 1),
-			array(array("mpg", "avi", "asf", "mpeg", "flv", "ogg", "ogv"), "fileVideo", SEARCH_TYPE_MOVIE, 1),
-			array(array("aif", "aiff", "wav", "mp3", "wma","mid", "midi", "oga"), "fileMusic", SEARCH_TYPE_MUSIC, 1),
+			array(array("mpg", "avi", "asf", "mpeg", "flv"), "fileVideo", SEARCH_TYPE_MOVIE, 1),
+			array(array("aif", "aiff", "wav", "mp3", "wma","mid", "midi"), "fileMusic", SEARCH_TYPE_MUSIC, 1),
 			array(array("swf", ), "fileFlash", SEARCH_TYPE_FLASH, 1),
 			array(array("ppt", "pps", "pptx"), "filePPT", SEARCH_TYPE_PPT, 0),
 			array(array("rtf"), "fileRTF", SEARCH_TYPE_DOC, 0),
@@ -52,6 +52,7 @@ class manager
 			array(array("txt"), "fileText", SEARCH_TYPE_TEXT, 1),
 			array(array("xml", "xsl", "dtd"), "fileXml", SEARCH_TYPE_XML, 1),
 			array(array("svg","svgz"), "fileSVG", SEARCH_TYPE_SVG, 1),			
+			array(array("ogg", "ogx", "ogv", "oga"), "fileOGG", SEARCH_TYPE_OGG, 1),			
 			array(array("odt", "ott", "sxw", "stw"), "fileODT", SEARCH_TYPE_ODT, 1),			
 			array(array("odp", "otp", "sxi", "sti"), "fileODP", SEARCH_TYPE_ODP, 1),
 			array(array("ods", "ots", "sxc", "stc"), "fileODS", SEARCH_TYPE_ODS, 1),

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/config.base.php

@@ -159,8 +159,8 @@
 	define('CONFIG_EDITABLE_VALID_EXTS', 'txt,htm,html'); //make you include all these extension in CONFIG_UPLOAD_VALID_EXTS if you want all valid. For Chamilo exclude original xml, js and css
 
 	define('CONFIG_OVERWRITTEN', false); //overwirte when processing paste
-	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,bmp,tif,psd,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,ogg,ogv,oga, aif,aiff,wav,mp3,swf,flv, mp4, aac, ppt,rtf,doc, pdf,xls,txt,flv,odt,ods,odp,odg,odc,odf,odb,odi,pps,docx,pptx,xlsx,accdb,xml,mid, midi, svg, svgz');//For Chamilo updated
-	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,mp3,wav,wmv,wma,rm,rmvb,mov,swf,flv,mp4,aac,avi,mpg,mpeg,asf,mid,midi, svg,pdf');//For Chamilo updated
+	define('CONFIG_UPLOAD_VALID_EXTS', 'gif,jpg,jpeg,png,bmp,tif,psd,zip,sit,rar,gz,tar,htm,html,mov,mpg,avi,asf,mpeg,wmv,ogg,ogx,ogv,oga, aif,aiff,wav,mp3,swf,flv, mp4, aac, ppt,rtf,doc, pdf,xls,txt,flv,odt,ods,odp,odg,odc,odf,odb,odi,pps,docx,pptx,xlsx,accdb,xml,mid, midi, svg, svgz');//For Chamilo updated
+	define("CONFIG_VIEWABLE_VALID_EXTS", 'gif,bmp,txt,jpg,jpeg,png,tif,html,htm,mp3,wav,wmv,wma,rm,rmvb,mov,swf,flv,mp4,aac,avi,mpg,mpeg,asf,mid,midi,svg,pdf,ogg,ogx,ogv,oga');//For Chamilo updated
 	define('CONFIG_UPLOAD_INVALID_EXTS', 'php,php3,php4,php5,php6,phps,phtml,asp,aspx,jsp,cfm,cfc,pl,jar,sh,cgi,js,exe,com,bat,pif,scr,msi,ws,wsc,wsf,vb,vbe,vbs,reg,dll,ini'); //For Chamilo added.
 	//Preview
 	define('CONFIG_IMG_THUMBNAIL_MAX_X', 100);

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/fckeditor.css

@@ -277,7 +277,7 @@ span.fileRTF, span.fileXml, span.fileCode,
 span.fileZip, span.addMore, span.deleteFile,
 span.cancel,span.uploadProcessing,
 span.folderShared, span.unknownUser, span.fileSVG,
-span.fileODT,span.fileODS,span.fileODP,span.fileODG{
+span.fileODT,span.fileODS,span.fileODP,span.fileODG,span.fileOGG{
 padding:2px 0 2px 16px;
 background-repeat:no-repeat;
 background-position:0 50%;
@@ -312,6 +312,7 @@ span.fileODT{background-image:url(../images/small_icon/fileODT.png);}
 span.fileODS{background-image:url(../images/small_icon/fileODS.png);}
 span.fileODP{background-image:url(../images/small_icon/fileODP.png);}
 span.fileODG{background-image:url(../images/small_icon/fileODG.png);}
+span.fileOGG{background-image:url(../images/small_icon/fileOGG.png);}
 
 /* big icon */
 dt.folderEmpty, dt.folder, dt.folderParent,
@@ -322,7 +323,7 @@ dt.fileMusic, dt.fileExe, dt.fileAcrobat,
 dt.fileRTF, dt.fileXml, dt.fileCode,
 dt.fileZip,
 dt.folderShared, dt.unknownUser, dt.fileSVG,
-dt.fileODT,dt.fileODS,dt.fileODP,dt.fileODG{
+dt.fileODT,dt.fileODS,dt.fileODP,dt.fileODG,dt.fileOGG{
 margin: 0px;
 padding:0px;
 border:solid #ccc 1px;
@@ -362,6 +363,7 @@ dt.fileODT{background-image:url(../images/big_icon/fileODT.png);}
 dt.fileODS{background-image:url(../images/big_icon/fileODS.png);}
 dt.fileODP{background-image:url(../images/big_icon/fileODP.png);}
 dt.fileODG{background-image:url(../images/big_icon/fileODG.png);}
+dt.fileOGG{background-image:url(../images/big_icon/fileOGG.png);}
 
 table.tableSummary{
 border-collapse:collapse;

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/stand_alone.css

@@ -269,7 +269,7 @@ span.fileRTF, span.fileXml, span.fileCode,
 span.fileZip, span.addMore, span.deleteFile,
 span.cancel,span.uploadProcessing,
 span.folderShared, span.unknownUser, span.fileSVG,
-span.fileODT,span.fileODS,span.fileODP,span.fileODG{
+span.fileODT,span.fileODS,span.fileODP,span.fileODG,span.fileOGG{
 padding:2px 0 2px 16px;
 background-repeat:no-repeat;
 background-position:0 50%;
@@ -304,6 +304,7 @@ span.fileODT{background-image:url(../images/small_icon/fileODT.png);}
 span.fileODS{background-image:url(../images/small_icon/fileODS.png);}
 span.fileODP{background-image:url(../images/small_icon/fileODP.png);}
 span.fileODG{background-image:url(../images/small_icon/fileODG.png);}
+span.fileOGG{background-image:url(../images/small_icon/fileOGG.png);}
 
 /* big icon */
 dt.folderEmpty, dt.folder, dt.folderParent,
@@ -314,7 +315,7 @@ dt.fileMusic, dt.fileExe, dt.fileAcrobat,
 dt.fileRTF, dt.fileXml, dt.fileCode,
 dt.fileZip,
 dt.folderShared, dt.unknownUser, dt.fileSVG,
-dt.fileODT,dt.fileODS,dt.fileODP,dt.fileODG{
+dt.fileODT,dt.fileODS,dt.fileODP,dt.fileODG,dt.fileOGG{
 margin: 0px;
 padding:0px;
 border:solid #ccc 1px;
@@ -354,6 +355,7 @@ dt.fileODT{background-image:url(../images/big_icon/fileODT.png);}
 dt.fileODS{background-image:url(../images/big_icon/fileODS.png);}
 dt.fileODP{background-image:url(../images/big_icon/fileODP.png);}
 dt.fileODG{background-image:url(../images/big_icon/fileODG.png);}
+dt.fileOGG{background-image:url(../images/big_icon/fileOGG.png);}
 
 table.tableSummary{
 border-collapse:collapse;

main/inc/lib/fileDisplay.lib.php

@@ -54,8 +54,8 @@ function choose_image($file_name)
 		$type['web'       ] = array('htm', 'html', 'htx', 'xml',  'xsl',  'php', 'xhtml');
 		$type['image'     ] = array('gif', 'jpg',  'png', 'bmp',  'jpeg');
 		$type['image_vect'] = array('svg','svgz');
-		$type['audio'     ] = array('wav', 'mid',  'mp2', 'mp3',  'midi', 'sib', 'amr', 'kar');
-		$type['video'     ] = array('mp4', 'mov',  'rm',  'pls',  'mpg',  'mpeg', 'au', 'flv', 'avi', 'wmv', 'asf', '3gp');
+		$type['audio'     ] = array('wav', 'mid',  'mp2', 'mp3',  'midi', 'sib', 'amr', 'kar', 'oga');
+		$type['video'     ] = array('mp4', 'mov',  'rm',  'pls',  'mpg',  'mpeg', 'au', 'flv', 'avi', 'wmv', 'asf', '3gp','ogv','ogg','ogx');
 		$type['excel'     ] = array('xls', 'xlt',  'xls', 'xlt', 'pxl', 'xlsx', 'xlsm', 'xlam', 'xlsb', 'xltm', 'xltx');
 		$type['compressed'] = array('zip', 'tar',  'rar', 'gz');
 		$type['code'      ] = array('js',  'cpp',  'c',   'java', 'phps');
@@ -82,9 +82,6 @@ function choose_image($file_name)
 		$image['powerpoint'] = 'powerpoint.gif';
 		$image['flash'     ] = 'file_flash.gif';
 		$image['text'      ] = 'file_txt.gif';
-		//$image['oo_writer' ] = 'word.gif';
-		//$image['oo_calc'   ] = 'excel.gif';
-		//$image['oo_impress'] = 'powerpoint.gif';
 		$image['oo_writer' ] = 'file_oo_writer.gif';
 		$image['oo_calc'   ] = 'file_oo_calc.gif';
 		$image['oo_impress'] = 'file_oo_impress.gif';