[svn r20524] Switched GARBAGE_PATH to SYS_ARCHIVE_PATH (see FS#4191)

main/inc/lib/course.lib.php

@@ -1594,8 +1594,8 @@ class CourseManager
 				}
 			}
 			$course_dir = api_get_path(SYS_COURSE_PATH).$course['directory'];
-			$garbage_dir = api_get_path(GARBAGE_PATH).$course['directory'].'_'.time();
-			rename($course_dir, $garbage_dir);
+			$archive_dir = api_get_path(SYS_ARCHIVE_PATH).$course['directory'].'_'.time();
+			rename($course_dir, $archive_dir);
 		}
 
 		// Unsubscribe all classes from the course

main/inc/lib/groupmanager.lib.php

@@ -402,7 +402,7 @@ class GroupManager
 		
 		
 		// define repository for deleted element
-		$group_garbage = api_get_path(GARBAGE_PATH).$course['path']."/group/";
+		$group_garbage = api_get_path(SYS_ARCHIVE_PATH).$course['path']."/group/";
 		$perm = api_get_setting('permissions_for_new_directories');
 		$perm = (!empty($perm)?$perm:'0770');
 		if (!file_exists($group_garbage))

main/inc/lib/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer.php

@@ -88,12 +88,12 @@ class HTMLPurifier_DefinitionCache_Serializer extends
      * @todo Make protected
      */
     public function generateBaseDirectoryPath($config) {    	
-    	$directory_in_garbage= api_get_path(GARBAGE_PATH).'Serializer';
+    	$directory_in_garbage= api_get_path(SYS_ARCHIVE_PATH).'Serializer';
     	//add directory Serializer, in choose not exist
     	if (!file_exists($directory_in_garbage)) {
     		mkdir($directory_in_garbage,0777);
     	} 
-        $base = $config->get('Cache', 'SerializerPath');//main/garbage/Serializer
+        $base = $config->get('Cache', 'SerializerPath');//archive/Serializer
        // $base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
         $base = is_null($base) ? $directory_in_garbage : $base;       
         return $base;

main/install/update-db-scorm-1.6.x-1.8.0.inc.php

@@ -40,9 +40,9 @@ function my_get_time($time){
 }
 
 //open log file
-$fh = fopen('../garbage/newscorm_'.time().'.log','w');
-$fh_revert = fopen('../garbage/newscorm_'.time().'_revert.log','w');
-$fh_res = fopen('../garbage/newscorm_'.time().'_res.log','w');
+$fh = fopen('../../archive/newscorm_'.time().'.log','w');
+$fh_revert = fopen('../../archive/newscorm_'.time().'_revert.log','w');
+$fh_res = fopen('../../archive/newscorm_'.time().'_res.log','w');
 fwrite($fh,"-- Recording course homepages links changes to enable reverting\n");
 fwrite($fh_revert,"-- Recording reverted course homepages links changes to enable reverting\n");
 fwrite($fh_res,"-- Recording resulting course homepages links changes\n");