From 57f57504a5ad6c1a0fca943fc46fb4d3ec346574 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 5 May 2010 17:02:13 +0200
Subject: [PATCH] Replacing dokeos to chamilo, cleaning code

---
 main/admin/access_url_add_sessions_to_url.php |  2 +-
 main/admin/access_url_add_users_to_url.php    |  2 +-
 main/admin/access_url_edit.php                |  1 +
 main/admin/access_url_edit_courses_to_url.php |  2 --
 .../admin/access_url_edit_sessions_to_url.php |  4 +--
 main/admin/access_url_edit_users_to_url.php   |  5 ++--
 main/admin/add_courses_to_session.php         |  1 -
 main/admin/add_users_to_group.php             |  4 +--
 main/admin/add_users_to_session.php           |  2 +-
 main/admin/calendar.lib.php                   |  6 -----
 main/admin/calendar.php                       |  8 +++---
 main/admin/calendar_ical_export.php           |  8 +++---
 main/admin/calendar_view.php                  |  4 +--
 main/admin/calendar_view_print.php            | 26 +++----------------
 main/admin/configure_homepage.php             |  2 +-
 main/admin/course_add.php                     | 10 ++-----
 16 files changed, 23 insertions(+), 64 deletions(-)
 mode change 100644 => 100755 main/admin/access_url_add_sessions_to_url.php
 mode change 100644 => 100755 main/admin/access_url_add_users_to_url.php
 mode change 100644 => 100755 main/admin/calendar.lib.php
 mode change 100644 => 100755 main/admin/calendar_ical_export.php
 mode change 100644 => 100755 main/admin/calendar_view.php
 mode change 100644 => 100755 main/admin/calendar_view_print.php

diff --git a/main/admin/access_url_add_sessions_to_url.php b/main/admin/access_url_add_sessions_to_url.php
old mode 100644
new mode 100755
index 64f04f3d8f..f98efba4c2
--- a/main/admin/access_url_add_sessions_to_url.php
+++ b/main/admin/access_url_add_sessions_to_url.php
@@ -14,7 +14,7 @@ $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section=SECTION_PLATFORM_ADMIN;
 
-require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
+require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
 api_protect_admin_script();
 if (!$_configuration['multiple_access_urls']) {
 	header('Location: index.php');
diff --git a/main/admin/access_url_add_users_to_url.php b/main/admin/access_url_add_users_to_url.php
old mode 100644
new mode 100755
index 8ab51b76d6..c0c12fad9c
--- a/main/admin/access_url_add_users_to_url.php
+++ b/main/admin/access_url_add_users_to_url.php
@@ -14,7 +14,7 @@ $cidReset = true;
 require_once '../inc/global.inc.php';
 $this_section=SECTION_PLATFORM_ADMIN;
 
-require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
+require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
 api_protect_admin_script();
 if (!$_configuration['multiple_access_urls']) {
 	header('Location: index.php');
diff --git a/main/admin/access_url_edit.php b/main/admin/access_url_edit.php
index eb65b63e85..9cd6d5a23a 100755
--- a/main/admin/access_url_edit.php
+++ b/main/admin/access_url_edit.php
@@ -13,6 +13,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 if (!$_configuration['multiple_access_urls']) {
 	header('Location: index.php');
+	exit;
 }
 
 require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
diff --git a/main/admin/access_url_edit_courses_to_url.php b/main/admin/access_url_edit_courses_to_url.php
index c586159069..b646ace69f 100755
--- a/main/admin/access_url_edit_courses_to_url.php
+++ b/main/admin/access_url_edit_courses_to_url.php
@@ -12,9 +12,7 @@ $language_file='admin';
 // resetting the course id
 $cidReset=true;
 
-// including some necessary dokeos files
 require_once '../inc/global.inc.php';
-
 require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'access_url_edit_courses_to_url_functions.lib.php');
 
diff --git a/main/admin/access_url_edit_sessions_to_url.php b/main/admin/access_url_edit_sessions_to_url.php
index 9628993216..c5fbac3397 100755
--- a/main/admin/access_url_edit_sessions_to_url.php
+++ b/main/admin/access_url_edit_sessions_to_url.php
@@ -14,8 +14,8 @@ $cidReset=true;
 
 // including some necessary dokeos files
 require_once '../inc/global.inc.php';
-require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'access_url_edit_sessions_to_url_functions.lib.php');
+require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
+require_once api_get_path(LIBRARY_PATH).'access_url_edit_sessions_to_url_functions.lib.php';
 
 $xajax = new xajax();
 //$xajax->debugOn();
diff --git a/main/admin/access_url_edit_users_to_url.php b/main/admin/access_url_edit_users_to_url.php
index 4611cf7475..dfb91e58da 100755
--- a/main/admin/access_url_edit_users_to_url.php
+++ b/main/admin/access_url_edit_users_to_url.php
@@ -12,11 +12,10 @@ $language_file='admin';
 // resetting the course id
 $cidReset=true;
 
-// including some necessary dokeos files
 require_once '../inc/global.inc.php';
-require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
+require_once api_get_path(LIBRARY_PATH).'urlmanager.lib.php';
 require_once api_get_path(LIBRARY_PATH).'access_url_edit_users_to_url_functions.lib.php';
-require_once ('../inc/lib/xajax/xajax.inc.php');
+require_once '../inc/lib/xajax/xajax.inc.php';
 $xajax = new xajax();
 //$xajax->debugOn();
 $xajax -> registerFunction (array('search_users', 'Accessurledituserstourl', 'search_users'));
diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php
index d75b9db23d..88e28fbd35 100755
--- a/main/admin/add_courses_to_session.php
+++ b/main/admin/add_courses_to_session.php
@@ -11,7 +11,6 @@ $language_file='admin';
 // resetting the course id
 $cidReset=true;
 
-// including some necessary dokeos files
 require_once('../inc/global.inc.php');
 
 // including additonal libraries
diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php
index cec319a087..e77dbe56ba 100755
--- a/main/admin/add_users_to_group.php
+++ b/main/admin/add_users_to_group.php
@@ -1,7 +1,7 @@
 <?php //$id: $
 /* For licensing terms, see /license.txt */
 /**
-*	@package dokeos.admin
+*	@package chamilo.admin
 */
 
 // name of the language file that needs to be included
@@ -10,7 +10,7 @@ $language_file=array('admin','registration');
 // resetting the course id
 $cidReset=true;
 
-// including some necessary dokeos files
+// including some necessary files
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/xajax/xajax.inc.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php
index 55e6ad02f5..824c7ed991 100755
--- a/main/admin/add_users_to_session.php
+++ b/main/admin/add_users_to_session.php
@@ -10,7 +10,7 @@ $language_file=array('admin','registration');
 // resetting the course id
 $cidReset=true;
 
-// including some necessary dokeos files
+// including some necessary files
 require_once '../inc/global.inc.php';
 require_once '../inc/lib/xajax/xajax.inc.php';
 $xajax = new xajax();
diff --git a/main/admin/calendar.lib.php b/main/admin/calendar.lib.php
old mode 100644
new mode 100755
index 49073973eb..2545bb0eb7
--- a/main/admin/calendar.lib.php
+++ b/main/admin/calendar.lib.php
@@ -1,17 +1,13 @@
 <?php // $id: $
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	@package chamilo.admin
 *	@author Carlos Vargas
 *	This file is the calendar/agenda.inc.php
-==============================================================================
 */
 
 /*
------------------------------------------------------------
 	Constants and variables
------------------------------------------------------------
 */
 // the variables for the days and the months
 // Defining the shorts for the days
@@ -22,9 +18,7 @@ $DaysLong = api_get_week_days_long();
 $MonthsLong = api_get_months_long();
 
 /*
-==============================================================================
 		FUNCTIONS
-==============================================================================
 */
 
 /**
diff --git a/main/admin/calendar.php b/main/admin/calendar.php
index 635c49f3cd..b00802c556 100755
--- a/main/admin/calendar.php
+++ b/main/admin/calendar.php
@@ -1,11 +1,9 @@
 <?php // $id: $
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
+*	@package chamilo.admin
 *	@author Carlos Vargas
 *	This file is the calendar/agenda.php
-==============================================================================
 */
 
 // name of the language file that needs to be included
@@ -14,8 +12,8 @@ $language_file[] = 'agenda';
 
 // resetting the course id
 $cidReset=true;
-// including some necessary dokeos files
-require('../inc/global.inc.php');
+// including some necessary files
+require_once '../inc/global.inc.php';
 
 $this_section = SECTION_PLATFORM_ADMIN;
 $_SESSION['this_section']=$this_section;
diff --git a/main/admin/calendar_ical_export.php b/main/admin/calendar_ical_export.php
old mode 100644
new mode 100755
index 2e7a0fc552..b904888a42
--- a/main/admin/calendar_ical_export.php
+++ b/main/admin/calendar_ical_export.php
@@ -1,11 +1,9 @@
 <?php // $id: $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
+*	@package chamilo.admin
 *	@author Carlos Vargas
 *	This file is the calendar/ical_export.php
-==============================================================================
 */
 /**
  * Initialisation
@@ -15,7 +13,7 @@ $language_file = 'agenda';
 // we are not inside a course, so we reset the course id
 $cidReset = true;
 // setting the global file that gets the general configuration, the databases, the languages, ...
-require_once ('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 $this_section = SECTION_MYAGENDA;
 api_block_anonymous_users();
 require_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
diff --git a/main/admin/calendar_view.php b/main/admin/calendar_view.php
old mode 100644
new mode 100755
index 94859080ad..ba96313fe6
--- a/main/admin/calendar_view.php
+++ b/main/admin/calendar_view.php
@@ -1,11 +1,9 @@
 <?php // $id: $
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
+*	@package chamilo.admin
 *	@author Carlos Vargas
 *	This file is the calendar/calendar.php
-==============================================================================
 */
 // name of the language file that needs to be included
 $language_file = 'agenda';
diff --git a/main/admin/calendar_view_print.php b/main/admin/calendar_view_print.php
old mode 100644
new mode 100755
index 9c7659eaed..965dc42be7
--- a/main/admin/calendar_view_print.php
+++ b/main/admin/calendar_view_print.php
@@ -1,29 +1,9 @@
-<?php // $id: $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2008 Dokeos S.A.
-
-	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: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
+*	@package chamilo.admin
 *	@author Carlos Vargas
 *	This file is the calendar/print.php
-==============================================================================
 */
 // name of the language file that needs to be included
 $language_file = 'agenda';
diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php
index 18edf4f280..1ee4a49fde 100755
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@@ -764,7 +764,7 @@ switch ($action) {
 			<tr>
 			<?php
 			$access_url_id = 1;
-			// we only show the category options for the main Dokeos installation
+			// we only show the category options for the main chamilo installation
 			if ($_configuration['multiple_access_urls']) {
 				$access_url_id = api_get_current_access_url_id();
 			}
diff --git a/main/admin/course_add.php b/main/admin/course_add.php
index e3d96fd109..3669ac63ea 100755
--- a/main/admin/course_add.php
+++ b/main/admin/course_add.php
@@ -1,15 +1,11 @@
 <?php
 // $Id: course_add.php 20441 2009-05-10 07:39:15Z ivantcholakov $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
 /*
-==============================================================================
 		INIT SECTION
-==============================================================================
 */
 
 // name of the language file that needs to be included
@@ -29,9 +25,7 @@ $tool_name = get_lang('AddCourse');
 $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 
 /*
-==============================================================================
 		MAIN CODE
-==============================================================================
 */
 
 global $_configuration;