Browse Source

Feature #751 - "Documents" tool: Blocking deletion action for the special folder "certificates".

Ivan Tcholakov 15 years ago
parent
commit
87eb7aea2e
2 changed files with 35 additions and 35 deletions
  1. 14 14
      main/document/document.inc.php
  2. 21 21
      main/document/document.php

+ 14 - 14
main/document/document.inc.php

@@ -250,7 +250,7 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
 	$visibility_command = ($visibility == 0) ? 'set_visible' : 'set_invisible';
 	$curdirpath = urlencode($curdirpath);
 
-	$is_certificate_mode = DocumentManager::is_certificate_mode($path);	
+	$is_certificate_mode = DocumentManager::is_certificate_mode($path);
 	$modify_icons = '';
 	$cur_ses = api_get_session_id();
 	// If document is read only *or* we're in a session and the document
@@ -265,30 +265,30 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
 			$modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'&selectcat='.$gradebook_category.'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
 		} else {
 			$modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
-		}						
-        
-        if (strcmp($path,'/audio')===0 or strcmp($path,'/flash')===0 or strcmp($path,'/images')===0 or strcmp($path,'/shared_folder')===0 or strcmp($path,'/video')===0) { 
+		}
+
+        if (in_array($path, array('/audio', '/flash', '/images', '/shared_folder', '/video', '/chat_files', '/certificates'))) {
         	$modify_icons .= '&nbsp;'.Display::return_icon('delete_na.gif',get_lang('ThisFolderCannotBeDeleted'));
         } else {
-        	
+
 			if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && DocumentManager::get_default_certificate_id(api_get_course_id())==$id) {
-								
-        		$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;delete='.urlencode($path).$req_gid.'&amp;'.$sort_params.'delete_certificate_id='.$id.'&selectcat='.$gradebook_category.' " onclick="return confirmation(\''.basename($path).'\');"><img src="../img/delete.gif" border="0" title="'.get_lang('Delete').'" alt="" /></a>';				
-			} else {								
-				if ($is_certificate_mode) {		
+
+        		$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;delete='.urlencode($path).$req_gid.'&amp;'.$sort_params.'delete_certificate_id='.$id.'&selectcat='.$gradebook_category.' " onclick="return confirmation(\''.basename($path).'\');"><img src="../img/delete.gif" border="0" title="'.get_lang('Delete').'" alt="" /></a>';
+			} else {
+				if ($is_certificate_mode) {
         			$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;delete='.urlencode($path).$req_gid.'&amp;'.$sort_params.'&selectcat='.$gradebook_category.'" onclick="return confirmation(\''.basename($path).'\');"><img src="../img/delete.gif" border="0" title="'.get_lang('Delete').'" alt="" /></a>';
 				} else {
 					$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;delete='.urlencode($path).$req_gid.'&amp;'.$sort_params.'" onclick="return confirmation(\''.basename($path).'\');"><img src="../img/delete.gif" border="0" title="'.get_lang('Delete').'" alt="" /></a>';
 				}
 			}
         }
-        
+
         if ($is_certificate_mode) {
         	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;move='.urlencode($path).$req_gid.'&selectcat='.$gradebook_category.'"><img src="../img/deplacer_fichier.gif" border="0" title="'.get_lang('Move').'" alt="" /></a>';
         	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'&selectcat='.$gradebook_category.'"><img src="../img/'.$visibility_icon.'.gif" border="0" title="'.get_lang('Visible').'" alt="" /></a>';
         } else {
         	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;move='.urlencode($path).$req_gid.'"><img src="../img/deplacer_fichier.gif" border="0" title="'.get_lang('Move').'" alt="" /></a>';
-        	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon.'.gif" border="0" title="'.get_lang('Visible').'" alt="" /></a>';	
+        	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon.'.gif" border="0" title="'.get_lang('Visible').'" alt="" /></a>';
         }
 	}
 
@@ -307,14 +307,14 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
 					  } else {
 					  	$is_preview=false;
 					  	$certificate=get_lang('NoDefaultCertificate');
-					  }	
+					  }
 					  if (isset($_GET['selectcat'])) {
-					  	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']).'&amp;set_certificate='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon_certificate.'.png" border="0" title="'.$certificate.'" alt="" /></a>';				  	
+					  	$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']).'&amp;set_certificate='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon_certificate.'.png" border="0" title="'.$certificate.'" alt="" /></a>';
 						if ($is_preview) {
 						 	$modify_icons .= '&nbsp;<a target="_blank"  href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;set_preview='.$id.$req_gid.'&amp;'.$sort_params.'" ><img src="../img/search.gif" border="0" title="'.$preview.'" alt="" width="16" height="16"/></a>';
 							}
 					  }
-				}			
+				}
 		} else {
 			$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;remove_as_template='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/wizard_gray_small.gif" border="0" title="'.get_lang('RemoveAsTemplate').'" alt=""'.get_lang('RemoveAsTemplate').'" /></a>';
 		}

+ 21 - 21
main/document/document.php

@@ -71,12 +71,12 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && isset(
 			//generate document HTML
 			$course_id=api_get_course_id();
 			$content_html=DocumentManager::replace_user_info_into_html($course_id);
-			
+
 			$new_content_html=$content_html;
 
 			$path_image=api_get_path(WEB_COURSE_PATH).api_get_course_path().'/document/images/gallery';
 			$new_content_html=str_replace('../images/gallery',$path_image,$new_content_html);
-			
+
 			$path_image_in_default_course=api_get_path(WEB_CODE_PATH).'default_course_document';
 			$new_content_html=str_replace('/main/default_course_document',$path_image_in_default_course,$new_content_html);
 
@@ -86,7 +86,7 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && isset(
 			<style media="print" type="text/css">
 				#imprimir {
 				visibility:hidden;
-				}				
+				}
 			</style>';
 			echo '<a href="javascript:window.print();" style="float:right; padding:4px;" id="imprimir"><img src="../img/printmgr.gif" alt="' . get_lang('Print') . '" /> ' . get_lang('Print') . '</a>';
 			print_r($new_content_html);
@@ -132,7 +132,7 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath'] != '') {
 }
 $curdirpathurl = urlencode($curdirpath);
 
-//I'm in the certification module?  
+//I'm in the certification module?
 $is_certificate_mode = DocumentManager::is_certificate_mode($curdirpath);
 
 $course_dir      = $_course['path'].'/document';
@@ -277,7 +277,7 @@ $image_files_only = '';
 
 if ($is_certificate_mode) {
 	$interbreadcrumb[]= array (	'url' => '../gradebook/index.php', 'name' => get_lang('Gradebook'));
-} else {  
+} else {
 	$interbreadcrumb[]= array ('url'=>'', 'name'=> get_lang('Document'));
 }
 
@@ -308,9 +308,9 @@ for ($i = 0; $i < $array_len; $i++) {
 	if ($is_certificate_mode) {
 		$interbreadcrumb[]= array ('url'=>$url_dir.'&selectcat='.Security::remove_XSS($_GET['selectcat']), 'name'=> $dir_array[$i]);
 	} else {
-		$interbreadcrumb[]= array ('url'=>$url_dir, 'name'=> $dir_array[$i]);	
+		$interbreadcrumb[]= array ('url'=>$url_dir, 'name'=> $dir_array[$i]);
 	}
-	
+
 	$dir_acum.=$dir_array[$i].'/';
 }
 
@@ -418,7 +418,7 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights) { // TEACHER ONLY
 				}
 
 				foreach ($_POST['path'] as $index => & $path) {
-					if (in_array($path, array('/audio', '/flash', '/images', '/shared_folder', '/video', '/chat_files'))) {
+					if (in_array($path, array('/audio', '/flash', '/images', '/shared_folder', '/video', '/chat_files', '/certificates'))) {
 						continue;
 					} else {
 					   $delete_document = DocumentManager::delete_document($_course, $path, $base_work_dir);
@@ -593,8 +593,8 @@ if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates' && isset(
 		$course_id=Security::remove_XSS($_GET['cidReq']);//course id
 		$document_id=Security::remove_XSS($_GET['set_certificate']);//document id
 		DocumentManager::attach_gradebook_certificate ($course_id,$document_id) ;
-		Display::display_normal_message(get_lang('IsDefaultCertificate'));	
-	}	
+		Display::display_normal_message(get_lang('IsDefaultCertificate'));
+	}
 }
 
 
@@ -609,20 +609,20 @@ if ($folders === false) {
 echo '<div class="actions">';
 
 	/* GO TO PARENT DIRECTORY */
-	if ($curdirpath!= '/' && $curdirpath!=$group_properties['directory']&& !$is_certificate_mode)  {		
+	if ($curdirpath!= '/' && $curdirpath!=$group_properties['directory']&& !$is_certificate_mode)  {
 	?>
 		 <a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath)=='\\')?'/':dirname($curdirpath)).$req_gid ?>">
 				<img src="../img/folder_up.gif" border="0" title="<?php echo get_lang('Up'); ?>" alt="" />
 				<?php echo get_lang('Up'); ?></a>&nbsp;
-	<?php		
+	<?php
 	}
-	
-	if ($is_certificate_mode & $curdirpath!= '/certificates')  {		
+
+	if ($is_certificate_mode & $curdirpath!= '/certificates')  {
 	?>
 		 <a href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&curdirpath=<?php echo urlencode((dirname($curdirpath)=='\\')?'/':dirname($curdirpath)).$req_gid ?>">
 				<img src="../img/folder_up.gif" border="0" title="<?php echo get_lang('Up'); ?>" alt="" />
 				<?php echo get_lang('Up'); ?></a>&nbsp;
-	<?php		
+	<?php
 	}
 
 if (isset($docs_and_folders) && is_array($docs_and_folders)) {
@@ -727,19 +727,19 @@ if ($is_allowed_to_edit || $group_member_with_upload_rights || is_my_shared_fold
                 <a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>"><img src="../img/filenew.gif" border="0" alt="" title="<?php echo get_lang('CreateDoc'); ?>" /></a>
                 <a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>"><?php echo get_lang("CreateDoc"); ?></a>&nbsp;&nbsp;
 	        <?php }?>
-	        
+
       		<!--create new certificate -->
-			<?php if ($is_certificate_mode) { ?>	
+			<?php if ($is_certificate_mode) { ?>
 			<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>&certificate=true&<?php echo 'selectcat=' . Security::remove_XSS($_GET['selectcat']); ?>"><img src="../img/filenew.gif" border="0" alt="" title="<?php echo get_lang('CreateCertificate'); ?>" /></a>
-			<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>&certificate=true&<?php echo 'selectcat=' . Security::remove_XSS($_GET['selectcat']); ?>"><?php echo get_lang("CreateCertificate"); ?></a>&nbsp;&nbsp;	
+			<a href="create_document.php?<?php echo api_get_cidreq();?>&dir=<?php echo $curdirpathurl.$req_gid; ?>&certificate=true&<?php echo 'selectcat=' . Security::remove_XSS($_GET['selectcat']); ?>"><?php echo get_lang("CreateCertificate"); ?></a>&nbsp;&nbsp;
 			<?php }?>
-			
+
 			<!-- file upload link -->
 			<?php
 				$upload_name =  get_lang('UplUploadDocument');
-				if ($is_certificate_mode) { 
+				if ($is_certificate_mode) {
 				$upload_name =	 get_lang('UploadCertificate');
-			}?>	
+			}?>
 
 			<a href="upload.php?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>"><img src="../img/submit_file.gif" border="0" title="<?php echo get_lang('UplUploadDocument'); ?>" alt="" /></a>
 			<a href="upload.php?<?php echo api_get_cidreq();?>&curdirpath=<?php echo $curdirpathurl.$req_gid; ?>"><?php echo get_lang('UplUploadDocument'); ?></a>&nbsp;