From 6af4b9bc50829c511e529e923f2fe173f2d93309 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 29 Mar 2010 11:52:56 -0500
Subject: [PATCH] Changing headers

---
 main/exercice/addlimits.php                   | 27 +++++--------------
 main/exercice/admin.php                       |  2 +-
 main/exercice/adminhp.php                     | 21 ++-------------
 main/exercice/answer_admin.inc.php            | 19 +------------
 main/exercice/exercice_history.php            | 19 +------------
 main/exercice/exercise.class.php              |  2 +-
 main/exercice/exercise.lib.php                | 27 ++-----------------
 main/exercice/exercise_show.php               |  2 +-
 main/exercice/feedback.php                    | 19 +------------
 main/exercice/fill_blanks.class.php           | 21 +--------------
 main/exercice/hotpotatoes.lib.php             |  4 +--
 main/exercice/hotspot_actionscript.as.php     |  2 +-
 .../hotspot_actionscript_admin.as.php         |  2 +-
 main/exercice/hotspot_lang_conversion.php     |  2 +-
 main/exercice/hotspot_save.inc.php            |  2 +-
 main/exercice/savescores.php                  | 19 +------------
 main/exercice/testheaderpage.php              |  2 +-
 main/exercice/unique_answer.class.php         | 19 +------------
 18 files changed, 26 insertions(+), 185 deletions(-)
 mode change 100644 => 100755 main/exercice/fill_blanks.class.php

diff --git a/main/exercice/addlimits.php b/main/exercice/addlimits.php
index 857241687b..eca3f1076b 100755
--- a/main/exercice/addlimits.php
+++ b/main/exercice/addlimits.php
@@ -1,7 +1,5 @@
 <?php
 /* For licensing terms, see /license.txt */
-
-
 /**
 *	Adding limits
 *	@package chamilo.exercise
@@ -9,26 +7,20 @@
 * 	@version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
 */
 /*
------------------------------------------------------------
 	including the global file
------------------------------------------------------------
 */
-include('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 
 /*
------------------------------------------------------------
 	Including necessary files
------------------------------------------------------------
 */
-include('exercise.class.php');
-include('question.class.php');
-include('answer.class.php');
-include_once(api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
+require_once 'exercise.class.php';
+require_once 'question.class.php';
+require_once 'answer.class.php';
+require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 /*
------------------------------------------------------------
 	Answer types
------------------------------------------------------------
 */
 define('UNIQUE_ANSWER',	1);
 define('MULTIPLE_ANSWER',	2);
@@ -38,27 +30,21 @@ define('FREE_ANSWER', 5);
 define('MULTIPLE_ANSWER_COMBINATION', 9);
 
 /*
------------------------------------------------------------
 	Language
------------------------------------------------------------
 */
 // name of the language file that needs to be included
 $language_file='exercice';
 
 /*
------------------------------------------------------------
 	section (for the tabs)
------------------------------------------------------------
 */
 $this_section=SECTION_COURSES;
 
 api_protect_course_script();
 
 /*
------------------------------------------------------------
 	Table definitions
 	@todo: use the Database :: get_course_table functions
------------------------------------------------------------
 */
 $TBL_EXERCICE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
 $TBL_EXERCICES         = Database::get_course_table(TABLE_QUIZ_TEST);
@@ -233,5 +219,4 @@ if (isset($_POST['ok'])) {
 		Database::query($query);
 	}
 }
-?>
-
+?>
\ No newline at end of file
diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index ed01215d65..acf9b05d4e 100755
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -41,7 +41,7 @@
 * 	- $cancelAnswers : ask to cancel answer modifications
 * 	- $buttonBack : ask to go back to the previous page in answers of type "Fill in blanks"
 *
-*	@package dokeos.exercise
+*	@package chamilo.exercise
 * 	@author Olivier Brouckaert
 * 	@version $Id: admin.php 21662 2009-06-29 14:55:09Z iflorespaz $
 */
diff --git a/main/exercice/adminhp.php b/main/exercice/adminhp.php
index cf77581d15..15bc8a4979 100755
--- a/main/exercice/adminhp.php
+++ b/main/exercice/adminhp.php
@@ -1,26 +1,9 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
-
+/* For licensing terms, see /license.txt */
 
 /**
 *	HotPotatoes administration.
-*	@package dokeos.exercise
+*	@package chamilo.exercise
 * 	@author Istvan Mandak
 * 	@version $Id: adminhp.php 20089 2009-04-24 21:12:54Z cvargas1 $
 */
diff --git a/main/exercice/answer_admin.inc.php b/main/exercice/answer_admin.inc.php
index c09ef365da..cb55891c9d 100755
--- a/main/exercice/answer_admin.inc.php
+++ b/main/exercice/answer_admin.inc.php
@@ -1,22 +1,5 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
-
+/* For licensing terms, see /license.txt */
 
 /**
 *	This script allows to manage answers. It is included from the script admin.php
diff --git a/main/exercice/exercice_history.php b/main/exercice/exercice_history.php
index 80deb362be..7713779eba 100644
--- a/main/exercice/exercice_history.php
+++ b/main/exercice/exercice_history.php
@@ -1,22 +1,5 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue du Corbeau, 108
-		B-1030 Brussels - Belgium
-		info@dokeos.com
-*/
-
+/* For licensing terms, see /license.txt */
 
 /**
 *	Exercise list: This script shows the list of exercises for administrators and students.
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 171aa54f3f..49602753d0 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -1,5 +1,5 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 
 /**
 *	Exercise class: This class allows to instantiate an object of type Exercise
diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index f46f1f6db4..5ee471904a 100755
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -1,28 +1,5 @@
-<?php // $Id: exercise.lib.php 22247 2009-07-20 15:57:25Z ivantcholakov $
-
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) various contributors
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 
 /**
 *	Exercise library
diff --git a/main/exercice/exercise_show.php b/main/exercice/exercise_show.php
index c41b3cad10..5ee9b09dae 100755
--- a/main/exercice/exercise_show.php
+++ b/main/exercice/exercise_show.php
@@ -5,7 +5,7 @@
 *	@package chamilo.exercise
 * 	@author Julio Montoya Armas Added switchable fill in blank option added
 * 	@version $Id: exercise_show.php 22256 2009-07-20 17:40:20Z ivantcholakov $
-*
+*	@package chamilo.exercise
 * 	@todo remove the debug code and use the general debug library
 * 	@todo use the Database:: functions
 * 	@todo small letters for table variables
diff --git a/main/exercice/feedback.php b/main/exercice/feedback.php
index 9d7bebc0c9..cce98d133a 100755
--- a/main/exercice/feedback.php
+++ b/main/exercice/feedback.php
@@ -1,22 +1,5 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
-
+/* For licensing terms, see /license.txt */
 // Note by Ivan Tcholakov, 14-JUL-2009: I can't see where this file is used. Is it obsolete?
 
 /**
diff --git a/main/exercice/fill_blanks.class.php b/main/exercice/fill_blanks.class.php
old mode 100644
new mode 100755
index 76defedf6f..dc392eb278
--- a/main/exercice/fill_blanks.class.php
+++ b/main/exercice/fill_blanks.class.php
@@ -1,24 +1,5 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 
 
 /**
diff --git a/main/exercice/hotpotatoes.lib.php b/main/exercice/hotpotatoes.lib.php
index 2e074dc884..daa5131695 100755
--- a/main/exercice/hotpotatoes.lib.php
+++ b/main/exercice/hotpotatoes.lib.php
@@ -1,8 +1,8 @@
 <?php //$id: $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 *	Code library for HotPotatoes integration.
-*	@package dokeos.exercise
+*	@package chamilo.exercise
 * 	@author Istvan Mandak (original author)
 */
 $dbTable = Database::get_course_table(TABLE_DOCUMENT);
diff --git a/main/exercice/hotspot_actionscript.as.php b/main/exercice/hotspot_actionscript.as.php
index 4a5f43345e..dea533be52 100755
--- a/main/exercice/hotspot_actionscript.as.php
+++ b/main/exercice/hotspot_actionscript.as.php
@@ -1,5 +1,5 @@
 <?php //$id:$
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 //error_log(__FILE__);
 /**
 *	This file generates the ActionScript variables code used by the HotSpot .swf
diff --git a/main/exercice/hotspot_actionscript_admin.as.php b/main/exercice/hotspot_actionscript_admin.as.php
index f60fc38fa9..18492171ee 100755
--- a/main/exercice/hotspot_actionscript_admin.as.php
+++ b/main/exercice/hotspot_actionscript_admin.as.php
@@ -1,5 +1,5 @@
 <?php //$id:$
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 //error_log(__FILE__);
 /**
 *	This file generates the ActionScript variables code used by the HotSpot .swf
diff --git a/main/exercice/hotspot_lang_conversion.php b/main/exercice/hotspot_lang_conversion.php
index 4b0ca48355..2efb5b9e7f 100755
--- a/main/exercice/hotspot_lang_conversion.php
+++ b/main/exercice/hotspot_lang_conversion.php
@@ -1,5 +1,5 @@
 <?php //$id:$
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 //error_log(__FILE__);
 /**
 *	Hotspot languae conversion
diff --git a/main/exercice/hotspot_save.inc.php b/main/exercice/hotspot_save.inc.php
index e63be2c805..853e936d8a 100755
--- a/main/exercice/hotspot_save.inc.php
+++ b/main/exercice/hotspot_save.inc.php
@@ -1,5 +1,5 @@
 <?php //$id:$
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 //error_log(__FILE__);
 /**
 *
diff --git a/main/exercice/savescores.php b/main/exercice/savescores.php
index 124751418b..0b35e619a0 100755
--- a/main/exercice/savescores.php
+++ b/main/exercice/savescores.php
@@ -1,22 +1,5 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
-
+/* For licensing terms, see /license.txt */
 
 /**
 *	Saving the scores.
diff --git a/main/exercice/testheaderpage.php b/main/exercice/testheaderpage.php
index 81ba54724c..0b9a49ac25 100755
--- a/main/exercice/testheaderpage.php
+++ b/main/exercice/testheaderpage.php
@@ -1,5 +1,5 @@
 <?php //$id: $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 *	Code library for HotPotatoes integration.
 *	@package dokeos.exercise
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index d4bbce8b22..adff6cb65b 100755
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -1,22 +1,5 @@
 <?php
-/*
-    DOKEOS - elearning and course management software
-
-    For a full list of contributors, see documentation/credits.html
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-    See "documentation/licence.html" more details.
-
-    Contact:
-		Dokeos
-		Rue des Palais 44 Paleizenstraat
-		B-1030 Brussels - Belgium
-		Tel. +32 (2) 211 34 56
-*/
-
+/* For licensing terms, see /license.txt */
 
 /**
 *	File containing the UNIQUE_ANSWER class.