Browse Source

Task #875 - Cleaning white space in a file before a change.

Ivan Tcholakov 14 years ago
parent
commit
34746f5b6f
1 changed files with 365 additions and 365 deletions
  1. 365 365
      main/coursecopy/classes/CourseRecycler.class.php

+ 365 - 365
main/coursecopy/classes/CourseRecycler.class.php

@@ -10,389 +10,389 @@ require_once 'Course.class.php';
  */
 class CourseRecycler
 {
-	/**
-	 * A course-object with the items to delete
-	 */
-	var $course;
-	/**
-	 * Create a new CourseRecycler
-	 * @param course $course The course-object which contains the items to
-	 * delete
-	 */
-	function CourseRecycler($course)
-	{
-		$this->course = $course;
-	}
-	/**
-	 * Delete all items from the course.
-	 * This deletes all items in the course-object from the current Dokeos-
-	 * course
-	 */
-	function recycle()
-	{
-		$table_tool_intro = Database::get_course_table(TABLE_TOOL_INTRO);
-		$table_linked_resources = Database :: get_course_table(TABLE_LINKED_RESOURCES);
-		$table_item_properties = Database::get_course_table(TABLE_ITEM_PROPERTY);
-		
-		$this->recycle_links();
-		$this->recycle_link_categories();
-		$this->recycle_events();
-		$this->recycle_announcements();
-		$this->recycle_documents();		
-		$this->recycle_forums(); //@todo does not work yet
-		$this->recycle_forum_categories();
-		$this->recycle_quizzes();
-		$this->recycle_surveys();
-		$this->recycle_learnpaths();
-		$this->recycle_cours_description();
-		$this->recycle_wiki();
-		$this->recycle_glossary();
-		
-		
-		foreach ($this->course->resources as $type => $resources) {			
-			foreach ($resources as $id => $resource) {
-				$sql = "DELETE FROM ".$table_linked_resources." WHERE (source_type = '".$type."' AND source_id = '".$id."') OR (resource_type = '".$type."' AND resource_id = '".$id."')  ";
-				Database::query($sql);
-				if(is_numeric($id)) {
-					$sql = "DELETE FROM ".$table_item_properties." WHERE tool ='".$resource->get_tool()."' AND ref=".$id;
-					Database::query($sql);
-				} elseif ($type == RESOURCE_TOOL_INTRO) {
-					$sql = "DELETE FROM $table_tool_intro WHERE id='$id'";
-					Database::query($sql);
-				}
-			}
-		}
+    /**
+     * A course-object with the items to delete
+     */
+    var $course;
+    /**
+     * Create a new CourseRecycler
+     * @param course $course The course-object which contains the items to
+     * delete
+     */
+    function CourseRecycler($course)
+    {
+        $this->course = $course;
+    }
+    /**
+     * Delete all items from the course.
+     * This deletes all items in the course-object from the current Dokeos-
+     * course
+     */
+    function recycle()
+    {
+        $table_tool_intro = Database::get_course_table(TABLE_TOOL_INTRO);
+        $table_linked_resources = Database :: get_course_table(TABLE_LINKED_RESOURCES);
+        $table_item_properties = Database::get_course_table(TABLE_ITEM_PROPERTY);
 
-	}
-	/**
-	 * Delete documents
-	 */
-	function recycle_documents()
-	{
-		if ($this->course->has_resources(RESOURCE_DOCUMENT))
-		{
-			$table = Database :: get_course_table(TABLE_DOCUMENT);
-			foreach ($this->course->resources[RESOURCE_DOCUMENT] as $id => $document)
-			{
-				rmdirr($this->course->backup_path.'/'.$document->path);
-			}
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_DOCUMENT])));
-			$sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
-			Database::query($sql);
-		}
-	}
+        $this->recycle_links();
+        $this->recycle_link_categories();
+        $this->recycle_events();
+        $this->recycle_announcements();
+        $this->recycle_documents();
+        $this->recycle_forums(); //@todo does not work yet
+        $this->recycle_forum_categories();
+        $this->recycle_quizzes();
+        $this->recycle_surveys();
+        $this->recycle_learnpaths();
+        $this->recycle_cours_description();
+        $this->recycle_wiki();
+        $this->recycle_glossary();
 
-	/**
-	 * Delete wiki
-	 */
-	function recycle_wiki() {
-		if ($this->course->has_resources(RESOURCE_WIKI)) {
-			$table_wiki 		= Database::get_course_table(TABLE_WIKI);
-			$table_wiki_conf 	= Database::get_course_table(TABLE_WIKI_CONF);
-			$table_wiki_discuss = Database::get_course_table(TABLE_WIKI_DISCUSS);
-			$table_wiki_mailcue = Database::get_course_table(TABLE_WIKI_MAILCUE);
 
-			$pages = array();
-			foreach ($this->course->resources[RESOURCE_WIKI] as $resource) {
-				$pages[] = $resource->page_id;
-			}
-			$wiki_ids = implode(',', (array_keys($this->course->resources[RESOURCE_WIKI])));
-			$page_ids = implode(',', $pages);
+        foreach ($this->course->resources as $type => $resources) {
+            foreach ($resources as $id => $resource) {
+                $sql = "DELETE FROM ".$table_linked_resources." WHERE (source_type = '".$type."' AND source_id = '".$id."') OR (resource_type = '".$type."' AND resource_id = '".$id."')  ";
+                Database::query($sql);
+                if(is_numeric($id)) {
+                    $sql = "DELETE FROM ".$table_item_properties." WHERE tool ='".$resource->get_tool()."' AND ref=".$id;
+                    Database::query($sql);
+                } elseif ($type == RESOURCE_TOOL_INTRO) {
+                    $sql = "DELETE FROM $table_tool_intro WHERE id='$id'";
+                    Database::query($sql);
+                }
+            }
+        }
 
-			$sql = "DELETE FROM ".$table_wiki." WHERE id IN(".$wiki_ids.")";
-			Database::query($sql);
-			$sql = "DELETE FROM ".$table_wiki_conf." WHERE page_id IN(".$page_ids.")";
-			Database::query($sql);
-		}
-	}
+    }
+    /**
+     * Delete documents
+     */
+    function recycle_documents()
+    {
+        if ($this->course->has_resources(RESOURCE_DOCUMENT))
+        {
+            $table = Database :: get_course_table(TABLE_DOCUMENT);
+            foreach ($this->course->resources[RESOURCE_DOCUMENT] as $id => $document)
+            {
+                rmdirr($this->course->backup_path.'/'.$document->path);
+            }
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_DOCUMENT])));
+            $sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
 
-	/**
-	 * Delete glossary
-	 */
-	function recycle_glossary() {
-		if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
-			$table_glossary	= Database::get_course_table(TABLE_GLOSSARY);
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_GLOSSARY])));
-			$sql = "DELETE FROM ".$table_glossary." WHERE glossary_id IN(".$ids.")";
-			Database::query($sql);
-		}
-	}
+    /**
+     * Delete wiki
+     */
+    function recycle_wiki() {
+        if ($this->course->has_resources(RESOURCE_WIKI)) {
+            $table_wiki 		= Database::get_course_table(TABLE_WIKI);
+            $table_wiki_conf 	= Database::get_course_table(TABLE_WIKI_CONF);
+            $table_wiki_discuss = Database::get_course_table(TABLE_WIKI_DISCUSS);
+            $table_wiki_mailcue = Database::get_course_table(TABLE_WIKI_MAILCUE);
 
-	/**
-	 * Delete links
-	 */
-	function recycle_links()
-	{
-		if ($this->course->has_resources(RESOURCE_LINK))
-		{
-			$table = Database :: get_course_table(TABLE_LINK);
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_LINK])));
-			$sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
-			Database::query($sql);
-		}
-	}
-	/**
-	 * Delete forums
-	 */
-	function recycle_forums()
-	{
-		if ($this->course->has_resources(RESOURCE_FORUM))
-		{
-			$table_category = Database :: get_course_table(TABLE_FORUM_CATEGORY);
-			$table_forum = Database :: get_course_table(TABLE_FORUM);
-			$table_thread = Database :: get_course_table(TABLE_FORUM_THREAD);
-			$table_post = Database :: get_course_table(TABLE_FORUM_POST);
-			$table_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
-			$table_notification = Database::get_course_table(TABLE_FORUM_NOTIFICATION);
-			$table_mail_queue = Database::get_course_table(TABLE_FORUM_MAIL_QUEUE);
-			$table_thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
-			$table_thread_qualify_log = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY_LOG);
+            $pages = array();
+            foreach ($this->course->resources[RESOURCE_WIKI] as $resource) {
+                $pages[] = $resource->page_id;
+            }
+            $wiki_ids = implode(',', (array_keys($this->course->resources[RESOURCE_WIKI])));
+            $page_ids = implode(',', $pages);
 
-			$forum_ids = implode(',', (array_keys($this->course->resources[RESOURCE_FORUM])));
+            $sql = "DELETE FROM ".$table_wiki." WHERE id IN(".$wiki_ids.")";
+            Database::query($sql);
+            $sql = "DELETE FROM ".$table_wiki_conf." WHERE page_id IN(".$page_ids.")";
+            Database::query($sql);
+        }
+    }
 
-			$sql = "DELETE FROM ".$table_attachment.
-				" USING ".$table_attachment." INNER JOIN ".$table_post.
-				" WHERE ".$table_attachment.".post_id = ".$table_post.".post_id".
-				" AND ".$table_post.".forum_id IN(".$forum_ids.");";
-			Database::query($sql);
+    /**
+     * Delete glossary
+     */
+    function recycle_glossary() {
+        if ($this->course->has_resources(RESOURCE_GLOSSARY)) {
+            $table_glossary	= Database::get_course_table(TABLE_GLOSSARY);
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_GLOSSARY])));
+            $sql = "DELETE FROM ".$table_glossary." WHERE glossary_id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
 
-			$sql = "DELETE FROM ".$table_mail_queue.
-				" USING ".$table_mail_queue." INNER JOIN ".$table_post.
-				" WHERE ".$table_mail_queue.".post_id = ".$table_post.".post_id".
-				" AND ".$table_post.".forum_id IN(".$forum_ids.");";
-			Database::query($sql);
+    /**
+     * Delete links
+     */
+    function recycle_links()
+    {
+        if ($this->course->has_resources(RESOURCE_LINK))
+        {
+            $table = Database :: get_course_table(TABLE_LINK);
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_LINK])));
+            $sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
+    /**
+     * Delete forums
+     */
+    function recycle_forums()
+    {
+        if ($this->course->has_resources(RESOURCE_FORUM))
+        {
+            $table_category = Database :: get_course_table(TABLE_FORUM_CATEGORY);
+            $table_forum = Database :: get_course_table(TABLE_FORUM);
+            $table_thread = Database :: get_course_table(TABLE_FORUM_THREAD);
+            $table_post = Database :: get_course_table(TABLE_FORUM_POST);
+            $table_attachment = Database::get_course_table(TABLE_FORUM_ATTACHMENT);
+            $table_notification = Database::get_course_table(TABLE_FORUM_NOTIFICATION);
+            $table_mail_queue = Database::get_course_table(TABLE_FORUM_MAIL_QUEUE);
+            $table_thread_qualify = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY);
+            $table_thread_qualify_log = Database::get_course_table(TABLE_FORUM_THREAD_QUALIFY_LOG);
 
-			// Just in case, deleting in the same table using thread_id as record-linker.
-			$sql = "DELETE FROM ".$table_mail_queue.
-				" USING ".$table_mail_queue." INNER JOIN ".$table_thread.
-				" WHERE ".$table_mail_queue.".thread_id = ".$table_thread.".thread_id".
-				" AND ".$table_thread.".forum_id IN(".$forum_ids.");";
-			Database::query($sql);
+            $forum_ids = implode(',', (array_keys($this->course->resources[RESOURCE_FORUM])));
 
-			$sql = "DELETE FROM ".$table_thread_qualify.
-				" USING ".$table_thread_qualify." INNER JOIN ".$table_thread.
-				" WHERE ".$table_thread_qualify.".thread_id = ".$table_thread.".thread_id".
-				" AND ".$table_thread.".forum_id IN(".$forum_ids.");";
-			Database::query($sql);
+            $sql = "DELETE FROM ".$table_attachment.
+                " USING ".$table_attachment." INNER JOIN ".$table_post.
+                " WHERE ".$table_attachment.".post_id = ".$table_post.".post_id".
+                " AND ".$table_post.".forum_id IN(".$forum_ids.");";
+            Database::query($sql);
 
-			$sql = "DELETE FROM ".$table_thread_qualify_log.
-				" USING ".$table_thread_qualify_log." INNER JOIN ".$table_thread.
-				" WHERE ".$table_thread_qualify_log.".thread_id = ".$table_thread.".thread_id".
-				" AND ".$table_thread.".forum_id IN(".$forum_ids.");";
-			Database::query($sql);
+            $sql = "DELETE FROM ".$table_mail_queue.
+                " USING ".$table_mail_queue." INNER JOIN ".$table_post.
+                " WHERE ".$table_mail_queue.".post_id = ".$table_post.".post_id".
+                " AND ".$table_post.".forum_id IN(".$forum_ids.");";
+            Database::query($sql);
 
-			$sql = "DELETE FROM ".$table_notification." WHERE forum_id IN(".$forum_ids.")";
-			Database::query($sql);
+            // Just in case, deleting in the same table using thread_id as record-linker.
+            $sql = "DELETE FROM ".$table_mail_queue.
+                " USING ".$table_mail_queue." INNER JOIN ".$table_thread.
+                " WHERE ".$table_mail_queue.".thread_id = ".$table_thread.".thread_id".
+                " AND ".$table_thread.".forum_id IN(".$forum_ids.");";
+            Database::query($sql);
 
-			$sql = "DELETE FROM ".$table_post." WHERE forum_id IN(".$forum_ids.")";
-			Database::query($sql);
+            $sql = "DELETE FROM ".$table_thread_qualify.
+                " USING ".$table_thread_qualify." INNER JOIN ".$table_thread.
+                " WHERE ".$table_thread_qualify.".thread_id = ".$table_thread.".thread_id".
+                " AND ".$table_thread.".forum_id IN(".$forum_ids.");";
+            Database::query($sql);
 
-			$sql = "DELETE FROM ".$table_thread." WHERE forum_id IN(".$forum_ids.")";
-			Database::query($sql);
+            $sql = "DELETE FROM ".$table_thread_qualify_log.
+                " USING ".$table_thread_qualify_log." INNER JOIN ".$table_thread.
+                " WHERE ".$table_thread_qualify_log.".thread_id = ".$table_thread.".thread_id".
+                " AND ".$table_thread.".forum_id IN(".$forum_ids.");";
+            Database::query($sql);
 
-			$sql = "DELETE FROM ".$table_forum." WHERE forum_id IN(".$forum_ids.")";
-			Database::query($sql);
-		}
-	}
-	/**
-	 * Delete forum-categories
-	 * Deletes all forum-categories from current course without forums
-	 */
-	function recycle_forum_categories()
-	{
-		$table_forum = Database :: get_course_table(TABLE_FORUM);
-		$table_forumcat = Database :: get_course_table(TABLE_FORUM_CATEGORY);
-		$sql = "SELECT fc.cat_id FROM ".$table_forumcat." fc LEFT JOIN ".$table_forum." f ON fc.cat_id=f.forum_category WHERE f.forum_id IS NULL";
-		$res = Database::query($sql);
-		while ($obj = Database::fetch_object($res))
-		{
-			$sql = "DELETE FROM ".$table_forumcat." WHERE cat_id = ".$obj->cat_id;
-			Database::query($sql);
-		}
-	}
-	/**
-	 * Delete link-categories
-	 * Deletes all empty link-categories (=without links) from current course
-	 */
-	function recycle_link_categories()
-	{
-		$link_cat_table = Database :: get_course_table(TABLE_LINK_CATEGORY);
-		$link_table = Database :: get_course_table(TABLE_LINK);
-		$sql = "SELECT lc.id FROM ".$link_cat_table." lc LEFT JOIN ".$link_table." l ON lc.id=l.category_id WHERE l.id IS NULL";
-		$res = Database::query($sql);
-		while ($obj = Database::fetch_object($res))
-		{
-			$sql = "DELETE FROM ".$link_cat_table." WHERE id = ".$obj->id;
-			Database::query($sql);
-		}
-	}
-	/**
-	 * Delete events
-	 */
-	function recycle_events() {
-		if ($this->course->has_resources(RESOURCE_EVENT)) {
-			$table = Database :: get_course_table(TABLE_AGENDA);
-			$table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
-			
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_EVENT])));
-			$sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
-			Database::query($sql);
-			
-			$sql = "DELETE FROM ".$table_attachment." WHERE agenda_id IN(".$ids.")";
-			Database::query($sql);			
-		}
-	}
-	/**
-	 * Delete announcements
-	 */
-	function recycle_announcements() {		
-		if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
-			$table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-			$table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
-			
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_ANNOUNCEMENT])));
-			$sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
-			Database::query($sql);
-			
-			$sql = "DELETE FROM ".$table_attachment." WHERE announcement_id IN(".$ids.")";
-			Database::query($sql);			
-		}
-	}
-	/**
-	 * Recycle quizzes - doesn't remove the questions and their answers, as they might still be used later
-	 */
-	function recycle_quizzes()
-	{
-		if ($this->course->has_resources(RESOURCE_QUIZ))
-		{
-			$table_qui_que = Database :: get_course_table(TABLE_QUIZ_QUESTION);
-			$table_qui_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER);
-			$table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
-			$table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
+            $sql = "DELETE FROM ".$table_notification." WHERE forum_id IN(".$forum_ids.")";
+            Database::query($sql);
 
-			$ids = array_keys($this->course->resources[RESOURCE_QUIZ]);
-			$delete_orphan_questions = in_array(-1, $ids);
-			$ids = implode(',', $ids);
+            $sql = "DELETE FROM ".$table_post." WHERE forum_id IN(".$forum_ids.")";
+            Database::query($sql);
 
-			// Deletion of the normal tests, questions in them are not deleted, they become orphan at this moment.
-			$sql = "DELETE FROM ".$table_qui." WHERE id <> -1 AND id IN(".$ids.")";
-			Database::query($sql);
-			$sql = "DELETE FROM ".$table_rel." WHERE exercice_id <> -1 AND exercice_id IN(".$ids.")";
-			Database::query($sql);
+            $sql = "DELETE FROM ".$table_thread." WHERE forum_id IN(".$forum_ids.")";
+            Database::query($sql);
 
-			// Identifying again and deletion of the orphan questions, if it was desired.
-			if ($delete_orphan_questions)
-			{
-				$sql = 'SELECT questions.id FROM '.$table_qui_que.
-					' as questions LEFT JOIN '.$table_rel.' as quizz_questions ON questions.id=quizz_questions.question_id LEFT JOIN '.$table_qui.
-					' as exercices ON exercice_id=exercices.id WHERE quizz_questions.exercice_id IS NULL OR exercices.active = -1'; // active = -1 means "deleted" test.
-				$db_result = Database::query($sql);
-				if (Database::num_rows($db_result) > 0)
-				{
-					$orphan_ids = array();
-					while ($obj = Database::fetch_object($db_result))
-					{
-						$orphan_ids[] = $obj->id;
-					}
-					$orphan_ids = implode(',', $orphan_ids);
-					$sql = "DELETE FROM ".$table_rel." WHERE question_id IN(".$orphan_ids.")";
-					Database::query($sql);
-					$sql = "DELETE FROM ".$table_qui_ans." WHERE question_id IN(".$orphan_ids.")";
-					Database::query($sql);
-					$sql = "DELETE FROM ".$table_qui_que." WHERE id IN(".$orphan_ids.")";
-					Database::query($sql);
-				}
-			}
-		}
+            $sql = "DELETE FROM ".$table_forum." WHERE forum_id IN(".$forum_ids.")";
+            Database::query($sql);
+        }
+    }
+    /**
+     * Delete forum-categories
+     * Deletes all forum-categories from current course without forums
+     */
+    function recycle_forum_categories()
+    {
+        $table_forum = Database :: get_course_table(TABLE_FORUM);
+        $table_forumcat = Database :: get_course_table(TABLE_FORUM_CATEGORY);
+        $sql = "SELECT fc.cat_id FROM ".$table_forumcat." fc LEFT JOIN ".$table_forum." f ON fc.cat_id=f.forum_category WHERE f.forum_id IS NULL";
+        $res = Database::query($sql);
+        while ($obj = Database::fetch_object($res))
+        {
+            $sql = "DELETE FROM ".$table_forumcat." WHERE cat_id = ".$obj->cat_id;
+            Database::query($sql);
+        }
+    }
+    /**
+     * Delete link-categories
+     * Deletes all empty link-categories (=without links) from current course
+     */
+    function recycle_link_categories()
+    {
+        $link_cat_table = Database :: get_course_table(TABLE_LINK_CATEGORY);
+        $link_table = Database :: get_course_table(TABLE_LINK);
+        $sql = "SELECT lc.id FROM ".$link_cat_table." lc LEFT JOIN ".$link_table." l ON lc.id=l.category_id WHERE l.id IS NULL";
+        $res = Database::query($sql);
+        while ($obj = Database::fetch_object($res))
+        {
+            $sql = "DELETE FROM ".$link_cat_table." WHERE id = ".$obj->id;
+            Database::query($sql);
+        }
+    }
+    /**
+     * Delete events
+     */
+    function recycle_events() {
+        if ($this->course->has_resources(RESOURCE_EVENT)) {
+            $table = Database :: get_course_table(TABLE_AGENDA);
+            $table_attachment = Database :: get_course_table(TABLE_AGENDA_ATTACHMENT);
 
-		// Purge "deleted" tests (active = -1).
-		$sql = "DELETE FROM ".$table_qui." WHERE active = -1";
-		Database::query($sql);
-	}
-	/**
-	 * Recycle surveys - removes everything
-	 */
-	function recycle_surveys()
-	{
-		if ($this->course->has_resources(RESOURCE_SURVEY))
-		{
-			$table_survey = Database :: get_course_table(TABLE_SURVEY);
-			$table_survey_q = Database :: get_course_table(TABLE_SURVEY_QUESTION);
-			$table_survey_q_o = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
-			$table_survey_a = Database :: get_course_Table(TABLE_SURVEY_ANSWER);
-			$table_survey_i = Database :: get_course_table(TABLE_SURVEY_INVITATION);
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_SURVEY])));
-			$sql = "DELETE FROM ".$table_survey_i." ";
-			Database::query($sql);
-			$sql = "DELETE FROM ".$table_survey_a." WHERE survey_id IN(".$ids.")";
-			Database::query($sql);
-			$sql = "DELETE FROM ".$table_survey_q_o." WHERE survey_id IN(".$ids.")";
-			Database::query($sql);
-			$sql = "DELETE FROM ".$table_survey_q." WHERE survey_id IN(".$ids.")";
-			Database::query($sql);
-			$sql = "DELETE FROM ".$table_survey." WHERE survey_id IN(".$ids.")";
-			Database::query($sql);
-		}
-	}
-	/**
-	 * Recycle learnpaths
-	 */
-	function recycle_learnpaths()
-	{
-		if ($this->course->has_resources(RESOURCE_LEARNPATH))
-		{
-			$table_main = Database :: get_course_table(TABLE_LP_MAIN);
-			$table_item = Database :: get_course_table(TABLE_LP_ITEM);
-			$table_view = Database :: get_course_table(TABLE_LP_VIEW);
-			$table_iv   = Database :: get_course_table(TABLE_LP_ITEM_VIEW);
-			$table_iv_int = Database :: get_course_table(TABLE_LP_IV_INTERACTION);
-			$table_tool = Database::get_course_table(TABLE_TOOL_LIST);
-			foreach($this->course->resources[RESOURCE_LEARNPATH] as $id => $learnpath)
-			{
-				//remove links from course homepage
-				$sql = "DELETE FROM $table_tool WHERE link LIKE '%lp_controller.php%lp_id=$id%' AND image='scormbuilder.gif'";
-				Database::query($sql);
-				//remove elements from lp_* tables (from bottom-up) by removing interactions, then item_view, then views and items, then paths
-				$sql_items = "SELECT id FROM $table_item WHERE lp_id=$id";
-				$res_items = Database::query($sql_items);
-				while ($row_item = Database::fetch_array($res_items))
-				{
-					//get item views
-					$sql_iv = "SELECT id FROM $table_iv WHERE lp_item_id=".$row_item['id'];
-					$res_iv = Database::query($sql_iv);
-					while ($row_iv = Database::fetch_array($res_iv))
-					{
-						//delete interactions
-						$sql_iv_int_del = "DELETE FROM $table_iv_int WHERE lp_iv_id = ".$row_iv['id'];
-						$res_iv_int_del = Database::query($sql_iv_int_del);
-					}
-					//delete item views
-					$sql_iv_del = "DELETE FROM $table_iv WHERE lp_item_id=".$row_item['id'];
-					$res_iv_del = Database::query($sql_iv_del);
-				}
-				//delete items
-				$sql_items_del = "DELETE FROM $table_item WHERE lp_id=$id";
-				$res_items_del = Database::query($sql_items_del);
-				//delete views
-				$sql_views_del = "DELETE FROM $table_view WHERE lp_id=$id";
-				$res_views_del = Database::query($sql_views_del);
-				//delete lps
-				$sql_del = "DELETE FROM $table_main WHERE id = $id";
-				$res_del = Database::query($sql_del);
-			}
-		}
-	}
-	/**
-	 * Delete course description
-	 */
-	function recycle_cours_description()
-	{
-		if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION))
-		{
-			$table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
-			$ids = implode(',', (array_keys($this->course->resources[RESOURCE_COURSEDESCRIPTION])));
-			$sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
-			Database::query($sql);
-		}
-	}
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_EVENT])));
+            $sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
+            Database::query($sql);
+
+            $sql = "DELETE FROM ".$table_attachment." WHERE agenda_id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
+    /**
+     * Delete announcements
+     */
+    function recycle_announcements() {
+        if ($this->course->has_resources(RESOURCE_ANNOUNCEMENT)) {
+            $table = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+            $table_attachment = Database :: get_course_table(TABLE_ANNOUNCEMENT_ATTACHMENT);
+
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_ANNOUNCEMENT])));
+            $sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
+            Database::query($sql);
+
+            $sql = "DELETE FROM ".$table_attachment." WHERE announcement_id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
+    /**
+     * Recycle quizzes - doesn't remove the questions and their answers, as they might still be used later
+     */
+    function recycle_quizzes()
+    {
+        if ($this->course->has_resources(RESOURCE_QUIZ))
+        {
+            $table_qui_que = Database :: get_course_table(TABLE_QUIZ_QUESTION);
+            $table_qui_ans = Database :: get_course_table(TABLE_QUIZ_ANSWER);
+            $table_qui = Database :: get_course_table(TABLE_QUIZ_TEST);
+            $table_rel = Database :: get_course_table(TABLE_QUIZ_TEST_QUESTION);
+
+            $ids = array_keys($this->course->resources[RESOURCE_QUIZ]);
+            $delete_orphan_questions = in_array(-1, $ids);
+            $ids = implode(',', $ids);
+
+            // Deletion of the normal tests, questions in them are not deleted, they become orphan at this moment.
+            $sql = "DELETE FROM ".$table_qui." WHERE id <> -1 AND id IN(".$ids.")";
+            Database::query($sql);
+            $sql = "DELETE FROM ".$table_rel." WHERE exercice_id <> -1 AND exercice_id IN(".$ids.")";
+            Database::query($sql);
+
+            // Identifying again and deletion of the orphan questions, if it was desired.
+            if ($delete_orphan_questions)
+            {
+                $sql = 'SELECT questions.id FROM '.$table_qui_que.
+                    ' as questions LEFT JOIN '.$table_rel.' as quizz_questions ON questions.id=quizz_questions.question_id LEFT JOIN '.$table_qui.
+                    ' as exercices ON exercice_id=exercices.id WHERE quizz_questions.exercice_id IS NULL OR exercices.active = -1'; // active = -1 means "deleted" test.
+                $db_result = Database::query($sql);
+                if (Database::num_rows($db_result) > 0)
+                {
+                    $orphan_ids = array();
+                    while ($obj = Database::fetch_object($db_result))
+                    {
+                        $orphan_ids[] = $obj->id;
+                    }
+                    $orphan_ids = implode(',', $orphan_ids);
+                    $sql = "DELETE FROM ".$table_rel." WHERE question_id IN(".$orphan_ids.")";
+                    Database::query($sql);
+                    $sql = "DELETE FROM ".$table_qui_ans." WHERE question_id IN(".$orphan_ids.")";
+                    Database::query($sql);
+                    $sql = "DELETE FROM ".$table_qui_que." WHERE id IN(".$orphan_ids.")";
+                    Database::query($sql);
+                }
+            }
+        }
+
+        // Purge "deleted" tests (active = -1).
+        $sql = "DELETE FROM ".$table_qui." WHERE active = -1";
+        Database::query($sql);
+    }
+    /**
+     * Recycle surveys - removes everything
+     */
+    function recycle_surveys()
+    {
+        if ($this->course->has_resources(RESOURCE_SURVEY))
+        {
+            $table_survey = Database :: get_course_table(TABLE_SURVEY);
+            $table_survey_q = Database :: get_course_table(TABLE_SURVEY_QUESTION);
+            $table_survey_q_o = Database :: get_course_table(TABLE_SURVEY_QUESTION_OPTION);
+            $table_survey_a = Database :: get_course_Table(TABLE_SURVEY_ANSWER);
+            $table_survey_i = Database :: get_course_table(TABLE_SURVEY_INVITATION);
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_SURVEY])));
+            $sql = "DELETE FROM ".$table_survey_i." ";
+            Database::query($sql);
+            $sql = "DELETE FROM ".$table_survey_a." WHERE survey_id IN(".$ids.")";
+            Database::query($sql);
+            $sql = "DELETE FROM ".$table_survey_q_o." WHERE survey_id IN(".$ids.")";
+            Database::query($sql);
+            $sql = "DELETE FROM ".$table_survey_q." WHERE survey_id IN(".$ids.")";
+            Database::query($sql);
+            $sql = "DELETE FROM ".$table_survey." WHERE survey_id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
+    /**
+     * Recycle learnpaths
+     */
+    function recycle_learnpaths()
+    {
+        if ($this->course->has_resources(RESOURCE_LEARNPATH))
+        {
+            $table_main = Database :: get_course_table(TABLE_LP_MAIN);
+            $table_item = Database :: get_course_table(TABLE_LP_ITEM);
+            $table_view = Database :: get_course_table(TABLE_LP_VIEW);
+            $table_iv   = Database :: get_course_table(TABLE_LP_ITEM_VIEW);
+            $table_iv_int = Database :: get_course_table(TABLE_LP_IV_INTERACTION);
+            $table_tool = Database::get_course_table(TABLE_TOOL_LIST);
+            foreach($this->course->resources[RESOURCE_LEARNPATH] as $id => $learnpath)
+            {
+                //remove links from course homepage
+                $sql = "DELETE FROM $table_tool WHERE link LIKE '%lp_controller.php%lp_id=$id%' AND image='scormbuilder.gif'";
+                Database::query($sql);
+                //remove elements from lp_* tables (from bottom-up) by removing interactions, then item_view, then views and items, then paths
+                $sql_items = "SELECT id FROM $table_item WHERE lp_id=$id";
+                $res_items = Database::query($sql_items);
+                while ($row_item = Database::fetch_array($res_items))
+                {
+                    //get item views
+                    $sql_iv = "SELECT id FROM $table_iv WHERE lp_item_id=".$row_item['id'];
+                    $res_iv = Database::query($sql_iv);
+                    while ($row_iv = Database::fetch_array($res_iv))
+                    {
+                        //delete interactions
+                        $sql_iv_int_del = "DELETE FROM $table_iv_int WHERE lp_iv_id = ".$row_iv['id'];
+                        $res_iv_int_del = Database::query($sql_iv_int_del);
+                    }
+                    //delete item views
+                    $sql_iv_del = "DELETE FROM $table_iv WHERE lp_item_id=".$row_item['id'];
+                    $res_iv_del = Database::query($sql_iv_del);
+                }
+                //delete items
+                $sql_items_del = "DELETE FROM $table_item WHERE lp_id=$id";
+                $res_items_del = Database::query($sql_items_del);
+                //delete views
+                $sql_views_del = "DELETE FROM $table_view WHERE lp_id=$id";
+                $res_views_del = Database::query($sql_views_del);
+                //delete lps
+                $sql_del = "DELETE FROM $table_main WHERE id = $id";
+                $res_del = Database::query($sql_del);
+            }
+        }
+    }
+    /**
+     * Delete course description
+     */
+    function recycle_cours_description()
+    {
+        if ($this->course->has_resources(RESOURCE_COURSEDESCRIPTION))
+        {
+            $table = Database :: get_course_table(TABLE_COURSE_DESCRIPTION);
+            $ids = implode(',', (array_keys($this->course->resources[RESOURCE_COURSEDESCRIPTION])));
+            $sql = "DELETE FROM ".$table." WHERE id IN(".$ids.")";
+            Database::query($sql);
+        }
+    }
 }