Fix Conflict between 2 CourseDescription classes - Refs #8045

1.10.x
José Loguercio 9 years ago
parent 8f0e33bfc4
commit c953b098c4
  1. 2
      main/coursecopy/classes/Announcement.class.php
  2. 2
      main/coursecopy/classes/Attendance.class.php
  3. 2
      main/coursecopy/classes/CourseBuilder.class.php
  4. 2
      main/coursecopy/classes/CourseCopyLearnpath.class.php
  5. 2
      main/coursecopy/classes/CourseCopyTestCategory.php
  6. 2
      main/coursecopy/classes/CourseDescription.class.php
  7. 2
      main/coursecopy/classes/CourseSession.class.php
  8. 2
      main/coursecopy/classes/Document.class.php
  9. 2
      main/coursecopy/classes/Event.class.php
  10. 2
      main/coursecopy/classes/Forum.class.php
  11. 2
      main/coursecopy/classes/ForumCategory.class.php
  12. 2
      main/coursecopy/classes/ForumPost.class.php
  13. 2
      main/coursecopy/classes/ForumTopic.class.php
  14. 2
      main/coursecopy/classes/Glossary.class.php
  15. 2
      main/coursecopy/classes/Link.class.php
  16. 2
      main/coursecopy/classes/LinkCategory.class.php
  17. 2
      main/coursecopy/classes/Quiz.class.php
  18. 2
      main/coursecopy/classes/QuizQuestion.class.php
  19. 2
      main/coursecopy/classes/QuizQuestionOption.class.php
  20. 1
      main/coursecopy/classes/Resource.class.php
  21. 2
      main/coursecopy/classes/ScormDocument.class.php
  22. 2
      main/coursecopy/classes/Survey.class.php
  23. 2
      main/coursecopy/classes/SurveyInvitation.class.php
  24. 2
      main/coursecopy/classes/SurveyQuestion.class.php
  25. 2
      main/coursecopy/classes/Thematic.class.php
  26. 2
      main/coursecopy/classes/ToolIntro.class.php
  27. 2
      main/coursecopy/classes/Work.class.php
  28. 2
      main/coursecopy/classes/wiki.class.php

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save