Browse Source

Feature #2484 fix hide certificates into advanced file manager

Juan Carlos Raña 14 years ago
parent
commit
d1c8700be4

+ 3 - 3
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/_ajax_get_details_listing.php

@@ -24,13 +24,13 @@
 								///First step for hidden some type of Chamilo files and folders
 								//Juan Carlos Raña
 
-									//hidden files and folders deleted by Chamilo. Hidde folders css, hotpotatoes, chat_files
+									//hidden files and folders deleted by Chamilo. Hidde folders css, hotpotatoes, chat_files, certificates
 									$deleted_by_chamilo_file=' DELETED '; // ' DELETED ' not '_DELETED_' because in $file['name'] _ is replaced with blank see class.manager.php
 									$deleted_by_chamilo_folder='_DELETED_';
 									$css_folder_chamilo='css';
 									$hotpotatoes_folder_chamilo='HotPotatoes_files';
 									$chat_files_chamilo='chat_files';
-
+									$certificates_chamilo='certificates';
 									//show group's directory only if I'm member. Or if I'm a teacher. TODO: check groups not necessary because the student dont have access to main folder documents (only to document/group or document/shared_folder). Teachers can access to all groups ?
 									$group_folder='_groupdocs';
 
@@ -48,7 +48,7 @@
 								///Second step: hiding as the case
 								//Juan Carlos Raña
 
-								if((!ereg($deleted_by_chamilo_file, $file['name']) && !ereg($deleted_by_chamilo_folder, $file['path'])) && !ereg($css_folder_chamilo, $file['path']) && !ereg($hotpotatoes_folder_chamilo, $file['path']) && !ereg($chat_files_chamilo, $file['path']) && $show_doc_group && $file['name'][0]!='.')
+								if((!ereg($deleted_by_chamilo_file, $file['name']) && !ereg($deleted_by_chamilo_folder, $file['path'])) && !ereg($css_folder_chamilo, $file['path']) && !ereg($hotpotatoes_folder_chamilo, $file['path']) && !ereg($chat_files_chamilo, $file['path']) && !ereg($certificates_chamilo, $file['path']) && $show_doc_group && $file['name'][0]!='.')
 								{							
 								
 									if($file['type'] == 'file')

+ 3 - 3
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/_ajax_get_thumbnail_listing.php

@@ -9,14 +9,14 @@
 			///First step for hidden some type of Chamilo files and folders
 			//Juan Carlos Ra�a
 
-			//hidden files and folders deleted by Chamilo. Hidde folders css, hotpotatoes, chat
+			//hidden files and folders deleted by Chamilo. Hidde folders css, hotpotatoes, chat, certificates
 
 			$deleted_by_chamilo_file=' DELETED '; // ' DELETED ' not '_DELETED_' because in $file['name'] _ is replaced with blank see class.manager.php
 			$deleted_by_chamilo_folder='_DELETED_';
 			$css_folder_chamilo='css';
 			$hotpotatoes_folder_chamilo='HotPotatoes_files';
 			$chat_files_chamilo='chat_files';
-
+			$certificates_chamilo='certificates';
 			//hidden directory of the group if the user is not a member of the group
 			$group_folder='_groupdocs';
 
@@ -37,7 +37,7 @@
 			
 			///Second step: hiding as the case
 			//Juan Carlos Ra�a
-			if((!ereg($deleted_by_chamilo_file, $file['name']) && !ereg($deleted_by_chamilo_folder, $file['path'])) && !ereg($css_folder_chamilo, $file['path']) && !ereg($hotpotatoes_folder_chamilo, $file['path']) && !ereg($chat_files_chamilo, $file['path']) && $show_doc_group && $file['name'][0]!='.')
+			if((!ereg($deleted_by_chamilo_file, $file['name']) && !ereg($deleted_by_chamilo_folder, $file['path'])) && !ereg($css_folder_chamilo, $file['path']) && !ereg($hotpotatoes_folder_chamilo, $file['path']) && !ereg($chat_files_chamilo, $file['path']) && !ereg($certificates_chamilo, $file['path']) && $show_doc_group && $file['name'][0]!='.')
 			{			
 			
 			?>

+ 2 - 1
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_get_file_listing.php

@@ -77,6 +77,7 @@
 			$css_folder_Chamilo='css';
 			$hotpotatoes_folder_Chamilo='HotPotatoes_files';
 			$chat_files_Chamilo='chat_files';
+			$certificates_Chamilo='certificates';
 
 		//end previous fix for count hidden folders
 
@@ -112,7 +113,7 @@
 
 			}
 
-			if((!ereg($deleted_by_Chamilo_file, $file['name']) || !ereg($deleted_by_Chamilo_folder, $file['path'])) || ereg($css_folder_Chamilo, $file['path']) || ereg($hotpotatoes_folder_Chamilo, $file['path']) || ereg($chat_files_Chamilo, $file['path']) || $hide_doc_group || $file['name'][0]=='.')//Chamilo fix for hidden items.
+			if((!ereg($deleted_by_Chamilo_file, $file['name']) || !ereg($deleted_by_Chamilo_folder, $file['path'])) || ereg($css_folder_Chamilo, $file['path']) || ereg($hotpotatoes_folder_Chamilo, $file['path']) || ereg($chat_files_Chamilo, $file['path']) || ereg($certificates_Chamilo, $file['path']) || $hide_doc_group || $file['name'][0]=='.')//Chamilo fix for hidden items.
 			{
 
 				$count_hideItem=$count_hideItem+1;

+ 2 - 1
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/class.manager.php

@@ -208,6 +208,7 @@ class manager
 						$css_folder_Chamilo='css';
 						$hotpotatoes_folder_Chamilo='HotPotatoes_files';
 						$chat_files_Chamilo='chat_files';
+						$certificates_Chamilo='certificates';
 						//show group's directory only if I'm member. Or if I'm a teacher. TODO: check groups not necessary because the student dont have access to main folder documents (only to document/group or document/shared_folder). Teachers can access to all groups ?
 						$group_folder='_groupdocs';
 						$hide_doc_group=false;
@@ -221,7 +222,7 @@ class manager
 
 						}
 
-						if(ereg($deleted_by_Chamilo_folder, $path)|| ereg($css_folder_Chamilo, $path) || ereg($hotpotatoes_folder_Chamilo, $path) || ereg($chat_files_Chamilo, $path) || $hide_doc_group || $file[0]=='.')
+						if(ereg($deleted_by_Chamilo_folder, $path)|| ereg($css_folder_Chamilo, $path) || ereg($hotpotatoes_folder_Chamilo, $path) || ereg($chat_files_Chamilo, $path) || ereg($certificates_Chamilo, $path) || $hide_doc_group || $file[0]=='.')
 						{
 							$this->currentFolderInfo['subdir']=$this->currentFolderInfo['subdir']-1;
 						}

+ 3 - 2
main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/inc/function.base.php

@@ -1226,7 +1226,7 @@ function getRootPath() {
 * check if a folder is allowed to shown on the search 'look in' list
 * @param string $folderName
 * @return string
-* @author Juan Carlos Raña Trabado
+* @author Juan Carlos Raña Trabado
 */
 function hideFolderName($folderName)
 {
@@ -1236,6 +1236,7 @@ function hideFolderName($folderName)
 	$hotpotatoes_folder_chamilo='HotPotatoes_files';
 	$chat_files_chamilo='chat_files';
 	$thumbs_folder='.thumbs';
+	$certificates_chamilo='certificates';
 
 	//hidden directory of the group if the user is not a member of the group
 	$group_folder='_groupdocs';
@@ -1251,7 +1252,7 @@ function hideFolderName($folderName)
 		}
 	}
 
-	if(!ereg($deleted_by_chamilo, $folderName) && !ereg($css_folder_chamilo, $folderName) && !ereg($hotpotatoes_folder_chamilo, $folderName) && !ereg($chat_files_chamilo, $folderName) && !ereg($thumbs_folder, $folderName) && $show_doc_group==true)
+	if(!ereg($deleted_by_chamilo, $folderName) && !ereg($css_folder_chamilo, $folderName) && !ereg($hotpotatoes_folder_chamilo, $folderName) && !ereg($chat_files_chamilo, $folderName) && !ereg($certificates_chamilo, $folderName) && !ereg($thumbs_folder, $folderName) && $show_doc_group==true)
 	{
 		return substr($folderName,strpos($folderName, '-'),strlen($folderName)); //hide the firsts numbers
 	}