chamilo/archive folder cleaner implements #3748

skala
Julio Montoya 14 years ago
parent 6e27190325
commit 87e60d678e
  1. 5
      main/admin/index.php
  2. 4
      main/css/base_chamilo.css
  3. 14
      main/inc/lib/main_api.lib.php

@ -156,8 +156,11 @@ if (api_is_platform_admin()) { ?>
if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) { if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
// Do not show on production portals, where the tests directory doesn't exist. // Do not show on production portals, where the tests directory doesn't exist.
echo '<li><a href="filler.php">'.get_lang('DataFiller').'</a></li>'; echo '<li><a href="filler.php">'.get_lang('DataFiller').'</a></li>';
} }
if (api_is_global_platform_admin()) {
echo '<li><a href="archive_cleanup.php">'.get_lang('ArchiveDirCleanup').'</a></li>';
}
?> ?>
</ul> </ul>
</div> </div>

@ -1080,7 +1080,9 @@ form br {
color: #f00; color: #f00;
font-weight: bold; font-weight: bold;
} }
/* Admin section */ /* Admin section */
div.admin_section { div.admin_section {
-moz-border-radius:10px; -moz-border-radius:10px;
border-radius:10px; border-radius:10px;
@ -1089,7 +1091,7 @@ div.admin_section {
float: left; float: left;
padding: 5px; padding: 5px;
margin: 10px 20px; margin: 10px 20px;
min-height:234px; min-height:280px;
} }
div.admin_section h4 { div.admin_section h4 {

@ -3185,12 +3185,15 @@ if (!function_exists('sys_get_temp_dir')) {
* @author Aidan Lister <aidan@php.net> * @author Aidan Lister <aidan@php.net>
* @version 1.0.3 * @version 1.0.3
* @param string $dirname Directory to delete * @param string $dirname Directory to delete
* @param bool Deletes only the content or not
* @return bool Returns TRUE on success, FALSE on failure * @return bool Returns TRUE on success, FALSE on failure
* @link http://aidanlister.com/2004/04/recursively-deleting-a-folder-in-php/ * @link http://aidanlister.com/2004/04/recursively-deleting-a-folder-in-php/
* @author Yannick Warnier, adaptation for the Chamilo LMS, April, 2008 * @author Yannick Warnier, adaptation for the Chamilo LMS, April, 2008
* @author Ivan Tcholakov, a sanity check about Directory class creation has been added, September, 2009 * @author Ivan Tcholakov, a sanity check about Directory class creation has been added, September, 2009
*/ */
function rmdirr($dirname) { function rmdirr($dirname, $delete_only_content = false) {
$res = true;
// A sanity check. // A sanity check.
if (!file_exists($dirname)) { if (!file_exists($dirname)) {
return false; return false;
@ -3225,9 +3228,12 @@ function rmdirr($dirname) {
if ($is_object_dir) { if ($is_object_dir) {
$dir->close(); $dir->close();
} }
$res = rmdir($dirname);
if ($res === false) { if ($delete_only_content == false) {
error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0); $res = rmdir($dirname);
if ($res === false) {
error_log(__FILE__.' line '.__LINE__.': '.((bool)ini_get('track_errors') ? $php_errormsg : 'error not recorded because track_errors is off in your php.ini'), 0);
}
} }
return $res; return $res;
} }

Loading…
Cancel
Save