Преглед на файлове

[svn r17072] Remove the possibility to delete system directories in the document tool (FS#1522) by cvargas

Yannick Warnier преди 16 години
родител
ревизия
9a44976aa5
променени са 2 файла, в които са добавени 9 реда и са изтрити 2 реда
  1. 3 0
      documentation/changelog.html
  2. 6 2
      main/document/document.inc.php

+ 3 - 0
documentation/changelog.html

@@ -47,6 +47,7 @@
   <li>New glossary tool (FS#3248)</li>
   <li>Integrated the gradebook at course level (FS#3173)</li>
   <li>New wiki tool (considerably improved, built on CoolWiki plugin) (FS#2873)</li>
+  <li>Remove possibility to delete system directories in documents tool (FS#1522)</li>
 </ul>
 <br />
 <h3>Debugging</h3>
@@ -94,6 +95,8 @@
   <li>Fixed bug whereby e-mails sent did not have the standard syntax (SVN#16708)</li>
   <li>Fixed bug whereby an empty institution name gave a useless output in the header (SVN#16710)</li>
   <li>Fixed bug whereby questions ordering was broken when deleting one question in the middle (SVN#16879)</li>
+  <li>Fixed bug in link (see FS#3306)</li>
+  <li>Improved display of human resource manager option (see FS#3304)</li>
 </ul>
 <br />
 <h3>CSS changes</h3>

+ 6 - 2
main/document/document.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.inc.php 17054 2008-12-03 13:38:03Z pcool $
+<?php // $Id: document.inc.php 17072 2008-12-04 21:54:56Z yannoo $
 
 /*
 ==============================================================================
@@ -258,7 +258,11 @@ function build_edit_icons($curdirpath,$type,$path,$visibility,$id,$is_template,$
 	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>';
-        $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 (strcmp($path,'/audio')===0 or strcmp($path,'/flash')===0 or strcmp($path,'/images')===0) {
+        	$modify_icons .= '&nbsp;<img src="../img/delete_na.gif" border="0" title="'.get_lang('Delete').'" alt="'.get_lang('Delete').'" /></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>';
+        }
         $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>';
 	}