diff --git a/main/admin/index.php b/main/admin/index.php
index 0b21ff4b49..32a94bbf35 100755
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -156,8 +156,11 @@ if (api_is_platform_admin()) { ?>
if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
// Do not show on production portals, where the tests directory doesn't exist.
echo '
'.get_lang('DataFiller').'';
- }
+ }
+ if (api_is_global_platform_admin()) {
+ echo ''.get_lang('ArchiveDirCleanup').'';
+ }
?>
diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css
index eb49de9f45..3babc122a4 100644
--- a/main/css/base_chamilo.css
+++ b/main/css/base_chamilo.css
@@ -1080,7 +1080,9 @@ form br {
color: #f00;
font-weight: bold;
}
+
/* Admin section */
+
div.admin_section {
-moz-border-radius:10px;
border-radius:10px;
@@ -1089,7 +1091,7 @@ div.admin_section {
float: left;
padding: 5px;
margin: 10px 20px;
- min-height:234px;
+ min-height:280px;
}
div.admin_section h4 {
diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php
index fdf86f5714..dc970b7580 100755
--- a/main/inc/lib/main_api.lib.php
+++ b/main/inc/lib/main_api.lib.php
@@ -3185,12 +3185,15 @@ if (!function_exists('sys_get_temp_dir')) {
* @author Aidan Lister
* @version 1.0.3
* @param string $dirname Directory to delete
+ * @param bool Deletes only the content or not
* @return bool Returns TRUE on success, FALSE on failure
* @link http://aidanlister.com/2004/04/recursively-deleting-a-folder-in-php/
* @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
*/
-function rmdirr($dirname) {
+function rmdirr($dirname, $delete_only_content = false) {
+ $res = true;
+
// A sanity check.
if (!file_exists($dirname)) {
return false;
@@ -3225,9 +3228,12 @@ function rmdirr($dirname) {
if ($is_object_dir) {
$dir->close();
}
- $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);
+
+ if ($delete_only_content == false) {
+ $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;
}