Pārlūkot izejas kodu

Feature #272 - Writting an author's name (Ren?) correctly within UTF-8 source code.

Ivan Tcholakov 15 gadi atpakaļ
vecāks
revīzija
427bdffdd3

+ 7 - 7
main/document/edit_document.php

@@ -8,7 +8,7 @@
 	Copyright (c) 2001 Universite catholique de Louvain (UCL)
 	Copyright (c) Olivier Brouckaert
 	Copyright (c) Roan Embrechts
-	Copyright (c) Rene Haentjens (RH) (update 2004/09/30)
+	Copyright (c) René Haentjens (RH) (update 2004/09/30)
 	Copyright (c) Bart Mollet, Hogeschool Gent
 
 	For a full list of contributors, see "credits.txt".
@@ -486,7 +486,7 @@ if($is_allowedToEdit)
 								copy(api_get_path(SYS_CODE_PATH).'css/'.$platform_theme.'/frames.css',$filepath.'css/frames.css');
 								$doc_id=add_document($_course,$dir.'css/frames.css','file',filesize($filepath.'css/frames.css'),'frames.css');
 								api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'],null,null,null,null,$current_session_id);
-								api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $_user['user_id'],null,null,null,null,$current_session_id);								
+								api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'invisible', $_user['user_id'],null,null,null,null,$current_session_id);
 							}
 						}
 
@@ -623,7 +623,7 @@ $owner_id = Database::result($rs,0,'insert_user_id');
 
 
 if ($owner_id == $_user['user_id'] || api_is_platform_admin() || $is_allowed_to_edit || GroupManager :: is_user_in_group($_user['user_id'],$_SESSION['_gid'] ))
-{  
+{
 	$get_cur_path=Security::remove_XSS($_GET['curdirpath']);
 	$get_file=Security::remove_XSS($_GET['file']);
 	$action =  api_get_self().'?sourceFile='.urlencode($file_name).'&curdirpath='.urlencode($get_cur_path).'&file='.urlencode($get_file).'&doc='.urlencode($doc);
@@ -707,8 +707,8 @@ if ($owner_id == $_user['user_id'] || api_is_platform_admin() || $is_allowed_to_
 	/*
 	$form->addElement('html','<div id="frmModel" style="display:block; height:525px; width:240px; position:absolute; top:115px; left:1px;"></div>');
 	*/
-	
-	
+
+
 	$origin=Security::remove_XSS($_GET['origin']);
 	if ($origin=='slideshow') {
 		$slide_id=$_GET['origin_opt'];
@@ -723,8 +723,8 @@ if ($owner_id == $_user['user_id'] || api_is_platform_admin() || $is_allowed_to_
 //for better navigation when a slide is been commented
 function nav_to_slideshow($slide_id)
 {
-		echo '<div class="actions">';		
-		echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ViewSlideshow')).get_lang('BackTo').' '.get_lang('ViewSlideshow').'</a>';		
+		echo '<div class="actions">';
+		echo '<a href="'.api_get_path(WEB_PATH).'main/document/slideshow.php?slide_id='.$slide_id.'&curdirpath='.Security::remove_XSS(urlencode($_GET['curdirpath'])).'">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ViewSlideshow')).get_lang('BackTo').' '.get_lang('ViewSlideshow').'</a>';
 		echo '</div>';
 }
 /*

+ 38 - 38
main/dropbox/dropbox_class.inc.php

@@ -39,9 +39,9 @@
  * @version 1.30
  * @copyright 2004
  * @author Jan Bols <jan@ivpv.UGent.be>
- * with contributions by Ren Haentjens <rene.haentjens@UGent.be> (see RH)
-  *	@package dokeos.dropbox
- **/
+ * with contributions by René Haentjens <rene.haentjens@UGent.be> (see RH)
+ * @package dokeos.dropbox
+ */
 class Dropbox_Work {
 	public $id;
 	public $uploader_id;
@@ -57,8 +57,8 @@ class Dropbox_Work {
 	public $feedback_date, $feedback;  // RH: Feedback
 
 	/**
-		* Constructor calls private functions to create a new work or retreive an existing work from DB
-		* depending on the number of parameters
+	 * Constructor calls private functions to create a new work or retreive an existing work from DB
+	 * depending on the number of parameters
 	 *
 	 * @param unknown_type $arg1
 	 * @param unknown_type $arg2
@@ -67,7 +67,7 @@ class Dropbox_Work {
 	 * @param unknown_type $arg5
 	 * @param unknown_type $arg6
 	 * @return Dropbox_Work
-		*/
+	 */
 	function Dropbox_Work ($arg1, $arg2=null, $arg3=null, $arg4=null, $arg5=null, $arg6=null) {
 		if (func_num_args()>1)  {
 		    $this->_createNewWork($arg1, $arg2, $arg3, $arg4, $arg5, $arg6);
@@ -77,7 +77,7 @@ class Dropbox_Work {
 	}
 
 	/**
-		* private function creating a new work object
+	 * private function creating a new work object
 	 *
 	 * @param unknown_type $uploader_id
 	 * @param unknown_type $title
@@ -88,7 +88,7 @@ class Dropbox_Work {
 	 *
 	 * @todo 	$author was originally a field but this has now been replaced by the first and lastname of the uploader (to prevent anonymous uploads)
 	 * 			As a consequence this parameter can be removed
-		*/
+	 */
 	function _createNewWork ($uploader_id, $title, $description, $author, $filename, $filesize) {
 		global $_user;
 
@@ -159,10 +159,10 @@ class Dropbox_Work {
 	}
 
 	/**
-		* private function creating existing object by retreiving info from db
+	 * private function creating existing object by retreiving info from db
 	 *
 	 * @param unknown_type $id
-		*/
+	 */
 	function _createExistingWork ($id) {
 		global $_user;  // RH: Feedback
 
@@ -204,7 +204,7 @@ class Dropbox_Work {
 			$feedback2=array();
 			$sql_feedback = "SELECT * FROM ".dropbox_cnf("tbl_feedback")." WHERE file_id='".$id."' ORDER BY feedback_id ASC";
 			$result = Database::query($sql_feedback, __FILE__, __LINE__);
-			while ($row_feedback=Database::fetch_array($result)) {				
+			while ($row_feedback=Database::fetch_array($result)) {
 				$row_feedback['feedback'] = Security::remove_XSS($row_feedback['feedback']);
 				$feedback2[]=$row_feedback;
 			}
@@ -229,8 +229,8 @@ class Dropbox_SentWork extends Dropbox_Work
 	public $recipients;	//array of ["id"]["name"] arrays
 
 	/**
-		* Constructor calls private functions to create a new work or retreive an existing work from DB
-		* depending on the number of parameters
+	 * Constructor calls private functions to create a new work or retreive an existing work from DB
+	 * depending on the number of parameters
 	 *
 	 * @param unknown_type $arg1
 	 * @param unknown_type $arg2
@@ -240,7 +240,7 @@ class Dropbox_SentWork extends Dropbox_Work
 	 * @param unknown_type $arg6
 	 * @param unknown_type $arg7
 	 * @return Dropbox_SentWork
-		*/
+	 */
 	function Dropbox_SentWork ($arg1, $arg2=null, $arg3=null, $arg4=null, $arg5=null, $arg6=null, $arg7=null) {
 		if (func_num_args()>1) {
 		    $this->_createNewSentWork ($arg1, $arg2, $arg3, $arg4, $arg5, $arg6, $arg7);
@@ -250,8 +250,8 @@ class Dropbox_SentWork extends Dropbox_Work
 	}
 
 	/**
-		* private function creating a new SentWork object
-		*
+	 * private function creating a new SentWork object
+	 *
 	 * @param unknown_type $uploader_id
 	 * @param unknown_type $title
 	 * @param unknown_type $description
@@ -259,7 +259,7 @@ class Dropbox_SentWork extends Dropbox_Work
 	 * @param unknown_type $filename
 	 * @param unknown_type $filesize
 	 * @param unknown_type $recipient_ids
-		*/
+	 */
 	function _createNewSentWork ($uploader_id, $title, $description, $author, $filename, $filesize, $recipient_ids) {
 		// Call constructor of Dropbox_Work object
 		$this->Dropbox_Work($uploader_id, $title, $description, $author, $filename, $filesize);
@@ -316,10 +316,10 @@ class Dropbox_SentWork extends Dropbox_Work
 	}
 
 	/**
-		* private function creating existing object by retreiving info from db
+	 * private function creating existing object by retreiving info from db
 	 *
 	 * @param unknown_type $id
-		*/
+	 */
 	function _createExistingSentWork  ($id) {
 		// Call constructor of Dropbox_Work object
 		$this->Dropbox_Work($id);
@@ -378,7 +378,7 @@ class Dropbox_Person
 
 		$session_id = api_get_session_id();
 		$condition_session = api_get_session_condition($session_id);
-			
+
 		$post_tbl = Database::get_course_table(TABLE_DROPBOX_POST);
 		$person_tbl = Database::get_course_table(TABLE_DROPBOX_PERSON);
 		$file_tbl = Database::get_course_table(TABLE_DROPBOX_FILE);
@@ -414,15 +414,15 @@ class Dropbox_Person
 	}
 
 	/**
-		* This private method is used by the usort function in  the
-		* orderSentWork and orderReceivedWork methods.
-		* It compares 2 work-objects by 1 of the properties of that object, dictated by the
+	 * This private method is used by the usort function in  the
+	 * orderSentWork and orderReceivedWork methods.
+	 * It compares 2 work-objects by 1 of the properties of that object, dictated by the
 	 * private property _orderBy
 	 *
 	 * @param unknown_type $a
 	 * @param unknown_type $b
 	 * @return -1, 0 or 1 dependent of the result of the comparison.
-		*/
+	 */
 	function _cmpWork ($a, $b) {
 		$sort = $this->_orderBy;
 		$aval = $a->$sort;
@@ -441,11 +441,11 @@ class Dropbox_Person
 	}
 
 	/**
-		* method that sorts the objects in the sentWork array, dependent on the $sort parameter.
-		* $sort can be lastDate, firstDate, title, size, ...
+	 * method that sorts the objects in the sentWork array, dependent on the $sort parameter.
+	 * $sort can be lastDate, firstDate, title, size, ...
 	 *
 	 * @param unknown_type $sort
-		*/
+	 */
 	function orderSentWork($sort) {
 		/*
 
@@ -477,10 +477,10 @@ class Dropbox_Person
 	}
 
 	/**
-		* method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
-		* $sort can be lastDate, firstDate, title, size, ...
+	 * method that sorts the objects in the receivedWork array, dependent on the $sort parameter.
+	 * $sort can be lastDate, firstDate, title, size, ...
 	 * @param unknown_type $sort
-		*/
+	 */
 	function orderReceivedWork($sort) {
 		switch($sort) {
 			case 'lastDate':
@@ -509,9 +509,9 @@ class Dropbox_Person
 	}
 
 	/**
-		* Deletes all the received work of this person
+	 * Deletes all the received work of this person
 	 *
-		*/
+	 */
 	function deleteAllReceivedWork () {
 		//delete entries in person table concerning received works
 		foreach ($this->receivedWork as $w) {
@@ -521,9 +521,9 @@ class Dropbox_Person
 
 	}
 
-   /**
-    * Deletes all the received categories and work of this person
-	  */
+	/**
+	 * Deletes all the received categories and work of this person
+	 */
 	function deleteReceivedWorkFolder($id) {
 		$sql = "DELETE FROM ".dropbox_cnf("tbl_file")." where cat_id = '".$id."' ";
 		if(!Database::query($sql))		return false;
@@ -537,7 +537,7 @@ class Dropbox_Person
 	 * Deletes a received dropbox file of this person with id=$id
 	 *
 	 * @param integer $id
-		*/
+	 */
 	function deleteReceivedWork ($id) {
 		//id check
 		$found = false;
@@ -559,7 +559,7 @@ class Dropbox_Person
 
 	/**
 	 * Deletes all the sent dropbox files of this person
-		*/
+	 */
 	function deleteAllSentWork () {
 		//delete entries in person table concerning sent works
 		foreach ($this->sentWork as $w) {
@@ -573,7 +573,7 @@ class Dropbox_Person
 	 * Deletes a sent dropbox file of this person with id=$id
 	 *
 	 * @param unknown_type $id
-		*/
+	 */
 	function deleteSentWork ($id) {
 		//index check
 		$found = false;

+ 2 - 2
main/dropbox/dropbox_download.php

@@ -215,7 +215,7 @@ else
 	Copyright (c) 2003 Ghent University (UGent)
 	Copyright (c) 2001 Universite catholique de Louvain (UCL)
 	Copyright (c) Jan Bols
-	Copyright (c) Rene Haentjens
+	Copyright (c) René Haentjens
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -313,7 +313,7 @@ else
  * @version 1.21
  * @copyright 2004-2005
  * @author Jan Bols <jan@ivpv.UGent.be>, main programmer
- * @author Ren Haentjens <rene.haentjens@UGent.be>, several contributions  (see RH)
+ * @author René Haentjens <rene.haentjens@UGent.be>, several contributions  (see RH)
  * @author Roan Embrechts, virtual course support
  *
  * @package dokeos.dropbox

+ 3 - 3
main/dropbox/dropbox_init.inc.php

@@ -12,7 +12,7 @@
  * @version 1.31
  * @copyright 2004-2005
  * @author Jan Bols <jan@ivpv.UGent.be>, main programmer
- * @author Rene Haentjens, severalcontributions <rene.haentjens@UGent.be> (see RH)
+ * @author René Haentjens, severalcontributions <rene.haentjens@UGent.be> (see RH)
  * @author Roan Embrechts, virtual course support
  * @author Patrick Cool <patrick.cool@UGent.be>
  				Dokeos Config Settings (AWACS)
@@ -277,8 +277,8 @@ if((!$is_allowed_in_course || !$is_course_member) && !api_is_allowed_to_edit(nul
 	} else {
 		api_not_allowed();
 	}
-	exit();	
-}	
+	exit();
+}
 
 /*
 ==============================================================================

+ 21 - 21
main/inc/lib/display.lib.php

@@ -9,7 +9,7 @@
 	Copyright (c) Wolfgang Schneider
 	Copyright (c) Bert Vanderkimpen, Ghent University
 	Copyright (c) Bart Mollet, Hogeschool Gent
-	Copyright (c) Rene Haentjens, Ghent University
+	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.
@@ -270,7 +270,7 @@ class Display {
 	 * 					'per_page' = number of items to show per page
 	 * 					'page_nr' = The page to display
 	 * @param array $query_vars Additional variables to add in the query-string
-	 * @param string The style that the table will show. You can set 'table' or 'grid'  
+	 * @param string The style that the table will show. You can set 'table' or 'grid'
 	 * @author bart.mollet@hogent.be
 	 */
 	public static function display_sortable_table ($header, $content, $sorting_options = array (), $paging_options = array (), $query_vars = null, $form_actions=array(), $style='table') {
@@ -289,14 +289,14 @@ class Display {
 					$table->set_header($index, $header_item[0], $header_item[1], $header_item[2], $header_item[3]);
 				}
 			}
-			$table->set_form_actions($form_actions);	
-			$table->display();			
+			$table->set_form_actions($form_actions);
+			$table->display();
 		} else {
-			$table->display_grid();	
-		}		
+			$table->display_grid();
+		}
 	}
 	/**
-	 * Shows a nice grid 
+	 * Shows a nice grid
 	 * @param string grid name (important to create css)
 	 * @param array header content
 	 * @param array array with the information to show
@@ -309,21 +309,21 @@ class Display {
 	 * @param array $query_vars Additional variables to add in the query-string
 	 * @param array $form actions Additional variables to add in the query-string
 	 * @param mixed An array with bool values to know which columns show. i.e: $vibility_options= array(true, false) we will only show the first column
-	 * 				Can be also only a bool value. TRUE: show all columns, FALSE: show nothing 
+	 * 				Can be also only a bool value. TRUE: show all columns, FALSE: show nothing
 	 */
-	 			
+
 	public static function display_sortable_grid ($name, $header, $content, $paging_options = array (), $query_vars = null, $form_actions=array(), $vibility_options = true) {
 		global $origin;
 		$column =  0;
-		$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;		
-		$table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);		
-		
+		$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;
+		$table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);
+
 		if (is_array($query_vars)) {
 			$table->set_additional_parameters($query_vars);
-		}		
-		echo $table->display_simple_grid($vibility_options, $paging_options['hide_navigation']);		
+		}
+		echo $table->display_simple_grid($vibility_options, $paging_options['hide_navigation']);
 	}
-	
+
 	/**
 	 * gets a nice grid in html string
 	 * @param string grid name (important to create css)
@@ -338,21 +338,21 @@ class Display {
 	 * @param array $query_vars Additional variables to add in the query-string
 	 * @param array $form actions Additional variables to add in the query-string
 	 * @param mixed An array with bool values to know which columns show. i.e: $vibility_options= array(true, false) we will only show the first column
-	 * 				Can be also only a bool value. TRUE: show all columns, FALSE: show nothing 
+	 * 				Can be also only a bool value. TRUE: show all columns, FALSE: show nothing
 	 * @param bool  true for sorting data or false otherwise
 	 * @return 	string   html grid
 	 */
 	public static function return_sortable_grid ($name, $header, $content, $paging_options = array (), $query_vars = null, $form_actions=array(), $vibility_options = true, $sort_data = true) {
 		global $origin;
 		$column =  0;
-		$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;		
-		$table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);		
-		
+		$default_items_per_page = isset ($paging_options['per_page']) ? $paging_options['per_page'] : 20;
+		$table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);
+
 		if (is_array($query_vars)) {
 			$table->set_additional_parameters($query_vars);
-		}		
+		}
 		//var_dump($table->get_additional_url_paramstring());
-		return $table->display_simple_grid($vibility_options, $paging_options['hide_navigation'], $paging_options['per_page'], $sort_data);		
+		return $table->display_simple_grid($vibility_options, $paging_options['hide_navigation'], $paging_options['per_page'], $sort_data);
 	}
 
 	/**

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

@@ -38,7 +38,7 @@ class TableSort
 	/**
 	 * Create a string to use in sorting.
 	 * @param string $txt The string to convert
-	 * @author Ren Haentjens
+	 * @author René Haentjens
 	 */
 	function orderingstring($txt)
 	{

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

@@ -11,7 +11,7 @@
 *	This is the XML Dom library for Dokeos.
 *	Include/require it in your code to use its functionality.
 *
-*	@author Rene Haentjens
+*	@author René Haentjens
 *	@package dokeos.library
 ==============================================================================
 */

+ 1 - 1
main/link/link.php

@@ -33,7 +33,7 @@
 * - add link to 'root' category => category-less link is always visible.
 *
 * @author Patrick Cool, main author, completely rewritten
-* @author Rene Haentjens, added CSV file import (October 2004)
+* @author René Haentjens, added CSV file import (October 2004)
 * @package dokeos.link
 * @todo improve organisation, tables should come from database library
 ==============================================================================

+ 5 - 5
main/link/linkfunctions.php

@@ -35,7 +35,7 @@
 * - add link to 'root' category => category-less link is always visible.
 *
 *	@author Patrick Cool, complete remake (December 2003 - January 2004)
-*	@author Rene Haentjens, CSV file import (October 2004)
+*	@author René Haentjens, CSV file import (October 2004)
 *	@package dokeos.link
 ==============================================================================
 */
@@ -753,7 +753,7 @@ function movecatlink($catlinkid)
 
 /**
 * CSV file import functions
-* @author Rene Haentjens , Ghent University
+* @author René Haentjens , Ghent University
 */
 function get_cat($catname) // get category id (existing or make new)
 {
@@ -773,7 +773,7 @@ function get_cat($catname) // get category id (existing or make new)
 }
 /**
 * CSV file import functions
-* @author Rene Haentjens , Ghent University
+* @author René Haentjens , Ghent University
 */
 function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
 {
@@ -815,7 +815,7 @@ function put_link($url, $cat, $title, $description, $on_homepage, $hidden)
 }
 /**
 * CSV file import functions
-* @author Rene Haentjens , Ghent University
+* @author René Haentjens , Ghent University
 */
 function import_link($linkdata) // url, category_id, title, description, ...
 {
@@ -851,7 +851,7 @@ function import_link($linkdata) // url, category_id, title, description, ...
 }
 /**
 * CSV file import functions
-* @author Rene Haentjens , Ghent University
+* @author René Haentjens , Ghent University
 */
 function import_csvfile()
 {

+ 1 - 1
main/metadata/doc/testXht.php

@@ -49,7 +49,7 @@ $testdoc = new xmddoc(
 , this description was
                          modified
 by
-               Ren
+               Ren&eacute;
                                        </imsmd:langstring>
             </imsmd:description>
           </imsmd:general>