Эх сурвалжийг харах

Deleting ==== from heades adding license text

Julio Montoya 15 жил өмнө
parent
commit
67c3626ef0
40 өөрчлөгдсөн 105 нэмэгдсэн , 549 устгасан
  1. 1 3
      main/inc/lib/add_course.lib.inc.php
  2. 1 0
      main/inc/lib/add_courses_to_session_functions.lib.php
  3. 1 2
      main/inc/lib/add_many_session_to_category_functions.lib.php
  4. 2 9
      main/inc/lib/array.lib.php
  5. 1 0
      main/inc/lib/banner.lib.php
  6. 1 1
      main/inc/lib/blog.lib.php
  7. 2 26
      main/inc/lib/classmanager.lib.php
  8. 2 16
      main/inc/lib/course.lib.php
  9. 1 1
      main/inc/lib/course_document.lib.php
  10. 1 7
      main/inc/lib/database.lib.php
  11. 3 25
      main/inc/lib/debug.lib.inc.php
  12. 7 52
      main/inc/lib/display.lib.php
  13. 8 47
      main/inc/lib/document.lib.php
  14. 4 13
      main/inc/lib/events.lib.inc.php
  15. 2 1
      main/inc/lib/exercise_show_functions.lib.php
  16. 2 27
      main/inc/lib/export.lib.inc.php
  17. 3 34
      main/inc/lib/fileDisplay.lib.php
  18. 1 1
      main/inc/lib/fileManage.lib.php
  19. 31 63
      main/inc/lib/fileUpload.lib.php
  20. 2 1
      main/inc/lib/geometry.lib.php
  21. 0 2
      main/inc/lib/glossary.lib.php
  22. 0 2
      main/inc/lib/group_portal_manager.lib.php
  23. 1 24
      main/inc/lib/groupmanager.lib.php
  24. 1 1
      main/inc/lib/image.lib.php
  25. 1 21
      main/inc/lib/import.lib.php
  26. 0 4
      main/inc/lib/internationalization.lib.php
  27. 2 2
      main/inc/lib/legal.lib.php
  28. 3 1
      main/inc/lib/mail.lib.inc.php
  29. 3 40
      main/inc/lib/main_api.lib.php
  30. 2 4
      main/inc/lib/message.lib.php
  31. 1 3
      main/inc/lib/notebook.lib.php
  32. 2 3
      main/inc/lib/online.inc.php
  33. 2 1
      main/inc/lib/security.lib.php
  34. 3 32
      main/inc/lib/session_handler.class.php
  35. 0 4
      main/inc/lib/sessionmanager.lib.php
  36. 2 4
      main/inc/lib/social.lib.php
  37. 1 21
      main/inc/lib/sortabletable.class.php
  38. 3 26
      main/inc/lib/stats.lib.inc.php
  39. 2 23
      main/inc/lib/urlmanager.lib.php
  40. 0 2
      main/inc/lib/usermanager.lib.php

+ 1 - 3
main/inc/lib/add_course.lib.inc.php

@@ -1,7 +1,6 @@
 <?php //$id: $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * This is the course creation library for Dokeos.
 * It contains functions to create a course.
 * Include/require it in your code to use its functionality.
@@ -9,7 +8,6 @@
 * @package dokeos.library
 * @todo clean up horrible structure, script is unwieldy, for example easier way to deal with
 * different tool visibility settings: ALL_TOOLS_INVISIBLE, ALL_TOOLS_VISIBLE, CORE_TOOLS_VISIBLE...
-==============================================================================
 */
 
 include_once (api_get_path(LIBRARY_PATH).'database.lib.php');

+ 1 - 0
main/inc/lib/add_courses_to_session_functions.lib.php

@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 require_once (api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php');
 //require_once (api_get_path(SYS_CODE_PATH).'admin/add_courses_to_session.php');

+ 1 - 2
main/inc/lib/add_many_session_to_category_functions.lib.php

@@ -1,8 +1,7 @@
 <?php
-
+/* For licensing terms, see /license.txt */
 require_once (api_get_path(LIBRARY_PATH).'xajax/xajax.inc.php');
 
-
 class AddManySessionToCategoryFunctions {
 
 	function search_courses($needle,$type) {

+ 2 - 9
main/inc/lib/array.lib.php

@@ -1,18 +1,11 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 *	This is the array library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
-*	@package dokeos.library
-==============================================================================
-*/
-
-/*
-==============================================================================
-		FUNCTIONS
-==============================================================================
+*	@package chamilo.library
 */
 
 

+ 1 - 0
main/inc/lib/banner.lib.php

@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 require_once(api_get_path(SYS_CODE_PATH).'inc/banner.inc.php');
 
 /**

+ 1 - 1
main/inc/lib/blog.lib.php

@@ -1,5 +1,5 @@
 <?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 
 /**
  * Blog class

+ 2 - 26
main/inc/lib/classmanager.lib.php

@@ -1,32 +1,8 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Bart Mollet, Hogeschool Gent
-
-	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, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This is the class library for Dokeos.
-*	@package	 dokeos.library
-==============================================================================
+*	@package	 chamilo.library
 */
 require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
 /**

+ 2 - 16
main/inc/lib/course.lib.php

@@ -1,12 +1,7 @@
 <?php //$id: $
-/* For licensing terms, see /dokeos_license.txt
-	Copyright (c) Roan Embrechts, Vrije Universiteit Brussel
-	Copyright (c) Bart Mollet, Hogeschool Gent
-	Copyright (c) Yannick Warnier, Dokeos SPRL
-*/
+/* For licensing terms, see /license.txt*/
 
 /**
-==============================================================================
 * This is the course library for Dokeos.
 *
 * All main course functions should be placed here.
@@ -20,11 +15,9 @@
 * There are probably some places left with the wrong code.
 *
 * @package chamilo.library
-==============================================================================
 */
 
 /*
-==============================================================================
 	DOCUMENTATION
 	(list not up to date, you can auto generate documentation with phpDocumentor)
 
@@ -67,14 +60,9 @@
 
 	CREATION FUNCTIONS
 	CourseManager::attempt_create_virtual_course($real_course_code, $course_title, $wanted_course_code, $course_language, $course_category)
-==============================================================================
 */
 
-/*
-==============================================================================
-		INIT SECTION
-==============================================================================
-*/
+/*	INIT SECTION */
 
 /*
 -----------------------------------------------------------
@@ -137,9 +125,7 @@ $TABLEANNOUNCEMENTS = 'announcement';
 $coursesRepositories = $_configuration['root_sys'];
 
 /*
-==============================================================================
 		CourseManager CLASS
-==============================================================================
 */
 
 /**

+ 1 - 1
main/inc/lib/course_document.lib.php

@@ -1,5 +1,5 @@
 <?php
-
+/* For licensing terms, see /license.txt */
 
 
 function getlist ($directory) {

+ 1 - 7
main/inc/lib/database.lib.php

@@ -1,7 +1,6 @@
 <?php // $Id: database.lib.php 22265 2009-07-20 23:26:43Z juliomontoya $
 /* See license terms in /license.txt */
 /**
-==============================================================================
 *	This is the main database library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *   Because this library contains all the basic database calls, it could be
@@ -12,14 +11,9 @@
 *	@package chamilo.library
 * 	@todo the table constants have all to start with TABLE_
 * 		  This is because of the analogy with the tool constants TOOL_
-==============================================================================
 */
 
-/*
-==============================================================================
-		CONSTANTS
-==============================================================================
-*/
+/*	CONSTANTS */
 
 // Main database tables
 define('TABLE_MAIN_COURSE', 				'course');

+ 3 - 25
main/inc/lib/debug.lib.inc.php

@@ -1,34 +1,12 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-
-	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
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-* This is the debug library for Dokeos.
+* This is the debug library for Chamilo.
 * Include/require it in your code to use its functionality.
 *
 * debug functions
 *
-* @package dokeos.library
-==============================================================================
+* @package chamilo.library
 */
 
 /**

+ 7 - 52
main/inc/lib/display.lib.php

@@ -1,36 +1,7 @@
 <?php
-
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos S.A.
-	Copyright (c) Roan Embrechts, Vrije Universiteit Brussel
-	Copyright (c) Wolfgang Schneider
-	Copyright (c) Bert Vanderkimpen, Ghent University
-	Copyright (c) Bart Mollet, Hogeschool Gent
-	Copyright (c) René Haentjens, Ghent University
-	Copyright (c) Yannick Warnier, Dokeos S.A.
-	Copyright (c) Sandra Matthys, Hogeschool Gent
-	Copyright (c) Denes Nagy, 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 address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	This is a display library for Dokeos.
+*	This is a display library for Chamilo.
 *
 *	Include/require it in your code to use its public functionality.
 *	There are also several display public functions in the main api library.
@@ -39,28 +10,11 @@
 *	so you use them like this: e.g.
 *	Display::display_normal_message($message)
 *
-*	@package dokeos.library
-==============================================================================
-*/
-/*
-==============================================================================
-	   CONSTANTS
-==============================================================================
+*	@package chamilo.library
 */
 /*
-==============================================================================
-	   LIBRARIES
-==============================================================================
-*/
-//no other libraries needed at the moment
-/*
-==============================================================================
-		public functionS
-==============================================================================
-*/
-//all public functions are stored inside the Display class
-/*
-==============================================================================
+all public functions are stored inside the Display class
+ 
 		CLASS Display
 
 		public functions inside
@@ -74,8 +28,9 @@
 		Display::display_error_message($message)
 		Display::encrypted_mailto_link($email, $clickable_text, $style_class='')
 		Display::get_platform_home_link_html($name = '')
-==============================================================================
 */
+
+
 /**
 *	Display class
 *	contains several public functions dealing with the display of

+ 8 - 47
main/inc/lib/document.lib.php

@@ -1,78 +1,39 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) Roan Embrechts, Vrije Universiteit Brussel
-
-	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 */
 /**
-==============================================================================
 *	This is the document library for Dokeos.
 *	It is / will be used to provide a service layer to all document-using tools.
 *	and eliminate code duplication fro group documents, scorm documents, main documents.
 *	Include/require it in your code to use its functionality.
 *
 *	@version 1.1, January 2005
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 
-/*
-==============================================================================
-	DOCUMENTATION
-	use the functions like this: DocumentManager::get_course_quota()
-==============================================================================
+/*  DOCUMENTATION
+	use the functions like this: DocumentManager::get_course_quota() 
 */
 
 require_once api_get_path(LIBRARY_PATH).'course.lib.php';
 
-/*
-==============================================================================
-		CONSTANTS
-==============================================================================
-*/
+/* CONSTANTS */
 
 define("DISK_QUOTA_FIELD", "disk_quota"); //name of the database field
 /** default quota for the course documents folder */
 define("DEFAULT_DOCUMENT_QUOTA", api_get_setting('default_document_quotum'));
 
-/*
-==============================================================================
-		VARIABLES
-==============================================================================
-*/
+/* VARIABLES */
 
 $sys_course_path = api_get_path(SYS_COURSE_PATH);
 $baseServDir = api_get_path(SYS_PATH);
 $baseServUrl = $_configuration['url_append']."/";
 $baseWorkDir = $sys_course_path.(!empty($courseDir)?$courseDir:'');
 
-/*
-==============================================================================
+/* 
 		DocumentManager CLASS
-		the class and its functions
-==============================================================================
+		the class and its functions 
 */
 
-/**
- *	@package dokeos.library
- */
 class DocumentManager {
 	private function __construct() {
 

+ 4 - 13
main/inc/lib/events.lib.inc.php

@@ -1,7 +1,6 @@
 <?php // $Id: events.lib.inc.php 22205 2009-07-17 21:11:52Z cfasanando $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
-==============================================================================
 * EVENTS LIBRARY
 *
 * This is the events library for Dokeos.
@@ -12,13 +11,9 @@
 *
 * @package dokeos.library
 * @todo convert queries to use Database API
-==============================================================================
-*/
-/*
-==============================================================================
-	   INIT SECTION
-==============================================================================
 */
+/*	   INIT SECTION */
+
 // REGROUP TABLE NAMES FOR MAINTENANCE PURPOSE
 $TABLETRACK_LOGIN 		= $_configuration['statistics_database'].".track_e_login";
 $TABLETRACK_OPEN 		= $_configuration['statistics_database'].".track_e_open";
@@ -31,11 +26,7 @@ $TABLETRACK_SUBSCRIPTIONS = $_configuration['statistics_database'].".track_e_sub
 $TABLETRACK_LASTACCESS 	= $_configuration['statistics_database'].".track_e_lastaccess"; //for "what's new" notification
 $TABLETRACK_DEFAULT 	= $_configuration['statistics_database'].".track_e_default";
 
-/*
-==============================================================================
-		FUNCTIONS
-==============================================================================
-*/
+/* FUNCTIONS */
 /**
  * @author Sebastien Piraux <piraux_seb@hotmail.com>
  * @desc Record information for open event (when homepage is opened)

+ 2 - 1
main/inc/lib/exercise_show_functions.lib.php

@@ -1,4 +1,5 @@
-<?php // $Id: exercise_show_functions.lib.php 22205 2010-02-11 15:00:00Z aportugal $
+<?php
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * EVENTS LIBRARY

+ 2 - 27
main/inc/lib/export.lib.inc.php

@@ -1,37 +1,12 @@
 <?php
-/*
-==============================================================================
-	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) Olivier Brouckaert
-	Copyright (c) Bart Mollet, Hogeschool Gent
-
-	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, info@dokeos.com
-==============================================================================
-*/
-
+/* See license terms in /license.txt */
 /**
-==============================================================================
 *	This is the export library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
 *	Several functions below are adaptations from functions distributed by www.nexen.net
 *
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 
 require_once 'document.lib.php';

+ 3 - 34
main/inc/lib/fileDisplay.lib.php

@@ -1,41 +1,14 @@
 <?php
-/*
-vim: set expandtab tabstop=4 shiftwidth=4:
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-
-	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
-==============================================================================
-*/
+/* See license terms in /license.txt */
 /**
-==============================================================================
 *	This is the file display library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
 *	@package dokeos.library
-==============================================================================
 */
 
 
-/*
-==============================================================================
-		GENERIC FUNCTIONS : FOR OLDER PHP VERSIONS
-==============================================================================
-*/
+/*	GENERIC FUNCTIONS : FOR OLDER PHP VERSIONS */
 if ( ! function_exists('array_search') )
 {
 	/**
@@ -61,11 +34,7 @@ if ( ! function_exists('array_search') )
 	}
 }
 
-/*
-==============================================================================
-		FILE DISPLAY FUNCTIONS
-==============================================================================
-*/
+/* FILE DISPLAY FUNCTIONS */
 /**
  * Define the image to display for each file extension.
  * This needs an existing image repository to work.

+ 1 - 1
main/inc/lib/fileManage.lib.php

@@ -5,7 +5,7 @@
 *	This is the file manage library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
-*	@package dokeos.library
+*	@package chamilo.library
 ==============================================================================
 */
 

+ 31 - 63
main/inc/lib/fileUpload.lib.php

@@ -1,40 +1,17 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004 Dokeos S.A.
-	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: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 	FILE UPLOAD LIBRARY
 
 *	This is the file upload library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
-*	@package dokeos.library
+*	@package chamilo.library
 *	@todo test and reorganise
-==============================================================================
 */
 
 /*
-==============================================================================
+
 List of functions
 function php2phps ($fileName)
 function htaccess2txt($filename)
@@ -68,10 +45,9 @@ function check_for_missing_files($file)
 function build_missing_files_form($missing_files,$upload_path,$file_name)
 	Still experimental:
 function api_replace_parameter($upload_path, $buffer, $param_name="src")
-==============================================================================
+
 */
 
-//------------------------------------------------------------------------------
 
 /**
  * change the file name extension from .php to .phps
@@ -88,7 +64,7 @@ function php2phps ($fileName)
 	return $fileName;
 }
 
-//------------------------------------------------------------------------------
+
 
 /**
  * Renames .htaccess & .HTACCESS tot htaccess.txt
@@ -103,7 +79,6 @@ function htaccess2txt($filename)
     return $filename;
 }
 
-//------------------------------------------------------------------------------
 
 
 /**
@@ -122,8 +97,6 @@ function disable_dangerous_file($filename)
 	return $filename;
 }
 
-//------------------------------------------------------------------------------
-
 /**
  * this function generates a unique name for a file on a given location
  * filenames are changed to name_#.ext
@@ -145,7 +118,6 @@ function unique_name($path,$name)
 	return $name_no_ext . $unique . $ext;
 }
 
-//------------------------------------------------------------------------------
 
 /**
  * Returns the name without extension, used for the title
@@ -163,8 +135,6 @@ function get_document_title($name)
 	return $filename;
 }
 
-//------------------------------------------------------------------------------
-
 /**
  * This function checks if the upload succeeded
  *
@@ -196,8 +166,6 @@ function process_uploaded_file($uploaded_file) {
 	return true;
 }
 
-//------------------------------------------------------------------------------
-
 /**
  * this function does the save-work for the documents.
  * it handles the uploaded file and adds the properties to the database
@@ -418,7 +386,7 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Check if there is enough place to add a file on a directory
@@ -450,7 +418,7 @@ function enough_size($fileSize, $dir, $maxDirSpace)
 	return true;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Check if there is enough place to add a file on a directory
@@ -479,7 +447,7 @@ function enough_space($file_size, $max_dir_space)
 	return true;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Compute the size already occupied by a directory and is subdirectories
@@ -526,7 +494,7 @@ function dir_total_space($dirPath)
 	return $sumSize;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Calculate the total size of all documents in a course
@@ -562,7 +530,7 @@ function documents_total_space($to_group_id='0')
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Try to add an extension to files without extension
@@ -670,7 +638,7 @@ function add_ext_on_mime($fileName,$fileType)
 	return $fileName;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  *
@@ -856,7 +824,7 @@ function unzip_uploaded_file($uploadedFile, $uploadPath, $baseWorkDir, $maxFille
 
 	return true;
 }
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Manages all the unzipping process of an uploaded document
@@ -1013,7 +981,7 @@ function unzip_uploaded_document($uploaded_file, $upload_path, $base_work_dir, $
 	*/
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * this function is a callback function that is used while extracting a zipfile
@@ -1029,7 +997,7 @@ function clean_up_files_in_zip($p_event, &$p_header)
 	return $res;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * this function cleans up a given path
@@ -1121,7 +1089,7 @@ function filter_extension(&$filename)
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Adds a new document to the database
@@ -1154,13 +1122,13 @@ function add_document($_course,$path,$filetype,$filesize,$title,$comment=NULL, $
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /*
 function get_document_id() moved to document.lib.php
 */
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Update an existing document in the database
@@ -1233,7 +1201,7 @@ function item_property_update_on_folder($_course,$path,$user_id)
 		}
 	}
 }
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Returns the directory depth of the file.
@@ -1256,7 +1224,7 @@ function get_levels($filename)
 	class FileManager
 */
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Adds file to document table in database
@@ -1306,7 +1274,7 @@ function set_default_settings($upload_path,$filename,$filetype="file")
 	Database::query($query);
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * retrieve the image path list in a html file
@@ -1364,7 +1332,7 @@ function search_img_from_html($htmlFile)
 
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * creates a new directory trying to find a directory name
@@ -1422,7 +1390,7 @@ function create_unexisting_directory($_course,$user_id,$to_group_id,$to_user_id,
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Handles uploaded missing images
@@ -1458,9 +1426,9 @@ function move_uploaded_file_collection_into_directory($_course, $uploaded_file_c
 	return $new_file_list;
 }
 
-//------------------------------------------------------------------------------
+ 
 
-//------------------------------------------------------------------------------
+ 
 
 /*
  * Open the old html file and replace the src path into the img tag
@@ -1512,7 +1480,7 @@ function replace_img_path_in_html_file($originalImgPath, $newImgPath, $htmlFile)
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Creates a file containing an html redirection to a given url
@@ -1541,7 +1509,7 @@ function create_link_file($filePath, $url)
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
 	Open html file $full_file_name;
@@ -1567,7 +1535,7 @@ function api_replace_links_in_html($upload_path, $full_file_name)
 	}
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
 	@deprecated, use api_replace_parameter instead
@@ -1662,7 +1630,7 @@ function api_replace_links_in_string($upload_path, $buffer)
 	return $buffer;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
 	EXPERIMENTAL - function seems to work, needs more testing
@@ -1789,7 +1757,7 @@ function api_replace_parameter($upload_path, $buffer, $param_name="src")
 	return $buffer;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * Checks the extension of a file, if it's .htm or .html
@@ -1809,7 +1777,7 @@ function check_for_missing_files($file)
 	return false;
 }
 
-//------------------------------------------------------------------------------
+ 
 
 /**
  * This builds a form that asks for the missing images in a html file
@@ -1848,7 +1816,7 @@ function build_missing_files_form($missing_files,$upload_path,$file_name)
 				return $form;
 }
 
-//------------------------------------------------------------------------------
+
 
 /**
  * This recursive function can be used during the upgrade process form older versions of Dokeos

+ 2 - 1
main/inc/lib/geometry.lib.php

@@ -1,4 +1,5 @@
-<?php //$Id: geometry.lib.php 16500 2008-10-11 14:56:57Z yannoo $
+<?php
+/* For licensing terms, see /license.txt */
 
 //more natural array index names
 define(X, 0);

+ 0 - 2
main/inc/lib/glossary.lib.php

@@ -1,12 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This library provides functions for the glossary tool.
 *	Include/require it in your code to use its functionality.
 
 *	@package chamilo.library
-==============================================================================
 */
 class GlossaryManager {
 

+ 0 - 2
main/inc/lib/group_portal_manager.lib.php

@@ -1,12 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This library provides functions for the group management.
 *	Include/require it in your code to use its functionality.
 *	@author Julio Montoya <gugli100@gmail.com>
 *	@package chamilo.library
-==============================================================================
 */
 // Group permissions
 define('GROUP_PERMISSION_OPEN'	, '1');

+ 1 - 24
main/inc/lib/groupmanager.lib.php

@@ -1,28 +1,6 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-
-	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, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This is the group library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
@@ -31,7 +9,6 @@
 *   @author Bart Mollet (HoGent), all functions in class GroupManager
 *   @author Julio Montoya (Dokeos), LOTS of database::escape_string added
 *	@package dokeos.library
-==============================================================================
 */
 require_once 'database.lib.php';
 require_once 'course.lib.php';

+ 1 - 1
main/inc/lib/image.lib.php

@@ -1,5 +1,5 @@
 <?php
-
+/* For licensing terms, see /license.txt */
 class image {
 
 	var $bg;

+ 1 - 21
main/inc/lib/import.lib.php

@@ -1,25 +1,5 @@
 <?php
-// $Id: import.lib.php 13806 2007-11-28 06:29:03Z yannoo $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-	Copyright (c) 2004,2005 Dokeos S.A.
-	Copyright (c) Bart Mollet, Hogeschool Gent
-
-	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, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 * This class provides some functions which can be used when importing data from

+ 0 - 4
main/inc/lib/internationalization.lib.php

@@ -1,6 +1,5 @@
 <?php
 /**
- * ==============================================================================
  * File: internationalization.lib.php
  * Internationalization library for Chamilo 1.8.7 LMS
  * A library implementing internationalization related functions.
@@ -8,14 +7,11 @@
  * @author Ivan Tcholakov, <ivantcholakov@gmail.com>, 2009, 2010
  * @author More authors, mentioned in the correpsonding fragments of this source.
  * @package chamilo.library
- * ==============================================================================
  */
 
 
 /**
- * ----------------------------------------------------------------------------
  * Constants
- * ----------------------------------------------------------------------------
  */
 
 // Predefined date formats in Chamilo provided by the language sub-system.

+ 2 - 2
main/inc/lib/legal.lib.php

@@ -1,12 +1,12 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
  * Legal class
  *
  * @version 1.0
  * @package dokeos.legal
  *
- */
+*/
 
 class LegalManager {
 	private function __construct () {

+ 3 - 1
main/inc/lib/mail.lib.inc.php

@@ -1,4 +1,6 @@
-<?php //$id: $
+<?php
+/* For licensing terms, see /license.txt */
+
 require_once api_get_path(LIBRARY_PATH).'phpmailer/class.phpmailer.php';
 require_once api_get_path(CONFIGURATION_PATH).'mail.conf.php';
 

+ 3 - 40
main/inc/lib/main_api.lib.php

@@ -1,53 +1,16 @@
 <?php
-/*
-===============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2008 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Julio Montoya
-	Copyright (c) Hugues Peeters
-	Copyright (c) Christophe Gesché
-	Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
-	Copyright (c) Patrick Cool
-	Copyright (c) Olivier Brouckaert
-	Copyright (c) Toon Van Hoecke
-	Copyright (c) Denes Nagy
-	Copyright (c) Isaac Flores
-	Copyright (c) Ivan Tcholakov
-
-	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 */
 
 /**
-==============================================================================
 *	This is a code library for Dokeos.
 *	It is included by default in every Dokeos file
 *	(through including the global.inc.php)
 *
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 
 
-/*
-==============================================================================
-		CONSTANTS
-==============================================================================
-*/
+/*	CONSTANTS */
 
 //USER STATUS CONSTANTS
 /** global status of a user: student */

+ 2 - 4
main/inc/lib/message.lib.php

@@ -1,13 +1,11 @@
 <?php
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 
 /**
-==============================================================================
 *	This class provides methods for messages management.
 *	Include/require it in your code to use its features.
 *
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 
 require_once api_get_path(LIBRARY_PATH).'online.inc.php';

+ 1 - 3
main/inc/lib/notebook.lib.php

@@ -1,13 +1,11 @@
 <?php
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 
 /**
-==============================================================================
 *	This class provides methods for the notebook management.
 *	Include/require it in your code to use its features.
 *	@author Carlos Vargas <litox84@gmail.com>, move code of main/notebook up here
 *	@package chamilo.library
-==============================================================================
 */
 
 class NotebookManager

+ 2 - 3
main/inc/lib/online.inc.php

@@ -1,5 +1,5 @@
 <?php
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 *	Code library for showing Who is online
@@ -8,8 +8,7 @@
 *	@author Denes Nagy, principal author
 *	@author Bart Mollet
 *	@author Roan Embrechts, cleaning and bugfixing
-*	@package dokeos.whoisonline
-==============================================================================
+*	@package chamilo.whoisonline
 */
 /**
  * Insert a login reference for the current user into the track_e_online stats table.

+ 2 - 1
main/inc/lib/security.lib.php

@@ -1,5 +1,5 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 * This is the security library for Dokeos.
 *
@@ -21,6 +21,7 @@
 * @package dokeos.library
 * @author Yannick Warnier <ywarnier@beeznest.org>
 */
+
 /**
  * Security class
  *

+ 3 - 32
main/inc/lib/session_handler.class.php

@@ -1,39 +1,10 @@
-<?php // $Id: session_handler.class.php 22311 2009-07-23 15:39:23Z iflorespaz $
-/*
-===============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2007 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Hugues Peeters
-	Copyright (c) Christophe Gesche
-	Copyright (c) Roan Embrechts
-	Copyright (c) Patrick Cool
-	Copyright (c) Olivier Brouckaert
-	Copyright (c) Toon Van Hoecke
-	Copyright (c) Denes Nagy
-
-	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 */
 /**
-==============================================================================
 *	This class allows to manage the session. Session is stored in
 *	the database
 *
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 
 class session_handler {

+ 0 - 4
main/inc/lib/sessionmanager.lib.php

@@ -1,23 +1,19 @@
 <?php //$id: $
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * This is the session library for Chamilo.
 * All main sessions functions should be placed here.
 * @package chamilo.library
-==============================================================================
 */
 
 /* LIBRARIES */
 require_once 'display.lib.php';
 
 /**
-==============================================================================
 *	This class provides methods for sessions management.
 *	Include/require it in your code to use its features.
 *
 *	@package chamilo.library
-==============================================================================
 */
 class SessionManager {
 	private function __construct() {

+ 2 - 4
main/inc/lib/social.lib.php

@@ -1,13 +1,11 @@
 <?php //$id: $
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 
 /**
-==============================================================================
 *	This class provides methods for the social network management.
 *	Include/require it in your code to use its features.
 *
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 
 //PLUGIN PLACES

+ 1 - 21
main/inc/lib/sortabletable.class.php

@@ -1,26 +1,6 @@
 <?php
+/* For licensing terms, see /license.txt */
 
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2005-2008 Dokeos S.A.
-	Copyright (c) Bart Mollet (bart.mollet@hogent.be)
-
-	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, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
 require_once "HTML/Table.php"; //See http://pear.php.net/package/HTML_Table
 require_once "Pager/Pager.php"; //See http://pear.php.net/package/Pager
 require_once 'tablesort.lib.php';

+ 3 - 26
main/inc/lib/stats.lib.inc.php

@@ -1,37 +1,14 @@
-<?php // $Id: stats.lib.inc.php 10082 2006-11-21 19:08:15Z pcool $
-
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-
-	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 */
 
 /**
-==============================================================================
 *	This is the statistics library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
 *	@author Sebastien Piraux
-*	@package dokeos.library
+*	@package chamilo.library
 *
 * 	@todo use the Database libraries
-==============================================================================
 */
 
 /*

+ 2 - 23
main/inc/lib/urlmanager.lib.php

@@ -1,31 +1,10 @@
 <?php
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2009 Dokeos SPRL
-	Copyright (c) 2009 Julio Montoya Armas <gugli100@gmail.com>
-
-	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, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This library provides functions for the access_url management.
 *	Include/require it in your code to use its functionality.
 *
-*	@package dokeos.library
-==============================================================================
+*	@package chamilo.library
 */
 class UrlManager
 {

+ 0 - 2
main/inc/lib/usermanager.lib.php

@@ -1,13 +1,11 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-==============================================================================
 *	This library provides functions for user management.
 *	Include/require it in your code to use its functionality.
 *
 *	@package chamilo.library
 *	@author Julio Montoya <gugli100@gmail.com> Social network groups added 2009/12
-==============================================================================
 */
 
 // Constants for user extra field types.