Browse Source

Merge pull request #978 from jloguercio/8045

Fix Conflict between 2 CourseDescription classes - Refs #8045
Yannick Warnier 9 years ago
parent
commit
cfcba70979
28 changed files with 28 additions and 27 deletions
  1. 1 1
      main/coursecopy/classes/Announcement.class.php
  2. 1 1
      main/coursecopy/classes/Attendance.class.php
  3. 1 1
      main/coursecopy/classes/CourseBuilder.class.php
  4. 1 1
      main/coursecopy/classes/CourseCopyLearnpath.class.php
  5. 1 1
      main/coursecopy/classes/CourseCopyTestCategory.php
  6. 1 1
      main/coursecopy/classes/CourseDescription.class.php
  7. 1 1
      main/coursecopy/classes/CourseSession.class.php
  8. 1 1
      main/coursecopy/classes/Document.class.php
  9. 1 1
      main/coursecopy/classes/Event.class.php
  10. 1 1
      main/coursecopy/classes/Forum.class.php
  11. 1 1
      main/coursecopy/classes/ForumCategory.class.php
  12. 1 1
      main/coursecopy/classes/ForumPost.class.php
  13. 1 1
      main/coursecopy/classes/ForumTopic.class.php
  14. 1 1
      main/coursecopy/classes/Glossary.class.php
  15. 1 1
      main/coursecopy/classes/Link.class.php
  16. 1 1
      main/coursecopy/classes/LinkCategory.class.php
  17. 1 1
      main/coursecopy/classes/Quiz.class.php
  18. 1 1
      main/coursecopy/classes/QuizQuestion.class.php
  19. 1 1
      main/coursecopy/classes/QuizQuestionOption.class.php
  20. 1 0
      main/coursecopy/classes/Resource.class.php
  21. 1 1
      main/coursecopy/classes/ScormDocument.class.php
  22. 1 1
      main/coursecopy/classes/Survey.class.php
  23. 1 1
      main/coursecopy/classes/SurveyInvitation.class.php
  24. 1 1
      main/coursecopy/classes/SurveyQuestion.class.php
  25. 1 1
      main/coursecopy/classes/Thematic.class.php
  26. 1 1
      main/coursecopy/classes/ToolIntro.class.php
  27. 1 1
      main/coursecopy/classes/Work.class.php
  28. 1 1
      main/coursecopy/classes/wiki.class.php

+ 1 - 1
main/coursecopy/classes/Announcement.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class Announcement extends Resource
+class Announcement extends Coursecopy\Resource
 {
 	/**
 	 * The title of the announcement

+ 1 - 1
main/coursecopy/classes/Attendance.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @package chamilo.backup
  */
 
-class Attendance extends Resource
+class Attendance extends Coursecopy\Resource
 {
     public $params = array();
     public $attendance_calendar = array();

+ 1 - 1
main/coursecopy/classes/CourseBuilder.class.php

@@ -1147,7 +1147,7 @@ class CourseBuilder
 
         $db_result = Database::query($sql);
         while ($obj = Database::fetch_object($db_result)) {
-            $cd = new CourseDescription(
+            $cd = new \Coursecopy\CourseDescription(
                 $obj->id,
                 $obj->title,
                 $obj->content,

+ 1 - 1
main/coursecopy/classes/CourseCopyLearnpath.class.php

@@ -6,7 +6,7 @@
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class CourseCopyLearnpath extends Resource
+class CourseCopyLearnpath extends Coursecopy\Resource
 {
 	/**
 	 * Type of learnpath (can be dokeos (1), scorm (2), aicc (3))

+ 1 - 1
main/coursecopy/classes/CourseCopyTestCategory.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Hubert Borderiou <hubert.borderiou@grenet.fr>
  * @package chamilo.backup
  */
-class CourseCopyTestcategory extends Resource
+class CourseCopyTestcategory extends Coursecopy\Resource
 {
     /**
      * The title

+ 1 - 1
main/coursecopy/classes/CourseDescription.class.php

@@ -1,6 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
-
+namespace Coursecopy;
 require_once 'Resource.class.php';
 
 /**

+ 1 - 1
main/coursecopy/classes/CourseSession.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Jhon Hinojosa <jhon.hinojosa@beeznest.com>
  * @package chamilo.backup
  */
-class CourseSession extends Resource
+class CourseSession extends Coursecopy\Resource
 {
     // The title session
 	public $title;

+ 1 - 1
main/coursecopy/classes/Document.class.php

@@ -11,7 +11,7 @@ define('FOLDER','folder');
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class Document extends Resource
+class Document extends Coursecopy\Resource
 {
     public $path;
     public $comment;

+ 1 - 1
main/coursecopy/classes/Event.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class CalendarEvent extends Resource
+class CalendarEvent extends Coursecopy\Resource
 {
     /**
      * The title

+ 1 - 1
main/coursecopy/classes/Forum.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class Forum extends Resource
+class Forum extends Coursecopy\Resource
 {
     /**
      * The title

+ 1 - 1
main/coursecopy/classes/ForumCategory.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class ForumCategory extends Resource
+class ForumCategory extends Coursecopy\Resource
 {
     /**
      * Create a new ForumCategory

+ 1 - 1
main/coursecopy/classes/ForumPost.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class ForumPost extends Resource
+class ForumPost extends Coursecopy\Resource
 {
 
     /**

+ 1 - 1
main/coursecopy/classes/ForumTopic.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class ForumTopic extends Resource
+class ForumTopic extends Coursecopy\Resource
 {
     /**
      * Create a new ForumTopic

+ 1 - 1
main/coursecopy/classes/Glossary.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Isaac flores
  * @package chamilo.backup
  */
-class Glossary extends Resource
+class Glossary extends Coursecopy\Resource
 {
 	public $glossary_id;
 	public $name;

+ 1 - 1
main/coursecopy/classes/Link.class.php

@@ -9,7 +9,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class Link extends Resource
+class Link extends Coursecopy\Resource
 {
 	/**
 	 * The title

+ 1 - 1
main/coursecopy/classes/LinkCategory.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class LinkCategory extends Resource
+class LinkCategory extends Coursecopy\Resource
 {
 	/**
 	 * The title

+ 1 - 1
main/coursecopy/classes/Quiz.class.php

@@ -9,7 +9,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class Quiz extends Resource
+class Quiz extends Coursecopy\Resource
 {
     /**
      * Create a new Quiz

+ 1 - 1
main/coursecopy/classes/QuizQuestion.class.php

@@ -9,7 +9,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class QuizQuestion extends Resource
+class QuizQuestion extends Coursecopy\Resource
 {
     /**
      * The question

+ 1 - 1
main/coursecopy/classes/QuizQuestionOption.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class QuizQuestionOption extends Resource
+class QuizQuestionOption extends Coursecopy\Resource
 {
     public $obj; //question_option
 

+ 1 - 0
main/coursecopy/classes/Resource.class.php

@@ -1,5 +1,6 @@
 <?php
 /* For licensing terms, see /license.txt */
+namespace Coursecopy;
 
 define('RESOURCE_DOCUMENT', 'document');
 define('RESOURCE_GLOSSARY', 'glossary');

+ 1 - 1
main/coursecopy/classes/ScormDocument.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Olivier Brouckaert <oli.brouckaert@dokeos.com>
  * @package chamilo.backup
  */
-class ScormDocument extends Resource
+class ScormDocument extends Coursecopy\Resource
 {
     public $path;
     public $title;

+ 1 - 1
main/coursecopy/classes/Survey.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
  * @package chamilo.backup
  */
-class Survey extends Resource
+class Survey extends Coursecopy\Resource
 {
 	/**
 	 * The survey code

+ 1 - 1
main/coursecopy/classes/SurveyInvitation.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
  * @package chamilo.backup
  */
-class SurveyInvitation extends Resource
+class SurveyInvitation extends Coursecopy\Resource
 {
 	/**
 	 * Survey code

+ 1 - 1
main/coursecopy/classes/SurveyQuestion.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
  * @package chamilo.backup
  */
-class SurveyQuestion extends Resource
+class SurveyQuestion extends Coursecopy\Resource
 {
 	/**
 	 * Survey ID

+ 1 - 1
main/coursecopy/classes/Thematic.class.php

@@ -7,7 +7,7 @@ require_once 'Resource.class.php';
  * @package chamilo.backup
  */
 
-class Thematic extends Resource
+class Thematic extends Coursecopy\Resource
 {
     public $params = array();
     public $thematic_advance_list = array();

+ 1 - 1
main/coursecopy/classes/ToolIntro.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Bart Mollet <bart.mollet@hogent.be>
  * @package chamilo.backup
  */
-class ToolIntro extends Resource
+class ToolIntro extends Coursecopy\Resource
 {
 	var $id;
 

+ 1 - 1
main/coursecopy/classes/Work.class.php

@@ -8,7 +8,7 @@ require_once 'Resource.class.php';
  * @author Yannick Warnier <yannick.warnier@beeznest.com>
  * @package chamilo.backup
  */
-class Work extends Resource
+class Work extends Coursecopy\Resource
 {
     public $params = array();
 

+ 1 - 1
main/coursecopy/classes/wiki.class.php

@@ -7,7 +7,7 @@
  * @package chamilo.backup
  * @author Matthias Crauwels <matthias.crauwels@UGent.be>, Ghent University
  */
-class Wiki extends Resource
+class Wiki extends Coursecopy\Resource
 {
 	var $id;
 	var $page_id;